Merge pull request #1215 from croneter/fix-subtitle-download
Fix playback failing due to caching of subtitles with non-ascii chars
This commit is contained in:
commit
249c0993e2
1 changed files with 13 additions and 4 deletions
|
@ -261,10 +261,19 @@ class Media(object):
|
||||||
if int(stream.get('streamType')) != 3 or 'key' not in stream.attrib:
|
if int(stream.get('streamType')) != 3 or 'key' not in stream.attrib:
|
||||||
# Not a subtitle or not not an external subtitle
|
# Not a subtitle or not not an external subtitle
|
||||||
continue
|
continue
|
||||||
path = self.download_external_subtitles(
|
try:
|
||||||
'{server}%s' % stream.get('key'),
|
path = self.download_external_subtitles(
|
||||||
stream.get('displayTitle'),
|
'{server}%s' % stream.get('key'),
|
||||||
stream.get('codec'))
|
stream.get('displayTitle'),
|
||||||
|
stream.get('codec'))
|
||||||
|
except IOError:
|
||||||
|
# Catch "IOError: [Errno 22] invalid mode ('wb') or filename"
|
||||||
|
# Due to stream.get('displayTitle') returning chars that our
|
||||||
|
# OS is not supporting, e.g. "српски језик (SRT External)"
|
||||||
|
path = self.download_external_subtitles(
|
||||||
|
'{server}%s' % stream.get('key'),
|
||||||
|
stream.get('languageCode', 'Unknown'),
|
||||||
|
stream.get('codec'))
|
||||||
if path:
|
if path:
|
||||||
externalsubs.append(path)
|
externalsubs.append(path)
|
||||||
LOG.info('Found external subs: %s', externalsubs)
|
LOG.info('Found external subs: %s', externalsubs)
|
||||||
|
|
Loading…
Reference in a new issue