From aecfcd4e595121d17b173f1ee9f4444ee9c0fda2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Tue, 19 Jan 2016 21:51:46 +0600 Subject: [PATCH] [ultimedia] Rename to digiteka --- youtube_dl/extractor/__init__.py | 2 +- youtube_dl/extractor/{ultimedia.py => digiteka.py} | 2 +- youtube_dl/extractor/generic.py | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) rename youtube_dl/extractor/{ultimedia.py => digiteka.py} (99%) diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 0ba0d226f..1d838cdd0 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -777,7 +777,7 @@ UdemyCourseIE ) from .udn import UDNEmbedIE -from .ultimedia import UltimediaIE +from .digiteka import DigitekaIE from .unistra import UnistraIE from .urort import UrortIE from .ustream import UstreamIE, UstreamChannelIE diff --git a/youtube_dl/extractor/ultimedia.py b/youtube_dl/extractor/digiteka.py similarity index 99% rename from youtube_dl/extractor/ultimedia.py rename to youtube_dl/extractor/digiteka.py index eef8705e0..7bb79ffda 100644 --- a/youtube_dl/extractor/ultimedia.py +++ b/youtube_dl/extractor/digiteka.py @@ -7,7 +7,7 @@ from ..utils import int_or_none -class UltimediaIE(InfoExtractor): +class DigitekaIE(InfoExtractor): _VALID_URL = r'''(?x) https?://(?:www\.)?(?:digiteka\.net|ultimedia\.com)/ (?: diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 0baa17e8d..26d3698c8 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -57,7 +57,7 @@ from .videomore import VideomoreIE from .googledrive import GoogleDriveIE from .jwplatform import JWPlatformIE -from .ultimedia import UltimediaIE +from .digiteka import DigitekaIE class GenericIE(InfoExtractor): @@ -1814,10 +1814,10 @@ def _playlist_from_matches(matches, getter=None, ie=None): if mobj is not None: return self.url_result(unescapeHTML(mobj.group('url')), 'ScreenwaveMedia') - # Look for Ulltimedia embeds - ultimedia_url = UltimediaIE._extract_url(webpage) - if ultimedia_url: - return self.url_result(self._proto_relative_url(ultimedia_url), 'Ultimedia') + # Look for Digiteka embeds + digiteka_url = DigitekaIE._extract_url(webpage) + if digiteka_url: + return self.url_result(self._proto_relative_url(digiteka_url), DigitekaIE.ie_key()) # Look for AdobeTVVideo embeds mobj = re.search(