From: Philipp Hagemeister Date: Tue, 25 Jun 2013 15:12:35 +0000 (+0200) Subject: Add Jukebox IE X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=515d7a5e73082c0f2e35bf7e778573bb2bbd576e;hp=98bcd2834a8652e12914e8b76b871a36be32f0ab Add Jukebox IE --- diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 9878ad942..7b291f907 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 @@ -127,6 +128,7 @@ def gen_extractors(): StatigramIE(), BreakIE(), VevoIE(), + JukeboxIE(), GenericIE() ] diff --git a/youtube_dl/extractor/jukebox.py b/youtube_dl/extractor/jukebox.py new file mode 100644 index 000000000..5eb255bf7 --- /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'