fix caption import error.

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

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index e13037d..2275dfc 100644 (file)
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -4,17 +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 tv2audio\r
 \r
 def ts2mp4(pin, pout, opt):\r
@@ -57,13 +59,11 @@ def raw2mp4(pin,pout,opt):
     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
@@ -95,9 +95,7 @@ def mkv2mp4(pin,pout):
     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
@@ -118,10 +116,11 @@ def addCaption(pts,pmp4):##字幕の追加を試みる。
             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.getsize(pincap)>1000:\r
-            exe = configreader.getpath("mp4box")\r
-            e1s=exe +u" -add \""+pincap+"\" \""+pmp4+"\""\r
-            addmp4(pincap,pmp4,e1s)\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
@@ -197,9 +196,14 @@ def addmp4(padd,pout,cmd):#without video
     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
@@ -209,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