From 1e6e0ff8974d5b955390764edb8249279ee2bb5e Mon Sep 17 00:00:00 2001
From: gn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Date: Wed, 24 Mar 2010 05:59:44 +0000
Subject: [PATCH] simplify codes.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@526 4e526526-5e11-4fc0-8910-f8fd03428081
---
 rec10/trunk/src/auto_move.py |  3 ++-
 rec10/trunk/src/classify.py  | 14 +++++++-------
 rec10/trunk/src/guess.py     |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/rec10/trunk/src/auto_move.py b/rec10/trunk/src/auto_move.py
index 90d959f..f04e422 100644
--- a/rec10/trunk/src/auto_move.py
+++ b/rec10/trunk/src/auto_move.py
@@ -11,6 +11,7 @@ import time
 import shutil
 
 import recdblist
+import guess
 def getTitle(title):
     rT=re.compile("(.+)_(\d+)\Z")
     tT=rT.match(title)
@@ -97,7 +98,7 @@ def veryfySize(path):
     return ret
 def execMove(title,temppath,recpath,ext,autodel):
     srcpath=os.path.join(temppath,title+ext)
-    sf=searchFolder(title, recpath)
+    sf=guess.searchFolder(title, recpath)
     if sf!="":
         destpath=os.path.join(sf,get_move_dest_path(title, temppath, sf, ext)+ext)
         recdblist.printutf8("moving now..")
diff --git a/rec10/trunk/src/classify.py b/rec10/trunk/src/classify.py
index 1be4e4c..192d60e 100644
--- a/rec10/trunk/src/classify.py
+++ b/rec10/trunk/src/classify.py
@@ -28,7 +28,7 @@ if __name__ == "__main__":
     (opts,args)=parser.parse_args(sys.argv)
     if opts.ltitle!="":
         ltitle=unicode(opts.ltitle,'utf-8')
-        sf=guess.searchFolder(ltitle, recordedpath)[0]
+        sf=guess.searchFolder(ltitle, recordedpath)
         print "###MKV###"
         recdblist.printutf8(os.path.join(sf, auto_move.get_move_dest_path(ltitle,recpath,sf,".mkv")+".mkv"))
         print "###MP4###"
@@ -37,7 +37,7 @@ if __name__ == "__main__":
         sa=auto_move.search_file(recpath, recordedpath, ".mkv")
         for t in sa:
             recdblist.printutf8(u"自動推測実行中-MKV")
-            sf=guess.searchFolder(t,recordedpath)[0]
+            sf=guess.searchFolder(t,recordedpath)
             if sf!="":
                 recdblist.printutf8(u"移動先")
                 recdblist.printutf8(t+" : "+os.path.join(sf, auto_move.get_move_dest_path(t, recpath,sf,".mkv")+".mkv"))
@@ -48,7 +48,7 @@ if __name__ == "__main__":
         sa=auto_move.search_file(recpath, recordedpath, ".mp4")
         for t in sa:
             recdblist.printutf8(u"自動推測実行中-MP4")
-            sf=guess.searchFolder(t,recordedpath)[0]
+            sf=guess.searchFolder(t,recordedpath)
             if sf!="":
                 recdblist.printutf8(u"移動先")
                 recdblist.printutf8(t+" : "+os.path.join(sf, auto_move.get_move_dest_path(t, recpath,sf,".mp4")+".mp4"))
@@ -59,12 +59,12 @@ if __name__ == "__main__":
     elif opts.list:
         sa=auto_move.search_file(recpath, recordedpath,".mkv")
         for t in sa:
-            sf=guess.searchFolder(t,recordedpath)[0]
+            sf=guess.searchFolder(t,recordedpath)
             if sf!="":
                 recdblist.printutf8(t+u" : "+os.path.join(sf, auto_move.get_move_dest_path(t, recpath,sf,".mkv")+".mkv"))
         sa=auto_move.search_file(recpath, recordedpath,".mp4")
         for t in sa:
-            sf=guess.searchFolder(t,recordedpath)[0]
+            sf=guess.searchFolder(t,recordedpath)
             if sf!="":
                 recdblist.printutf8(t+u" : "+os.path.join(sf, auto_move.get_move_dest_path(t, recpath,sf,".mp4")+".mp4"))
     elif opts.etitle!="":
@@ -81,7 +81,7 @@ if __name__ == "__main__":
         if tsmovepath!="":
             sa=auto_move.search_file(recpath, tsmovepath,".ts")
             for t in sa:
-                sf=guess.searchFolder(t,tsmovepath,700)[0]
+                sf=guess.searchFolder(t,tsmovepath,700)
                 if sf!="":
                     recdblist.printutf8(t+u" : "+os.path.join(sf, auto_move.get_move_dest_path(t, recpath,sf,".ts")+".ts"))
             sa=auto_move.search_file(recpath, tsmovepath,".ts")
@@ -96,7 +96,7 @@ if __name__ == "__main__":
         if tsmovepath!="":
             sa=auto_move.search_file(recpath, tsmovepath,".ts")
             for t in sa:
-                sf=guess.searchFolder(t,tsmovepath,700)[0]
+                sf=guess.searchFolder(t,tsmovepath,700)
                 if sf!="":
                     recdblist.printutf8(u"移動先")
                     recdblist.printutf8(t+" : "+os.path.join(sf, auto_move.get_move_dest_path(t, recpath,sf,".ts")+".ts"))
diff --git a/rec10/trunk/src/guess.py b/rec10/trunk/src/guess.py
index e2d710f..7f54071 100644
--- a/rec10/trunk/src/guess.py
+++ b/rec10/trunk/src/guess.py
@@ -210,7 +210,7 @@ def searchFolder(title,path,threshold=300):
     if len(ngram)>0:
         #recdblist.printutf8(title + ngram[0][1] + " : "+str(ngram[0][0]))
         if ngram[0][0]>threshold:
-            return [ngram[0][1],ngram[0][0]]
+            return ngram[0][1]
         else:
             return ""
     else:
-- 
2.11.0