Merge branch 'refs/heads/develop' into tv

Conflicts: couchpotato/core/helpers/variable.py couchpotato/core/media/_base/searcher/main.py couchpotato/core/media/movie/searcher/main.py couchpotato/core/plugins/quality/main.py couchpotato/core/plugins/release/main.py couchpotato/core/plugins/renamer/main.py
2013-11-24 23:13:25 +01:00
parent 611c159373 3d5b33856f
commit 3e035f84b1
263 changed files with 27457 additions and 10287 deletions
@@ -2,7 +2,7 @@ from couchpotato import get_session
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import toUnicode, ss
-from couchpotato.core.helpers.variable import mergeDicts, md5, getExt
+from couchpotato.core.helpers.variable import mergeDicts, getExt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.core.settings.model import Quality, Profile, ProfileType
@@ -38,6 +38,9 @@ class QualityPlugin(Plugin):
    ]
    pre_releases = ['cam', 'ts', 'tc', 'r5', 'scr']

+    cached_qualities = None
+    cached_order = None
+
    def __init__(self):
        addEvent('quality.all', self.all)
        addEvent('quality.single', self.single)
@@ -55,6 +58,8 @@ class QualityPlugin(Plugin):

        addEvent('app.initialize', self.fill, priority = 10)

+        addEvent('app.test', self.doTest)
+
    def preReleases(self):
        return self.pre_releases

@@ -67,6 +72,9 @@ class QualityPlugin(Plugin):

    def all(self):

+        if self.cached_qualities:
+            return self.cached_qualities
+
        db = get_session()

        qualities = db.query(Quality).all()
@@ -76,6 +84,7 @@ class QualityPlugin(Plugin):
            q = mergeDicts(self.getQuality(quality.identifier), quality.to_dict())
            temp.append(q)

+        self.cached_qualities = temp
        return temp

    def single(self, identifier = ''):
@@ -104,6 +113,8 @@ class QualityPlugin(Plugin):
            setattr(quality, kwargs.get('value_type'), kwargs.get('value'))
            db.commit()

+        self.cached_qualities = None
+
        return {
            'success': True
        }
@@ -164,77 +175,149 @@ class QualityPlugin(Plugin):
        if not extra: extra = {}

        # Create hash for cache
-        cache_key = md5(str([f.replace('.' + getExt(f), '') for f in files]))
+        cache_key = str([f.replace('.' + getExt(f), '') if len(getExt(f)) < 4 else f for f in files])
        cached = self.getCache(cache_key)
-        if cached and len(extra) == 0: return cached
+        if cached and len(extra) == 0:
+            return cached

        qualities = self.all()
+
+        # Start with 0
+        score = {}
+        for quality in qualities:
+            score[quality.get('identifier')] = 0
+
        for cur_file in files:
            words = re.split('\W+', cur_file.lower())

-            found = {}
            for quality in qualities:
-                contains = self.containsTag(quality, words, cur_file)
-                if contains:
-                    found[quality['identifier']] = True
-
-            for quality in qualities:
-
-                # Check identifier
-                if quality['identifier'] in words:
-                    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(cache_key, quality)
-
-                # Check alt and tags
-                contains = self.containsTag(quality, words, cur_file)
-                if contains:
-                    return self.setCache(cache_key, quality)
+                contains_score = self.containsTagScore(quality, words, cur_file)
+                self.calcScore(score, quality, contains_score)

        # Try again with loose testing
-        quality = self.guessLoose(cache_key, files = files, extra = extra)
-        if quality:
-            return self.setCache(cache_key, quality)
+        for quality in qualities:
+            loose_score = self.guessLooseScore(quality, files = files, extra = extra)
+            self.calcScore(score, quality, loose_score)
+
+
+        # Return nothing if all scores are 0
+        has_non_zero = 0
+        for s in score:
+            if score[s] > 0:
+                has_non_zero += 1
+
+        if not has_non_zero:
+            return None
+
+        heighest_quality = max(score, key = score.get)
+        if heighest_quality:
+            for quality in qualities:
+                if quality.get('identifier') == heighest_quality:
+                    return self.setCache(cache_key, quality)

-        log.debug('Could not identify quality for: %s', files)
        return None

-    def containsTag(self, quality, words, cur_file = ''):
+    def containsTagScore(self, quality, words, cur_file = ''):
        cur_file = ss(cur_file)
+        score = 0
+
+        points = {
+            'identifier': 10,
+            'label': 10,
+            'alternative': 9,
+            'tags': 9,
+            'ext': 3,
+        }

        # Check alt and tags
-        for tag_type in ['alternative', 'tags', 'label']:
+        for tag_type in ['identifier', 'alternative', 'tags', 'label']:
            qualities = quality.get(tag_type, [])
            qualities = [qualities] if isinstance(qualities, (str, unicode)) else qualities

            for alt in qualities:
-                if (isinstance(alt, tuple) and '.'.join(alt) in '.'.join(words)) or (isinstance(alt, (str, unicode)) and ss(alt.lower()) in cur_file.lower()):
+                if (isinstance(alt, tuple)):
+                    if len(set(words) & set(alt)) == len(alt):
+                        log.debug('Found %s via %s %s in %s', (quality['identifier'], tag_type, quality.get(tag_type), cur_file))
+                        score += points.get(tag_type)
+
+                if (isinstance(alt, (str, unicode)) and ss(alt.lower()) in cur_file.lower()):
                    log.debug('Found %s via %s %s in %s', (quality['identifier'], tag_type, quality.get(tag_type), cur_file))
-                    return True
+                    score += points.get(tag_type) / 2

            if list(set(qualities) & set(words)):
                log.debug('Found %s via %s %s in %s', (quality['identifier'], tag_type, quality.get(tag_type), cur_file))
-                return True
+                score += points.get(tag_type)

-        return
+        # Check extention
+        for ext in quality.get('ext', []):
+            if ext == words[-1]:
+                log.debug('Found %s extension in %s', (ext, cur_file))
+                score += points['ext']

-    def guessLoose(self, cache_key, files = None, extra = None):
+        return score
+
+    def guessLooseScore(self, quality, files = None, extra = None):
+
+        score = 0

        if extra:
-            for quality in self.all():

-                # Check width resolution, range 20
-                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(cache_key, quality)
+            # Check width resolution, range 20
+            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)))
+                score += 5

-                # Check height resolution, range 20
-                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(cache_key, quality)
+            # Check height resolution, range 20
+            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)))
+                score += 5
+
+            if quality.get('identifier') == 'dvdrip' and 480 <= extra.get('resolution_width', 0) <= 720:
+                log.debug('Add point for correct dvdrip resolutions')
+                score += 1
+
+        return score
+
+    def calcScore(self, score, quality, add_score):
+
+        score[quality['identifier']] += add_score
+
+        # Set order for allow calculation (and cache)
+        if not self.cached_order:
+            self.cached_order = {}
+            for q in self.qualities:
+                self.cached_order[q.get('identifier')] = self.qualities.index(q)
+
+        if add_score != 0:
+            for allow in quality.get('allow', []):
+                score[allow] -= 40 if self.cached_order[allow] < self.cached_order[quality['identifier']] else 5
+
+    def doTest(self):
+
+        tests = {
+            'Movie Name (1999)-DVD-Rip.avi': 'dvdrip',
+            'Movie Name 1999 720p Bluray.mkv': '720p',
+            'Movie Name 1999 BR-Rip 720p.avi': 'brrip',
+            'Movie Name 1999 720p Web Rip.avi': 'scr',
+            'Movie Name 1999 Web DL.avi': 'brrip',
+            'Movie.Name.1999.1080p.WEBRip.H264-Group': 'scr',
+            'Movie.Name.1999.DVDRip-Group': 'dvdrip',
+            'Movie.Name.1999.DVD-Rip-Group': 'dvdrip',
+            'Movie.Name.1999.DVD-R-Group': 'dvdr',
+        }
+
+        correct = 0
+        for name in tests:
+            success = self.guess([name]).get('identifier') == tests[name]
+            if not success:
+                log.error('%s failed check, thinks it\'s %s', (name, self.guess([name]).get('identifier')))
+
+            correct += success
+
+        if correct == len(tests):
+            log.info('Quality test successful')
+            return True
+        else:
+            log.error('Quality test failed: %s out of %s succeeded', (correct, len(tests)))

-            if 480 <= extra.get('resolution_width', 0) <= 720:
-                log.debug('Found as dvdrip')
-                return self.setCache(cache_key, self.single('dvdrip'))

-        return None