From 933ae49c7a3615ae52505b30465e90119fbb4a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Perttil=C3=A4?= Date: Sun, 8 Sep 2019 22:20:22 +0300 Subject: [PATCH 1/2] Add viafree.fi support to tvplay extractor --- youtube_dl/extractor/tvplay.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/youtube_dl/extractor/tvplay.py b/youtube_dl/extractor/tvplay.py index d82d48f94..866f42e27 100644 --- a/youtube_dl/extractor/tvplay.py +++ b/youtube_dl/extractor/tvplay.py @@ -35,6 +35,7 @@ class TVPlayIE(InfoExtractor): tvplay(?:\.skaties)?\.lv(?:/parraides)?| (?:tv3play|play\.tv3)\.lt(?:/programos)?| tv3play(?:\.tv3)?\.ee/sisu| + (?:viafree)\.fi/ohjelmat| (?:tv(?:3|6|8|10)play|viafree)\.se/program| (?:(?:tv3play|viasat4play|tv6play|viafree)\.no|(?:tv3play|viafree)\.dk)/programmer| play\.nova(?:tv)?\.bg/programi @@ -350,6 +351,7 @@ class ViafreeIE(InfoExtractor): viafree\. (?: (?:dk|no)/programmer| + fi/ohjelmat| se/program ) /(?:[^/]+/)+(?P[^/?#&]+) From d459b8529248b37a54498262b46800fb2335dbd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Perttil=C3=A4?= Date: Sun, 8 Sep 2019 23:18:42 +0300 Subject: [PATCH 2/2] viafree.fi tests to tvplay extractor --- youtube_dl/extractor/tvplay.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/youtube_dl/extractor/tvplay.py b/youtube_dl/extractor/tvplay.py index 866f42e27..7f11e336b 100644 --- a/youtube_dl/extractor/tvplay.py +++ b/youtube_dl/extractor/tvplay.py @@ -97,6 +97,21 @@ class TVPlayIE(InfoExtractor): 'skip_download': True, }, }, + { + 'url': 'https://www.viafree.fi/ohjelmat/urheilu/huuhkajat/kausi-2/998873', + 'info_dict': { + 'id': '998873', + 'ext': 'mp4', + 'title': 'Päivän maalit 11.6.', + 'description': 'md5:d41d8cd98f00b204e9800998ecf8427e', + 'duration': 922, + 'timestamp': 1560294193, + 'upload_date': '20190611', + }, + 'params': { + 'skip_download': True, + }, + }, { 'url': 'http://www.tv3play.se/program/husraddarna/395385?autostart=true', 'info_dict': { @@ -357,6 +372,24 @@ class ViafreeIE(InfoExtractor): /(?:[^/]+/)+(?P[^/?#&]+) ''' _TESTS = [{ + 'url': 'https://www.viafree.fi/ohjelmat/kotimaiset/tyhmat-kysymykset-viisaat-vastaukset/kausi-2/jakso-1', + 'info_dict': { + 'id': '866877', + 'ext': 'mp4', + 'title': 'Pasi & Ville MayMac 1', + 'description': 'md5:d41d8cd98f00b204e9800998ecf8427e', + 'series': 'Tyhmät Kysymykset / Viisaat Vastaukset', + 'season': 'Mayweather vs McGregor', + 'season_number': 2, + 'duration': 178, + 'timestamp': 1503560313, + 'upload_date': '20170824', + }, + 'params': { + 'skip_download': True, + }, + 'add_ie': [TVPlayIE.ie_key()], + }, { 'url': 'http://www.viafree.se/program/livsstil/husraddarna/sasong-2/avsnitt-2', 'info_dict': { 'id': '395375',