From 216244ba103c0264bd03f027202d577b4cd7a3b4 Mon Sep 17 00:00:00 2001
From: gn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Date: Sun, 7 Nov 2010 12:11:50 +0000
Subject: [PATCH] implement ch scan system.(alpha)

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@745 4e526526-5e11-4fc0-8910-f8fd03428081
---
 rec10/trunk/src/dbMySQL.py | 22 +++++++++++++++++++---
 rec10/trunk/src/readme.txt |  5 ++++-
 rec10/trunk/src/timerec.py |  9 ++++++---
 rec10/trunk/src/ts2epg.py  |  2 +-
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 89b80ea..ba5c090 100644
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -28,7 +28,8 @@ class DB_MySQL:
             cur.close()
             con.close()
         except Exception, inst:
-            recdblist.Commonlogex("Error", "init (dbMySQL.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=800)
+            if not (type(inst)==MySQLdb.ProgrammingError and (inst[0] == 1007 or inst[0]==1050)):
+                recdblist.Commonlogex("Error", "init (dbMySQL.py)", str(type(inst)),str(inst)+traceback.format_exc(),log_level=200)
         db = self.connect_db()
         try:
             db[1].execute('\
@@ -673,6 +674,8 @@ class DB_MySQL:
             (\
             id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,\
             keyword VARCHAR(200),\
+            auto TINYINT DEFAULT 0,\
+            opt VARCHAR(20),\
             UNIQUE unijbk (keyword)\
             )")
         except:
@@ -690,7 +693,7 @@ class DB_MySQL:
     def select_all_in_auto_jbk_key(self):
         db = self.connect_db()
         dbexe = db[1].execute("\
-        SELECT keyword \
+        SELECT keyword,auto,opt \
         FROM in_auto_jbk_key \
         ")
         ret = []
@@ -1147,4 +1150,17 @@ class DB_MySQL:
         self.drop_in_settings()
         self.new_in_settings()
         self.close_db(db)
-        self.change_version_in_status("98")
\ No newline at end of file
+        self.change_version_in_status("98")
+    def update_db_98to99(self):
+        db = self.connect_db()
+        self.drop_in_settings()
+        self.new_in_settings()
+        db[1].execute("\
+        ALTER TABLE epg_ch DEL ontv")
+        db[1].execute("\
+        ALTER TABLE in_auto_jbk_key ADD auto TINYINT DEFAULT 0")
+        db[1].execute("\
+        ALTER TABLE in_auto_jbk_key ADD opt VARCHAR(20)")
+        self.close_db(db)
+        self.change_installed_in_status()#チャンネルスキャンをさせる
+        self.change_version_in_status("99")
\ No newline at end of file
diff --git a/rec10/trunk/src/readme.txt b/rec10/trunk/src/readme.txt
index 8b40cc5..5b1c10d 100644
--- a/rec10/trunk/src/readme.txt
+++ b/rec10/trunk/src/readme.txt
@@ -74,7 +74,10 @@ yukikaze.jp@gmail.com
 10// 0.9.9
 BonTsDemuxを最新版へ(nogui化によりXvfbが不要)
 一部CSチャンネルの追加
-epg_chを変更(ontvの削除、)
+epg_chを変更(ontvの削除)
+チャンネルスキャン機能を実装
+キーワード予約の自動実行オプション追加(in_auto_jbkにauto,optの追加)
+
 10/10/09 0.9.8 release
 インターレース保持エンコードに対応
 色空間を修正
diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 2c693b5..6984efc 100644
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -254,7 +254,7 @@ def task():
 def search_keyword(key):
     tnow = datetime.datetime.now()
     nows =tnow.strftime("%Y-%m-%d %H:%M:%S")
-    for k in key:
+    for k,auto,opt in key:
         recdatum = epgdb.searchtime_auto(k,nows, "144")
         for recdata in recdatum:
             if recdata[1] != "":
@@ -266,8 +266,11 @@ def search_keyword(key):
                 ett = datetime.datetime.strptime(etimet, "%Y-%m-%d %H:%M:%S")
                 btimet = btt.strftime("%Y-%m-%d %H:%M:%S")
                 etimet = ett.strftime("%Y-%m-%d %H:%M:%S")
-                if status.getSettings_auto_jbk()==1:
-                    topt=status.getSettings_auto_opt()
+                #if status.getSettings_auto_jbk()==1:
+                if auto==1 or status.getSettings_auto_jbk()==1:
+                    topt=opt
+                    if len(topt)==0:
+                        topt=status.getSettings_auto_opt()
                     try:
                         maxnum=0
                         if len(ch['ch'])>2:
diff --git a/rec10/trunk/src/ts2epg.py b/rec10/trunk/src/ts2epg.py
index 86636ad..6214e30 100644
--- a/rec10/trunk/src/ts2epg.py
+++ b/rec10/trunk/src/ts2epg.py
@@ -33,7 +33,7 @@ def write_time(pout, ch ,times):
     elif len(ch)>2:
         mode = "/BS"
     else:
-        mode = chdb.bctypesearch(u'te' + ch)['chtxt']
+        mode = str(chdb.bctypesearch(u'te' + ch)['ch'])
     epgdump = configreader.getpath("epgdump")
     if os.access(pout + ".ts", os.F_OK):
         os.remove(pout + ".ts")
-- 
2.11.0