projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Fix extraction.
[youtube-dl]
/
youtube_dl
/
extractor
/
zattoo.py
diff --git
a/youtube_dl/extractor/zattoo.py
b/youtube_dl/extractor/zattoo.py
index bbe0aecb6685349decd3b3e9ca0f6159216aae47..6bac3026ede81754f41d6eb56c92815c41cfa06c 100644
(file)
--- a/
youtube_dl/extractor/zattoo.py
+++ b/
youtube_dl/extractor/zattoo.py
@@
-22,7
+22,7
@@
class ZattooPlatformBaseIE(InfoExtractor):
_power_guide_hash = None
def _host_url(self):
_power_guide_hash = None
def _host_url(self):
- return 'https://%s' %
self._HOST
+ return 'https://%s' %
(self._API_HOST if hasattr(self, '_API_HOST') else self._HOST)
def _login(self):
username, password = self._get_login_info()
def _login(self):
username, password = self._get_login_info()
@@
-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')
@@
-286,6
+286,7
@@
class ZattooLiveIE(ZattooBaseIE):
class NetPlusIE(ZattooIE):
_NETRC_MACHINE = 'netplus'
_HOST = 'netplus.tv'
class NetPlusIE(ZattooIE):
_NETRC_MACHINE = 'netplus'
_HOST = 'netplus.tv'
+ _API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
@@
-300,7
+301,7
@@
class MNetTVIE(ZattooIE):
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
- 'url': 'https://
www.
tvplus.m-net.de/watch/abc/123-abc',
+ 'url': 'https://tvplus.m-net.de/watch/abc/123-abc',
'only_matching': True,
}]
'only_matching': True,
}]
@@
-311,7
+312,7
@@
class WalyTVIE(ZattooIE):
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
- 'url': 'https://
www.
player.waly.tv/watch/abc/123-abc',
+ 'url': 'https://player.waly.tv/watch/abc/123-abc',
'only_matching': True,
}]
'only_matching': True,
}]
@@
-319,6
+320,7
@@
class WalyTVIE(ZattooIE):
class BBVTVIE(ZattooIE):
_NETRC_MACHINE = 'bbvtv'
_HOST = 'bbv-tv.net'
class BBVTVIE(ZattooIE):
_NETRC_MACHINE = 'bbvtv'
_HOST = 'bbv-tv.net'
+ _API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
@@
-330,6
+332,7
@@
class BBVTVIE(ZattooIE):
class VTXTVIE(ZattooIE):
_NETRC_MACHINE = 'vtxtv'
_HOST = 'vtxtv.ch'
class VTXTVIE(ZattooIE):
_NETRC_MACHINE = 'vtxtv'
_HOST = 'vtxtv.ch'
+ _API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
@@
-341,6
+344,7
@@
class VTXTVIE(ZattooIE):
class MyVisionTVIE(ZattooIE):
_NETRC_MACHINE = 'myvisiontv'
_HOST = 'myvisiontv.ch'
class MyVisionTVIE(ZattooIE):
_NETRC_MACHINE = 'myvisiontv'
_HOST = 'myvisiontv.ch'
+ _API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
@@
-355,7
+359,7
@@
class GlattvisionTVIE(ZattooIE):
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
- 'url': 'https://
www.
iptv.glattvision.ch/watch/abc/123-abc',
+ 'url': 'https://iptv.glattvision.ch/watch/abc/123-abc',
'only_matching': True,
}]
'only_matching': True,
}]
@@
-363,6
+367,7
@@
class GlattvisionTVIE(ZattooIE):
class SAKTVIE(ZattooIE):
_NETRC_MACHINE = 'saktv'
_HOST = 'saktv.ch'
class SAKTVIE(ZattooIE):
_NETRC_MACHINE = 'saktv'
_HOST = 'saktv.ch'
+ _API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
@@
-377,7
+382,7
@@
class EWETVIE(ZattooIE):
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
- 'url': 'https://
www.
tvonline.ewe.de/watch/abc/123-abc',
+ 'url': 'https://tvonline.ewe.de/watch/abc/123-abc',
'only_matching': True,
}]
'only_matching': True,
}]
@@
-385,6
+390,7
@@
class EWETVIE(ZattooIE):
class QuantumTVIE(ZattooIE):
_NETRC_MACHINE = 'quantumtv'
_HOST = 'quantum-tv.com'
class QuantumTVIE(ZattooIE):
_NETRC_MACHINE = 'quantumtv'
_HOST = 'quantum-tv.com'
+ _API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
@@
-395,11
+401,11
@@
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 = [{
- 'url': 'https://
www.onlinetv
.osnatel.de/watch/abc/123-abc',
+ 'url': 'https://
tvonline
.osnatel.de/watch/abc/123-abc',
'only_matching': True,
}]
'only_matching': True,
}]
@@
-407,9
+413,21
@@
class OsnatelTVIE(ZattooIE):
class EinsUndEinsTVIE(ZattooIE):
_NETRC_MACHINE = '1und1tv'
_HOST = '1und1.tv'
class EinsUndEinsTVIE(ZattooIE):
_NETRC_MACHINE = '1und1tv'
_HOST = '1und1.tv'
+ _API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
'url': 'https://www.1und1.tv/watch/abc/123-abc',
'only_matching': True,
}]
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
'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,
+ }]