projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
457ac58
)
[thvideo] Simplify (#3848)
author
Philipp Hagemeister
<phihag@phihag.de>
Sun, 28 Sep 2014 22:38:37 +0000
(
00:38
+0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Sun, 28 Sep 2014 22:38:37 +0000
(
00:38
+0200)
youtube_dl/extractor/thvideo.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/thvideo.py
b/youtube_dl/extractor/thvideo.py
index 0ae20ea30bc307e014f63bc31c1288945b9a4046..496f15d80b478f94bc2aac86c3d20417e2b09925 100644
(file)
--- a/
youtube_dl/extractor/thvideo.py
+++ b/
youtube_dl/extractor/thvideo.py
@@
-26,8
+26,7
@@
class THVideoIE(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)
# extract download link from mobile player page
webpage_player = self._download_webpage(
# extract download link from mobile player page
webpage_player = self._download_webpage(
@@
-71,13
+70,15
@@
class THVideoPlaylistIE(InfoExtractor):
}
def _real_extract(self, url):
}
def _real_extract(self, url):
- webpage = self._download_webpage(url, 'playlist')
- mobj = re.match(self._VALID_URL, url)
- list_id = mobj.group('id')
- list_title = self._html_search_regex(r'<h1 class="show_title">(.*?)<b id', webpage, 'playlist title')
+ playlist_id = self._match_id(url)
+
+ webpage = self._download_webpage(url, playlist_id)
+ list_title = self._html_search_regex(
+ r'<h1 class="show_title">(.*?)<b id', webpage, 'playlist title',
+ fatal=False)
entries = [
self.url_result('http://thvideo.tv/v/th' + id, 'THVideo')
for id in re.findall(r'<dd><a href="http://thvideo.tv/v/th(\d+)/" target=', webpage)]
entries = [
self.url_result('http://thvideo.tv/v/th' + id, 'THVideo')
for id in re.findall(r'<dd><a href="http://thvideo.tv/v/th(\d+)/" target=', webpage)]
- return self.playlist_result(entries, list_id, list_title)
\ No newline at end of file
+ return self.playlist_result(entries, playlist_id, list_title)