Merge pull request #656 from MoojMidge/master

v7.0.5+beta.1
anxdpanic · Mar 28, 2024 · d9999ec · d9999ec
2 parents 6ca0b94 + 2196a5c
commit d9999ec
Show file tree

Hide file tree

Showing 38 changed files with 951 additions and 683 deletions.
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
@@ -49,57 +49,9 @@ jobs:
           echo "${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_OUTPUT
         working-directory: ${{ github.event.repository.name }}
 
-      - name: Create Zip (Nexus)
-        id: zip-nexus
+      - name: Create Zip
+        id: zip
         run: |
-          mv .git ..
-          rm -rf .??*
-          rm *.md
-          news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//')
-          version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          xmlstarlet ed -L -P \
-            -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
-            -u '/addon/@version' -v "${version}+nexus.1" \
-            addon.xml
-          filename=${{ github.event.repository.name }}-${version}.nexus.1.zip
-          cd ..
-          zip -r $filename ${{ github.event.repository.name }}
-          mv .git ${{ github.event.repository.name }}
-          echo "filename=$filename" >> $GITHUB_OUTPUT
-        working-directory: ${{ github.event.repository.name }}
-
-      - name: Create Zip (Nexus-Unofficial)
-        id: zip-unofficial-nexus
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          git reset
-          git checkout .
-          git fetch origin nexus-unofficial
-          git -c user.email="\<\>" -c user.name="make-release" merge -X theirs --allow-unrelated-histories origin/nexus-unofficial
-          git clean -fdx
-          mv .git ..
-          rm -rf .??*
-          rm *.md
-          news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//')
-          version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          xmlstarlet ed -L -P \
-            -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
-            -u '/addon/@version' -v "${version}+nexus.unofficial.1" \
-            addon.xml
-          filename=${{ github.event.repository.name }}-${version}.nexus.unofficial.1.zip
-          cd ..
-          zip -r $filename ${{ github.event.repository.name }}
-          mv .git ${{ github.event.repository.name }}
-          echo "filename=$filename" >> $GITHUB_OUTPUT
-        working-directory: ${{ github.event.repository.name }}
-
-      - name: Create Zip (Matrix)
-        id: zip-matrix
-        run: |
-          git reset
-          git checkout .
-          git clean -fdx
           mv .git ..
           rm -rf .??*
           rm *.md
@@ -108,9 +60,6 @@ jobs:
           xmlstarlet ed -L -P \
             -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
             -u '/addon/@version' -v "${version}+matrix.1" \
-            -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '3.0.0' \
-            -u '/addon/requires/import[@addon="inputstream.adaptive"]/@version' -v '19.0.0' \
-            -d '/addon/requires/import[@addon="script.module.infotagger"]' \
             addon.xml
           filename=${{ github.event.repository.name }}-${version}.matrix.1.zip
           cd ..
@@ -119,12 +68,12 @@ jobs:
           echo "filename=$filename" >> $GITHUB_OUTPUT
         working-directory: ${{ github.event.repository.name }}
 
-      - name: Create Zip (Matrix-Unofficial)
-        id: zip-unofficial-matrix
+      - name: Create Zip (Unofficial)
+        id: zip-unofficial
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git reset
+          git reset --hard ${{ github.sha }}
           git checkout .
           git fetch origin nexus-unofficial
           git -c user.email="\<\>" -c user.name="make-release" merge -X theirs --allow-unrelated-histories origin/nexus-unofficial
@@ -137,9 +86,6 @@ jobs:
           xmlstarlet ed -L -P \
             -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
             -u '/addon/@version' -v "${version}+matrix.unofficial.1" \
-            -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '3.0.0' \
-            -u '/addon/requires/import[@addon="inputstream.adaptive"]/@version' -v '19.0.0' \
-            -d '/addon/requires/import[@addon="script.module.infotagger"]' \
             addon.xml
           filename=${{ github.event.repository.name }}-${version}.matrix.unofficial.1.zip
           cd ..
@@ -151,7 +97,7 @@ jobs:
       - name: Create Zip (Leia)
         id: zip-leia
         run: |
-          git reset
+          git reset --hard ${{ github.sha }}
           git checkout .
           git clean -fdx
           mv .git ..
@@ -166,7 +112,6 @@ jobs:
             -d '/addon/requires/import[@addon="script.module.requests"]/@version' \
             -d '/addon/requires/import[@addon="inputstream.adaptive"]/@version' \
             -d '/addon/requires/import[@addon="script.module.inputstreamhelper"]/@version' \
-            -d '/addon/requires/import[@addon="script.module.infotagger"]' \
             -s '/addon/requires' -t elem -n import_temp \
             -s '/addon/requires/import_temp' -t attr -n addon -v 'script.module.kodi-six' \
             -r '/addon/requires/import_temp' -v import \
@@ -183,7 +128,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git reset
+          git reset --hard ${{ github.sha }}
           git checkout .
           git fetch origin nexus-unofficial
           git -c user.email="\<\>" -c user.name="make-release" merge -X theirs --allow-unrelated-histories origin/nexus-unofficial
@@ -200,7 +145,6 @@ jobs:
             -d '/addon/requires/import[@addon="script.module.requests"]/@version' \
             -d '/addon/requires/import[@addon="inputstream.adaptive"]/@version' \
             -d '/addon/requires/import[@addon="script.module.inputstreamhelper"]/@version' \
-            -d '/addon/requires/import[@addon="script.module.infotagger"]' \
             -s '/addon/requires' -t elem -n import_temp \
             -s '/addon/requires/import_temp' -t attr -n addon -v 'script.module.kodi-six' \
             -r '/addon/requires/import_temp' -v import \
@@ -224,48 +168,26 @@ jobs:
           draft: false
           prerelease: ${{ steps.release.outputs.pre-release }}
 
-      - name: Upload Zip (Nexus)
-        id: upload-nexus
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_name: ${{ steps.zip-nexus.outputs.filename }}
-          asset_path: ${{ steps.zip-nexus.outputs.filename }}
-          asset_content_type: application/zip
-
-      - name: Upload Zip (Nexus-Unofficial)
-        id: upload-unofficial-nexus
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_name: ${{ steps.zip-unofficial-nexus.outputs.filename }}
-          asset_path: ${{ steps.zip-unofficial-nexus.outputs.filename }}
-          asset_content_type: application/zip
-
-      - name: Upload Zip (Matrix)
-        id: upload-matrix
+      - name: Upload Zip
+        id: upload
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_name: ${{ steps.zip-matrix.outputs.filename }}
-          asset_path: ${{ steps.zip-matrix.outputs.filename }}
+          asset_name: ${{ steps.zip.outputs.filename }}
+          asset_path: ${{ steps.zip.outputs.filename }}
           asset_content_type: application/zip
 
-      - name: Upload Zip (Matrix-Unofficial)
-        id: upload-unofficial-matrix
+      - name: Upload Zip (Unofficial)
+        id: upload-unofficial
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_name: ${{ steps.zip-unofficial-matrix.outputs.filename }}
-          asset_path: ${{ steps.zip-unofficial-matrix.outputs.filename }}
+          asset_name: ${{ steps.zip-unofficial.outputs.filename }}
+          asset_path: ${{ steps.zip-unofficial.outputs.filename }}
           asset_content_type: application/zip
 
       - name: Upload Zip (Leia)

diff --git a/.github/workflows/submit-release.yml b/.github/workflows/submit-release.yml
@@ -42,8 +42,8 @@ jobs:
           git config --global user.name "anxdpanic"
           git config --global user.email "[email protected]"
 
-      - name: Staging for Official Repository (Nexus)
-        id: stage-nexus
+      - name: Staging for Official Repository
+        id: stage
         run: |
           mv .git ..
           rm -rf .??*
@@ -55,53 +55,14 @@ jobs:
           version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
           xmlstarlet ed -L -P \
             -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
-            -u '/addon/@version' -v "${version}+nexus.1" \
-            addon.xml
-          git add .
-          git commit -m "Update news and repository identifier"
-        working-directory: ${{ github.event.repository.name }}
-
-      - name: Submit to Official Repository (Nexus)
-        id: submit-nexus
-        run: |
-          submit-addon -r repo-plugins -b nexus --pull-request ${{ github.event.repository.name }}
-        working-directory: ${{ github.event.repository.name }}
-        env:
-          GH_USERNAME: anxdpanic
-          GH_TOKEN: ${{ secrets.ADDON_SUBMISSION_TOKEN }}
-          EMAIL: [email protected]
-
-      - name: Staging for Official Repository (Matrix)
-        id: stage-matrix
-        run: |
-          git reset --hard ${{ github.sha }}
-          git checkout .
-          git clean -fdx
-          mv .git ..
-          rm -rf .??*
-          mv ../.git .
-          rm *.md
-          git add .
-          git commit -m "Remove Unwanted Files"
-          news=$(awk '/^## /{rel_num++} {if(rel_num==2){exit} if(rel_num==1){print}}' changelog.txt | sed -E 's/ ?#[[:digit:]]+[., ]?//;s/\r//')
-          xmlstarlet ed -L -P \
-            -s '/addon/extension[@point="xbmc.addon.metadata"]' -t elem -n news -v "${news:0:1500}" \
-            addon.xml
-          git add .
-          git commit -m "Update news"
-          version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          xmlstarlet ed -L -P \
             -u '/addon/@version' -v "${version}+matrix.1" \
-            -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '3.0.0' \
-            -u '/addon/requires/import[@addon="inputstream.adaptive"]/@version' -v '19.0.0' \
-            -d '/addon/requires/import[@addon="script.module.infotagger"]' \
             addon.xml
           git add .
-          git commit -m "Kodi 19 Patch"
+          git commit -m "Update news and repository identifier"
         working-directory: ${{ github.event.repository.name }}
 
-      - name: Submit to Official Repository (Matrix)
-        id: submit-matrix
+      - name: Submit to Official Repository
+        id: submit
         run: |
           submit-addon -r repo-plugins -b matrix --pull-request ${{ github.event.repository.name }}
         working-directory: ${{ github.event.repository.name }}

diff --git a/addon.xml b/addon.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.youtube" name="YouTube" version="7.0.4" provider-name="anxdpanic, bromix">
+<addon id="plugin.video.youtube" name="YouTube" version="7.0.5+beta.1" provider-name="anxdpanic, bromix">
     <requires>
-        <import addon="xbmc.python" version="3.0.1"/>
+        <import addon="xbmc.python" version="3.0.0"/>
         <import addon="script.module.requests" version="2.27.1"/>
-        <import addon="inputstream.adaptive" version="20.0.0"/>
+        <import addon="inputstream.adaptive" version="19.0.0"/>
         <import addon="script.module.inputstreamhelper" version="0.2.2" optional="true"/>
-        <import addon="script.module.infotagger" version="0.0.5"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="resources/lib/plugin.py">
         <provides>video</provides>

diff --git a/changelog.txt b/changelog.txt
@@ -1,14 +1,37 @@
+## v7.0.5+beta.1
+### Fixed
+- Try to prevent Kodi freezing when settings are updated and container is reloaded
+- Fix lockups when using xbmc.executebuiltin #647, #653
+- Fix searching for preferred language subtitles not using non-region specific subtitles
+- Fix not being able to set custom watch later history playlist per user #646
+- Update workarounds for multiple busy dialog crashes #640, #649
+- Fix playing incorrect video when player request is blocked #654
+
+### Changed
+- Display search history as list rather than videos
+- Update Setup Wizard
+  - Add settings for Rasberry Pi 3 class devices (1080p30, VP9 enabled)
+  - Update settings for Rasberry Pi 4 class devices (1080p60, VP9 enabled)
+  - Move option to disable list details to last step in wizard
+- Shared playlist play using default order without prompting
+- Removed dependency on script.module.infotagger #479
+- Removed Nexus specific releases
+  - Matrix releases will now work in Kodi v19+
+  - Leia releases will work, but are unsupported, for Kodi v18 only
+- Updated client versions used for player requests
+  - Use iOS client as fallback for default client selection
+
 ## v7.0.4
 ### Fixed
 - Fix issues with Profiler running without timer when debug logging was enabled
 - Fix additional Python 2 unicode handling issues when accessing My Subscription #639
 
- ### Changed
- - Only set combined cache size to 20 MB in Setup Wizard if value is not already larger
- - Cached playlist items will be forced to reload when deleting item from playlist rather than waiting 5 minutes
+### Changed
+- Only set combined cache size to 20 MB in Setup Wizard if value is not already larger
+- Cached playlist items will be forced to reload when deleting item from playlist rather than waiting 5 minutes
 
- ### New
- - Make colours used for extra details in video listings customisable in Kodi 20+
+### New
+- Make colours used for extra details in video listings customisable in Kodi 20+
 
 ## v7.0.4+beta.2
 ### Fixed

diff --git a/resources/language/resource.language.en_au/strings.po b/resources/language/resource.language.en_au/strings.po
@@ -1454,7 +1454,7 @@ msgid "720p | Limited or older devices"
 msgstr ""
 
 msgctxt "#30788"
-msgid "1080p/30 fps | Rasberry Pi 4B, or similar"
+msgid "1080p/30 fps | Rasberry Pi 3, or similar"
 msgstr ""
 
 msgctxt "#30789"
@@ -1484,3 +1484,7 @@ msgstr ""
 msgctxt "#30795"
 msgid "Comments count display colour"
 msgstr ""
+
+msgctxt "#30796"
+msgid "1080p/60 fps | Rasberry Pi 4, or similar"
+msgstr ""
diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
@@ -1454,7 +1454,7 @@ msgid "720p | Limited or older devices"
 msgstr ""
 
 msgctxt "#30788"
-msgid "1080p/30 fps | Rasberry Pi 4B, or similar"
+msgid "1080p/30 fps | Rasberry Pi 3, or similar"
 msgstr ""
 
 msgctxt "#30789"
@@ -1484,3 +1484,7 @@ msgstr ""
 msgctxt "#30795"
 msgid "Comments count display colour"
 msgstr ""
+
+msgctxt "#30796"
+msgid "1080p/60 fps | Rasberry Pi 4, or similar"
+msgstr ""
diff --git a/resources/language/resource.language.en_nz/strings.po b/resources/language/resource.language.en_nz/strings.po
@@ -1454,7 +1454,7 @@ msgid "720p | Limited or older devices"
 msgstr ""
 
 msgctxt "#30788"
-msgid "1080p/30 fps | Rasberry Pi 4B, or similar"
+msgid "1080p/30 fps | Rasberry Pi 3, or similar"
 msgstr ""
 
 msgctxt "#30789"
@@ -1484,3 +1484,7 @@ msgstr ""
 msgctxt "#30795"
 msgid "Comments count display colour"
 msgstr ""
+
+msgctxt "#30796"
+msgid "1080p/60 fps | Rasberry Pi 4, or similar"
+msgstr ""
diff --git a/resources/language/resource.language.en_us/strings.po b/resources/language/resource.language.en_us/strings.po
@@ -1455,7 +1455,7 @@ msgid "720p | Limited or older devices"
 msgstr ""
 
 msgctxt "#30788"
-msgid "1080p/30 fps | Rasberry Pi 4B, or similar"
+msgid "1080p/30 fps | Rasberry Pi 3, or similar"
 msgstr ""
 
 msgctxt "#30789"
@@ -1485,3 +1485,7 @@ msgstr ""
 msgctxt "#30795"
 msgid "Comments count display color"
 msgstr ""
+
+msgctxt "#30796"
+msgid "1080p/60 fps | Rasberry Pi 4, or similar"
+msgstr ""
diff --git a/resources/lib/youtube_plugin/kodion/abstract_provider.py b/resources/lib/youtube_plugin/kodion/abstract_provider.py
@@ -261,7 +261,7 @@ def _internal_search(self, context, re_match):
             context.set_path(paths.SEARCH, 'query')
             return self.on_search(query, context, re_match)
 
-        context.set_content(content.VIDEO_CONTENT)
+        context.set_content(content.LIST_CONTENT)
         result = []
 
         location = context.get_param('location', False)