OSDN Git Service

fix remove error.
[rec10/rec10-git.git] / rec10 / trunk / src / timerec.py
index 85775ec..5df5793 100644 (file)
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
-# Copyright (C) 2009 Yukikaze
+# Copyright (C) 2009-2010 Yukikaze
 import datetime
 import os
 import os.path
@@ -9,7 +9,6 @@ import re
 import sys
 import time
 import shutil
-import traceback
 
 import auto_rec
 import auto_process
@@ -23,6 +22,7 @@ import status
 import tv2avi
 import tv2mkv
 import tv2mp4
+import install
 import recdblist
 recpath = configreader.getpath('recpath')
 movepath = configreader.getpath('move_destpath')
@@ -32,21 +32,25 @@ def task():
     数分毎に実行されるタスク処理
     予定によって子プロセスを生成し処理する。
     """
+    try:
+        if rec10d.rec10db.select_installed_in_status()==0 or rec10d.rec10db.select_version_in_status()<recdblist.version:
+            install.install()
+    except:
+        install.install()
     recdb.delete_old("24")
     recdb.delete_old_auto_bayes("1")
     recdb.delete_old_auto_keyword("1")
-    tasks = recdb.getnow("2")
+    tasks = recdb.getnow("3")
     inum = recdb.countRecNow_minutes("10")
-    #pyprint traceback.format_exc()
     recdblist.printutf8(u"rec10処理開始"+ datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
     recdblist.printutf8(u"直近録画予約件数:" + str(inum) + u"BS/CS録画中件数:" + str(status.getBSCSRecording()) + u"TE録画中件数:" + str(status.getTERecording()) )
     encodenum=0
     b25num=0
     dnow=datetime.datetime.now()
-    if dnow.hour==12 and dnow.minute<5 :
+    if dnow.minute%10<5:
         pid = os.fork()
         if pid != 0:
-            time.sleep(1)
+            ""
         else:
             for k in recdb.get_key():
                 search_keyword(k)
@@ -54,15 +58,16 @@ def task():
     else:
         pid = os.fork()
         if pid!=0:
-            time.sleep(1)
+            ""
         else:
+            time.sleep(10)
             auto_process.auto_check(recpath)
             sys.exit()
     update = chdb.update()
     if len(update) > 0:
         pid = os.fork()
         if pid != 0:
-            time.sleep(1)
+            ""
         else:
             i = 0
             for bctype in update:
@@ -83,9 +88,17 @@ def task():
                     i = i + 1
                 if i > 0:
                     break
+            time.sleep(5)
+            auto_process.update_all_timeline_epg()
+            sys.exit()
+    else:
+        pid = os.fork()
+        if pid != 0:
+            ""
+        else:
+            auto_process.update_all_timeline_epg()
             sys.exit()
     for task in tasks:
-        #recdblist.printutf8(task)
         typetxt = task["type"]
         try:
             chtxt = task['chtxt']
@@ -169,9 +182,22 @@ def task():
                 if pid > 0:#親プロセスの場合
                     ""
                 else:
+                    makeMP4=0
+                    try:
+                        if configreader.getenv("make_mp4")==1:
+                            makeMP4=1
+                    except:
+                        ""
+                    if re.search("m", opt):
+                        makeMP4=0
+                    if re.search("4", opt):
+                        makeMP4=1
                     recdb.del_reckey(recdblist.REC_AVI_TO_MKV, title, chtxt, btime)
                     recdb.rec_reckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime, etime, opt)
-                    tv2mkv.avi2mkv(os.path.join(recpath,title+".avi"),os.path.join(recpath,title+".mkv"))
+                    if makeMP4==1:
+                        tv2mp4.raw2mp4(os.path.join(recpath,title+".264"),os.path.join(recpath,title+".mp4"),opt)
+                    else:
+                        tv2mkv.raw2mkv(os.path.join(recpath,title+".264"),os.path.join(recpath,title+".mkv"),opt)
                     recdb.del_reckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime)
                     sys.exit()
         elif task["type"] == recdblist.REC_AVI_TO_MP4:
@@ -180,9 +206,23 @@ def task():
                 if pid > 0:#親プロセスの場合
                     ""
                 else:
+                    makeMP4=0
+                    try:
+                        if configreader.getenv("make_mp4")==1:
+                            makeMP4=1
+                    except:
+                        ""
+                    if re.search("m", opt):
+                        makeMP4=0
+                    if re.search("4", opt):
+                        makeMP4=1
                     recdb.del_reckey(recdblist.REC_AVI_TO_MP4, title, chtxt, btime)
                     recdb.rec_reckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime, etime, opt)
-                    tv2mp4.avi2mp4(os.path.join(recpath,title+".avi"),os.path.join(recpath,title+".mp4"))
+                    if makeMP4==1:
+                        tv2mp4.ts2mp4(pin, pout, opt)
+                        tv2mp4.raw2mp4(os.path.join(recpath,title+".264"),os.path.join(recpath,title+".mp4"),opt)
+                    else:
+                        tv2mkv.raw2mkv(os.path.join(recpath,title+".264"),os.path.join(recpath,title+".mkv"),opt)
                     recdb.del_reckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime)
                     sys.exit()
         elif task["type"] == recdblist.REC_MKV_TO_MP4:
@@ -191,116 +231,11 @@ def task():
                 if pid > 0:#親プロセスの場合
                     ""
                 else:
-                    recdb.del_reckey(recdblist.REC_AVI_TO_MP4, title, chtxt, btime)
+                    recdb.del_reckey(recdblist.REC_MKV_TO_MP4, title, chtxt, btime)
                     recdb.rec_reckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime, etime, opt)
                     tv2mp4.mkv2mp4(os.path.join(recpath,title+".mkv"),os.path.join(recpath,title+".mp4"))
                     recdb.del_reckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime)
                     sys.exit()
-        elif task["type"] == recdblist.REC_AUTO_KEYWORD:#"key,"+chtxt+","+keyword+","+btime+","+deltatime+","+opt
-            deltatime = "24"
-            if dt < 90 * 60:
-                recdatum = epgdb.searchtime_auto(title, btime, deltatime, chtxt)
-                for recdata in recdatum:
-                    if recdata[1] != "":
-                        chtxtt = recdata[0]
-                        titlet = recdata[1]
-                        btimet = recdata[2]
-                        etimet = recdata[3]
-                        exp = recdata[4]
-                        longexp = recdata[5]
-                        category=recdata[6]
-                        btt = datetime.datetime.strptime(btimet, "%Y-%m-%d %H:%M:%S")
-                        ett = datetime.datetime.strptime(etimet, "%Y-%m-%d %H:%M:%S")
-                        btimet = btt.strftime("%Y-%m-%d %H:%M:%S")
-                        etimet = ett.strftime("%Y-%m-%d %H:%M:%S")
-                        try:
-                            recdb.rec_reckey(recdblist.REC_AUTO_SUGGEST_REC, titlet, chtxtt, btimet, etimet, opt)
-                        except Exception, inst:
-                            print "Error occures in REC_AUTO_KEYWORD(1)"
-                            print type(inst)
-                            print inst
-                dd = datetime.timedelta(days=1)
-                bt = bt + dd
-                et = et + dd
-                btxt = bt.strftime("%Y-%m-%d %H:%M:%S")
-                etxt = et.strftime("%Y-%m-%d %H:%M:%S")
-                try:
-                    recdb.del_reckey(recdblist.REC_AUTO_KEYWORD, title, chtxt, btime)
-                    recdb.auto_keyreserv(title, chtxt, btxt, etxt, "24", opt)
-                except Exception, inst:
-                    print "Error occures in REC_AUTO_KEYWORD(1)"
-                    print type(inst)
-                    print inst
-        elif task["type"] == recdblist.REC_MOVE_AFTER_RECORD:#"res,"+chtxt+","+title+","+btime+","+etime+","+opt
-            pid = os.fork()
-            if pid != 0:#親プロセスの場合
-                ""
-            else:#子プロセスの場合 アップデートを行って終了
-                type_reserve(task["type"],chtxt,title,bt,et,opt)
-                sys.exit()
-        elif task["type"] == recdblist.REC_MOVE_AFTER_DECODE:#"res,"+chtxt+","+title+","+btime+","+etime+","+opt
-            pid = os.fork()
-            if pid != 0:#親プロセスの場合
-                ""
-            else:#子プロセスの場合 アップデートを行って終了
-                type_reserve(task["type"],chtxt,title,bt,et,opt)
-                sys.exit()
-        elif task["type"] == recdblist.REC_MOVE_AFTER_ENCODE:#"res,"+chtxt+","+title+","+btime+","+etime+","+opt
-            pid = os.fork()
-            if pid != 0:#親プロセスの場合
-                ""
-            else:#子プロセスの場合 アップデートを行って終了
-                type_reserve(task["type"],chtxt,title,bt,et,opt)
-                sys.exit()
-        elif task["type"] == recdblist.REC_MOVE_AFTER_RECORD_FINAL:#"rec,"+chtxt+","+title+","+btime+","+etime+","+opt
-            pid = os.fork()
-            if pid != 0:#親プロセスの場合
-                ""
-            else:#子プロセスの場合 アップデートを行って終了
-                type_final(task["type"],chtxt, title, bt, et, opt)
-                sys.exit()
-        elif task["type"] == recdblist.REC_MOVE_AFTER_DECODE_FINAL:#"rec,"+chtxt+","+title+","+btime+","+etime+","+opt
-            pid = os.fork()
-            if pid != 0:#親プロセスの場合
-                ""
-            else:#子プロセスの場合 アップデートを行って終了
-                type_final(task["type"],chtxt, title, bt, et, opt)
-                sys.exit()
-        elif task["type"] == recdblist.REC_MOVE_AFTER_ENCODE_FINAL:#"rec,"+chtxt+","+title+","+btime+","+etime+","+opt
-            pid = os.fork()
-            if pid != 0:#親プロセスの場合
-                ""
-            else:#子プロセスの場合 アップデートを行って終了
-                type_final(task["type"],chtxt, title, bt, et, opt)
-                sys.exit()
-        elif task["type"] == recdblist.REC_MOVE_AFTER_DECODE_DECODE_QUE:
-            b25num=b25num+1
-            pid = os.fork()
-            if pid != 0:#親プロセスの場合
-                ""
-            else:#子プロセスの場合 アップデートを行って終了
-                time.sleep(5*b25num)
-                type_decode_que(task["type"],chtxt, title, bt, et, opt)
-                sys.exit()
-        elif task["type"] == recdblist.REC_MOVE_AFTER_ENCODE_DECODE_QUE:
-            b25num=b25num+1
-            pid = os.fork()
-            if pid != 0:#親プロセスの場合
-                ""
-            else:#子プロセスの場合 アップデートを行って終了
-
-                time.sleep(5*b25num)
-                type_decode_que(task["type"],chtxt, title, bt, et, opt)
-                sys.exit()
-        elif task["type"] == recdblist.REC_MOVE_AFTER_ENCODE_ENCODE_QUE:
-            encodenum=encodenum+1
-            pid = os.fork()
-            if pid != 0:#親プロセスの場合
-                ""
-            else:#子プロセスの場合 アップデートを行って終了
-                time.sleep(5*encodenum)
-                type_encode_que(task["type"],chtxt, title, bt, et, opt)
-                sys.exit()
     sys.exit()
 def search_keyword(key):
     tnow = datetime.datetime.now()
@@ -317,12 +252,30 @@ def search_keyword(key):
                 ett = datetime.datetime.strptime(etimet, "%Y-%m-%d %H:%M:%S")
                 btimet = btt.strftime("%Y-%m-%d %H:%M:%S")
                 etimet = ett.strftime("%Y-%m-%d %H:%M:%S")
-                try:
-                    recdb.add_auto_keyword(chtxtt, titlet, btimet, etimet)
-                except Exception, inst:
-                    print "error occures in search_keyword"
-                    print type(inst)
-                    print inst
+                if status.getSettings_auto_jbk()==1:
+                    topt=status.getSettings_auto_opt()
+                    try:
+                        maxnum=0
+                        if len(ch['ch'])>2:
+                            maxnum=epgdb.count_schedule_timeline(btimet, etimet)[1]
+                            maxnum=int(configreader.getenv("bscs_max"))-maxnum
+                        else:
+                            maxnum=epgdb.count_schedule_timeline(btimet, etimet)[0]
+                            maxnum=int(configreader.getenv("te_max"))-maxnum
+                        if maxnum>0:
+                            topt=status.getSettings_auto_opt()
+                            recdb.recreserv(titlet,chtxtt, btimet, etimet,topt)
+                    except Exception, inst:
+                        print "error occures in search_keyword_auto_jbk"
+                        print str(type(inst))
+                        print str(inst)
+                else:
+                    try:
+                        recdb.add_auto_keyword(chtxtt, titlet, btimet, etimet)
+                    except Exception, inst:
+                        print "error occures in search_keyword"
+                        print str(type(inst))
+                        print str(inst)
 def type_reserve(typetxt,chtxt,title,bt,et,opt):
     btime = bt.strftime("%Y-%m-%d %H:%M:%S")
     etime = et.strftime("%Y-%m-%d %H:%M:%S")
@@ -330,16 +283,10 @@ def type_reserve(typetxt,chtxt,title,bt,et,opt):
     typetxtfinal=""
     if typetxt==recdblist.REC_RESERVE:
         typetxtfinal=recdblist.REC_FINAL_RESERVE
-    elif typetxt==recdblist.REC_MOVE_AFTER_DECODE:
-        typetxtfinal=recdblist.REC_MOVE_AFTER_DECODE_FINAL
-    elif typetxt==recdblist.REC_MOVE_AFTER_RECORD:
-        typetxtfinal=recdblist.REC_MOVE_AFTER_RECORD_FINAL
-    elif typetxt==recdblist.REC_MOVE_AFTER_ENCODE:
-        typetxtfinal=recdblist.REC_MOVE_AFTER_ENCODE_FINAL
     tnow = datetime.datetime.now()
     dtt = bt-tnow
     dt = dtt.days * 24 * 60 * 60 + dtt.seconds
-    if (dt < 58 * 60 and dt > 20 * 60):
+    if (dt < 58 * 60 and dt > 30 * 60):
         bctypet = chdb.chtxtsearch(chtxt)['bctype']
         chdatat = rec10d.rec10db.select_by_bctype_epg_ch(bctypet)
         dt1 = datetime.datetime.strptime(chdatat[0][5], "%Y-%m-%d %H:%M:%S")-datetime.datetime.now()
@@ -364,17 +311,42 @@ def type_reserve(typetxt,chtxt,title,bt,et,opt):
                     recdb.rec_reclog(titlen, chtxtn, btimen, etimen, opt, exp, longexp, category)
                     auto_rec.add_key(chtxt, titlen,exp+" "+longexp)
                     auto_rec.add_key("ALL", titlen,exp+" "+longexp)
-                    recdblist.printutf8("Oikake "+title+" : "+titlen+" "+btimen+" "+etimen)
+                    recdblist.printutf8(u"追いかけ機能実行中: "+title+" : "+titlen+" "+btimen+" "+etimen)
                 except Exception, inst:
-                    print "Error happended in Oikake DB"
-                    print type(inst)
-                    print inst
+                    print "Error happened in Oikake DB"
+                    print str(type(inst))
+                    print str(inst)
             else:
-                recdblist.printutf8("nothing match")
+                recdblist.printutf8(u"追いかけ機能エラー:番組データが見付かりません。")
         else:
             if rec10d.rec10db.select_by_bctype_epg_ch(bctypet)[0][6] != "0":
                 rec10d.rec10db.update_status_by_bctype_epg_ch(bctypet, "3")
         sys.exit()
+    elif (dt <= 30 * 60 and dt > 20 * 60):
+        recdata = epgdb.searchtime2(title, btime, "5", chtxt)
+        chtxtn = recdata[0]
+        titlen = recdata[1]
+        btimen = recdata[2]
+        etimen = recdata[3]
+        exp = recdata[4]
+        longexp = recdata[5]
+        category=recdata[6]
+        bt = datetime.datetime.strptime(btimen, "%Y-%m-%d %H:%M:%S")
+        et = datetime.datetime.strptime(etimen, "%Y-%m-%d %H:%M:%S")
+        btimen = bt.strftime("%Y-%m-%d %H:%M:%S")
+        etimen = et.strftime("%Y-%m-%d %H:%M:%S")
+        if chtxt != "":
+            try:
+                recdb.del_reckey(typetxtnow, title, chtxt, btime)
+                recdb.rec_reckey(typetxtfinal, titlen, chtxtn, btimen, etimen, opt)
+                recdb.rec_reclog(titlen, chtxtn, btimen, etimen, opt, exp, longexp, category)
+                auto_rec.add_key(chtxt, titlen,exp+" "+longexp)
+                auto_rec.add_key("ALL", titlen,exp+" "+longexp)
+                recdblist.printutf8(u"追いかけ機能実行中: "+title+" : "+titlen+" "+btimen+" "+etimen)
+            except Exception, inst:
+                print "Error happened in Oikake DB"
+                print type(inst)
+                print inst
     elif dt <= 20 * 60:
         try:
             recdb.del_reckey(typetxtnow, title, chtxt, btime)
@@ -391,39 +363,35 @@ def type_final(typetxt,chtxt,title,bt,et,opt):
     if typetxt==recdblist.REC_FINAL_RESERVE:
         typetxting=recdblist.REC_TS_RECORDING
         typetxtdecque=recdblist.REC_TS_DECODE_QUE
-    elif typetxt==recdblist.REC_MOVE_AFTER_DECODE_FINAL:
-        typetxting=recdblist.REC_MOVE_AFTER_DECODE_RECORDING
-        typetxtdecque=recdblist.REC_MOVE_AFTER_DECODE_DECODE_QUE
-    elif typetxt==recdblist.REC_MOVE_AFTER_RECORD_FINAL:
-        typetxting=recdblist.REC_MOVE_AFTER_RECORD_RECORDING
-        typetxtdecque=""
-    elif typetxt==recdblist.REC_MOVE_AFTER_ENCODE_FINAL:
-        typetxting=recdblist.REC_MOVE_AFTER_ENCODE_RECORDING
-        typetxtdecque=recdblist.REC_MOVE_AFTER_ENCODE_DECODE_QUE
     tnow = datetime.datetime.now()
     dtt = bt-tnow
     dt = dtt.days * 24 * 60 * 60 + dtt.seconds
     print dt
     if dt < 6 * 60 and dt > 0:
+        newtitle=title
         recdb.del_reckey(typetxtnow, title, chtxt, btime)
-        recdb.rec_reckey(typetxting, title, chtxt, btime, etime, opt)
-        recdblist.printutf8(u"録画開始 "+title+" "+btime+" "+etime)
-        ttitle=title
-        #recdblist.printutf8(title)
         testpath=[os.path.join(recpath,title+".ts.b25")]
         testpath.append(os.path.join(recpath,title+".ts"))
         testpath.append(os.path.join(recpath,title+".avi"))
-        testpath.append(os.path.join(recpath,title+".mkv"))
+        testpath.append(os.path.join(recpath,title+".mp4"))
         testpath.append(os.path.join(recpath,title+".log"))
         tcheck=0
         for ti in testpath:
             if os.path.exists(ti):
                 tcheck=tcheck+1
-        if tcheck>0:
-            ttitle=title+"_"+datetime.datetime.now().strftime("%Y%m%d%H%M")
-        tv2avi.timetv2b25(recpath + "/" + ttitle + ".avi", chtxt, btime, etime, opt)
-        recdb.del_reckey(typetxting, title, chtxt, btime)
-        if typetxtdecque != "":
+        if re.search("N", opt) or tcheck>0:
+            iff=""
+            try:
+                iff=u"("+configreader.getenv("iff")+u")_"
+            except:
+                iff=""
+            newtime=bt
+            newtitle=newtitle+u"_"+iff+newtime.strftime("%Y-%m-%dT%H-%M-%S")
+        recdb.rec_reckey(typetxting, newtitle, chtxt, btime, etime, opt)
+        recdblist.printutf8(u"録画開始 "+newtitle+" "+btime+" "+etime)
+        tv2avi.timetv2b25(recpath + "/" + newtitle + ".avi", chtxt, btime, etime, opt)
+        recdb.del_reckey(typetxting, newtitle, chtxt, btime)
+        if not re.search("R", opt):
             tnow = datetime.datetime.now()
             bt = datetime.datetime.strptime(btime, "%Y-%m-%d %H:%M:%S")
             et = datetime.datetime.strptime(etime, "%Y-%m-%d %H:%M:%S")
@@ -432,9 +400,13 @@ def type_final(typetxt,chtxt,title,bt,et,opt):
             et = et + dt + datetime.timedelta(seconds=600)
             btime = bt.strftime("%Y-%m-%d %H:%M:%S")
             etime = et.strftime("%Y-%m-%d %H:%M:%S")
-            recdb.rec_reckey(typetxtdecque, ttitle, chtxt, btime, etime, opt)
+            recdb.rec_reckey(typetxtdecque, newtitle, chtxt, btime, etime, opt)
         else:
-            shutil.copy(os.path.join(recpath,title+".ts.b25"), os.path.join(movepath,title+".ts.b25"))
+            try:
+                shutil.copy(os.path.join(recpath,title+".ts.b25"), os.path.join(movepath,title+".ts.b25"))
+            except:
+                ""
+            recdb.rec_reckey(recdblist.REC_MOVE_END, newtitle, chtxt, btime, etime, opt)
         sys.exit()
 def type_keyword(typetxt,chtxt,title,bt,et,opt,deltatime):
     btime = bt.strftime("%Y-%m-%d %H:%M:%S")
@@ -490,7 +462,6 @@ def type_keyword_every_day(type,chtxt,title,bt,et,opt,deltatime,deltaday):
         etxt = et.strftime("%Y-%m-%d %H:%M:%S")
         recdb.everyreserv(title, chtxt, btxt, etxt, deltatime, opt, deltaday)
     elif dt < 120 * 60:
-        recdb.keyreserv(title, chtxt, btime, etime, deltatime, opt)
         recdb.del_reckey(recdblist.REC_KEYWORD_EVERY_SOME_DAYS, title, chtxt, btime)
         bt = bt + dd
         et = et + dd
@@ -498,7 +469,23 @@ def type_keyword_every_day(type,chtxt,title,bt,et,opt,deltatime,deltaday):
         etxt = et.strftime("%Y-%m-%d %H:%M:%S")
         recdb.everyreserv(title, chtxt, btxt, etxt, deltatime, opt, deltaday)
 
-
+        recdata = epgdb.searchtime2(title, btime, deltatime, chtxt)
+        if recdata[1] != "":
+            chtxtt = recdata[0]
+            titlet = recdata[1]
+            btimet = recdata[2]
+            etimet = recdata[3]
+            exp = recdata[4]
+            longexp = recdata[5]
+            category=recdata[6]
+            bt = datetime.datetime.strptime(btimet, "%Y-%m-%d %H:%M:%S")
+            et = datetime.datetime.strptime(etimet, "%Y-%m-%d %H:%M:%S")
+            btimet = bt.strftime("%Y-%m-%d %H:%M:%S")
+            etimet = et.strftime("%Y-%m-%d %H:%M:%S")
+            #try:
+            recdb.keyreserv(titlet, chtxtt, btimet, etimet, deltatime, opt)
+        else:
+            recdb.keyreserv(title, chtxt, btime, etime, deltatime, opt)
 def type_decode_que(typetxt,chtxt,title,bt,et,opt):
     btime = bt.strftime("%Y-%m-%d %H:%M:%S")
     etime = et.strftime("%Y-%m-%d %H:%M:%S")
@@ -513,14 +500,6 @@ def type_decode_que(typetxt,chtxt,title,bt,et,opt):
         typetxting=recdblist.REC_TS_DECODING
         typetxtmiss=recdblist.REC_MISS_DECODE
         typetxtencque=recdblist.REC_ENCODE_QUE
-    elif typetxt== recdblist.REC_MOVE_AFTER_DECODE_DECODE_QUE:
-        typetxting=recdblist.REC_MOVE_AFTER_DECODE_DECODING
-        typetxtmiss=recdblist.REC_MISS_DECODE
-        typetxtencque=""
-    elif typetxt== recdblist.REC_MOVE_AFTER_ENCODE_DECODE_QUE:
-        typetxting=recdblist.REC_MOVE_AFTER_ENCODE_DECODING
-        typetxtmiss=recdblist.REC_MISS_DECODE
-        typetxtencque=recdblist.REC_MOVE_AFTER_ENCODE_ENCODE_QUE
     tnow = datetime.datetime.now()
     dtt = bt-tnow
     dt = dtt.days * 24 * 60 * 60 + dtt.seconds
@@ -534,10 +513,15 @@ def type_decode_que(typetxt,chtxt,title,bt,et,opt):
             if not os.access(recpath + "/" + title + ".ts", os.F_OK):
                 recdb.del_reckey(typetxting, title, chtxt, btime)
                 recdb.rec_reckey(typetxtmiss, title, chtxt, btime, etime, opt)
+            else:
+                ch=checker.checkB25Decode(recpath + "/" + title + ".ts.b25", recpath + "/" + title + ".ts")
+                print ch
+                if ch == 1:
+                    os.remove(recpath + "/" + title + ".ts.b25")
             bt = datetime.datetime.strptime(btime, "%Y-%m-%d %H:%M:%S")
             et = datetime.datetime.strptime(etime, "%Y-%m-%d %H:%M:%S")
             dt = et-bt
-            if not typetxtencque=="":
+            if not re.search("D", opt):
                 tnow = datetime.datetime.now()
                 bt = tnow + datetime.timedelta(seconds=600)
                 et = bt + dt
@@ -545,15 +529,15 @@ def type_decode_que(typetxt,chtxt,title,bt,et,opt):
                 etime = et.strftime("%Y-%m-%d %H:%M:%S")
                 recdb.rec_reckey(typetxtencque, title, chtxt, btime, etime, opt)
             else:
-                if opt.rfind("d")>=0:
-                    shutil.copy(os.path.join(recpath,title+".sa.avi"),os.path.join(movepath,title+".sa.avi"))
-                elif opt.rfind("5")>=0:
-                    shutil.copy(os.path.join(recpath,title+".sa.avi"),os.path.join(movepath,title+".sa.avi"))
-                else:
+                try:
                     shutil.copy(os.path.join(recpath,title+".ts"), os.path.join(movepath,title+".ts"))
-            #recdblist.printutf8(checker.checkB25Decode(recpath + "/" + title + ".ts.b25", recpath + "/" + title + ".ts"))
-            if checker.checkB25Decode(recpath + "/" + title + ".ts.b25", recpath + "/" + title + ".ts") == 1:
-                os.remove(recpath + "/" + title + ".ts.b25")
+                except Exception, inst:
+                    errtxt="Error happened in type_decode_que in timerec.\n"
+                    errtxt=errtxt+"move ts error.\n"
+                    errtxt=errtxt+str(type(inst))+"\n"
+                    errtxt=errtxt+str(inst)
+                    recdblist.addlog(os.path.join(recpath,title+".ts"), errtxt, "timerec-move(Decode) error")
+                recdb.rec_reckey(recdblist.REC_MOVE_END, title, chtxt, btime, etime, opt)
         else:
             recdb.del_reckey(typetxtnow, title, chtxt, btime)
             bt = bt + datetime.timedelta(seconds=600)
@@ -575,29 +559,60 @@ def type_encode_que(typetxt,chtxt,title,bt,et,opt):
     if typetxt==recdblist.REC_ENCODE_QUE:
         typetxting=recdblist.REC_ENCODE_LOCAL
         typetxtfin=recdblist.REC_FIN_LOCAL
-    elif typetxt==recdblist.REC_MOVE_AFTER_ENCODE_ENCODE_QUE:
-        typetxting=recdblist.REC_ENCODE_LOCAL
-        typetxtfin=recdblist.REC_MOVE_END
     if dt < 10 * 60:
         if status.getEncoding() < int(configreader.getenv("enc_max")):
+            recdb.del_reckey(typetxtnow, title, chtxt, btime)
+            recdb.rec_reckey(typetxting, title, chtxt, btime, etime, opt)
             recdblist.printutf8(opt)
             pin = recpath + "/" + title + ".ts"
             if re.search("d", opt):
-                pin = recpath + "/" + title + ".sa.avi"
-            if re.search("5", opt):
-                pin = recpath + "/" + title + ".sa.avi"
-            #pout = recpath + "/" + title + ".avi"
-            pout = recpath + "/" + title + ".mp4"
+                pin = recpath + "/" + title + ".m2v"
+                if not os.path.exists(pin) or os.path.getsize(pin)<100*1000:
+                    paac2 = recpath + "/" + title + "_2.aac"
+                    pmp32 = recpath + "/" + title + "_2.mp3"
+                    if not os.path.exists(paac2) and not os.path.exists(pmp32):
+                        tv2avi.dualaudio2sep(os.path.join(recpath, title+".ts"),"167")
+                time.sleep(3)
+            elif re.search("5", opt):
+                pin = recpath + "/" + title + ".m2v"
+                if not os.path.exists(pin) or os.path.getsize(pin)<100*1000:
+                    paac2 = recpath + "/" + title + "_2.aac"
+                    pmp32 = recpath + "/" + title + "_2.mp3"
+                    if not os.path.exists(paac2) and not os.path.exists(pmp32):
+                        tv2avi.pentaaudio2sep(os.path.join(recpath, title+".ts"))
+                time.sleep(3)
+            makeMP4=0
+            try:
+                if configreader.getenv("make_mp4")==1:
+                    makeMP4=1
+            except:
+                ""
+            if re.search("m", opt):
+                makeMP4=0
+            if re.search("4", opt):
+                makeMP4=1
             recdblist.printutf8(pin)
-            #recdblist.printutf8(pin+":"+pout+":"+opt)
-            recdb.del_reckey(typetxtnow, title, chtxt, btime)
-            recdb.rec_reckey(typetxting, title, chtxt, btime, etime, opt)
-            #tv2mkv.ts2mkv(pin, pout, opt)
-            tv2mp4.ts2mp4(pin, pout, opt)
-            #tv2avi.ts2avi(pin, pout, opt)
+            if makeMP4==1:
+                pout = recpath + "/" + title + ".mp4"
+                tv2mp4.ts2mp4(pin, pout, opt)
+            else:
+                pout = recpath + "/" + title + ".mkv"
+                tv2mkv.ts2mkv(pin, pout, opt)
             recdb.del_reckey(typetxting, title, chtxt, btime)
-            if typetxtfin==recdblist.REC_MOVE_END:
-                shutil.copy(os.path.join(recpath,title+".mp4"), os.path.join(movepath,title+".mp4"))
+            time.sleep(10)
+            if re.search("E", opt):
+                try:
+                    if os.path.exists(os.path.join(recpath,title+".mp4")):
+                        shutil.copy(os.path.join(recpath,title+".mp4"), os.path.join(movepath,title+".mp4"))
+                    elif os.path.exists(os.path.join(recpath,title+".mkv")):
+                        shutil.copy(os.path.join(recpath,title+".mkv"), os.path.join(movepath,title+".mkv"))
+                except Exception, inst:
+                    errtxt="Error happened in type_encode_que in timerec.\n"
+                    errtxt=errtxt+"move mkv/mp4 error.\n"
+                    errtxt=errtxt+str(type(inst))+"\n"
+                    errtxt=errtxt+str(inst)
+                    recdblist.addlog(os.path.join(recpath,title+".ts"), errtxt, "timerec-move(Encode) error")
+                recdb.rec_reckey(recdblist.REC_MOVE_END, title, chtxt, btime, etime, opt)
             recdb.rec_reckey(typetxtfin, title, chtxt, btime, etime, opt)
             sys.exit()
         else: