Jellyfin
/
jellyfin-kodi
mirror of https://github.com/jellyfin/jellyfin-kodi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #515 from venomousZealot/patch-1 

Allow multiple subtitles with identical names
This commit is contained in:
mcarlton00 2021-05-08 17:56:52 -04:00 committed by GitHub
parent 3804447c48 8870d772a8
commit aad222b603
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jellyfin_kodi/helper/playutils.py
View File

@ -5,7 +5,6 @@ from __future__ import division, absolute_import, print_function, unicode_litera
import os
from uuid import uuid4
import collections
from kodi_six import xbmc, xbmcvfs
@ -566,8 +565,8 @@ class PlayUtils(object):
IsTextSubtitleStream if true, is available to download from server.
'''
prefs = ""
audio_streams = collections.OrderedDict()
subs_streams = collections.OrderedDict()
audio_streams = list()
subs_streams = list()
streams = source['MediaStreams']
server_settings = self.api_client.get_transcode_settings()
@ -580,9 +579,7 @@ class PlayUtils(object):
if stream_type == 'Audio':
track = stream['DisplayTitle']
audio_streams[track] = index
audio_streams.append(index)
elif stream_type == 'Subtitle':
if stream['IsExternal']:
@ -593,24 +590,25 @@ class PlayUtils(object):
if not avail_for_extraction and not allow_burned_subs:
continue
track = stream['DisplayTitle']
subs_streams[track] = index
subs_streams.append(index)
skip_dialog = int(settings('skipDialogTranscode') or 0)
audio_selected = None
def get_track_title(track_index):
return streams[track_index]['DisplayTitle'] or ("Track %s" % track_index)
if audio:
audio_selected = audio
elif skip_dialog in (0, 1):
if len(audio_streams) > 1:
selection = list(audio_streams.keys())
selection = list(map(get_track_title, audio_streams))
resp = dialog("select", translate(33013), selection)
audio_selected = audio_streams[selection[resp]] if resp > -1 else source['DefaultAudioStreamIndex']
else: # Only one choice
audio_selected = audio_streams[next(iter(audio_streams))]
audio_selected = audio_streams[resp] if resp > -1 else source['DefaultAudioStreamIndex']
elif len(audio_streams) > 0: # Only one choice
audio_selected = audio_streams[0]
else:
audio_selected = source['DefaultAudioStreamIndex']
@ -632,11 +630,11 @@ class PlayUtils(object):
elif skip_dialog in (0, 2) and len(subs_streams):
selection = list(['No subtitles']) + list(subs_streams.keys())
resp = dialog("select", translate(33014), selection)
selection = list(['No subtitles']) + list(map(get_track_title, subs_streams))
resp = dialog("select", translate(33014), selection) - 1
if resp:
index = subs_streams[selection[resp]] if resp > -1 else source.get('DefaultSubtitleStreamIndex')
index = subs_streams[resp] if resp > -1 else source.get('DefaultSubtitleStreamIndex')
if index is not None: