happy new year! 2011

[rec10/rec10-git.git] / rec10 / trunk / src / guess.py

diff --git a/rec10/trunk/src/guess.py b/rec10/trunk/src/guess.py
index 474aacf..cad73e1 100644 (file)
--- a/rec10/trunk/src/guess.py
+++ b/rec10/trunk/src/guess.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
-# Copyright (C) 2009-2010 Yukikaze
+# Copyright (C) 2009-2011 Yukikaze
 
 import os
 import os.path
@@ -36,7 +36,7 @@ def detDeltaNum(title,movepath):
     ff=[]
     maxnum=0
     for file in files:
-        recdblist.printutf8(unicode(file,'utf-8'))
+        recdblist.printutf8(unicode(file,'utf-8'),verbose_level=800)
         file=os.path.join(movepath,file)
         if os.path.isfile(file):
             name=os.path.splitext(os.path.split(file)[1])
@@ -123,8 +123,14 @@ def detNameType(title,path):
     type Aj ---title第<number>話
     path --search reflexively
     """
-    recdblist.printutf8(title)
+    new=0
+    if re.search(u"[新]",title) or re.search(u" 新",title):
+        title=title.replace(u"[新]","")
+        title=title.replace(u" 新","")
+        new=1
+    recdblist.printutf8(title,verbose_level=800)
     title=auto_move.getTitle(title)##titleから日時を除く
+    title=title.replace(u"無料≫","")
     #rA=re.compile(".+(?P<title>)#\d(?P<num>)\s[0,10]\z")
     rA=re.compile("(.+)#(\d*)\s*\Z")
     tA=rA.match(title)
@@ -134,28 +140,28 @@ def detNameType(title,path):
     tAj=rAj.match(title)
     ret={'title':"",'type':"",'num':0,'subtitle':"",'folder':""}
     if tA:
-        recdblist.printutf8("typeA")
-        recdblist.printutf8("title="+tA.group(1))
-        recdblist.printutf8("num="+tA.group(2))
+        #recdblist.printutf8("typeA")
+        #recdblist.printutf8("title="+tA.group(1))
+        #recdblist.printutf8("num="+tA.group(2))
         ret['type']="A"
-        ret['title']=tA.group(1)
+        ret['title']=tA.group(1).replace(" ","")
         ret['num']=int(tA.group(2))
         ret['folder']=searchFolder(tA.group(1),unicode(path,'utf-8'))
     if tAj:
-        recdblist.printutf8("typeA")
-        recdblist.printutf8("title="+tAj.group(1))
-        recdblist.printutf8("num="+tAj.group(2))
+        #recdblist.printutf8("typeA")
+        #recdblist.printutf8("title="+tAj.group(1))
+        #recdblist.printutf8("num="+tAj.group(2))
         ret['type']="Aj"
-        ret['title']=tAj.group(1)
+        ret['title']=tAj.group(1).replace(" ","")
         ret['num']=int(tAj.group(2))
         ret['folder']=searchFolder(tAj.group(1),unicode(path,'utf-8'))
     elif tB:
-        recdblist.printutf8("typeB")
-        recdblist.printutf8("title="+tB.group(1))
-        recdblist.printutf8("num="+tB.group(2))
-        recdblist.printutf8("subtitle="+tB.group(3))
+        #recdblist.printutf8("typeB")
+        #recdblist.printutf8("title="+tB.group(1))
+        #recdblist.printutf8("num="+tB.group(2))
+        #recdblist.printutf8("subtitle="+tB.group(3))
         ret['type']="B"
-        ret['title']=tB.group(1)
+        ret['title']=tB.group(1).replace(" ","")
         ret['num']=int(tB.group(2))
         ret['folder']=searchFolder(tB.group(1),unicode(path,'utf-8'))
         ret['subtitle']=tB.group(3)
@@ -167,7 +173,7 @@ def detNameType(title,path):
         for t in ts:
             tt=tt+" "+t
             ft1=searchFolder(tt,unicode(path,'utf-8'))
-            recdblist.printutf8(tt)
+            #recdblist.printutf8(tt)
             #print ft1
             if ft1!="":
                 #recdblist.printutf8(rt)
@@ -179,7 +185,7 @@ def detNameType(title,path):
                     #recdblist.printutf8(rt)
         #recdblist.printutf8("title="+rt[0][1:]+"/")
         #recdblist.printutf8("subtitle = "+title.replace(rt[0][1:],"")[1:])
-        ret['title']=rt[0][1:]
+        ret['title']=rt[0][1:].replace(" ","")
         ret['num']=-1
         ret['folder']=rt[2]
         ret['subtitle']=title.replace(rt[0][1:],"")[1:]
@@ -187,6 +193,8 @@ def detNameType(title,path):
             ret['type']="D"
         else:
             ret['type']="C"
+    if new==1:
+        ret['num']=1
     return ret
 def searchFolder(title,path,threshold=500):
     """