From 0139205ceeb35230e84852090181d5def7544227 Mon Sep 17 00:00:00 2001 From: Alexander Seiler Date: Sun, 27 Jan 2019 18:34:38 +0100 Subject: [PATCH 1/2] [zattoo] Add new Zattoo reseller: Salt --- youtube_dl/extractor/extractors.py | 1 + youtube_dl/extractor/zattoo.py | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 2ffcffa9e..8862c0d78 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -1497,6 +1497,7 @@ from .zattoo import ( QuantumTVIE, QuicklineIE, QuicklineLiveIE, + SaltIE, SAKTVIE, VTXTVIE, WalyTVIE, diff --git a/youtube_dl/extractor/zattoo.py b/youtube_dl/extractor/zattoo.py index 896276301..dda0d048a 100644 --- a/youtube_dl/extractor/zattoo.py +++ b/youtube_dl/extractor/zattoo.py @@ -420,3 +420,14 @@ class EinsUndEinsTVIE(ZattooIE): 'url': 'https://www.1und1.tv/watch/abc/123-abc', 'only_matching': True, }] + + +class SaltIE(ZattooIE): + _NETRC_MACHINE = 'salt' + _HOST = 'tv.salt.ch' + _VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST) + + _TESTS = [{ + 'url': 'https://tv.salt.ch/watch/abc/123-abc', + 'only_matching': True, + }] From d47833a1083fded1936f66900ad3cdb620574b29 Mon Sep 17 00:00:00 2001 From: Alexander Seiler Date: Mon, 28 Jan 2019 20:12:21 +0100 Subject: [PATCH 2/2] [zattoo] Rename extractor for Zattoo reseller Salt. --- youtube_dl/extractor/extractors.py | 2 +- youtube_dl/extractor/zattoo.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 8862c0d78..9d776ff45 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -1497,7 +1497,7 @@ from .zattoo import ( QuantumTVIE, QuicklineIE, QuicklineLiveIE, - SaltIE, + SaltTVIE, SAKTVIE, VTXTVIE, WalyTVIE, diff --git a/youtube_dl/extractor/zattoo.py b/youtube_dl/extractor/zattoo.py index dda0d048a..ee514666b 100644 --- a/youtube_dl/extractor/zattoo.py +++ b/youtube_dl/extractor/zattoo.py @@ -422,8 +422,8 @@ class EinsUndEinsTVIE(ZattooIE): }] -class SaltIE(ZattooIE): - _NETRC_MACHINE = 'salt' +class SaltTVIE(ZattooIE): + _NETRC_MACHINE = 'salttv' _HOST = 'tv.salt.ch' _VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)