Plugin cleanup and tweaks

This commit is contained in:
2023-02-20 19:18:45 -06:00
parent 372e4ff3dc
commit 3ad9e1c7bb
1138 changed files with 48878 additions and 40445 deletions

View File

@@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
from .common import InfoExtractor
from ..utils import (
try_get,
@@ -47,7 +44,7 @@ class SovietsClosetIE(SovietsClosetBaseIE):
_TESTS = [
{
'url': 'https://sovietscloset.com/video/1337',
'md5': '11e58781c4ca5b283307aa54db5b3f93',
'md5': 'bd012b04b261725510ca5383074cdd55',
'info_dict': {
'id': '1337',
'ext': 'mp4',
@@ -67,15 +64,16 @@ class SovietsClosetIE(SovietsClosetBaseIE):
'series': 'The Witcher',
'season': 'Misc',
'episode_number': 13,
'episode': 'Episode 13',
},
},
{
'url': 'https://sovietscloset.com/video/1105',
'md5': '578b1958a379e7110ba38697042e9efb',
'md5': '89fa928f183893cb65a0b7be846d8a90',
'info_dict': {
'id': '1105',
'ext': 'mp4',
'title': 'Arma 3 - Zeus Games #3',
'title': 'Arma 3 - Zeus Games #5',
'uploader': 'SovietWomble',
'thumbnail': r're:^https?://.*\.b-cdn\.net/c0e5e76f-3a93-40b4-bf01-12343c2eec5d/thumbnail\.jpg$',
'uploader': 'SovietWomble',
@@ -91,7 +89,8 @@ class SovietsClosetIE(SovietsClosetBaseIE):
'availability': 'public',
'series': 'Arma 3',
'season': 'Zeus Games',
'episode_number': 3,
'episode_number': 5,
'episode': 'Episode 5',
},
},
]
@@ -105,7 +104,6 @@ class SovietsClosetIE(SovietsClosetBaseIE):
thumbnail_url = self._search_regex(r'(https?://.*?thumbnail\.jpg)', iframe, 'thumbnail url')
m3u8_formats = self._extract_m3u8_formats(m3u8_url, video_id, headers=self.MEDIADELIVERY_REFERER)
self._sort_formats(m3u8_formats)
if not m3u8_formats:
duration = None
@@ -123,7 +121,7 @@ class SovietsClosetIE(SovietsClosetBaseIE):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
static_assets_base = self._search_regex(r'staticAssetsBase:\"(.*?)\"', webpage, 'staticAssetsBase')
static_assets_base = self._search_regex(r'(/_nuxt/static/\d+)', webpage, 'staticAssetsBase')
static_assets_base = f'https://sovietscloset.com{static_assets_base}'
stream = self.parse_nuxt_jsonp(f'{static_assets_base}/video/{video_id}/payload.js', video_id, 'video')['stream']
@@ -182,7 +180,7 @@ class SovietsClosetPlaylistIE(SovietsClosetBaseIE):
webpage = self._download_webpage(url, playlist_id)
static_assets_base = self._search_regex(r'staticAssetsBase:\"(.*?)\"', webpage, 'staticAssetsBase')
static_assets_base = self._search_regex(r'(/_nuxt/static/\d+)', webpage, 'staticAssetsBase')
static_assets_base = f'https://sovietscloset.com{static_assets_base}'
sovietscloset = self.parse_nuxt_jsonp(f'{static_assets_base}/payload.js', playlist_id, 'global')['games']