X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ffootyroom.py;h=d2503ae2eff3d2e46497bbcba356af11db665452;hb=89f257d6e57131a266efae629334fe5f4bcf96e9;hp=dc784db9680fbb1f183b0fa3000ad48bcbf68714;hpb=7d2ba6394c489879578e316e533eeb282942e54b;p=youtube-dl diff --git a/youtube_dl/extractor/footyroom.py b/youtube_dl/extractor/footyroom.py index dc784db96..d2503ae2e 100644 --- a/youtube_dl/extractor/footyroom.py +++ b/youtube_dl/extractor/footyroom.py @@ -5,26 +5,23 @@ from .common import InfoExtractor class FootyRoomIE(InfoExtractor): - _VALID_URL = r'http://footyroom\.com/(?P[^/]+)' + _VALID_URL = r'https?://footyroom\.com/(?P[^/]+)' _TESTS = [{ 'url': 'http://footyroom.com/schalke-04-0-2-real-madrid-2015-02/', - 'md5': 'f38d400d32f19724570040d5ce3a505f', 'info_dict': { 'id': 'schalke-04-0-2-real-madrid-2015-02', 'title': 'Schalke 04 0 – 2 Real Madrid', }, 'playlist_count': 3, - }, - { + 'skip': 'Video for this match is not available', + }, { 'url': 'http://footyroom.com/georgia-0-2-germany-2015-03/', 'info_dict': { 'id': 'georgia-0-2-germany-2015-03', 'title': 'Georgia 0 – 2 Germany', }, 'playlist_count': 1, - }, - - ] + }] def _real_extract(self, url): playlist_id = self._match_id(url) @@ -46,9 +43,8 @@ class FootyRoomIE(InfoExtractor): playwire_url = self._search_regex( r'data-config="([^"]+)"', payload, 'playwire url', default=None) - if not playwire_url.startswith("http:"): - playwire_url = "http:" + playwire_url if playwire_url: - entries.append(self.url_result(playwire_url, 'Playwire')) + entries.append(self.url_result(self._proto_relative_url( + playwire_url, 'http:'), 'Playwire')) return self.playlist_result(entries, playlist_id, playlist_title)