mirror of
				https://github.com/yt-dlp/yt-dlp.git
				synced 2025-10-30 06:05:13 +00:00 
			
		
		
		
	[ie/dplay] Fix extractors (#10471)
Closes #1623, Closes #2138, Closes #2361, Closes #3841, Closes #8026, Closes #10421 Authored by: bashonly
This commit is contained in:
		| @@ -346,8 +346,16 @@ class HGTVDeIE(DPlayBaseIE): | ||||
| 
 | ||||
| 
 | ||||
| class DiscoveryPlusBaseIE(DPlayBaseIE): | ||||
|     """Subclasses must set _PRODUCT, _DISCO_API_PARAMS""" | ||||
| 
 | ||||
|     _DISCO_CLIENT_VER = '27.43.0' | ||||
| 
 | ||||
|     def _update_disco_api_headers(self, headers, disco_base, display_id, realm): | ||||
|         headers['x-disco-client'] = f'WEB:UNKNOWN:{self._PRODUCT}:25.2.6' | ||||
|         headers.update({ | ||||
|             'x-disco-params': f'realm={realm},siteLookupKey={self._PRODUCT}', | ||||
|             'x-disco-client': f'WEB:UNKNOWN:{self._PRODUCT}:{self._DISCO_CLIENT_VER}', | ||||
|             'Authorization': self._get_auth(disco_base, display_id, realm), | ||||
|         }) | ||||
| 
 | ||||
|     def _download_video_playback_info(self, disco_base, video_id, headers): | ||||
|         return self._download_json( | ||||
| @@ -368,6 +376,26 @@ class DiscoveryPlusBaseIE(DPlayBaseIE): | ||||
| class GoDiscoveryIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:go\.)?discovery\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://go.discovery.com/video/in-the-eye-of-the-storm-discovery-atve-us/trapped-in-a-twister', | ||||
|         'info_dict': { | ||||
|             'id': '5352642', | ||||
|             'display_id': 'in-the-eye-of-the-storm-discovery-atve-us/trapped-in-a-twister', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Trapped in a Twister', | ||||
|             'description': 'Twisters destroy Midwest towns, trapping spotters in the eye of the storm.', | ||||
|             'episode_number': 1, | ||||
|             'episode': 'Episode 1', | ||||
|             'season_number': 1, | ||||
|             'season': 'Season 1', | ||||
|             'series': 'In The Eye Of The Storm', | ||||
|             'duration': 2490.237, | ||||
|             'upload_date': '20240715', | ||||
|             'timestamp': 1721008800, | ||||
|             'tags': [], | ||||
|             'creators': ['Discovery'], | ||||
|             'thumbnail': 'https://us1-prod-images.disco-api.com/2024/07/10/5e39637d-cabf-3ab3-8e9a-f4e9d37bc036.jpeg', | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://go.discovery.com/video/dirty-jobs-discovery-atve-us/rodbuster-galvanizer', | ||||
|         'info_dict': { | ||||
|             'id': '4164906', | ||||
| @@ -395,6 +423,26 @@ class GoDiscoveryIE(DiscoveryPlusBaseIE): | ||||
| class TravelChannelIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:watch\.)?travelchannel\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://watch.travelchannel.com/video/the-dead-files-travel-channel/protect-the-children', | ||||
|         'info_dict': { | ||||
|             'id': '4710177', | ||||
|             'display_id': 'the-dead-files-travel-channel/protect-the-children', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Protect the Children', | ||||
|             'description': 'An evil presence threatens an Ohio woman\'s children and marriage.', | ||||
|             'season_number': 14, | ||||
|             'season': 'Season 14', | ||||
|             'episode_number': 10, | ||||
|             'episode': 'Episode 10', | ||||
|             'series': 'The Dead Files', | ||||
|             'duration': 2550.481, | ||||
|             'timestamp': 1664510400, | ||||
|             'upload_date': '20220930', | ||||
|             'tags': [], | ||||
|             'creators': ['Travel Channel'], | ||||
|             'thumbnail': 'https://us1-prod-images.disco-api.com/2022/03/17/5e45eace-de5d-343a-9293-f400a2aa77d5.jpeg', | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://watch.travelchannel.com/video/ghost-adventures-travel-channel/ghost-train-of-ely', | ||||
|         'info_dict': { | ||||
|             'id': '2220256', | ||||
| @@ -422,6 +470,26 @@ class TravelChannelIE(DiscoveryPlusBaseIE): | ||||
| class CookingChannelIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:watch\.)?cookingchanneltv\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://watch.cookingchanneltv.com/video/bobbys-triple-threat-food-network-atve-us/titans-vs-marcus-samuelsson', | ||||
|         'info_dict': { | ||||
|             'id': '5350005', | ||||
|             'ext': 'mp4', | ||||
|             'display_id': 'bobbys-triple-threat-food-network-atve-us/titans-vs-marcus-samuelsson', | ||||
|             'title': 'Titans vs Marcus Samuelsson', | ||||
|             'description': 'Marcus Samuelsson throws his legendary global tricks at the Titans.', | ||||
|             'episode_number': 1, | ||||
|             'episode': 'Episode 1', | ||||
|             'season_number': 3, | ||||
|             'season': 'Season 3', | ||||
|             'series': 'Bobby\'s Triple Threat', | ||||
|             'duration': 2520.851, | ||||
|             'upload_date': '20240710', | ||||
|             'timestamp': 1720573200, | ||||
|             'tags': [], | ||||
|             'creators': ['Food Network'], | ||||
|             'thumbnail': 'https://us1-prod-images.disco-api.com/2024/07/04/529cd095-27ec-35c5-84e9-90ebd3e5d2da.jpeg', | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://watch.cookingchanneltv.com/video/carnival-eats-cooking-channel/the-postman-always-brings-rice-2348634', | ||||
|         'info_dict': { | ||||
|             'id': '2348634', | ||||
| @@ -449,6 +517,22 @@ class CookingChannelIE(DiscoveryPlusBaseIE): | ||||
| class HGTVUsaIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:watch\.)?hgtv\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://watch.hgtv.com/video/flip-or-flop-the-final-flip-hgtv-atve-us/flip-or-flop-the-final-flip', | ||||
|         'info_dict': { | ||||
|             'id': '5025585', | ||||
|             'display_id': 'flip-or-flop-the-final-flip-hgtv-atve-us/flip-or-flop-the-final-flip', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Flip or Flop: The Final Flip', | ||||
|             'description': 'Tarek and Christina are going their separate ways after one last flip!', | ||||
|             'series': 'Flip or Flop: The Final Flip', | ||||
|             'duration': 2580.644, | ||||
|             'upload_date': '20231101', | ||||
|             'timestamp': 1698811200, | ||||
|             'tags': [], | ||||
|             'creators': ['HGTV'], | ||||
|             'thumbnail': 'https://us1-prod-images.disco-api.com/2022/11/27/455caa6c-1462-3f14-b63d-a026d7a5e6d3.jpeg', | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://watch.hgtv.com/video/home-inspector-joe-hgtv-atve-us/this-mold-house', | ||||
|         'info_dict': { | ||||
|             'id': '4289736', | ||||
| @@ -476,6 +560,26 @@ class HGTVUsaIE(DiscoveryPlusBaseIE): | ||||
| class FoodNetworkIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:watch\.)?foodnetwork\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://watch.foodnetwork.com/video/guys-grocery-games-food-network/wild-in-the-aisles', | ||||
|         'info_dict': { | ||||
|             'id': '2152549', | ||||
|             'display_id': 'guys-grocery-games-food-network/wild-in-the-aisles', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Wild in the Aisles', | ||||
|             'description': 'The chefs make spaghetti and meatballs with "Out of Stock" ingredients.', | ||||
|             'season_number': 1, | ||||
|             'season': 'Season 1', | ||||
|             'episode_number': 1, | ||||
|             'episode': 'Episode 1', | ||||
|             'series': 'Guy\'s Grocery Games', | ||||
|             'tags': [], | ||||
|             'creators': ['Food Network'], | ||||
|             'duration': 2520.651, | ||||
|             'upload_date': '20230623', | ||||
|             'timestamp': 1687492800, | ||||
|             'thumbnail': 'https://us1-prod-images.disco-api.com/2022/06/15/37fb5333-cad2-3dbb-af7c-c20ec77c89c6.jpeg', | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://watch.foodnetwork.com/video/kids-baking-championship-food-network/float-like-a-butterfly', | ||||
|         'info_dict': { | ||||
|             'id': '4116449', | ||||
| @@ -503,6 +607,26 @@ class FoodNetworkIE(DiscoveryPlusBaseIE): | ||||
| class DestinationAmericaIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:www\.)?destinationamerica\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://www.destinationamerica.com/video/bbq-pit-wars-destination-america/smoke-on-the-water', | ||||
|         'info_dict': { | ||||
|             'id': '2218409', | ||||
|             'display_id': 'bbq-pit-wars-destination-america/smoke-on-the-water', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Smoke on the Water', | ||||
|             'description': 'The pitmasters head to Georgia for the Smoke on the Water BBQ Festival.', | ||||
|             'season_number': 2, | ||||
|             'season': 'Season 2', | ||||
|             'episode_number': 1, | ||||
|             'episode': 'Episode 1', | ||||
|             'series': 'BBQ Pit Wars', | ||||
|             'tags': [], | ||||
|             'creators': ['Destination America'], | ||||
|             'duration': 2614.878, | ||||
|             'upload_date': '20230623', | ||||
|             'timestamp': 1687492800, | ||||
|             'thumbnail': 'https://us1-prod-images.disco-api.com/2020/05/11/c0f8e85d-9a10-3e6f-8e43-f6faafa81ba2.jpeg', | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://www.destinationamerica.com/video/alaska-monsters-destination-america-atve-us/central-alaskas-bigfoot', | ||||
|         'info_dict': { | ||||
|             'id': '4210904', | ||||
| @@ -530,6 +654,26 @@ class DestinationAmericaIE(DiscoveryPlusBaseIE): | ||||
| class InvestigationDiscoveryIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:www\.)?investigationdiscovery\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://www.investigationdiscovery.com/video/deadly-influence-the-social-media-murders-investigation-discovery-atve-us/rip-bianca', | ||||
|         'info_dict': { | ||||
|             'id': '5341132', | ||||
|             'display_id': 'deadly-influence-the-social-media-murders-investigation-discovery-atve-us/rip-bianca', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'RIP Bianca', | ||||
|             'description': 'A teenage influencer discovers an online world of threat, harm and danger.', | ||||
|             'season_number': 1, | ||||
|             'season': 'Season 1', | ||||
|             'episode_number': 3, | ||||
|             'episode': 'Episode 3', | ||||
|             'series': 'Deadly Influence: The Social Media Murders', | ||||
|             'creators': ['Investigation Discovery'], | ||||
|             'tags': [], | ||||
|             'duration': 2490.888, | ||||
|             'upload_date': '20240618', | ||||
|             'timestamp': 1718672400, | ||||
|             'thumbnail': 'https://us1-prod-images.disco-api.com/2024/06/15/b567c774-9e44-3c6c-b0ba-db860a73e812.jpeg', | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://www.investigationdiscovery.com/video/unmasked-investigation-discovery/the-killer-clown', | ||||
|         'info_dict': { | ||||
|             'id': '2139409', | ||||
| @@ -557,6 +701,26 @@ class InvestigationDiscoveryIE(DiscoveryPlusBaseIE): | ||||
| class AmHistoryChannelIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:www\.)?ahctv\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://www.ahctv.com/video/blood-and-fury-americas-civil-war-ahc/battle-of-bull-run', | ||||
|         'info_dict': { | ||||
|             'id': '2139199', | ||||
|             'display_id': 'blood-and-fury-americas-civil-war-ahc/battle-of-bull-run', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Battle of Bull Run', | ||||
|             'description': 'Two untested armies clash in the first real battle of the Civil War.', | ||||
|             'season_number': 1, | ||||
|             'season': 'Season 1', | ||||
|             'episode_number': 1, | ||||
|             'episode': 'Episode 1', | ||||
|             'series': 'Blood and Fury: America\'s Civil War', | ||||
|             'duration': 2612.509, | ||||
|             'upload_date': '20220923', | ||||
|             'timestamp': 1663905600, | ||||
|             'creators': ['AHC'], | ||||
|             'tags': [], | ||||
|             'thumbnail': 'https://us1-prod-images.disco-api.com/2020/05/11/4af61bd7-d705-3108-82c4-1a6e541e20fa.jpeg', | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://www.ahctv.com/video/modern-sniper-ahc/army', | ||||
|         'info_dict': { | ||||
|             'id': '2309730', | ||||
| @@ -584,6 +748,26 @@ class AmHistoryChannelIE(DiscoveryPlusBaseIE): | ||||
| class ScienceChannelIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:www\.)?sciencechannel\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://www.sciencechannel.com/video/spaces-deepest-secrets-science-atve-us/mystery-of-the-dead-planets', | ||||
|         'info_dict': { | ||||
|             'id': '2347335', | ||||
|             'display_id': 'spaces-deepest-secrets-science-atve-us/mystery-of-the-dead-planets', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Mystery of the Dead Planets', | ||||
|             'description': 'Astronomers unmask the truly destructive nature of the cosmos.', | ||||
|             'season_number': 7, | ||||
|             'season': 'Season 7', | ||||
|             'episode_number': 1, | ||||
|             'episode': 'Episode 1', | ||||
|             'series': 'Space\'s Deepest Secrets', | ||||
|             'duration': 2524.989, | ||||
|             'upload_date': '20230128', | ||||
|             'timestamp': 1674882000, | ||||
|             'creators': ['Science'], | ||||
|             'tags': [], | ||||
|             'thumbnail': 'https://us1-prod-images.disco-api.com/2021/03/30/3796829d-aead-3f9a-bd8d-e49048b3cdca.jpeg', | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://www.sciencechannel.com/video/strangest-things-science-atve-us/nazi-mystery-machine', | ||||
|         'info_dict': { | ||||
|             'id': '2842849', | ||||
| @@ -608,36 +792,29 @@ class ScienceChannelIE(DiscoveryPlusBaseIE): | ||||
|     } | ||||
| 
 | ||||
| 
 | ||||
| class DIYNetworkIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:watch\.)?diynetwork\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://watch.diynetwork.com/video/pool-kings-diy-network/bringing-beach-life-to-texas', | ||||
|         'info_dict': { | ||||
|             'id': '2309730', | ||||
|             'display_id': 'pool-kings-diy-network/bringing-beach-life-to-texas', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Bringing Beach Life to Texas', | ||||
|             'description': 'The Pool Kings give a family a day at the beach in their own backyard.', | ||||
|             'season_number': 10, | ||||
|             'episode_number': 2, | ||||
|         }, | ||||
|         'skip': 'Available for Premium users', | ||||
|     }, { | ||||
|         'url': 'https://watch.diynetwork.com/video/pool-kings-diy-network/bringing-beach-life-to-texas', | ||||
|         'only_matching': True, | ||||
|     }] | ||||
| 
 | ||||
|     _PRODUCT = 'diy' | ||||
|     _DISCO_API_PARAMS = { | ||||
|         'disco_host': 'us1-prod-direct.watch.diynetwork.com', | ||||
|         'realm': 'go', | ||||
|         'country': 'us', | ||||
|     } | ||||
| 
 | ||||
| 
 | ||||
| class DiscoveryLifeIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:www\.)?discoverylife\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://www.discoverylife.com/video/er-files-discovery-life-atve-us/sweet-charity', | ||||
|         'info_dict': { | ||||
|             'id': '2347614', | ||||
|             'display_id': 'er-files-discovery-life-atve-us/sweet-charity', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Sweet Charity', | ||||
|             'description': 'The staff at Charity Hospital treat a serious foot infection.', | ||||
|             'season_number': 1, | ||||
|             'season': 'Season 1', | ||||
|             'episode_number': 1, | ||||
|             'episode': 'Episode 1', | ||||
|             'series': 'ER Files', | ||||
|             'duration': 2364.261, | ||||
|             'upload_date': '20230721', | ||||
|             'timestamp': 1689912000, | ||||
|             'creators': ['Discovery Life'], | ||||
|             'tags': [], | ||||
|             'thumbnail': 'https://us1-prod-images.disco-api.com/2021/03/16/4b6f0124-360b-3546-b6a4-5552db886b86.jpeg', | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://www.discoverylife.com/video/surviving-death-discovery-life-atve-us/bodily-trauma', | ||||
|         'info_dict': { | ||||
|             'id': '2218238', | ||||
| @@ -665,6 +842,26 @@ class DiscoveryLifeIE(DiscoveryPlusBaseIE): | ||||
| class AnimalPlanetIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:www\.)?animalplanet\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://www.animalplanet.com/video/mysterious-creatures-with-forrest-galante-animal-planet-atve-us/the-demon-of-peru', | ||||
|         'info_dict': { | ||||
|             'id': '4650835', | ||||
|             'display_id': 'mysterious-creatures-with-forrest-galante-animal-planet-atve-us/the-demon-of-peru', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'The Demon of Peru', | ||||
|             'description': 'In Peru, a farming village is being terrorized by a “man-like beast.”', | ||||
|             'season_number': 1, | ||||
|             'season': 'Season 1', | ||||
|             'episode_number': 4, | ||||
|             'episode': 'Episode 4', | ||||
|             'series': 'Mysterious Creatures with Forrest Galante', | ||||
|             'duration': 2490.488, | ||||
|             'upload_date': '20230111', | ||||
|             'timestamp': 1673413200, | ||||
|             'creators': ['Animal Planet'], | ||||
|             'tags': [], | ||||
|             'thumbnail': 'https://us1-prod-images.disco-api.com/2022/03/01/6dbaa833-9a2e-3fee-9381-c19eddf67c0c.jpeg', | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://www.animalplanet.com/video/north-woods-law-animal-planet/squirrel-showdown', | ||||
|         'info_dict': { | ||||
|             'id': '3338923', | ||||
| @@ -692,6 +889,26 @@ class AnimalPlanetIE(DiscoveryPlusBaseIE): | ||||
| class TLCIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:go\.)?tlc\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://go.tlc.com/video/90-day-the-last-resort-tlc-atve-us/the-last-chance', | ||||
|         'info_dict': { | ||||
|             'id': '5186422', | ||||
|             'display_id': '90-day-the-last-resort-tlc-atve-us/the-last-chance', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'The Last Chance', | ||||
|             'description': 'Infidelity shakes Kalani and Asuelu\'s world, and Angela threatens divorce.', | ||||
|             'season_number': 1, | ||||
|             'season': 'Season 1', | ||||
|             'episode_number': 1, | ||||
|             'episode': 'Episode 1', | ||||
|             'series': '90 Day: The Last Resort', | ||||
|             'duration': 5123.91, | ||||
|             'upload_date': '20230815', | ||||
|             'timestamp': 1692061200, | ||||
|             'creators': ['TLC'], | ||||
|             'tags': [], | ||||
|             'thumbnail': 'https://us1-prod-images.disco-api.com/2023/08/08/0ee367e2-ac76-334d-bf23-dbf796696a24.jpeg', | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://go.tlc.com/video/my-600-lb-life-tlc/melissas-story-part-1', | ||||
|         'info_dict': { | ||||
|             'id': '2206540', | ||||
| @@ -716,93 +933,8 @@ class TLCIE(DiscoveryPlusBaseIE): | ||||
|     } | ||||
| 
 | ||||
| 
 | ||||
| class MotorTrendIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:watch\.)?motortrend\.com/video' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://watch.motortrend.com/video/car-issues-motortrend-atve-us/double-dakotas', | ||||
|         'info_dict': { | ||||
|             'id': '"4859182"', | ||||
|             'display_id': 'double-dakotas', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Double Dakotas', | ||||
|             'description': 'Tylers buy-one-get-one Dakota deal has the Wizard pulling double duty.', | ||||
|             'season_number': 2, | ||||
|             'episode_number': 3, | ||||
|         }, | ||||
|         'skip': 'Available for Premium users', | ||||
|     }, { | ||||
|         'url': 'https://watch.motortrend.com/video/car-issues-motortrend-atve-us/double-dakotas', | ||||
|         'only_matching': True, | ||||
|     }] | ||||
| 
 | ||||
|     _PRODUCT = 'vel' | ||||
|     _DISCO_API_PARAMS = { | ||||
|         'disco_host': 'us1-prod-direct.watch.motortrend.com', | ||||
|         'realm': 'go', | ||||
|         'country': 'us', | ||||
|     } | ||||
| 
 | ||||
| 
 | ||||
| class MotorTrendOnDemandIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:www\.)?motortrend(?:ondemand\.com|\.com/plus)/detail' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://www.motortrendondemand.com/detail/wheelstanding-dump-truck-stubby-bobs-comeback/37699/784', | ||||
|         'info_dict': { | ||||
|             'id': '37699', | ||||
|             'display_id': 'wheelstanding-dump-truck-stubby-bobs-comeback/37699', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Wheelstanding Dump Truck! Stubby Bob’s Comeback', | ||||
|             'description': 'md5:996915abe52a1c3dfc83aecea3cce8e7', | ||||
|             'season_number': 5, | ||||
|             'episode_number': 52, | ||||
|             'episode': 'Episode 52', | ||||
|             'season': 'Season 5', | ||||
|             'thumbnail': r're:^https?://.+\.jpe?g$', | ||||
|             'timestamp': 1388534401, | ||||
|             'duration': 1887.345, | ||||
|             'creator': 'Originals', | ||||
|             'series': 'Roadkill', | ||||
|             'upload_date': '20140101', | ||||
|             'tags': [], | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://www.motortrend.com/plus/detail/roadworthy-rescues-teaser-trailer/4922860/', | ||||
|         'info_dict': { | ||||
|             'id': '4922860', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Roadworthy Rescues | Teaser Trailer', | ||||
|             'description': 'Derek Bieri helps Freiburger and Finnegan with their \'68 big-block Dart.', | ||||
|             'display_id': 'roadworthy-rescues-teaser-trailer/4922860', | ||||
|             'creator': 'Originals', | ||||
|             'series': 'Roadworthy Rescues', | ||||
|             'thumbnail': r're:^https?://.+\.jpe?g$', | ||||
|             'upload_date': '20220907', | ||||
|             'timestamp': 1662523200, | ||||
|             'duration': 1066.356, | ||||
|             'tags': [], | ||||
|         }, | ||||
|     }, { | ||||
|         'url': 'https://www.motortrend.com/plus/detail/ugly-duckling/2450033/12439', | ||||
|         'only_matching': True, | ||||
|     }] | ||||
| 
 | ||||
|     _PRODUCT = 'MTOD' | ||||
|     _DISCO_API_PARAMS = { | ||||
|         'disco_host': 'us1-prod-direct.motortrendondemand.com', | ||||
|         'realm': 'motortrend', | ||||
|         'country': 'us', | ||||
|     } | ||||
| 
 | ||||
|     def _update_disco_api_headers(self, headers, disco_base, display_id, realm): | ||||
|         headers.update({ | ||||
|             'x-disco-params': f'realm={realm}', | ||||
|             'x-disco-client': f'WEB:UNKNOWN:{self._PRODUCT}:4.39.1-gi1', | ||||
|             'Authorization': self._get_auth(disco_base, display_id, realm), | ||||
|         }) | ||||
| 
 | ||||
| 
 | ||||
| class DiscoveryPlusIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://(?:www\.)?discoveryplus\.com/(?!it/)(?:\w{2}/)?video' + DPlayBaseIE._PATH_REGEX | ||||
|     _VALID_URL = r'https?://(?:www\.)?discoveryplus\.com/(?!it/)(?:(?P<country>[a-z]{2})/)?video(?:/sport)?' + DPlayBaseIE._PATH_REGEX | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://www.discoveryplus.com/video/property-brothers-forever-home/food-and-family', | ||||
|         'info_dict': { | ||||
| @@ -823,14 +955,42 @@ class DiscoveryPlusIE(DiscoveryPlusBaseIE): | ||||
|     }, { | ||||
|         'url': 'https://discoveryplus.com/ca/video/bering-sea-gold-discovery-ca/goldslingers', | ||||
|         'only_matching': True, | ||||
|     }, { | ||||
|         'url': 'https://www.discoveryplus.com/gb/video/sport/eurosport-1-british-eurosport-1-british-sport/6-hours-of-spa-review', | ||||
|         'only_matching': True, | ||||
|     }] | ||||
| 
 | ||||
|     _PRODUCT = 'dplus_us' | ||||
|     _DISCO_API_PARAMS = { | ||||
|         'disco_host': 'us1-prod-direct.discoveryplus.com', | ||||
|         'realm': 'go', | ||||
|         'country': 'us', | ||||
|     } | ||||
|     _PRODUCT = None | ||||
|     _DISCO_API_PARAMS = None | ||||
| 
 | ||||
|     def _update_disco_api_headers(self, headers, disco_base, display_id, realm): | ||||
|         headers.update({ | ||||
|             'x-disco-params': f'realm={realm},siteLookupKey={self._PRODUCT}', | ||||
|             'x-disco-client': f'WEB:UNKNOWN:dplus_us:{self._DISCO_CLIENT_VER}', | ||||
|             'Authorization': self._get_auth(disco_base, display_id, realm), | ||||
|         }) | ||||
| 
 | ||||
|     def _real_extract(self, url): | ||||
|         video_id, country = self._match_valid_url(url).group('id', 'country') | ||||
|         if not country: | ||||
|             country = 'us' | ||||
| 
 | ||||
|         self._PRODUCT = f'dplus_{country}' | ||||
| 
 | ||||
|         if country in ('br', 'ca', 'us'): | ||||
|             self._DISCO_API_PARAMS = { | ||||
|                 'disco_host': 'us1-prod-direct.discoveryplus.com', | ||||
|                 'realm': 'go', | ||||
|                 'country': country, | ||||
|             } | ||||
|         else: | ||||
|             self._DISCO_API_PARAMS = { | ||||
|                 'disco_host': 'eu1-prod-direct.discoveryplus.com', | ||||
|                 'realm': 'dplay', | ||||
|                 'country': country, | ||||
|             } | ||||
| 
 | ||||
|         return self._get_disco_api_info(url, video_id, **self._DISCO_API_PARAMS) | ||||
| 
 | ||||
| 
 | ||||
| class DiscoveryPlusIndiaIE(DiscoveryPlusBaseIE): | ||||
| @@ -993,7 +1153,7 @@ class DiscoveryPlusItalyIE(DiscoveryPlusBaseIE): | ||||
|         'only_matching': True, | ||||
|     }] | ||||
| 
 | ||||
|     _PRODUCT = 'dplus_us' | ||||
|     _PRODUCT = 'dplus_it' | ||||
|     _DISCO_API_PARAMS = { | ||||
|         'disco_host': 'eu1-prod-direct.discoveryplus.com', | ||||
|         'realm': 'dplay', | ||||
| @@ -1002,8 +1162,8 @@ class DiscoveryPlusItalyIE(DiscoveryPlusBaseIE): | ||||
| 
 | ||||
|     def _update_disco_api_headers(self, headers, disco_base, display_id, realm): | ||||
|         headers.update({ | ||||
|             'x-disco-params': f'realm={realm}', | ||||
|             'x-disco-client': f'WEB:UNKNOWN:{self._PRODUCT}:25.2.6', | ||||
|             'x-disco-params': f'realm={realm},siteLookupKey={self._PRODUCT}', | ||||
|             'x-disco-client': f'WEB:UNKNOWN:dplus_us:{self._DISCO_CLIENT_VER}', | ||||
|             'Authorization': self._get_auth(disco_base, display_id, realm), | ||||
|         }) | ||||
| 
 | ||||
| @@ -1044,39 +1204,3 @@ class DiscoveryPlusIndiaShowIE(DiscoveryPlusShowBaseIE): | ||||
|     _SHOW_STR = 'show' | ||||
|     _INDEX = 4 | ||||
|     _VIDEO_IE = DiscoveryPlusIndiaIE | ||||
| 
 | ||||
| 
 | ||||
| class GlobalCyclingNetworkPlusIE(DiscoveryPlusBaseIE): | ||||
|     _VALID_URL = r'https?://plus\.globalcyclingnetwork\.com/watch/(?P<id>\d+)' | ||||
|     _TESTS = [{ | ||||
|         'url': 'https://plus.globalcyclingnetwork.com/watch/1397691', | ||||
|         'info_dict': { | ||||
|             'id': '1397691', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'The Athertons: Mountain Biking\'s Fastest Family', | ||||
|             'description': 'md5:75a81937fcd8b989eec6083a709cd837', | ||||
|             'thumbnail': 'https://us1-prod-images.disco-api.com/2021/03/04/eb9e3026-4849-3001-8281-9356466f0557.png', | ||||
|             'series': 'gcn', | ||||
|             'creator': 'Gcn', | ||||
|             'upload_date': '20210309', | ||||
|             'timestamp': 1615248000, | ||||
|             'duration': 2531.0, | ||||
|             'tags': [], | ||||
|         }, | ||||
|         'skip': 'Subscription required', | ||||
|         'params': {'skip_download': 'm3u8'}, | ||||
|     }] | ||||
| 
 | ||||
|     _PRODUCT = 'web' | ||||
|     _DISCO_API_PARAMS = { | ||||
|         'disco_host': 'disco-api-prod.globalcyclingnetwork.com', | ||||
|         'realm': 'gcn', | ||||
|         'country': 'us', | ||||
|     } | ||||
| 
 | ||||
|     def _update_disco_api_headers(self, headers, disco_base, display_id, realm): | ||||
|         headers.update({ | ||||
|             'x-disco-params': f'realm={realm}', | ||||
|             'x-disco-client': f'WEB:UNKNOWN:{self._PRODUCT}:27.3.2', | ||||
|             'Authorization': self._get_auth(disco_base, display_id, realm), | ||||
|         }) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 bashonly
					bashonly