R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[picta] Add field API_BASE_URL in PictaBaseIE class

Browse Source 
Add support for slug url
This commit is contained in:
Oleksis 2019-02-16 03:02:32 -05:00
parent d9cf3bfaa9
commit 5c619d2d5e
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
youtube_dl/extractor/picta.py
View File

@ -5,12 +5,15 @@ from ..utils import (
int_or_none, int_or_none,
unified_timestamp, unified_timestamp,
try_get, try_get,
base_url,
ExtractorError ExtractorError
) )
from .common import InfoExtractor from .common import InfoExtractor
class PictaBaseIE(InfoExtractor): class PictaBaseIE(InfoExtractor):
API_BASE_URL = 'https://www.picta.cu/api/v1/'
def _extract_video(self, video, video_id=None, require_title=True): def _extract_video(self, video, video_id=None, require_title=True):
title = video['results'][0]['nombre'] if require_title else video.get('results')[0].get('nombre') title = video['results'][0]['nombre'] if require_title else video.get('results')[0].get('nombre')
description = try_get(video, lambda x: x['results'][0]['descripcion'], compat_str) description = try_get(video, lambda x: x['results'][0]['descripcion'], compat_str)
@ -36,11 +39,11 @@ class PictaBaseIE(InfoExtractor):
class PictaIE(PictaBaseIE): class PictaIE(PictaBaseIE):
IE_NAME = 'picta' IE_NAME = 'picta'
IE_DESC = 'Picta videos' IE_DESC = 'Picta videos'
_VALID_URL = r'https?://(?:www\.)?picta\.cu/(?:medias|embed)/(?:\?v=)?(?P<id>[0-9]+)' _VALID_URL = r'https?://(?:www\.)?picta\.cu/(?:medias|embed)/(?:\?v=)?(?P<id>[\da-z-]+)'
_TESTS = [{ _TESTS = [{
'url': 'https://www.picta.cu/medias/818', 'url': 'https://www.picta.cu/medias/orishas-everyday-2019-01-16-16-36-42-443003',
'file': 'Orishas - Everyday-818.webm', 'file': 'Orishas - Everyday-orishas-everyday-2019-01-16-16-36-42-443003.webm',
'md5': 'ebd10d5a34f23059e08419aa123aebdb', 'md5': 'ebd10d5a34f23059e08419aa123aebdb',
'info_dict': { 'info_dict': {
'id': '818', 'id': '818',
@ -55,9 +58,10 @@ class PictaIE(PictaBaseIE):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
if base_url(url).find('medias') != -1:
api_url = 'https://www.picta.cu/api/v1/publicacion/' json_url = self.API_BASE_URL + 'publicacion/?format=json&slug_url=%s&tipo=publicacion' % video_id
json_url = api_url + '?format=json&id_publicacion=%s&tipo=publicacion' % video_id else:
json_url = self.API_BASE_URL + 'publicacion/?format=json&id_publicacion=%s&tipo=publicacion' % video_id
video = self._download_json(json_url, video_id, 'Downloading video JSON') video = self._download_json(json_url, video_id, 'Downloading video JSON')
@ -83,7 +87,7 @@ class PictaEmbedIE(InfoExtractor):
_TEST = { _TEST = {
'url': 'https://www.picta.cu/embed/?v=818', 'url': 'https://www.picta.cu/embed/?v=818',
'file': 'Orishas - Everyday-818.webm', 'file': 'Orishas - Everyday-orishas-everyday-2019-01-16-16-36-42-443003.webm',
'md5': 'ebd10d5a34f23059e08419aa123aebdb', 'md5': 'ebd10d5a34f23059e08419aa123aebdb',
'info_dict': { 'info_dict': {
'id': '818', 'id': '818',
@ -94,6 +98,4 @@ class PictaEmbedIE(InfoExtractor):
} }
def _real_extract(self, url): def _real_extract(self, url):
embed_id = self._match_id(url) return self.url_result(url, PictaIE.ie_key())
video_url = 'https://www.picta.cu/medias/%s' % embed_id
return self.url_result(video_url, PictaIE.ie_key())