From 71623e0d8bf5e59eea960b8d7479e5af97a8449e Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Wed, 27 Jan 2010 10:33:45 +0000
Subject: [PATCH] Fix logger issues, renamed path formatting names

---
 tvorganise.cfg |  2 +-
 tvorganise.py  | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/tvorganise.cfg b/tvorganise.cfg
index d6e2333..1ad5ba6 100644
--- a/tvorganise.cfg
+++ b/tvorganise.cfg
@@ -1,6 +1,6 @@
 [main]
 # Target directory
-target_path: /mnt/vault/video/TV Shows/%(file_showname)s/Season %(seasno)s/
+target_path: /mnt/vault/video/TV Shows/%(showname)s/Season %(seasonnum)s/
 
 [regex]
 # Replacement strings used within regexs.
diff --git a/tvorganise.py b/tvorganise.py
index 6a336b1..bebf117 100755
--- a/tvorganise.py
+++ b/tvorganise.py
@@ -62,7 +62,6 @@ class TvOrganiser():
         """
         if not hasattr(self, "__logger"):
             self.__logger = logging.getLogger(self.__class__.__name__)
-            self.__logger.addHandler(logging.StreamHandler())
         return self.__logger
 
     def _get_config(self, cfile):
@@ -101,9 +100,10 @@ class TvOrganiser():
         self._config = config
         return config
 
-    def process(self, names):
+    def parse_filenames(self, names):
         """
-        Takes list of names, runs them though the regexs
+        Takes list of names, runs them though the regexs and breaks them down
+        into logical information.
         """
         episodelist = []
         for efile in names:
@@ -129,12 +129,12 @@ class TvOrganiser():
                     self._logger.debug("Seas:", seasno)
                     self._logger.debug("Ep:", epno)
 
-                    episodelist.append({'file_showname': showname,
-                                    'seasno': seasno,
-                                    'epno': epno,
+                    episodelist.append({'showname': showname,
+                                    'seasonnum': seasno,
+                                    'episodenum': epno,
                                     'filepath': filepath,
                                     'filename': filename,
-                                    'epname': epname,
+                                    'episodename': epname,
                                     'ext': ext})
                     break # Matched - to the next file!
             else:
@@ -170,7 +170,7 @@ class TvOrganiser():
             sys.exit(1)
 
         files = find_files(args)
-        files = self.process(files)
+        files = self.parse_filenames(files)
 
         self._logger.debug(files)
 
@@ -212,5 +212,10 @@ class TvOrganiser():
                 self._logger.warning("Skipping file: %s" % filename)
 
 def main():
+    logging.basicConfig(format="%(name)s:%(levelname)s: %(message)s")
+
     t = TvOrganiser()
     t.main()
+
+if __name__ == '__main__':
+    main()