script.skinshortcuts-3.0.0~beta4

Author: MikeSiLVO

.github/workflows/addon-validations.yml

@@ -16,12 +16,12 @@ jobs:
 
     steps:
       - name: Set up Python v3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.9'
 
       - name: Checkout Add-on
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ${{ github.event.repository.name }}
 
@@ -31,7 +31,6 @@ jobs:
           python -m pip install isort
           python -m pip install pylint
           python -m pip install simpleeval
-          python -m pip install unidecode
           python -m pip install git+https://github.com/xbmc/addon-check.git
 
       - name: Kodi Add-on Checker

.github/workflows/close-translation-prs.yml

@@ -2,61 +2,54 @@ name: Close Translation Pull Requests
 
 on:
   pull_request:
-    branches: [ master, main, dev ]
+    branches: [ main ]
 
 jobs:
 
   close-translation-prs:
-    if: github.actor != 'weblate' && github.actor != 'anxdpanic' && github.repository == 'mikesilvo164/script.skinshortcuts'
+    if: github.actor != 'weblate' && github.repository == 'MikeSiLVO/script.skinshortcuts'
 
     name: Close Translation Pull Requests
     runs-on: ubuntu-latest
 
     steps:
-      - name: Get changed files
-        id: modified_files
-        uses: trilom/file-changes-action@v1.2.4
+      - name: Check and close translation PRs
+        uses: actions/github-script@v7
         with:
-          output: ","
-
-      - name: Check the PR for translations
-        id: check
-        run: |
-          shopt -s nocasematch
-          if [[ "${{ steps.modified_files.outputs.files_modified }}" == *"en_gb/strings.po"* ]]; then
-            echo "Found modified en_gb, likely a valid PR"
-            unset CLOSE
-          elif [[ "${{ steps.modified_files.outputs.files_modified }}" == *"strings.po"* ]]; then
-            echo "Found modified strings.po, unwanted."
-            CLOSE="true"
-          elif [[ "${{ steps.modified_files.outputs.files_added }}" == *"strings.po"* ]]; then
-            echo "Found added strings.po, unwanted."
-            CLOSE="true"
-          elif [[ "${{ steps.modified_files.outputs.files_removed }}" == *"strings.po"* ]]; then
-            echo "Found removed strings.po, unwanted."
-            CLOSE="true"
-          else
-            echo "No strings.po were modified or added, not a translation."
-            unset CLOSE
-          fi
-          echo ::set-output name=close::${CLOSE}
-
-      - name: Comment on the PR
-        uses: mshick/add-pr-comment@v1
-        if: ${{ steps.check.outputs.close }}
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          repo-token-user-login: 'github-actions[bot]'
-          allow-repeats: true
-          message: |
-            A modified strings.po file was detected.
+          script: |
+            const { data: files } = await github.rest.pulls.listFiles({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.payload.pull_request.number
+            });
+
+            const hasEnGb = files.some(f => f.filename.includes('en_gb/strings.po'));
+            const hasStrings = files.some(f => f.filename.includes('strings.po'));
+
+            // Allow if en_gb was modified (likely valid PR) or no strings.po at all
+            if (hasEnGb || !hasStrings) {
+              console.log('Not a translation-only PR, allowing through');
+              return;
+            }
+
+            // Close translation PRs from non-Weblate contributors
+            console.log('Translation PR detected, closing');
+
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              body: `A modified strings.po file was detected.
 
             Translations are not accepted through PRs, please use Weblate if you'd like to contribute to the translations.
-            For more information see Issue #58.
 
             If you feel this PR was closed in error, please reply below.
-            Thank you for your interest in improving this add-on.
-
-      - name: Close the PR
-        uses: peter-evans/close-pull@v1
-        if: ${{ steps.check.outputs.close }}
+            Thank you for your interest in improving this add-on.`
+            });
+
+            await github.rest.pulls.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.payload.pull_request.number,
+              state: 'closed'
+            });

.github/workflows/make-release.yml

@@ -1,86 +1,59 @@
-# Based on https://github.com/im85288/service.upnext/blob/master/.github/workflows/release.yml
 name: Make Release
+
 on:
   push:
     tags:
       - 'v*'
-      - '*.alpha*'
-      - '*.beta*'
 
 jobs:
   release:
     name: Make Release
     runs-on: ubuntu-latest
 
     steps:
-      - name: Release Status
-        id: release
-        run: |
-          version=${GITHUB_REF/refs\/tags\//}
-          if [[ $version == *.alpha* || $version == *.beta* ]] ;
-          then
-            echo ::set-output name=pre-release::true
-          else
-            echo ::set-output name=pre-release::false
-          fi
-
       - name: Checkout Add-on
-        uses: actions/checkout@v3
-        with:
-          path: ${{ github.event.repository.name }}
+        uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
           sudo apt-get update
           sudo apt-get install libxml2-utils xmlstarlet zip
 
-      - name: Get Variables
-        id: variables
+      - name: Get addon info
+        id: addon-info
         run: |
-          changes=$(xmlstarlet sel -t -v '//news' -n addon.xml)
-          changes="${changes//'%'/'%25'}"
-          changes="${changes//$'\n'/'%0A'}"
-          changes="${changes//$'\r'/'%0D'}"
           version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
-          echo ::set-output name=changes::$changes
-          echo ::set-output name=version::$version
-        working-directory: ${{ github.event.repository.name }}
+          echo "version=$version" >> $GITHUB_OUTPUT
+
+          # Extract changelog, preserve newlines for release body
+          changelog=$(xmlstarlet sel -t -v '//news' addon.xml)
+          echo "changelog<<EOF" >> $GITHUB_OUTPUT
+          echo "$changelog" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+          # Check if pre-release (addon.xml uses ~ for pre-release)
+          if [[ $version == *~alpha* || $version == *~beta* ]]; then
+            echo "prerelease=true" >> $GITHUB_OUTPUT
+          else
+            echo "prerelease=false" >> $GITHUB_OUTPUT
+          fi
 
       - name: Create Zip
         id: zip
         run: |
-          git reset
-          git checkout .
-          git clean -fdx
-          mv .git ..
-          rm -rf .??*
-          rm LICENSE.txt
+          # Clean up for release
+          rm -rf .git .github .gitignore .pylintrc
           cd ..
-          filename=${{ github.event.repository.name }}-${{ steps.variables.outputs.version }}.zip
+          filename=${{ github.event.repository.name }}-${{ steps.addon-info.outputs.version }}.zip
           zip -r $filename ${{ github.event.repository.name }}
-          mv .git ${{ github.event.repository.name }}
-          echo ::set-output name=filename::$filename
-        working-directory: ${{ github.event.repository.name }}
+          echo "filename=$filename" >> $GITHUB_OUTPUT
 
       - name: Create Release
-        id: create-release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          body: ${{ steps.variables.outputs.changes }}
-          draft: false
-          prerelease: ${{ steps.release.outputs.pre-release }}
-
-      - name: Upload Zip (Matrix)
-        id: upload-matrix
-        uses: actions/upload-release-asset@v1
+          name: v${{ steps.addon-info.outputs.version }}
+          body: ${{ steps.addon-info.outputs.changelog }}
+          prerelease: ${{ steps.addon-info.outputs.prerelease }}
+          files: ../${{ steps.zip.outputs.filename }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_name: ${{ steps.zip.outputs.filename }}
-          asset_path: ${{ steps.zip.outputs.filename }}
-          asset_content_type: application/zip

.github/workflows/submit-release.yml

@@ -2,48 +2,43 @@ name: Sync addon metadata translations
 
 on:
   push:
-    branches: [ master, main ]
+    branches: [ main ]
     paths:
       - '**addon.xml'
       - '**resource.language.**strings.po'
 
 jobs:
-  default:
-    if: github.repository == 'mikesilvo164/script.skinshortcuts'
+  sync-translations:
+    # PAUSED: Re-enable when main replaces master and Weblate PR is merged
+    # Change 'false' to the condition below to re-enable:
+    # github.repository == 'MikeSiLVO/script.skinshortcuts'
+    if: false
+
+    name: Sync addon metadata translations
     runs-on: ubuntu-latest
 
     steps:
-
-      # Checkout the current repository into the 'project' directory
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: project
 
-      # Setup python version 3.9
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.9'
 
-      # Install all dependencies required by the following steps
-      # - git+https://github.com/xbmc/sync_addon_metadata_translations.git: main script for this action
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           python -m pip install git+https://github.com/xbmc/sync_addon_metadata_translations.git
 
-      # Run the sync-addon-metadata-translations against the 'project' directory
       - name: Run sync-addon-metadata-translations
-        run: |
-          sync-addon-metadata-translations
+        run: sync-addon-metadata-translations
         working-directory: ./project
 
-      # Create a PR with any changes made by the sync-addon-metadata-translations script
-      # - title/commit message: Sync of addon metadata translations
-      # - body: Sync of addon metadata translations triggered by {github.sha}
-      - name: Create PR for sync-addon-metadata-translations changes
-        uses: peter-evans/create-pull-request@v3.10.0
+      - name: Create PR for sync changes
+        uses: peter-evans/create-pull-request@v7
         with:
           commit-message: Sync of addon metadata translations
           title: Sync of addon metadata translations

.github/workflows/sync-addon-metadata-translations.yml

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.skinshortcuts" name="Skin Shortcuts" version="3.0.0~beta3" provider-name="BigNoid, marcelveldt, SiLVO, anxdpanic">
+<addon id="script.skinshortcuts" name="Skin Shortcuts" version="3.0.0~beta4" provider-name="SiLVO, anxdpanic">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
-        <import addon="script.module.unidecode" version="1.1.1+matrix.2"/>
         <import addon="script.module.simpleeval" version="0.9.10"/>
     </requires>
     <extension point="xbmc.python.script" library="default.py"/>
     <extension point="xbmc.addon.metadata">
         <news>
-[fix] translations in PVR |contrib: Dis90|
-[fix] titles missing in some dialogs
-[fix] handle missing profiles.xml gracefully (fixes Apple TV)
-[lang] update translations from Weblate
+v3.0.0~beta4
+- Complete addon rewrite
+- JSON-based userdata
         </news>
+        <summary lang="en_GB">Custom menus, properties, and artwork for skins</summary>
         <platform>all</platform>
         <license>GPL-2.0-only</license>
         <forum>https://forum.kodi.tv/showthread.php?tid=178294</forum>