OSDN Git Service

implement new log system.
[rec10/rec10-git.git] / rec10 / trunk / src / timerec.py
index 48b2aa9..58a2c3c 100644 (file)
@@ -33,7 +33,7 @@ def task():
     予定によって子プロセスを生成し処理する。
     """
     try:
-        if rec10d.rec10db.select_installed_in_status()==0:
+        if rec10d.rec10db.select_installed_in_status()==0 or rec10d.rec10db.select_version_in_status()<recdblist.version:
             install.install()
     except:
         install.install()
@@ -62,6 +62,8 @@ def task():
         else:
             time.sleep(10)
             auto_process.auto_check(recpath)
+            time.sleep(10)
+            auto_process.kill_dead_encode(recpath)
             sys.exit()
     update = chdb.update()
     if len(update) > 0:
@@ -81,7 +83,7 @@ def task():
                     recdblist.printutf8(u"放送種別:"+bctype + u"||該当チューナー実行中件数:" + str(status.getBSCSRecording()) + u":直近予約件数:" + str(recdb.countRecNow_minutes_BSCS("10")))
                     recnum = int(configreader.getenv("bscs_max")) -recnum
                 if recnum >0 :
-                    print update
+                    recdblist.printutf8(str(update))
                     rec10d.rec10db.update_status_by_bctype_epg_ch(bctype, "0")
                     epgdb.updatebc(bctype)
                     update = chdb.update()
@@ -145,11 +147,15 @@ def task():
         elif task["type"] == recdblist.REC_KEYWORD_EVERY_SOME_DAYS:#"keyevery,"+chtxt+","+keyword+","+btime+","+deltatime+","+opt+","+deltaday
             deltatime = task['deltatime']
             deltaday = task['deltaday']
+            try:
+                keyeverycounter=task['counter']
+            except:
+                keyeverycounter=-1
             pid = os.fork()
             if pid != 0:#親プロセスの場合
                 ""
             else:#子プロセスの場合 アップデートを行って終了
-                type_keyword_every_day(task["type"],chtxt, title, bt, et, opt, deltatime, deltaday)
+                type_keyword_every_day(task["type"],chtxt, title, bt, et, opt, deltatime, deltaday,keyeverycounter)
                 sys.exit()
         elif task["type"] == recdblist.REC_FINAL_RESERVE:#"rec,"+chtxt+","+title+","+btime+","+etime+","+opt
             pid = os.fork()
@@ -266,16 +272,12 @@ def search_keyword(key):
                             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)
+                        recdblist.Commonlogex("Error", "search_keyword_auto_jbk(timerec.py)", str(type(inst)),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.Commonlogex("Error", "search_keyword(timerec.py)", str(type(inst)),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")
@@ -313,9 +315,7 @@ def type_reserve(typetxt,chtxt,title,bt,et,opt):
                     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 str(type(inst))
-                    print str(inst)
+                    recdblist.Commonlogex("Error", "Oikake DB(timerec.py)", str(type(inst)),str(inst))
             else:
                 recdblist.printutf8(u"追いかけ機能エラー:番組データが見付かりません。")
         else:
@@ -342,18 +342,16 @@ 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(u"追いかけ機能実行中: "+title+" : "+titlen+" "+btimen+" "+etimen)
+                #recdblist.printutf8(u"追いかけ機能実行中: "+title+" : "+titlen+" "+btimen+" "+etimen)
+                recdblist.Commonlogex(u"通常", "Oikake (timerec.py)",u"追いかけ機能実行中",u"追いかけ機能実行中: "+title+" : "+titlen+" "+btimen+" "+etimen)
             except Exception, inst:
-                print "Error happened in Oikake DB"
-                print type(inst)
-                print inst
+                recdblist.Commonlogex("Error", "Oikake DB(timerec.py)", str(type(inst)),str(inst))
     elif dt <= 20 * 60:
         try:
             recdb.del_reckey(typetxtnow, title, chtxt, btime)
             recdb.rec_reckey(typetxtfinal, title, chtxt, btime, etime, opt)
         except Exception, inst:
-            print type(inst)
-            print inst
+            recdblist.Commonlogex("Error", "Oikake DB(timerec.py)", str(type(inst)),str(inst))
 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")
@@ -366,7 +364,6 @@ 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)
@@ -388,7 +385,7 @@ def type_final(typetxt,chtxt,title,bt,et,opt):
             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)
+        recdblist.Commonlogex(u"通常","timerec.py",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):
@@ -439,15 +436,14 @@ def type_keyword(typetxt,chtxt,title,bt,et,opt,deltatime):
             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)
+            recdblist.Commonlogex(u"通常","timerec.py",u"key "+title+u" : "+titlet+u" "+btimet+u" "+etimet,"")
             #except Exception, inst:
             #    recdblist.printutf8("Error happened in REC_KEYWORD DB")
             #    recdblist.printutf8(type(inst))
             #    recdblist.printutf8(inst)
         else:
             recdblist.printutf8("nothing match")
-
-def type_keyword_every_day(type,chtxt,title,bt,et,opt,deltatime,deltaday):
+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")
     tnow = datetime.datetime.now()
@@ -467,8 +463,10 @@ def type_keyword_every_day(type,chtxt,title,bt,et,opt,deltatime,deltaday):
         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.everyreserv(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)
         if recdata[1] != "":
             chtxtt = recdata[0]
@@ -514,8 +512,14 @@ def type_decode_que(typetxt,chtxt,title,bt,et,opt):
                 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
+                cstch=-1
+                try:
+                    cstch=int(chdb.chtxtsearch(chtxt)['csch'])
+                except:
+                    cstch=-1
+                if cstch>-1:
+                    ch=checker.checkB25Decode(recpath + "/" + title + ".ts.b25", recpath + "/" + title + ".ts",cstch)
+                #print ch
                 if ch == 1:
                     os.remove(recpath + "/" + title + ".ts.b25")
             bt = datetime.datetime.strptime(btime, "%Y-%m-%d %H:%M:%S")
@@ -532,11 +536,10 @@ def type_decode_que(typetxt,chtxt,title,bt,et,opt):
                 try:
                     shutil.copy(os.path.join(recpath,title+".ts"), os.path.join(movepath,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")
+                    errtxt1="move ts error.\n"
+                    errtxt2=str(type(inst))+"\n"
+                    errtxt2=errtxt2+str(inst)
+                    recdblist.Commonlogex("Error", "type_decode_que(timerec.py)", errtxt1,errtxt2)
                 recdb.rec_reckey(recdblist.REC_MOVE_END, title, chtxt, btime, etime, opt)
         else:
             recdb.del_reckey(typetxtnow, title, chtxt, btime)
@@ -581,9 +584,17 @@ def type_encode_que(typetxt,chtxt,title,bt,et,opt):
                     if not os.path.exists(paac2) and not os.path.exists(pmp32):
                         tv2avi.pentaaudio2sep(os.path.join(recpath, title+".ts"))
                 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 + "_1.aac"
+                    pmp32 = recpath + "/" + title + "_1.mp3"
+                    if not os.path.exists(paac2) and not os.path.exists(pmp32):
+                        tv2avi.singleaudio2sep(os.path.join(recpath, title+".ts"))
+                time.sleep(3)
             makeMP4=0
             try:
-                if configreader.getenv("make_mp4")==1:
+                if configreader.getenv("make_mp4")=="1":
                     makeMP4=1
             except:
                 ""
@@ -592,12 +603,51 @@ 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("8", opt) or re.search("9", opt):
+                    optt=opt
+                    optt=optt.replace("8","MW8")
+                    optt=optt.replace("9","MW9")
+                    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)
+                optt=opt
+                optt=optt.replace("8","MW8")
+                optt=optt.replace("9","MW9")
+                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.del_reckey(typetxting, title, chtxt, btime)
             time.sleep(10)
             if re.search("E", opt):
@@ -607,11 +657,10 @@ def type_encode_que(typetxt,chtxt,title,bt,et,opt):
                     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")
+                    errtxt1="move mkv/mp4 error."
+                    errtxt2=str(type(inst))+"\n"
+                    errtxt2=errtxt2+str(inst)
+                    recdblist.Commonlogex("Error", "type_encode_que(timerec.py)", errtxt1,errtxt2)
                 recdb.rec_reckey(recdblist.REC_MOVE_END, title, chtxt, btime, etime, opt)
             recdb.rec_reckey(typetxtfin, title, chtxt, btime, etime, opt)
             sys.exit()