implement ch scan system.(alpha)

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

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 24722c4..312f5ce 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -821,6 +821,14 @@ class DB_MySQL:
         db[1].execute("\
         UPDATE in_status SET installed=1")
         self.close_db(db)
+    def change_chscaned_in_status(self):
+        """
+        installedを設定する
+        """
+        db = self.connect_db()
+        db[1].execute("\
+        UPDATE in_status SET installed=2")
+        self.close_db(db)
     def new_epg_timeline(self, bctype):
         db = self.connect_db()
         try:

diff --git a/rec10/trunk/src/install.py b/rec10/trunk/src/install.py
index 4bfe4ee..90ef9ce 100644 (file)
--- a/rec10/trunk/src/install.py
+++ b/rec10/trunk/src/install.py
@@ -47,10 +47,14 @@ def install():
             recdblist.printutf8(u"DB処理中にエラーが出ました。configファイルのDB設定を見直してください。",verbose_level=100)
             recdblist.printutf8(str(type(inst)),verbose_level=100)
             recdblist.printutf8(str(inst)+"\n"+traceback.format_exc(),verbose_level=100)
+    import rec10d
+    rec10d.rec10db.change_installed_in_status()
     recdblist.printutf8(u"チャンネル設定に入ります",verbose_level=100)
     import scan_ch
+    rec10d.rec10db.new_epg_ch()
     recdblist.printutf8(u"チャンネルスキャンの開始",verbose_level=100)
     scan_ch.searchCh()
+    rec10d.rec10db.change_chscaned_in_status()
     #if os.path.exists(os.path.join(path,"chlist.xml")):
     #    recdblist.printutf8(u"チャンネルリストが見つかりました。||chlist.xml",verbose_level=100)
     #else:
@@ -63,8 +67,7 @@ def install():
     #chdata.new_chdata(bsok,csok)
     recdblist.printutf8(u"おめでとうございます　初期設定は完了しました。",verbose_level=100)
     recdblist.printutf8(u"rec10を実行するユーザーのcrontabに"+os.path.join(path,"rec10")+u"を追加してください(5分周期が目安)",verbose_level=100)
-    import rec10d
-    rec10d.rec10db.change_installed_in_status()
+    
 def getpath(cmd):
     printutf8(cmd+u"の場所を確認中")
     txt=commands.getoutput(u"which "+cmd)

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 9014625..2c693b5 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -37,6 +37,11 @@ def task():
     try:
         if rec10d.rec10db.select_installed_in_status()==0 or rec10d.rec10db.select_version_in_status()<recdblist.version:
             install.install()
+        elif rec10d.rec10db.select_installed_in_status()==1:
+            import scan_ch
+            rec10d.rec10db.new_epg_ch()
+            scan_ch.searchCh()
+            rec10d.rec10db.change_chscaned_in_status()
     except:
         install.install()
     recdb.delete_old("24")