fix some.

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

diff --git a/rec10/trunk/src/classify.py b/rec10/trunk/src/classify.py
index 5076b02..54a758b 100644 (file)
--- a/rec10/trunk/src/classify.py
+++ b/rec10/trunk/src/classify.py
@@ -152,21 +152,8 @@ 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)
-        rT3=re.compile("(.+)_(.+)_(\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
-        tT4=rT4.match(title)
-        if tT :
-            ntitle=tT.group(0)
-        elif tT3:
-            ntitle=tT3.group(0)
-        elif tT4:
-            ntitle=tT4.group(0)
-        if tT2:
-            cmpp=cmpp.group(0)
+        ntitle=getTitle(title)
+        cmpp=getTitle(cmpp)
         p=n_gram.trigram(ntitle,cmpp)
         if p>0:
             ngram.append((p,appp))
@@ -181,6 +168,21 @@ def searchFolder(title,path):
             return ""
     else:
         return ""
+def getTitle(title):
+    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
+    tT3=rT3.match(title)
+    ntitle=title
+    if tT :
+        ntitle=tT.group(0)
+    elif tT2:
+        ntitle=tT3.group(0)
+    elif tT3:
+        ntitle=tT4.group(0)
+    return ntitle
 def execMove(title,temppath,recpath):
     srcpath=os.path.join(temppath,title+".mkv")
     #desttitle=destName(title, temppath, recpath)

diff --git a/rec10/trunk/src/tester.py b/rec10/trunk/src/tester.py
index 7f547e1..4d0c736 100644 (file)
--- a/rec10/trunk/src/tester.py
+++ b/rec10/trunk/src/tester.py
@@ -4,6 +4,7 @@
 # Copyright (C) 2009-2010 Yukikaze
 #import sys
 import os
+import tv2avi
 import tv2mkv
 #import datetime
 #import rec10d
@@ -35,6 +36,4 @@ ftpusr = "/home/ftpusr/ftp-tmp"
 recordedpath = "/home/ftpusr/ftp5/Series-Finish/"
 
 if __name__ == "__main__":
-    tv2mkv.ts2mkv(recpath+u"[二]神秘の東洋医学 #2 【特集：医学を考える】.m2v", recpath+u"[二]神秘の東洋医学 #2 【特集：医学を考える】.mkv", "Ld2")
-    ""
-    
\ No newline at end of file
+    ""
\ No newline at end of file

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 0d11fe0..48e9d1b 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -40,7 +40,7 @@ def task():
     recdb.delete_old("24")
     recdb.delete_old_auto_bayes("1")
     recdb.delete_old_auto_keyword("1")
-    tasks = recdb.getnow("2")
+    tasks = recdb.getnow("3")
     inum = recdb.countRecNow_minutes("10")
     recdblist.printutf8(u"rec10処理開始"+ datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
     recdblist.printutf8(u"直近録画予約件数:" + str(inum) + u"BS/CS録画中件数:" + str(status.getBSCSRecording()) + u"TE録画中件数:" + str(status.getTERecording()) )