R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[extractor/common] Use more meaningful name for default criteria value set

Browse Source
This commit is contained in:
Sergey M․ 2016-01-03 04:55:33 +06:00
parent 8afe782893
commit 1a27909314
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/common.py
View File

@ -859,7 +859,7 @@ class InfoExtractor(object):
def field_criterion(name, default=-1): def field_criterion(name, default=-1):
return name, f.get(name) if f.get(name) is not None else default return name, f.get(name) if f.get(name) is not None else default
default_key = ( default_criteria_values = (
synthetic_criterion('preference', preference), synthetic_criterion('preference', preference),
field_criterion('language_preference'), field_criterion('language_preference'),
field_criterion('quality'), field_criterion('quality'),
@ -880,9 +880,9 @@ class InfoExtractor(object):
if (not criteria_preference and not criteria_relative_preference and if (not criteria_preference and not criteria_relative_preference and
not criteria_exclusion): not criteria_exclusion):
return [value for _, value in default_key] return [value for _, value in default_criteria_values]
default_criteria_order = [name for name, _ in default_key] default_criteria_order = [name for name, _ in default_criteria_values]
criteria_order = [] criteria_order = []
if criteria_preference: if criteria_preference:
for field in criteria_preference: for field in criteria_preference:
@ -903,8 +903,8 @@ class InfoExtractor(object):
criteria_order.append(field) criteria_order.append(field)
default_criteria_order.remove(field) default_criteria_order.remove(field)
default_key_dict = dict(default_key) default_criteria_dict = dict(default_criteria_values)
return [default_key_dict[criterion] for criterion in criteria_order] return [default_criteria_dict[criterion] for criterion in criteria_order]
formats.sort(key=_formats_key) formats.sort(key=_formats_key)