From 318c4ba67aaabb8b834eec6aaf7283d8d8874012 Mon Sep 17 00:00:00 2001
From: CommanderFoo <944078+CommanderFoo@users.noreply.github.com>
Date: Mon, 11 Nov 2024 23:40:20 +0000
Subject: [PATCH] add: jpg save format

Test Notes: n/a
---
 index.html   |  4 ++++
 main.js      | 20 ++++++++++++++------
 package.json |  2 +-
 preload.js   |  1 +
 renderer.js  | 10 ++++++++--
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index 715b727..621cb7c 100644
--- a/index.html
+++ b/index.html
@@ -13,6 +13,10 @@
         <div class="toolbar-left">
             <button id="selectFolderBtn" class="btn"><i class="fas fa-folder-open"></i> Select Folder</button>
             <button id="addFilesBtn" class="btn"><i class="fas fa-file"></i> Add Files</button>
+            <select id="atlasFormat" class="select">
+                <option value="png" selected>PNG</option>
+                <option value="jpg">JPG</option>
+            </select>
             <select id="atlasSizeSelect" class="select"></select>
             <select id="paddingSelect" class="select">
                 <option value="0" selected>0px</option>
diff --git a/main.js b/main.js
index 13e949c..d228c50 100644
--- a/main.js
+++ b/main.js
@@ -5,6 +5,7 @@ const sharp = require("sharp");
 
 let store;
 let main_window;
+let format = "png";
 
 async function initialize_store() {
 	const { default: Store } = await import("electron-store");
@@ -164,16 +165,24 @@ app.whenReady().then(async () => {
 		}
 	});
 
-	ipcMain.handle("save-atlas", async (event, { data_url, default_path, quality }) => {
+	ipcMain.handle("save-atlas", async (event, { data_url, default_path, quality, format }) => {
+		if (!format) {
+			format = "png"; // Default to PNG if format is not provided
+		}
 		const result = await dialog.showSaveDialog({
 			default_path,
-			filters: [{ name: "PNG", extensions: ["png"] }]
+			filters: [{ name: format.toUpperCase(), extensions: [format] }]
 		});
 		if (!result.canceled) {
-			const base64_data = data_url.replace(/^data:image\/png;base64,/, "");
+			const base64_data = data_url.replace(/^data:image\/(png|jpeg);base64,/, "");
 			const buffer = Buffer.from(base64_data, "base64");
-			const png_buffer = await sharp(buffer).png({ quality: Math.round(parseFloat(quality) * 100) }).toBuffer();
-			await fs.writeFile(result.filePath, png_buffer, "base64");
+			let image_buffer;
+			if (format === "jpg") {
+				image_buffer = await sharp(buffer).jpeg({ quality: Math.round(parseFloat(quality) * 100) }).toBuffer();
+			} else {
+				image_buffer = await sharp(buffer).png({ quality: Math.round(parseFloat(quality) * 100) }).toBuffer();
+			}
+			await fs.writeFile(result.filePath, image_buffer, "base64");
 			return result.filePath;
 		}
 	});
@@ -226,7 +235,6 @@ app.whenReady().then(async () => {
 		return store.get("atlas_zoom_factor", 0.6); // Change default to 0.6 (60%)
 	});
 
-	// Add these new IPC handlers
 	ipcMain.handle("save-project", async (event, project_data) => {
 		const result = await dialog.showSaveDialog({
 			title: "Save Project",
diff --git a/package.json b/package.json
index 0c5317b..5fb05e7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sprite-packer",
   "productName": "Sprite Packer",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "main": "main.js",
   "scripts": {
     "start": "electron .",
diff --git a/preload.js b/preload.js
index 245a039..0d9f48e 100644
--- a/preload.js
+++ b/preload.js
@@ -19,4 +19,5 @@ contextBridge.exposeInMainWorld("electronAPI", {
 	save_project: (projectData) => ipcRenderer.invoke("save-project", projectData),
 	load_project: () => ipcRenderer.invoke("load-project"),
 	open_external: (url) => ipcRenderer.invoke("open-external", url),
+	select_format: () => ipcRenderer.invoke("select-format"),
 });
\ No newline at end of file
diff --git a/renderer.js b/renderer.js
index cd21de2..2912ede 100644
--- a/renderer.js
+++ b/renderer.js
@@ -9,6 +9,7 @@ const preview_canvas = document.getElementById("previewCanvas");
 const ctx = preview_canvas.getContext("2d");
 const quality_select = document.getElementById("qualitySelect");
 const canvas_container = document.getElementById("canvasContainer");
+const atlas_format_select = document.getElementById("atlasFormat");
 
 const save_atlas_btn = document.getElementById("saveAtlasBtn");
 const save_project_btn = document.getElementById("saveProjectBtn");
@@ -585,8 +586,13 @@ if (image_files.length > 0) {
 save_atlas_btn.addEventListener("click", async () => {
 	if (packed_atlas_data_url) {
 		try {
-			const default_path = "sprite_atlas.png";
-			const saved_path = await window.electronAPI.save_atlas({ data_url: packed_atlas_data_url, default_path, quality: quality_select.value });
+			const default_path = `sprite_atlas.${atlas_format_select.value}`;
+			const saved_path = await window.electronAPI.save_atlas({
+				data_url: packed_atlas_data_url,
+				default_path,
+				quality: quality_select.value,
+				format: atlas_format_select.value
+			});
 			if (saved_path) {
 
 			}