projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[lynda] Remove superfluous space
[youtube-dl]
/
youtube_dl
/
extractor
/
common.py
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index f7247752e0c510367a3ce342546790d6b57ef922..2a5e8076cadadfe7d83d316b87f0477732710217 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-73,6
+73,10
@@
class InfoExtractor(object):
by this field.
-1 for default (order by other properties),
-2 or smaller for less than default.
by this field.
-1 for default (order by other properties),
-2 or smaller for less than default.
+ * quality Order number of the video quality of this
+ format, irrespective of the file format.
+ -1 for default (order by other properties),
+ -2 or smaller for less than default.
url: Final video URL.
ext: Video filename extension.
format: The video format, defaults to ext (used for --get-format)
url: Final video URL.
ext: Video filename extension.
format: The video format, defaults to ext (used for --get-format)
@@
-378,7
+382,7
@@
class InfoExtractor(object):
@staticmethod
def _og_regexes(prop):
content_re = r'content=(?:"([^>]+?)"|\'(.+?)\')'
@staticmethod
def _og_regexes(prop):
content_re = r'content=(?:"([^>]+?)"|\'(.+?)\')'
- property_re = r'
property
=[\'"]og:%s[\'"]' % re.escape(prop)
+ property_re = r'
(?:name|property)
=[\'"]og:%s[\'"]' % re.escape(prop)
template = r'<meta[^>]+?%s[^>]+?%s'
return [
template % (property_re, content_re),
template = r'<meta[^>]+?%s[^>]+?%s'
return [
template % (property_re, content_re),
@@
-483,6
+487,7
@@
class InfoExtractor(object):
return (
preference,
return (
preference,
+ f.get('quality') if f.get('quality') is not None else -1,
f.get('height') if f.get('height') is not None else -1,
f.get('width') if f.get('width') is not None else -1,
ext_preference,
f.get('height') if f.get('height') is not None else -1,
f.get('width') if f.get('width') is not None else -1,
ext_preference,