add tsid channel information for complete BS support.

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

diff --git a/rec10/trunk/src/auto_process.py b/rec10/trunk/src/auto_process.py
index f8c5ac5..5523768 100644 (file)
--- a/rec10/trunk/src/auto_process.py
+++ b/rec10/trunk/src/auto_process.py
@@ -72,7 +72,7 @@ def autoCheck(path):
                 dir = os.path.split(fn)[0]\r
                 file = os.path.split(fn)[1]\r
                 title = os.path.splitext(file)[0]\r
-                title = unicode(title,'utf-8')\r
+                title = unicode(title,'utf-8',errors='replace')\r
                 ext = os.path.splitext(file)[1]\r
                 if ext == ".b25":\r
                     title=title.replace(".ts","")\r
@@ -204,33 +204,39 @@ def killDeadEncode(path):
     for fn in rawlist:\r
         if int(time.time()-os.path.getmtime(fn))>3000:\r
             m2vpath=unicode(fn.replace(".264",".m2v"),'utf-8')\r
-            x264path=fn\r
+            x264path=os.path.split(fn)[1]\r
+            folderpath=unicode(os.path.split(fn)[0],'utf-8')\r
             x264path=re.sub("\\[","[",x264path)\r
             x264path=re.sub("\[","\\\[",x264path)\r
             x264path=re.sub("\\]","]",x264path)\r
             x264path=re.sub("]","\\]",x264path)\r
-            #x264path=x264path.replace("[^\\]\]","\\\]")\r
             tspath=unicode(x264path.replace(".264",".ts"),'utf-8')\r
             m2vpath=unicode(x264path.replace(".264",".m2v"),'utf-8')\r
             x264path=unicode(x264path,'utf-8')\r
             os.environ['LANG']="ja_JP.UTF-8"\r
             ktmp=[]\r
-            ktmp.append(u"ps auxww | grep \""+x264path+u"\" | egrep -v grep | egrep -v \"sh -c\" | grep x264 | awk '{print $2}'")\r
-            ktmp.append(u"ps auxww | grep \""+tspath+u"\" | egrep -v grep | egrep -v \"sh -c\" | grep mencoder | awk '{print $2}'")\r
-            ktmp.append(u"ps auxww | grep \""+m2vpath+u"\" | egrep -v grep | egrep -v \"sh -c\" | grep ffmpeg | awk '{print $2}'")\r
+            ktmp.append(u"ps auxww | grep \""+folderpath+"\" | grep \""+x264path+u"\" | egrep -v grep | egrep -v \"sh -c\" | grep x264 | awk '{print $2}'")\r
+            ktmp.append(u"ps auxww | grep \""+folderpath+"\" | grep \""+tspath+u"\" | egrep -v grep | egrep -v \"sh -c\" | grep mencoder | awk '{print $2}'")\r
+            ktmp.append(u"ps auxww | grep \""+folderpath+"\" | grep \""+m2vpath+u"\" | egrep -v grep | egrep -v \"sh -c\" | grep ffmpeg | awk '{print $2}'")\r
             recdblist.printutf8(u"エンコード処理異常終了タスク終了")\r
             for istr in ktmp:\r
                 recdblist.printutf8(istr)\r
                 ktmt=commands.getoutput(istr.encode('utf-8'))\r
-            if len(ktmt)>0:\r
-                ktmt=ktmt[0]\r
-            try:\r
-                if int(ktmt)>0:\r
-                    ktmp=u"kill -9 `"+istr+u"`"\r
-                    recdblist.printutf8(ktmp)\r
-                    os.system(ktmp.encode('utf-8'))\r
-            except:\r
-                ""\r
+                #print ktmt\r
+                #print len(ktmt)\r
+                if len(ktmt)>0:\r
+                    #print ktmt\r
+                    if len(ktmt[0])>0:\r
+                        ktmt=ktmt[0]\r
+                    #print ktmt\r
+                try:\r
+                    if int(ktmt)>0:\r
+                        ktmp=u"kill -9 `"+istr+u"`"\r
+                        recdblist.printutf8(ktmp)\r
+                        #print ktmp\r
+                        os.system(ktmp.encode('utf-8'))\r
+                except:\r
+                    ""\r
 def deleteTmpFile(path,title,ext):\r
     level= 0##0:b25 1:ts(del tsmix and ts.b25) 5:x264(del 2 and so on) 10:mp4/mkv\r
     smsize= 0\r