Hello community,
here is the log from the commit of package youtube-dl for openSUSE:Factory
checked in at 2018-08-29 12:26:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/youtube-dl (Old)
and /work/SRC/openSUSE:Factory/.youtube-dl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "youtube-dl"
Wed Aug 29 12:26:34 2018 rev:83 rq:631955 version:2018.08.28
Changes:
--------
--- /work/SRC/openSUSE:Factory/youtube-dl/python-youtube-dl.changes
2018-08-27 12:59:16.428811245 +0200
+++ /work/SRC/openSUSE:Factory/.youtube-dl.new/python-youtube-dl.changes
2018-08-29 12:26:36.075580493 +0200
@@ -1,0 +2,9 @@
+Tue Aug 28 10:26:30 UTC 2018 - jeng...@inai.de
+
+- Update to new upstream release 2018.08.28
+ * nova:embed: Add extractor (closes #17282)
+ * Add support for vidzi.nu, vidto.se
+ * youtube:playlist: Add support for music album playlists
+ (OLAK5uy_ prefix)
+
+-------------------------------------------------------------------
youtube-dl.changes: same change
Old:
----
youtube-dl-2018.08.22.tar.gz
youtube-dl-2018.08.22.tar.gz.sig
New:
----
youtube-dl-2018.08.28.tar.gz
youtube-dl-2018.08.28.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-youtube-dl.spec ++++++
--- /var/tmp/diff_new_pack.oa5ejp/_old 2018-08-29 12:26:36.911582327 +0200
+++ /var/tmp/diff_new_pack.oa5ejp/_new 2018-08-29 12:26:36.915582336 +0200
@@ -19,7 +19,7 @@
%define modname youtube-dl
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-youtube-dl
-Version: 2018.08.22
+Version: 2018.08.28
Release: 0
Summary: A python module for downloading from video sites for offline
watching
License: SUSE-Public-Domain AND CC-BY-SA-3.0
++++++ youtube-dl.spec ++++++
--- /var/tmp/diff_new_pack.oa5ejp/_old 2018-08-29 12:26:36.931582371 +0200
+++ /var/tmp/diff_new_pack.oa5ejp/_new 2018-08-29 12:26:36.935582379 +0200
@@ -17,7 +17,7 @@
Name: youtube-dl
-Version: 2018.08.22
+Version: 2018.08.28
Release: 0
Summary: A tool for downloading from video sites for offline watching
License: SUSE-Public-Domain AND CC-BY-SA-3.0
++++++ youtube-dl-2018.08.22.tar.gz -> youtube-dl-2018.08.28.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-08-21 21:32:14.000000000 +0200
+++ new/youtube-dl/ChangeLog 2018-08-27 22:10:06.000000000 +0200
@@ -1,3 +1,17 @@
+version 2018.08.28
+
+Extractors
++ [youtube:playlist] Add support for music album playlists (OLAK5uy_ prefix)
+ (#17361)
+* [bitchute] Fix extraction by pass custom User-Agent (#17360)
+* [webofstories:playlist] Fix extraction (#16914)
++ [tvplayhome] Add support for new tvplay URLs (#17344)
++ [generic] Allow relative src for videojs embeds (#17324)
++ [xfileshare] Add support for vidto.se (#17317)
++ [vidzi] Add support for vidzi.nu (#17316)
++ [nova:embed] Add support for media.cms.nova.cz (#17282)
+
+
version 2018.08.22
Core
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/docs/supportedsites.md
new/youtube-dl/docs/supportedsites.md
--- old/youtube-dl/docs/supportedsites.md 2018-08-21 21:32:18.000000000
+0200
+++ new/youtube-dl/docs/supportedsites.md 2018-08-27 22:10:09.000000000
+0200
@@ -580,6 +580,7 @@
- **Normalboots**
- **NosVideo**
- **Nova**: TN.cz, Prásk.tv, Nova.cz, Novaplus.cz, FANDA.tv, Krásná.cz and
Doma.cz
+ - **NovaEmbed**
- **nowness**
- **nowness:playlist**
- **nowness:series**
@@ -916,6 +917,7 @@
- **tvp:embed**: Telewizja Polska
- **tvp:series**
- **TVPlayer**
+ - **TVPlayHome**
- **Tweakers**
- **twitch:chapter**
- **twitch:clips**
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/extractor/bitchute.py
new/youtube-dl/youtube_dl/extractor/bitchute.py
--- old/youtube-dl/youtube_dl/extractor/bitchute.py 2018-08-21
21:31:14.000000000 +0200
+++ new/youtube-dl/youtube_dl/extractor/bitchute.py 2018-08-27
22:08:34.000000000 +0200
@@ -33,7 +33,9 @@
video_id = self._match_id(url)
webpage = self._download_webpage(
- 'https://www.bitchute.com/video/%s' % video_id, video_id)
+ 'https://www.bitchute.com/video/%s' % video_id, video_id, headers={
+ 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0)
AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.57 Safari/537.36',
+ })
title = self._search_regex(
(r'<[^>]+\bid=["\']video-title[^>]+>([^<]+)', r'<title>([^<]+)'),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/extractors.py
new/youtube-dl/youtube_dl/extractor/extractors.py
--- old/youtube-dl/youtube_dl/extractor/extractors.py 2018-08-21
21:31:28.000000000 +0200
+++ new/youtube-dl/youtube_dl/extractor/extractors.py 2018-08-27
22:08:34.000000000 +0200
@@ -741,7 +741,10 @@
from .noovo import NoovoIE
from .normalboots import NormalbootsIE
from .nosvideo import NosVideoIE
-from .nova import NovaIE
+from .nova import (
+ NovaEmbedIE,
+ NovaIE,
+)
from .novamov import (
AuroraVidIE,
CloudTimeIE,
@@ -1178,6 +1181,7 @@
from .tvplay import (
TVPlayIE,
ViafreeIE,
+ TVPlayHomeIE,
)
from .tvplayer import TVPlayerIE
from .tweakers import TweakersIE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/generic.py
new/youtube-dl/youtube_dl/extractor/generic.py
--- old/youtube-dl/youtube_dl/extractor/generic.py 2018-08-21
21:31:28.000000000 +0200
+++ new/youtube-dl/youtube_dl/extractor/generic.py 2018-08-27
22:08:34.000000000 +0200
@@ -32,7 +32,6 @@
unified_strdate,
unsmuggle_url,
UnsupportedError,
- url_or_none,
xpath_text,
)
from .commonprotocols import RtmpIE
@@ -2071,6 +2070,21 @@
},
'playlist_count': 6,
},
+ {
+ # videojs embed
+ 'url': 'https://video.sibnet.ru/shell.php?videoid=3422904',
+ 'info_dict': {
+ 'id': 'shell',
+ 'ext': 'mp4',
+ 'title': 'Доставщик пиццы спросил разрешения сыграть на
фортепиано',
+ 'description': 'md5:89209cdc587dab1e4a090453dbaa2cb1',
+ 'thumbnail': r're:^https?://.*\.jpg$',
+ },
+ 'params': {
+ 'skip_download': True,
+ },
+ 'expected_warnings': ['Failed to download MPD manifest'],
+ },
# {
# # TODO: find another test
# # http://schema.org/VideoObject
@@ -3152,8 +3166,8 @@
sources = [sources]
formats = []
for source in sources:
- src = url_or_none(source.get('src'))
- if not src:
+ src = source.get('src')
+ if not src or not isinstance(src, compat_str):
continue
src = compat_urlparse.urljoin(url, src)
src_type = source.get('type')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/nova.py
new/youtube-dl/youtube_dl/extractor/nova.py
--- old/youtube-dl/youtube_dl/extractor/nova.py 2018-08-21 21:31:28.000000000
+0200
+++ new/youtube-dl/youtube_dl/extractor/nova.py 2018-08-27 22:08:34.000000000
+0200
@@ -6,30 +6,90 @@
from .common import InfoExtractor
from ..utils import (
clean_html,
+ int_or_none,
js_to_json,
+ qualities,
unified_strdate,
url_or_none,
)
+class NovaEmbedIE(InfoExtractor):
+ _VALID_URL = r'https?://media\.cms\.nova\.cz/embed/(?P<id>[^/?#&]+)'
+ _TEST = {
+ 'url': 'https://media.cms.nova.cz/embed/8o0n0r?autoplay=1',
+ 'md5': 'b3834f6de5401baabf31ed57456463f7',
+ 'info_dict': {
+ 'id': '8o0n0r',
+ 'ext': 'mp4',
+ 'title': '2180. díl',
+ 'thumbnail': r're:^https?://.*\.jpg',
+ 'duration': 2578,
+ },
+ }
+
+ def _real_extract(self, url):
+ video_id = self._match_id(url)
+
+ webpage = self._download_webpage(url, video_id)
+
+ bitrates = self._parse_json(
+ self._search_regex(
+ r'(?s)bitrates\s*=\s*({.+?})\s*;', webpage, 'formats'),
+ video_id, transform_source=js_to_json)
+
+ QUALITIES = ('lq', 'mq', 'hq', 'hd')
+ quality_key = qualities(QUALITIES)
+
+ formats = []
+ for format_id, format_list in bitrates.items():
+ if not isinstance(format_list, list):
+ continue
+ for format_url in format_list:
+ format_url = url_or_none(format_url)
+ if not format_url:
+ continue
+ f = {
+ 'url': format_url,
+ }
+ f_id = format_id
+ for quality in QUALITIES:
+ if '%s.mp4' % quality in format_url:
+ f_id += '-%s' % quality
+ f.update({
+ 'quality': quality_key(quality),
+ 'format_note': quality.upper(),
+ })
+ break
+ f['format_id'] = f_id
+ formats.append(f)
+ self._sort_formats(formats)
+
+ title = self._og_search_title(
+ webpage, default=None) or self._search_regex(
+ (r'<value>(?P<title>[^<]+)',
+ r'videoTitle\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1'), webpage,
+ 'title', group='value')
+ thumbnail = self._og_search_thumbnail(
+ webpage, default=None) or self._search_regex(
+ r'poster\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1', webpage,
+ 'thumbnail', fatal=False, group='value')
+ duration = int_or_none(self._search_regex(
+ r'videoDuration\s*:\s*(\d+)', webpage, 'duration', fatal=False))
+
+ return {
+ 'id': video_id,
+ 'title': title,
+ 'thumbnail': thumbnail,
+ 'duration': duration,
+ 'formats': formats,
+ }
+
+
class NovaIE(InfoExtractor):
IE_DESC = 'TN.cz, Prásk.tv, Nova.cz, Novaplus.cz, FANDA.tv, Krásná.cz and
Doma.cz'
_VALID_URL =
r'https?://(?:[^.]+\.)?(?P<site>tv(?:noviny)?|tn|novaplus|vymena|fanda|krasna|doma|prask)\.nova\.cz/(?:[^/]+/)+(?P<id>[^/]+?)(?:\.html|/|$)'
_TESTS = [{
- 'url':
'http://tvnoviny.nova.cz/clanek/novinky/co-na-sebe-sportaci-praskli-vime-jestli-pujde-hrdlicka-na-materskou.html?utm_source=tvnoviny&utm_medium=cpfooter&utm_campaign=novaplus',
- 'info_dict': {
- 'id': '1608920',
- 'display_id':
'co-na-sebe-sportaci-praskli-vime-jestli-pujde-hrdlicka-na-materskou',
- 'ext': 'flv',
- 'title': 'Duel: Michal Hrdlička a Petr Suchoň',
- 'description': 'md5:d0cc509858eee1b1374111c588c6f5d5',
- 'thumbnail': r're:^https?://.*\.(?:jpg)',
- },
- 'params': {
- # rtmp download
- 'skip_download': True,
- }
- }, {
'url':
'http://tn.nova.cz/clanek/tajemstvi-ukryte-v-podzemi-specialni-nemocnice-v-prazske-krci.html#player_13260',
'md5': '1dd7b9d5ea27bc361f110cd855a19bd3',
'info_dict': {
@@ -41,33 +101,6 @@
'thumbnail': r're:^https?://.*\.(?:jpg)',
}
}, {
- 'url':
'http://novaplus.nova.cz/porad/policie-modrava/video/5591-policie-modrava-15-dil-blondynka-na-hrbitove',
- 'info_dict': {
- 'id': '1756825',
- 'display_id': '5591-policie-modrava-15-dil-blondynka-na-hrbitove',
- 'ext': 'flv',
- 'title': 'Policie Modrava - 15. díl - Blondýnka na hřbitově',
- 'description': 'md5:dc24e50be5908df83348e50d1431295e', # Make
sure this description is clean of html tags
- 'thumbnail': r're:^https?://.*\.(?:jpg)',
- },
- 'params': {
- # rtmp download
- 'skip_download': True,
- }
- }, {
- 'url':
'http://novaplus.nova.cz/porad/televizni-noviny/video/5585-televizni-noviny-30-5-2015/',
- 'info_dict': {
- 'id': '1756858',
- 'ext': 'flv',
- 'title': 'Televizní noviny - 30. 5. 2015',
- 'thumbnail': r're:^https?://.*\.(?:jpg)',
- 'upload_date': '20150530',
- },
- 'params': {
- # rtmp download
- 'skip_download': True,
- }
- }, {
'url':
'http://fanda.nova.cz/clanek/fun-and-games/krvavy-epos-zaklinac-3-divoky-hon-vychazi-vyhrajte-ho-pro-sebe.html',
'info_dict': {
'id': '1753621',
@@ -82,6 +115,20 @@
'skip_download': True,
}
}, {
+ # media.cms.nova.cz embed
+ 'url': 'https://novaplus.nova.cz/porad/ulice/epizoda/18760-2180-dil',
+ 'info_dict': {
+ 'id': '8o0n0r',
+ 'ext': 'mp4',
+ 'title': '2180. díl',
+ 'thumbnail': r're:^https?://.*\.jpg',
+ 'duration': 2578,
+ },
+ 'params': {
+ 'skip_download': True,
+ },
+ 'add_ie': [NovaEmbedIE.ie_key()],
+ }, {
'url':
'http://sport.tn.nova.cz/clanek/sport/hokej/nhl/zivot-jde-dal-hodnotil-po-vyrazeni-z-playoff-jiri-sekac.html',
'only_matching': True,
}, {
@@ -105,6 +152,15 @@
webpage = self._download_webpage(url, display_id)
+ # novaplus
+ embed_id = self._search_regex(
+
r'<iframe[^>]+\bsrc=["\'](?:https?:)?//media\.cms\.nova\.cz/embed/([^/?#&]+)',
+ webpage, 'embed url', default=None)
+ if embed_id:
+ return self.url_result(
+ 'https://media.cms.nova.cz/embed/%s' % embed_id,
+ ie=NovaEmbedIE.ie_key(), video_id=embed_id)
+
video_id = self._search_regex(
[r"(?:media|video_id)\s*:\s*'(\d+)'",
r'media=(\d+)',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/tvplay.py
new/youtube-dl/youtube_dl/extractor/tvplay.py
--- old/youtube-dl/youtube_dl/extractor/tvplay.py 2018-08-21
21:31:17.000000000 +0200
+++ new/youtube-dl/youtube_dl/extractor/tvplay.py 2018-08-27
22:08:34.000000000 +0200
@@ -32,12 +32,12 @@
https?://
(?:www\.)?
(?:
- tvplay(?:\.skaties)?\.lv/parraides|
- (?:tv3play|play\.tv3)\.lt/programos|
+ tvplay(?:\.skaties)?\.lv(?:/parraides)?|
+ (?:tv3play|play\.tv3)\.lt(?:/programos)?|
tv3play(?:\.tv3)?\.ee/sisu|
(?:tv(?:3|6|8|10)play|viafree)\.se/program|
(?:(?:tv3play|viasat4play|tv6play|viafree)\.no|(?:tv3play|viafree)\.dk)/programmer|
- play\.novatv\.bg/programi
+ play\.nova(?:tv)?\.bg/programi
)
/(?:[^/]+/)+
)
@@ -204,10 +204,18 @@
},
},
{
+ 'url':
'https://play.nova.bg/programi/zdravei-bulgariya/764300?autostart=true',
+ 'only_matching': True,
+ },
+ {
'url':
'http://tvplay.skaties.lv/parraides/vinas-melo-labak/418113?autostart=true',
'only_matching': True,
},
{
+ 'url':
'https://tvplay.skaties.lv/vinas-melo-labak/418113/?autostart=true',
+ 'only_matching': True,
+ },
+ {
# views is null
'url': 'http://tvplay.skaties.lv/parraides/tv3-zinas/760183',
'only_matching': True,
@@ -288,6 +296,7 @@
'url': m.group('url'),
'app': m.group('app'),
'play_path': m.group('playpath'),
+ 'preference': -1,
})
else:
fmt.update({
@@ -447,3 +456,102 @@
'skip_rtmp': True,
}),
ie=TVPlayIE.ie_key(), video_id=video_id)
+
+
+class TVPlayHomeIE(InfoExtractor):
+ _VALID_URL =
r'https?://tvplay\.(?:tv3\.lt|skaties\.lv|tv3\.ee)/[^/]+/[^/?#&]+-(?P<id>\d+)'
+ _TESTS = [{
+ 'url': 'https://tvplay.tv3.lt/aferistai-n-7/aferistai-10047125/',
+ 'info_dict': {
+ 'id': '366367',
+ 'ext': 'mp4',
+ 'title': 'Aferistai',
+ 'description': 'Aferistai. Kalėdinė pasaka.',
+ 'series': 'Aferistai [N-7]',
+ 'season': '1 sezonas',
+ 'season_number': 1,
+ 'duration': 464,
+ 'timestamp': 1394209658,
+ 'upload_date': '20140307',
+ 'age_limit': 18,
+ },
+ 'params': {
+ 'skip_download': True,
+ },
+ 'add_ie': [TVPlayIE.ie_key()],
+ }, {
+ 'url':
'https://tvplay.skaties.lv/vinas-melo-labak/vinas-melo-labak-10280317/',
+ 'only_matching': True,
+ }, {
+ 'url':
'https://tvplay.tv3.ee/cool-d-ga-mehhikosse/cool-d-ga-mehhikosse-10044354/',
+ 'only_matching': True,
+ }]
+
+ def _real_extract(self, url):
+ video_id = self._match_id(url)
+
+ webpage = self._download_webpage(url, video_id)
+
+ video_id = self._search_regex(
+ r'data-asset-id\s*=\s*["\'](\d{5,7})\b', webpage, 'video id',
+ default=None)
+
+ if video_id:
+ return self.url_result(
+ 'mtg:%s' % video_id, ie=TVPlayIE.ie_key(), video_id=video_id)
+
+ m3u8_url = self._search_regex(
+ r'data-file\s*=\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
+ 'm3u8 url', group='url')
+
+ formats = self._extract_m3u8_formats(
+ m3u8_url, video_id, 'mp4', entry_protocol='m3u8_native',
+ m3u8_id='hls')
+ self._sort_formats(formats)
+
+ title = self._search_regex(
+ r'data-title\s*=\s*(["\'])(?P<value>(?:(?!\1).)+)\1', webpage,
+ 'title', default=None, group='value') or self._html_search_meta(
+ 'title', webpage, default=None) or self._og_search_title(
+ webpage)
+
+ description = self._html_search_meta(
+ 'description', webpage,
+ default=None) or self._og_search_description(webpage)
+
+ thumbnail = self._search_regex(
+ r'data-image\s*=\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
+ 'thumbnail', default=None, group='url') or self._html_search_meta(
+ 'thumbnail', webpage, default=None) or self._og_search_thumbnail(
+ webpage)
+
+ duration = int_or_none(self._search_regex(
+ r'data-duration\s*=\s*["\'](\d+)', webpage, 'duration',
+ fatal=False))
+
+ season = self._search_regex(
+ (r'data-series-title\s*=\s*(["\'])[^/]+/(?P<value>(?:(?!\1).)+)\1',
+ r'\bseason\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1'), webpage,
+ 'season', default=None, group='value')
+ season_number = int_or_none(self._search_regex(
+ r'(\d+)(?:[.\s]+sezona|\s+HOOAEG)', season or '', 'season number',
+ default=None))
+ episode = self._search_regex(
+ r'(["\'])(?P<value>(?:(?!\1).)+)\1', webpage, 'episode',
+ default=None, group='value')
+ episode_number = int_or_none(self._search_regex(
+ r'(?:S[eē]rija|Osa)\s+(\d+)', episode or '', 'episode number',
+ default=None))
+
+ return {
+ 'id': video_id,
+ 'title': title,
+ 'description': description,
+ 'thumbnail': thumbnail,
+ 'duration': duration,
+ 'season': season,
+ 'season_number': season_number,
+ 'episode': episode,
+ 'episode_number': episode_number,
+ 'formats': formats,
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/vidzi.py
new/youtube-dl/youtube_dl/extractor/vidzi.py
--- old/youtube-dl/youtube_dl/extractor/vidzi.py 2018-08-21
21:31:17.000000000 +0200
+++ new/youtube-dl/youtube_dl/extractor/vidzi.py 2018-08-27
22:08:34.000000000 +0200
@@ -13,7 +13,7 @@
class VidziIE(InfoExtractor):
- _VALID_URL =
r'https?://(?:www\.)?vidzi\.(?:tv|cc|si)/(?:embed-)?(?P<id>[0-9a-zA-Z]+)'
+ _VALID_URL =
r'https?://(?:www\.)?vidzi\.(?:tv|cc|si|nu)/(?:embed-)?(?P<id>[0-9a-zA-Z]+)'
_TESTS = [{
'url': 'http://vidzi.tv/cghql9yq6emu.html',
'md5': '4f16c71ca0c8c8635ab6932b5f3f1660',
@@ -35,6 +35,9 @@
}, {
'url': 'https://vidzi.si/rph9gztxj1et.html',
'only_matching': True,
+ }, {
+ 'url': 'http://vidzi.nu/cghql9yq6emu.html',
+ 'only_matching': True,
}]
def _real_extract(self, url):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/webofstories.py
new/youtube-dl/youtube_dl/extractor/webofstories.py
--- old/youtube-dl/youtube_dl/extractor/webofstories.py 2018-08-21
21:31:17.000000000 +0200
+++ new/youtube-dl/youtube_dl/extractor/webofstories.py 2018-08-27
22:08:34.000000000 +0200
@@ -4,7 +4,10 @@
import re
from .common import InfoExtractor
-from ..utils import int_or_none
+from ..utils import (
+ int_or_none,
+ orderedSet,
+)
class WebOfStoriesIE(InfoExtractor):
@@ -133,8 +136,10 @@
webpage = self._download_webpage(url, playlist_id)
entries = [
- self.url_result('http://www.webofstories.com/play/%s' %
video_number, 'WebOfStories')
- for video_number in
set(re.findall(r'href="/playAll/%s\?sId=(\d+)"' % playlist_id, webpage))
+ self.url_result(
+ 'http://www.webofstories.com/play/%s' % video_id,
+ 'WebOfStories', video_id=video_id)
+ for video_id in orderedSet(re.findall(r'\bid=["\']td_(\d+)',
webpage))
]
title = self._search_regex(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/xfileshare.py
new/youtube-dl/youtube_dl/extractor/xfileshare.py
--- old/youtube-dl/youtube_dl/extractor/xfileshare.py 2018-08-21
21:31:17.000000000 +0200
+++ new/youtube-dl/youtube_dl/extractor/xfileshare.py 2018-08-27
22:08:34.000000000 +0200
@@ -23,7 +23,7 @@
(r'powerwatch\.pw', 'PowerWatch'),
(r'rapidvideo\.ws', 'Rapidvideo.ws'),
(r'thevideobee\.to', 'TheVideoBee'),
- (r'vidto\.me', 'Vidto'),
+ (r'vidto\.(?:me|se)', 'Vidto'),
(r'streamin\.to', 'Streamin.To'),
(r'xvidstage\.com', 'XVIDSTAGE'),
(r'vidabc\.com', 'Vid ABC'),
@@ -115,7 +115,10 @@
'only_matching': True,
}, {
'url':
'http://www.fastvideo.me/k8604r8nk8sn/FAST_FURIOUS_8_-_Trailer_italiano_ufficiale.mp4.html',
- 'only_matching': True
+ 'only_matching': True,
+ }, {
+ 'url': 'http://vidto.se/1tx1pf6t12cg.html',
+ 'only_matching': True,
}]
@staticmethod
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-08-21
21:31:17.000000000 +0200
+++ new/youtube-dl/youtube_dl/extractor/youtube.py 2018-08-27
22:08:34.000000000 +0200
@@ -64,7 +64,7 @@
# If True it will raise an error if no login info is provided
_LOGIN_REQUIRED = False
- _PLAYLIST_ID_RE = r'(?:PL|LL|EC|UU|FL|RD|UL|TL)[0-9A-Za-z-_]{10,}'
+ _PLAYLIST_ID_RE = r'(?:PL|LL|EC|UU|FL|RD|UL|TL|OLAK5uy_)[0-9A-Za-z-_]{10,}'
def _set_language(self):
self._set_cookie(
@@ -2123,7 +2123,7 @@
youtu\.be/[0-9A-Za-z_-]{11}\?.*?\blist=
)
(
- (?:PL|LL|EC|UU|FL|RD|UL|TL)?[0-9A-Za-z-_]{10,}
+
(?:PL|LL|EC|UU|FL|RD|UL|TL|OLAK5uy_)?[0-9A-Za-z-_]{10,}
# Top tracks, they can also include dots
|(?:MC)[\w\.]*
)
@@ -2261,6 +2261,10 @@
}, {
'url': 'TLGGrESM50VT6acwMjAyMjAxNw',
'only_matching': True,
+ }, {
+ # music album playlist
+ 'url': 'OLAK5uy_m4xAFdmMC5rX3Ji3g93pQe3hqLZw_9LhM',
+ 'only_matching': True,
}]
def _real_initialize(self):
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-08-21 21:32:14.000000000
+0200
+++ new/youtube-dl/youtube_dl/version.py 2018-08-27 22:10:06.000000000
+0200
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-__version__ = '2018.08.22'
+__version__ = '2018.08.28'
