gitlab-com-dstftw/youtube-dl
1
0
Fork 0
mirror of https://gitlab.com/dstftw/youtube-dl.git synced 2020-11-16 09:42:26 +00:00
Code Issues Releases Wiki Activity

[naver] Fix video url (fixes #5809)

Browse source 
RTMP urls in test:naver does not work. Need more investigation.
This commit is contained in:
Yen Chi Hsuan 2015-05-27 14:44:08 +08:00
parent c23848b3c5
commit f8d5e1cfb5
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
youtube_dl/extractor/naver.py
View file

@ -6,6 +6,7 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import ( from ..compat import (
compat_urllib_parse, compat_urllib_parse,
compat_urlparse,
) )
from ..utils import ( from ..utils import (
ExtractorError, ExtractorError,
@ -16,7 +17,7 @@ from ..utils import (
class NaverIE(InfoExtractor): class NaverIE(InfoExtractor):
_VALID_URL = r'https?://(?:m\.)?tvcast\.naver\.com/v/(?P<id>\d+)' _VALID_URL = r'https?://(?:m\.)?tvcast\.naver\.com/v/(?P<id>\d+)'
_TEST = { _TESTS = [{
'url': 'http://tvcast.naver.com/v/81652', 'url': 'http://tvcast.naver.com/v/81652',
'info_dict': { 'info_dict': {
'id': '81652', 'id': '81652',
@ -25,7 +26,18 @@ class NaverIE(InfoExtractor):
'description': '합격불변의 법칙 메가스터디 | 메가스터디 수학 김상희 선생님이 9월 모의고사 수학A형 16번에서 20번까지 해설강의를 공개합니다.', 'description': '합격불변의 법칙 메가스터디 | 메가스터디 수학 김상희 선생님이 9월 모의고사 수학A형 16번에서 20번까지 해설강의를 공개합니다.',
'upload_date': '20130903', 'upload_date': '20130903',
}, },
} }, {
'url': 'http://tvcast.naver.com/v/395837',
'md5': '638ed4c12012c458fefcddfd01f173cd',
'info_dict': {
'id': '395837',
'ext': 'mp4',
'title': '9년이 지나도 아픈 기억, 전효성의 아버지',
'description': 'md5:5bf200dcbf4b66eb1b350d1eb9c753f7',
'upload_date': '20150519',
},
'skip': 'Georestricted',
}]
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
@ -58,14 +70,18 @@ class NaverIE(InfoExtractor):
formats = [] formats = []
for format_el in urls.findall('EncodingOptions/EncodingOption'): for format_el in urls.findall('EncodingOptions/EncodingOption'):
domain = format_el.find('Domain').text domain = format_el.find('Domain').text
uri = format_el.find('uri').text
f = { f = {
'url': domain + format_el.find('uri').text, 'url': compat_urlparse.urljoin(domain, uri),
'ext': 'mp4', 'ext': 'mp4',
'width': int(format_el.find('width').text), 'width': int(format_el.find('width').text),
'height': int(format_el.find('height').text), 'height': int(format_el.find('height').text),
} }
if domain.startswith('rtmp'): if domain.startswith('rtmp'):
# urlparse does not support custom schemes
# https://bugs.python.org/issue18828
f.update({ f.update({
'url': domain + uri,
'ext': 'flv', 'ext': 'flv',
'rtmp_protocol': '1', # rtmpt 'rtmp_protocol': '1', # rtmpt
}) })