fix some bugs.

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

diff --git a/rec10/trunk/src/ts2epg.py b/rec10/trunk/src/ts2epg.py
index 31b2054..545b282 100644 (file)
--- a/rec10/trunk/src/ts2epg.py
+++ b/rec10/trunk/src/ts2epg.py
@@ -21,7 +21,7 @@ def write(pout, ch):
     timet = "90"
     if re.search(u'cs', bctype):
         mode = "/CS"
-        timet = "150"
+        timet = "180"
     elif re.search(u'bs', bctype):
         mode = "/BS"
         timet = "150"
@@ -34,13 +34,6 @@ def write(pout, ch):
     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 > 3:
-    #        break
     exe = "export LANG=ja_JP.UTF-8 && nice -n 15 " + epgdump + " " + mode + " " + pout + ".ts " + pout
     print exe
     os.system(exe)

diff --git a/rec10/trunk/src/tv2ts.py b/rec10/trunk/src/tv2ts.py
index 4a94981..db86d50 100644 (file)
--- a/rec10/trunk/src/tv2ts.py
+++ b/rec10/trunk/src/tv2ts.py
@@ -21,7 +21,6 @@ def tv2tsmix(pout, ch, time):
     else:
         status.changeTERecording(-1)
     b252tsmix(pout + ".b25", pout)
-    #os.remove(pout+".b25")
     if os.access(pout, os.F_OK):
         try:
             os.remove(pout + ".b25")
@@ -33,20 +32,15 @@ def tv2ts(pout, ch, csch, time):
     path = tempt[0]
     if len(ch) > 2:#BS/CSは100とかCS??とかなので3文字以上
         status.changeBSCSRecording(1)
-        #status.setBSCSRecording(status.getBSCSRecording() + 1)
     else:
-        #status.setTERecording(status.getTERecording() + 1)
         status.changeTERecording(1)
     tv2b25ts(pout + ".b25", ch, time)
     if len(ch) > 2:#BS/CSは100とかCS??とかなので3文字以上
-        #status.setBSCSRecording(status.getBSCSRecording()-1)
         status.changeBSCSRecording(-1)
     else:
-        #status.setTERecording(status.getTERecording()-1)
         status.changeTERecording(-1)
     b252tsmix(pout + ".b25", pout + ".tsmix")
     tsmix2ts(pout + ".tsmix", pout, csch)
-    #os.remove(path+"/"+t+"."+temp[1])
     if os.access(pout, os.F_OK):
         try:
             os.remove(path + "/" + t + ext)
@@ -54,7 +48,6 @@ def tv2ts(pout, ch, csch, time):
             ""
 def b252ts(pout, ch, csch):
     ext = os.path.splitext(pout)[1]#ext=".なんたら"
-    #t=hashlib.md5(pout).hexdigest()
     tempt = os.path.split(pout)
     path = tempt[0]
     b252tsmix(pout + ".b25", pout + ".tsmix")