Merge remote-tracking branch 'origin/master' into skip_segments

.github/workflows/publish.yaml

@@ -47,18 +47,18 @@ jobs:
         with:
           switches: -vrptz
           path: '*.zip'
-          remote_path: /srv/repository/incoming/kodi
-          remote_host: ${{ secrets.DEPLOY_HOST }}
-          remote_user: ${{ secrets.DEPLOY_USER }}
-          remote_key: ${{ secrets.DEPLOY_KEY }}
+          remote_path: /srv/incoming/kodi
+          remote_host: ${{ secrets.REPO_HOST }}
+          remote_user: ${{ secrets.REPO_USER }}
+          remote_key: ${{ secrets.REPO_KEY }}
 
       - name: Add to Kodi repo and clean up
         uses: appleboy/ssh-action@v1.2.0
         with:
-          host: ${{ secrets.DEPLOY_HOST  }}
-          username: ${{ secrets.DEPLOY_USER }}
-          key: ${{ secrets.DEPLOY_KEY }}
+          host: ${{ secrets.REPO_HOST  }}
+          username: ${{ secrets.REPO_USER }}
+          key: ${{ secrets.REPO_KEY }}
           script_stop: true
           script: |
-            python3 /usr/local/bin/kodirepo add /srv/repository/incoming/kodi/plugin.video.jellycon+${{ matrix.py_version }}.zip --datadir /srv/repository/releases/client/kodi/${{ matrix.py_version }};
-            rm /srv/repository/incoming/kodi/plugin.video.jellycon+${{ matrix.py_version }}.zip;
+            python3 /usr/local/bin/kodirepo add /srv/incoming/kodi/plugin.video.jellycon+${{ matrix.py_version }}.zip --datadir /srv/repository/main/client/kodi/${{ matrix.py_version }};
+            rm /srv/incoming/kodi/plugin.video.jellycon+${{ matrix.py_version }}.zip;

release.yaml

@@ -1,34 +1,8 @@
-version: '0.8.1'
+version: '0.8.3'
 changelog: |-
-  :tada: New features and improvements
-  ------------------------------------
-  + New Tv Shows menu entry , Totally unwatched Tv Shows entries (#339) @hagaygo
-  + Explicitly request non resumeable episodes on next up widget (#336) @hagaygo
-  + Add setting option to hide item count limit on menu entries (#320) @hagaygo
-  + nicer and kodi's style resume position on resume dialog (#321) @hagaygo
-
-  Bug Fixes
-  ---------
-  + Restore play next without prompt functionality (#362) @abysslynx
-  + Fix youtube addon call for trailer playback (#351) @hagaygo
-
-  Code or Repo Maintenance
-  ------------------------
-  + Remove duplicate line of code (#319) @hagaygo
-
-  :arrow_up: Dependency updates
-  -----------------------------
-  + Update kodistubs requirement from ~=20.0 to ~=21.0 (#356) @[dependabot[bot]](https://github.com/apps/dependabot)
-
   CI & build changes
   ------------------
-  + Remove py2 from testing CI (#365) @mcarlton00
-  + Bump release-drafter/release-drafter from 6.0.0 to 6.1.0 (#361) @[dependabot[bot]](https://github.com/apps/dependabot)
-  + Bump appleboy/ssh-action from 1.0.0 to 1.2.0 (#357) @[dependabot[bot]](https://github.com/apps/dependabot)
-  + Bump release-drafter/release-drafter from 5.25.0 to 6.0.0 (#315) @[dependabot[bot]](https://github.com/apps/dependabot)
-  + Bump github/codeql-action from 2 to 3 (#308) @[dependabot[bot]](https://github.com/apps/dependabot)
-  + Bump actions/setup-python from 4 to 5 (#306) @[dependabot[bot]](https://github.com/apps/dependabot)
-  + Bump actions/upload-artifact from 3 to 4 (#309) @[dependabot[bot]](https://github.com/apps/dependabot)
+  + Swap legacy secrets for current secrets (#371) @joshuaboniface
 dependencies:
   py2:
     - addon: 'xbmc.python'

resources/lib/play_utils.py

@@ -891,9 +891,7 @@ def external_subs(media_source, list_item, item_id):
     sub_names = []
 
     server = settings.getSetting('server_address')
-
-    for stream in media_streams:
-
+    for idx, stream in enumerate(media_streams):
         if (stream['Type'] == "Subtitle"
                 and stream['IsExternal']
                 and stream['IsTextSubtitleStream']
@@ -911,13 +909,16 @@ def external_subs(media_source, list_item, item_id):
 
             url = '{}{}'.format(server, stream.get('DeliveryUrl'))
             if language:
+                title = str(idx)
+                if stream.get('Title'):
+                    title = stream['Title']
                 '''
                 Starting in 10.8, the server no longer provides language
                 specific download points.  We have to download the file
                 and name it with the language code ourselves so Kodi
                 will parse it correctly
                 '''
-                subtitle_file = download_external_sub(language, codec, url)
+                subtitle_file = download_external_sub(language, codec, url, title)
             else:
                 # If there is no language defined, we can go directly to the server
                 subtitle_file = url

resources/lib/utils.py

@@ -424,7 +424,7 @@ def translate_path(path):
         return xbmc.translatePath(path)
 
 
-def download_external_sub(language, codec, url):
+def download_external_sub(language, codec, url, title):
     addon_settings = xbmcaddon.Addon()
     verify_cert = addon_settings.getSetting('verify_cert') == 'true'
 
@@ -433,7 +433,7 @@ def download_external_sub(language, codec, url):
     r.raise_for_status()
 
     # Write the subtitle file to the local filesystem
-    file_name = 'Stream.{}.{}'.format(language, codec)
+    file_name = 'Stream.{}.{}.{}'.format(title, language, codec)
     file_path = py2_decode(
         translate_path('special://temp/{}'.format(file_name))
     )