From 7b7502fa2fdacfe3b0f8f2b246a062d0ea336aca Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 19 Dec 2020 17:07:16 -0500 Subject: [PATCH] Show proper language names for external subs --- resources/lib/play_utils.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/resources/lib/play_utils.py b/resources/lib/play_utils.py index 6470903..adb9118 100644 --- a/resources/lib/play_utils.py +++ b/resources/lib/play_utils.py @@ -853,12 +853,15 @@ def external_subs(media_source, list_item, item_id): source_id = media_source['Id'] server = download_utils.get_server() token = download_utils.authenticate() + language = stream.get('Language', '') + codec = stream.get('Codec', '') - if stream.get('DeliveryUrl', '').lower().startswith('/videos'): - url = "%s%s" % (server, stream.get('DeliveryUrl')) + url_root = '{}/Videos/{}/{}/Subtitles/{}'.format(server, item_id, source_id, index) + if language: + url = '{}/Stream.{}.{}?api_key={}'.format( + url_root, language, codec, token) else: - url = ("%s/Videos/%s/%s/Subtitles/%s/Stream.%s?api_key=%s" - % (server, item_id, source_id, index, stream['Codec'], token)) + url = '{}/Stream.{}?api_key={}'.format(url_root, codec, token) default = "" if stream['IsDefault']: @@ -867,7 +870,7 @@ def external_subs(media_source, list_item, item_id): if stream['IsForced']: forced = "forced" - sub_name = stream.get('Language', "n/a") + " (" + stream.get('Codec', "n/a") + ") " + default + " " + forced + sub_name = '{} ( {} ) {} {}'.format(language, codec, default, forced) sub_names.append(sub_name) externalsubs.append(url)