Merge branch 'main' into pr/T01iK/60

Author: nekename

.github/workflows/format-pr-icons.yml

@@ -0,0 +1,125 @@
+name: Format PR icons
+
+on:
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: Pull request number to format
+        required: true
+        type: number
+
+permissions:
+  contents: write
+  issues: read
+  pull-requests: read
+
+jobs:
+  format:
+    name: Format added icons
+    runs-on: ubuntu-latest
+    env:
+      PR_NUMBER: ${{ inputs.pr_number }}
+      GH_TOKEN: ${{ github.token }}
+    steps:
+      - name: Check out trusted formatter
+        uses: actions/checkout@v7
+        with:
+          path: base
+          ref: ${{ github.event.repository.default_branch }}
+          fetch-depth: 1
+
+      - name: Get pull request head
+        id: pr
+        run: |
+          gh pr view "$PR_NUMBER" --repo "${{ github.repository }}" --json \
+            headRefName,headRepository,headRefOid,maintainerCanModify \
+            --jq '"head_ref=\(.headRefName)\nhead_repository=\(.headRepository.nameWithOwner)\nhead_sha=\(.headRefOid)\nmaintainer_can_modify=\(.maintainerCanModify)"' >> "$GITHUB_OUTPUT"
+
+      - name: Require maintainer edits
+        if: >-
+          steps.pr.outputs.head_repository != github.repository &&
+          steps.pr.outputs.maintainer_can_modify != 'true'
+        run: |
+          echo "This PR does not allow edits from maintainers." >&2
+          exit 1
+
+      - name: Check out pull request
+        uses: actions/checkout@v7
+        with:
+          repository: ${{ steps.pr.outputs.head_repository }}
+          ref: ${{ steps.pr.outputs.head_sha }}
+          path: pr
+          token: ${{ github.token }}
+
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+
+      - name: Set up Python
+        uses: actions/setup-python@v7
+        with:
+          python-version: "3.13"
+
+      - name: Format added icons
+        id: format
+        run: |
+          set -euo pipefail
+          mkdir -p format/icons
+
+          mapfile -t added_icons < <(
+            gh api --paginate "repos/${{ github.repository }}/pulls/$PR_NUMBER/files" \
+              --jq '.[] | select(.status == "added" and (.filename | startswith("icons/"))) | .filename'
+          )
+
+          if ((${#added_icons[@]} == 0)); then
+            echo "No added icons found in PR #$PR_NUMBER."
+            echo "changed=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          for path in "${added_icons[@]}"; do
+            relative_path="${path#icons/}"
+            if [[ "$relative_path" == */* ]]; then
+              echo "Icon path must be directly under icons/: $path" >&2
+              exit 1
+            fi
+            cp "pr/$path" "format/icons/$relative_path"
+          done
+
+          (
+            cd format
+            uv run --project ../base --locked python ../base/format_icons.py
+          )
+
+          changed=false
+          for path in "${added_icons[@]}"; do
+            relative_path="${path#icons/}"
+            if ! cmp -s "format/icons/$relative_path" "pr/$path"; then
+              cp "format/icons/$relative_path" "pr/$path"
+              changed=true
+            fi
+          done
+          echo "changed=$changed" >> "$GITHUB_OUTPUT"
+
+      - name: Commit formatted icons to pull request
+        if: steps.format.outputs.changed == 'true'
+        working-directory: pr
+        env:
+          HEAD_REF: ${{ steps.pr.outputs.head_ref }}
+          PUSH_TOKEN: >-
+            ${{ steps.pr.outputs.head_repository == github.repository &&
+                github.token ||
+                secrets.MAINTAINER_TOKEN }}
+        run: |
+          set -euo pipefail
+          if [[ -z "$PUSH_TOKEN" ]]; then
+            echo "MAINTAINER_TOKEN is required to push to fork PR branches." >&2
+            exit 1
+          fi
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add -- icons
+          git commit -m "Format icons"
+          git -c "http.extraheader=AUTHORIZATION: bearer $PUSH_TOKEN" \
+            push origin "HEAD:$HEAD_REF"

.github/workflows/validate-plugin-submission.yml

@@ -0,0 +1,31 @@
+name: Validate plugin submission
+
+on:
+  pull_request:
+    paths:
+      - "catalogue.json"
+      - "icons/**"
+      - "validate_submission.py"
+
+permissions:
+  contents: read
+
+jobs:
+  validate:
+    name: Validate plugin submission
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out pull request
+        uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v7
+        with:
+          python-version: "3.x"
+
+      - name: Validate catalogue submission
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: python validate_submission.py --base "${{ github.event.pull_request.base.sha }}" --head "${{ github.event.pull_request.head.sha }}"

.gitignore

@@ -1,4 +1,2 @@
 .venv/
-uv.lock
-
 .ruff_cache/

README.md

@@ -30,6 +30,4 @@ To submit your plugin to the OpenAction Marketplace, please follow these steps:
 
 Once you have added your entry to the appropriate section, submit a Pull Request to this repository for review.
 
-### Alternative Method (The Easy Way)
-
-If you prefer an easier route, simply get in contact with us via Matrix, Discord, or by opening a GitHub Issue in this repository. Drop your plugin's repository URL, and a maintainer will add the plugin for you!
+Pull requests that change the catalogue are checked automatically. The check verifies the repository topic, manifest metadata, repository description, bundle ID, latest-release artifacts, icon format and resolution, section placement, and repository URL ordering before maintainers review the submission.

catalogue.json

@@ -29,6 +29,12 @@
 		"repository": "https://github.com/OpenActionPlugins/system",
 		"description": "An OpenAction plugin for displaying system information"
 	},
+	"us.rivul.tacto": {
+		"name": "Tacto Connect",
+		"author": "Rivulus",
+		"repository": "https://github.com/RivulusLive/tacto-connect-source",
+		"description": "OpenAction plugin providing Tacto mobile and keyboard device support"
+	},
 	"com.ags.info_clock": {
 		"name": "Info Clock",
 		"author": "Alex Godinez",
@@ -146,6 +152,12 @@
 			"ai_assisted": true
 		}
 	},
+	"at.terrorwolf.helldivers2": {
+		"name": "Helldivers2",
+		"author": "Terrorwolf",
+		"repository": "https://github.com/Terrorwolf01/opendeck-helldivers2",
+		"description": "A Plugin Providing all Helldivers2 Stratagems."
+	},
 	"at.terrorwolf.linkwarden": {
 		"name": "Linkwarden",
 		"author": "Terrorwolf",

format_icons.py

@@ -1,11 +1,18 @@
+import logging
 import os
-from PIL import Image
 import shutil
-import logging
 from pathlib import Path
+
+from PIL import Image
 from tqdm import tqdm
 
 
+def same_pixels(a, b):
+	"""Compare decoded pixels, ignoring PNG compression differences."""
+	with Image.open(a) as ia, Image.open(b) as ib:
+		return ia.size == ib.size and ia.convert("RGBA").tobytes() == ib.convert("RGBA").tobytes()
+
+
 def process_images(input_dir, quality, palette_colors):
 	total_files = 0
 	modified_files = 0
@@ -54,12 +61,18 @@ def process_images(input_dir, quality, palette_colors):
 				save_kwargs = {"compress_level": 9 - int((quality / 100) * 9), "optimize": True}
 				img.save(temp_filepath, "PNG", **save_kwargs)
 
-				# Count as modified only if we actually created a new file
+				# Keep the existing file if the pixels are identical (zlib output differs per platform)
+				existing = os.path.join(input_dir, new_filename)
+				if os.path.exists(existing) and same_pixels(temp_filepath, existing):
+					os.remove(temp_filepath)
+					new_size += os.path.getsize(existing)
+					continue
+
 				modified_files += 1
 				new_size += os.path.getsize(temp_filepath)
 
-		except Exception as e:
-			logging.warning(f"Could not process {filename}: {str(e)}")
+		except Exception as e:  # noqa: BLE001
+			logging.getLogger(__name__).warning(f"Could not process {filename}: {e!s}")
 			continue
 
 	# Replace original files with processed ones

icons/at.terrorwolf.helldivers2.png

@@ -1,8 +1,9 @@
-import sys
 import json
+import sys
 import time
-import requests
 from urllib.parse import urlparse
+
+import requests
 from tqdm import tqdm
 
 # Constants
@@ -122,12 +123,6 @@ def main():
 	global skip_update
 	global wait_on_rate_limit
 
-	global failed
-	global invalid_repo
-	global performed
-	global skipped
-	global succeeded
-
 	for arg in args:
 		if arg.lower() == "--skip-update":
 			skip_update = True
@@ -142,12 +137,12 @@ def main():
 				ids.append(arg)
 		else:
 			print(RED + "Unrecognised argument: " + arg + CLEAR)
-			exit(1)
+			sys.exit(1)
 
 	if len(ids) == 0:
 		if start_from:
 			print(RED + "No plugins to be updated." + CLEAR)
-			exit(1)
+			sys.exit(1)
 		ids = all_ids
 
 	data = update_descriptions(data, ids)
@@ -166,7 +161,7 @@ def main():
 		"Plugins succeeded or skipped: "
 		+ str(succeeded + skipped)
 		+ " "
-		+ "{:.2f}%".format((succeeded + skipped) / performed * 100)
+		+ f"{(succeeded + skipped) / performed * 100:.2f}%"
 	)