X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ffootyroom.py;h=d2503ae2eff3d2e46497bbcba356af11db665452;hb=dcce092e0aa92799f1e3a51ce5aae611af4d70d5;hp=70dfb06590f74d1e25d37b0a4d3e8f6dd8ba1273;hpb=9a4d8fae82f10afe8b2d0611f2f054af60dc7acc;p=youtube-dl diff --git a/youtube_dl/extractor/footyroom.py b/youtube_dl/extractor/footyroom.py index 70dfb0659..d2503ae2e 100644 --- a/youtube_dl/extractor/footyroom.py +++ b/youtube_dl/extractor/footyroom.py @@ -5,7 +5,7 @@ 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/', 'info_dict': { @@ -13,17 +13,15 @@ class FootyRoomIE(InfoExtractor): '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) @@ -45,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)