fix classify and some bug.

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

diff --git a/rec10/trunk/src/classify.py b/rec10/trunk/src/classify.py
index 6b963e2..3621af6 100644 (file)
--- a/rec10/trunk/src/classify.py
+++ b/rec10/trunk/src/classify.py
@@ -153,7 +153,9 @@ def searchFolder(title,path):
             cmpp=os.path.basename(dirp)
             appp=os.path.dirname(dirp)
         ntitle=getTitle(title)
-        cmpp=getTitle(cmpp)
+        #recdblist.printutf8(cmpp)
+        cmpp=getTitle(os.path.splitext(cmpp)[0])
+        #recdblist.printutf8(cmpp+"\n")
         p=n_gram.trigram(ntitle,cmpp)
         if p>0:
             ngram.append((p,appp))
@@ -162,30 +164,34 @@ def searchFolder(title,path):
     ngram.reverse()
     if len(ngram)>0:
         #recdblist.printutf8(title + ngram[0][1] + " : "+str(ngram[0][0]))
-        if ngram[0][0]>400:
+        if ngram[0][0]>500:
             return ngram[0][1]
         else:
             return ""
     else:
         return ""
 def getTitle(title):
-    rT=re.compile("(.+)_(\d*)\Z")
+    rT=re.compile("(.+)_(\d+)\Z")
     tT=rT.match(title)
     rT2=re.compile("(.+)_(.+)_(\d*)\Z")#_(aichi)_2010-02-06T01:59:00.mkv
     tT2=rT2.match(title)
-    rT3=re.compile("(.+)_(.+)_\d-\d-\dT\d:\d:\d\Z")#_(aichi)_2010-02-06T01:59:00.mkv
+    rT3=re.compile("(.+)_(.+)_\d+-\d+-\d+T\d+:\d+:\d+\Z")#_(aichi)_2010-02-06T01:59:00.mkv
     tT3=rT3.match(title)
-    rT4=re.compile("(.+)_(.+)_\d-\d-\dT\d-\d-\d\Z")#_(aichi)_2010-02-06T01-59-00.mkv
+    rT4=re.compile("(.+)_(.+)_\d+-\d+-\d+T\d+-\d+-\d+\Z")#_(aichi)_2010-02-06T01-59-00.mkv
     tT4=rT4.match(title)
+    rT5=re.compile("(.+)_(.+)_(.+)\Z")#_(aichi)_2010-02-06T01-59-00.mkv
+    tT5=rT5.match(title)
     ntitle=title
     if tT :
-        ntitle=tT.group(0)
+        ntitle=tT.group(1)
     elif tT2:
-        ntitle=tT2.group(0)
+        ntitle=tT2.group(1)
     elif tT3:
-        ntitle=tT3.group(0)
+        ntitle=tT3.group(1)
     elif tT4:
-        ntitle=tT4.group(0)
+        ntitle=tT4.group(1)
+    elif tT5:
+        ntitle=tT5.group(1)
     return ntitle
 def execMove(title,temppath,recpath):
     srcpath=os.path.join(temppath,title+".mkv")

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 487e5c7..e94fb3e 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -486,7 +486,7 @@ def type_decode_que(typetxt,chtxt,title,bt,et,opt):
                     errtxt="Error happened in type_decode_que in timerec.\n"
                     errtxt=errtxt+"move ts error.\n"
                     errtxt=errtxt+str(type(inst))+"\n"
-                    errtxt=errtxt+inst
+                    errtxt=errtxt+str(inst)
                     recdblist.addlog(os.path.join(recpath,title+".ts"), errtxt, "timerec-move(Decode) error")
                 recdb.rec_reckey(recdblist.REC_MOVE_END, title, chtxt, btime, etime, opt)
         else: