projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[rtvnh] Check status code
[youtube-dl]
/
youtube_dl
/
extractor
/
xtube.py
diff --git
a/youtube_dl/extractor/xtube.py
b/youtube_dl/extractor/xtube.py
index 95f1c8f3cf20bdd83b3e524808e5c5fb20cde680..779e4f46a1dd5315c6a9be3dad09e65c07a205b2 100644
(file)
--- a/
youtube_dl/extractor/xtube.py
+++ b/
youtube_dl/extractor/xtube.py
@@
-5,7
+5,7
@@
import re
from .common import InfoExtractor
from ..compat import (
compat_urllib_request,
from .common import InfoExtractor
from ..compat import (
compat_urllib_request,
- compat_urllib_parse,
+ compat_urllib_parse
_unquote
,
)
from ..utils import (
parse_duration,
)
from ..utils import (
parse_duration,
@@
-22,7
+22,7
@@
class XTubeIE(InfoExtractor):
'id': 'kVTUy_G222_',
'ext': 'mp4',
'title': 'strange erotica',
'id': 'kVTUy_G222_',
'ext': 'mp4',
'title': 'strange erotica',
- 'description': '
http://www.xtube.com
an ET kind of thing',
+ 'description': '
contains:
an ET kind of thing',
'uploader': 'greenshowers',
'duration': 450,
'age_limit': 18,
'uploader': 'greenshowers',
'duration': 450,
'age_limit': 18,
@@
-59,7
+59,7
@@
class XTubeIE(InfoExtractor):
for format_id, video_url in re.findall(
r'flashvars\.quality_(.+?)\s*=\s*"([^"]+)"', webpage):
fmt = {
for format_id, video_url in re.findall(
r'flashvars\.quality_(.+?)\s*=\s*"([^"]+)"', webpage):
fmt = {
- 'url': compat_urllib_parse
.
unquote(video_url),
+ 'url': compat_urllib_parse
_
unquote(video_url),
'format_id': format_id,
}
m = re.search(r'^(?P<height>\d+)[pP]', format_id)
'format_id': format_id,
}
m = re.search(r'^(?P<height>\d+)[pP]', format_id)
@@
-68,7
+68,7
@@
class XTubeIE(InfoExtractor):
formats.append(fmt)
if not formats:
formats.append(fmt)
if not formats:
- video_url = compat_urllib_parse
.
unquote(self._search_regex(
+ video_url = compat_urllib_parse
_
unquote(self._search_regex(
r'flashvars\.video_url\s*=\s*"([^"]+)"',
webpage, 'video URL'))
formats.append({'url': video_url})
r'flashvars\.video_url\s*=\s*"([^"]+)"',
webpage, 'video URL'))
formats.append({'url': video_url})
@@
-95,6
+95,7
@@
class XTubeUserIE(InfoExtractor):
'url': 'http://www.xtube.com/community/profile.php?user=greenshowers',
'info_dict': {
'id': 'greenshowers',
'url': 'http://www.xtube.com/community/profile.php?user=greenshowers',
'info_dict': {
'id': 'greenshowers',
+ 'age_limit': 18,
},
'playlist_mincount': 155,
}
},
'playlist_mincount': 155,
}
@@
-124,6
+125,7
@@
class XTubeUserIE(InfoExtractor):
return {
'_type': 'playlist',
'id': username,
return {
'_type': 'playlist',
'id': username,
+ 'age_limit': 18,
'entries': [{
'_type': 'url',
'url': eurl,
'entries': [{
'_type': 'url',
'url': eurl,