[hypestat] Unify allmyvideos and vidspot (Closes #3788)

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 75831b40a57394dc4e01ab77c0082101b59ba8da..97693018fe494a8fba2957671a5c26af61051f22 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -6,7 +6,6 @@ from .aftonbladet import AftonbladetIE
 from .anitube import AnitubeIE
 from .anysex import AnySexIE
 from .aol import AolIE
-from .allmyvideos import AllmyvideosIE
 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .appletrailers import AppleTrailersIE
@@ -151,6 +150,7 @@ from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE
 from .huffpost import HuffPostIE
 from .hypem import HypemIE
+from .hypestat import HypestatIE
 from .iconosquare import IconosquareIE
 from .ign import IGNIE, OneUPIE
 from .imdb import (

diff --git a/youtube_dl/extractor/allmyvideos.py b/youtube_dl/extractor/hypestat.py
similarity index 77%
rename from youtube_dl/extractor/allmyvideos.py
rename to youtube_dl/extractor/hypestat.py
index e6c60e7e46e3c2b4752f1c72ad7374df10ee616a..8b8db30ae63beb8d2127d298cd2e152895e293ee 100644 (file)
--- a/youtube_dl/extractor/allmyvideos.py
+++ b/youtube_dl/extractor/hypestat.py
@@ -11,11 +11,11 @@ from ..utils import (
 )
 
 
-class AllmyvideosIE(InfoExtractor):
-    IE_NAME = 'allmyvideos.net'
-    _VALID_URL = r'https?://allmyvideos\.net/(?P<id>[a-zA-Z0-9_-]+)'
+class HypestatIE(InfoExtractor):
+    IE_DESC = 'allmyvideos.net and vidspot.net'
+    _VALID_URL = r'https?://(?:allmyvideos|vidspot)\.net/(?P<id>[a-zA-Z0-9_-]+)'
 
-    _TEST = {
+    _TESTS = [{
         'url': 'http://allmyvideos.net/jih3nce3x6wn',
         'md5': '710883dee1bfc370ecf9fa6a89307c88',
         'info_dict': {
@@ -23,7 +23,15 @@ class AllmyvideosIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'youtube-dl test video',
         },
-    }
+    }, {
+        'url': 'http://vidspot.net/l2ngsmhs8ci5',
+        'md5': '710883dee1bfc370ecf9fa6a89307c88',
+        'info_dict': {
+            'id': 'l2ngsmhs8ci5',
+            'ext': 'mp4',
+            'title': 'youtube-dl test video',
+        },
+    }]
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)