aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Larionov <diffident.cat@gmail.com>2014-09-28 23:36:55 +0400
committerAnton Larionov <diffident.cat@gmail.com>2014-09-28 23:36:55 +0400
commit67077b182b698ac56cec9525a2669d5cee394226 (patch)
treeb068ed1c2ce45717f2db17ae35ba75d361785fbc
parent7f5c0c4a19cf72b6ede80ee0fea4611d8bd45010 (diff)
downloadyoutube-dl-67077b182b698ac56cec9525a2669d5cee394226.tar.xz
[thvideo] Add support for playlists
-rw-r--r--youtube_dl/extractor/__init__.py5
-rw-r--r--youtube_dl/extractor/thvideo.py24
2 files changed, 28 insertions, 1 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 86bff185b..89a9d8106 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -371,7 +371,10 @@ from .thisav import ThisAVIE
from .tinypic import TinyPicIE
from .tlc import TlcIE, TlcDeIE
from .tnaflix import TNAFlixIE
-from .thvideo import THVideoIE
+from .thvideo import (
+ THVideoIE,
+ THVideoPlaylistIE
+)
from .toutv import TouTvIE
from .toypics import ToypicsUserIE, ToypicsIE
from .traileraddict import TrailerAddictIE
diff --git a/youtube_dl/extractor/thvideo.py b/youtube_dl/extractor/thvideo.py
index 607e947bb..0ae20ea30 100644
--- a/youtube_dl/extractor/thvideo.py
+++ b/youtube_dl/extractor/thvideo.py
@@ -57,3 +57,27 @@ class THVideoIE(InfoExtractor):
'description': description,
'upload_date': upload_date
}
+
+
+class THVideoPlaylistIE(InfoExtractor):
+ _VALID_URL = r'http?://(?:www\.)?thvideo\.tv/mylist(?P<id>[0-9]+)'
+ _TEST = {
+ 'url': 'http://thvideo.tv/mylist2',
+ 'info_dict': {
+ 'id': '2',
+ 'title': '幻想万華鏡',
+ },
+ 'playlist_mincount': 23,
+ }
+
+ 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')
+
+ 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