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

This commit is contained in:
Philipp Hagemeister 2014-09-18 18:54:03 +02:00
parent fd78a4d3e6
commit 0529eef5a4
2 changed files with 14 additions and 6 deletions

View file

@ -6,7 +6,6 @@
from .anitube import AnitubeIE from .anitube import AnitubeIE
from .anysex import AnySexIE from .anysex import AnySexIE
from .aol import AolIE from .aol import AolIE
from .allmyvideos import AllmyvideosIE
from .allocine import AllocineIE from .allocine import AllocineIE
from .aparat import AparatIE from .aparat import AparatIE
from .appletrailers import AppleTrailersIE from .appletrailers import AppleTrailersIE
@ -151,6 +150,7 @@
from .howstuffworks import HowStuffWorksIE from .howstuffworks import HowStuffWorksIE
from .huffpost import HuffPostIE from .huffpost import HuffPostIE
from .hypem import HypemIE from .hypem import HypemIE
from .hypestat import HypestatIE
from .iconosquare import IconosquareIE from .iconosquare import IconosquareIE
from .ign import IGNIE, OneUPIE from .ign import IGNIE, OneUPIE
from .imdb import ( from .imdb import (

View file

@ -11,11 +11,11 @@
) )
class AllmyvideosIE(InfoExtractor): class HypestatIE(InfoExtractor):
IE_NAME = 'allmyvideos.net' IE_DESC = 'allmyvideos.net and vidspot.net'
_VALID_URL = r'https?://allmyvideos\.net/(?P<id>[a-zA-Z0-9_-]+)' _VALID_URL = r'https?://(?:allmyvideos|vidspot)\.net/(?P<id>[a-zA-Z0-9_-]+)'
_TEST = { _TESTS = [{
'url': 'http://allmyvideos.net/jih3nce3x6wn', 'url': 'http://allmyvideos.net/jih3nce3x6wn',
'md5': '710883dee1bfc370ecf9fa6a89307c88', 'md5': '710883dee1bfc370ecf9fa6a89307c88',
'info_dict': { 'info_dict': {
@ -23,7 +23,15 @@ class AllmyvideosIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'title': 'youtube-dl test video', '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): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)