mirror of
https://gitlab.com/dstftw/youtube-dl.git
synced 2020-11-16 09:42:26 +00:00
[screenwavemedia] Add support for player2 URLs (Closes #5696)
This commit is contained in:
parent
fa6a16996e
commit
7a012d5a16
|
@ -11,7 +11,7 @@ from ..utils import (
|
||||||
|
|
||||||
|
|
||||||
class ScreenwaveMediaIE(InfoExtractor):
|
class ScreenwaveMediaIE(InfoExtractor):
|
||||||
_VALID_URL = r'http://player\.screenwavemedia\.com/play/[a-zA-Z]+\.php\?[^"]*\bid=(?P<id>.+)'
|
_VALID_URL = r'http://player\d?\.screenwavemedia\.com/(?:play/)?[a-zA-Z]+\.php\?[^"]*\bid=(?P<id>.+)'
|
||||||
|
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'http://player.screenwavemedia.com/play/play.php?playerdiv=videoarea&companiondiv=squareAd&id=Cinemassacre-19911',
|
'url': 'http://player.screenwavemedia.com/play/play.php?playerdiv=videoarea&companiondiv=squareAd&id=Cinemassacre-19911',
|
||||||
|
@ -20,7 +20,10 @@ class ScreenwaveMediaIE(InfoExtractor):
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id = self._match_id(url)
|
video_id = self._match_id(url)
|
||||||
playerdata = self._download_webpage(url, video_id, 'Downloading player webpage')
|
|
||||||
|
playerdata = self._download_webpage(
|
||||||
|
'http://player.screenwavemedia.com/play/player.php?id=%s' % video_id,
|
||||||
|
video_id, 'Downloading player webpage')
|
||||||
|
|
||||||
vidtitle = self._search_regex(
|
vidtitle = self._search_regex(
|
||||||
r'\'vidtitle\'\s*:\s*"([^"]+)"', playerdata, 'vidtitle').replace('\\/', '/')
|
r'\'vidtitle\'\s*:\s*"([^"]+)"', playerdata, 'vidtitle').replace('\\/', '/')
|
||||||
|
@ -99,7 +102,7 @@ class TeamFourIE(InfoExtractor):
|
||||||
webpage = self._download_webpage(url, display_id)
|
webpage = self._download_webpage(url, display_id)
|
||||||
|
|
||||||
playerdata_url = self._search_regex(
|
playerdata_url = self._search_regex(
|
||||||
r'src="(http://player\.screenwavemedia\.com/play/[a-zA-Z]+\.php\?[^"]*\bid=.+?)"',
|
r'src="(http://player\d?\.screenwavemedia\.com/(?:play/)?[a-zA-Z]+\.php\?[^"]*\bid=.+?)"',
|
||||||
webpage, 'player data URL')
|
webpage, 'player data URL')
|
||||||
|
|
||||||
video_title = self._html_search_regex(
|
video_title = self._html_search_regex(
|
||||||
|
|
Loading…
Reference in a new issue