projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[sbs] Fix extraction (Closes #5725)
[youtube-dl]
/
youtube_dl
/
extractor
/
kanalplay.py
diff --git
a/youtube_dl/extractor/kanalplay.py
b/youtube_dl/extractor/kanalplay.py
index 772d5aca49eadf120eea5b3b936832960ad982e3..4597d1b961a0fcae8137d3ec919fc2ce6ac31777 100644
(file)
--- a/
youtube_dl/extractor/kanalplay.py
+++ b/
youtube_dl/extractor/kanalplay.py
@@
-7,6
+7,7
@@
from .common import InfoExtractor
from ..utils import (
ExtractorError,
float_or_none,
from ..utils import (
ExtractorError,
float_or_none,
+ srt_subtitles_timecode,
)
)
@@
-15,14
+16,17
@@
class KanalPlayIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?kanal(?P<channel_id>5|9|11)play\.se/(?:#!/)?(?:play/)?program/\d+/video/(?P<id>\d+)'
_TESTS = [{
'url': 'http://www.kanal5play.se/#!/play/program/3060212363/video/3270012277',
_VALID_URL = r'https?://(?:www\.)?kanal(?P<channel_id>5|9|11)play\.se/(?:#!/)?(?:play/)?program/\d+/video/(?P<id>\d+)'
_TESTS = [{
'url': 'http://www.kanal5play.se/#!/play/program/3060212363/video/3270012277',
- 'md5': '',
'info_dict': {
'info_dict': {
- 'id': '
2609989
',
+ 'id': '
3270012277
',
'ext': 'flv',
'title': 'Saknar både dusch och avlopp',
'ext': 'flv',
'title': 'Saknar både dusch och avlopp',
- 'description': 'md5:',
+ 'description': 'md5:
6023a95832a06059832ae93bc3c7efb7
',
'duration': 2636.36,
},
'duration': 2636.36,
},
+ 'params': {
+ # rtmp download
+ 'skip_download': True,
+ }
}, {
'url': 'http://www.kanal9play.se/#!/play/program/335032/video/246042',
'only_matching': True,
}, {
'url': 'http://www.kanal9play.se/#!/play/program/335032/video/246042',
'only_matching': True,
@@
-36,8
+40,8
@@
class KanalPlayIE(InfoExtractor):
'%s\r\n%s --> %s\r\n%s'
% (
num,
'%s\r\n%s --> %s\r\n%s'
% (
num,
- s
elf.
_subtitles_timecode(item['startMillis'] / 1000.0),
- s
elf.
_subtitles_timecode(item['endMillis'] / 1000.0),
+ s
rt
_subtitles_timecode(item['startMillis'] / 1000.0),
+ s
rt
_subtitles_timecode(item['endMillis'] / 1000.0),
item['text'],
) for num, item in enumerate(subs, 1))
item['text'],
) for num, item in enumerate(subs, 1))