Merge pull request #187 from jellyfin/prepare-0.5.3

Prepare for release v0.5.3

.github/tools/reformat_changelog.py

@@ -23,7 +23,7 @@ class SectionType(TypedDict):
 
 def reformat(item_format: str, output_emoji: bool) -> None:
     data = [
-        emojize(x.strip(), use_aliases=True, variant="emoji_type")
+        emojize(x.strip(), variant="emoji_type")
         for x in sys.stdin.readlines()
         if x.strip()
     ]

.github/workflows/build.yaml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python 3.x
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 

.github/workflows/codeql.yaml

@@ -30,7 +30,7 @@ jobs:
           queries: +security-and-quality
 
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.version }}
 

.github/workflows/publish.yaml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python 3.x
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 

.github/workflows/test.yaml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.py_version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.py_version }}
 

release.yaml

@@ -1,8 +1,19 @@
-version: '0.5.2'
+version: '0.5.3'
 changelog: |-
   Bug Fixes
   ---------
-  + Download all external subs when playback starts (#176) @mcarlton00
+  + Fix forced and sdh/cc subtitle not working (#184) @aiosk
+  + Fix performance profiling (#182) @mcarlton00
+  + Allow playback from Info menu (#179) @mcarlton00
+
+  Code or Repo Maintenance
+  ------------------------
+  + Manually decode json responses (#183) @mcarlton00
+
+  CI & build changes
+  ------------------
+  + CI - remove use_aliases from emoji command (#186) @mcarlton00
+  + Bump actions/setup-python from 3 to 4 (#178) @dependabot
 dependencies:
   py2:
     - addon: 'xbmc.python'

resources/language/resource.language.es/strings.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2022-05-17 04:13+0000\n"
-"Last-Translator: José Albano <josealbano@disroot.org>\n"
+"PO-Revision-Date: 2022-07-06 13:22+0000\n"
+"Last-Translator: Joaquín Díaz <joac.emi.a.n@gmail.com>\n"
 "Language-Team: Spanish <https://translate.jellyfin.org/projects/jellycon/"
 "jellycon/es/>\n"
 "Language: es\n"
@@ -1089,3 +1089,15 @@ msgstr "Detectada solicitud adicional a reanudar"
 msgctxt "#30260"
 msgid "BoxSets"
 msgstr "Colecciones"
+
+msgctxt "#30444"
+msgid "Login using Quick Connect"
+msgstr "Inicia sesión usando Conexión Rápida"
+
+msgctxt "#30443"
+msgid "Quick Connect"
+msgstr "Conexión rápida"
+
+msgctxt "#30323"
+msgid "Artists"
+msgstr "Artistas"

resources/language/resource.language.fr/strings.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2022-05-20 04:22+0000\n"
-"Last-Translator: MoFanFr <hennebelle.benoit@gmail.com>\n"
+"PO-Revision-Date: 2022-07-06 13:22+0000\n"
+"Last-Translator: Thomas Schwery <thomas@inf3.ch>\n"
 "Language-Team: French <https://translate.jellyfin.org/projects/jellycon/"
 "jellycon/fr/>\n"
 "Language: fr\n"
@@ -169,10 +169,9 @@ msgctxt "#30210"
 msgid "HTTP direct stream"
 msgstr "Stream direct HTTP"
 
-#, fuzzy
 msgctxt "#30208"
 msgid "Max stream bitrate (Kbits)"
-msgstr "Bitrate maximum du flux (Kbps)"
+msgstr "Débit maximum du flux (Kbps)"
 
 msgctxt "#30207"
 msgid "Playback"
@@ -734,17 +733,14 @@ msgctxt "#30349"
 msgid " - Recently Played"
 msgstr "- Lus récemment"
 
-#, fuzzy
 msgctxt "#30347"
 msgid "Getting Existing Images"
 msgstr "Récupération des images existantes"
 
-#, fuzzy
 msgctxt "#30346"
 msgid "Deleteing Cached Images"
 msgstr "Suppression des images en cache"
 
-#, fuzzy
 msgctxt "#30345"
 msgid "Cache Jellyfin server data requests"
 msgstr "Garder les requêtes de données serveur de Jellyfin en cache"
@@ -761,7 +757,6 @@ msgctxt "#30322"
 msgid "Auto resume"
 msgstr "Reprise automatique"
 
-#, fuzzy
 msgctxt "#30314"
 msgid "Play"
 msgstr "Lecture"
@@ -899,31 +894,58 @@ msgctxt "#30126"
 msgid "Processing Item : "
 msgstr "Traitement de l'élément :"
 
-#, fuzzy
 msgctxt "#30356"
 msgid "Loading existing image list"
 msgstr "Chargement de la liste des images existantes"
 
-#, fuzzy
 msgctxt "#30354"
 msgid "Go To Series"
-msgstr "Voir les  Séries"
+msgstr "Voir les Séries"
 
 #, fuzzy
 msgctxt "#30319"
 msgid "Music - All Album Artists"
-msgstr "Musique - Tous les Albums par Artistes"
+msgstr "Musique - Tous les Artistes d'album"
 
-#, fuzzy
 msgctxt "#30343"
 msgid "Changes Require Kodi Restart"
-msgstr "Les modifications nécessite le redémarrage de Kodi"
+msgstr "Les modifications nécessitent le redémarrage de Kodi"
 
-#, fuzzy
 msgctxt "#30341"
 msgid "Background image update interval (0 = disabled)"
-msgstr "Intervalle de mise à jours des imades en arrière plan (0=désactivé)"
+msgstr "Intervalle de mise à jour des images en arrière plan (0=désactivé)"
 
 msgctxt "#30333"
 msgid "Cache artwork in the background"
 msgstr "Mise en cache des illustrations en arrière plan"
+
+msgctxt "#30366"
+msgid "Manually enter user details"
+msgstr "Renseigner manuellement les détails utilisateurs"
+
+#, fuzzy
+msgctxt "#30359"
+msgid "Building full image list"
+msgstr "Construction de la liste complète des images"
+
+msgctxt "#30358"
+msgid "Retreiving remote image list"
+msgstr "Récupération de la liste des images distantes"
+
+msgctxt "#30357"
+msgid "Processing existing image list"
+msgstr "Traitement de la liste des images existantes"
+
+#, fuzzy
+msgctxt "#30355"
+msgid "Kodi Settings->Services->Allow remote control via HTTP"
+msgstr "Paramètres de Kodi->Services->Autoriser le contrôle à distance par HTTP"
+
+#, fuzzy
+msgctxt "#30348"
+msgid "Add user ratings"
+msgstr "Ajouter une note"
+
+msgctxt "#30323"
+msgid "Artists"
+msgstr "Artistes"

resources/language/resource.language.it/strings.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2021-12-02 18:05+0000\n"
-"Last-Translator: Alfonso Scarpino <alfonso.scarpino@gmail.com>\n"
+"PO-Revision-Date: 2022-06-28 13:22+0000\n"
+"Last-Translator: Michele Fattoruso <michele.fattoruso@gmail.com>\n"
 "Language-Team: Italian <https://translate.jellyfin.org/projects/jellycon/"
 "jellycon/it/>\n"
 "Language: it\n"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.5.2\n"
+"X-Generator: Weblate 4.10.1\n"
 
 msgctxt "#30120"
 msgid "Show load progress"
@@ -97,7 +97,7 @@ msgstr "Avanzate"
 
 msgctxt "#30021"
 msgid "Show all episodes item"
-msgstr "Mostra elemento tutti gli episodi"
+msgstr "Mostra tutti gli episodi"
 
 msgctxt "#30020"
 msgid "Flatten single season"
@@ -426,3 +426,18 @@ msgstr "Percorso diretto del file"
 msgctxt "#30208"
 msgid "Max stream bitrate (Kbits)"
 msgstr "Bitrate massimo del flusso (Kbits)"
+
+msgctxt "#30277"
+msgid "JellyCon needs to prompt for resume on partily played items, Kodi can also prompt, this can cause a double prompt. Do you want to remove the double prompt?"
+msgstr ""
+"JellyCon richiede una finestra per continuare la riproduzione di elementi, "
+"anche Kodi può  richiedere una finestra, causando lapertura di una doppia "
+"finestra. Vuoi rimuovere la doppia finestra?"
+
+msgctxt "#30213"
+msgid "Video force 8 bit"
+msgstr "Forza video 8 bit"
+
+msgctxt "#30114"
+msgid "Jump back seconds"
+msgstr "Riavvolgi secondi"

resources/language/resource.language.pl/strings.po

@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2021-12-13 17:05+0000\n"
+"PO-Revision-Date: 2022-06-28 13:22+0000\n"
 "Last-Translator: Marcin Woliński <cierdek@gmail.com>\n"
 "Language-Team: Polish <https://translate.jellyfin.org/projects/jellycon/"
 "jellycon/pl/>\n"
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.5.2\n"
+"X-Generator: Weblate 4.10.1\n"
 
 msgctxt "#30313"
 msgid "Menu"
@@ -1089,3 +1089,15 @@ msgstr "Odtwórz kinowe intro"
 msgctxt "#30437"
 msgid "Playback options"
 msgstr "Opcje odtwarzania"
+
+msgctxt "#30444"
+msgid "Login using Quick Connect"
+msgstr "Zaloguj używając Szybkiego Połączenia"
+
+msgctxt "#30443"
+msgid "Quick Connect"
+msgstr "Szybkie połączenie"
+
+msgctxt "#30323"
+msgid "Artists"
+msgstr "Artyści"

resources/language/resource.language.zh_Hans/strings.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2022-03-04 12:13+0000\n"
-"Last-Translator: 小造xu_zh <ngc7331@outlook.com>\n"
+"PO-Revision-Date: 2022-06-20 16:22+0000\n"
+"Last-Translator: wolong gl <wolong98@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://translate.jellyfin.org/projects/"
 "jellycon/jellycon/zh_Hans/>\n"
 "Language: zh_Hans\n"
@@ -1082,3 +1082,15 @@ msgstr "端口"
 msgctxt "#30000"
 msgid "Host"
 msgstr "主机"
+
+msgctxt "#30444"
+msgid "Login using Quick Connect"
+msgstr "使用 Quick Connect 登录"
+
+msgctxt "#30443"
+msgid "Quick Connect"
+msgstr "Quick Connect"
+
+msgctxt "#30323"
+msgid "Artists"
+msgstr "艺术家"

resources/lib/functions.py

@@ -153,14 +153,14 @@ def main_entry_point():
 
         file_time_stamp = time.strftime("%Y%m%d-%H%M%S")
         tab_file_name = __addondir__ + "profile(" + file_time_stamp + ").txt"
-        s = StringIO.StringIO()
+        s = StringIO()
         ps = pstats.Stats(pr, stream=s)
         ps = ps.sort_stats('cumulative')
         ps.print_stats()
         ps.strip_dirs()
         ps = ps.sort_stats('tottime')
         ps.print_stats()
-        with open(tab_file_name, 'wb') as f:
+        with open(tab_file_name, 'w') as f:
             f.write(s.getvalue())
 
     log.debug("===== JellyCon FINISHED =====")

resources/lib/jellyfin.py

@@ -4,6 +4,7 @@ import xbmcaddon
 from kodi_six.utils import py2_decode
 
 import requests
+import json
 
 from .utils import get_device_id, get_version, load_user_details
 from .lazylogger import LazyLogger
@@ -36,7 +37,17 @@ class API:
 
         r = requests.get(url, headers=self.headers, verify=self.verify_cert)
         try:
-            response_data = r.json()
+            try:
+                '''
+                The requests library defaults to using simplejson to handle
+                json decoding.  On low power devices and using Py3, this is
+                significantly slower than the builtin json library.  Skip that
+                and just parse the json ourselves.  Fall back to using
+                requests/simplejson if there's a parsing error.
+                '''
+                response_data = json.loads(r.text)
+            except ValueError:
+                response_data = r.json()
         except:
             response_data = {}
         return response_data
@@ -49,7 +60,11 @@ class API:
 
         r = requests.post(url, json=payload, headers=self.headers, verify=self.verify_cert)
         try:
-            response_data = r.json()
+            try:
+                # Much faster on low power devices, see above comment
+                response_data = json.loads(r.text)
+            except ValueError:
+                response_data = r.json()
         except:
             response_data = {}
         return response_data

resources/lib/play_utils.py

@@ -5,12 +5,14 @@ import xbmc
 import xbmcgui
 import xbmcaddon
 import xbmcvfs
+import xbmcplugin
 
 from datetime import timedelta
 import json
 import os
 import re
 from six.moves.urllib.parse import urlencode
+import sys
 
 from .jellyfin import api
 from .lazylogger import LazyLogger
@@ -414,7 +416,7 @@ def play_file(play_info):
     display_options["addSubtitleAvailable"] = False
     display_options["addUserRatings"] = False
 
-    gui_item = add_gui_item("", item_details, display_options, False)
+    gui_item = add_gui_item(item_id, item_details, display_options, False)
     list_item = gui_item[1]
 
     if playback_type == "2":  # if transcoding then prompt for audio and subtitle
@@ -454,12 +456,17 @@ def play_file(play_info):
     if len(intro_items) > 0:
         playlist = play_all_files(intro_items, play_items=False)
         playlist.add(playurl, list_item)
+        player.play(playlist)
     else:
-        playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
-        playlist.clear()
-        playlist.add(playurl, list_item)
-
-    player.play(playlist)
+        if sys.argv[1] > 1:
+            # Play from "Info" screen
+            xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, list_item)
+        else:
+            # Play from menu.  Doesn't have a handle, so need to call player directly
+            playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
+            playlist.clear()
+            playlist.add(playurl, list_item)
+            player.play(playlist)
 
     if seek_time != 0:
         player.pause()
@@ -841,6 +848,13 @@ def external_subs(media_source, list_item, item_id):
             source_id = media_source['Id']
 
             language = stream.get('Language', '')
+            if language and stream['IsDefault']:
+                language = '{}.default'.format(language)
+            if language and stream['IsForced']:
+                language = '{}.forced'.format(language)
+            is_sdh = stream.get('Title') and stream['Title'] in ('sdh', 'cc')
+            if language and is_sdh:
+                language = '{}.{}'.format(language, stream['Title'])
             codec = stream.get('Codec', '')
 
             url = '{}{}'.format(server, stream.get('DeliveryUrl'))
@@ -856,14 +870,7 @@ def external_subs(media_source, list_item, item_id):
                 # If there is no language defined, we can go directly to the server
                 subtitle_file = url
 
-            default = ""
-            if stream['IsDefault']:
-                default = "default"
-            forced = ""
-            if stream['IsForced']:
-                forced = "forced"
-
-            sub_name = '{} ( {} ) {} {}'.format(language, codec, default, forced)
+            sub_name = '{} ( {} )'.format(language, codec)
 
             sub_names.append(sub_name)
             externalsubs.append(subtitle_file)