youtube_dl/extractor/extractors.py

@@ -376,7 +376,6 @@ from .fc2 import (
     FC2EmbedIE,
 )
 from .fczenit import FczenitIE
-from .fifa import FifaIE
 from .filmon import (
     FilmOnIE,
     FilmOnChannelIE,
@@ -728,7 +727,6 @@ from .myvi import (
     MyviIE,
     MyviEmbedIE,
 )
-from .myvideoge import MyVideoGeIE
 from .myvidster import MyVidsterIE
 from .nationalgeographic import (
     NationalGeographicVideoIE,

youtube_dl/extractor/fifa.py

@@ -1,101 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-
-from ..utils import (
-    int_or_none,
-    traverse_obj,
-    unified_timestamp,
-)
-
-if not callable(getattr(InfoExtractor, '_match_valid_url', None)):
-
-    BaseInfoExtractor = InfoExtractor
-
-    import re
-
-    class InfoExtractor(BaseInfoExtractor):
-
-        @classmethod
-        def _match_valid_url(cls, url):
-            return re.match(cls._VALID_URL, url)
-
-
-class FifaIE(InfoExtractor):
-    _VALID_URL = r'https?://www.fifa.com/fifaplus/(?P<locale>\w{2})/watch/([^#?]+/)?(?P<id>\w+)'
-    _TESTS = [{
-        'url': 'https://www.fifa.com/fifaplus/en/watch/7on10qPcnyLajDDU3ntg6y',
-        'info_dict': {
-            'id': '7on10qPcnyLajDDU3ntg6y',
-            'title': 'Italy v France | Final | 2006 FIFA World Cup Germany™ | Full Match Replay',
-            'description': 'md5:f4520d0ee80529c8ba4134a7d692ff8b',
-            'ext': 'mp4',
-            'categories': ['FIFA Tournaments'],
-            'thumbnail': 'https://digitalhub.fifa.com/transform/135e2656-3a51-407b-8810-6c34bec5b59b/FMR_2006_Italy_France_Final_Hero',
-            'duration': 8165,
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://www.fifa.com/fifaplus/pt/watch/1cg5r5Qt6Qt12ilkDgb1sV',
-        'info_dict': {
-            'id': '1cg5r5Qt6Qt12ilkDgb1sV',
-            'title': 'Brazil v Germany | Semi-finals | 2014 FIFA World Cup Brazil™ | Extended Highlights',
-            'description': 'md5:d908c74ee66322b804ae2e521b02a855',
-            'ext': 'mp4',
-            'categories': ['FIFA Tournaments', 'Highlights'],
-            'thumbnail': 'https://digitalhub.fifa.com/transform/d8fe6f61-276d-4a73-a7fe-6878a35fd082/FIFAPLS_100EXTHL_2014BRAvGER_TMB',
-            'duration': 902,
-            'release_timestamp': 1404777600,
-            'release_date': '20140708',
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://www.fifa.com/fifaplus/fr/watch/3C6gQH9C2DLwzNx7BMRQdp',
-        'info_dict': {
-            'id': '3C6gQH9C2DLwzNx7BMRQdp',
-            'title': 'Josimar goal against Northern Ireland | Classic Goals',
-            'description': 'md5:cbe7e7bb52f603c9f1fe9a4780fe983b',
-            'ext': 'mp4',
-            'categories': ['FIFA Tournaments', 'Goal'],
-            'duration': 28,
-            'thumbnail': 'https://digitalhub.fifa.com/transform/f9301391-f8d9-48b5-823e-c093ac5e3e11/CG_MEN_1986_JOSIMAR',
-        },
-        'params': {'skip_download': 'm3u8'},
-    }]
-
-    def _real_extract(self, url):
-        video_id, locale = self._match_valid_url(url).group('id', 'locale')
-        webpage = self._download_webpage(url, video_id)
-
-        preconnect_link = self._search_regex(
-            r'<link\b[^>]+\brel\s*=\s*"preconnect"[^>]+href\s*=\s*"([^"]+)"', webpage, 'Preconnect Link')
-
-        video_details = self._download_json(
-            '{preconnect_link}/sections/videoDetails/{video_id}'.format(**locals()), video_id, 'Downloading Video Details', fatal=False)
-
-        preplay_parameters = self._download_json(
-            '{preconnect_link}/videoPlayerData/{video_id}'.format(**locals()), video_id, 'Downloading Preplay Parameters')['preplayParameters']
-
-        content_data = self._download_json(
-            # 1. query string is expected to be sent as-is
-            # 2. `sig` must be appended
-            # 3. if absent, the call appears to work but the manifest is bad (404)
-            'https://content.uplynk.com/preplay/{contentId}/multiple.json?{queryStr}&sig={signature}'.format(**preplay_parameters),
-            video_id, 'Downloading Content Data')
-
-        # formats, subtitles = self._extract_m3u8_formats_and_subtitles(content_data['playURL'], video_id)
-        formats, subtitles = self._extract_m3u8_formats(content_data['playURL'], video_id, ext='mp4', entry_protocol='m3u8_native'), None
-        self._sort_formats(formats)
-
-        return {
-            'id': video_id,
-            'title': video_details['title'],
-            'description': video_details.get('description'),
-            'duration': int_or_none(video_details.get('duration')),
-            'release_timestamp': unified_timestamp(video_details.get('dateOfRelease')),
-            'categories': traverse_obj(video_details, (('videoCategory', 'videoSubcategory'),)),
-            'thumbnail': traverse_obj(video_details, ('backgroundImage', 'src')),
-            'formats': formats,
-            'subtitles': subtitles,
-        }

youtube_dl/extractor/myvideoge.py

@@ -1,87 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    get_element_by_id,
-    get_element_by_class,
-    int_or_none,
-    js_to_json,
-    MONTH_NAMES,
-    qualities,
-    unified_strdate,
-)
-
-
-class MyVideoGeIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?myvideo\.ge/v/(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'https://www.myvideo.ge/v/3941048',
-        'md5': '8c192a7d2b15454ba4f29dc9c9a52ea9',
-        'info_dict': {
-            'id': '3941048',
-            'ext': 'mp4',
-            'title': 'The best prikol',
-            'upload_date': '20200611',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'uploader': 'chixa33',
-            'description': 'md5:5b067801318e33c2e6eea4ab90b1fdd3',
-        },
-        # working from local dev system
-        'skip': 'site blocks CI servers',
-    }
-    _MONTH_NAMES_KA = ['იანვარი', 'თებერვალი', 'მარტი', 'აპრილი', 'მაისი', 'ივნისი', 'ივლისი', 'აგვისტო', 'სექტემბერი', 'ოქტომბერი', 'ნოემბერი', 'დეკემბერი']
-
-    _quality = staticmethod(qualities(('SD', 'HD')))
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        title = (
-            self._og_search_title(webpage, default=None)
-            or clean_html(get_element_by_class('my_video_title', webpage))
-            or self._html_search_regex(r'<title\b[^>]*>([^<]+)</title\b', webpage, 'title'))
-
-        jwplayer_sources = self._parse_json(
-            self._search_regex(
-                r'''(?s)jwplayer\s*\(\s*['"]mvplayer['"]\s*\)\s*\.\s*setup\s*\(.*?\bsources\s*:\s*(\[.*?])\s*[,});]''', webpage, 'jwplayer sources', fatal=False)
-            or '',
-            video_id, transform_source=js_to_json, fatal=False)
-
-        formats = self._parse_jwplayer_formats(jwplayer_sources or [], video_id)
-        for f in formats or []:
-            f['preference'] = self._quality(f['format_id'])
-        self._sort_formats(formats)
-
-        description = (
-            self._og_search_description(webpage)
-            or get_element_by_id('long_desc_holder', webpage)
-            or self._html_search_meta('description', webpage))
-
-        uploader = self._search_regex(r'<a[^>]+class="mv_user_name"[^>]*>([^<]+)<', webpage, 'uploader', fatal=False)
-
-        upload_date = get_element_by_class('mv_vid_upl_date', webpage)
-        # as ka locale may not be present roll a local date conversion
-        upload_date = (unified_strdate(
-            # translate any ka month to an en one
-            re.sub('|'.join(self._MONTH_NAMES_KA),
-                   lambda m: MONTH_NAMES['en'][self._MONTH_NAMES_KA.index(m.group(0))],
-                   upload_date, re.I))
-            if upload_date else None)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'uploader': uploader,
-            'formats': formats,
-            'thumbnail': self._og_search_thumbnail(webpage),
-            'upload_date': upload_date,
-            'view_count': int_or_none(get_element_by_class('mv_vid_views', webpage)),
-            'like_count': int_or_none(get_element_by_id('likes_count', webpage)),
-            'dislike_count': int_or_none(get_element_by_id('dislikes_count', webpage)),
-        }

youtube_dl/extractor/xhamster.py

@@ -24,7 +24,7 @@ from ..utils import (
 
 
 class XHamsterIE(InfoExtractor):
-    _DOMAINS = r'(?:xhamster\.(?:com|one|desi)|xhms\.pro|xhamster\d+\.com|xhday\.com|xhvid\.com)'
+    _DOMAINS = r'(?:xhamster\.(?:com|one|desi)|xhms\.pro|xhamster\d+\.com|xhday\.com)'
     _VALID_URL = r'''(?x)
                     https?://
                         (?:.+?\.)?%s/
@@ -123,9 +123,6 @@ class XHamsterIE(InfoExtractor):
     }, {
         'url': 'https://xhday.com/videos/strapless-threesome-xhh7yVf',
         'only_matching': True,
-    }, {
-        'url': 'https://xhvid.com/videos/lk-mm-xhc6wn6',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -436,9 +433,6 @@ class XHamsterUserIE(InfoExtractor):
     }, {
         'url': 'https://xhday.com/users/mobhunter',
         'only_matching': True,
-    }, {
-        'url': 'https://xhvid.com/users/pelushe21',
-        'only_matching': True,
     }]
 
     def _entries(self, user_id):