From 94e2e0eec052fd20be08419ebdfa6ed379dce3ce Mon Sep 17 00:00:00 2001 From: Ozan Karaali Date: Sun, 13 Oct 2019 01:21:07 +0300 Subject: [PATCH] [foxcomtr] cleaning code, adding more tests --- youtube_dl/extractor/foxcomtr.py | 37 +++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/youtube_dl/extractor/foxcomtr.py b/youtube_dl/extractor/foxcomtr.py index f9263f935..483d5ecd8 100644 --- a/youtube_dl/extractor/foxcomtr.py +++ b/youtube_dl/extractor/foxcomtr.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import unsmuggle_url class FoxComTrIE(InfoExtractor): @@ -26,26 +25,38 @@ class FoxComTrIE(InfoExtractor): 'title': 'FOX | Mucize Doktor 2. Bölüm', } }, + { + 'url': 'https://www.foxplay.com.tr/4N1K-2/izle', + 'md5': '74fb90d11d519c194e31b77e966bb252', + 'info_dict': { + 'id': 'izle', + 'ext': 'ts', + 'title': '4N1K 2 FOXPlay\'de | Ücretsiz HD Kalitede Film İzle', + } + }, + { + 'url': 'https://www.foxplay.com.tr/Mucize-Doktor/bolumler/4-bolum', + 'md5': '38a8f999e236758f00e7f487560a59ad', + 'info_dict': { + 'id': '4-bolum', + 'ext': 'ts', + 'title': 'Mucize Doktor Dizisi 4. Bölümü İzle', + } + }, ] def _real_extract(self, url): - url, smuggled_data = unsmuggle_url(url) - if smuggled_data and 'force_videoid' in smuggled_data: - force_videoid = smuggled_data['force_videoid'] - video_id = force_videoid - else: - video_id = self._generic_id(url) + video_id = self._generic_id(url) webpage = self._download_webpage(url, video_id) - title = self._og_search_title( - webpage, default=None) or self._html_search_regex( - r'(?s)(.*?)', webpage, 'video title', - default='video') + title = self._og_search_title(webpage, default=None).strip() - m3u8_url = self._html_search_regex(r"videoSrc : '(.*)'", webpage, 'root_url') + m3u8_url = self._html_search_regex(r"videoSrc : '(.*)'", + webpage, 'root_url') return { 'id': video_id, 'title': title, - 'formats': reversed(self._extract_m3u8_formats(m3u8_url, video_id, 'ts', 'm3u8_native', fatal=False)), + 'formats': reversed(self._extract_m3u8_formats( + m3u8_url, video_id, 'ts', 'm3u8_native')), }