OSDN Git Service

fix caption import error.
[rec10/rec10-git.git] / rec10 / trunk / src / tv2mp4.py
index 96a14da..2275dfc 100644 (file)
@@ -4,18 +4,19 @@
 # Copyright (C) 2009-2010 Yukikaze\r
 import commands\r
 import shutil\r
-import tv2avi\r
+import auto_process\r
 import os\r
 import re\r
 import os.path\r
 import string\r
 import base64\r
 import time\r
+import subprocess\r
+\r
+import tv2avi\r
 import recdblist\r
 import configreader\r
 import status\r
-import subprocess\r
-import signal\r
 import tv2audio\r
 \r
 def ts2mp4(pin, pout, opt):\r
@@ -53,17 +54,16 @@ def raw2mp4(pin,pout,opt):
     execmp4box(pin, pout, e1)\r
     addAudio(pints, pout, opt)\r
     addCaption(pints, pout)\r
-    recdblist.addlog(pout, txt, "mp4box-log")\r
+    #recdblist.addlog(pout, txt, "mp4boxログ-コマンド")\r
+    #recdblist.addlog(pout, txt, "mp4boxログ-詳細")\r
     if status.getSettings_auto_del_tmp()==1:\r
         if os.path.exists(pout):\r
             if re.search(opt,"MW8") or re.search(opt,"MW9"):\r
-                if os.path.getsize(pout)>50*1000*1000:\r
-                    deltitle(dir,title)\r
+                auto_process.deltmpfile(dir, title, ".mp4")\r
             elif re.search(opt,"8") or re.search(opt,"9"):\r
                 ""\r
             else:\r
-                if os.path.getsize(pout)>100*1000*1000:\r
-                    deltitle(dir,title)\r
+                auto_process.deltmpfile(dir, title, ".mp4")\r
 def mkv2mp4(pin,pout):\r
     exeb = configreader.getpath(u"mkvextract")\r
     exe = configreader.getpath(u"mp4Box")\r
@@ -90,14 +90,12 @@ def mkv2mp4(pin,pout):
         txt=txt+execcomd(exe3)+"\n"\r
     except:\r
         ""\r
-    recdblist.addlog(pin, txt, "MKV2MP4-log")\r
+    recdblist.addlog(pin, txt, u"MKV2MP4-log")\r
     txt = "\n####MKV2MP4-log####\n"+txt\r
     time.sleep(10)\r
     if status.getSettings_auto_del_tmp()==1:\r
         if os.path.exists(pout):\r
-            if os.path.getsize(pout)>100*1000*1000:\r
-                deltitle(dir,title)\r
-\r
+            auto_process.deltmpfile(dir, title, ".mp4")\r
 def addCaption(pts,pmp4):##字幕の追加を試みる。\r
     wineexe=configreader.getpath("wine")\r
     pincap=pts.replace(".ts",".srt")\r
@@ -108,17 +106,21 @@ def addCaption(pts,pmp4):##字幕の追加を試みる。
     if os.path.isfile(cap2ass):\r
         e0=wineexe+u" "+cap2ass+u" -format srt \"Z:\\"+pts+"\" \"Z:\\"+pincap+"\""\r
         recdblist.printutf8(e0)\r
-        p0=subprocess.Popen(e0,shell=True)\r
-        time.sleep(120)\r
-        if p0.poll==-1:#実行中\r
-            if os.path.getsize(pincap)<1000:#2mで1kb以下の場合自動で終了\r
-                os.kill(p0.pid,signal.SIGKILL)\r
-            else:\r
-                os.waitpid(p0.pid, 0)\r
-    if os.path.getsize(pincap)>1000:\r
-        exe = configreader.getpath("mp4box")\r
-        e1s=exe +u" -add \""+pincap+"\" \""+pout+"\""\r
-        addmp4(pincap,pmp4,e1s)\r
+        p0=subprocess.Popen(e0,shell=True,stdout=subprocess.PIPE)\r
+        time.sleep(300)\r
+        if p0.poll==None:#実行中\r
+            #if os.path.getsize(pincap)<1000:#2mで1kb以下の場合自動で終了\r
+             #   os.kill(p0.pid,signal.SIGKILL)\r
+            #else:\r
+            os.waitpid(p0.pid, 0)\r
+            logt=unicode(p0.communicate()[0], "UTF-8")\r
+            recdblist.addlog(pts,e0, u"Captionログ-コマンド")\r
+            recdblist.addlog(pts,logt, u"Captionログ-詳細")\r
+        if os.path.exists(pincap):\r
+            if os.path.getsize(pincap)>1000:\r
+                exe = configreader.getpath("mp4box")\r
+                e1s=exe +u" -add \""+pincap+"\" \""+pmp4+"\""\r
+                addmp4(pincap,pmp4,e1s)\r
 def addAudio(pts,pmp4,opt):#オプションに応じた音声の追加を行う\r
     exe = configreader.getpath("mp4box")\r
     if re.search("d",opt) or re.search("5",opt):#二カ国語放送/5.1ch放送の場合\r
@@ -160,7 +162,8 @@ def execmp4box(pin,pout,cmd):
         txt= "error occures in execmp4box\n"\r
         txt=txt+ str(type(inst))+"\n"\r
         txt=txt+str(inst)\r
-    recdblist.addlog(pin, txt, "MP4Box-log")\r
+    recdblist.addlog(pin, cmdn, u"MP4Boxログ-コマンド")\r
+    recdblist.addlog(pin, txt, u"MP4Boxログ-詳細")\r
     time.sleep(5)\r
     shutil.move(ptin,pin)\r
     shutil.move(ptout,pout)\r
@@ -190,11 +193,17 @@ def addmp4(padd,pout,cmd):#without video
         txt= "error occures in addmp4\n"\r
         txt=txt+ str(type(inst))+"\n"\r
         txt=txt+str(inst)\r
-    recdblist.addlog(pout, txt, "MP4Box-log-add")\r
+    recdblist.addlog(pout, cmdn, u"MP4Box追加ログ-コマンド")\r
+    recdblist.addlog(pout, txt, u"MP4Box追加ログ-詳細")\r
     time.sleep(5)\r
-    os.remove(ptoutb)\r
     shutil.move(ptadd,padd)\r
-    shutil.move(ptout,pout)\r
+    if os.path.exists(ptout):\r
+        shutil.move(ptout,pout)\r
+        os.remove(ptoutb)\r
+    else:\r
+        txtt=padd+u"のインポートエラー"\r
+        recdblist.addlog(pout, txtt, u"MP4Box追加ログ-コマンド")\r
+        shutil.move(ptoutb,pout)\r
     time.sleep(5)\r
 def execcomd(cmd):\r
     txt=""\r
@@ -204,31 +213,4 @@ def execcomd(cmd):
         txt=txt+unicode(txt2,"utf-8")+"\n"\r
     except:\r
         ""\r
-    return txt\r
-\r
-def deltitle(path,title):\r
-    dp=[]\r
-    dp.append(os.path.join(path,title+".avi"))\r
-    dp.append(os.path.join(path,title+".264"))\r
-    dp.append(os.path.join(path,title+".120.avi"))\r
-    dp.append(os.path.join(path,title+".noodml.avi"))\r
-    dp.append(os.path.join(path,title+".aac"))\r
-    dp.append(os.path.join(path,title+".m2v"))\r
-    dp.append(os.path.join(path,title+"_1.aac"))\r
-    dp.append(os.path.join(path,title+"_2.aac"))\r
-    dp.append(os.path.join(path,title+"_1.mp3"))\r
-    dp.append(os.path.join(path,title+"_2.mp3"))\r
-    dp.append(os.path.join(path,title+".srt"))\r
-    if configreader.getenv("remove_ts")=="1":\r
-        dp.append(os.path.join(path,title+".ts"))\r
-    if os.path.exists(os.path.join(path,title+".ts"))and os.path.exists(os.path.join(path,title+".ts.b25")):\r
-        if os.path.getsize(os.path.join(path,title+".ts"))*10>os.path.getsize(os.path.join(path,title+".ts.b25")):\r
-            if os.path.getsize(os.path.join(path,title+".ts"))>1000*1000*100:\r
-                dp.append(os.path.join(path,title+".ts.b25"))\r
-    if os.path.exists(os.path.join(path,title+".mp4")):\r
-        if os.path.getsize(os.path.join(path,title+".mp4"))>1000*1000*10:\r
-            for ip in dp:\r
-                try:\r
-                    os.remove(ip)\r
-                except:\r
-                    ""\r
+    return txt
\ No newline at end of file