From fa278f94267ba14ece5f925fcfdb2100f4431e20 Mon Sep 17 00:00:00 2001 From: Ozzy Walsh Date: Thu, 25 Jan 2018 08:56:54 +0000 Subject: [PATCH 1/3] Change Spike extractor tests to Paramount Network "Spike TV" has become "Paramount Network" and the domain has changed, breaking it's extractor. This commit changes the tests to use the new domain in preparation for fixing the extractor. --- youtube_dl/extractor/spike.py | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/youtube_dl/extractor/spike.py b/youtube_dl/extractor/spike.py index a7b1b3b5f..46086eef7 100644 --- a/youtube_dl/extractor/spike.py +++ b/youtube_dl/extractor/spike.py @@ -8,37 +8,24 @@ from .mtv import MTVServicesInfoExtractor class SpikeIE(MTVServicesInfoExtractor): _VALID_URL = r'https?://(?:[^/]+\.)?spike\.com/[^/]+/[\da-z]{6}(?:[/?#&]|$)' _TESTS = [{ - 'url': 'http://www.spike.com/video-clips/lhtu8m/auction-hunters-can-allen-ride-a-hundred-year-old-motorcycle', - 'md5': '1a9265f32b0c375793d6c4ce45255256', + 'url': 'http://www.paramountnetwork.com/video-clips/e1ktem/nobodies-gangbanged', + 'md5': 'TODO: md5 sum of the first 10241 bytes of the video file (use --test)', 'info_dict': { - 'id': 'b9c8221a-4e50-479a-b86d-3333323e38ba', + 'id': 'e1ktem', 'ext': 'mp4', - 'title': 'Auction Hunters|December 27, 2013|4|414|Can Allen Ride A Hundred Year-Old Motorcycle?', - 'description': 'md5:fbed7e82ed5fad493615b3094a9499cb', - 'timestamp': 1388120400, - 'upload_date': '20131227', + 'title': 'Gangbanged - NOBODIES | Paramount Network', + 'description': 'TODO: Add description checksum', + 'upload_date': 'TODO: Add upload date', }, }, { - 'url': 'http://www.spike.com/full-episodes/j830qm/lip-sync-battle-joel-mchale-vs-jim-rash-season-2-ep-209', - 'md5': 'b25c6f16418aefb9ad5a6cae2559321f', + 'url': 'http://www.paramountnetwork.com/episodes/j830qm/lip-sync-battle-joel-mchale-vs-jim-rash-season-2-ep-13', + 'md5': 'TODO: md5 sum of the first 10241 bytes of the video file (use --test)', 'info_dict': { - 'id': '37ace3a8-1df6-48be-85b8-38df8229e241', + 'id': 'j830qm', 'ext': 'mp4', - 'title': 'Lip Sync Battle|April 28, 2016|2|209|Joel McHale Vs. Jim Rash|Act 1', - 'description': 'md5:a739ca8f978a7802f67f8016d27ce114', + 'title': 'Lip Sync Battle - Season 2, Ep. 13 - Joel McHale Vs. Jim Rash - Full Episode | Paramount Network', + 'description': 'TODO: Add description checksum', }, - }, { - 'url': 'http://www.spike.com/video-clips/lhtu8m/', - 'only_matching': True, - }, { - 'url': 'http://www.spike.com/video-clips/lhtu8m', - 'only_matching': True, - }, { - 'url': 'http://bellator.spike.com/fight/atwr7k/bellator-158-michael-page-vs-evangelista-cyborg', - 'only_matching': True, - }, { - 'url': 'http://bellator.spike.com/video-clips/bw6k7n/bellator-158-foundations-michael-venom-page', - 'only_matching': True, }] _FEED_URL = 'http://www.spike.com/feeds/mrss/' From a0f285fce1eea1e1dca23a0c23a9e43b9bcb4541 Mon Sep 17 00:00:00 2001 From: Ozzy Walsh Date: Thu, 25 Jan 2018 09:29:22 +0000 Subject: [PATCH 2/3] Change Spike _VALID_URL to Paramount Network URL #15418 Downloads from Paramount Network(previously Spike) now function and no longer raise 'Unsupported URL'. Single episodes seem to be download in parts as described in #15418, which may no be correct behaviour --- youtube_dl/extractor/spike.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/spike.py b/youtube_dl/extractor/spike.py index 46086eef7..affb8425d 100644 --- a/youtube_dl/extractor/spike.py +++ b/youtube_dl/extractor/spike.py @@ -6,10 +6,10 @@ from .mtv import MTVServicesInfoExtractor class SpikeIE(MTVServicesInfoExtractor): - _VALID_URL = r'https?://(?:[^/]+\.)?spike\.com/[^/]+/[\da-z]{6}(?:[/?#&]|$)' + _VALID_URL = r'https?://(?:[^/]+\.)?paramountnetwork\.com/[^/]+/[\da-z]{6}(?:[/?#&]|$)' _TESTS = [{ 'url': 'http://www.paramountnetwork.com/video-clips/e1ktem/nobodies-gangbanged', - 'md5': 'TODO: md5 sum of the first 10241 bytes of the video file (use --test)', + 'md5': 'f53ab001b5c1c6fee01bc9f00e2859d1', 'info_dict': { 'id': 'e1ktem', 'ext': 'mp4', From 1ea36c37d79d0596570204a52bd5fdb86e556f47 Mon Sep 17 00:00:00 2001 From: Ozzy Walsh Date: Thu, 25 Jan 2018 10:29:03 +0000 Subject: [PATCH 3/3] Rename SpikeIE to ParamountNetworkIE --- youtube_dl/extractor/extractors.py | 2 +- youtube_dl/extractor/{spike.py => paramountnetwork.py} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename youtube_dl/extractor/{spike.py => paramountnetwork.py} (93%) diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 57e74ba62..822b30265 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -985,7 +985,7 @@ from .spankbang import SpankBangIE from .spankwire import SpankwireIE from .spiegel import SpiegelIE, SpiegelArticleIE from .spiegeltv import SpiegeltvIE -from .spike import SpikeIE +from .paramountnetwork import ParamountNetworkIE from .stitcher import StitcherIE from .sport5 import Sport5IE from .sportbox import SportBoxEmbedIE diff --git a/youtube_dl/extractor/spike.py b/youtube_dl/extractor/paramountnetwork.py similarity index 93% rename from youtube_dl/extractor/spike.py rename to youtube_dl/extractor/paramountnetwork.py index affb8425d..e15dc099b 100644 --- a/youtube_dl/extractor/spike.py +++ b/youtube_dl/extractor/paramountnetwork.py @@ -5,7 +5,7 @@ import re from .mtv import MTVServicesInfoExtractor -class SpikeIE(MTVServicesInfoExtractor): +class ParamountNetworkIE(MTVServicesInfoExtractor): _VALID_URL = r'https?://(?:[^/]+\.)?paramountnetwork\.com/[^/]+/[\da-z]{6}(?:[/?#&]|$)' _TESTS = [{ 'url': 'http://www.paramountnetwork.com/video-clips/e1ktem/nobodies-gangbanged', @@ -34,7 +34,7 @@ class SpikeIE(MTVServicesInfoExtractor): _GEO_COUNTRIES = ['US'] def _extract_mgid(self, webpage): - mgid = super(SpikeIE, self)._extract_mgid(webpage) + mgid = super(ParamountNetworkIE, self)._extract_mgid(webpage) if mgid is None: url_parts = self._search_regex(self._CUSTOM_URL_REGEX, webpage, 'episode_id') video_type, episode_id = url_parts.split('/', 1)