mirror of
https://github.com/blackjack4494/yt-dlc.git
synced 2024-12-25 17:27:36 +00:00
JukeboxIE: support more countries
This commit is contained in:
parent
318452bc0c
commit
037fcd0047
1 changed files with 2 additions and 3 deletions
|
@ -8,11 +8,10 @@ from ..utils import (
|
||||||
)
|
)
|
||||||
|
|
||||||
class JukeboxIE(InfoExtractor):
|
class JukeboxIE(InfoExtractor):
|
||||||
_VALID_URL = r'^http://www\.jukebox\.es\/.+[,](?P<video_id>[a-z0-9]+).html'
|
_VALID_URL = r'^http://www\.jukebox?\..+?\/.+[,](?P<video_id>[a-z0-9\-]+).html'
|
||||||
_IFRAME = r'<iframe .*src="(?P<iframe>[^"]*)".*>'
|
_IFRAME = r'<iframe .*src="(?P<iframe>[^"]*)".*>'
|
||||||
_VIDEO_URL = r'"config":{"file":"(?P<video_url>http:[^"]+[.](?P<video_ext>[^.?]+)[?]mdtk=[0-9]+)"'
|
_VIDEO_URL = r'"config":{"file":"(?P<video_url>http:[^"]+[.](?P<video_ext>[^.?]+)[?]mdtk=[0-9]+)"'
|
||||||
_TITLE = r'<h1 class="inline">(?P<title>[^<]+)</h1>.*<span id="infos_article_artist">(?P<artist>[^<]+)</span>'
|
_TITLE = r'<h1 class="inline">(?P<title>[^<]+)</h1>.*<span id="infos_article_artist">(?P<artist>[^<]+)</span>'
|
||||||
_NOT_AVAILABLE = r'<span>Este video no está disponible por el momento [!]</span>'
|
|
||||||
_IS_YOUTUBE = r'config":{"file":"(?P<youtube_url>http:[\\][/][\\][/]www[.]youtube[.]com[\\][/]watch[?]v=[^"]+)"'
|
_IS_YOUTUBE = r'config":{"file":"(?P<youtube_url>http:[\\][/][\\][/]www[.]youtube[.]com[\\][/]watch[?]v=[^"]+)"'
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
|
@ -27,7 +26,7 @@ class JukeboxIE(InfoExtractor):
|
||||||
iframe_url = unescapeHTML(mobj.group('iframe'))
|
iframe_url = unescapeHTML(mobj.group('iframe'))
|
||||||
|
|
||||||
iframe_html = self._download_webpage(iframe_url, video_id, 'Downloading iframe')
|
iframe_html = self._download_webpage(iframe_url, video_id, 'Downloading iframe')
|
||||||
mobj = re.search(self._NOT_AVAILABLE, iframe_html)
|
mobj = re.search(r'class="jkb_waiting"', iframe_html)
|
||||||
if mobj is not None:
|
if mobj is not None:
|
||||||
raise ExtractorError(u'Video is not available(in your country?)!')
|
raise ExtractorError(u'Video is not available(in your country?)!')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue