From 6673c4f08e4290e4b7360b43855ba0af8f66e79a Mon Sep 17 00:00:00 2001 From: TGS963 Date: Thu, 27 Apr 2023 23:48:44 +0530 Subject: [PATCH] fixed remember output toggle --- electron/index.ts | 29 ++++++++++++++------- renderer/components/SettingsTab.tsx | 40 ++++++++++++++++------------- renderer/pages/index.tsx | 12 +++++++-- 3 files changed, 52 insertions(+), 29 deletions(-) diff --git a/electron/index.ts b/electron/index.ts index 634cb60..8dbd421 100644 --- a/electron/index.ts +++ b/electron/index.ts @@ -33,7 +33,7 @@ import commands from "./commands"; log.initialize({ preload: true }); function escapeRegExp(string) { - return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string + return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string } // Prepare the renderer once the app is ready @@ -164,7 +164,10 @@ ipcMain.handle(commands.SELECT_FILE, async () => { } else { logit("Selected File Path: ", filePaths[0]); const platform = getPlatform(); - imagePath = platform === "win" ? filePaths[0].replace(new RegExp(escapeRegExp('\\'), 'g'), '\\\\') : filePaths[0]; + imagePath = + platform === "win" + ? filePaths[0].replace(new RegExp(escapeRegExp("\\"), "g"), "\\\\") + : filePaths[0]; mainWindow.webContents .executeJavaScript( `localStorage.setItem("lastImagePath", "${imagePath}");`, @@ -219,15 +222,23 @@ ipcMain.handle(commands.SELECT_FOLDER, async (event, message) => { } else { logit("Selected Folder Path: ", folderPaths[0]); const platform = getPlatform(); - folderPath = platform === "win" ? folderPaths[0].replace(new RegExp(escapeRegExp('\\'), 'g'), '\\\\') : folderPaths[0]; + folderPath = + platform === "win" + ? folderPaths[0].replace(new RegExp(escapeRegExp("\\"), "g"), "\\\\") + : folderPaths[0]; mainWindow.webContents - .executeJavaScript( - `localStorage.setItem("lastFolderPath", "${folderPath}");`, - true - ) + .executeJavaScript('localStorage.getItem("rememberOutputFolder");', true) .then(() => { - logit(`Saved Last Folder Path (${folderPath}) to Local Storage`); + mainWindow.webContents + .executeJavaScript( + `localStorage.setItem("lastFolderPath", "${folderPath}");`, + true + ) + .then(() => { + logit(`Saved Last Folder Path (${folderPath}) to Local Storage`); + }); }); + return folderPaths[0]; } }); @@ -447,7 +458,7 @@ ipcMain.on(commands.UPSCAYL, async (event, payload) => { const gpuId = payload.gpuId as string; const saveImageAs = payload.saveImageAs as string; let inputDir = (payload.imagePath.match(/(.*)[\/\\]/)[1] || "") as string; - let outputDir = folderPath || payload.outputPath as string; + let outputDir = folderPath || (payload.outputPath as string); const isDefaultModel = defaultModels.includes(model); diff --git a/renderer/components/SettingsTab.tsx b/renderer/components/SettingsTab.tsx index 6d55d2c..3c224d1 100644 --- a/renderer/components/SettingsTab.tsx +++ b/renderer/components/SettingsTab.tsx @@ -2,16 +2,14 @@ import React, { useEffect, useState } from "react"; import { themeChange } from "theme-change"; import commands from "../../electron/commands"; import { useAtom } from "jotai"; -import { - customModelsPathAtom, - rememberOutputFolderAtom, - scaleAtom, -} from "../atoms/userSettingsAtom"; +import { customModelsPathAtom, scaleAtom } from "../atoms/userSettingsAtom"; import { modelsListAtom } from "../atoms/modelsListAtom"; interface IProps { batchMode: boolean; setBatchMode: React.Dispatch>; + rememberOutputFolder: boolean; + setRememberOutputFolder: React.Dispatch>; imagePath: string; setModel: React.Dispatch>; saveImageAs: string; @@ -24,6 +22,8 @@ interface IProps { function SettingsTab({ batchMode, setBatchMode, + rememberOutputFolder, + setRememberOutputFolder, imagePath, setModel, gpuId, @@ -45,9 +45,6 @@ function SettingsTab({ const [customModelsPath, setCustomModelsPath] = useAtom(customModelsPathAtom); const [modelOptions, setModelOptions] = useAtom(modelsListAtom); - const [rememberOutputFolder, setRememberOutputFolder] = useAtom( - rememberOutputFolderAtom - ); const [scale, setScale] = useAtom(scaleAtom); @@ -68,7 +65,7 @@ function SettingsTab({ } else { const currentlySavedModel = JSON.parse( localStorage.getItem("model") - ) as typeof modelOptions[0]; + ) as (typeof modelOptions)[0]; setCurrentModel(currentlySavedModel); setModel(currentlySavedModel.value); } @@ -91,6 +88,10 @@ function SettingsTab({ localStorage.setItem("saveImageAs", format); }; + const handleRememberOutputFolder = () => { + setRememberOutputFolder((oldValue) => !oldValue); + }; + const handleGpuIdChange = (e) => { setGpuId(e.target.value); localStorage.setItem("gpuId", e.target.value); @@ -159,9 +160,7 @@ function SettingsTab({ type="checkbox" className="toggle-primary toggle" defaultChecked={rememberOutputFolder} - onChange={() => { - setRememberOutputFolder((oldValue) => !oldValue); - }} + onChange={handleRememberOutputFolder} /> @@ -192,7 +191,8 @@ function SettingsTab({ setCustomModelsPath(customModelPath); window.electron.send(commands.GET_MODELS_LIST, customModelPath); } - }}> + }} + > Select Folder @@ -217,7 +217,8 @@ function SettingsTab({ className={`btn-primary btn ${ saveImageAs === "png" && "btn-accent" }`} - onClick={() => setExportType("png")}> + onClick={() => setExportType("png")} + > PNG {/* JPG */} @@ -225,7 +226,8 @@ function SettingsTab({ className={`btn-primary btn ${ saveImageAs === "jpg" && "btn-accent" }`} - onClick={() => setExportType("jpg")}> + onClick={() => setExportType("jpg")} + > JPG {/* WEBP */} @@ -233,7 +235,8 @@ function SettingsTab({ className={`btn-primary btn ${ saveImageAs === "webp" && "btn-accent" }`} - onClick={() => setExportType("webp")}> + onClick={() => setExportType("webp")} + > WEBP @@ -268,8 +271,9 @@ function SettingsTab({

LOGS

diff --git a/renderer/pages/index.tsx b/renderer/pages/index.tsx index b1b575d..71402e3 100644 --- a/renderer/pages/index.tsx +++ b/renderer/pages/index.tsx @@ -15,6 +15,7 @@ import { modelsListAtom } from "../atoms/modelsListAtom"; import { batchModeAtom, customModelsPathAtom, + rememberOutputFolderAtom, scaleAtom, } from "../atoms/userSettingsAtom"; @@ -29,6 +30,9 @@ const Home = () => { const [loaded, setLoaded] = useState(false); const [version, setVersion] = useState(""); const [batchMode, setBatchMode] = useAtom(batchModeAtom); + const [rememberOutputFolder, setRememberOutputFolder] = useAtom( + rememberOutputFolderAtom + ); const [batchFolderPath, setBatchFolderPath] = useState(""); const [upscaledBatchFolderPath, setUpscaledBatchFolderPath] = useState(""); const [doubleUpscayl, setDoubleUpscayl] = useState(false); @@ -538,6 +542,8 @@ const Home = () => { { onDragOver={(e) => handleDragOver(e)} onDragEnter={(e) => handleDragEnter(e)} onDragLeave={(e) => handleDragLeave(e)} - onPaste={(e) => handlePaste(e)}> + onPaste={(e) => handlePaste(e)} + > {progress.length > 0 && upscaledImagePath.length === 0 && upscaledBatchFolderPath.length === 0 && @@ -635,7 +642,8 @@ const Home = () => {