Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2025-02-26 05:57:53 +01:00
Code Issues Releases Wiki Activity

[ruv] Fix extractor

Browse Source
This commit is contained in:
Einar Jonsson 2019-01-18 17:24:13 +00:00
parent 79fec976b0
commit d2d2df03df
1 changed files with 52 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
youtube_dl/extractor/ruv.py
View File

@ -1,52 +1,66 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
determine_ext, determine_ext,
unified_timestamp, unified_timestamp,
int_or_none,
) )
class RuvIE(InfoExtractor): class RuvIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?ruv\.is/(?:sarpurinn/[^/]+|node)/(?P<id>[^/]+(?:/\d+)?)' _VALID_URL = r'https?://(?:www\.)?ruv\.is/(?:spila/[^/]+|node)/(?P<id>[^/]+(?:/\d+)?)'
_TESTS = [{ _TESTS = [{
# m3u8 # m3u8
'url': 'http://ruv.is/sarpurinn/ruv-aukaras/fh-valur/20170516', 'url': 'http://www.ruv.is/spila/ruv/ferdastiklur/20190106',
'md5': '66347652f4e13e71936817102acc1724', 'md5': '26ba808bf9690f6f87c1469f6b6db8ab',
'info_dict': { 'info_dict': {
'id': '1144499', 'id': '1338199',
'display_id': 'fh-valur/20170516', 'display_id': 'ferdastiklur/20190106',
'ext': 'mp4', 'ext': 'mp4',
'title': 'FH - Valur', 'title': 'Ferðastiklur',
'description': 'Bein útsending frá 3. leik FH og Vals í úrslitum Olísdeildar karla í handbolta.', 'episode_number': 1,
'timestamp': 1494963600, 'description': 'md5:775b811c7cd3d7bf1509d5a4ff5edbcb',
'upload_date': '20170516', 'timestamp': 1546803900,
'upload_date': '20190106',
},
}, {
# m3u8
# No episode number
'url': 'http://www.ruv.is/spila/ruv/vedur/20190117',
'md5': '41cee6ef9c62955bba90b60f78a7de34',
'info_dict': {
'id': '1341887',
'display_id': 'vedur/20190117',
'ext': 'mp4',
'title': 'Veður',
'timestamp': 1547753400,
'upload_date': '20190117',
}, },
}, { }, {
# mp3 # mp3
'url': 'http://ruv.is/sarpurinn/ras-2/morgunutvarpid/20170619', 'url': 'http://www.ruv.is/spila/ras-1/i-ljosi-sogunnar/20190111',
'md5': '395ea250c8a13e5fdb39d4670ef85378', 'md5': 'dbee43b6d480499421a37f65910d81b4',
'info_dict': { 'info_dict': {
'id': '1153630', 'id': '1351187',
'display_id': 'morgunutvarpid/20170619', 'display_id': 'i-ljosi-sogunnar/20190111',
'ext': 'mp3', 'ext': 'mp3',
'title': 'Morgunútvarpið', 'title': 'Í ljósi sögunnar',
'description': 'md5:a4cf1202c0a1645ca096b06525915418', 'description': 'md5:f79146f1737e21046b4f497ffd8c01b5',
'timestamp': 1497855000, 'timestamp': 1547197500,
'upload_date': '20170619', 'upload_date': '20190111',
}, },
}, { }, {
'url': 'http://ruv.is/sarpurinn/ruv/frettir/20170614', 'url': 'http://www.ruv.is/spila/ruv/frettir/20190117',
'only_matching': True, 'only_matching': True,
}, { }, {
'url': 'http://www.ruv.is/node/1151854', 'url': 'http://www.ruv.is/node/1341894',
'only_matching': True, 'only_matching': True,
}, { }, {
'url': 'http://ruv.is/sarpurinn/klippa/secret-soltice-hefst-a-morgun', 'url': 'http://www.ruv.is/spila/ras-1/lestin/20190117',
'only_matching': True,
}, {
'url': 'http://ruv.is/sarpurinn/ras-1/morgunvaktin/20170619',
'only_matching': True, 'only_matching': True,
}] }]
@ -57,10 +71,22 @@ class RuvIE(InfoExtractor):
title = self._og_search_title(webpage) title = self._og_search_title(webpage)
FIELD_RE = r'video\.%s\s*=\s*(["\'])(?P<url>(?:(?!\1).)+)\1' episode = int_or_none(self._html_search_regex(
r'<h3[^>].+\((\d+)+\s*\w{2}\s*\d+\)',
webpage,
'episode number',
default=None,
))
FIELD_RE = r'sources{0}\[(?:.*src{0}(["\'])(?P<url>(?:(?!\1).)+)\1.*\])'
media_url = self._html_search_regex( media_url = self._html_search_regex(
FIELD_RE % 'src', webpage, 'video URL', group='url') FIELD_RE.format('\\s*:\\s*'),
webpage,
'video URL',
group='url',
flags=re.DOTALL,
)
video_id = self._search_regex( video_id = self._search_regex(
r'<link\b[^>]+\bhref=["\']https?://www\.ruv\.is/node/(\d+)', r'<link\b[^>]+\bhref=["\']https?://www\.ruv\.is/node/(\d+)',
@ -98,4 +124,5 @@ class RuvIE(InfoExtractor):
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'timestamp': timestamp, 'timestamp': timestamp,
'formats': formats, 'formats': formats,
'episode_number': episode,
} }