projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bilibili] Extract multipart videos (closes #3250)
[youtube-dl]
/
youtube_dl
/
extractor
/
swrmediathek.py
diff --git
a/youtube_dl/extractor/swrmediathek.py
b/youtube_dl/extractor/swrmediathek.py
index 6c688c5202804986b6a0d6d154cb986e18789073..58073eefeffc0f3ebc244a6087cad36662940228 100644
(file)
--- a/
youtube_dl/extractor/swrmediathek.py
+++ b/
youtube_dl/extractor/swrmediathek.py
@@
-8,7
+8,7
@@
from ..utils import parse_duration
class SWRMediathekIE(InfoExtractor):
class SWRMediathekIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?swrmediathek\.de/player\.htm\?show=(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'
+ _VALID_URL = r'https?://(?:www\.)?swrmediathek\.de/
(?:content/)?
player\.htm\?show=(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'
_TESTS = [{
'url': 'http://swrmediathek.de/player.htm?show=849790d0-dab8-11e3-a953-0026b975f2e6',
_TESTS = [{
'url': 'http://swrmediathek.de/player.htm?show=849790d0-dab8-11e3-a953-0026b975f2e6',
@@
-80,7
+80,7
@@
class SWRMediathekIE(InfoExtractor):
if media_type == 'Video':
fmt.update({
if media_type == 'Video':
fmt.update({
- 'format_note': ['144p', '288p', '544p'
][quality-
1],
+ 'format_note': ['144p', '288p', '544p'
, '720p'][quality -
1],
'vcodec': codec,
})
elif media_type == 'Audio':
'vcodec': codec,
})
elif media_type == 'Audio':
@@
-101,4
+101,4
@@
class SWRMediathekIE(InfoExtractor):
'uploader': attr['channel_title'],
'uploader_id': attr['channel_idkey'],
'formats': formats,
'uploader': attr['channel_title'],
'uploader_id': attr['channel_idkey'],
'formats': formats,
- }
\ No newline at end of file
+ }