projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
937f935
)
[prosiebensat1] Fix test case
author
Philipp Hagemeister
<phihag@phihag.de>
Mon, 29 Sep 2014 10:18:49 +0000
(12:18 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Mon, 29 Sep 2014 10:18:49 +0000
(12:18 +0200)
youtube_dl/extractor/prosiebensat1.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/prosiebensat1.py
b/youtube_dl/extractor/prosiebensat1.py
index 5b2a723c1d8dce6f05fcdd3647c93b48ad41dc5a..619496de7a57f9ab297b708bbffb3005c85e0dd8 100644
(file)
--- a/
youtube_dl/extractor/prosiebensat1.py
+++ b/
youtube_dl/extractor/prosiebensat1.py
@@
-144,7
+144,7
@@
class ProSiebenSat1IE(InfoExtractor):
'id': '2156342',
'ext': 'mp4',
'title': 'Kurztrips zum Valentinstag',
'id': '2156342',
'ext': 'mp4',
'title': 'Kurztrips zum Valentinstag',
- 'description': '
md5:8ba6301e70351ae0bedf8da00f7ba528
',
+ 'description': '
Romantischer Kurztrip zum Valentinstag? Wir verraten, was sich hier wirklich lohnt.
',
'duration': 307.24,
},
'params': {
'duration': 307.24,
},
'params': {
@@
-180,12
+180,10
@@
class ProSiebenSat1IE(InfoExtractor):
]
def _real_extract(self, url):
]
def _real_extract(self, url):
-
mobj = re.match(self._VALID_URL,
url)
-
video_id = mobj.group('id'
)
+
video_id = self._match_id(
url)
+
webpage = self._download_webpage(url, video_id
)
- page = self._download_webpage(url, video_id, 'Downloading page')
-
- clip_id = self._html_search_regex(self._CLIPID_REGEXES, page, 'clip id')
+ clip_id = self._html_search_regex(self._CLIPID_REGEXES, webpage, 'clip id')
access_token = 'testclient'
client_name = 'kolibri-1.2.5'
access_token = 'testclient'
client_name = 'kolibri-1.2.5'
@@
-234,12
+232,12
@@
class ProSiebenSat1IE(InfoExtractor):
urls = self._download_json(url_api_url, clip_id, 'Downloading urls JSON')
urls = self._download_json(url_api_url, clip_id, 'Downloading urls JSON')
- title = self._html_search_regex(self._TITLE_REGEXES, page, 'title')
- description = self._html_search_regex(self._DESCRIPTION_REGEXES, page, 'description', fatal=False)
- thumbnail = self._og_search_thumbnail(page)
+ title = self._html_search_regex(self._TITLE_REGEXES,
web
page, 'title')
+ description = self._html_search_regex(self._DESCRIPTION_REGEXES,
web
page, 'description', fatal=False)
+ thumbnail = self._og_search_thumbnail(
web
page)
upload_date = unified_strdate(self._html_search_regex(
upload_date = unified_strdate(self._html_search_regex(
- self._UPLOAD_DATE_REGEXES, page, 'upload date', default=None))
+ self._UPLOAD_DATE_REGEXES,
web
page, 'upload date', default=None))
formats = []
formats = []