dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusted Matcher.chainMatch to support 'WEB DL' tags

Browse Source
This commit is contained in:
Dean Gardiner
2013-12-06 13:50:01 +13:00
parent aa394f59ae
commit 45484461b5
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/media/show/searcher/main.py
+2 -2
View File
@@ -19,8 +19,8 @@ class ShowSearcher(Plugin):
# TODO come back to this later, think this could be handled better # TODO come back to this later, think this could be handled better
quality_map = { quality_map = {
'webdl_1080p': {'resolution': ['1080p'], 'source': ['webdl']}, 'webdl_1080p': {'resolution': ['1080p'], 'source': ['webdl', ['web', 'dl']]},
'webdl_720p': {'resolution': ['720p'], 'source': ['webdl']}, 'webdl_720p': {'resolution': ['720p'], 'source': ['webdl', ['web', 'dl']]},
'hdtv_720p': {'resolution': ['720p'], 'source': ['hdtv']}, 'hdtv_720p': {'resolution': ['720p'], 'source': ['hdtv']},
'hdtv_sd': {'resolution': ['480p', None], 'source': ['hdtv']}, 'hdtv_sd': {'resolution': ['480p', None], 'source': ['hdtv']},
couchpotato/core/plugins/matcher/main.py
+11 -1
View File
@@ -40,9 +40,19 @@ class Matcher(Plugin):
for match in chain.info[group]: for match in chain.info[group]:
for ck, cv in match.items(): for ck, cv in match.items():
if ck in tags and simplifyString(cv) in tags[ck]: if ck not in tags:
continue
if isinstance(cv, basestring) and simplifyString(cv) in tags[ck]:
found_tags.append(ck) found_tags.append(ck)
elif isinstance(cv, list):
simple_list = [simplifyString(x) for x in cv]
if simple_list in tags[ck]:
found_tags.append(ck)
log.debug('tags found: %s, required: %s' % (found_tags, tags.keys()))
if set(tags.keys()) == set(found_tags): if set(tags.keys()) == set(found_tags):
return True return True