add tsid channel information for complete BS support.

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

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 4937208..fd5068f 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
-# Copyright (C) 2009-2011 Yukikaze
+# Copyright (C) 2009-2012 Yukikaze
 import datetime
 import os
 import os.path
@@ -302,23 +302,24 @@ def search_keyword(key):
                 #if status.getSettings_auto_jbk()==1:
                 if auto==1 or status.getSettings_auto_jbk()==1:
                     topt=opt
-                    if topt!=None:
-                        if len(topt)==0:
-                            topt=status.getSettings_auto_opt()
-                        try:
-                            maxnum=0
-                            ch=chdb.searchCHFromChtxt(chtxtt)
-                            if len(ch['ch'])>2:
-                                maxnum=epgdb.countSchedule(btimet, etimet)[1]
-                                maxnum=int(configreader.getConfEnv("bscs_max"))-maxnum
-                            else:
-                                maxnum=epgdb.countSchedule(btimet, etimet)[0]
-                                maxnum=int(configreader.getConfEnv("te_max"))-maxnum
-                            if maxnum>0:
-                                if recdb.checkDuplicated(titlet, chtxtt, btimet, etimet)==0:
-                                    recdb.reserveReckey(recdblist.REC_RESERVE,titlet,chtxtt, btimet, etimet,topt)
-                        except Exception, inst:
-                            recdblist.addCommonlogEX("Error", "search_keyword_auto_jbk(timerec.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
+                    if topt==None:
+                        topt=status.getSettings_auto_opt()
+                    if len(topt)==0:
+                        topt=status.getSettings_auto_opt()
+                    try:
+                        maxnum=0
+                        ch=chdb.searchCHFromChtxt(chtxtt)
+                        if len(ch['ch'])>2:
+                            maxnum=epgdb.countSchedule(btimet, etimet)[1]
+                            maxnum=int(configreader.getConfEnv("bscs_max"))-maxnum
+                        else:
+                            maxnum=epgdb.countSchedule(btimet, etimet)[0]
+                            maxnum=int(configreader.getConfEnv("te_max"))-maxnum
+                        if maxnum>0:
+                            if recdb.checkDuplicated(titlet, chtxtt, btimet, etimet)==0:
+                                recdb.reserveReckey(recdblist.REC_RESERVE,titlet,chtxtt, btimet, etimet,topt)
+                    except Exception, inst:
+                        recdblist.addCommonlogEX("Error", "search_keyword_auto_jbk(timerec.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
                 try:
                     recdb.reserveAutoKeyword(chtxtt, titlet, btimet, etimet)
                 except Exception, inst:
@@ -336,7 +337,7 @@ def type_reserve(typetxt,chtxt,title,bt,et,opt):
     if (dt < 58 * 60 and dt > 30 * 60):
         bctypet = chdb.searchCHFromChtxt(chtxt)['bctype']
         chdatat = rec10d.rec10db.select_by_bctype_epg_ch(bctypet)
-        dt1 = bt - datetime.datetime.strptime(chdatat[0][4], "%Y-%m-%d %H:%M:%S")
+        dt1 = bt - datetime.datetime.strptime(chdatat[0][5], "%Y-%m-%d %H:%M:%S")
         dt1 = dt1.days * 24 * 60 * 60 + dt1.seconds
         if dt1 < 60 * 60:
             recdata = epgdb.searchTime(title, btime, "5", chtxt)
@@ -364,7 +365,7 @@ def type_reserve(typetxt,chtxt,title,bt,et,opt):
             else:
                 recdblist.printutf8(u"追いかけ機能エラー：番組データが見付かりません。")
         else:
-            if rec10d.rec10db.select_by_bctype_epg_ch(bctypet)[0][5] != "0":
+            if rec10d.rec10db.select_by_bctype_epg_ch(bctypet)[0][6] != "0":
                 rec10d.rec10db.update_status_by_bctype_epg_ch(bctypet, "3")
         sys.exit()
     elif (dt <= 30 * 60 and dt > 20 * 60):