projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e034cbc
)
[pluralsight] Fix subtitles conversion (closes #10990)
author
Sergey M․
<dstftw@gmail.com>
Sat, 22 Oct 2016 14:15:39 +0000
(21:15 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 22 Oct 2016 14:15:39 +0000
(21:15 +0700)
youtube_dl/extractor/pluralsight.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/pluralsight.py
b/youtube_dl/extractor/pluralsight.py
index 2683c0a728ff7619927383498d1b1bd46237872a..0ffd41ecd3b73bdaaba3b27cd1638cdf0383103e 100644
(file)
--- a/
youtube_dl/extractor/pluralsight.py
+++ b/
youtube_dl/extractor/pluralsight.py
@@
-11,6
+11,7
@@
from ..compat import (
compat_urlparse,
)
from ..utils import (
compat_urlparse,
)
from ..utils import (
+ dict_get,
ExtractorError,
float_or_none,
int_or_none,
ExtractorError,
float_or_none,
int_or_none,
@@
-119,14
+120,17
@@
class PluralsightIE(PluralsightBaseIE):
@staticmethod
def _convert_subtitles(duration, subs):
srt = ''
@staticmethod
def _convert_subtitles(duration, subs):
srt = ''
+ TIME_OFFSET_KEYS = ('displayTimeOffset', 'DisplayTimeOffset')
+ TEXT_KEYS = ('text', 'Text')
for num, current in enumerate(subs):
current = subs[num]
for num, current in enumerate(subs):
current = subs[num]
- start, text = float_or_none(
- current.get('DisplayTimeOffset')), current.get('Text')
+ start, text = (
+ float_or_none(dict_get(current, TIME_OFFSET_KEYS)),
+ dict_get(current, TEXT_KEYS))
if start is None or text is None:
continue
end = duration if num == len(subs) - 1 else float_or_none(
if start is None or text is None:
continue
end = duration if num == len(subs) - 1 else float_or_none(
-
subs[num + 1].get('DisplayTimeOffset'
))
+
dict_get(subs[num + 1], TIME_OFFSET_KEYS
))
if end is None:
continue
srt += os.linesep.join(
if end is None:
continue
srt += os.linesep.join(