Cleanup PR

couchpotato/core/media/_base/searcher/main.py

@@ -87,17 +87,17 @@ class Searcher(SearcherBase):
     def containsOtherQuality(self, nzb, movie_year = None, preferred_quality = None):
         if not preferred_quality: preferred_quality = {}
 
+        found = {}
+
         # Try guessing via quality tags
         guess = fireEvent('quality.guess', files = [nzb.get('name')], size = nzb.get('size', None), single = True)
         if guess:
-            return not guess['identifier'] == preferred_quality.get('identifier')
-
+            found[guess['identifier']] = True
 
         # Hack for older movies that don't contain quality tag
         name = nzb['name']
         size = nzb.get('size', 0)
 
-        found = {}
         year_name = fireEvent('scanner.name_year', name, single = True)
         if len(found) == 0 and movie_year < datetime.datetime.now().year - 3 and not year_name.get('year', None):
             if size > 20000:  # Assume bd50
@@ -110,6 +110,11 @@ class Searcher(SearcherBase):
                 log.info('Quality was missing in name, assuming it\'s a DVD-Rip based on the size: %s', size)
                 found['dvdrip'] = True
 
+        # Allow other qualities
+        for allowed in preferred_quality.get('allow'):
+            if found.get(allowed):
+                del found[allowed]
+
         return not (found.get(preferred_quality['identifier']) and len(found) == 1)
 
     def correct3D(self, nzb, preferred_quality = None):

couchpotato/core/media/movie/_base/static/movie.actions.js

@@ -78,7 +78,7 @@ MA.IMDB = new Class({
 	create: function(){
 		var self = this;
 
-		self.id = self.movie.get('imdb');
+		self.id = self.movie.getIdentifier();
 
 		self.el = new Element('a.imdb', {
 			'title': 'Go to the IMDB page of ' + self.getTitle(),
@@ -703,7 +703,7 @@ MA.Readd = new Class({
 
 		Api.request('movie.add', {
 			'data': {
-				'identifier': self.movie.get('imdb'),
+				'identifier': self.movie.getIdentifier(),
 				'ignore_previous': 1
 			}
 		});

couchpotato/core/media/movie/_base/static/movie.js

@@ -300,6 +300,17 @@ var Movie = new Class({
 		self.el.removeClass(self.view+'_view')
 	},
 
+	getIdentifier: function(){
+		var self = this;
+
+		try {
+			return self.get('identifiers').imdb;
+		}
+		catch (e){ }
+
+		return self.get('imdb');
+	},
+
 	get: function(attr){
 		return this.data[attr] || this.data.info[attr]
 	},

couchpotato/core/plugins/quality/main.py

@@ -61,7 +61,7 @@ class QualityPlugin(Plugin):
 
         addEvent('app.initialize', self.fill, priority = 10)
 
-        addEvent('app.load', self.doTest)
+        addEvent('app.test', self.doTest)
 
         self.order = []
         self.addOrder()