]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[ultimedia] Rename to digiteka
authorSergey M․ <dstftw@gmail.com>
Tue, 19 Jan 2016 15:51:46 +0000 (21:51 +0600)
committerSergey M․ <dstftw@gmail.com>
Tue, 19 Jan 2016 15:51:46 +0000 (21:51 +0600)
youtube_dl/extractor/__init__.py
youtube_dl/extractor/digiteka.py [moved from youtube_dl/extractor/ultimedia.py with 99% similarity]
youtube_dl/extractor/generic.py

index 0ba0d226f8c236f5af6e3d93f272642d2cd9e843..1d838cdd0afdd1be2b0ea8d33271025b8b47f1de 100644 (file)
@@ -777,7 +777,7 @@ from .udemy import (
     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
similarity index 99%
rename from youtube_dl/extractor/ultimedia.py
rename to youtube_dl/extractor/digiteka.py
index eef8705e01b62fa74b27b2d3883537d2a21e2d54..7bb79ffda0bbeda00ea103e59ab19ab746196de3 100644 (file)
@@ -7,7 +7,7 @@ from .common import InfoExtractor
 from ..utils import int_or_none
 
 
-class UltimediaIE(InfoExtractor):
+class DigitekaIE(InfoExtractor):
     _VALID_URL = r'''(?x)
         https?://(?:www\.)?(?:digiteka\.net|ultimedia\.com)/
         (?:
index 0baa17e8d80024c1c2f6fed25230a0c99469247b..26d3698c8b1e99a6899037a0a514e0a6480b2293 100644 (file)
@@ -57,7 +57,7 @@ from .pladform import PladformIE
 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 @@ class GenericIE(InfoExtractor):
         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(