fix remove error.

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

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index e94fb3e..5df5793 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -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()
@@ -88,6 +88,15 @@ 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:
         typetxt = task["type"]
@@ -173,10 +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)
-                    #tv2mp4.avi2mp4(os.path.join(recpath,title+".avi"),os.path.join(recpath,title+".mkv"),opt)
-                    tv2mkv.avi2mkv(os.path.join(recpath,title+".avi"),os.path.join(recpath,title+".mkv"),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)
                     sys.exit()
         elif task["type"] == recdblist.REC_AVI_TO_MP4:
@@ -185,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"),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)
                     sys.exit()
         elif task["type"] == recdblist.REC_MKV_TO_MP4:
@@ -351,7 +386,6 @@ def type_final(typetxt,chtxt,title,bt,et,opt):
             except:
                 iff=""
             newtime=bt
-            newtime=newtime+datetime.timedelta(seconds=10)
             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)
@@ -428,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
@@ -436,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")
@@ -532,9 +581,23 @@ 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)
-            pout = recpath + "/" + title + ".mkv"
+            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)
-            tv2mkv.ts2mkv(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)
             time.sleep(10)
             if re.search("E", opt):