Add WEB-DL and WEB-Rip. fix #1913

couchpotato/core/plugins/quality/main.py

@@ -19,10 +19,10 @@ class QualityPlugin(Plugin):
         {'identifier': 'bd50', 'hd': True, 'size': (15000, 60000), 'label': 'BR-Disk', 'alternative': ['bd25'], 'allow': ['1080p'], 'ext':[], 'tags': ['bdmv', 'certificate', ('complete', 'bluray')]},
         {'identifier': '1080p', 'hd': True, 'size': (4000, 20000), 'label': '1080p', 'width': 1920, 'height': 1080, 'alternative': [], 'allow': [], 'ext':['mkv', 'm2ts'], 'tags': ['m2ts']},
         {'identifier': '720p', 'hd': True, 'size': (3000, 10000), 'label': '720p', 'width': 1280, 'height': 720, 'alternative': [], 'allow': [], 'ext':['mkv', 'ts']},
-        {'identifier': 'brrip', 'hd': True, 'size': (700, 7000), 'label': 'BR-Rip', 'alternative': ['bdrip'], 'allow': ['720p', '1080p'], 'ext':['avi']},
+        {'identifier': 'brrip', 'hd': True, 'size': (700, 7000), 'label': 'BR-Rip', 'alternative': ['bdrip'], 'allow': ['720p', '1080p'], 'ext':['avi'], 'tags': ['hdtv', 'hdrip', 'webdl', ('web', 'dl')]},
         {'identifier': 'dvdr', 'size': (3000, 10000), 'label': 'DVD-R', 'alternative': [], 'allow': [], 'ext':['iso', 'img'], 'tags': ['pal', 'ntsc', 'video_ts', 'audio_ts']},
-        {'identifier': 'dvdrip', 'size': (600, 2400), 'label': 'DVD-Rip', 'width': 720, 'alternative': ['dvdrip'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg'], 'tags': [('dvd', 'rip'), ('dvd', 'xvid'), ('dvd', 'divx')]},
+        {'identifier': 'dvdrip', 'size': (600, 2400), 'label': 'DVD-Rip', 'width': 720, 'alternative': [], 'allow': [], 'ext':['avi', 'mpg', 'mpeg'], 'tags': [('dvd', 'rip'), ('dvd', 'xvid'), ('dvd', 'divx')]},
-        {'identifier': 'scr', 'size': (600, 1600), 'label': 'Screener', 'alternative': ['screener', 'dvdscr', 'ppvrip', 'dvdscreener'], 'allow': ['dvdr', 'dvd'], 'ext':['avi', 'mpg', 'mpeg']},
+        {'identifier': 'scr', 'size': (600, 1600), 'label': 'Screener', 'alternative': ['screener', 'dvdscr', 'ppvrip', 'dvdscreener'], 'allow': ['dvdr', 'dvd'], 'ext':['avi', 'mpg', 'mpeg'], 'tags': ['webrip', ('web', 'rip')]},
         {'identifier': 'r5', 'size': (600, 1000), 'label': 'R5', 'alternative': ['r6'], 'allow': ['dvdr'], 'ext':['avi', 'mpg', 'mpeg']},
         {'identifier': 'tc', 'size': (600, 1000), 'label': 'TeleCine', 'alternative': ['telecine'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg']},
         {'identifier': 'ts', 'size': (600, 1000), 'label': 'TeleSync', 'alternative': ['telesync', 'hdts'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg']},
@@ -162,24 +162,26 @@ class QualityPlugin(Plugin):
         for cur_file in files:
             words = re.split('\W+', cur_file.lower())
 
+            found = {}
             for quality in self.all():
+                contains = self.containsTag(quality, words, cur_file)
+                if contains:
+                    found[quality['identifier']] = True
 
-                # Check tags
+            if 'web' in words and 'dl' in words:
-                if quality['identifier'] in words:
+                print found
-                    log.debug('Found via identifier "%s" in %s', (quality['identifier'], cur_file))
-                    return self.setCache(hash, quality)
 
-                if list(set(quality.get('alternative', [])) & set(words)):
+            for quality in self.all():
-                    log.debug('Found %s via alt %s in %s', (quality['identifier'], quality.get('alternative'), cur_file))
-                    return self.setCache(hash, quality)
 
-                for tag in quality.get('tags', []):
+                # Check identifier
-                    if isinstance(tag, tuple) and '.'.join(tag) in '.'.join(words):
+                if quality['identifier'] in words:
-                        log.debug('Found %s via tag %s in %s', (quality['identifier'], quality.get('tags'), cur_file))
+                    if len(found) == 0 or len(found) == 1 and found.get(quality['identifier']):
+                        log.debug('Found via identifier "%s" in %s', (quality['identifier'], cur_file))
                         return self.setCache(hash, quality)
 
-                if list(set(quality.get('tags', [])) & set(words)):
+                # Check alt and tags
-                    log.debug('Found %s via tag %s in %s', (quality['identifier'], quality.get('tags'), cur_file))
+                contains = self.containsTag(quality, words, cur_file)
+                if contains:
                     return self.setCache(hash, quality)
 
         # Try again with loose testing
@@ -190,6 +192,21 @@ class QualityPlugin(Plugin):
         log.debug('Could not identify quality for: %s', files)
         return None
 
+    def containsTag(self, quality, words, cur_file = ''):
+
+        # Check alt and tags
+        for tag_type in ['alternative', 'tags']:
+            for alt in quality.get(tag_type, []):
+                if isinstance(alt, tuple) and '.'.join(alt) in '.'.join(words):
+                    log.debug('Found %s via %s %s in %s', (quality['identifier'], tag_type, quality.get(tag_type), cur_file))
+                    return True
+
+            if list(set(quality.get(tag_type, [])) & set(words)):
+                log.debug('Found %s via %s %s in %s', (quality['identifier'], tag_type, quality.get(tag_type), cur_file))
+                return True
+
+        return
+
     def guessLoose(self, hash, files = None, extra = None):
 
         if extra: