cleaned up some config settings

ghickman · Nov 28, 2010 · a524c2d · a524c2d
1 parent fc0b7e0
commit a524c2d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/tvrenamr/config.py b/tvrenamr/config.py
@@ -38,6 +38,7 @@ def get_canonical(self, show):
         try:
             return self.config[show.lower()]['canonical']
         except KeyError:
+            self.log.debug('No canonical defined, returning: %s' % show)
             return show
 
     def get_output(self, show):

diff --git a/tvrenamr/main.py b/tvrenamr/main.py
@@ -100,10 +100,14 @@ def retrieve_episode_name(self, library='thetvdb', \
             from lib.tvrage import TvRage as library
             log.debug('Imported Tv Rage library')
 
-        if canonical is not None:
+        if canonical:
             kwargs['show'] = canonical
-        self.library = library(self.config.get_canonical(kwargs['show']),
-                                kwargs['season'], kwargs['episode'])
+        else:
+            kwargs['show'] = self.config.get_canonical(kwargs['show'])
+        log.debug('Show Name: %s' % kwargs['show'])
+
+        self.library = library(kwargs['show'], kwargs['season'],
+                                kwargs['episode'])
 
         self.title = self.library.get_title()
         log.info('Episode: %s' % self.title)

diff --git a/tvrenamr/tvrenamr.py b/tvrenamr/tvrenamr.py
@@ -98,7 +98,6 @@ def __init__(self, path):
         # get the first viable config from the list of possibles
         for config in possible_config:
             if config is not None and os.path.exists(config):
-                print config
                 self.config = Config(config)
                 break
         if self.config is None: