convert CRLF to LF

[rec10/rec10-git.git] / rec10 / trunk / src / chdata.py

diff --git a/rec10/trunk/src/chdata.py b/rec10/trunk/src/chdata.py
index 249aeb0..0b2120a 100644 (file)
--- a/rec10/trunk/src/chdata.py
+++ b/rec10/trunk/src/chdata.py
@@ -1,39 +1,24 @@
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
-# Copyright (C) 2009-2010 Yukikaze
+# Copyright (C) 2009-2012 Yukikaze
 import os.path
 import configreader
 import xml.dom.minidom
+import scan_ch
+import datetime
 
 import rec10d
 
 path = str(os.path.dirname(os.path.abspath(__file__))) + "/"
 
-def chadd(bctype, chtxt, ch, csch):#すべて文字列
-    rec10d.rec10db.add_epg_ch(bctype,chtxt, ch, csch, u"2010-01-01 00:00:00")
-def chlistadd(cl):
+def chAdd(bctype, chtxt, ch, csch,tsid="0"):#すべて文字列
+    tnow=datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    rec10d.rec10db.add_epg_ch(bctype,chtxt, ch, csch,tsid, u"2010-01-01 00:00:00",u"2010-01-01 00:00:00",tnow)
+def addCHlist(cl):
     if len(cl)>0:
         for c in cl:
-            chadd(c[0],c[1],c[2],c[3])
-def new_chdata(bs,cs):
-    rec10d.rec10db.new_epg_ch()
-    chlistadd(getChList(os.path.join(path,"chlist.xml")))
-    if bs==1:
-        #bs放送の設定　全国共通のはず
-        chlistadd(getChList(os.path.join(path,"chlist_bs.xml")))
-    if cs==1:
-        #CS放送(スカパーe2)主に基本パックに入ってるものを中心に
-        chlistadd(getChList(os.path.join(path,"chlist_cs.xml")))
-def new_chdata_all():
-    bs=0
-    cs=0
-    try:
-        bs=int(configreader.getenv("bs"))
-        cs=int(configreader.getenv("cs"))
-    except:
-        ""
-    new_chdata(bs,cs)
+            chAdd(c[0],c[1],c[2],c[3])
 def getChList(xmlpath):
     dom=xml.dom.minidom.parse(file(xmlpath))
     chlist=[]
@@ -45,5 +30,8 @@ def getChList(xmlpath):
         ontv=ch.getAttribute("ontvcode")
         chlist.append([bctype,ontv,chtxt,chd,csch])
     return chlist
+def deleteChListALL():
+    rec10d.rec10db.new_epg_ch()
 if __name__ == "__main__":
-    new_chdata_all()
\ No newline at end of file
+    deleteChListALL()
+    scan_ch.searchCh()