projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[__init__] Simplify colon presence check
[youtube-dl]
/
youtube_dl
/
extractor
/
xstream.py
diff --git
a/youtube_dl/extractor/xstream.py
b/youtube_dl/extractor/xstream.py
index 71584c291f9134ac2444a1ac48bba9ae514c2981..76c91bd92c6906f28412aa60e0cb6bf8ace10422 100644
(file)
--- a/
youtube_dl/extractor/xstream.py
+++ b/
youtube_dl/extractor/xstream.py
@@
-42,11
+42,7
@@
class XstreamIE(InfoExtractor):
'only_matching': True,
}]
'only_matching': True,
}]
- def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- partner_id = mobj.group('partner_id')
- video_id = mobj.group('id')
-
+ def _extract_video_info(self, partner_id, video_id):
data = self._download_xml(
'http://frontend.xstream.dk/%s/feed/video/?platform=web&id=%s'
% (partner_id, video_id),
data = self._download_xml(
'http://frontend.xstream.dk/%s/feed/video/?platform=web&id=%s'
% (partner_id, video_id),
@@
-97,6
+93,7
@@
class XstreamIE(InfoExtractor):
formats.append({
'url': link.get('href'),
'format_id': link.get('rel'),
formats.append({
'url': link.get('href'),
'format_id': link.get('rel'),
+ 'preference': 1,
})
thumbnails = [{
})
thumbnails = [{
@@
-113,3
+110,10
@@
class XstreamIE(InfoExtractor):
'formats': formats,
'thumbnails': thumbnails,
}
'formats': formats,
'thumbnails': thumbnails,
}
+
+ def _real_extract(self, url):
+ mobj = re.match(self._VALID_URL, url)
+ partner_id = mobj.group('partner_id')
+ video_id = mobj.group('id')
+
+ return self._extract_video_info(partner_id, video_id)