mirror of
https://codeberg.org/polarisfm/youtube-dl.git
synced 2024-12-24 16:51:36 +00:00
[laola1tv] Improve extraction and update test case (#3742)
This commit is contained in:
parent
ffdf972b91
commit
3037b91e05
1 changed files with 31 additions and 16 deletions
|
@ -1,23 +1,26 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import random
|
import random
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import ExtractorError
|
from ..utils import (
|
||||||
|
ExtractorError,
|
||||||
|
xpath_text,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class Laola1TvIE(InfoExtractor):
|
class Laola1TvIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:www\.)?laola1\.tv/(?P<lang>[a-z]+)-(?P<portal>[a-z]+)/.*?/(?P<id>[0-9]+)\.html'
|
_VALID_URL = r'https?://(?:www\.)?laola1\.tv/(?P<lang>[a-z]+)-(?P<portal>[a-z]+)/.*?/(?P<id>[0-9]+)\.html'
|
||||||
_TEST = {
|
_TEST = {
|
||||||
'url': 'http://www.laola1.tv/de-de/live/bwf-bitburger-open-grand-prix-gold-court-1/250019.html',
|
'url': 'http://www.laola1.tv/de-de/video/straubing-tigers-koelner-haie/227883.html',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '250019',
|
'id': '227883',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Bitburger Open Grand Prix Gold - Court 1',
|
'title': 'Straubing Tigers - Kölner Haie',
|
||||||
'categories': ['Badminton'],
|
'categories': ['Eishockey'],
|
||||||
'uploader': 'BWF - Badminton World Federation',
|
'is_live': False,
|
||||||
'is_live': True,
|
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
|
@ -43,15 +46,26 @@ class Laola1TvIE(InfoExtractor):
|
||||||
r'flashvars\.([_a-zA-Z0-9]+)\s*=\s*"([^"]*)";', iframe)
|
r'flashvars\.([_a-zA-Z0-9]+)\s*=\s*"([^"]*)";', iframe)
|
||||||
flashvars = dict((m[0], m[1]) for m in flashvars_m)
|
flashvars = dict((m[0], m[1]) for m in flashvars_m)
|
||||||
|
|
||||||
|
partner_id = self._search_regex(
|
||||||
|
'partnerid\s*:\s*"([^"]+)"', iframe, 'partner id')
|
||||||
|
|
||||||
xml_url = ('http://www.laola1.tv/server/hd_video.php?' +
|
xml_url = ('http://www.laola1.tv/server/hd_video.php?' +
|
||||||
'play=%s&partner=1&portal=%s&v5ident=&lang=%s' % (
|
'play=%s&partner=%s&portal=%s&v5ident=&lang=%s' % (
|
||||||
video_id, portal, lang))
|
video_id, partner_id, portal, lang))
|
||||||
hd_doc = self._download_xml(xml_url, video_id)
|
hd_doc = self._download_xml(xml_url, video_id)
|
||||||
|
|
||||||
title = hd_doc.find('.//video/title').text
|
title = xpath_text(hd_doc, './/video/title', fatal=True)
|
||||||
flash_url = hd_doc.find('.//video/url').text
|
flash_url = xpath_text(hd_doc, './/video/url', fatal=True)
|
||||||
categories = hd_doc.find('.//video/meta_sports').text.split(',')
|
uploader = xpath_text(hd_doc, './/video/meta_organistation')
|
||||||
uploader = hd_doc.find('.//video/meta_organistation').text
|
|
||||||
|
is_live = xpath_text(hd_doc, './/video/islive') == 'true'
|
||||||
|
if is_live:
|
||||||
|
raise ExtractorError(
|
||||||
|
'Live streams are not supported by the f4m downloader.')
|
||||||
|
|
||||||
|
categories = xpath_text(hd_doc, './/video/meta_sports')
|
||||||
|
if categories:
|
||||||
|
categories = categories.split(',')
|
||||||
|
|
||||||
ident = random.randint(10000000, 99999999)
|
ident = random.randint(10000000, 99999999)
|
||||||
token_url = '%s&ident=%s&klub=0&unikey=0×tamp=%s&auth=%s' % (
|
token_url = '%s&ident=%s&klub=0&unikey=0×tamp=%s&auth=%s' % (
|
||||||
|
@ -60,15 +74,16 @@ class Laola1TvIE(InfoExtractor):
|
||||||
token_doc = self._download_xml(
|
token_doc = self._download_xml(
|
||||||
token_url, video_id, note='Downloading token')
|
token_url, video_id, note='Downloading token')
|
||||||
token_attrib = token_doc.find('.//token').attrib
|
token_attrib = token_doc.find('.//token').attrib
|
||||||
if token_attrib.get('auth') == 'blocked':
|
if token_attrib.get('auth') in ('blocked', 'restricted'):
|
||||||
raise ExtractorError('Token error: ' % token_attrib.get('comment'))
|
raise ExtractorError(
|
||||||
|
'Token error: %s' % token_attrib.get('comment'), expected=True)
|
||||||
|
|
||||||
video_url = '%s?hdnea=%s&hdcore=3.2.0' % (
|
video_url = '%s?hdnea=%s&hdcore=3.2.0' % (
|
||||||
token_attrib['url'], token_attrib['auth'])
|
token_attrib['url'], token_attrib['auth'])
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'is_live': True,
|
'is_live': is_live,
|
||||||
'title': title,
|
'title': title,
|
||||||
'url': video_url,
|
'url': video_url,
|
||||||
'uploader': uploader,
|
'uploader': uploader,
|
||||||
|
|
Loading…
Reference in a new issue