From 1954dcf990fc955489d5da414f576df0262e5b3d Mon Sep 17 00:00:00 2001
From: Nayam Amarshe <25067102+NayamAmarshe@users.noreply.github.com>
Date: Sun, 25 Sep 2022 16:45:43 +0530
Subject: [PATCH] Fixed #81 #53 #69

---
 main/binaries.js                      | 12 +++++++-----
 main/index.js                         |  4 ++++
 package.json                          |  2 +-
 renderer/components/LeftPaneSteps.jsx |  2 +-
 renderer/pages/index.jsx              |  6 ++++++
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/main/binaries.js b/main/binaries.js
index f7d9c1a..6e212bb 100644
--- a/main/binaries.js
+++ b/main/binaries.js
@@ -6,18 +6,20 @@
 
 const { join, dirname, resolve } = require("path");
 const { getPlatform } = require("./getPlatform");
-const appRootDir = require("app-root-dir");
 const isDev = require("electron-is-dev");
+const { app } = require("electron");
+
+const appRootDir = app.getAppPath();
 
 const binariesPath = isDev
-  ? join(appRootDir.get(), "resources", getPlatform(), "bin")
-  : join(dirname(appRootDir.get()), "bin");
+  ? join(appRootDir, "resources", getPlatform(), "bin")
+  : join(dirname(appRootDir), "bin");
 
 const execPath = (execName) =>
   resolve(join(binariesPath, `./upscayl-${execName}`));
 
 const modelsPath = isDev
-  ? resolve(join(appRootDir.get(), "resources", "models"))
-  : resolve(join(dirname(appRootDir.get()), "models"));
+  ? resolve(join(appRootDir, "resources", "models"))
+  : resolve(join(dirname(appRootDir), "models"));
 
 module.exports = { execPath, modelsPath };
diff --git a/main/index.js b/main/index.js
index b8ed240..f3b6ffd 100644
--- a/main/index.js
+++ b/main/index.js
@@ -18,6 +18,7 @@ const {
   ipcRenderer,
   shell,
 } = require("electron");
+
 const isDev = require("electron-is-dev");
 const prepareNext = require("electron-next");
 const commands = require("./commands");
@@ -75,6 +76,8 @@ app.on("ready", async () => {
 // Quit the app once all windows are closed
 app.on("window-all-closed", app.quit);
 
+console.log(app.getAppPath());
+//------------------------Select File-----------------------------//
 // ! DONT FORGET TO RESTART THE APP WHEN YOU CHANGE CODE HERE
 ipcMain.handle(commands.SELECT_FILE, async () => {
   const { canceled, filePaths } = await dialog.showOpenDialog({
@@ -91,6 +94,7 @@ ipcMain.handle(commands.SELECT_FILE, async () => {
   }
 });
 
+//------------------------Select Folder-----------------------------//
 ipcMain.handle(commands.SELECT_FOLDER, async (event, message) => {
   const { canceled, filePaths } = await dialog.showOpenDialog({
     properties: ["openDirectory"],
diff --git a/package.json b/package.json
index ed60c85..5d113d5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "upscayl",
   "private": true,
-  "version": "1.5.0",
+  "version": "1.5.5",
   "productName": "Upscayl",
   "homepage": "https://github.com/TGS963/upscayl",
   "contributors": [
diff --git a/renderer/components/LeftPaneSteps.jsx b/renderer/components/LeftPaneSteps.jsx
index 985b84e..8b49322 100644
--- a/renderer/components/LeftPaneSteps.jsx
+++ b/renderer/components/LeftPaneSteps.jsx
@@ -53,7 +53,7 @@ function LeftPaneSteps(props) {
         <select
           name="select-model"
           onDrop={(e) => props.handleDrop(e)}
-          className="animate bg-gradient-white block cursor-pointer rounded-lg p-3 font-medium text-black/90 outline-none hover:bg-slate-200 focus-visible:shadow-lg focus-visible:shadow-white"
+          className="animate bg-gradient-white block cursor-pointer rounded-lg p-3 font-medium text-black/90 outline-none hover:bg-slate-200 focus-visible:ring-2 focus-visible:ring-slate-400"
           onChange={props.handleModelChange}
         >
           <option value="realesrgan-x4plus">General Photo</option>
diff --git a/renderer/pages/index.jsx b/renderer/pages/index.jsx
index 2d59541..90c466f 100644
--- a/renderer/pages/index.jsx
+++ b/renderer/pages/index.jsx
@@ -128,6 +128,9 @@ const Home = () => {
 
   const handleModelChange = (e) => {
     setModel(e.target.value);
+    if (e.target.value === "models-DF2K") {
+      setDoubleUpscayl(false);
+    }
   };
 
   const handleDragEnter = (e) => {
@@ -216,6 +219,7 @@ const Home = () => {
           model,
         });
       } else if (batchMode) {
+        setDoubleUpscayl(false);
         await window.electron.send(commands.FOLDER_UPSCAYL, {
           scaleFactor,
           batchFolderPath,
@@ -339,6 +343,7 @@ const Home = () => {
                   style={{
                     objectFit: "contain",
                   }}
+                  className="bg-[#1d1c23]"
                 />
               </>
             }
@@ -353,6 +358,7 @@ const Home = () => {
                   style={{
                     objectFit: "contain",
                   }}
+                  className="bg-[#1d1c23]"
                 />
               </>
             }