implemetn rec10 0.9.0 function.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@282 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index b192c0c..62a1400 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -83,7 +83,6 @@ def task():
                     break
             sys.exit()
     for task in tasks:
-        #recdblist.printutf8(task)
         typetxt = task["type"]
         try:
             chtxt = task['chtxt']
@@ -229,76 +228,6 @@ def task():
                     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()
@@ -415,9 +344,10 @@ 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(recdblist.REC_MOVE_END, ttitle, chtxt, btime, etime, opt)
+            recdb.rec_reckey(typetxtdecque, ttitle, chtxt, btime, etime, opt)
         else:
             shutil.copy(os.path.join(recpath,title+".ts.b25"), os.path.join(movepath,title+".ts.b25"))
+            recdb.rec_reckey(recdblist.REC_MOVE_END, ttitle, 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")
@@ -518,7 +448,7 @@ 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(recdblist.REC_MOVE_END, title, chtxt, btime, etime, opt)
+                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"))
@@ -526,6 +456,7 @@ def type_decode_que(typetxt,chtxt,title,bt,et,opt):
                     shutil.copy(os.path.join(recpath,title+".sa.avi"),os.path.join(movepath,title+".sa.avi"))
                 else:
                     shutil.copy(os.path.join(recpath,title+".ts"), os.path.join(movepath,title+".ts"))
+                recdb.rec_reckey(recdblist.REC_MOVE_END, title, chtxt, btime, etime, opt)
             #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")