X-Git-Url: http://git.osdn.net/view?p=rec10%2Frec10-git.git;a=blobdiff_plain;f=rec10%2Ftrunk%2Fsrc%2Ftimerec.py;h=18c403aa64264acca9009c837e680a9691de4eeb;hp=a3a5d2b90976ed7556892197e1b8480cada757de;hb=d381e264288091d06b29551d62fdc46b9629dbd5;hpb=dedf50b1641a28c1f83495a1c9e4e334691ef8b2

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index a3a5d2b..18c403a 100644
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
-# Copyright (C) 2009-2010 Yukikaze
+# Copyright (C) 2009-2011 Yukikaze
 import datetime
 import os
 import os.path
@@ -9,23 +9,25 @@ import re
 import sys
 import time
 import shutil
+import traceback
 
 import auto_rec
 import auto_process
 import chdb
-import checker
 import configreader
 import epgdb
 import rec10d
 import recdb
 import status
+import tv2audio
 import tv2avi
 import tv2mkv
 import tv2mp4
 import install
 import recdblist
-recpath = configreader.getpath('recpath')
-movepath = configreader.getpath('move_destpath')
+import recque
+recpath = configreader.getConfPath('recpath')
+movepath = configreader.getConfPath('move_destpath')
 path = str(os.path.dirname(os.path.abspath(__file__))) + "/"
 def task():
     """
@@ -35,25 +37,34 @@ def task():
     try:
         if rec10d.rec10db.select_installed_in_status()==0 or rec10d.rec10db.select_version_in_status()<recdblist.version:
             install.install()
-    except:
+        elif rec10d.rec10db.select_installed_in_status()==1:
+            import scan_ch
+            rec10d.rec10db.new_epg_ch()
+            scan_ch.searchCh()
+            rec10d.rec10db.change_installed_in_status(100)
+        elif rec10d.rec10db.select_installed_in_status()==2:
+            recdblist.printutf8ex("Exit because CH scanning.", 200, 200)
+            sys.exit(0)
+    except Exception, inst:
+        recdblist.addCommonlogEX("Error", "install_check(timerec.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
         install.install()
-    recdb.delete_old("24")
+    recdb.deleteOldProgramBeforeTheseHours("24")
     recdb.delete_old_auto_bayes("1")
     recdb.delete_old_auto_keyword("1")
-    tasks = recdb.getnow("3")
+    tasks = recdb.getProgramsInTheseHours("3")
     inum = recdb.countRecNow_minutes("10")
-    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()) )
+    recdblist.printutf8(u"rec10処理開始"+ datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),verbose_level=800)
+    recdblist.printutf8(u"直近録画予約件数:" + str(inum) + u"BS/CS録画中件数:" + str(status.getBSCSRecording()) + u"TE録画中件数:" + str(status.getTERecording()) ,verbose_level=800)
     encodenum=0
     b25num=0
     dnow=datetime.datetime.now()
-    if dnow.minute%10<5:
+    if dnow.minute % 10 < 5:
         pid = os.fork()
         if pid != 0:
             ""
         else:
-            for k in recdb.get_key():
-                search_keyword(k)
+            search_keyword(recdb.getAllJbkKeyword())
+            recque.searchRecQue(recpath)
             sys.exit()
     else:
         pid = os.fork()
@@ -61,11 +72,13 @@ def task():
             ""
         else:
             time.sleep(10)
-            auto_process.auto_check(recpath)
+            auto_process.autoCheck(recpath)
             time.sleep(10)
-            auto_process.kill_dead_encode(recpath)
+            auto_process.killDeadEncode(recpath)
             sys.exit()
     update = chdb.update()
+    updatelogo = chdb.updateLogo()
+    updatelogo=[]
     if len(update) > 0:
         pid = os.fork()
         if pid != 0:
@@ -76,14 +89,14 @@ def task():
                 recnum = 0
                 if bctype.find('te') > -1:
                     recnum = status.getTERecording() + recdb.countRecNow_minutes_TE("10")
-                    recdblist.printutf8(u"放送種別:"+bctype + u"||該当チューナー実行中件数:" + str(status.getTERecording()) + u":直近予約件数:" + str(recdb.countRecNow_minutes_TE("10")))
-                    recnum = int(configreader.getenv("te_max")) -recnum
+                    recdblist.printutf8(u"放送種別:"+bctype + u"||該当チューナー実行中件数:" + str(status.getTERecording()) + u":直近予約件数:" + str(recdb.countRecNow_minutes_TE("10")),verbose_level=800)
+                    recnum = int(configreader.getConfEnv("te_max")) -recnum
                 else:
                     recnum = status.getBSCSRecording() + recdb.countRecNow_minutes_BSCS("10")
-                    recdblist.printutf8(u"放送種別:"+bctype + u"||該当チューナー実行中件数:" + str(status.getBSCSRecording()) + u":直近予約件数:" + str(recdb.countRecNow_minutes_BSCS("10")))
-                    recnum = int(configreader.getenv("bscs_max")) -recnum
+                    recdblist.printutf8(u"放送種別:"+bctype + u"||該当チューナー実行中件数:" + str(status.getBSCSRecording()) + u":直近予約件数:" + str(recdb.countRecNow_minutes_BSCS("10")),verbose_level=800)
+                    recnum = int(configreader.getConfEnv("bscs_max")) -recnum
                 if recnum >0 :
-                    print update
+                    recdblist.printutf8(str(update),verbose_level=750)
                     rec10d.rec10db.update_status_by_bctype_epg_ch(bctype, "0")
                     epgdb.updatebc(bctype)
                     update = chdb.update()
@@ -93,6 +106,32 @@ def task():
             time.sleep(5)
             auto_process.update_all_timeline_epg()
             sys.exit()
+    elif len(updatelogo)>0:
+        pid = os.fork()
+        if pid != 0:
+            ""
+        else:
+            i = 0
+            for bctype in updatelogo:
+                recnum = 0
+                if bctype.find('te') > -1:
+                    recnum = status.getTERecording() + recdb.countRecNow_minutes_TE("1200")
+                    recdblist.printutf8(u"ロゴ未取得 : 放送種別-"+bctype + u"||該当チューナー実行中件数:" + str(status.getTERecording()) + u":直近予約件数:" + str(recdb.countRecNow_minutes_TE("10")),verbose_level=800)
+                    recnum = int(configreader.getConfEnv("te_max")) -recnum
+                else:
+                    recnum = status.getBSCSRecording() + recdb.countRecNow_minutes_BSCS("1200")
+                    recdblist.printutf8(u"ロゴ未取得 : 放送種別-"+bctype + u"||該当チューナー実行中件数:" + str(status.getBSCSRecording()) + u":直近予約件数:" + str(recdb.countRecNow_minutes_BSCS("10")),verbose_level=800)
+                    recnum = int(configreader.getConfEnv("bscs_max")) -recnum
+                if recnum >0 :
+                    recdblist.printutf8(u"ロゴ取得"+str(updatelogo),verbose_level=750)
+                    rec10d.rec10db.update_logostatus_by_bctype_epg_ch(bctype,"0")
+                    epgdb.updateLogo_bc(bctype)
+                    updatelogo = chdb.updateLogo()
+                    i = i + 1
+                if i > 0:
+                    break
+            time.sleep(5)
+            sys.exit()
     else:
         pid = os.fork()
         if pid != 0:
@@ -188,23 +227,25 @@ def task():
                 if pid > 0:#親プロセスの場合
                     ""
                 else:
-                    makeMP4=0
+                    makeMP4=1
                     try:
-                        if configreader.getenv("make_mp4")==1:
-                            makeMP4=1
+                        if configreader.getConfEnv("make_mp4")==0:
+                            makeMP4=0
                     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)
+                    recdb.deleteReckey(recdblist.REC_AVI_TO_MKV, title, chtxt, btime)
+                    recdb.reserveReckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime, etime, opt)
                     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)
+                        tv2mp4.raw2mp4(os.path.join(recpath,title+".264"),os.path.join(recpath,title+".mp4"),opt)
+                        tv2mkv.mp42mkv(os.path.join(recpath,title+".mp4"), os.path.join(recpath,title+".mkv"))
+                        os.remove(os.path.join(recpath,title+".mp4"))
+                    recdb.deleteReckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime)
                     sys.exit()
         elif task["type"] == recdblist.REC_AVI_TO_MP4:
             if dt < 10 * 60:
@@ -214,7 +255,7 @@ def task():
                 else:
                     makeMP4=0
                     try:
-                        if configreader.getenv("make_mp4")==1:
+                        if configreader.getConfEnv("make_mp4")==1:
                             makeMP4=1
                     except:
                         ""
@@ -222,14 +263,14 @@ def task():
                         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)
+                    recdb.deleteReckey(recdblist.REC_AVI_TO_MP4, title, chtxt, btime)
+                    recdb.reserveReckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime, etime, opt)
                     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)
+                    recdb.deleteReckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime)
                     sys.exit()
         elif task["type"] == recdblist.REC_MKV_TO_MP4:
             if dt < 10 * 60:
@@ -237,17 +278,17 @@ def task():
                 if pid > 0:#親プロセスの場合
                     ""
                 else:
-                    recdb.del_reckey(recdblist.REC_MKV_TO_MP4, title, chtxt, btime)
-                    recdb.rec_reckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime, etime, opt)
+                    recdb.deleteReckey(recdblist.REC_MKV_TO_MP4, title, chtxt, btime)
+                    recdb.reserveReckey(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)
+                    recdb.deleteReckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime)
                     sys.exit()
     sys.exit()
 def search_keyword(key):
     tnow = datetime.datetime.now()
     nows =tnow.strftime("%Y-%m-%d %H:%M:%S")
-    for k in key:
-        recdatum = epgdb.searchtime_auto(k,nows, "144")
+    for k,auto,opt in key:
+        recdatum = epgdb.searchTimeAuto(k,nows, "144")
         for recdata in recdatum:
             if recdata[1] != "":
                 chtxtt = recdata[0]
@@ -258,30 +299,29 @@ 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")
-                if status.getSettings_auto_jbk()==1:
-                    topt=status.getSettings_auto_opt()
+                #if status.getSettings_auto_jbk()==1:
+                if auto==1 or status.getSettings_auto_jbk()==1:
+                    topt=opt
+                    if len(topt)==0:
+                        topt=status.getSettings_auto_opt()
                     try:
                         maxnum=0
+                        ch=chdb.searchCHFromChtxt(chtxtt)
                         if len(ch['ch'])>2:
-                            maxnum=epgdb.count_schedule_timeline(btimet, etimet)[1]
-                            maxnum=int(configreader.getenv("bscs_max"))-maxnum
+                            maxnum=epgdb.countSchedule(btimet, etimet)[1]
+                            maxnum=int(configreader.getConfEnv("bscs_max"))-maxnum
                         else:
-                            maxnum=epgdb.count_schedule_timeline(btimet, etimet)[0]
-                            maxnum=int(configreader.getenv("te_max"))-maxnum
+                            maxnum=epgdb.countSchedule(btimet, etimet)[0]
+                            maxnum=int(configreader.getConfEnv("te_max"))-maxnum
                         if maxnum>0:
-                            topt=status.getSettings_auto_opt()
-                            recdb.recreserv(titlet,chtxtt, btimet, etimet,topt)
+                            if recdb.checkDuplicated(titlet, chtxtt, btimet, etimet)==0:
+                                recdb.reserveReckey(recdblist.REC_RESERVE,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)
+                        recdblist.addCommonlogEX("Error", "search_keyword_auto_jbk(timerec.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
+                try:
+                    recdb.reserveAutoKeyword(chtxtt, titlet, btimet, etimet)
+                except Exception, inst:
+                    recdblist.addCommonlogEX("Error", "search_keyword(timerec.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
 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")
@@ -293,12 +333,12 @@ def type_reserve(typetxt,chtxt,title,bt,et,opt):
     dtt = bt-tnow
     dt = dtt.days * 24 * 60 * 60 + dtt.seconds
     if (dt < 58 * 60 and dt > 30 * 60):
-        bctypet = chdb.chtxtsearch(chtxt)['bctype']
+        bctypet = chdb.searchCHFromChtxt(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()
+        dt1 = bt - datetime.datetime.strptime(chdatat[0][4], "%Y-%m-%d %H:%M:%S")
         dt1 = dt1.days * 24 * 60 * 60 + dt1.seconds
         if dt1 < 60 * 60:
-            recdata = epgdb.searchtime2(title, btime, "5", chtxt)
+            recdata = epgdb.searchTime(title, btime, "5", chtxt)
             chtxtn = recdata[0]
             titlen = recdata[1]
             btimen = recdata[2]
@@ -312,24 +352,22 @@ def type_reserve(typetxt,chtxt,title,bt,et,opt):
             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)
+                    recdb.deleteReckey(typetxtnow, title, chtxt, btime)
+                    recdb.reserveReckey(typetxtfinal, titlen, chtxtn, btimen, etimen, opt)
+                    recdb.addRecLogProgram(titlen, chtxtn, btimen, etimen, opt, exp, longexp, category)
+                    auto_rec.addKey(chtxt, titlen,exp+" "+longexp)
+                    auto_rec.addKey("ALL", titlen,exp+" "+longexp)
                     recdblist.printutf8(u"追いかけ機能実行中: "+title+" : "+titlen+" "+btimen+" "+etimen)
                 except Exception, inst:
-                    print "Error happened in Oikake DB"
-                    print str(type(inst))
-                    print str(inst)
+                    recdblist.addCommonlogEX("Error", "Oikake DB(timerec.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
             else:
                 recdblist.printutf8(u"追いかけ機能エラー：番組データが見付かりません。")
         else:
-            if rec10d.rec10db.select_by_bctype_epg_ch(bctypet)[0][6] != "0":
+            if rec10d.rec10db.select_by_bctype_epg_ch(bctypet)[0][5] != "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)
+        recdata = epgdb.searchTime(title, btime, "5", chtxt)
         chtxtn = recdata[0]
         titlen = recdata[1]
         btimen = recdata[2]
@@ -343,23 +381,21 @@ def type_reserve(typetxt,chtxt,title,bt,et,opt):
         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)
+                recdb.deleteReckey(typetxtnow, title, chtxt, btime)
+                recdb.reserveReckey(typetxtfinal, titlen, chtxtn, btimen, etimen, opt)
+                recdb.addRecLogProgram(titlen, chtxtn, btimen, etimen, opt, exp, longexp, category)
+                auto_rec.addKey(chtxt, titlen,exp+" "+longexp)
+                auto_rec.addKey("ALL", titlen,exp+" "+longexp)
+                #recdblist.printutf8(u"追いかけ機能実行中: "+title+" : "+titlen+" "+btimen+" "+etimen)
+                recdblist.addCommonlogEX(u"通常", "Oikake (timerec.py)",u"追いかけ機能実行中",u"追いかけ機能実行中: "+title+" : "+titlen+" "+btimen+" "+etimen,log_level=500)
             except Exception, inst:
-                print "Error happened in Oikake DB"
-                print type(inst)
-                print inst
+                recdblist.addCommonlogEX("Error", "Oikake DB(timerec.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
     elif dt <= 20 * 60:
         try:
-            recdb.del_reckey(typetxtnow, title, chtxt, btime)
-            recdb.rec_reckey(typetxtfinal, title, chtxt, btime, etime, opt)
+            recdb.deleteReckey(typetxtnow, title, chtxt, btime)
+            recdb.reserveReckey(typetxtfinal, title, chtxt, btime, etime, opt)
         except Exception, inst:
-            print type(inst)
-            print inst
+            recdblist.addCommonlogEX("Error", "Oikake DB(timerec.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
 def type_final(typetxt,chtxt,title,bt,et,opt):
     btime = bt.strftime("%Y-%m-%d %H:%M:%S")
     etime = et.strftime("%Y-%m-%d %H:%M:%S")
@@ -372,10 +408,9 @@ def type_final(typetxt,chtxt,title,bt,et,opt):
     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.deleteReckey(typetxtnow, title, chtxt, btime)
         testpath=[os.path.join(recpath,title+".ts.b25")]
         testpath.append(os.path.join(recpath,title+".ts"))
         testpath.append(os.path.join(recpath,title+".avi"))
@@ -388,15 +423,15 @@ def type_final(typetxt,chtxt,title,bt,et,opt):
         if re.search("N", opt) or tcheck>0:
             iff=""
             try:
-                iff=u"("+configreader.getenv("iff")+u")_"
+                iff=u"("+configreader.getConfEnv("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)
+        recdb.reserveReckey(typetxting, newtitle, chtxt, btime, etime, opt)
+        recdblist.addCommonlogEX(u"通常","timerec.py",u"録画開始 "+newtitle+" "+btime+" "+etime,"",log_level=500)
         tv2avi.timetv2b25(recpath + "/" + newtitle + ".avi", chtxt, btime, etime, opt)
-        recdb.del_reckey(typetxting, newtitle, chtxt, btime)
+        recdb.deleteReckey(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")
@@ -406,13 +441,25 @@ 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, newtitle, chtxt, btime, etime, opt)
+            recdb.reserveReckey(typetxtdecque, newtitle, chtxt, btime, etime, opt)
         else:
             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)
+                try:
+                    shutil.copy(os.path.join(recpath,title+".ts.b25"), os.path.join(movepath,title+".ts.b25"))
+                except:
+                    ""
+                try:
+                    os.chmod(os.path.join(movepath,title+".ts.b25"),0777)
+                except:
+                    ""
+                recque.writeRecQue(movepath, chtxt, title, opt)
+                try:
+                    os.chmod(os.path.join(movepath,title+".recq"),0777)
+                except:
+                    ""
+            except Exception, inst:
+                recdblist.addCommonlogEX("Error", "Move option(timerec.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
+            recdb.reserveReckey(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")
@@ -424,9 +471,9 @@ def type_keyword(typetxt,chtxt,title,bt,et,opt,deltatime):
     tnow = datetime.datetime.now()
     dtt = bt-tnow
     dt = dtt.days * 24 * 60 * 60 + dtt.seconds
-    print dt
-    if dt < 90 * 60:
-        recdata = epgdb.searchtime2(title, btime, deltatime, chtxt)
+    recdblist.printutf8(str(dt), verbose_level=800)
+    if dt <= 90 * 60 and dt > 70 * 60:
+        recdata = epgdb.searchTime(title, btime, deltatime, chtxt)
         if recdata[1] != "":
             chtxtt = recdata[0]
             titlet = recdata[1]
@@ -440,18 +487,23 @@ def type_keyword(typetxt,chtxt,title,bt,et,opt,deltatime):
             btimet = bt.strftime("%Y-%m-%d %H:%M:%S")
             etimet = et.strftime("%Y-%m-%d %H:%M:%S")
             #try:
-            recdb.del_reckey(typetxtnow, title, chtxt, btime)
-            recdb.rec_reckey(typetxtres, titlet, chtxtt, btimet, etimet, opt)
-            recdb.rec_reclog(titlet, chtxtt, btimet, etimet, opt, exp,longexp,category)
-            auto_rec.add_key(chtxt, titlet,exp+" "+longexp)
-            auto_rec.add_key("ALL", titlet,exp+" "+longexp)
-            recdblist.printutf8(u"key "+title+u" : "+titlet+u" "+btimet+u" "+etimet)
+            recdb.deleteReckey(typetxtnow, title, chtxt, btime)
+            recdb.reserveReckey(typetxtres, titlet, chtxt, btimet, etimet, opt)
+            recdb.addRecLogProgram(titlet, chtxtt, btimet, etimet, opt, exp,longexp,category)
+            auto_rec.addKey(chtxt, titlet,exp+" "+longexp)
+            auto_rec.addKey("ALL", titlet,exp+" "+longexp)
+            recdblist.addCommonlogEX(u"通常","timerec.py",u"key "+title+u" : "+titlet+u" "+btimet+u" "+etimet,"",log_level=500)
             #except Exception, inst:
             #    recdblist.printutf8("Error happened in REC_KEYWORD DB")
             #    recdblist.printutf8(type(inst))
             #    recdblist.printutf8(inst)
         else:
             recdblist.printutf8("nothing match")
+    elif dt <= 70 * 60:
+        recdb.deleteReckey(typetxtnow, title, chtxt, btime)
+        recdb.reserveReckey(typetxtres, title, chtxt, btime, etime, opt)
+        recdblist.addCommonlogEX(u"エラー","timerec.py",u"nothing match","",log_level=200)
+        recdblist.addCommonlogEX(u"エラー","timerec.py",u"key "+title+u" "+btime+u" "+etime,"",log_level=200)
 def type_keyword_every_day(type,chtxt,title,bt,et,opt,deltatime,deltaday,counter):
     btime = bt.strftime("%Y-%m-%d %H:%M:%S")
     etime = et.strftime("%Y-%m-%d %H:%M:%S")
@@ -460,23 +512,26 @@ def type_keyword_every_day(type,chtxt,title,bt,et,opt,deltatime,deltaday,counter
     dt = dtt.days * 24 * 60 * 60 + dtt.seconds
     dd = datetime.timedelta(days=int(deltaday))
     if dtt.days < 0:
-        recdb.del_reckey(recdblist.REC_KEYWORD_EVERY_SOME_DAYS, title, chtxt, btime)
+        recdb.deleteReckey(recdblist.REC_KEYWORD_EVERY_SOME_DAYS, title, chtxt, btime)
         bt = bt + dd
         et = et + dd
         btxt = bt.strftime("%Y-%m-%d %H:%M:%S")
         etxt = et.strftime("%Y-%m-%d %H:%M:%S")
-        recdb.everyreserv(title, chtxt, btxt, etxt, deltatime, opt, deltaday)
+        if counter>0:
+            recdb.reserveEverydayKeyword(title, chtxt, btxt, etxt, deltatime, opt, deltaday,counter-1)
+        elif counter==-1:
+            recdb.reserveEverydayKeyword(title, chtxt, btxt, etxt, deltatime, opt, deltaday,-1)
     elif dt < 120 * 60:
-        recdb.del_reckey(recdblist.REC_KEYWORD_EVERY_SOME_DAYS, title, chtxt, btime)
+        recdb.deleteReckey(recdblist.REC_KEYWORD_EVERY_SOME_DAYS, title, chtxt, btime)
         bt = bt + dd
         et = et + dd
         btxt = bt.strftime("%Y-%m-%d %H:%M:%S")
         etxt = et.strftime("%Y-%m-%d %H:%M:%S")
         if counter>0:
-            recdb.everyreserv(title, chtxt, btxt, etxt, deltatime, opt, deltaday,counter-1)
+            recdb.reserveEverydayKeyword(title, chtxt, btxt, etxt, deltatime, opt, deltaday,counter-1)
         elif counter==-1:
-            recdb.everyreserv(title, chtxt, btxt, etxt, deltatime, opt, deltaday,-1)
-        recdata = epgdb.searchtime2(title, btime, deltatime, chtxt)
+            recdb.reserveEverydayKeyword(title, chtxt, btxt, etxt, deltatime, opt, deltaday,-1)
+        recdata = epgdb.searchTime(title, btime, deltatime, chtxt)
         if recdata[1] != "":
             chtxtt = recdata[0]
             titlet = recdata[1]
@@ -490,9 +545,9 @@ def type_keyword_every_day(type,chtxt,title,bt,et,opt,deltatime,deltaday,counter
             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)
+            recdb.reserveKeyword(titlet, chtxt, btimet, etimet, deltatime, opt)
         else:
-            recdb.keyreserv(title, chtxt, btime, etime, deltatime, opt)
+            recdb.reserveKeyword(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,18 +568,15 @@ def type_decode_que(typetxt,chtxt,title,bt,et,opt):
     if dt < 10 * 60:
         if status.getB25Decoding() < 2:
             pin = recpath + "/" + title
-            recdb.del_reckey(typetxtnow, title, chtxt, btime)
-            recdb.rec_reckey(typetxting, title, chtxt, btime, etime, opt)
+            recdb.deleteReckey(typetxtnow, title, chtxt, btime)
+            recdb.reserveReckey(typetxting, title, chtxt, btime, etime, opt)
             tv2avi.b252ts(pin, chtxt, btime, etime, opt)
-            recdb.del_reckey(typetxting, title, chtxt, btime)
+            recdb.deleteReckey(typetxting, title, chtxt, btime)
             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)
+                recdb.deleteReckey(typetxting, title, chtxt, btime)
+                recdb.reserveReckey(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")
+                auto_process.deleteTmpFile(recpath, title, ".ts")
             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
@@ -534,24 +586,38 @@ def type_decode_que(typetxt,chtxt,title,bt,et,opt):
                 et = bt + dt
                 btime = bt.strftime("%Y-%m-%d %H:%M:%S")
                 etime = et.strftime("%Y-%m-%d %H:%M:%S")
-                recdb.rec_reckey(typetxtencque, title, chtxt, btime, etime, opt)
+                recdb.reserveReckey(typetxtencque, title, chtxt, btime, etime, opt)
             else:
                 try:
-                    shutil.copy(os.path.join(recpath,title+".ts"), os.path.join(movepath,title+".ts"))
+                    try:
+                        shutil.copy(os.path.join(recpath,title+".ts"), os.path.join(movepath,title+".ts"))
+                    except:
+                        ""
+                    try:
+                        os.chmod(os.path.join(movepath,title+".ts"),0777)
+                    except:
+                        ""
+                    recque.writeRecQue(movepath, chtxt, title, opt)
+                    try:
+                        os.chmod(os.path.join(movepath,title+".recq"),0777)
+                    except:
+                        ""
+                    time.sleep(5)
+                    if os.path.getsize(os.path.join(recpath,title+".ts"))==os.path.getsize(os.path.join(movepath,title+".ts")):
+                        os.remove(os.path.join(recpath,title+".ts"))
                 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)
+                    errtxt1="move ts error.\n"
+                    errtxt2=str(type(inst))+"\n"
+                    errtxt2=errtxt2+str(inst)
+                    recdblist.addCommonlogEX("Error", "type_decode_que(timerec.py)", errtxt1,errtxt2+traceback.format_exc(),log_level=200)
+                recdb.reserveReckey(recdblist.REC_MOVE_END, title, chtxt, btime, etime, opt)
         else:
-            recdb.del_reckey(typetxtnow, title, chtxt, btime)
+            recdb.deleteReckey(typetxtnow, title, chtxt, btime)
             bt = bt + datetime.timedelta(seconds=600)
             et = et + 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(typetxtnow, title, chtxt, btime, etime, opt)
+            recdb.reserveReckey(typetxtnow, title, chtxt, btime, etime, opt)
     sys.exit()
 
 def type_encode_que(typetxt,chtxt,title,bt,et,opt):
@@ -567,9 +633,9 @@ def type_encode_que(typetxt,chtxt,title,bt,et,opt):
         typetxting=recdblist.REC_ENCODE_LOCAL
         typetxtfin=recdblist.REC_FIN_LOCAL
     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)
+        if status.getEncoding() < int(configreader.getConfEnv("enc_max")):
+            recdb.deleteReckey(typetxtnow, title, chtxt, btime)
+            recdb.reserveReckey(typetxting, title, chtxt, btime, etime, opt)
             recdblist.printutf8(opt)
             pin = recpath + "/" + title + ".ts"
             if re.search("d", opt):
@@ -578,7 +644,7 @@ def type_encode_que(typetxt,chtxt,title,bt,et,opt):
                     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")
+                        tv2audio.ts2dualaudio_BonTsDemux(os.path.join(recpath, title+".ts"),recdblist.BONTSDEMUX_DELAY,opt)
                 time.sleep(3)
             elif re.search("5", opt):
                 pin = recpath + "/" + title + ".m2v"
@@ -586,11 +652,19 @@ def type_encode_que(typetxt,chtxt,title,bt,et,opt):
                     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"))
+                        tv2audio.ts2pentaaudio_BonTsDemux(os.path.join(recpath, title+".ts"), recdblist.BONTSDEMUX_DELAY, opt)
+                time.sleep(3)
+            elif re.search("b", opt):
+                pin = recpath + "/" + title + ".m2v"
+                if not os.path.exists(pin) or os.path.getsize(pin)<100*1000:
+                    paac2 = recpath + "/" + title + ".aac"
+                    pmp32 = recpath + "/" + title + ".mp3"
+                    if not os.path.exists(paac2) and not os.path.exists(pmp32):
+                        tv2audio.ts2single_fp_BonTsDemux(os.path.join(recpath, title+".ts"),opt)
                 time.sleep(3)
             makeMP4=0
             try:
-                if configreader.getenv("make_mp4")=="1":
+                if configreader.getConfEnv("make_mp4")=="1":
                     makeMP4=1
             except:
                 ""
@@ -599,34 +673,93 @@ def type_encode_que(typetxt,chtxt,title,bt,et,opt):
             if re.search("4", opt):
                 makeMP4=1
             recdblist.printutf8(pin)
-            if makeMP4==1:
-                pout = recpath + "/" + title + ".mp4"
-                tv2mp4.ts2mp4(pin, pout, opt)
+            if not re.search("0", opt):
+                if makeMP4==1:
+                    pout = recpath + "/" + title + ".mp4"
+                    tv2mp4.ts2mp4(pin, pout, opt)
+                else:
+                    pout = recpath + "/" + title + ".mkv"
+                    tv2mkv.ts2mkv(pin, pout, opt)
+                if re.search("1", opt) or re.search("2", opt):
+                    optt=opt.replace("1","MW1")
+                    optt=optt.replace("2","MW2")
+                    poutt = recpath + "/" + "m_"+title + ".mp4"
+                    if re.search("d", opt) or re.search("5", opt):
+                        if os.path.exists(os.path.join(recpath, "m_"+title+".m2v")):
+                            shutil.move(os.path.join(recpath, title+".m2v"),os.path.join(recpath, "m_"+title+".m2v"))
+                        if os.path.exists(os.path.join(recpath, "m_"+title+"_1.aac")):
+                            shutil.move(os.path.join(recpath, title+"_1.aac"),os.path.join(recpath, "m_"+title+"_1.aac"))
+                        if os.path.exists(os.path.join(recpath, "m_"+title+"_1.mp3")):
+                            shutil.move(os.path.join(recpath, title+"_1.mp3"),os.path.join(recpath, "m_"+title+"_1.mp3"))
+                        if os.path.exists(os.path.join(recpath, "m_"+title+"_2.aac")):
+                            shutil.move(os.path.join(recpath, title+"_2.aac"),os.path.join(recpath, "m_"+title+"_2.aac"))
+                        if os.path.exists(os.path.join(recpath, "m_"+title+"_2.mp3")):
+                            shutil.move(os.path.join(recpath, title+"_2.mp3"),os.path.join(recpath, "m_"+title+"_2.mp3"))
+                    shutil.move(os.path.join(recpath, title+".ts"),os.path.join(recpath, "m_"+title+".ts"))
+                    tv2mp4.ts2mp4(os.path.join(recpath, "m_"+title+".ts"), poutt, optt)
+                    shutil.move(os.path.join(recpath, "m_"+title+".ts"),os.path.join(recpath, title+".ts"))
             else:
-                pout = recpath + "/" + title + ".mkv"
-                tv2mkv.ts2mkv(pin, pout, opt)
-            recdb.del_reckey(typetxting, title, chtxt, btime)
+                optt=opt
+                poutt = recpath + "/" + "m_"+title + ".mp4"
+                shutil.move(os.path.join(recpath, title+".ts"),os.path.join(recpath, "m_"+title+".ts"))
+                if re.search("d", opt) or re.search("5", opt):
+                    if os.path.exists(os.path.join(recpath, "m_"+title+".m2v")):
+                        shutil.move(os.path.join(recpath, title+".m2v"),os.path.join(recpath, "m_"+title+".m2v"))
+                    if os.path.exists(os.path.join(recpath, "m_"+title+"_1.aac")):
+                        shutil.move(os.path.join(recpath, title+"_1.aac"),os.path.join(recpath, "m_"+title+"_1.aac"))
+                    if os.path.exists(os.path.join(recpath, "m_"+title+"_1.mp3")):
+                        shutil.move(os.path.join(recpath, title+"_1.mp3"),os.path.join(recpath, "m_"+title+"_1.mp3"))
+                    if os.path.exists(os.path.join(recpath, "m_"+title+"_2.aac")):
+                        shutil.move(os.path.join(recpath, title+"_2.aac"),os.path.join(recpath, "m_"+title+"_2.aac"))
+                    if os.path.exists(os.path.join(recpath, "m_"+title+"_2.mp3")):
+                        shutil.move(os.path.join(recpath, title+"_2.mp3"),os.path.join(recpath, "m_"+title+"_2.mp3"))
+                tv2mp4.ts2mp4(os.path.join(recpath, "m_"+title+".ts"), poutt, optt)
+                shutil.move(os.path.join(recpath, "m_"+title+".ts"),os.path.join(recpath, title+".ts"))
+            recdb.deleteReckey(typetxting, title, chtxt, btime)
             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"))
+                        try:
+                            shutil.copy(os.path.join(recpath,title+".mp4"), os.path.join(movepath,title+".mp4"))
+                        except:
+                            ""
+                        try:
+                            os.chmod(os.path.join(movepath,title+".mp4"),0777)
+                        except:
+                            ""
+                        recque.writeRecQue(movepath, chtxt, title, opt)
+                        try:
+                            os.chmod(os.path.join(movepath,title+".recq"),0777)
+                        except:
+                            ""
                     elif os.path.exists(os.path.join(recpath,title+".mkv")):
-                        shutil.copy(os.path.join(recpath,title+".mkv"), os.path.join(movepath,title+".mkv"))
+                        try:
+                            shutil.copy(os.path.join(recpath,title+".mkv"), os.path.join(movepath,title+".mkv"))
+                        except:
+                            ""
+                        try:
+                            os.chmod(os.path.join(movepath,title+".mkv"),0777)
+                        except:
+                            ""
+                        recque.writeRecQue(movepath, chtxt, title, opt)
+                        try:
+                            os.chmod(os.path.join(movepath,title+".recq"),0777)
+                        except:
+                            ""
                 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)
+                    errtxt1="move mkv/mp4 error."
+                    errtxt2=str(type(inst))+"\n"
+                    errtxt2=errtxt2+str(inst)
+                    recdblist.addCommonlogEX("Error", "type_encode_que(timerec.py)", errtxt1,errtxt2+traceback.format_exc(),log_level=200)
+                recdb.reserveReckey(recdblist.REC_MOVE_END, title, chtxt, btime, etime, opt)
+            recdb.reserveReckey(typetxtfin, title, chtxt, btime, etime, opt)
             sys.exit()
         else:
-            recdb.del_reckey(typetxtnow, title, chtxt, btime)
+            recdb.deleteReckey(typetxtnow, title, chtxt, btime)
             bt = bt + datetime.timedelta(seconds=600)
             et = et + 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(typetxtnow, title, chtxt, btime, etime, opt)
-            sys.exit()
\ No newline at end of file
+            recdb.reserveReckey(typetxtnow, title, chtxt, btime, etime, opt)
+            sys.exit()