fix rename error.

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

diff --git a/rec10/trunk/src/classify.py b/rec10/trunk/src/classify.py
index b967010..34aef6e 100644 (file)
--- a/rec10/trunk/src/classify.py
+++ b/rec10/trunk/src/classify.py
@@ -40,7 +40,7 @@ if __name__ == "__main__":
         recdblist.printutf8(os.path.join(sf, auto_move.getMoveDestpath(ltitle,recpath,sf,".mp4")+".mp4"),verbose_level=100)\r
         print "\n"\r
     elif opts.auto:##-A の場合\r
         recdblist.printutf8(os.path.join(sf, auto_move.getMoveDestpath(ltitle,recpath,sf,".mp4")+".mp4"),verbose_level=100)\r
         print "\n"\r
     elif opts.auto:##-A の場合\r

-        sa=auto_move.search_file(recpath, recordedpath, ".mkv")\r
+        sa=auto_move.searchFile(recpath, recordedpath, ".mkv")\r

         for t in sa:\r
             recdblist.printutf8(u"自動推測実行中-MKV",verbose_level=100)\r
             sf=guess.searchFolder(t,recordedpath)\r
         for t in sa:\r
             recdblist.printutf8(u"自動推測実行中-MKV",verbose_level=100)\r
             sf=guess.searchFolder(t,recordedpath)\r


@@ -63,14 +63,14 @@ if __name__ == "__main__":
             else:\r
                 recdblist.printutf8(t+" can't find matching folder",verbose_level=100)\r
     elif opts.delete:##-Dの場合\r
             else:\r
                 recdblist.printutf8(t+" can't find matching folder",verbose_level=100)\r
     elif opts.delete:##-Dの場合\r

-        sa=auto_move.search_file(recpath, recordedpath,".mkv")\r
+        sa=auto_move.searchFile(recpath, recordedpath,".mkv")\r

         for t in sa:\r
             auto_move.execDelete(t, recpath)\r
         sa=auto_move.searchFile(recpath, recordedpath,".mp4")\r
         for t in sa:\r
             auto_move.execDelete(t, recpath)\r
     elif opts.list:##-lの場合\r
         for t in sa:\r
             auto_move.execDelete(t, recpath)\r
         sa=auto_move.searchFile(recpath, recordedpath,".mp4")\r
         for t in sa:\r
             auto_move.execDelete(t, recpath)\r
     elif opts.list:##-lの場合\r

-        sa=auto_move.search_file(recpath, recordedpath,".mkv")\r
+        sa=auto_move.searchFile(recpath, recordedpath,".mkv")\r

         for t in sa:\r
             sf=guess.searchFolder(t,recordedpath)\r
             if sf!="":\r
         for t in sa:\r
             sf=guess.searchFolder(t,recordedpath)\r
             if sf!="":\r


@@ -108,15 +108,15 @@ if __name__ == "__main__":
         except:\r
             ""\r
         if tsmovepath!="":\r
         except:\r
             ""\r
         if tsmovepath!="":\r

-            sa=auto_move.search_file(recpath, tsmovepath,".ts")\r
-       searchFilein sa:\r
+            sa=auto_move.searchFile(recpath, tsmovepath,".ts")\r
+            for t in sa:\r

                 sf=guess.searchFolder(t,tsmovepath,700)\r
                 if sf!="":\r
                     recdblist.printutf8(u"移動先",verbose_level=100)\r
                     recdblist.printutf8(t+" : "+os.path.join(sf, auto_move.getMoveDestpath(t, recpath,sf,".ts")+".ts"),verbose_level=100)\r
                     recdblist.printutf8(u"実行中",verbose_level=100)\r
                     auto_move.execMove(t, recpath, tsmovepath,".ts",0)\r
                 sf=guess.searchFolder(t,tsmovepath,700)\r
                 if sf!="":\r
                     recdblist.printutf8(u"移動先",verbose_level=100)\r
                     recdblist.printutf8(t+" : "+os.path.join(sf, auto_move.getMoveDestpath(t, recpath,sf,".ts")+".ts"),verbose_level=100)\r
                     recdblist.printutf8(u"実行中",verbose_level=100)\r
                     auto_move.execMove(t, recpath, tsmovepath,".ts",0)\r

-            sa=auto_move.search_file(recpath, tsmovepath,".ts")\r
+            sa=auto_move.searchFile(recpath, tsmovepath,".ts")\r

         else:\r
             recdblist.printutf8(u"ts_movepathが設定されていません。/etc/rec10.confを設定してください。",verbose_level=100)\r
     elif opts.seriespath!="":##-Sの場合##与えられたパスにシリーズがそろっているかを調べる。\r
         else:\r
             recdblist.printutf8(u"ts_movepathが設定されていません。/etc/rec10.confを設定してください。",verbose_level=100)\r
     elif opts.seriespath!="":##-Sの場合##与えられたパスにシリーズがそろっているかを調べる。\r