fix encoding option.

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

diff --git a/rec10/trunk/src/auto_process.py b/rec10/trunk/src/auto_process.py
index 685a1c7..88a584b 100644 (file)
--- a/rec10/trunk/src/auto_process.py
+++ b/rec10/trunk/src/auto_process.py
@@ -5,6 +5,7 @@
 import os
 import glob
 import time
+import datetime
 
 import recdblist
 import rec10d
@@ -58,32 +59,36 @@ def auto_check(path):
     b25list = glob.glob(path+"/*.ts.b25")
     filelist=avilist+mkvlist+tslist+b25list+mp4list
     add=[]
+    tbtime=datetime.datetime.now()+datetime.timedelta(seconds=60)
+    tbtime2=datetime.datetime.now()+datetime.timedelta(seconds=1200)
     for fn in filelist:
         if fn.rfind("sa.avi")==-1 and fn.rfind(".120.avi")==-1:
             dir = os.path.split(fn)[0]
             file = os.path.split(fn)[1]
             title = os.path.splitext(file)[0]
             title = unicode(title,'utf-8')
-            ext = os.path.splitext(file)[1]
-            if ext == ".b25":
-                title=title.replace(".ts","")
-            proc=check_process(dir, title)
-            chtxtt=rec10d.rec10db.select_chtxt_by_title_timeline_log(title)
-            nchtxt=""
-            if chtxtt!=None:
-                nchtxt=chtxtt
-            if proc=="b25":
-                """chtxtt=rec10d.rec10db.select_chtxt_by_title_timeline_log(title)
+            dbs=rec10d.rec10db.select_by_name_time_timeline(self,title,tbtime,tbtime2)
+            if len(dbs)==0:
+                ext = os.path.splitext(file)[1]
+                if ext == ".b25":
+                    title=title.replace(".ts","")
+                proc=check_process(dir, title)
+                chtxtt=rec10d.rec10db.select_chtxt_by_title_timeline_log(title)
                 nchtxt=""
                 if chtxtt!=None:
-                    nchtxt=chtxtt"""
-                add.append([recdblist.REC_AUTO_SUGGEST_DECODE,title,nchtxt])
-            elif proc=="ts":
-                add.append([recdblist.REC_AUTO_SUGGEST_ENCODE,title,nchtxt])
-            elif proc =="avi":
-                add.append([recdblist.REC_AUTO_SUGGEST_AVI2FP,title,nchtxt])
-            #elif proc =="mp4":
-            #    add.append([recdblist.REC_AUTO_SUGGEST_AP2FP,title,nchtxt])
+                    nchtxt=chtxtt
+                if proc=="b25":
+                    """chtxtt=rec10d.rec10db.select_chtxt_by_title_timeline_log(title)
+                    nchtxt=""
+                    if chtxtt!=None:
+                        nchtxt=chtxtt"""
+                    add.append([recdblist.REC_AUTO_SUGGEST_DECODE,title,nchtxt])
+                elif proc=="ts":
+                    add.append([recdblist.REC_AUTO_SUGGEST_ENCODE,title,nchtxt])
+                elif proc =="avi":
+                    add.append([recdblist.REC_AUTO_SUGGEST_AVI2FP,title,nchtxt])
+                #elif proc =="mp4":
+                #    add.append([recdblist.REC_AUTO_SUGGEST_AP2FP,title,nchtxt])
     if len(add)>0:
         rec10d.rec10db.new_auto_proc_tmp()
         for a in add:

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 20ff905..0bbb69d 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -481,6 +481,40 @@ class DB_MySQL:
                     ret['deltaday'] = deltaday
                 recdatum.append(ret)
         return recdatum
+    def select_by_name_time_timeline(self,title,btime,btime2):
+        db = self.connect_db()
+        recdatum = []
+        #dbr=db[1].execute("SELECT type, chtxt, title, btime, etime, deltatime ,deltaday ,opt FROM rectime WHERE btime < DATE_SUB(now(),INTERVAL "+dminutes+" MINUTE ) AND btime > DATE_ADD(now(),INTERVAL "+dminutes+" MINUTE )")
+        dbr = db[1].execute("SELECT \
+        type, chtxt, title, btime, etime, deltatime ,deltaday ,opt \
+        FROM timeline \
+        WHERE btime > %s AND \
+        btime < %s AND title = %s",(btime,btime2,title))
+        dbl = db[1].fetchall()
+        self.close_db(db)
+        #recdblist.printutf8(dbl)
+        if dbr > 0:
+            for typet, chtxt, title, btime, etime, deltatime, deltaday, opt in dbl:
+                ret = {}
+                ret['type'] = typet
+                ret['chtxt'] = chtxt
+                ret['title'] = title
+                btime = btime.strftime("%Y-%m-%d %H:%M:%S")
+                etime = etime.strftime("%Y-%m-%d %H:%M:%S")
+                ret['btime'] = btime
+                ret['etime'] = etime
+                ret['opt'] = opt
+                if deltatime == None or deltatime == "":
+                    deltatime = "3"
+                if deltaday == None or deltaday == "":
+                    deltaday = "7"
+                if typet == recdblist.REC_KEYWORD:
+                    ret['deltatime'] = deltatime
+                elif typet == recdblist.REC_KEYWORD_EVERY_SOME_DAYS:
+                    ret['deltatime'] = deltatime
+                    ret['deltaday'] = deltaday
+                recdatum.append(ret)
+        return recdatum
     def select_bytime_all_timeline(self,btime,etime):
         db = self.connect_db()
         recdatum = []