fix encode option.

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

diff --git a/rec10/trunk/src/auto_process.py b/rec10/trunk/src/auto_process.py
index fde8a74..cf3fee0 100644 (file)
--- a/rec10/trunk/src/auto_process.py
+++ b/rec10/trunk/src/auto_process.py
@@ -150,13 +150,18 @@ def check_process(path,title):
             return "recording"
 def update_timeline_epg(btime,etime):
     dbl=rec10d.rec10db.select_bytime_all_timeline(btime, etime)
+    print dbl
     for db in dbl:
         ret=[]
         #[chtxtt, title, btime, etime,exp,longexp,category]
         if db['type']==recdblist.REC_KEYWORD or db['type']==recdblist.REC_KEYWORD_EVERY_SOME_DAYS:
             ret=epgdb.searchtime2(db['title'], db['btime'], db['deltatime'], db['chtxt'])
             rec10d.rec10db.update_epg_timeline(db['type'], db['chtxt'], db['title'], db['btime'], ret[2],ret[3],ret[1])
+            if not (db['btime'] == ret[2] and  db['etime']==ret[3]):
+                rec10d.rec10db.update_status_change_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "1")
         elif db['type']==recdblist.REC_RESERVE or db['type']==recdblist.REC_FINAL_RESERVE :
             ret=epgdb.searchtime2(db['title'], db['btime'],"5", db['chtxt'])
             rec10d.rec10db.update_epg_timeline(db['type'], db['chtxt'], db['title'], db['btime'], ret[2],ret[3],ret[1])
+            if not (db['btime'] == ret[2] and  db['etime']==ret[3]):
+                rec10d.rec10db.update_status_change_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "1")
 

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index ded7f3f..0c618a3 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -467,8 +467,7 @@ class DB_MySQL:
         dbl = db[1].fetchall()
         self.close_db(db)
         if dbr > 0:
-            recdata = getdic_timeline(dbl)
-        self.close_db(db)
+            recdata = self.getdic_timeline(dbl)
         return recdata
     def select_bytime_timeline(self, dminutes):
         db = self.connect_db()
@@ -483,8 +482,7 @@ class DB_MySQL:
         self.close_db(db)
         #recdblist.printutf8(dbl)
         if dbr > 0:
-            recdatum = getdic_timeline(dbl)
-        self.close_db(db)
+            recdatum = self.getdic_timeline(dbl)
         return recdatum
     def select_by_name_time_timeline(self,title,btime,btime2):
         db = self.connect_db()
@@ -499,8 +497,7 @@ class DB_MySQL:
         self.close_db(db)
         #recdblist.printutf8(dbl)
         if dbr > 0:
-            recdatum = getdic_timeline(dbl)
-        self.close_db(db)
+            recdatum = self.getdic_timeline(dbl)
         return recdatum
     def select_bytime_all_timeline(self,btime,etime):
         db = self.connect_db()
@@ -515,8 +512,7 @@ class DB_MySQL:
         self.close_db(db)
         #recdblist.printutf8(dbl)
         if dbr > 0:
-            recdatum = getdic_timeline(dbl)
-        self.close_db(db)
+            recdatum = self.getdic_timeline(dbl)
         return recdatum
     def select_byepgtime_all_timeline(self,epgbtime,epgetime):
         db = self.connect_db()
@@ -531,8 +527,7 @@ class DB_MySQL:
         self.close_db(db)
         #recdblist.printutf8(dbl)
         if dbr > 0:
-            recdatum=getdic_timeline(dbl)
-        self.close_db(db)
+            recdatum=self.getdic_timeline(dbl)
         return recdatum
     def count_schedule_timeline(self, btime, etime):
         """
@@ -624,8 +619,7 @@ class DB_MySQL:
         self.close_db(db)
         #recdblist.printutf8(dbl)
         if dbr > 0:
-            recdatum = getdic_timeline(dbl)
-        self.close_db(db)
+            recdatum = self.getdic_timeline(dbl)
         return recdatum
     def getdic_timeline(self,timelinelists):
         recdatum=[]
@@ -639,8 +633,12 @@ class DB_MySQL:
             ret['btime'] = btime
             ret['etime'] = etime
             ret['opt'] = opt
-            ret['epgbtime'] = epgbtimet
-            ret['epgetime'] = epgetimet
+            try:
+                ret['epgbtime'] = epgbtimet.strftime("%Y-%m-%d %H:%M:%S")
+                ret['epgetime'] = epgetimet.strftime("%Y-%m-%d %H:%M:%S")
+            except:
+                ret['epgbtime'] = "2010-01-01 00:00:00"
+                ret['epgetime'] = "2010-01-01 00:00:00"
             ret['epgtitle'] = epgtitlet
             ret['epgduplicate'] = epgduplicatet
             ret['epgchange'] = epgchanget

diff --git a/rec10/trunk/src/epgdb.py b/rec10/trunk/src/epgdb.py
index 0b826ed..89119d6 100644 (file)
--- a/rec10/trunk/src/epgdb.py
+++ b/rec10/trunk/src/epgdb.py
@@ -56,6 +56,7 @@ def searchtime2(titletxt, timet, deltatime, chtxt):
     ret = []
     deltatime = int(deltatime)
     beforetime = time.strftime("%Y%m%d%H%M%S")
+    beforetime = time - datetime.timedelta(hours=deltatime)
     aftertime = time + datetime.timedelta(hours=deltatime)
     aftertime = aftertime.strftime("%Y%m%d%H%M%S")
     one = ["", "", "", "","","",""]
@@ -81,7 +82,7 @@ def searchtime2(titletxt, timet, deltatime, chtxt):
         if p > 0:
             recdblist.printutf8(title + ":" + str(p) + u"点")
     ret = one
-    print ret
+    #print ret
     return ret
 def searchtime_auto(keytxt, timet, deltatime):
     time = datetime.datetime.strptime(timet, "%Y-%m-%d %H:%M:%S")

diff --git a/rec10/trunk/src/tester.py b/rec10/trunk/src/tester.py
index 5755771..a4e92cb 100644 (file)
--- a/rec10/trunk/src/tester.py
+++ b/rec10/trunk/src/tester.py
@@ -38,4 +38,4 @@ ftpusr = "/home/ftpusr/ftp-tmp"
 recordedpath = "/home/ftpusr/ftp5/Series-Finish/"
 
 if __name__ == "__main__":
-    auto_process.update_timeline_epg("2010-03-07 11:00:00", "2010-03-07 15:00:00")
\ No newline at end of file
+    auto_process.update_timeline_epg("2010-03-07 11:00:00", "2010-03-07 17:00:00")
\ No newline at end of file