OSDN Git Service

simplize codes.
authorgn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Mon, 1 Jun 2009 10:20:57 +0000 (10:20 +0000)
committergn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Mon, 1 Jun 2009 10:20:57 +0000 (10:20 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@32 4e526526-5e11-4fc0-8910-f8fd03428081

rec10/trunk/src/config.ini
rec10/trunk/src/encodetester.py [deleted file]
rec10/trunk/src/photorec.ses [deleted file]
rec10/trunk/src/recdb.py
rec10/trunk/src/tester.py
rec10/trunk/src/timerec.py
rec10/trunk/src/tv2avi.py

index 4a017c1..f1269a8 100644 (file)
@@ -10,7 +10,8 @@ tsepg2xml=/pt1-tools/tstools/tsEpg2xml/tsEpg2xml.exe
 temppath=/pt1-tools/temp
 recpath=/home/ftpusr/ftp3/Recording
 cmdow=/pt1-tools/tstools/cmdow.exe
-cmdwine=wine /pt1-tools/tstools/cmdow.exe /run /hid 
+cmdwine=wine /pt1-tools/tstools/cmdow.exe /run /hid
+gridserver_port=10910
 wine=wine 
 epg2xmlpath=/media/ramdisk
 
diff --git a/rec10/trunk/src/encodetester.py b/rec10/trunk/src/encodetester.py
deleted file mode 100644 (file)
index 0feb31d..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/python
-# coding: UTF-8
-# Rec10 TS Recording Tools
-# Copyright (C) 2009 Yukikaze
-import tv2ts
-import datetime
-import os
-import shutil
-recpath="/home/ftpusr/ftp1/Recording/enctest/"
-tspath="/home/ftpusr/ftp1/Recording/enctest/src.ts"
-tv2ts.tv2ts(tspath,"CS16","333", "300")
-max=1+2+4+8+16+32
-recpath="/home/ftpusr/ftp1/Recording/enctest/"
-tspath="/home/ftpusr/ftp1/Recording/enctest/src.ts"
-def doencode(i):
-    global recpath,tspath
-
-    if i>=32:
-        i=i-32
-        ##setting yuki_0904
-        t1=datetime.datetime.now()
-        encvf="-vf pullup,softskip,pp=dr,hqdn3d,scale=720:480,harddup"
-        x264opts="bitrate=1500:threads=auto"
-        fn="yuki_0904"
-        encode(tspath,encvf,x264opts,recpath+fn+".avi")
-        dt=datetime.datetime.now()-t1
-        dt=str(dt.seconds)
-        shutil.move(recpath+fn+".avi", recpath+"("+dt+"s)"+fn+".avi")
-    if i>=16:
-        ##ageha's setting
-        i=i-16
-        t1=datetime.datetime.now()
-        encvf="-vf pullup,softskip,pp=l5,hqdn3d=4:3:6,scale=720:480,harddup"
-        x264="bitrate=1500:cabac:keyint=240:keyint_min=1:scenecut=55"
-        x264=x264+":bframes=2:b_adapt:weight_b:nob_pyramid:qp_min=10:qp_max=51:qp_step=4:"
-        x264=x264+"qcomp=0.6:ratetol=4:deblock:deblockalpha=0:deblockbeta=0"
-        x264=x264+":cqm=jvt:nofast_pskip:direct_pred=3:psnr:pass=2:me=3:subq=7:frameref=5:"
-        x264=x264+"mixed_refs:8x8dct:i8x8:8x8mv:b8x8mv:i4x4:4x4mv:trellis=2:brdo:bime:threads=auto"
-        fn="ageha"
-        encode(tspath,encvf,x264opts,recpath+fn+".avi")
-        dt=datetime.datetime.now()-t1
-        dt=str(dt.seconds)
-        shutil.move(recpath+fn+".avi", recpath+"("+dt+"s)"+fn+".avi")
-    if i>=8:
-        i=i-8
-        ##setting yuki_now-dr-noisefilter
-        t1=datetime.datetime.now()
-        encvf="-vf pullup,softskip,pp=l5,scale=720:480,harddup"
-        x264opts="bitrate=1500:threads=auto"
-        fn="yuki_0904-dr-hqdn3d"
-        encode(tspath,encvf,x264opts,recpath+fn+".avi")
-        dt=datetime.datetime.now()-t1
-        dt=str(dt.seconds)
-        shutil.move(recpath+fn+".avi", recpath+"("+dt+"s)"+fn+".avi")
-    if i>=4:
-        i=i-4
-        ##setting yuki_now-dr-noisefilter
-        t1=datetime.datetime.now()
-        encvf="-vf pullup,softskip,pp=l5,scale=720:480,harddup"
-        x264opts="bitrate=1500:threads=auto"
-        fn="yuki_0904-dr-hqdn3d"
-        encode(tspath,encvf,x264opts,recpath+fn+".avi")
-        dt=datetime.datetime.now()-t1
-        dt=str(dt.seconds)
-        shutil.move(recpath+fn+".avi", recpath+"("+dt+"s)"+fn+".avi")
-    if i>=2:
-        i=i-2
-    if i>=1:
-        ""
-def encode(inTsPath,encodeVFopts,x264opts,outPath):
-    exe="mencoder \'"+inTsPath+"\' -ovc x264 "+encodeVFopts+" -x264encopts "+x264opts+" -oac mp3lame -lameopts cbr:br=128 -o \'"+outPath+"\'"
-    exe="/usr/bin/nice -n 19 "+exe
-    print "Now. encoding..."+exe
-    os.system(exe)
-def main():
-    doencode(54)
-
-main()
\ No newline at end of file
diff --git a/rec10/trunk/src/photorec.ses b/rec10/trunk/src/photorec.ses
deleted file mode 100644 (file)
index 4a4df6d..0000000
Binary files a/rec10/trunk/src/photorec.ses and /dev/null differ
index a6d7ee0..76b029f 100644 (file)
@@ -1,18 +1,37 @@
+import recdb
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
 # Copyright (C) 2009 Yukikaze
 import os
 import sqlite3
-#import japanesenkf
-#japanesenkf.overrideEncodings()
 dbpath=str(os.path.dirname(os.path.abspath(__file__)))+"/"+"ch.db"
 db=sqlite3.connect(dbpath)
-#try:
-#db.execute('drop table rectime')
-#db.commit()
-#except:
-    #  test=""
+
+global REC_RESERVE
+REC_RESERVE="res"
+global REC_FINAL_RESERVE
+REC_FINAL_RESERVE="rec"
+global REC_END
+REC_END="end"
+global REC_GRID
+REC_GRID="grid"
+global REC_ENCODE_QUE
+REC_ENCODE_QUE="ts2avi"
+global REC_MIXING_SOUND
+REC_MIXING_SOUND="mixsound"
+global REC_MISS_ENCODE
+REC_MISS_ENCODE="miss"
+global REC_KEYWORD
+REC_KEYWORD="key"
+global REC_KEYWORD_EVERY_SOME_DAYS
+REC_KEYWORD="keyevery"
+global REC_FIN_DECODE
+REC_FIN_DECODE="tsfin"
+global REC_MISS_DECODE
+REC_MISS_DECODE="tsmiss"
+global REC_TS_DECODING
+REC_MISS_DECODE="tsdecoding"
 try:
     db.execute('create table rectime (type TEXT,chtxt TEXT,title TEXT,btime TEXT,etime TEXT,deltatime TEXT,deltaday TEXT,opt TEXT,id INTEGER PRIMARY KEY,UNIQUE(type,chtxt,title,btime,deltaday))')
 except:
@@ -24,22 +43,35 @@ def recreserv(title,chtxt,btime,etime,opt):#optにはa(アニメ)d(副音声)v(x
     rec_reckey("res",title,chtxt,btime,etime,opt)
 def keyreserv(keyword,chtxt,btime,etime,deltatime,opt):
     db=sqlite3.connect(dbpath)
-    recline="\"key\",\""+chtxt+"\",\""+keyword+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+deltatime+"\",\""+opt+"\""
+    recline="\""+recdb.REC_KEYWORD+"\",\""+chtxt+"\",\""+keyword+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+deltatime+"\",\""+opt+"\""
     db.execute('insert into rectime ("type","chtxt","title","btime","etime","deltatime","opt") values ('+recline+')')
     db.commit()
     db.close()
 def everyreserv(keyword,chtxt,btime,etime,deltatime,opt,deltaday):
     db=sqlite3.connect(dbpath)
-    recline="\"keyevery\",\""+chtxt+"\",\""+keyword+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+deltatime+"\",\""+opt+"\",\""+deltaday+"\""
+    recline="\""+recdb.REC_KEYWORD_EVERY_SOME_DAYS+"\",\""+chtxt+"\",\""+keyword+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+deltatime+"\",\""+opt+"\",\""+deltaday+"\""
     db.execute('insert into rectime ("type","chtxt","title","btime","etime","deltatime","opt","deltaday") values ('+recline+')')
     db.commit()
     db.close()
 def lastrecreserv(title,chtxt,btime,etime,opt):#optにはa(アニメ)d(副音声)v(xvid)##btimeなどは2006-07-17 13:25:23の形
-    rec_reckey("rec",title,chtxt,btime,etime,opt)
+    """
+    Caution this is old function and you should not use it.
+    Please use rec_reckey(recdb.REC_FINAL_RESERVE,title,chtxt,btime,etime,opt) instead of lastrecreserv(title,chtxt,btime,etime,opt)
+    """
+    rec_reckey(recdb.REC_FINAL_RESERVE,title,chtxt,btime,etime,opt)
 def misrecwrite(title,chtxt,btime,etime,opt):
-    rec_reckey("miss",title,chtxt,btime,etime,opt)
+
+    """
+    Caution this is old function and you should not use it.
+    Please use rec_reckey(recdb.REC_MISS_ENCODE,title,chtxt,btime,etime,opt) instead.
+    """
+    rec_reckey(recdb.REC_MISS_ENCODE,title,chtxt,btime,etime,opt)
 def recend(title,chtxt,btime,etime,opt):#optにはa(アニメ)d(副音声)v(xvid)
-    rec_reckey("end",title,chtxt,btime,etime,opt)
+    """
+    Caution this is old function and you should not use it.
+    Please use rec_reckey(recdb.REC_END,title,chtxt,btime,etime,opt) instead.
+    """
+    rec_reckey(recdb.REC_END,title,chtxt,btime,etime,opt)
 def rec_reckey(type,title,chtxt,btime,etime,opt):
     db=sqlite3.connect(dbpath)
     recline="\""+type+"\",\""+chtxt+"\",\""+title+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+opt+"\""
@@ -47,21 +79,35 @@ def rec_reckey(type,title,chtxt,btime,etime,opt):
     db.commit()
     db.close()
 def delrec(title,chtxt,btime):
-    del_reckey("res",title,chtxt,btime)
+    """
+    Caution this is old function and you should not use it.
+    Please use del_reckey(recdb.REC_RESERVE,title,chtxt,btime) instead.
+    """
+    del_reckey(recdb.REC_RESERVE,title,chtxt,btime)
 def delkey(keyword,chtxt,btime,deltatime):
-    db=sqlite3.connect(dbpath)
-    db.execute("delete from rectime where deltatime = \'"+deltatime+"\' AND type = \'key\' AND title = \'"+keyword+"\' AND chtxt = \'"+chtxt+"\' AND btime = datetime(\""+btime+"\")")
-    db.commit()
-    db.close()
+    """
+    Caution this is old function and you should not use it.
+    Please use del_reckey(recdb.REC_FINAL_RESERVE,keyword,chtxt,btime) instead.
+    """
+    del_reckey(recdb.REC_KEYWORD,keyword,chtxt,btime)
 def dellastrec(title,chtxt,btime):
-    del_reckey("rec",title,chtxt,btime)
+    """
+    Caution this is old function and you should not use it.
+    Please use del_reckey(recdb.REC_FINAL_RESERVE,title,chtxt,btime) instead.
+    """
+    del_reckey(recdb.REC_FINAL_RESERVE,title,chtxt,btime)
 def delevery(keyword,chtxt,btime,deltatime,deltaday):
-    db=sqlite3.connect(dbpath)
-    db.execute("delete from rectime where deltaday = \'"+deltaday+"\' AND deltatime = \'"+deltatime+"\' AND type = \'keyevery\' AND title = \'"+keyword+"\' AND chtxt = \'"+chtxt+"\' AND btime = datetime(\""+btime+"\")")
-    db.commit()
-    db.close()
+    """
+    Caution this is old function and you should not use it.
+    Please use del_reckey(recdb.REC_FINAL_RESERVE,keyword,chtxt,btime) instead.
+    """
+    del_reckey(recdb.REC_KEYWORD_EVERY_SOME_DAYS,keyword,chtxt,btime)
 def delend(title,chtxt,btime):
-    del_reckey("end",title,chtxt,btime)
+    """
+    Caution this is old function and you should not use it.
+    Please use del_reckey(recdb.REC_END,title,chtxt,btime) instead.
+    """
+    del_reckey(recdb.REC_END,title,chtxt,btime)
 def deltitle(key):
     db=sqlite3.connect(dbpath)
     i=0
@@ -78,8 +124,6 @@ def del_reckey(type,title,chtxt,btime):
     db.close()
 def getnow(dhour):
     db=sqlite3.connect(dbpath)
-    recdata=[]
-    db.execute("DELETE FROM rectime WHERE NOT ( type = \"miss\" OR type = \"keyevery\" ) AND btime < datetime(\'now\',\'localtime\',\'-"+dhour+" hours\')")
     for typet, chtxt, title, btime, etime, deltatime ,deltaday ,opt in db.execute("SELECT type, chtxt, title, DATETIME(btime), DATETIME(etime), deltatime ,deltaday ,opt FROM rectime WHERE btime < datetime(\'now\',\'localtime\',\'+"+dhour+" hours\') AND btime >datetime(\'now\',\'localtime\',\'-"+dhour+" hours\')"):
         ret={}
         ret['type']=typet
@@ -97,6 +141,14 @@ def getnow(dhour):
     db.commit()
     db.close()
     return recdata
+def delete_old(dhour):
+    """
+    delete keys except recdb.REC_MISS_ENCODE and recdb.REC_KEYWORD_EVERY_SOME_DAYS before dhour hours from now.
+    """
+    db=sqlite3.connect(dbpath)
+    db.execute("DELETE FROM rectime WHERE NOT ( type = \""+recdb.REC_MISS_ENCODE+"\" OR type = \""+recdb.REC_KEYWORD_EVERY_SOME_DAYS+"\" ) AND btime < datetime(\'now\',\'localtime\',\'-"+dhour+" hours\')")
+    db.commit()
+    db.close()
 def getall():
     db=sqlite3.connect(dbpath)
     recdata=[]
index ad61ffb..229de2c 100644 (file)
@@ -16,4 +16,4 @@ import ts2x264
 #import datetime
 path=str(os.path.dirname(os.path.abspath(__file__)))+"/"
 recordingpath="/home/ftpusr/ftp3/Recording/"
-recordedpath="/home/ftpusr/ftp3/Recorded/"
+recordedpath="/home/ftpusr/ftp3/Recorded/"
\ No newline at end of file
index 823161d..7c90a1e 100644 (file)
@@ -11,7 +11,6 @@ import configreader
 #import japanesenkf
 import ts2x264
 import tv2avi
-import tv2ts
 import recdb
 import chdb
 import status
@@ -24,7 +23,9 @@ def task():
     数分毎に実行されるタスク処理
     予定によって子プロセスを生成し処理する。
     """
+    recdb.delete_old("6")
     tasks=recdb.getnow("1")
+
     #tasks=recdb.getall()
     print tasks
     if len(tasks)==0:
@@ -43,22 +44,47 @@ def task():
                     print bctype
                     epgdb.updatebc(bctype)
                 sys.exit(0)
+
     for task in tasks:
-        #value=line.split(",")
-        if task["type"]=="res":#"res,"+chtxt+","+title+","+btime+","+etime+","+opt
+        try:
             chtxt=task['chtxt']
+        except:
+            chtxt=""
+        try:
             title=task['title']
+        except:
+            title=""
+        try:
             btime=task['btime']
+            bt=datetime.datetime.strptime(btime,"%Y-%m-%d %H:%M:%S")
+        except:
+            btime=""
+            bt=datetime.datetime.strptime("2009-01-01 00:00:00","%Y-%m-%d %H:%M:%S")
+        try:
             etime=task['etime']
+            et=datetime.datetime.strptime(etime,"%Y-%m-%d %H:%M:%S")
+        except:
+            etime=""
+            et=datetime.datetime.strptime("2009-01-01 00:00:00","%Y-%m-%d %H:%M:%S")
+        try:
             opt=task['opt']
-            bt=datetime.datetime.strptime(btime,"%Y-%m-%d %H:%M:%S")
+        except:
+            opt=""
+        dtt=bt-tnow#
+        dt=dtt.days*24*60*60+dtt.seconds
+        #value=line.split(",")
+        if task["type"]==recdb.REC_RESERVE:#"res,"+chtxt+","+title+","+btime+","+etime+","+opt
+            """bt=datetime.datetime.strptime(btime,"%Y-%m-%d %H:%M:%S")
             tnow=datetime.datetime.now()
             dt=bt-tnow
             dt=dt.days*24*60*60+dt.seconds
             print dt
+            """
             if dt<58*60*60:
-                recdb.delrec(title,chtxt,btime)
-                recdb.lastrecreserv(title,chtxt,btime,etime,opt)
+                recdb.del_reckey(recdb.REC_RESERVE, title, chtxt, btime)
+                #recdb.delrec(title,chtxt,btime)
+                recdb.rec_reckey(recdb.REC_FINAL_RESERVE, title, chtxt, btime, etime, opt)
+                #recdb.lastrecreserv(title,chtxt,btime,etime,opt)
                 """if dt >30*60:
                     pid=os.fork()
                     if pid>0:#親プロセスの場合
@@ -68,60 +94,71 @@ def task():
                         sys.exit(0)
                 """
                 
-        elif task["type"]=="key":#"key,"+chtxt+","+keyword+","+btime+","+deltatime+","+opt
+        elif task["type"]==recdb.REC_KEYWORD:#"key,"+chtxt+","+keyword+","+btime+","+deltatime+","+opt
+            """
             chtxt=task['chtxt']
             #title=task['title']
             btime=task['btime']
             etime=task['etime']
             keyword=task['title']
+            """
             deltatime=task['deltatime']
-            opt=task['opt']
-            bt=datetime.datetime.strptime(btime,"%Y-%m-%d %H:%M:%S")
-            tnow=datetime.datetime.now()
-            dt=bt-tnow
-            dt=dt.days*24*60*60+dt.seconds
+            #opt=task['opt']
+            #bt=datetime.datetime.strptime(btime,"%Y-%m-%d %H:%M:%S")
+            #tnow=datetime.datetime.now()
+            #dt=bt-tnow
+            #dt=dt.days*24*60*60+dt.seconds
             #print dt
+
             if dt<30*60*60:
-                recdata=epgdb.searchtime(keyword,btime,deltatime)
+                recdatum=epgdb.searchtime(title,btime,deltatime)
                 if len(recdata)>0:
-                    recdb.delkey(keyword,chtxt,btime,deltatime)
-                    recdata=recdata[0]
-                    #print recdata
-                    recds=recdata.split(",")
-                    chtxt=recds[0]
-                    title=recds[1]
-                    btime=recds[2]
-                    etime=recds[3]
-                    bt=datetime.datetime.strptime(btime,"%Y-%m-%d %H:%M:%S")
-                    et=datetime.datetime.strptime(etime,"%Y-%m-%d %H:%M:%S")
-                    btime=bt.strftime("%Y-%m-%d %H:%M:%S")
-                    etime=et.strftime("%Y-%m-%d %H:%M:%S")
-                    recdb.lastrecreserv(title,chtxt,btime,etime,opt)
-        elif task["type"]=="keyevery":#"keyevery,"+chtxt+","+keyword+","+btime+","+deltatime+","+opt+","+deltaday
-            chtxt=task['chtxt']
+                    #recdb.delkey(title,chtxt,btime,deltatime)
+                    recdb.del_reckey(recdb.REC_KEYWORD, title, chtxt, btime)
+                    for recdata in recdatum:
+                        recdata=recdata[0]
+                        #print recdata
+                        recds=recdata.split(",")
+                        chtxt=recds[0]
+                        title=recds[1]
+                        btime=recds[2]
+                        etime=recds[3]
+                        bt=datetime.datetime.strptime(btime,"%Y-%m-%d %H:%M:%S")
+                        et=datetime.datetime.strptime(etime,"%Y-%m-%d %H:%M:%S")
+                        btime=bt.strftime("%Y-%m-%d %H:%M:%S")
+                        etime=et.strftime("%Y-%m-%d %H:%M:%S")
+                        recdb.rec_reckey(recdb.REC_FINAL_RESERVE, title, chtxt, btime, etime, opt)
+                        #recdb.lastrecreserv(title,chtxt,btime,etime,opt)
+                else :
+                    print "nothing match"
+        elif task["type"]==recdb.REC_KEYWORD_EVERY_SOME_DAYS:#"keyevery,"+chtxt+","+keyword+","+btime+","+deltatime+","+opt+","+deltaday
+            """chtxt=task['chtxt']
             #title=task['title']
             btime=task['btime']
             etime=task['etime']
             keyword=task['title']
+            """
             deltatime=task['deltatime']
-            opt=task['opt']                    
+            #opt=task['opt']
             deltaday=task['deltaday']
             dd=datetime.timedelta(days=int(deltaday))
-            bt=datetime.datetime.strptime(btime,"%Y-%m-%d %H:%M:%S")
-            et=datetime.datetime.strptime(etime,"%Y-%m-%d %H:%M:%S")
-            tnow=datetime.datetime.now()
-            dt=bt-tnow
-            dtt=dt.days*24*60*60+dt.seconds
-            if dt.days<0:
-                recdb.delevery(keyword,chtxt,btime,deltatime,deltaday)
+            #bt=datetime.datetime.strptime(btime,"%Y-%m-%d %H:%M:%S")
+            #et=datetime.datetime.strptime(etime,"%Y-%m-%d %H:%M:%S")
+            #tnow=datetime.datetime.now()
+            #dt=bt-tnow
+            #dtt=dt.days*24*60*60+dt.seconds
+            if dtt.days<0:
+                #recdb.delevery(keyword,chtxt,btime,deltatime,deltaday)
+                recdb.del_reckey(recdb.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(keyword,chtxt,btxt,etxt,deltatime,opt,deltaday)
-            elif dtt<30*60*60:
+            elif dt<30*60*60:
                 recdb.keyreserv(keyword,chtxt,btime,etime,deltatime,opt)
-                recdb.delevery(keyword,chtxt,btime,deltatime,deltaday)
+                recdb.del_reckey(recdb.REC_KEYWORD_EVERY_SOME_DAYS, title, chtxt, btime)
+                #recdb.delevery(keyword,chtxt,btime,deltatime,deltaday)
                 bt=bt+dd
                 et=et+dd
                 btxt=bt.strftime("%Y-%m-%d %H:%M:%S")
@@ -138,24 +175,27 @@ def task():
                     etime=recds[3]
                     recdb.lastrecreserv(title,chtxt,btime,etime,opt)
                 """
-        elif task["type"]=="rec":#"rec,"+chtxt+","+title+","+btime+","+etime+","+opt
-            chtxt=task['chtxt']
+        elif task["type"]==recdb.REC_FINAL_RESERVE:#"rec,"+chtxt+","+title+","+btime+","+etime+","+opt
+            """chtxt=task['chtxt']
             title=task['title']
             btime=task['btime']
             etime=task['etime']
+            
             #keyword=task['keyword']
             #deltatime==task['deltatime']
-            opt=task['opt']
+            #opt=task['opt']
             
             bt=datetime.datetime.strptime(btime,"%Y-%m-%d %H:%M:%S")
             tnow=datetime.datetime.now()
             dt=bt-tnow
             dt=dt.days*24*60*60+dt.seconds
             #print "dt="+str(dt)
+            """
             if dt<6*60*60:
-                recdb.dellastrec(title,chtxt,btime)
+                #recdb.dellastrec(title,chtxt,btime)
+                recdb.del_reckey(recdb.REC_FINAL_RESERVE, title, chtxt, btime)
                 #recdb.recend(title,chtxt,btime,etime,opt)
-                recdb.rec_reckey("tsfin", title, chtxt, btime, etime, opt)
+                recdb.rec_reckey(recdb.REC_TS_DECODING, title, chtxt, btime, etime, opt)
                 print "録画開始"
                 pid=os.fork()
                 if pid>0:#親プロセスの場合
@@ -164,25 +204,16 @@ def task():
                     #print title
                     tv2avi.timetv2avi(recpath+"/"+title+".avi",chtxt,btime,etime,opt)
                     if not os.access(recpath+"/"+title+".ts", os.F_OK):
-                        recdb.del_reckey("tsfin", title, chtxt, btime)
-                        recdb.rec_reckey("tsmiss", title, chtxt, btime, etime, opt)
+                        #recdb.del_reckey("tsfin", title, chtxt, btime)
+                        recdb.del_reckey(recdb.REC_TS_DECODING, title, chtxt, btime)
+                        recdb.rec_reckey(recdb.REC_MISS_DECODE, title, chtxt, btime, etime, opt)
+                    else:
+                        recdb.rec_reckey(recdb.REC_ENCODE_QUE,title,chtxt,btime,etime,opt)
+                        recdb.del_reckey(recdb.REC_TS_DECODING, title, chtxt, btime)
+                        recdb.rec_reckey(recdb.REC_FIN_DECODE,title,chtxt,btime,etime,opt)
                     sys.exit(0)
-        elif task["type"]=="b25-avi":
-            title=task['title']
-            opt=task['opt']
-            pid=os.fork()
-            """if pid>0:#親プロセスの場合
-                    ""
-                else:
-                    #print title
-                    tv2avi.b252avi(recpath+"/"+title+".avi", chtxt,opt)
-                    #tv2avi.timetv2avi(recpath+"/"+title+".avi",chtxt,btime,etime,opt)
-                    if not os.access(recpath+"/"+title+".avi", os.F_OK):
-                        recdb.delend(title,chtxt,btime)
-                        recdb.misrecwrite(title,chtxt,btime,etime,opt)
-                    sys.exit(0)"""
-        elif task["type"]=="ts2avi":
-            title=task['title']
+        elif task["type"]==recdb.REC_ENCODE_QUE:
+            """title=task['title']
             opt=task['opt']
             btime=task['btime']
             etime=task['etime']
@@ -192,6 +223,8 @@ def task():
             et=datetime.datetime.strptime(etime,"%Y-%m-%d %H:%M:%S")
             dt=bt-tnow
             dt=dt.days*24*60*60+dt.seconds
+            
+            """
             if dt<10*60:
                 if status.getEncoding()<2:
                     pid=os.fork()
@@ -214,9 +247,9 @@ def task():
                         #tv2avi.timetv2avi(recpath+"/"+title+".avi",chtxt,btime,etime,opt)
                         sys.exit(0)
                 else:
-                    recdb.del_reckey("ts2avi",title,chtxt,btime)
+                    recdb.del_reckey(recdb.REC_ENCODE_QUE,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("ts2avi",title,chtxt,btime,etime,opt)
+                    recdb.rec_reckey(recdb.REC_ENCODE_QUE,title,chtxt,btime,etime,opt)
index 56f6af2..934a556 100644 (file)
@@ -77,7 +77,6 @@ def timetv2avi(pout, chtxt, btime, etime,opt):
     et=datetime.datetime.now()+datetime.timedelta(seconds=600)
     etime=et.strftime("%Y-%m-%d %H:%M:%S")
     title=os.path.split(tsout)[1]
-    recdb.rec_reckey("ts2avi",title,chtxt,btime,etime,opt)
     #try:
     #    os.remove(aviin)
     #except: