make this to retry recording/epgts_getting.

add additional channel

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

diff --git a/rec10/trunk/src/chdata.py b/rec10/trunk/src/chdata.py
index f9b3c84..13a0407 100644 (file)
--- a/rec10/trunk/src/chdata.py
+++ b/rec10/trunk/src/chdata.py
@@ -64,6 +64,7 @@ chadd('cs', '1062.ontvjapan.com', 'disch', 'CS20', '340','CSDT340','ディスカ
 chadd('cs', '1193.ontvjapan.com', 'anipla', 'CS20', '341','CSDT341','アニマルプラネット')
 chadd('cs', '1008.ontvjapan.com', 'neco', 'CS6', '223','CSDT223','SPTV261')
 chadd('cs', '1015.ontvjapan.com', 'family', 'CS22', '293','CSDT293','ファミリー劇場')
+chadd('cs', '1213.ontvjapan.com', 'disney', 'CS4', '334','CSDT334','ディズニーチャンネル')
 chadd('cs', '1009.ontvjapan.com', 'yo-ga', 'CS6', '224','CSDT224','シネフィル・イマジカ')
 chadd('cs2', '1217.ontvjapan.com', 'thecinema', 'CS10', '228','CSDT228','none')
 chadd('cs2', '1086.ontvjapan.com', 'nihoneiga', 'CS2', '239','CSDT239','日本映画専門チャンネル')

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index d992637..bcf4b3c 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -127,8 +127,28 @@ 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(recdb.REC_TS_DECODING, title, chtxt, btime)
-                        recdb.rec_reckey(recdb.REC_MISS_DECODE, title, chtxt, btime, etime, opt)
+                        time.sleep(60)
+                        tnow2=datetime.datetime.now()
+                        dtt2=et-tnow
+                        dt2=dtt2.days*24*60*60+dtt2.seconds
+                        if dt2>0:
+                            title="rt-"+title
+                            tv2avi.timetv2avi(recpath+"/"+title+".avi",chtxt,btime,etime,opt)
+                        if not os.access(recpath+"/"+title+".ts", os.F_OK):
+                            recdb.del_reckey(recdb.REC_TS_DECODING, title, chtxt, btime)
+                            recdb.rec_reckey(recdb.REC_MISS_DECODE, title, chtxt, btime, etime, opt)
+                        else:
+                            recdb.del_reckey(recdb.REC_TS_DECODING, title, chtxt, btime)
+                            tnow=datetime.datetime.now()
+                            bt=datetime.datetime.strptime(btime,"%Y-%m-%d %H:%M:%S")
+                            et=datetime.datetime.strptime(etime,"%Y-%m-%d %H:%M:%S")
+                            dt=tnow-bt
+                            bt=tnow+datetime.timedelta(seconds=600)
+                            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(recdb.REC_ENCODE_QUE,title,chtxt,btime,etime,opt)
+                            recdb.rec_reckey(recdb.REC_FIN_DECODE,title,chtxt,btime,etime,opt)
                     else:
                         recdb.del_reckey(recdb.REC_TS_DECODING, title, chtxt, btime)
                         tnow=datetime.datetime.now()

diff --git a/rec10/trunk/src/ts2epg.py b/rec10/trunk/src/ts2epg.py
index 82b11d1..e9d5b30 100644 (file)
--- a/rec10/trunk/src/ts2epg.py
+++ b/rec10/trunk/src/ts2epg.py
@@ -27,7 +27,11 @@ def write(pout,ch):
     else :
         mode=chdb.bctypesearch('te'+ch)['ontv']
     tsepg2xml=configreader.getpath("tsepg2xml")
+    time.sleep(5)
     tv2ts.tv2tsmix(pout+".ts",ch,"180")
+    if not os.access(pout+".ts", os.F_OK):
+        time.sleep(10)
+        tv2ts.tv2tsmix(pout+".ts",ch,"180")
     exe="export LANG=ja_JP.UTF-8 && /usr/bin/nice -n 19 wine "+tsepg2xml+" "+mode+" "+pout+".ts >"+pout
     print exe
     os.system(exe)