Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2025-01-08 14:17:54 +01:00
Code Issues Releases Wiki Activity

[narando] Improve coding methods as requested by dstftw in #18268

Browse Source
This commit is contained in:
ealgase 2018-11-30 19:07:26 -05:00
parent 6892fcbcc4
commit 0c2fc982d3
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
youtube_dl/extractor/narando.py
View File

@ -6,7 +6,7 @@ from .common import InfoExtractor
class NarandoPlayerIE(InfoExtractor): class NarandoPlayerIE(InfoExtractor):
IE_NAME = "narando:player" IE_NAME = "narando:player"
_VALID_URL = r'https://narando.com/widget\?r=(?P<id>\w+)' _VALID_URL = r'https://narando\.com/widget\?r=(?P<id>\w+)'
_TEST = { _TEST = {
'url': 'https://narando.com/widget?r=b2t4t789kxgy9g7ms4rwjvvw', 'url': 'https://narando.com/widget?r=b2t4t789kxgy9g7ms4rwjvvw',
'md5': 'd20f671f0395bab8f8285d1f6e8f965e', 'md5': 'd20f671f0395bab8f8285d1f6e8f965e',
@ -14,26 +14,25 @@ class NarandoPlayerIE(InfoExtractor):
'id': 'b2t4t789kxgy9g7ms4rwjvvw', 'id': 'b2t4t789kxgy9g7ms4rwjvvw',
'ext': 'mp3', 'ext': 'mp3',
'title': 'An ihrem Selbstlob erkennt man sie', 'title': 'An ihrem Selbstlob erkennt man sie',
'url': 'https://static.narando.com/sounds/10492/original.mp3',
} }
} }
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage('https://narando.com/widget?r=' + video_id, video_id) webpage = self._download_webpage('https://narando.com/widget?r=' + video_id, video_id)
title = self._html_search_regex(r'<title>narando \| (.+?)</title>', webpage, 'title') title = self._html_search_regex(r'<span class="clip-title">(.+?)</span>', webpage, 'title')
download_url = self._html_search_regex(r'.<div class="stream_url hide">\s*([^?]*)', webpage, 'download_url') download_url = self._html_search_regex(r'.<div class="stream_url hide">\s*([^?]*)', webpage, 'download_url')
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'url': download_url, 'url': download_url,
'vcodec': 'none',
} }
class NarandoIE(InfoExtractor): class NarandoIE(InfoExtractor):
IE_NAME = "narando" IE_NAME = "narando"
_VALID_URL = r'https?://(?:www\.)?narando\.com/articles/(?P<id>([a-zA-Z]|-)+)' _VALID_URL = r'https?://(?:www\.)?narando\.com/articles/(?P<id>.+)'
_TEST = { _TEST = {
'url': 'https://narando.com/articles/an-ihrem-selbstlob-erkennt-man-sie', 'url': 'https://narando.com/articles/an-ihrem-selbstlob-erkennt-man-sie',
'md5': 'd20f671f0395bab8f8285d1f6e8f965e', 'md5': 'd20f671f0395bab8f8285d1f6e8f965e',
@ -41,15 +40,14 @@ class NarandoIE(InfoExtractor):
'id': 'b2t4t789kxgy9g7ms4rwjvvw', 'id': 'b2t4t789kxgy9g7ms4rwjvvw',
'ext': 'mp3', 'ext': 'mp3',
'title': 'An ihrem Selbstlob erkennt man sie', 'title': 'An ihrem Selbstlob erkennt man sie',
'url': 'https://static.narando.com/sounds/10492/original.mp3',
} }
} }
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage('https://narando.com/articles/' + video_id, video_id) webpage = self._download_webpage(url, video_id)
title = self._html_search_regex(r'<h1 class="visible-xs h3">(.+?)</h1>', webpage, 'title') title = self._html_search_regex(r'<h1 class="visible-xs h3">(.+?)</h1>', webpage, 'title')
player_id = self._html_search_regex(r'[\n\r].*https:\/\/narando.com\/r\/\s*([^"]*)', webpage, 'player_id') player_id = self._html_search_regex(r'\s*https://narando.com/r/([^"]*)', webpage, 'player_id')
player_url = 'https://narando.com/widget?r=' + player_id player_url = 'https://narando.com/widget?r=' + player_id
return { return {