fix mp4 vfr.

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

diff --git a/rec10/trunk/src/ts2epg.py b/rec10/trunk/src/ts2epg.py
index 88aca5b..4c59cb9 100644 (file)
--- a/rec10/trunk/src/ts2epg.py
+++ b/rec10/trunk/src/ts2epg.py
@@ -10,40 +10,38 @@ import time
 import chdb
 import configreader
 import tv2ts
+import recdblist
 
 def write(pout, ch):
     """
     tsを取得してepgの入ったxmlとして書き出す
     """
-    print "ts2epg処理"
-    bctype = chdb.chsearch(ch)['bctype']
-    print ch + ":" + bctype
     timet = "90"
-    if re.search(u'cs', bctype):
-        mode = "/CS"
+    if re.search(u'CS', ch):
         timet = "180"
-    elif re.search(u'bs', bctype):
+    elif len(ch)>2:
+        timet = "240"
+    write_time(pout, ch ,timet)
+def write_time(pout, ch ,times):
+    """
+    指定された時間分tsを取得してepgの入ったxmlとして書き出す
+    """
+    recdblist.printutf8(u"Ts-EPG XML書き出し処理開始")
+    recdblist.printutf8(u"CH:"+ch)
+    timet = times
+    if re.search(u'CS', ch):
+        mode = "/CS"
+    elif len(ch)>2:
         mode = "/BS"
-        timet = "180"
     else:
         mode = chdb.bctypesearch(u'te' + ch)['ontv']
     epgdump = configreader.getpath("epgdump")
     if os.access(pout + ".ts", os.F_OK):
         os.remove(pout + ".ts")
     time.sleep(10)
-    print type(ch)
-    print ch
     tv2ts.tv2tsmix(pout + ".ts", ch, timet)
-    t = 0
-    while not os.access(pout + ".ts", os.F_OK):
-        time.sleep(10)
-        tv2ts.tv2tsmix(pout + ".ts", ch, timet)
-        t = t + 1
-        if t > 10:
-            break
     exe = "export LANG=ja_JP.UTF-8 && nice -n 15 " + epgdump + " " + mode + " " + pout + ".ts " + pout
-    print exe
+    recdblist.printutf8(exe)
     os.system(exe)
     time.sleep(10)
-