aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2014-12-14 03:41:00 +0600
committerSergey M․ <dstftw@gmail.com>2014-12-14 03:41:00 +0600
commitac265bef1e685706c0be89237117e2df5f796ecb (patch)
treee0830b163c20d4295a15f58fa73b5aa3de6044b6
parent4a0132c570e29075e377c8b70d7f61018d1e4479 (diff)
downloadyoutube-dl-ac265bef1e685706c0be89237117e2df5f796ecb.tar.xz
[restudy] Simplify and extract all formats
-rw-r--r--youtube_dl/extractor/restudy.py37
1 files changed, 18 insertions, 19 deletions
diff --git a/youtube_dl/extractor/restudy.py b/youtube_dl/extractor/restudy.py
index 56a6c0f93..b17c2bfc0 100644
--- a/youtube_dl/extractor/restudy.py
+++ b/youtube_dl/extractor/restudy.py
@@ -5,37 +5,36 @@ from .common import InfoExtractor
class RestudyIE(InfoExtractor):
- _VALID_URL = r'https://www.restudy.dk/video/play/id/(?P<id>[0-9]+)'
+ _VALID_URL = r'https?://(?:www\.)?restudy\.dk/video/play/id/(?P<id>[0-9]+)'
_TEST = {
'url': 'https://www.restudy.dk/video/play/id/1637',
- # MD5 sum of first 10241 bytes of the video file, as reported by
- # head -c 10241 Leiden-frosteffekt-1637.mp4 | md5sum
- 'md5': '4e755c4287f292a1fe5363834a683818',
'info_dict': {
'id': '1637',
- 'ext': 'mp4',
+ 'ext': 'flv',
'title': 'Leiden-frosteffekt',
+ 'description': 'Denne video er et eksperiment med flydende kvælstof.',
+ },
+ 'params': {
+ # rtmp download
+ 'skip_download': True,
}
}
def _real_extract(self, url):
video_id = self._match_id(url)
+
webpage = self._download_webpage(url, video_id)
- xml_url = (
- 'https://www.restudy.dk/awsmedia/SmilDirectory/video_%s.xml'
- % video_id)
- xml = self._download_webpage(xml_url, video_id)
-
- base = self._search_regex(
- r'<meta base="([^"]+)', xml, 'meta base')
- # TODO: Provide multiple video qualities instead of forcing highest
- filename = self._search_regex(
- r'<video src="mp4:([^"]+_high\.mp4)', xml, 'filename')
- url = '%s%s' % (base, filename)
- title = self._og_search_title(webpage)
+
+ title = self._og_search_title(webpage).strip()
+ description = self._og_search_description(webpage).strip()
+
+ formats = self._extract_smil_formats(
+ 'https://www.restudy.dk/awsmedia/SmilDirectory/video_%s.xml' % video_id,
+ video_id)
+
return {
'id': video_id,
'title': title,
- 'url': url,
- 'protocol': 'rtmp',
+ 'description': description,
+ 'formats': formats,
}