d

Signed-off-by: ClaytonTDM <[email protected]>

.github/workflows/gif-to-webp-converter.js

@@ -1,12 +1,12 @@
-const fs = require("fs").promises;
-const path = require("path");
 const { execFile } = require("child_process");
 const util = require("util");
 const execFilePromise = util.promisify(execFile);
+const path = require("path");
+const fs = require("fs").promises;
 
+const gifsiclePath = "gifsicle";
 const gifskiPath = "gifski";
 const convertPath = "convert";
-const identifyPath = "identify";
 
 const textFileExtensions = [
 	".md",
@@ -17,77 +17,75 @@ const textFileExtensions = [
 	".htm",
 	".htm",
 	".txt",
-	".asp"
+	".asp",
 ];
 
 async function isAnimatedGif(filePath) {
-	try {
-		const { stdout } = await execFilePromise("identify", [
-			"-format",
-			"%n\n",
-			filePath,
-		]);
-		const frameCount = parseInt(stdout.trim(), 10);
-		return frameCount > 1;
-	} catch (error) {
-		console.error(`Error checking if GIF is animated: ${error.message}`);
-		return false;
-	}
+    try {
+        const { stdout } = await execFilePromise(gifsiclePath, ["--info", filePath]);
+        return stdout.includes("+ image #");
+    } catch (error) {
+        console.error(`Error checking if GIF is animated: ${error.message}`);
+        return false;
+    }
 }
 
 async function getGifLoopCount(filePath) {
-	try {
-		const { stdout } = await execFilePromise(identifyPath, [
-			"-format",
-			"%L",
-			filePath,
-		]);
-		const loopCount = parseInt(stdout.trim(), 10);
-		return isNaN(loopCount) ? 0 : loopCount;
-	} catch (error) {
-		console.error(`Error getting GIF loop count: ${error.message}`);
-		return 0;
-	}
+    try {
+        const { stdout } = await execFilePromise(gifsiclePath, ["--info", filePath]);
+        const loopMatch = stdout.match(/loop forever|loop count (\d+)/);
+        if (loopMatch) {
+            if (loopMatch[0] === "loop forever") {
+                return 0; // Infinite loop
+            } else {
+                return parseInt(loopMatch[1], 10);
+            }
+        }
+        return 1; // Default to playing once if no loop information is found
+    } catch (error) {
+        console.error(`Error getting GIF loop count: ${error.message}`);
+        return 1; // Default to playing once on error
+    }
 }
 
 async function convertGifToWebp(inputPath, outputPath) {
-	try {
-		const animated = await isAnimatedGif(inputPath);
-		if (animated) {
-			const loopCount = await getGifLoopCount(inputPath);
-			const loopArg =
-				loopCount === 0 ? "--repeat=0" : `--repeat=${loopCount - 1}`;
-			await execFilePromise(gifskiPath, [
-				"--quality=100",
-				loopArg,
-				"--output",
-				outputPath,
-				inputPath,
-			]);
-		} else {
-			await execFilePromise(convertPath, [
-				inputPath,
-				"-define",
-				"webp:lossless=true",
-				outputPath,
-			]);
-		}
-		console.log(`Converted ${inputPath} to ${outputPath}`);
-
-		// Delete the original GIF file
-		await fs.unlink(inputPath);
-		console.log(`Deleted original GIF: ${inputPath}`);
-
-		return true;
-	} catch (error) {
-		console.error(`Error converting ${inputPath}: ${error.message}`);
-		if (error.code === "ENOENT") {
-			console.error(
-				"The required executable was not found. Please make sure gifski and ImageMagick are installed and the paths are correct."
-			);
-		}
-		return false;
-	}
+    try {
+        const animated = await isAnimatedGif(inputPath);
+        if (animated) {
+            const loopCount = await getGifLoopCount(inputPath);
+            const loopArg = loopCount === 0 ? "--repeat=0" : `--repeat=${loopCount}`;
+            await execFilePromise(gifskiPath, [
+                "--quality=100",
+                loopArg,
+                "--output",
+                outputPath,
+                inputPath,
+            ]);
+        } else {
+            // For non-animated GIFs, use ImageMagick's convert
+            await execFilePromise(convertPath, [
+                inputPath,
+                "-define",
+                "webp:lossless=true",
+                outputPath,
+            ]);
+        }
+        console.log(`Converted ${inputPath} to ${outputPath}`);
+
+        // Delete the original GIF file
+        await fs.unlink(inputPath);
+        console.log(`Deleted original GIF: ${inputPath}`);
+
+        return true;
+    } catch (error) {
+        console.error(`Error converting ${inputPath}: ${error.message}`);
+        if (error.code === "ENOENT") {
+            console.error(
+                "The required executable was not found. Please make sure gifsicle, gifski, and ImageMagick are installed and the paths are correct."
+            );
+        }
+        return false;
+    }
 }
 
 async function isTextFile(filePath) {

.github/workflows/gifToWebp.yml

@@ -24,8 +24,7 @@
 #            - name: Install dependencies
 #              run: |
 #                  sudo apt-get update
-#                  sudo apt-get install -y imagemagick
-#                  sudo apt-get install -y webp
+#                  sudo apt-get install -y imagemagick webp gifsicle
 #                  curl -L https://github.com/ImageOptim/gifski/releases/download/1.32.0/gifski_1.32.0-1_amd64.deb -o gifski.deb
 #                  sudo dpkg -i gifski.deb
 #                  rm gifski.deb