fix encoding process.

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

diff --git a/rec10/trunk/src/auto_process.py b/rec10/trunk/src/auto_process.py
index a7b2f97..01b5b4a 100644 (file)
--- a/rec10/trunk/src/auto_process.py
+++ b/rec10/trunk/src/auto_process.py
@@ -64,7 +64,7 @@ def auto_check(path):
             file = os.path.split(fn)[1]
             title = os.path.splitext(file)[0]
             ext = os.path.splitext(file)[1]
-            if ext == "b25":
+            if ext == ".b25":
                 title=title.replace(".ts","")
             proc=check_process(dir, title)
             if proc=="b25":

diff --git a/rec10/trunk/src/auto_rec.py b/rec10/trunk/src/auto_rec.py
index 5fc6e31..3456a64 100644 (file)
--- a/rec10/trunk/src/auto_rec.py
+++ b/rec10/trunk/src/auto_rec.py
@@ -59,7 +59,6 @@ def calc_key(chtxt,title,desc):
     """
 
     """
-    kyoukai=1200
     title=u" "+title+u" "
     desc=u" "+desc+u" "
     str1=title*2+desc+title*2##タイトルは重視したいので幾度か足す。
@@ -84,7 +83,4 @@ def calc_key(chtxt,title,desc):
             p2=(1000*tarec+5)/(1000*taall+5)
             p2=p2*100
             nump=nump+p+p2
-    if (nump/tnum)>kyoukai:
-        return 1
-    else:
-        return 0
+    return int(nump/tnum)

diff --git a/rec10/trunk/src/classify.py b/rec10/trunk/src/classify.py
index a4624a8..a63368b 100644 (file)
--- a/rec10/trunk/src/classify.py
+++ b/rec10/trunk/src/classify.py
@@ -152,6 +152,13 @@ def searchFolder(title,path):
         else:
             cmpp=os.path.basename(dirp)
             appp=os.path.dirname(dirp)
+        rT=re.compile("(.+)_(\d*)\Z")
+        tT=rT.match(title)
+        tT2=rT.match(cmpp)
+        if tT:
+            ntitle=tT.group(0)
+        if tT2:
+            cmpp=cmpp.group(0)
         p=n_gram.trigram(ntitle,cmpp)
         if p>0:
             ngram.append((p,appp))

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index f5d343b..dce770f 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -782,17 +782,18 @@ class DB_MySQL:
             title VARCHAR(100),\
             btime DATETIME,\
             etime DATETIME,\
+            point INT,\
             UNIQUE uni (chtxt,title,btime,etime)\
             )')
         except:
             ""
-    def add_auto_timeline_bayes(self,chtxt="", title="", btime="", etime=""):
+    def add_auto_timeline_bayes(self,chtxt="", title="", btime="", etime="",point=""):
         db = self.connect_db()
         db[1].execute('\
         INSERT IGNORE into auto_timeline_bayes \
-        (chtxt,title,btime,etime) \
-        values (%s,%s,%s,%s)', \
-                      (chtxt, title, btime, etime))
+        (chtxt,title,btime,etime,point) \
+        values (%s,%s,%s,%s,%s)', \
+                      (chtxt, title, btime, etime,point))
         self.close_db(db)
     def delete_old_auto_timeline_bayes(self, dhour):
         db = self.connect_db()

diff --git a/rec10/trunk/src/recdb.py b/rec10/trunk/src/recdb.py
index eba1f22..ebdfa5b 100644 (file)
--- a/rec10/trunk/src/recdb.py
+++ b/rec10/trunk/src/recdb.py
@@ -20,8 +20,8 @@ def del_reckey(type, title, chtxt, btime):
     rec10d.rec10db.del_timeline(type=type, title=title, chtxt=chtxt, btime=btime)
 def add_auto_keyword(chtxt,title,btime,etime):
     rec10d.rec10db.add_auto_timeline_keyword(chtxt, title, btime, etime)
-def add_auto_bayes(chtxt,title,btime,etime):
-    rec10d.rec10db.add_auto_timeline_bayes(chtxt, title, btime, etime)
+def add_auto_bayes(chtxt,title,btime,etime,point):
+    rec10d.rec10db.add_auto_timeline_bayes(chtxt, title, btime, etime,point)
 def getnow(dhour):
     dhour = int(dhour)
     dminutes = 60 * dhour

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 8e56200..1ee2c94 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -193,41 +193,6 @@ def task():
                     tv2mp4.mkv2mp4(os.path.join(recpath,title+".mkv"),os.path.join(recpath,title+".mp4"))
                     recdb.del_reckey(recdblist.REC_CHANGING_CANTAINER, title, chtxt, btime)
                     sys.exit()
-        elif task["type"] == recdblist.REC_AUTO_KEYWORD:#"key,"+chtxt+","+keyword+","+btime+","+deltatime+","+opt
-            deltatime = "24"
-            if dt < 90 * 60:
-                recdatum = epgdb.searchtime_auto(title, btime, deltatime, chtxt)
-                for recdata in recdatum:
-                    if recdata[1] != "":
-                        chtxtt = recdata[0]
-                        titlet = recdata[1]
-                        btimet = recdata[2]
-                        etimet = recdata[3]
-                        exp = recdata[4]
-                        longexp = recdata[5]
-                        category=recdata[6]
-                        btt = datetime.datetime.strptime(btimet, "%Y-%m-%d %H:%M:%S")
-                        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")
-                        try:
-                            recdb.rec_reckey(recdblist.REC_AUTO_SUGGEST_REC, titlet, chtxtt, btimet, etimet, opt)
-                        except Exception, inst:
-                            print "Error occures in REC_AUTO_KEYWORD(1)"
-                            print type(inst)
-                            print inst
-                dd = datetime.timedelta(days=1)
-                bt = bt + dd
-                et = et + dd
-                btxt = bt.strftime("%Y-%m-%d %H:%M:%S")
-                etxt = et.strftime("%Y-%m-%d %H:%M:%S")
-                try:
-                    recdb.del_reckey(recdblist.REC_AUTO_KEYWORD, title, chtxt, btime)
-                    recdb.auto_keyreserv(title, chtxt, btxt, etxt, "24", opt)
-                except Exception, inst:
-                    print "Error occures in REC_AUTO_KEYWORD(1)"
-                    print type(inst)
-                    print inst
     sys.exit()
 def search_keyword(key):
     tnow = datetime.datetime.now()
@@ -368,10 +333,10 @@ def type_final(typetxt,chtxt,title,bt,et,opt):
             et = et + dt + datetime.timedelta(seconds=600)
             btime = bt.strftime("%Y-%m-%d %H:%M:%S")
             etime = et.strftime("%Y-%m-%d %H:%M:%S")
-            recdb.rec_reckey(typetxtdecque, ttitle, chtxt, btime, etime, opt)
+            recdb.rec_reckey(typetxtdecque, newtitle, chtxt, btime, etime, opt)
         else:
             shutil.copy(os.path.join(recpath,title+".ts.b25"), os.path.join(movepath,title+".ts.b25"))
-            recdb.rec_reckey(recdblist.REC_MOVE_END, ttitle, chtxt, btime, etime, opt)
+            recdb.rec_reckey(recdblist.REC_MOVE_END, newtitle, chtxt, btime, etime, opt)
         sys.exit()
 def type_keyword(typetxt,chtxt,title,bt,et,opt,deltatime):
     btime = bt.strftime("%Y-%m-%d %H:%M:%S")

diff --git a/rec10/trunk/src/tv2avi.py b/rec10/trunk/src/tv2avi.py
index a4539ad..ba643ea 100644 (file)
--- a/rec10/trunk/src/tv2avi.py
+++ b/rec10/trunk/src/tv2avi.py
@@ -61,35 +61,18 @@ def b252ts(pout, chtxt, btime, etime, opt):
             pentaaudio = 1
         if re.search("d", opt):
             dualaudio = 1
-        if re.search("\[二\]", pout):
+        if re.search(u"\[二\]", pout):
             dualaudio = 1
-        elif re.search('（二）', pout):
+        elif re.search(u'（二）', pout):
             dualaudio = 1
-        elif re.search('\(二\)', pout):
+        elif re.search(u'\(二\)', pout):
             dualaudio = 1
-        if opt == "":
-            opts = ""
-            if chdb.chtxtsearch(chtxt)['bctype'] == 'cs':
-                opts = opts + "S2"
-                if chtxt == "disch":
-                    ""
-                elif chtxt == "hisch":
-                    ""
-                else:
-                    opts = opts + "a"
-            else:
-                opts = opts + "Ha2"
-        else:
-            opts = opt
         if dualaudio == 1:
             dualaudiots2avi(aviin, tsout + ".sa.avi")
-            aviin = tsout + ".sa.avi"
         if pentaaudio == 1:
             dualaudiots2avi(aviin, tsout + ".sa.avi")
-            aviin = tsout + ".sa.avi"
     except:
         ""
-    #status.setB25Decoding(status.getB25Decoding()-1)
     status.changeB25Decoding(-1)
 def timetv2avi(pout, chtxt, btime, etime, opt):
     bt = datetime.datetime.strptime(btime, "%Y-%m-%d %H:%M:%S")

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index 03f87f6..c3d66e0 100644 (file)
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -67,7 +67,7 @@ def mkv2mp4(pin,pout):
     exe0=exeb+u" tracks \'"+pin+u"\' 1:\'"+videopath+u"\' 2:\'"+audiopath+u"\'"
     exe1=exe+u" -aviraw audio \'"+pin+u"\'"
     exe2=exe+u" -aviraw video \'"+pin+u"\'"
-    exefin=exe+u" -new -fps 29.97 -add \'"+videopath+u"\'#video -add \'"+audiopath+u"\'#audio \'"+pout+u"\'"
+    exefin=exe+u" -new -fps 29.970030 -add \'"+videopath+u"\'#video -add \'"+audiopath+u"\'#audio \'"+pout+u"\'"
     logo=pin.replace(".avi",".log")
     os.environ['LANG']="ja_JP.UTF-8"
     txt= exe0+"\n"+exe1+"\n"+exe2+"\n"+exefin+"\n"

diff --git a/rec10/trunk/src/tv2ts.py b/rec10/trunk/src/tv2ts.py
index 53d55ba..eae9bf5 100644 (file)
--- a/rec10/trunk/src/tv2ts.py
+++ b/rec10/trunk/src/tv2ts.py
@@ -39,11 +39,11 @@ def tv2ts(pout, ch, csch, time):
         status.changeTERecording(-1)
     b252tsmix(pout + ".b25", pout + ".tsmix")
     tch="0"
-    if csch!="0":
+    if csch!=u"0":
         tch=csch
-    elif ch=="101":
+    elif ch==u"101":
         tch="101"
-    elif ch=="102":
+    elif ch==u"102":
         tch="102"
     #else:
     #    tch=ch
@@ -59,13 +59,13 @@ def b252ts(pout, ch, csch):
     tempt = os.path.split(pout)
     path = tempt[0]
     b252tsmix(pout + ".b25", pout + ".tsmix")
-    tch="0"
-    if csch!="0":
+    tch=u"0"
+    if csch!=u"0":
         tch=csch
-    elif ch=="101":
-        tch="101"
-    elif ch=="102":
-        tch="102"
+    elif ch==u"101":
+        tch=u"101"
+    elif ch==u"102":
+        tch=u"102"
     #else:
     #    tch=ch
     tsmix2ts(pout + ".tsmix", pout, tch)

diff --git a/rec10/trunk/src/xml2db.py b/rec10/trunk/src/xml2db.py
index da6213e..bd20d5d 100644 (file)
--- a/rec10/trunk/src/xml2db.py
+++ b/rec10/trunk/src/xml2db.py
@@ -87,8 +87,9 @@ def end_element(name):
                     bt2=[bt[0]+utitle+" ",bt[1]+udesc+" "+ulongdesc+" ",bt[2]+1]
                     bayes[tch['chtxt']]=bt2
                     tvlists.append([ubctype, uch, ustart, ustop, utitle, udesc,ulongdesc,ucategory])
-                    if auto_rec.calc_key(tch['chtxt'], utitle, udesc+" "+ulongdesc):
-                        recdb.add_auto_bayes(tch['chtxt'],utitle, ustart,ustop)
+                    p=auto_rec.calc_key(tch['chtxt'], utitle, udesc+" "+ulongdesc)
+                    if p>2000:
+                        recdb.add_auto_bayes(tch['chtxt'],utitle, ustart,ustop,p)
             xmldate['title'] = ""
             xmldate['desc'] = ""
             xmldate['longdesc'] = ""