[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 .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 (

View File

@ -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)