implement caption/audio 0 byte error auto skip system.

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

diff --git a/rec10/trunk/src/readme.txt b/rec10/trunk/src/readme.txt
index f463cf9..590bf0d 100644 (file)
--- a/rec10/trunk/src/readme.txt
+++ b/rec10/trunk/src/readme.txt
@@ -1,7 +1,7 @@
 ###########################################
 #     Rec10 for PT1                       #
-#                          Ver.0.9.4      #
-# 2010/04/02    Yukikaze                 #
+#                          Ver.0.9.5      #
+# 2010/05/02    Yukikaze                 #
 #  Copyright (C) 2009-2010 Yukikaze      #
 ###########################################
 
@@ -68,6 +68,9 @@ yukikaze.jp@gmail.com
 [History]
 0.9.5
 b25自動削除機能の改善
+自動仕分け機能のアップデート
+Caption2Assやaac取り出しがうまくいかないときの自動復帰処理の実装
+
 10/04/02 0.9.4 release
 バグ修正
 インストーラーの大幅な改善

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index 21b7345..ff66102 100644 (file)
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -223,11 +223,14 @@ def addAudio(pts,pmp4,opt):#オプションに応じた音声の追加を行う
         addmp4(paac1, pmp4, e1a)\r
 def execmp4box(pin,pout,cmd):\r
     title=os.path.splitext(os.path.split(pin)[1])[0]\r
-    ptin=os.path.join(os.path.dirname(pin),base64.b16encode(title.encode('utf-8'))+".264")\r
+    nt=base64.b16encode(title.encode('utf-8'))\r
+    if len(nt)>200:\r
+        nt=nt[:180]\r
+    ptin=os.path.join(os.path.dirname(pin),nt+".264")\r
     recdblist.printutf8(ptin)\r
     shutil.move(pin,ptin)\r
     time.sleep(10)\r
-    ptout=os.path.join(os.path.dirname(pout),base64.b16encode(title.encode('utf-8'))+".mp4")\r
+    ptout=os.path.join(os.path.dirname(pout),nt+".mp4")\r
     cmdn=string.replace(cmd,pin,ptin)\r
     cmdn=string.replace(cmdn,pout,ptout)\r
     recdblist.printutf8(cmdn)\r
@@ -246,9 +249,12 @@ def execmp4box(pin,pout,cmd):
 def addmp4(padd,pout,cmd):#without video\r
     title=os.path.splitext(os.path.split(padd)[1])[0]\r
     ext=os.path.splitext(os.path.split(padd)[1])[1]\r
-    ptadd=os.path.join(os.path.dirname(padd),base64.b16encode(title.encode('utf-8'))+ext)\r
-    ptoutb=os.path.join(os.path.dirname(pout),base64.b16encode(title.encode('utf-8'))+"_b.mp4")\r
-    ptout=os.path.join(os.path.dirname(pout),base64.b16encode(title.encode('utf-8'))+".mp4")\r
+    nt=base64.b16encode(title.encode('utf-8'))\r
+    if len(nt)>200:\r
+        nt=nt[:180]\r
+    ptadd=os.path.join(os.path.dirname(padd),nt+ext)\r
+    ptoutb=os.path.join(os.path.dirname(pout),nt+"_b.mp4")\r
+    ptout=os.path.join(os.path.dirname(pout),nt+".mp4")\r
     shutil.move(padd,ptadd)\r
     if os.path.isfile(pout):\r
         shutil.move(pout,ptoutb)\r