Browse Source

Put renaming started lower

pull/1599/merge
Ruud 12 years ago
parent
commit
5b0fa9054b
  1. 6
      couchpotato/core/plugins/renamer/main.py

6
couchpotato/core/plugins/renamer/main.py

@ -86,11 +86,9 @@ class Renamer(Plugin):
log.info('Renamer is already running, if you see this often, check the logs above for errors.') log.info('Renamer is already running, if you see this often, check the logs above for errors.')
return return
self.renaming_started = True
# Check to see if the "to" folder is inside the "from" folder. # Check to see if the "to" folder is inside the "from" folder.
if movie_folder and not os.path.isdir(movie_folder) or not os.path.isdir(self.conf('from')) or not os.path.isdir(self.conf('to')): if movie_folder and not os.path.isdir(movie_folder) or not os.path.isdir(self.conf('from')) or not os.path.isdir(self.conf('to')):
log.debug('"To" and "From" have to exist.') log.error('"To" and "From" have to exist.')
return return
elif self.conf('from') in self.conf('to'): elif self.conf('from') in self.conf('to'):
log.error('The "to" can\'t be inside of the "from" folder. You\'ll get an infinite loop.') log.error('The "to" can\'t be inside of the "from" folder. You\'ll get an infinite loop.')
@ -99,6 +97,8 @@ class Renamer(Plugin):
log.error('The "to" and "from" folders can\'t be inside of or the same as the provided movie folder.') log.error('The "to" and "from" folders can\'t be inside of or the same as the provided movie folder.')
return return
self.renaming_started = True
# make sure the movie folder name is included in the search # make sure the movie folder name is included in the search
folder = None folder = None
movie_files = [] movie_files = []

Loading…
Cancel
Save