implement mysql function.(RC1)

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

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 4be4ef0..4d3a450 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -5,6 +5,7 @@
 import recdb
 import os
 import MySQLdb
+import dbSQLite
 
 class DB_MySQL():
     dbname=""
@@ -119,7 +120,7 @@ class DB_MySQL():
         self.close_db(db)
     def add_rectime(self,type="", chtxt="", title="", btime="", etime="", deltatime="", deltaday="", opt=""):
         db = self.connect_db()
-        db[1].execute('insert into rectime (type,chtxt,title,btime,etime,deltatime,deltaday,opt) values (%s,%s,%s,%s,%s,%s,%s,%s)', (type, chtxt, title, btime, etime, deltatime, deltaday, opt))
+        db[1].execute('INSERT IGNORE into rectime (type,chtxt,title,btime,etime,deltatime,deltaday,opt) values (%s,%s,%s,%s,%s,%s,%s,%s)', (type, chtxt, title, btime, etime, deltatime, deltaday, opt))
         ##db.commit()
         self.close_db(db)
     def del_rectime(self,type="", title="", chtxt="", btime=""):
@@ -147,6 +148,8 @@ class DB_MySQL():
                 ret['btime']=btime
                 ret['etime']=etime
                 ret['opt']=opt
+                ret['deltatime']=""
+                ret['deltaday']=""
                 if deltatime == None:
                     deltatime="3"
                 if deltaday == None:
@@ -201,7 +204,7 @@ class DB_MySQL():
         except:
             ""
         try:
-            db[1].execute("create table tv (bctype VARCHAR(20),channel VARCHAR(20) NOT NULL,start VARCHAR(20),stop  VARCHAR(20),title VARCHAR(100),exp VARCHAR(200),UNIQUE unitv(bctype,channel,start,stop,title))")
+            db[1].execute("create table tv (bctype VARCHAR(20),channel VARCHAR(100) NOT NULL,start VARCHAR(30),stop  VARCHAR(30),title VARCHAR(100),exp VARCHAR(200),UNIQUE unitv(bctype,channel,start,stop,title))")
         except:
             ""
         #db.commit()
@@ -270,3 +273,9 @@ class DB_MySQL():
         db=self.connect_db()
         db[1].executemany('INSERT IGNORE INTO ch VALUES (%s,%s,%s)', chlists)
         self.close_db(db)
+    def import_from_SQLite(self,dbpath):
+        dbb=dbSQLite.DB_SQLite(dbpath)
+        dbl=dbb.select_all_rectime()
+        for db in dbl:
+            self.add_rectime(db['type'],db['chtxt'],db['title'],db['btime'],db['etime'],db['deltatime'],db['deltaday'],db['opt'])
+        
\ No newline at end of file

diff --git a/rec10/trunk/src/dbSQLite.py b/rec10/trunk/src/dbSQLite.py
index 2df6646..eab4f31 100644 (file)
--- a/rec10/trunk/src/dbSQLite.py
+++ b/rec10/trunk/src/dbSQLite.py
@@ -116,6 +116,8 @@ class DB_SQLite():
             ret['btime']=btime
             ret['etime']=etime
             ret['opt']=opt
+            ret['deltatime']=""
+            ret['deltaday']=""
             if deltatime == None:
                 deltatime="3"
             if deltaday == None:

diff --git a/rec10/trunk/src/tester.py b/rec10/trunk/src/tester.py
index dea0536..f30b2d5 100644 (file)
--- a/rec10/trunk/src/tester.py
+++ b/rec10/trunk/src/tester.py
@@ -22,4 +22,6 @@ if __name__ == "__main__":
     #print checker.checkB25Decode(recpath+basepath,recpath+tspath)
     #print configreader.getdbpath("test")
     epgdb.updateall_bak()
+    #import rectime data from SQLite to MySQL
+    #rec10d.rec10db.import_from_SQLite(path+"ch.db")
     
\ No newline at end of file

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 2e270c0..9cc4f9d 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -176,7 +176,7 @@ def task():
                 btxt=bt.strftime("%Y-%m-%d %H:%M:%S")
                 etxt=et.strftime("%Y-%m-%d %H:%M:%S")
                 recdb.everyreserv(title,chtxt,btxt,etxt,deltatime,opt,deltaday)
-            elif dt<30*60*60:
+            elif dt<120*60:
                 recdb.keyreserv(title,chtxt,btime,etime,deltatime,opt)
                 recdb.del_reckey(recdb.REC_KEYWORD_EVERY_SOME_DAYS, title, chtxt, btime)
                 bt=bt+dd

diff --git a/rec10/trunk/src/ts2epg.py b/rec10/trunk/src/ts2epg.py
index cfed545..31fd10d 100644 (file)
--- a/rec10/trunk/src/ts2epg.py
+++ b/rec10/trunk/src/ts2epg.py
@@ -20,7 +20,7 @@ def write(pout,ch):
     timet="90"
     if re.search(u'cs',bctype):
         mode="/CS"
-        timet="150"
+        timet="200"
     elif re.search(u'bs',bctype):
         mode="/BS"
         timet="150"