X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=rec10%2Ftrunk%2Fsrc%2Fchdb.py;h=65133fa5671c326fb5d3bbd2f56b64115befa115;hb=834ad72ed635ce665792b0d9c1ebf98dd0897d6b;hp=361a9a33e70e09a8ad3807c4dbca7ae59dcd75a0;hpb=e92c04d600f815e5f30216210592bc60cff69285;p=rec10%2Frec10-git.git

diff --git a/rec10/trunk/src/chdb.py b/rec10/trunk/src/chdb.py
index 361a9a3..65133fa 100644
--- a/rec10/trunk/src/chdb.py
+++ b/rec10/trunk/src/chdb.py
@@ -1,56 +1,66 @@
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
-# Copyright (C) 2009 Yukikaze
+# Copyright (C) 2009-2011 Yukikaze
     # モジュール属性 argv を取得するため
 import rec10d
 
-def ontvsearch(ontvin):
+def searchCHFromChtxt(chtxtin):
+    chtxtt=chtxtin.replace("_0","_%")
     ret = []
-    for datum in rec10d.rec10db.select_by_ontv_chdata(ontvin):
-        rett = {'bctype':datum[0], 'ontv':datum[1], 'chtxt':datum[2], 'ch':datum[3], 'csch':datum[4], 'update':datum[5]}
+    for datum in rec10d.rec10db.select_by_chtxt_epg_ch(chtxtt):
+        rett = {'bctype':datum[0], 'chtxt':datum[1], 'ch':datum[2], 'csch':datum[3], 'update':datum[4], 'chname':datum[5], 'visible':datum[7]}
         ret.append(rett)
     if len(ret) == 0:
         ret.append(None)
     return ret[0]
-def chtxtsearch(chtxtin):
+def searchCHFromBctype(bctypein):
     ret = []
-    for datum in rec10d.rec10db.select_by_chtxt_chdata(chtxtin):
-        rett = {'bctype':datum[0], 'ontv':datum[1], 'chtxt':datum[2], 'ch':datum[3], 'csch':datum[4], 'update':datum[5]}
+    for datum in rec10d.rec10db.select_by_bctype_epg_ch(bctypein):
+        rett = {'bctype':datum[0], 'chtxt':datum[1], 'ch':datum[2], 'csch':datum[3], 'update':datum[4], 'chname':datum[5], 'visible':datum[7]}
         ret.append(rett)
     if len(ret) == 0:
         ret.append(None)
     return ret[0]
-def bctypesearch(bctypein):
+def searchCHFromCh(chin):
     ret = []
-    for datum in rec10d.rec10db.select_by_bctype_chdata(bctypein):
-        rett = {'bctype':datum[0], 'ontv':datum[1], 'chtxt':datum[2], 'ch':datum[3], 'csch':datum[4], 'update':datum[5]}
+    for datum in rec10d.rec10db.select_by_ch_epg_ch(chin):
+        rett = {'bctype':datum[0], 'chtxt':datum[1], 'ch':datum[2], 'csch':datum[3], 'update':datum[4], 'chname':datum[5], 'visible':datum[7]}
         ret.append(rett)
     if len(ret) == 0:
         ret.append(None)
     return ret[0]
-def chsearch(chin):
+def searchCHFromCsch(cschin):
     ret = []
-    for datum in rec10d.rec10db.select_by_ch_chdata(chin):
-        rett = {'bctype':datum[0], 'ontv':datum[1], 'chtxt':datum[2], 'ch':datum[3], 'csch':datum[4], 'update':datum[5]}
+    for datum in rec10d.rec10db.select_by_csch_epg_ch(cschin):
+        rett = {'bctype':datum[0], 'chtxt':datum[1], 'ch':datum[2], 'csch':datum[3], 'update':datum[4], 'chname':datum[5], 'visible':datum[7]}
         ret.append(rett)
     if len(ret) == 0:
         ret.append(None)
     return ret[0]
-def getall():
+def searchAllCHFromCh(chin):
     ret = []
-    for datum in rec10d.rec10db.select_all_chdata():
-        rett = {'bctype':datum[0], 'ontv':datum[1], 'chtxt':datum[2], 'ch':datum[3], 'csch':datum[4], 'update':datum[5]}
+    for datum in rec10d.rec10db.select_by_ch_epg_ch(chin):
+        rett = {'bctype':datum[0], 'chtxt':datum[1], 'ch':datum[2], 'csch':datum[3], 'update':datum[4], 'chname':datum[5], 'visible':datum[7]}
         ret.append(rett)
     if len(ret) == 0:
         ret.append(None)
-    return ret[0]
+    return ret
+def getAllCH():
+    ret = []
+    for datum in rec10d.rec10db.select_all_epg_ch():
+        rett = {'bctype':datum[0], 'chtxt':datum[1], 'ch':datum[2], 'csch':datum[3], 'update':datum[4], 'chname':datum[5], 'visible':datum[7]}
+        ret.append(rett)
+    if len(ret) == 0:
+        ret.append(None)
+    return ret
 def update():
     ret = []
     CSupdate = 0
     CS2update = 0
     BSupdate = 0
-    for datum in rec10d.rec10db.select_get_update_chdata("6"):
+    rec10d.rec10db.set_new_status("8")
+    for datum in rec10d.rec10db.select_get_update_epg_ch("6"):
         bctype = datum[0]
         if bctype == "cs1" or bctype == u"cs1":
             if CSupdate == 0:
@@ -66,4 +76,26 @@ def update():
                 BSupdate = 1
         else:
             ret.append(bctype)
-    return ret
\ No newline at end of file
+    return ret
+def changeCHShow(chtxt,isshow):
+    rec10d.rec10db.change_visible_epg_ch(chtxt, isshow)
+def updateLogo():
+    ret=[]
+    BSCSUpdate=0
+    for datum in rec10d.rec10db.select_get_updatelogo_epg_ch("720"):
+        bctype=datum[0]
+        if bctype == "cs1" or bctype == u"cs1":
+            if BSCSUpdate==0:
+                ret.append(u"bs")
+                BSCSUpdate=1
+        elif bctype == "cs2" or bctype == u"cs2":
+            if BSCSUpdate==0:
+                ret.append(u"bs")
+                BSCSUpdate=1
+        elif bctype == "bs" or bctype == u"bs":
+            if BSCSUpdate==0:
+                ret.append(u"bs")
+                BSCSUpdate=1
+        else:
+            ret.append(bctype)
+    return ret