R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

universcience 3

Browse Source
This commit is contained in:
flatgreen 2016-08-26 08:31:27 +02:00
parent 85ab99d1f2
commit 0a0c6d27ba
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
youtube_dl/extractor/extractors.py
View File

@ -116,7 +116,6 @@ from .camdemy import (
from .camwithher import CamWithHerIE from .camwithher import CamWithHerIE
from .canalplus import CanalplusIE from .canalplus import CanalplusIE
from .canalc2 import Canalc2IE from .canalc2 import Canalc2IE
from .canalu import CanalUIE
from .canvas import CanvasIE from .canvas import CanvasIE
from .carambatv import ( from .carambatv import (
CarambaTVIE, CarambaTVIE,

4
youtube_dl/extractor/universcience.py
View File

@ -11,6 +11,8 @@ from ..utils import (
update_url_query, update_url_query,
) )
import re
class UniverscienceIE(InfoExtractor): class UniverscienceIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?universcience\.tv/video-.*-(?P<id>[0-9]+)\.html' _VALID_URL = r'https?://(?:www\.)?universcience\.tv/video-.*-(?P<id>[0-9]+)\.html'
@ -64,7 +66,7 @@ class UniverscienceIE(InfoExtractor):
media_width = int_or_none(self._search_regex(r'(\d*) x \d*', media_label, 'width', default=None)) media_width = int_or_none(self._search_regex(r'(\d*) x \d*', media_label, 'width', default=None))
media_height = int_or_none(self._search_regex(r'\d* x (\d*)', media_label, 'height', default=None)) media_height = int_or_none(self._search_regex(r'\d* x (\d*)', media_label, 'height', default=None))
media_label = self._search_regex( media_label = self._search_regex(
r'(.*) (\d* x \d*)', media_label, 'media_label', default=media_label, fatal=False) r'(.*) \d* x \d*', media_label, 'media_label', default=media_label, fatal=False)
if media_label in ('HLS', 'm3u8'): if media_label in ('HLS', 'm3u8'):
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(