projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0cb58b0
)
[tf1] Fix extraction (Closes #7873)
author
Sergey M․
<dstftw@gmail.com>
Tue, 15 Dec 2015 15:09:14 +0000
(21:09 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 15 Dec 2015 15:09:14 +0000
(21:09 +0600)
youtube_dl/extractor/tf1.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/tf1.py
b/youtube_dl/extractor/tf1.py
index 3a68eaa80ea6867e6806a4f242a8afc910b8ba06..32f5f78bf848c909614506caf71d94588fae0e35 100644
(file)
--- a/
youtube_dl/extractor/tf1.py
+++ b/
youtube_dl/extractor/tf1.py
@@
-43,11
+43,9
@@
class TF1IE(InfoExtractor):
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
- embed_url = self._html_search_regex(
- r'["\'](https?://www.wat.tv/embedframe/.*?)["\']', webpage, 'embed url')
- embed_page = self._download_webpage(embed_url, video_id,
- 'Downloading embed player page')
- wat_id = self._search_regex(r'UVID=(.*?)&', embed_page, 'wat id')
+ wat_id = self._html_search_regex(
+ r'(["\'])(?:https?:)?//www\.wat\.tv/embedframe/.*?(?P<id>\d+)\1',
+ webpage, 'wat id', group='id')
wat_info = self._download_json(
'http://www.wat.tv/interface/contentv3/%s' % wat_id, video_id)
return self.url_result(wat_info['media']['url'], 'Wat')
wat_info = self._download_json(
'http://www.wat.tv/interface/contentv3/%s' % wat_id, video_id)
return self.url_result(wat_info['media']['url'], 'Wat')