fix rename miss.

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

diff --git a/rec10/trunk/src/tv2ts.py b/rec10/trunk/src/tv2ts.py
index eae9bf5..1a410fa 100644 (file)
--- a/rec10/trunk/src/tv2ts.py
+++ b/rec10/trunk/src/tv2ts.py
@@ -3,9 +3,9 @@
 #import sys # モジュール属性 argv を取得するため
 import commands
 import os
-import shutil
+import os.path
 import time
-import sys
+import traceback
 
 import configreader
 import status
@@ -30,9 +30,7 @@ def tv2ts(pout, ch, csch, time):
     try:
         tv2b25ts(pout + ".b25", ch, time)
     except Exception, inst:
-        print "error occures in tv2ts.py tv2ts"
-        print type(inst)
-        print inst
+        recdblist.addCommonlogEX(u"Error",u"tv2ts(tv2ts.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
     if len(ch) > 2:#BS/CSは100とかCS??とかなので3文字以上
         status.changeBSCSRecording(-1)
     else:
@@ -76,7 +74,7 @@ def b252ts(pout, ch, csch):
         except:
             ""
 def tv2b25ts(pout, ch, time):
-    exe = configreader.getpath('recpt1')
+    exe = configreader.getConfPath('recpt1')
     if len(ch) > 2:#BS/CSは100とかCS??とかなので3文字以上
         status.changeBSCSRecording(1)
     else:
@@ -84,68 +82,41 @@ def tv2b25ts(pout, ch, time):
     try:
         doexe = exe + ' ' + ch + ' ' + time + ' \'' + pout + '\''
         recdblist.printutf8(doexe)
-        txt=u"####recpt1-log####\n"
-        txt = txt + unicode(commands.getoutput(doexe.encode('utf-8')),'utf-8')
-        logo=pout.replace(".ts.b25",".log")
-        f=open(logo,'w')
-        f.write(txt.encode('utf-8'))
-        f.close()
+        recdblist.addLog(pout, doexe, u"recpt1ログ-コマンド")
+        recdblist.addLog(pout, unicode(commands.getoutput(doexe.encode('utf-8')),'utf-8'), u"recpt1ログ-詳細")
     except Exception, inst:
-        print "error occures in tv2ts.py tv2b25ts"
-        print type(inst)
-        print inst
+        recdblist.addCommonlogEX(u"Error",u"tv2b25ts(tv2ts.py)", str(type(inst)),str(inst))
     if len(ch) > 2:#BS/CSは100とかCS??とかなので3文字以上
         status.changeBSCSRecording(-1)
     else:
         status.changeTERecording(-1)
 def tv2b25ts_b25(pout, ch, time):
-    exe = configreader.getpath('recpt1')
+    exe = configreader.getConfPath('recpt1')
     doexe = exe + ' --b25 ' + ch + ' ' + time + ' \'' + pout + '\''
     os.system(doexe)
 def b252tsmix(pin, pout):
-    if not (os.path.exists(pout) and os.path.getsize(pin)==os.path.getsize(pout)):
+    if not (os.path.exists(pout) and os.path.getsize(pin)>os.path.getsize(pout)*0.95 and os.path.getsize(pin)<os.path.getsize(pout)*1.05):
         exe=""
-        if configreader.getpath('b25_remote')=="1":
+        if configreader.getConfPath('b25_remote')=="1":
             try:
-                exe = configreader.getpath('b25_env')+" && "
+                exe = configreader.getConfPath('b25_env')+" && "
             except:
-                recdblist.printutf8(u"b25_remoteがオンになっていますが、b25_envが設定されていないかコメントアウトされています。")
-        exe = exe + "nice -n 17 " + configreader.getpath('b25')
+                inst=u"b25_remoteがオンになっていますが、b25_envが設定されていないかコメントアウトされています。"
+                recdblist.addCommonlogEX(u"Error",u"b252tsmix(tv2ts.py)", "",inst)
+        exe = exe + "nice -n 17 " + configreader.getConfPath('b25')
         doexe = exe + u' \"' + pin + u'\" \"' + pout + u'\"'
         recdblist.printutf8(doexe)
-        sys.stdout.flush()
-        logo=pin.replace(".ts.b25",".log")
         txt = unicode(commands.getoutput(doexe.encode('utf-8')),'utf-8')
-        s=len(txt)
-        stxt=""
-        if s>1000:
-            s=s-1000
-            stxt=txt[s:]
-        else:
-            stxt=txt
-        s=stxt.find("\n")
-        if s>0:
-            s=s+len("\n")
-            stxt=stxt[s:]
-        txt = "\n####b25-log####\n"+stxt
-        f=open(logo,'a')
-        f.write(txt.encode('utf-8'))
-        f.close()
+        recdblist.addLog(pin, doexe, u"b25ログ-コマンド")
+        recdblist.addLog(pin, txt, u"b25ログ-詳細")
 def tsmix2ts(pin, pout, csch):#csch=0ならcsの処理をしない
-    """if csch==0:
-        shutil.move(pin,pout)
-    else:"""
-    doexe = configreader.getpath("tssplitter") + " \""+ pin + "\" \""+ pout + "\" " + str(csch)
+    doexe = configreader.getConfPath("tssplitter") + " \""+ pin + "\" \""+ pout + "\" " + str(csch)
     doexe = "nice -n 18 " + doexe
-    logo=pin.replace(".ts.tsmix",".log")
     os.environ['LANG']="ja_JP.UTF-8"
     txt = unicode(commands.getoutput(doexe.encode('utf-8')),'utf-8')
-    stxt=txt
-    txt = "\n####tssplit-log####\nCommand:"+doexe+"\nlog:\n"+stxt
-    f=open(logo,'a')
-    f.write(txt.encode('utf-8'))
-    f.close()
+    recdblist.addLog(pin, doexe, u"TsSplitログ-コマンド")
+    recdblist.addLog(pin, txt, u"TsSplitログ-詳細")
     time.sleep(1)
-    if os.access(pout, os.F_OK):
+    if os.access(pout, os.F_OK) and os.path.getsize(pout)>10*1000*1000:
         os.remove(pin)