Client and stream processing updates

.github/workflows/make-release.yml

@@ -1,17 +1,19 @@
 # Based on https://github.com/im85288/service.upnext/blob/master/.github/workflows/release.yml
 name: Make Release
 on:
+  workflow_dispatch:
   push:
     tags:
       - 'v*'
       - '*-dev'
 
 jobs:
   release:
-    if: github.repository == 'anxdpanic/plugin.video.youtube'
-
+    if: github.repository == 'anxdpanic/plugin.video.youtube' || github.event_name == 'workflow_dispatch'
     name: Make Release
     runs-on: ubuntu-20.04
+    permissions:
+      contents: write
 
     steps:
       - name: Release Status
@@ -38,11 +40,12 @@ jobs:
       - name: Get Changelog
         id: changelog
         run: |
-          changes=$(xmlstarlet sel -t -v '//news' -n addon.xml)
-          changes="${changes//'%'/'%25'}"
-          changes="${changes//$'\n'/'%0A'}"
-          changes="${changes//$'\r'/'%0D'}"
-          echo "changes=$changes" >> $GITHUB_OUTPUT
+          readarray -t changes < <(xmlstarlet sel -t -v '//news' -n addon.xml)
+          echo "body<<${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_OUTPUT
+          for change in "${changes[@]}"; do
+              echo "${change}" >> $GITHUB_OUTPUT
+          done
+          echo "${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_OUTPUT
         working-directory: ${{ github.event.repository.name }}
 
       - name: Create Zip (Nexus)
@@ -77,6 +80,45 @@ jobs:
           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
+          version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
+          xmlstarlet ed -L -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '3.0.0' addon.xml
+          xmlstarlet ed -L -d '/addon/requires/import[@addon="script.module.infotagger"]' addon.xml
+          filename=${{ github.event.repository.name }}-${version}.matrix.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-Unofficial)
+        id: zip-unofficial-matrix
+        run: |
+          git reset
+          git checkout .
+          git clean -fdx
+          git apply .patches/unofficial.patch
+          mv .git ..
+          rm -rf .??*
+          rm *.md
+          version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
+          xmlstarlet ed -L -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '3.0.0' addon.xml
+          xmlstarlet ed -L -d '/addon/requires/import[@addon="script.module.infotagger"]' addon.xml
+          filename=${{ github.event.repository.name }}-unofficial-${version}.matrix.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 Release
         id: create-release
         uses: actions/create-release@v1
@@ -85,7 +127,7 @@ jobs:
         with:
           tag_name: ${{ github.ref }}
           release_name: ${{ github.ref }}
-          body: ${{ steps.changelog.outputs.changes }}
+          body: ${{ steps.changelog.outputs.body }}
           draft: false
           prerelease: ${{ steps.release.outputs.pre-release }}
 
@@ -110,3 +152,25 @@ jobs:
           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
+        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_content_type: application/zip
+
+      - name: Upload Zip (Matrix-Unofficial)
+        id: upload-unofficial-matrix
+        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_content_type: application/zip

.github/workflows/submit-release.yml

@@ -40,8 +40,8 @@ jobs:
           git config --global user.name "anxdpanic"
           git config --global user.email "[email protected]"
 
-      - name: Staging for Official Repository (Isengard)
-        id: stage-isengard
+      - name: Staging for Official Repository (Nexus)
+        id: stage-nexus
         run: |
           mv .git ..
           rm -rf .??*
@@ -60,3 +60,31 @@ jobs:
           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
+          version=$(xmlstarlet sel -t -v 'string(/addon/@version)' addon.xml)
+          xmlstarlet ed -L -u '/addon/@version' -v "${version}+matrix.1" addon.xml
+          xmlstarlet ed -L -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v '3.0.0' addon.xml
+          xmlstarlet ed -L -d '/addon/requires/import[@addon="script.module.infotagger"]' addon.xml
+          git add .
+          git commit -m "Kodi 19 Patch"
+        working-directory: ${{ github.event.repository.name }}
+
+      - name: Submit to Official Repository (Matrix)
+        id: submit-matrix
+        run: |
+          submit-addon -r repo-plugins -b matrix --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]