implement 0.9.10

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@779 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/rec10/trunk/src/chdb.py b/rec10/trunk/src/chdb.py
index 4a4852f..1b76b34 100644 (file)
--- a/rec10/trunk/src/chdb.py
+++ b/rec10/trunk/src/chdb.py
@@ -62,10 +62,6 @@ def update():
             if BSupdate == 0:
                 ret.append(u"bs")
                 BSupdate = 1
-        elif bctype == "hu" or bctype == u"hu":
-            if HUupdate == 0:
-                ret.append(u"hu")
-                HUupdate = 1
         else:
             ret.append(bctype)
     return ret
\ No newline at end of file

diff --git a/rec10/trunk/src/scan_ch.py b/rec10/trunk/src/scan_ch.py
index cc8aedb..5ec6685 100644 (file)
--- a/rec10/trunk/src/scan_ch.py
+++ b/rec10/trunk/src/scan_ch.py
@@ -25,36 +25,36 @@ def searchCh():
     for i in xrange(100,240):
         recdblist.printuft8ex(u"チャンネルスキャン:BSデジタル CH "+str(i), 200, 200)
         if checkTs(str(i))>0:
-            addCh(str(i),u"bs","BS")
+            addCh(str(i),u"bs",str(i))
     #スカパーe2!
     #http://www5e.biglobe.ne.jp/~kazu_f/digital-sat/trapon-nsat110.html
     #
     #CS1ネットワーク
     if checkTs("CS2")>0:
-        addCh("CS2","cs1","CS")
+        addCh("CS2","cs1","CS2")
     if checkTs("CS8")>0:
-        addCh("CS8","cs1","CS")
+        addCh("CS8","cs1","CS8")
     if checkTs("CS10")>0:
-        addCh("CS10","cs1","CS")
+        addCh("CS10","cs1","CS10")
     #CS2ネットワーク
     if checkTs("CS4")>0:
-        addCh("CS4","cs2","CS")
+        addCh("CS4","cs2","CS4")
     if checkTs("CS6")>0:
-        addCh("CS6","cs2","CS")
+        addCh("CS6","cs2","CS6")
     if checkTs("CS12")>0:
-        addCh("CS12","cs2","CS")
+        addCh("CS12","cs2","CS12")
     if checkTs("CS14")>0:
-        addCh("CS14","cs2","CS")
+        addCh("CS14","cs2","CS14")
     if checkTs("CS16")>0:
-        addCh("CS16","cs2","CS")
+        addCh("CS16","cs2","CS16")
     if checkTs("CS18")>0:
-        addCh("CS18","cs2","CS")
+        addCh("CS18","cs2","CS18")
     if checkTs("CS20")>0:
-        addCh("CS20","cs2","CS")
+        addCh("CS20","cs2","CS20")
     if checkTs("CS22")>0:
-        addCh("CS22","cs2","CS")
+        addCh("CS22","cs2","CS22")
     if checkTs("CS24")>0:
-        addCh("CS24","cs2","CS")
+        addCh("CS24","cs2","CS24")
 def checkTs(ch):
     tv2ts.tv2b25ts(os.path.join(tmppath,"ch_"+str(ch)+".ts"), ch, "1")
     if os.path.exists(os.path.join(tmppath,"ch_"+str(ch)+".ts")):

diff --git a/rec10/trunk/src/ts2epg.py b/rec10/trunk/src/ts2epg.py
index e222d6e..cdf65ff 100644 (file)
--- a/rec10/trunk/src/ts2epg.py
+++ b/rec10/trunk/src/ts2epg.py
@@ -33,8 +33,8 @@ def writeTime(pout, ch ,times):
     elif len(ch)>2:
         mode = "/BS"
     else:
-        mode = str(chdb.bctypesearch(u'te' + ch)['ch'])
-    epgsearchFromBctypegreader.getPathSetting("epgdump")
+        mode = str(chdb.searchFromBctype(u'te' + ch)['ch'])
+    epgdump=configreader.getPathSetting("epgdump")
     if os.access(pout + ".ts", os.F_OK):
         os.remove(pout + ".ts")
     time.sleep(10)

diff --git a/rec10/trunk/src/tv2ts.py b/rec10/trunk/src/tv2ts.py
index d9cfb75..85ddc8e 100644 (file)
--- a/rec10/trunk/src/tv2ts.py
+++ b/rec10/trunk/src/tv2ts.py
@@ -83,7 +83,7 @@ def tv2b25ts(pout, ch, time):
         doexe = exe + ' ' + ch + ' ' + time + ' \'' + pout + '\''
         recdblist.printutf8(doexe)
         recdblist.addLog(pout, doexe, u"recpt1ログ-コマンド")
-        recdblist.addlog(pout, unicode(commands.getoutput(doexe.encode('utf-8')),'utf-8'), u"recpt1ログ-詳細")
+        recdblist.addLog(pout, unicode(commands.getoutput(doexe.encode('utf-8')),'utf-8'), u"recpt1ログ-詳細")
     except Exception, inst:
         recdblist.addCommonlogEX(u"Error",u"tv2b25ts(tv2ts.py)", str(type(inst)),str(inst))
     if len(ch) > 2:#BS/CSは100とかCS??とかなので3文字以上
@@ -108,7 +108,7 @@ def b252tsmix(pin, pout):
         recdblist.printutf8(doexe)
         txt = unicode(commands.getoutput(doexe.encode('utf-8')),'utf-8')
         recdblist.addLog(pin, doexe, u"b25ログ-コマンド")
-        recdblist.addlog(pin, txt, u"b25ログ-詳細")
+        recdblist.addLog(pin, txt, u"b25ログ-詳細")
 def tsmix2ts(pin, pout, csch):#csch=0ならcsの処理をしない
     doexe = configreader.getPathSetting("tssplitter") + " \""+ pin + "\" \""+ pout + "\" " + str(csch)
     doexe = "nice -n 18 " + doexe