implement traceback.

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

diff --git a/rec10/trunk/src/tv2audio.py b/rec10/trunk/src/tv2audio.py
index dafc58e..3eb53cd 100644 (file)
--- a/rec10/trunk/src/tv2audio.py
+++ b/rec10/trunk/src/tv2audio.py
@@ -69,8 +69,39 @@ def ts2single_audio(pts):
             except:
                 ""
             recdblist.Commonlogex("[Error]", "ffmpeg aac getting. (ts2single_audio@tv2audio.py)", u"AAC demux error(ffmpeg)", "", verbose_level=200, log_level=200)
-            os.kill(p0.pid,signal.SIGKILL)
-            os.remove(paac)
+            try:
+                os.kill(p0.pid,signal.SIGKILL)
+            except:
+                ""
+            ts2single_mp3_ffmpeg(pts)
+            if not os.path.exists(pts.replace(".ts",".mp3")):
+                ts2single_fp_BonTsDemux(pts)
+    else:
+        if os.path.exists(paac):
+            if os.path.getsize(paac)<1000:#1mで1kb以下の場合自動で終了
+                try:
+                    logt=unicode(p0.communicate()[0], "UTF-8")
+                    recdblist.addlog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
+                    recdblist.addlog(pts,logt, "FFmpeg音声取り出しログ-詳細")
+                except:
+                    ""
+                recdblist.Commonlogex("[Error]", "ffmpeg aac getting. (ts2single_audio@tv2audio.py)", u"AAC demux error(ffmpeg)", "", verbose_level=200, log_level=200)
+                os.remove(paac)
+                ts2single_mp3_ffmpeg(pts)
+                if not os.path.exists(pts.replace(".ts",".mp3")):
+                    ts2single_fp_BonTsDemux(pts)
+            else:
+                logt=unicode(p0.communicate()[0], "UTF-8")
+                recdblist.addlog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
+                recdblist.addlog(pts,logt, "FFmpeg音声取り出しログ-詳細")
+        else:
+            try:
+                logt=unicode(p0.communicate()[0], "UTF-8")
+                recdblist.addlog(pts,e0, "FFmpeg音声取り出しログ-コマンド")
+                recdblist.addlog(pts,logt, "FFmpeg音声取り出しログ-詳細")
+            except:
+                ""
+            recdblist.Commonlogex("[Error]", "ffmpeg aac getting. (ts2single_audio@tv2audio.py)", u"AAC demux error(ffmpeg)", "", verbose_level=200, log_level=200)
             ts2single_mp3_ffmpeg(pts)
             if not os.path.exists(pts.replace(".ts",".mp3")):
                 ts2single_fp_BonTsDemux(pts)
@@ -91,7 +122,7 @@ def ts2singlewav(pts):
 def ts2single_mp3_ffmpeg(pts):
     pmp3=pts.replace(".ts",".mp3")
     ffmpeg=configreader.getpath("ffmpeg")
-    e0=ffmpeg+" -i \""+pts+"\" -y -vn -ab 128 \""+pmp3+"\""
+    e0=ffmpeg+" -i \""+pts+"\" -y -vn -ab 128k \""+pmp3+"\""
     p0=subprocess.Popen(e0,shell=True)
     os.waitpid(p0.pid, 0)
     try: