diff --git a/couchpotato/core/plugins/movie/static/movie.js b/couchpotato/core/plugins/movie/static/movie.js index 02982e3..f8abf40 100644 --- a/couchpotato/core/plugins/movie/static/movie.js +++ b/couchpotato/core/plugins/movie/static/movie.js @@ -39,12 +39,19 @@ var Movie = new Class({ 'text': self.data.library.plot }), self.quality = new Element('div.quality', { - 'text': self.profile ? self.profile.get('label') : '' + 'text': self.profile.get('label')+ ':' }) ), self.actions = new Element('div.actions') ) ); + + self.profile.get('types').each(function(type){ + var q = Quality.getQuality(type.quality_id); + new Element('span', { + 'text': ' '+q.label + }).inject(self.quality); + }) Object.each(self.options.actions, function(action, key){ self.actions.adopt( diff --git a/couchpotato/core/plugins/quality/static/quality.js b/couchpotato/core/plugins/quality/static/quality.js index 1d9382f..f11334c 100644 --- a/couchpotato/core/plugins/quality/static/quality.js +++ b/couchpotato/core/plugins/quality/static/quality.js @@ -19,6 +19,12 @@ var QualityBase = new Class({ return this.profiles[id] }, + getQuality: function(id){ + return this.qualities.filter(function(q){ + return q.id == id; + }).pick(); + }, + addSettings: function(){ var self = this; @@ -106,9 +112,7 @@ var QualityBase = new Class({ new Element('input.min', {'value': quality.size_min}), new Element('input.max', {'value': quality.size_max}) ).inject(group) - }) - - p(group) + }); } diff --git a/couchpotato/core/plugins/renamer/main.py b/couchpotato/core/plugins/renamer/main.py index c31a5e9..17ba89b 100644 --- a/couchpotato/core/plugins/renamer/main.py +++ b/couchpotato/core/plugins/renamer/main.py @@ -131,6 +131,7 @@ class Renamer(Plugin): final_file_name = final_file_name.replace(' ', separator) # Main file + group['destination_dir'] = os.path.join(destination, final_folder_name) rename_files[file] = os.path.join(destination, final_folder_name, final_file_name) # Check for extra subtitle files @@ -176,7 +177,7 @@ class Renamer(Plugin): for rename_me in rename_files: filename = os.path.basename(rename_me) rename_files[rename_me] = rename_me.replace(filename, '_EXISTS_%s' % filename) - + # Notify on rename fail download_message = 'Renaming of %s (%s) canceled, exists in %s already.' % (movie.library.titles[0].title, group['meta_data']['quality']['label'], release.quality.label) fireEvent('notify', type = 'movie.renaming.canceled', message = download_message, data = group)