projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bc56355
)
[viki:channel] Extend matching URLs and extract movies
author
Sergey M․
<dstftw@gmail.com>
Wed, 20 May 2015 20:30:04 +0000
(
02:30
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Wed, 20 May 2015 20:30:04 +0000
(
02:30
+0600)
youtube_dl/extractor/viki.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/viki.py
b/youtube_dl/extractor/viki.py
index 071e280fb9fabf2c797f175be083b30fdce2f20c..3acb481f925c3f767df6e01045ee92d964893dd5 100644
(file)
--- a/
youtube_dl/extractor/viki.py
+++ b/
youtube_dl/extractor/viki.py
@@
-230,7
+230,7
@@
class VikiIE(VikiBaseIE):
class VikiChannelIE(VikiBaseIE):
IE_NAME = 'viki:channel'
class VikiChannelIE(VikiBaseIE):
IE_NAME = 'viki:channel'
- _VALID_URL = r'https?://(?:www\.)?viki\.com/
tv
/(?P<id>[0-9]+c)'
+ _VALID_URL = r'https?://(?:www\.)?viki\.com/
(?:tv|news|movies|artists)
/(?P<id>[0-9]+c)'
_TESTS = [{
'url': 'http://www.viki.com/tv/50c-boys-over-flowers',
'info_dict': {
_TESTS = [{
'url': 'http://www.viki.com/tv/50c-boys-over-flowers',
'info_dict': {
@@
-247,6
+247,15
@@
class VikiChannelIE(VikiBaseIE):
'description': 'md5:05bf5471385aa8b21c18ad450e350525',
},
'playlist_count': 127,
'description': 'md5:05bf5471385aa8b21c18ad450e350525',
},
'playlist_count': 127,
+ }, {
+ 'url': 'http://www.viki.com/news/24569c-showbiz-korea',
+ 'only_matching': True,
+ }, {
+ 'url': 'http://www.viki.com/movies/22047c-pride-and-prejudice-2005',
+ 'only_matching': True,
+ }, {
+ 'url': 'http://www.viki.com/artists/2141c-shinee',
+ 'only_matching': True,
}]
_PER_PAGE = 25
}]
_PER_PAGE = 25
@@
-265,7
+274,7
@@
class VikiChannelIE(VikiBaseIE):
description = descriptions.get('en') or descriptions[descriptions.keys()[0]]
entries = []
description = descriptions.get('en') or descriptions[descriptions.keys()[0]]
entries = []
- for video_type in ('episodes', 'clips'):
+ for video_type in ('episodes', 'clips'
, 'movies'
):
for page_num in itertools.count(1):
page = self._call_api(
'containers/%s/%s.json?per_page=%d&sort=number&direction=asc&with_paging=true&page=%d'
for page_num in itertools.count(1):
page = self._call_api(
'containers/%s/%s.json?per_page=%d&sort=number&direction=asc&with_paging=true&page=%d'