Hello community,
here is the log from the commit of package youtube-dl for openSUSE:Factory
checked in at 2018-11-12 09:45:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/youtube-dl (Old)
and /work/SRC/openSUSE:Factory/.youtube-dl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "youtube-dl"
Mon Nov 12 09:45:05 2018 rev:87 rq:648245 version:2018.11.07
Changes:
--------
--- /work/SRC/openSUSE:Factory/youtube-dl/python-youtube-dl.changes
2018-11-06 14:39:38.528573056 +0100
+++ /work/SRC/openSUSE:Factory/.youtube-dl.new/python-youtube-dl.changes
2018-11-12 09:45:42.484801875 +0100
@@ -1,0 +2,13 @@
+Sat Nov 10 23:23:40 CET 2018 - mc...@suse.com
+
+- Update to new upstream release 2018.11.07
+ * Add another JS signature function name regex (#18091,
+ #18093, #18094)
+ * [facebook] Fix tahoe request (#17171)
+ * [cliphunter] Fix extraction (#18083)
+ * [youtube:playlist] Add support for invidio.us (#18077)
+ * [zattoo] Arrange API hosts for derived extractors (#18035)
+ * [youtube] Add fallback metadata extraction from
+ videoDetails (#18052)
+
+-------------------------------------------------------------------
youtube-dl.changes: same change
Old:
----
youtube-dl-2018.11.03.tar.gz
youtube-dl-2018.11.03.tar.gz.sig
New:
----
youtube-dl-2018.11.07.tar.gz
youtube-dl-2018.11.07.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-youtube-dl.spec ++++++
--- /var/tmp/diff_new_pack.CZHfO4/_old 2018-11-12 09:45:50.364789904 +0100
+++ /var/tmp/diff_new_pack.CZHfO4/_new 2018-11-12 09:45:50.368789898 +0100
@@ -19,12 +19,12 @@
%define modname youtube-dl
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-youtube-dl
-Version: 2018.11.03
+Version: 2018.11.07
Release: 0
Summary: A python module for downloading from video sites for offline
watching
License: SUSE-Public-Domain AND CC-BY-SA-3.0
Group: Development/Languages/Python
-Url: http://rg3.github.io/youtube-dl/
+URL: http://rg3.github.io/youtube-dl/
Source:
http://youtube-dl.org/downloads/%version/%modname-%version.tar.gz
Source2:
http://youtube-dl.org/downloads/%version/%modname-%version.tar.gz.sig
Source3: %modname.keyring
@@ -32,7 +32,6 @@
BuildRequires: %{python_module xml}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%python_subpackages
@@ -57,8 +56,8 @@
%python_expand %fdupes -s %buildroot/%{$python_sitelib}
%files %python_files
-%defattr(-,root,root)
-%doc LICENSE README.txt
+%license LICENSE
+%doc README.txt
%python_sitelib/youtube_dl
%python_sitelib/youtube_dl-*-py%python_version.egg-info
++++++ youtube-dl.spec ++++++
--- /var/tmp/diff_new_pack.CZHfO4/_old 2018-11-12 09:45:50.384789874 +0100
+++ /var/tmp/diff_new_pack.CZHfO4/_new 2018-11-12 09:45:50.384789874 +0100
@@ -17,12 +17,12 @@
Name: youtube-dl
-Version: 2018.11.03
+Version: 2018.11.07
Release: 0
Summary: A tool for downloading from video sites for offline watching
License: SUSE-Public-Domain AND CC-BY-SA-3.0
Group: Productivity/Networking/Web/Utilities
-Url: http://rg3.github.io/youtube-dl/
+URL: http://rg3.github.io/youtube-dl/
#Git-Clone: https://github.com/rg3/youtube-dl
Source: http://youtube-dl.org/downloads/%version/%name-%version.tar.gz
Source2:
http://youtube-dl.org/downloads/%version/%name-%version.tar.gz.sig
@@ -31,7 +31,6 @@
BuildRequires: python-devel
BuildRequires: python-xml
BuildRequires: zip
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -44,7 +43,7 @@
%build
perl -i -pe '
- s{^PREFIX\ \?=\ /usr/local}{PREFIX ?= %_prefix};
+ s{^PREFIX\ \?=\ %_prefix/local}{PREFIX ?= %_prefix};
s{^BINDIR\ \?=\ \$\(PREFIX\)/bin}{BINDIR\ \?=\ %_bindir};
s{^MANDIR\ \?=\ \$\(PREFIX\)/man}{MANDIR\ \?=\ %_mandir};
s{^SHAREDIR\ \?=\ \$\(PREFIX\)/share}{SHAREDIR\ \?=\ %_datadir};'
Makefile
@@ -54,8 +53,8 @@
%make_install
%files
-%defattr(-,root,root)
-%doc LICENSE README.txt
+%license LICENSE
+%doc README.txt
%_bindir/youtube-dl
%_mandir/man1/*
%config %_sysconfdir/bash_completion.d/
++++++ youtube-dl-2018.11.03.tar.gz -> youtube-dl-2018.11.07.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/ChangeLog new/youtube-dl/ChangeLog
--- old/youtube-dl/ChangeLog 2018-11-02 20:57:46.000000000 +0100
+++ new/youtube-dl/ChangeLog 2018-11-06 19:38:22.000000000 +0100
@@ -1,3 +1,15 @@
+version 2018.11.07
+
+Extractors
++ [youtube] Add another JS signature function name regex (#18091, #18093,
+ #18094)
+* [facebook] Fix tahoe request (#17171)
+* [cliphunter] Fix extraction (#18083)
++ [youtube:playlist] Add support for invidio.us (#18077)
+* [zattoo] Arrange API hosts for derived extractors (#18035)
++ [youtube] Add fallback metadata extraction from videoDetails (#18052)
+
+
version 2018.11.03
Core
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/README.md new/youtube-dl/README.md
--- old/youtube-dl/README.md 2018-11-02 20:57:48.000000000 +0100
+++ new/youtube-dl/README.md 2018-11-06 19:38:24.000000000 +0100
@@ -1168,7 +1168,28 @@
### Use safe conversion functions
-Wrap all extracted numeric data into safe functions from `utils`:
`int_or_none`, `float_or_none`. Use them for string to number conversions as
well.
+Wrap all extracted numeric data into safe functions from
[`youtube_dl/utils.py`](https://github.com/rg3/youtube-dl/blob/master/youtube_dl/utils.py):
`int_or_none`, `float_or_none`. Use them for string to number conversions as
well.
+
+Use `url_or_none` for safe URL processing.
+
+Use `try_get` for safe metadata extraction from parsed JSON.
+
+Explore
[`youtube_dl/utils.py`](https://github.com/rg3/youtube-dl/blob/master/youtube_dl/utils.py)
for more useful convenience functions.
+
+#### More examples
+
+##### Safely extract optional description from parsed JSON
+```python
+description = try_get(response, lambda x: x['result']['video'][0]['summary'],
compat_str)
+```
+
+##### Safely extract more optional metadata
+```python
+video = try_get(response, lambda x: x['result']['video'][0], dict) or {}
+description = video.get('summary')
+duration = float_or_none(video.get('durationMs'), scale=1000)
+view_count = int_or_none(video.get('views'))
+```
# EMBEDDING YOUTUBE-DL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/README.txt new/youtube-dl/README.txt
--- old/youtube-dl/README.txt 2018-11-02 20:58:12.000000000 +0100
+++ new/youtube-dl/README.txt 2018-11-06 19:38:59.000000000 +0100
@@ -1591,9 +1591,28 @@
Use safe conversion functions
-Wrap all extracted numeric data into safe functions from utils:
-int_or_none, float_or_none. Use them for string to number conversions as
-well.
+Wrap all extracted numeric data into safe functions from
+youtube_dl/utils.py: int_or_none, float_or_none. Use them for string to
+number conversions as well.
+
+Use url_or_none for safe URL processing.
+
+Use try_get for safe metadata extraction from parsed JSON.
+
+Explore youtube_dl/utils.py for more useful convenience functions.
+
+More examples
+
+Safely extract optional description from parsed JSON
+
+ description = try_get(response, lambda x:
x['result']['video'][0]['summary'], compat_str)
+
+Safely extract more optional metadata
+
+ video = try_get(response, lambda x: x['result']['video'][0], dict) or {}
+ description = video.get('summary')
+ duration = float_or_none(video.get('durationMs'), scale=1000)
+ view_count = int_or_none(video.get('views'))
Binary files old/youtube-dl/youtube-dl and new/youtube-dl/youtube-dl differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube-dl.1 new/youtube-dl/youtube-dl.1
--- old/youtube-dl/youtube-dl.1 2018-11-02 20:58:13.000000000 +0100
+++ new/youtube-dl/youtube-dl.1 2018-11-06 19:39:00.000000000 +0100
@@ -2333,9 +2333,36 @@
.fi
.SS Use safe conversion functions
.PP
-Wrap all extracted numeric data into safe functions from \f[C]utils\f[]:
+Wrap all extracted numeric data into safe functions from
+\f[C]youtube_dl/utils.py\f[]
(https://github.com/rg3/youtube-dl/blob/master/youtube_dl/utils.py):
\f[C]int_or_none\f[], \f[C]float_or_none\f[].
Use them for string to number conversions as well.
+.PP
+Use \f[C]url_or_none\f[] for safe URL processing.
+.PP
+Use \f[C]try_get\f[] for safe metadata extraction from parsed JSON.
+.PP
+Explore
+\f[C]youtube_dl/utils.py\f[]
(https://github.com/rg3/youtube-dl/blob/master/youtube_dl/utils.py)
+for more useful convenience functions.
+.SS More examples
+.SS Safely extract optional description from parsed JSON
+.IP
+.nf
+\f[C]
+description\ =\ try_get(response,\ lambda\ x:\
x[\[aq]result\[aq]][\[aq]video\[aq]][0][\[aq]summary\[aq]],\ compat_str)
+\f[]
+.fi
+.SS Safely extract more optional metadata
+.IP
+.nf
+\f[C]
+video\ =\ try_get(response,\ lambda\ x:\
x[\[aq]result\[aq]][\[aq]video\[aq]][0],\ dict)\ or\ {}
+description\ =\ video.get(\[aq]summary\[aq])
+duration\ =\ float_or_none(video.get(\[aq]durationMs\[aq]),\ scale=1000)
+view_count\ =\ int_or_none(video.get(\[aq]views\[aq]))
+\f[]
+.fi
.SH EMBEDDING YOUTUBE\-DL
.PP
youtube\-dl makes the best effort to be a good command\-line program,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/cliphunter.py
new/youtube-dl/youtube_dl/extractor/cliphunter.py
--- old/youtube-dl/youtube_dl/extractor/cliphunter.py 2018-10-28
21:40:29.000000000 +0100
+++ new/youtube-dl/youtube_dl/extractor/cliphunter.py 2018-11-06
19:36:26.000000000 +0100
@@ -1,19 +1,10 @@
from __future__ import unicode_literals
from .common import InfoExtractor
-from ..utils import int_or_none
-
-
-_translation_table = {
- 'a': 'h', 'd': 'e', 'e': 'v', 'f': 'o', 'g': 'f', 'i': 'd', 'l': 'n',
- 'm': 'a', 'n': 'm', 'p': 'u', 'q': 't', 'r': 's', 'v': 'p', 'x': 'r',
- 'y': 'l', 'z': 'i',
- '$': ':', '&': '.', '(': '=', '^': '&', '=': '/',
-}
-
-
-def _decode(s):
- return ''.join(_translation_table.get(c, c) for c in s)
+from ..utils import (
+ int_or_none,
+ url_or_none,
+)
class CliphunterIE(InfoExtractor):
@@ -60,14 +51,14 @@
formats = []
for format_id, f in gexo_files.items():
- video_url = f.get('url')
+ video_url = url_or_none(f.get('url'))
if not video_url:
continue
fmt = f.get('fmt')
height = f.get('h')
format_id = '%s_%sp' % (fmt, height) if fmt and height else
format_id
formats.append({
- 'url': _decode(video_url),
+ 'url': video_url,
'format_id': format_id,
'width': int_or_none(f.get('w')),
'height': int_or_none(height),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/facebook.py
new/youtube-dl/youtube_dl/extractor/facebook.py
--- old/youtube-dl/youtube_dl/extractor/facebook.py 2018-10-28
21:40:29.000000000 +0100
+++ new/youtube-dl/youtube_dl/extractor/facebook.py 2018-11-06
19:37:10.000000000 +0100
@@ -57,7 +57,7 @@
_CHROME_USER_AGENT = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/48.0.2564.97 Safari/537.36'
_VIDEO_PAGE_TEMPLATE = 'https://www.facebook.com/video/video.php?v=%s'
- _VIDEO_PAGE_TAHOE_TEMPLATE =
'https://www.facebook.com/video/tahoe/async/%s/?chain=true&isvideo=true'
+ _VIDEO_PAGE_TAHOE_TEMPLATE =
'https://www.facebook.com/video/tahoe/async/%s/?chain=true&isvideo=true&payloadtype=primary'
_TESTS = [{
'url': 'https://www.facebook.com/video.php?v=637842556329505&fref=nf',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/youtube.py
new/youtube-dl/youtube_dl/extractor/youtube.py
--- old/youtube-dl/youtube_dl/extractor/youtube.py 2018-10-28
21:40:29.000000000 +0100
+++ new/youtube-dl/youtube_dl/extractor/youtube.py 2018-11-06
19:37:10.000000000 +0100
@@ -41,6 +41,7 @@
remove_quotes,
remove_start,
smuggle_url,
+ str_or_none,
str_to_int,
try_get,
unescapeHTML,
@@ -501,6 +502,7 @@
'categories': ['Science & Technology'],
'tags': ['youtube-dl'],
'duration': 10,
+ 'view_count': int,
'like_count': int,
'dislike_count': int,
'start_time': 1,
@@ -583,6 +585,7 @@
'categories': ['Science & Technology'],
'tags': ['youtube-dl'],
'duration': 10,
+ 'view_count': int,
'like_count': int,
'dislike_count': int,
},
@@ -1189,7 +1192,8 @@
(r'(["\'])signature\1\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
r'\.sig\|\|(?P<sig>[a-zA-Z0-9$]+)\(',
r'yt\.akamaized\.net/\)\s*\|\|\s*.*?\s*c\s*&&\s*d\.set\([^,]+\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
- r'\bc\s*&&\s*d\.set\([^,]+\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\('),
+ r'\bc\s*&&\s*d\.set\([^,]+\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+
r'\bc\s*&&\s*d\.set\([^,]+\s*,\s*\([^)]*\)\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\('),
jscode, 'Initial JS player signature function name', group='sig')
jsi = JSInterpreter(jscode)
@@ -1538,6 +1542,8 @@
def extract_view_count(v_info):
return int_or_none(try_get(v_info, lambda x: x['view_count'][0]))
+ player_response = {}
+
# Get video info
embed_webpage = None
if re.search(r'player-age-gate-content">', video_webpage) is not None:
@@ -1580,6 +1586,12 @@
if args.get('livestream') == '1' or args.get('live_playback')
== 1:
is_live = True
sts = ytplayer_config.get('sts')
+ if not player_response:
+ pl_response = str_or_none(args.get('player_response'))
+ if pl_response:
+ pl_response = self._parse_json(pl_response, video_id,
fatal=False)
+ if isinstance(pl_response, dict):
+ player_response = pl_response
if not video_info or
self._downloader.params.get('youtube_include_dash_manifest', True):
# We also try looking in get_video_info since it may contain
different dashmpd
# URL that points to a DASH manifest with possibly different
itag set (some itags
@@ -1608,6 +1620,10 @@
if not video_info_webpage:
continue
get_video_info = compat_parse_qs(video_info_webpage)
+ if not player_response:
+ pl_response = get_video_info.get('player_response',
[None])[0]
+ if isinstance(pl_response, dict):
+ player_response = pl_response
add_dash_mpd(get_video_info)
if view_count is None:
view_count = extract_view_count(get_video_info)
@@ -1653,9 +1669,14 @@
'"token" parameter not in video info for unknown reason',
video_id=video_id)
+ video_details = try_get(
+ player_response, lambda x: x['videoDetails'], dict) or {}
+
# title
if 'title' in video_info:
video_title = video_info['title'][0]
+ elif 'title' in player_response:
+ video_title = video_details['title']
else:
self._downloader.report_warning('Unable to extract video title')
video_title = '_'
@@ -1718,6 +1739,8 @@
if view_count is None:
view_count = extract_view_count(video_info)
+ if view_count is None and video_details:
+ view_count = int_or_none(video_details.get('viewCount'))
# Check for "rental" videos
if 'ypc_video_rental_bar_text' in video_info and 'author' not in
video_info:
@@ -1898,7 +1921,9 @@
raise ExtractorError('no conn, hlsvp or url_encoded_fmt_stream_map
information found in video info')
# uploader
- video_uploader = try_get(video_info, lambda x: x['author'][0],
compat_str)
+ video_uploader = try_get(
+ video_info, lambda x: x['author'][0],
+ compat_str) or str_or_none(video_details.get('author'))
if video_uploader:
video_uploader = compat_urllib_parse_unquote_plus(video_uploader)
else:
@@ -2011,6 +2036,11 @@
like_count = _extract_count('like')
dislike_count = _extract_count('dislike')
+ if view_count is None:
+ view_count = str_to_int(self._search_regex(
+ r'<[^>]+class=["\']watch-view-count[^>]+>\s*([\d,\s]+)',
video_webpage,
+ 'view count', default=None))
+
# subtitles
video_subtitles = self.extract_subtitles(video_id, video_webpage)
automatic_captions = self.extract_automatic_captions(video_id,
video_webpage)
@@ -2018,6 +2048,8 @@
video_duration = try_get(
video_info, lambda x: int_or_none(x['length_seconds'][0]))
if not video_duration:
+ video_duration = int_or_none(video_details.get('lengthSeconds'))
+ if not video_duration:
video_duration = parse_duration(self._html_search_meta(
'duration', video_webpage, 'video duration'))
@@ -2131,7 +2163,11 @@
(?:https?://)?
(?:\w+\.)?
(?:
- youtube\.com/
+ (?:
+ youtube\.com|
+ invidio\.us
+ )
+ /
(?:
(?:course|view_play_list|my_playlists|artist|playlist|watch|embed/(?:videoseries|[0-9A-Za-z_-]{11}))
\? (?:.*?[&;])*? (?:p|a|list)=
@@ -2244,6 +2280,7 @@
'description': 'md5:507cdcb5a49ac0da37a920ece610be80',
'categories': ['People & Blogs'],
'tags': list,
+ 'view_count': int,
'like_count': int,
'dislike_count': int,
},
@@ -2282,6 +2319,9 @@
# music album playlist
'url': 'OLAK5uy_m4xAFdmMC5rX3Ji3g93pQe3hqLZw_9LhM',
'only_matching': True,
+ }, {
+ 'url':
'https://invidio.us/playlist?list=PLDIoUOhQQPlXr63I_vwF9GD8sAKh77dWU',
+ 'only_matching': True,
}]
def _real_initialize(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/zattoo.py
new/youtube-dl/youtube_dl/extractor/zattoo.py
--- old/youtube-dl/youtube_dl/extractor/zattoo.py 2018-10-28
21:40:29.000000000 +0100
+++ new/youtube-dl/youtube_dl/extractor/zattoo.py 2018-11-06
19:36:26.000000000 +0100
@@ -22,7 +22,7 @@
_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()
@@ -286,6 +286,7 @@
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 = [{
@@ -300,7 +301,7 @@
_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,
}]
@@ -311,7 +312,7 @@
_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,
}]
@@ -319,6 +320,7 @@
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 = [{
@@ -330,6 +332,7 @@
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 = [{
@@ -341,6 +344,7 @@
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 = [{
@@ -355,7 +359,7 @@
_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,
}]
@@ -363,6 +367,7 @@
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 = [{
@@ -377,7 +382,7 @@
_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,
}]
@@ -385,6 +390,7 @@
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 = [{
@@ -395,11 +401,11 @@
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 = [{
- 'url': 'https://www.onlinetv.osnatel.de/watch/abc/123-abc',
+ 'url': 'https://tvonline.osnatel.de/watch/abc/123-abc',
'only_matching': True,
}]
@@ -407,6 +413,7 @@
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 = [{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/version.py
new/youtube-dl/youtube_dl/version.py
--- old/youtube-dl/youtube_dl/version.py 2018-11-02 20:57:46.000000000
+0100
+++ new/youtube-dl/youtube_dl/version.py 2018-11-06 19:38:22.000000000
+0100
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-__version__ = '2018.11.03'
+__version__ = '2018.11.07'
