Incorrect marking as BD-Rip

Fixes #1643

couchpotato/core/plugins/quality/main.py

@@ -188,25 +188,26 @@ class QualityPlugin(Plugin):
                     return self.setCache(hash, quality)
 
         # Try again with loose testing
-        quality = self.guessLoose(hash, extra = extra)
+        quality = self.guessLoose(hash, files = files, extra = extra)
         if quality:
             return self.setCache(hash, quality)
 
         log.debug('Could not identify quality for: %s', files)
         return None
 
-    def guessLoose(self, hash, extra):
+    def guessLoose(self, hash, files = None, extra = None):
 
+        if extra:
             for quality in self.all():
 
                 # Check width resolution, range 20
-            if (quality.get('width', 720) - 20) <= extra.get('resolution_width', 0) <= (quality.get('width', 720) + 20):
-                log.debug('Found %s via resolution_width: %s == %s', (quality['identifier'], quality.get('width', 720), extra.get('resolution_width', 0)))
+                if quality.get('width') and (quality.get('width') - 20) <= extra.get('resolution_width', 0) <= (quality.get('width') + 20):
+                    log.debug('Found %s via resolution_width: %s == %s', (quality['identifier'], quality.get('width'), extra.get('resolution_width', 0)))
                     return self.setCache(hash, quality)
 
                 # Check height resolution, range 20
-            if (quality.get('height', 480) - 20) <= extra.get('resolution_height', 0) <= (quality.get('height', 480) + 20):
-                log.debug('Found %s via resolution_height: %s == %s', (quality['identifier'], quality.get('height', 480), extra.get('resolution_height', 0)))
+                if quality.get('height') and (quality.get('height') - 20) <= extra.get('resolution_height', 0) <= (quality.get('height') + 20):
+                    log.debug('Found %s via resolution_height: %s == %s', (quality['identifier'], quality.get('height'), extra.get('resolution_height', 0)))
                     return self.setCache(hash, quality)
 
             if 480 <= extra.get('resolution_width', 0) <= 720:

couchpotato/core/plugins/scanner/main.py

@@ -440,11 +440,14 @@ class Scanner(Plugin):
             if data.get('audio'): break
 
         # Use the quality guess first, if that failes use the quality we wanted to download
-        data['quality'] = fireEvent('quality.guess', files = files, extra = data, single = True)
-        if not data['quality']:
+        data['quality'] = None
         if download_info and download_info.get('quality'):
             data['quality'] = fireEvent('quality.single', download_info.get('quality'), single = True)
-            else:
+
+        if not data['quality']:
+            data['quality'] = fireEvent('quality.guess', files = files, extra = data, single = True)
+
+            if not data['quality']:
                 data['quality'] = fireEvent('quality.single', 'dvdr' if group['is_dvd'] else 'dvdrip', single = True)
 
         data['quality_type'] = 'HD' if data.get('resolution_width', 0) >= 1280 or data['quality'].get('hd') else 'SD'