From a0052a046a3fd7a586b781bc8e88e3853f343efa Mon Sep 17 00:00:00 2001 From: Michael Abon Date: Thu, 2 May 2024 09:51:29 -0700 Subject: [PATCH] Validate manifest per streamdeck v0.3.0-beta.6 The @elgatosf/cli has started to offer quite helpful manifest feedback in the form of the `validate` and `pack` commands. I quite appreciate it. This commit adds a UUID to the manifest and unifies the .plugin folder name with that UUID. --- .../.sdignore | 1 + .../en.json | 0 .../icons/categoryIcon.svg | 0 .../icons/pluginIcon.svg | 0 .../icons/setLightsAction.svg | 0 .../icons/turnOffLightsAction.svg | 0 .../manifest.json | 7 ++++--- .../propertyInspector/libs/js/api.js | 0 .../propertyInspector/libs/js/constants.js | 0 .../propertyInspector/libs/js/events.js | 0 .../libs/js/property-inspector.js | 0 .../propertyInspector/libs/js/utils.js | 0 .../propertyInspector/pi.css | 0 .../propertyInspector/pi.html | 0 .../propertyInspector/pi.js | 0 .../logs/.gitkeep | 0 justfile | 4 ++-- package-lock.json | 17 +++++++++++++---- package.json | 5 ++++- 19 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 ca.michaelabon.logitech-litra-lights.sdPlugin/.sdignore rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/en.json (100%) rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/icons/categoryIcon.svg (100%) rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/icons/pluginIcon.svg (100%) rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/icons/setLightsAction.svg (100%) rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/icons/turnOffLightsAction.svg (100%) rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/manifest.json (88%) rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/propertyInspector/libs/js/api.js (100%) rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/propertyInspector/libs/js/constants.js (100%) rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/propertyInspector/libs/js/events.js (100%) rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/propertyInspector/libs/js/property-inspector.js (100%) rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/propertyInspector/libs/js/utils.js (100%) rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/propertyInspector/pi.css (100%) rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/propertyInspector/pi.html (100%) rename {ca.michaelabon.logitechlitra.sdPlugin => ca.michaelabon.logitech-litra-lights.sdPlugin}/propertyInspector/pi.js (100%) delete mode 100644 ca.michaelabon.logitechlitra.sdPlugin/logs/.gitkeep diff --git a/ca.michaelabon.logitech-litra-lights.sdPlugin/.sdignore b/ca.michaelabon.logitech-litra-lights.sdPlugin/.sdignore new file mode 100644 index 0000000..333c1e9 --- /dev/null +++ b/ca.michaelabon.logitech-litra-lights.sdPlugin/.sdignore @@ -0,0 +1 @@ +logs/ diff --git a/ca.michaelabon.logitechlitra.sdPlugin/en.json b/ca.michaelabon.logitech-litra-lights.sdPlugin/en.json similarity index 100% rename from ca.michaelabon.logitechlitra.sdPlugin/en.json rename to ca.michaelabon.logitech-litra-lights.sdPlugin/en.json diff --git a/ca.michaelabon.logitechlitra.sdPlugin/icons/categoryIcon.svg b/ca.michaelabon.logitech-litra-lights.sdPlugin/icons/categoryIcon.svg similarity index 100% rename from ca.michaelabon.logitechlitra.sdPlugin/icons/categoryIcon.svg rename to ca.michaelabon.logitech-litra-lights.sdPlugin/icons/categoryIcon.svg diff --git a/ca.michaelabon.logitechlitra.sdPlugin/icons/pluginIcon.svg b/ca.michaelabon.logitech-litra-lights.sdPlugin/icons/pluginIcon.svg similarity index 100% rename from ca.michaelabon.logitechlitra.sdPlugin/icons/pluginIcon.svg rename to ca.michaelabon.logitech-litra-lights.sdPlugin/icons/pluginIcon.svg diff --git a/ca.michaelabon.logitechlitra.sdPlugin/icons/setLightsAction.svg b/ca.michaelabon.logitech-litra-lights.sdPlugin/icons/setLightsAction.svg similarity index 100% rename from ca.michaelabon.logitechlitra.sdPlugin/icons/setLightsAction.svg rename to ca.michaelabon.logitech-litra-lights.sdPlugin/icons/setLightsAction.svg diff --git a/ca.michaelabon.logitechlitra.sdPlugin/icons/turnOffLightsAction.svg b/ca.michaelabon.logitech-litra-lights.sdPlugin/icons/turnOffLightsAction.svg similarity index 100% rename from ca.michaelabon.logitechlitra.sdPlugin/icons/turnOffLightsAction.svg rename to ca.michaelabon.logitech-litra-lights.sdPlugin/icons/turnOffLightsAction.svg diff --git a/ca.michaelabon.logitechlitra.sdPlugin/manifest.json b/ca.michaelabon.logitech-litra-lights.sdPlugin/manifest.json similarity index 88% rename from ca.michaelabon.logitechlitra.sdPlugin/manifest.json rename to ca.michaelabon.logitech-litra-lights.sdPlugin/manifest.json index 7b8ad5d..6172dbc 100644 --- a/ca.michaelabon.logitechlitra.sdPlugin/manifest.json +++ b/ca.michaelabon.logitech-litra-lights.sdPlugin/manifest.json @@ -34,8 +34,8 @@ "Author": "Michael Abon", "Category": "Logitech Litra", "CategoryIcon": "icons/categoryIcon", - "CodePathMac": "build/streamdeck-logitech-litra", - "CodePath": "build/streamdeck-logitech-litra.exe", + "CodePathMac": "build/streamdeck-logitech-litra-lights", + "CodePath": "build/streamdeck-logitech-litra-lights.exe", "Description": "Control your Logitech Litra Glow lights directly from the Stream Deck.", "Icon": "icons/pluginIcon", "Name": "Logitech Litra", @@ -55,5 +55,6 @@ "MinimumVersion": "6.4" }, "URL": "https://github.com/michaelabon/streamdeck-logitech-litra-lights", - "Version": "1.0.3" + "UUID": "ca.michaelabon.logitech-litra-lights", + "Version": "1.0.3.0" } diff --git a/ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/libs/js/api.js b/ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/libs/js/api.js similarity index 100% rename from ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/libs/js/api.js rename to ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/libs/js/api.js diff --git a/ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/libs/js/constants.js b/ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/libs/js/constants.js similarity index 100% rename from ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/libs/js/constants.js rename to ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/libs/js/constants.js diff --git a/ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/libs/js/events.js b/ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/libs/js/events.js similarity index 100% rename from ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/libs/js/events.js rename to ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/libs/js/events.js diff --git a/ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/libs/js/property-inspector.js b/ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/libs/js/property-inspector.js similarity index 100% rename from ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/libs/js/property-inspector.js rename to ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/libs/js/property-inspector.js diff --git a/ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/libs/js/utils.js b/ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/libs/js/utils.js similarity index 100% rename from ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/libs/js/utils.js rename to ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/libs/js/utils.js diff --git a/ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/pi.css b/ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/pi.css similarity index 100% rename from ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/pi.css rename to ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/pi.css diff --git a/ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/pi.html b/ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/pi.html similarity index 100% rename from ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/pi.html rename to ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/pi.html diff --git a/ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/pi.js b/ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/pi.js similarity index 100% rename from ca.michaelabon.logitechlitra.sdPlugin/propertyInspector/pi.js rename to ca.michaelabon.logitech-litra-lights.sdPlugin/propertyInspector/pi.js diff --git a/ca.michaelabon.logitechlitra.sdPlugin/logs/.gitkeep b/ca.michaelabon.logitechlitra.sdPlugin/logs/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/justfile b/justfile index 2dedc2d..38e55ea 100644 --- a/justfile +++ b/justfile @@ -1,11 +1,11 @@ # Not a UUID, I know. Blame Elgato. -UUID := "ca.michaelabon.logitechlitra" +UUID := "ca.michaelabon.logitech-litra-lights" GO := "go" GOFLAGS := "" PLUGIN := UUID + ".sdPlugin" DISTRIBUTION_TOOL := "$HOME/.bin/DistributionTool" -TARGET := "build/streamdeck-logitech-litra" +TARGET := "build/streamdeck-logitech-litra-lights" set windows-shell := ["powershell.exe", "-c"] diff --git a/package-lock.json b/package-lock.json index b01fee1..6b2b138 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,14 +5,17 @@ "packages": { "": { "devDependencies": { - "@elgato/cli": "^0.2.0" + "@elgato/cli": "github:elgatosf/cli#v0.3.0-beta.6" } }, "node_modules/@elgato/cli": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@elgato/cli/-/cli-0.2.0.tgz", - "integrity": "sha512-lj06xI/ldg0cvWkjBsfzRs2pSet1hjQuNgW1Q2DOFrwj7N3CX0p/L/ZZX3GyDTxRiHCCnvVkgi64fKXrhoO1wg==", + "version": "0.3.0-beta.6", + "resolved": "git+ssh://git@github.com/elgatosf/cli.git#eb3fa0ed67e4e02f3f8c026c639b757a3f56fc13", "dev": true, + "license": "MIT", + "dependencies": { + "@elgato/schemas": "^0.3.0" + }, "bin": { "sd": "bin/streamdeck.mjs", "streamdeck": "bin/streamdeck.mjs" @@ -20,6 +23,12 @@ "engines": { "node": "^20.1.0" } + }, + "node_modules/@elgato/schemas": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/@elgato/schemas/-/schemas-0.3.4.tgz", + "integrity": "sha512-pwQVhg2vAK8zvsASmbbf9dYPmUft1n0fV+S4Be47ijRqNKsPpPqZCdBWOH27V0a5eICGr2F9CAn52DY9aj1Ujw==", + "dev": true } } } diff --git a/package.json b/package.json index 194bea3..e3c0a52 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,8 @@ { + "scripts": { + "validate": "streamdeck validate" + }, "devDependencies": { - "@elgato/cli": "^0.2.0" + "@elgato/cli": "github:elgatosf/cli#v0.3.0-beta.6" } }