fix miss.

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

diff --git a/rec10/trunk/src/readme.txt b/rec10/trunk/src/readme.txt
index b4401e2..c3273fe 100644 (file)
--- a/rec10/trunk/src/readme.txt
+++ b/rec10/trunk/src/readme.txt
@@ -79,6 +79,7 @@ epg_chを変更(ontvの削除)
 キーワード予約の自動実行オプション追加(in_auto_jbkにauto,optの追加)
 番組初頭の解像度変更に対応
 キーワード予約自動実行オプションの重複チェック実装
+延長対応機能の修正
 
 10/10/09 0.9.8 release
 インターレース保持エンコードに対応

diff --git a/rec10/trunk/src/tester.py b/rec10/trunk/src/tester.py
index 94b8b12..014cc6b 100644 (file)
--- a/rec10/trunk/src/tester.py
+++ b/rec10/trunk/src/tester.py
@@ -6,7 +6,6 @@
 import epgdb
 import os
 import time
-from ts2x264 import ts2x264
 import tv2avi
 import tv2mkv
 import checker

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index da606d4..928cbf1 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -301,7 +301,7 @@ def type_reserve(typetxt,chtxt,title,bt,et,opt):
     if (dt < 58 * 60 and dt > 30 * 60):\r
         bctypet = chdb.searchCHFromChtxt(chtxt)['bctype']\r
         chdatat = rec10d.rec10db.select_by_bctype_epg_ch(bctypet)\r
-        dt1=bt-datetime.datetime.strptime(chdatat[0][4], "%Y-%m-%d %H:%M:%S")\r
+        dt1 = bt - datetime.datetime.strptime(chdatat[0][4], "%Y-%m-%d %H:%M:%S")\r
         dt1 = dt1.days * 24 * 60 * 60 + dt1.seconds\r
         if dt1 < 60 * 60:\r
             recdata = epgdb.searchTime(title, btime, "5", chtxt)\r
@@ -438,7 +438,7 @@ def type_keyword(typetxt,chtxt,title,bt,et,opt,deltatime):
     dtt = bt-tnow\r
     dt = dtt.days * 24 * 60 * 60 + dtt.seconds\r
     recdblist.printutf8(str(dt), verbose_level=800)\r
-    if dt < 90 * 60:\r
+    if dt <= 90 * 60 and dt > 70 * 60:\r
         recdata = epgdb.searchTime(title, btime, deltatime, chtxt)\r
         if recdata[1] != "":\r
             chtxtt = recdata[0]\r
@@ -465,6 +465,11 @@ def type_keyword(typetxt,chtxt,title,bt,et,opt,deltatime):
             #    recdblist.printutf8(inst)\r
         else:\r
             recdblist.printutf8("nothing match")\r
+    elif dt <= 70 * 60:\r
+        recdb.deleteReckey(typetxtnow, title, chtxt, btime)\r
+        recdb.reserveReckey(typetxtres, title, chtxt, btime, etime, opt)\r
+        recdblist.addCommonlogEX(u"エラー","timerec.py",u"nothing match","",log_level=200)\r
+        recdblist.addCommonlogEX(u"エラー","timerec.py",u"key "+title+u" : "+titlet+u" "+btimet+u" "+etimet,"",log_level=200)\r
 def type_keyword_every_day(type,chtxt,title,bt,et,opt,deltatime,deltaday,counter):\r
     btime = bt.strftime("%Y-%m-%d %H:%M:%S")\r
     etime = et.strftime("%Y-%m-%d %H:%M:%S")\r

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 824b357..b231a20 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -157,6 +157,8 @@ def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
         x264preset=u"slow"\r
     elif quality==6:\r
         x264preset=u"slower"\r
+    else:\r
+        x264preset=u"medium"\r
     if size == "WVGA_BASE" or size == "QVGA_BASE":\r
         x264profile=" --level 32 --profile baseline "\r
     else:\r
@@ -252,6 +254,8 @@ def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
         x264preset=u"slow"\r
     elif quality==6:\r
         x264preset=u"slower"\r
+    else:\r
+        x264preset=u"medium"\r
     if size == "WVGA_BASE" or size == "QVGA_BASE":\r
         x264profile=" --level 32 --profile baseline "\r
     else:\r

diff --git a/rec10/trunk/src/xml2db_dom.py b/rec10/trunk/src/xml2db_dom.py
index f430cd9..27a03fc 100644 (file)
--- a/rec10/trunk/src/xml2db_dom.py
+++ b/rec10/trunk/src/xml2db_dom.py
@@ -95,7 +95,6 @@ def xml2db_dom(xmlpath, bctype):#bctypeは放送種別で'TE'(地デジ)BS,CSが
                                     recdb.reserveReckey(recdblist.REC_RESERVE,title,tch['chtxt'], bttime, ettime,topt)\r
                         else:\r
                             recdb.addAutoBayesKeyword(tch['chtxt'],title,start,stop,p)\r
-\r
     dom.unlink()\r
     if len(chlist) > 0:\r
         writeMultiCHDB(chlist)\r