From 9ecc000328b3d03a1792813eb8b4b1e787733b6b Mon Sep 17 00:00:00 2001
From: Sergey Fuksman <sergey@fuksman.com>
Date: Sat, 23 Dec 2023 10:31:47 +0200
Subject: [PATCH] Change pngquant version

---
 .github/workflows/parse-new-experience.yml |  9 ++++-----
 tools/prepare-experience.js                | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/parse-new-experience.yml b/.github/workflows/parse-new-experience.yml
index f4bfccd..7119e20 100644
--- a/.github/workflows/parse-new-experience.yml
+++ b/.github/workflows/parse-new-experience.yml
@@ -27,11 +27,10 @@ jobs:
         run: |
           node tools/prepare-experience.js
           rm issue.json
-          sudo apt-get update
-          sudo apt-get install -y pngquant
-          for file in experiences/"${{ env.experience_name }}"/screenshots/*.png; do
-            pngquant -f "$file" -o "$file"
-          done
+          sudo apt update
+          sudo apt install snapd
+          sudo snap install pngquant
+          pngquant --force --ext=.png experiences/${{ env.experience_name }}/screenshots/*.png
           file_size=$(stat -c %s "experiences/${{ env.experience_name }}/${{ env.experience_name }}.zip")
           jq --arg file_size $file_size '.fileSize = ($file_size|tonumber)' "experiences/${{ env.experience_name }}/manifest.json" > temp.json && mv temp.json "experiences/${{ env.experience_name }}/manifest.json"
           rm -f temp.json
diff --git a/tools/prepare-experience.js b/tools/prepare-experience.js
index 9060914..3357879 100644
--- a/tools/prepare-experience.js
+++ b/tools/prepare-experience.js
@@ -1,21 +1,21 @@
 const fs = require('fs');
 const issue = require('../issue.json');
-const [issueExperience, issueTitle, issueScreenshot, issueDescription, issueCategories, issueLanguage, issueAuthor, name, id] = Object.values(issue);
 
-const author = "https://github.com/" + issueAuthor;
+const name = issue.name
+const author = "https://github.com/" + issue.author;
 const license = "MIT";
-const categories = issueCategories.split(", ");
+const categories = issue.categories.split(", ");
 
 var experience = {
   $schema: "https://tools.gallery.any.coop/experience.schema.json",
-  id: id,
+  id: issue.id,
   name: name,
   author: author,
   license: license,
-  title: issueTitle,
-  description: issueDescription,
+  title: issue.title,
+  description: issue.description,
   categories: categories,
-  language: issueLanguage,
+  language: issue.language,
   screenshots: [],
   downloadLink: "",
   fileSize: 0
@@ -33,7 +33,7 @@ if (fs.existsSync(dir)) {
 }
 
 var regex = /https:\/\/github.com\/.*\/.*\/.*\/.*\.zip/g;
-const zipLink = issueExperience.match(regex)[0];
+const zipLink = issue.experience.match(regex)[0];
 
 if (!zipLink) {
   throw new Error(`Experience has no link to zip archive`);
@@ -50,12 +50,12 @@ const prodDownloadLink = "https://storage.gallery.any.coop/" + name + "/" + name
 
 var regex = /src\s*=\s*"(.+?)"/g;
 const extension = "png";
-var screenshotLinks = issueScreenshot.match(regex);
+var screenshotLinks = issue.screenshots.match(regex);
 const screenshotsDir = `${dir}/screenshots`;
 
 if (!screenshotLinks) {
   var regex = /\((.*?)\)/g;
-  screenshotLinks = issueScreenshot.match(regex);
+  screenshotLinks = issue.screenshots.match(regex);
   screenshotLinks = screenshotLinks.map(link => link.replace(/\(|\)/g, ''));
 }