From: mc2avr Date: Tue, 25 Jun 2013 11:28:59 +0000 (+0200) Subject: add JukeboxIE X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=28ef06f7c28fa214841be6339bf3801b4834769a;p=youtube-dl add JukeboxIE --- diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index b208f9002..e27f58496 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -22,6 +22,7 @@ from .hypem import HypemIE from .ina import InaIE from .infoq import InfoQIE from .justintv import JustinTVIE +from .jukebox import JukeboxIE from .keek import KeekIE from .liveleak import LiveLeakIE from .metacafe import MetacafeIE @@ -125,6 +126,7 @@ def gen_extractors(): GametrailersIE(), StatigramIE(), BreakIE(), + JukeboxIE(), GenericIE() ] diff --git a/youtube_dl/extractor/jukebox.py b/youtube_dl/extractor/jukebox.py new file mode 100644 index 000000000..95b9fd06d --- /dev/null +++ b/youtube_dl/extractor/jukebox.py @@ -0,0 +1,59 @@ +import re + +from .common import InfoExtractor +from ..utils import ( + ExtractorError, + unescapeHTML, +) + +class JukeboxIE(InfoExtractor): + _VALID_URL = r'^http://www\.jukebox\.es\/.+[,](?P[a-z0-9]+).html' + _IFRAME = r'