aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-02-05 23:57:35 +0600
committerSergey M․ <dstftw@gmail.com>2016-02-05 23:57:35 +0600
commiteb2533ec4cc55f1a100e508ea683f345cc84dac9 (patch)
treed53b10d43825da692f330dfdbe249b1d188b9ea9
parentb7b365067f492e00166ef7ee0ebebcc53b4b6b9c (diff)
[vidme:user:likes] Add extractor
-rw-r--r--youtube_dl/extractor/__init__.py1
-rw-r--r--youtube_dl/extractor/vidme.py50
2 files changed, 36 insertions, 15 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index bedd2397c..2fbc7f812 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -825,6 +825,7 @@ from .videott import VideoTtIE
from .vidme import (
VidmeIE,
VidmeUserIE,
+ VidmeUserLikesIE,
)
from .vidzi import VidziIE
from .vier import VierIE, VierVideosIE
diff --git a/youtube_dl/extractor/vidme.py b/youtube_dl/extractor/vidme.py
index 91c8349c2..e39f52204 100644
--- a/youtube_dl/extractor/vidme.py
+++ b/youtube_dl/extractor/vidme.py
@@ -206,26 +206,16 @@ class VidmeIE(InfoExtractor):
}
-class VidmeUserIE(InfoExtractor):
- _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z]{6,})'
- _TEST = {
- 'url': 'https://vid.me/EFARCHIVE',
- 'info_dict': {
- 'id': '3834632',
- 'title': 'EFARCHIVE',
- },
- 'playlist_mincount': 238,
- }
-
+class VidmeListBaseIE(InfoExtractor):
# Max possible limit according to https://docs.vid.me/#api-Videos-List
_LIMIT = 100
def _entries(self, user_id, user_name):
for page_num in itertools.count(1):
page = self._download_json(
- 'https://api.vid.me/videos/list?user=%s&limit=%d&offset=%d'
- % (user_id, self._LIMIT, (page_num - 1) * self._LIMIT), user_name,
- 'Downloading user page %d' % page_num)
+ 'https://api.vid.me/videos/%s?user=%s&limit=%d&offset=%d'
+ % (self._API_ITEM, user_id, self._LIMIT, (page_num - 1) * self._LIMIT),
+ user_name, 'Downloading user %s page %d' % (self._API_ITEM, page_num))
videos = page.get('videos', [])
if not videos:
@@ -247,4 +237,34 @@ class VidmeUserIE(InfoExtractor):
'https://api.vid.me/userByUsername?username=%s' % user_name,
user_name)['user']['user_id']
- return self.playlist_result(self._entries(user_id, user_name), user_id, user_name)
+ return self.playlist_result(
+ self._entries(user_id, user_name), user_id,
+ '%s - %s' % (user_name, self._TITLE))
+
+
+class VidmeUserIE(VidmeListBaseIE):
+ _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z]{6,})(?!/likes)(?:[^\da-zA-Z]|$)'
+ _API_ITEM = 'list'
+ _TITLE = 'Videos'
+ _TEST = {
+ 'url': 'https://vid.me/EFARCHIVE',
+ 'info_dict': {
+ 'id': '3834632',
+ 'title': 'EFARCHIVE - %s' % _TITLE,
+ },
+ 'playlist_mincount': 238,
+ }
+
+
+class VidmeUserLikesIE(VidmeListBaseIE):
+ _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z]{6,})/likes'
+ _API_ITEM = 'likes'
+ _TITLE = 'Likes'
+ _TEST = {
+ 'url': 'https://vid.me/ErinAlexis/likes',
+ 'info_dict': {
+ 'id': '6483530',
+ 'title': 'ErinAlexis - %s' % _TITLE,
+ },
+ 'playlist_mincount': 415,
+ }