mirror of
https://github.com/l1ving/youtube-dl
synced 2024-12-21 17:07:49 +08:00
Merge branch 'master' of github.com:rg3/youtube-dl
This commit is contained in:
parent
a6620ac28d
commit
da4d4191a9
@ -20,7 +20,7 @@ IGNORED_FILES = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
from helper import assertRegexpMatches
|
from test.helper import assertRegexpMatches
|
||||||
|
|
||||||
|
|
||||||
class TestUnicodeLiterals(unittest.TestCase):
|
class TestUnicodeLiterals(unittest.TestCase):
|
||||||
|
@ -233,6 +233,7 @@ class F4mFD(FileDownloader):
|
|||||||
'continuedl': True,
|
'continuedl': True,
|
||||||
'quiet': True,
|
'quiet': True,
|
||||||
'noprogress': True,
|
'noprogress': True,
|
||||||
|
'ratelimit': self.params.get('ratelimit', None),
|
||||||
'test': self.params.get('test', False),
|
'test': self.params.get('test', False),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
@ -7,6 +7,8 @@ import json
|
|||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
ExtractorError,
|
ExtractorError,
|
||||||
|
xpath_text,
|
||||||
|
float_or_none,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -128,7 +130,8 @@ class AdultSwimIE(InfoExtractor):
|
|||||||
segment_url, segment_title,
|
segment_url, segment_title,
|
||||||
'Downloading segment information', 'Unable to download segment information')
|
'Downloading segment information', 'Unable to download segment information')
|
||||||
|
|
||||||
segment_duration = idoc.find('.//trt').text.strip()
|
segment_duration = float_or_none(
|
||||||
|
xpath_text(idoc, './/trt', 'segment duration').strip())
|
||||||
|
|
||||||
formats = []
|
formats = []
|
||||||
file_els = idoc.findall('.//files/file')
|
file_els = idoc.findall('.//files/file')
|
||||||
|
@ -209,7 +209,7 @@ class BBCCoUkIE(SubtitlesInfoExtractor):
|
|||||||
webpage = self._download_webpage(url, group_id, 'Downloading video page')
|
webpage = self._download_webpage(url, group_id, 'Downloading video page')
|
||||||
|
|
||||||
programme_id = self._search_regex(
|
programme_id = self._search_regex(
|
||||||
r'"vpid"\s*:\s*"([\da-z]{8})"', webpage, 'vpid', fatal=False)
|
r'"vpid"\s*:\s*"([\da-z]{8})"', webpage, 'vpid', fatal=False, default=None)
|
||||||
if programme_id:
|
if programme_id:
|
||||||
player = self._download_json(
|
player = self._download_json(
|
||||||
'http://www.bbc.co.uk/iplayer/episode/%s.json' % group_id,
|
'http://www.bbc.co.uk/iplayer/episode/%s.json' % group_id,
|
||||||
|
Loading…
Reference in New Issue
Block a user