fix b25 auto deleting and auto move error.

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

diff --git a/rec10/trunk/src/checker.py b/rec10/trunk/src/checker.py
index 93d4696..2d5df33 100644 (file)
--- a/rec10/trunk/src/checker.py
+++ b/rec10/trunk/src/checker.py
@@ -10,15 +10,17 @@ def checkB25Decode(b25filepath, decodedfilepath):
     if os.path.isfile(decodedfilepath):##tsファイルが存在している
         dtime = time.time()-os.path.getmtime(decodedfilepath)
         dtime = int(dtime)
-        if dtime > 120:
+        if dtime > 20:
             if (compareFilesize(b25filepath, decodedfilepath, 10) and minimizeCheck(decodedfilepath, 800)):
                 ret = 1
         else:
-            time.sleep(100)
-            if dtime > 120:
+            time.sleep(30)
+            dtime = time.time()-os.path.getmtime(decodedfilepath)
+            dtime = int(dtime)
+            if dtime > 20:
                 if (compareFilesize(b25filepath, decodedfilepath, 10) and minimizeCheck(decodedfilepath, 800)):
                     ret = 1
-    #recdblist.printutf8("delete b25 is " + str(ret))
+    #recdblist.printutf8("deleting b25 is " + str(ret))
     return ret
 def compareFilesize(pathbase, path, percentage):
     """
@@ -36,7 +38,6 @@ def minimizeCheck(filepath, minsize):
     """
     minsize is Megabytes
     """
-    print os.path.getsize(filepath)
     if os.path.getsize(filepath) > minsize * 1000 * 1000:
         return 1
     else:

diff --git a/rec10/trunk/src/chlist_cs.xml b/rec10/trunk/src/chlist_cs.xml
index 9f3ec5a..01593bc 100644 (file)
--- a/rec10/trunk/src/chlist_cs.xml
+++ b/rec10/trunk/src/chlist_cs.xml
@@ -26,7 +26,8 @@
     <channel bctype="cs1" ch="CS6" csch="311" chtxt="axn" ontvcode="1014.ontvjapan.com"/>\r
     <channel bctype="cs1" ch="CS4" csch="312" chtxt="fox" ontvcode="1016.ontvjapan.com"/>\r
     <!--アニメ-->\r
-    <channel bctype="cs1" ch="CS22" csch="330" chtxt="kids" ontvcode="1045.ontvjapan.com"/>\r
+    <!--<channel bctype="cs1" ch="CS22" csch="330" chtxt="kids" ontvcode="1045.ontvjapan.com"/>#Before 2010 April 1-->\r
+    <channel bctype="cs2" ch="CS8" csch="335" chtxt="kids" ontvcode="1045.ontvjapan.com"/>\r
     <channel bctype="cs1" ch="CS20" csch="332" chtxt="animax" ontvcode="1047.ontvjapan.com"/>\r
     <channel bctype="cs1" ch="CS4" csch="334" chtxt="disney" ontvcode="1213.ontvjapan.com"/>\r
     <!--ドキュメンタリー-->\r

diff --git a/rec10/trunk/src/tester.py b/rec10/trunk/src/tester.py
index 4d0c736..ac219fe 100644 (file)
--- a/rec10/trunk/src/tester.py
+++ b/rec10/trunk/src/tester.py
@@ -6,6 +6,7 @@
 import os
 import tv2avi
 import tv2mkv
+import checker
 #import datetime
 #import rec10d
 #import os

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index ddb0182..487e5c7 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -232,15 +232,15 @@ def search_keyword(key):
                             recdb.recreserv(titlet,chtxtt, btimet, etimet,topt)
                     except Exception, inst:
                         print "error occures in search_keyword_auto_jbk"
-                        print type(inst)
-                        print inst
+                        print str(type(inst))
+                        print str(inst)
                 else:
                     try:
                         recdb.add_auto_keyword(chtxtt, titlet, btimet, etimet)
                     except Exception, inst:
                         print "error occures in search_keyword"
-                        print type(inst)
-                        print inst
+                        print str(type(inst))
+                        print str(inst)
 def type_reserve(typetxt,chtxt,title,bt,et,opt):
     btime = bt.strftime("%Y-%m-%d %H:%M:%S")
     etime = et.strftime("%Y-%m-%d %H:%M:%S")
@@ -279,8 +279,8 @@ def type_reserve(typetxt,chtxt,title,bt,et,opt):
                     recdblist.printutf8(u"追いかけ機能実行中: "+title+" : "+titlen+" "+btimen+" "+etimen)
                 except Exception, inst:
                     print "Error happened in Oikake DB"
-                    print type(inst)
-                    print inst
+                    print str(type(inst))
+                    print str(inst)
             else:
                 recdblist.printutf8(u"追いかけ機能エラー：番組データが見付かりません。")
         else:
@@ -464,6 +464,11 @@ def type_decode_que(typetxt,chtxt,title,bt,et,opt):
             if not os.access(recpath + "/" + title + ".ts", os.F_OK):
                 recdb.del_reckey(typetxting, title, chtxt, btime)
                 recdb.rec_reckey(typetxtmiss, title, chtxt, btime, etime, opt)
+            else:
+                ch=checker.checkB25Decode(recpath + "/" + title + ".ts.b25", recpath + "/" + title + ".ts")
+                print ch
+                if ch == 1:
+                    os.remove(recpath + "/" + title + ".ts.b25")
             bt = datetime.datetime.strptime(btime, "%Y-%m-%d %H:%M:%S")
             et = datetime.datetime.strptime(etime, "%Y-%m-%d %H:%M:%S")
             dt = et-bt
@@ -484,8 +489,6 @@ def type_decode_que(typetxt,chtxt,title,bt,et,opt):
                     errtxt=errtxt+inst
                     recdblist.addlog(os.path.join(recpath,title+".ts"), errtxt, "timerec-move(Decode) error")
                 recdb.rec_reckey(recdblist.REC_MOVE_END, title, chtxt, btime, etime, opt)
-            if checker.checkB25Decode(recpath + "/" + title + ".ts.b25", recpath + "/" + title + ".ts") == 1:
-                os.remove(recpath + "/" + title + ".ts.b25")
         else:
             recdb.del_reckey(typetxtnow, title, chtxt, btime)
             bt = bt + datetime.timedelta(seconds=600)
@@ -516,12 +519,18 @@ def type_encode_que(typetxt,chtxt,title,bt,et,opt):
             if re.search("d", opt):
                 pin = recpath + "/" + title + ".m2v"
                 if not os.path.exists(pin) or os.path.getsize(pin)<100*1000:
-                    tv2avi.dualaudio2sep(os.path.join(recpath, title+".ts"),"167")
+                    paac2 = recpath + "/" + title + "_2.aac"
+                    pmp32 = recpath + "/" + title + "_2.mp3"
+                    if not os.path.exists(paac2) and not os.path.exists(pmp32):
+                        tv2avi.dualaudio2sep(os.path.join(recpath, title+".ts"),"167")
                 time.sleep(3)
-            if re.search("5", opt):
+            elif re.search("5", opt):
                 pin = recpath + "/" + title + ".m2v"
                 if not os.path.exists(pin) or os.path.getsize(pin)<100*1000:
-                    tv2avi.pentaaudio2sep(os.path.join(recpath, title+".ts"))
+                    paac2 = recpath + "/" + title + "_2.aac"
+                    pmp32 = recpath + "/" + title + "_2.mp3"
+                    if not os.path.exists(paac2) and not os.path.exists(pmp32):
+                        tv2avi.pentaaudio2sep(os.path.join(recpath, title+".ts"))
                 time.sleep(3)
             pout = recpath + "/" + title + ".mkv"
             recdblist.printutf8(pin)
@@ -537,8 +546,8 @@ def type_encode_que(typetxt,chtxt,title,bt,et,opt):
                 except Exception, inst:
                     errtxt="Error happened in type_encode_que in timerec.\n"
                     errtxt=errtxt+"move mkv/mp4 error.\n"
-                    errtxt=errtxt+type(inst)+"\n"
-                    errtxt=errtxt+inst
+                    errtxt=errtxt+str(type(inst))+"\n"
+                    errtxt=errtxt+str(inst)
                     recdblist.addlog(os.path.join(recpath,title+".ts"), errtxt, "timerec-move(Encode) error")
                 recdb.rec_reckey(recdblist.REC_MOVE_END, title, chtxt, btime, etime, opt)
             recdb.rec_reckey(typetxtfin, title, chtxt, btime, etime, opt)

diff --git a/rec10/trunk/src/tv2avi.py b/rec10/trunk/src/tv2avi.py
index f54ae56..eb08835 100644 (file)
--- a/rec10/trunk/src/tv2avi.py
+++ b/rec10/trunk/src/tv2avi.py
@@ -74,8 +74,8 @@ def b252ts(pout, chtxt, btime, etime, opt):
             pentaaudio2sep(aviin)
     except Exception, inst:
         print "Error happened in b252ts in tv2avi"
-        print type(inst)
-        print inst
+        print str(type(inst))
+        print str(inst)
     status.changeB25Decoding(-1)
 def ts2avi(pin, pout, opt):
     status.changeEncoding(1)