projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[README.md] Fix autonumber sequence description (refs #26686)
[youtube-dl]
/
youtube_dl
/
extractor
/
zattoo.py
diff --git
a/youtube_dl/extractor/zattoo.py
b/youtube_dl/extractor/zattoo.py
index cb1bac3a38ef603e1a5b2bca046773bc3482d62f..6bac3026ede81754f41d6eb56c92815c41cfa06c 100644
(file)
--- a/
youtube_dl/extractor/zattoo.py
+++ b/
youtube_dl/extractor/zattoo.py
@@
-86,8
+86,8
@@
class ZattooPlatformBaseIE(InfoExtractor):
return next(
chan['cid'] for chan in channel_list
if chan.get('cid') and (
return next(
chan['cid'] for chan in channel_list
if chan.get('cid') and (
- chan.get('display_alias') == channel_name
or
- chan.get('cid') == channel_name))
+ chan.get('display_alias') == channel_name
+
or
chan.get('cid') == channel_name))
except StopIteration:
raise ExtractorError('Could not extract channel id')
except StopIteration:
raise ExtractorError('Could not extract channel id')
@@
-401,7
+401,7
@@
class QuantumTVIE(ZattooIE):
class OsnatelTVIE(ZattooIE):
_NETRC_MACHINE = 'osnateltv'
class OsnatelTVIE(ZattooIE):
_NETRC_MACHINE = 'osnateltv'
- _HOST = '
onlinetv
.osnatel.de'
+ _HOST = '
tvonline
.osnatel.de'
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
@@
-420,3
+420,14
@@
class EinsUndEinsTVIE(ZattooIE):
'url': 'https://www.1und1.tv/watch/abc/123-abc',
'only_matching': True,
}]
'url': 'https://www.1und1.tv/watch/abc/123-abc',
'only_matching': True,
}]
+
+
+class SaltTVIE(ZattooIE):
+ _NETRC_MACHINE = 'salttv'
+ _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,
+ }]