|
@ -476,18 +476,18 @@ class Renamer(Plugin): |
|
|
log.error('Failed removing %s: %s', (release.identifier, traceback.format_exc())) |
|
|
log.error('Failed removing %s: %s', (release.identifier, traceback.format_exc())) |
|
|
|
|
|
|
|
|
if group['dirname'] and group['parentdir'] and not self.downloadIsTorrent(download_info): |
|
|
if group['dirname'] and group['parentdir'] and not self.downloadIsTorrent(download_info): |
|
|
try: |
|
|
if movie_folder: |
|
|
if movie_folder: |
|
|
# Delete the movie folder |
|
|
# Delete the movie folder |
|
|
group_folder = movie_folder |
|
|
group_folder = movie_folder |
|
|
else: |
|
|
else: |
|
|
# Delete the first empty subfolder in the tree relative to the 'from' folder |
|
|
# Delete the first empty subfolder in the tree relative to the 'from' folder |
|
|
group_folder = os.path.join(self.conf('from'), os.path.relpath(group['parentdir'], self.conf('from')).split(os.path.sep)[0]) |
|
|
group_folder = os.path.join(self.conf('from'), os.path.relpath(group['parentdir'], self.conf('from')).split(os.path.sep)[0]) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try: |
|
|
log.info('Deleting folder: %s', group_folder) |
|
|
log.info('Deleting folder: %s', group_folder) |
|
|
self.deleteEmptyFolder(group_folder) |
|
|
self.deleteEmptyFolder(group_folder) |
|
|
except: |
|
|
except: |
|
|
log.error('Failed removing %s: %s', (group['parentdir'], traceback.format_exc())) |
|
|
log.error('Failed removing %s: %s', (group_folder, traceback.format_exc())) |
|
|
|
|
|
|
|
|
# Notify on download, search for trailers etc |
|
|
# Notify on download, search for trailers etc |
|
|
download_message = 'Downloaded %s (%s)' % (movie_title, replacements['quality']) |
|
|
download_message = 'Downloaded %s (%s)' % (movie_title, replacements['quality']) |
|
|