projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/common] Add id and title helpers for generic IEs
[youtube-dl]
/
youtube_dl
/
extractor
/
toypics.py
diff --git
a/youtube_dl/extractor/toypics.py
b/youtube_dl/extractor/toypics.py
index 33a6988cacdc36a0c18ad89db80d50f21cd74219..938e05076313cb5b3d3284083d2cc7e699241d21 100644
(file)
--- a/
youtube_dl/extractor/toypics.py
+++ b/
youtube_dl/extractor/toypics.py
@@
-1,11
+1,13
@@
+# coding: utf-8
+from __future__ import unicode_literals
+
from .common import InfoExtractor
from .common import InfoExtractor
-from math import ceil
import re
class ToypicsIE(InfoExtractor):
IE_DESC = 'Toypics user profile'
import re
class ToypicsIE(InfoExtractor):
IE_DESC = 'Toypics user profile'
- _VALID_URL = r'http://videos\.toypics\.net/view/(?P<id>[0-9]+)/.*'
+ _VALID_URL = r'http
s?
://videos\.toypics\.net/view/(?P<id>[0-9]+)/.*'
_TEST = {
'url': 'http://videos.toypics.net/view/514/chancebulged,-2-1/',
'md5': '16e806ad6d6f58079d210fe30985e08b',
_TEST = {
'url': 'http://videos.toypics.net/view/514/chancebulged,-2-1/',
'md5': '16e806ad6d6f58079d210fe30985e08b',
@@
-39,7
+41,14
@@
class ToypicsIE(InfoExtractor):
class ToypicsUserIE(InfoExtractor):
IE_DESC = 'Toypics user profile'
class ToypicsUserIE(InfoExtractor):
IE_DESC = 'Toypics user profile'
- _VALID_URL = r'http://videos\.toypics\.net/(?P<username>[^/?]+)(?:$|[?#])'
+ _VALID_URL = r'https?://videos\.toypics\.net/(?P<username>[^/?]+)(?:$|[?#])'
+ _TEST = {
+ 'url': 'http://videos.toypics.net/Mikey',
+ 'info_dict': {
+ 'id': 'Mikey',
+ },
+ 'playlist_mincount': 19,
+ }
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
@@
-62,7
+71,7
@@
class ToypicsUserIE(InfoExtractor):
note='Downloading page %d/%d' % (n, page_count))
urls.extend(
re.findall(
note='Downloading page %d/%d' % (n, page_count))
urls.extend(
re.findall(
- r'<p class="video-entry-title">\
n\s*<a href="(http
://videos.toypics.net/view/[^"]+)">',
+ r'<p class="video-entry-title">\
s+<a href="(https?
://videos.toypics.net/view/[^"]+)">',
lpage))
return {
lpage))
return {
@@
-70,7
+79,7
@@
class ToypicsUserIE(InfoExtractor):
'id': username,
'entries': [{
'_type': 'url',
'id': username,
'entries': [{
'_type': 'url',
- 'url': url,
+ 'url':
e
url,
'ie_key': 'Toypics',
'ie_key': 'Toypics',
- } for url in urls]
+ } for
e
url in urls]
}
}