Merge pull request #6 from TGS963/temporary-release

Auto Update

main/binaries.js

@@ -2,13 +2,11 @@ const path = require("path");
 const { rootPath } = require("electron-root-path");
 const { isPackaged } = require("electron-is-packaged");
 const { getPlatform } = require("./getPlatform");
+const {app} = require('electron')
 
 const IS_PROD = process.env.NODE_ENV === "production";
 
-const binariesPath =
-  IS_PROD && isPackaged // the path to a bundled electron app.
-    ? path.join(rootPath, "./Contents", "./Resources", "./bin")
-    : path.join(rootPath, "./resources", getPlatform(), "./bin");
+const binariesPath = path.join(app.getAppPath(), "../", getPlatform(), "./bin");
 
 const execPath = path.resolve(path.join(binariesPath, "./upscayl"));
 const modelsPath = path.resolve(path.join(binariesPath, "./models"));

main/commands.js

@@ -0,0 +1,9 @@
+const commands = {
+  SELECT_FILE: "Select a File",
+  SELECT_FOLDER: "Select a Folder",
+  UPSCAYL: "Upscale the Image",
+  UPSCAYL_DONE: "Upscaling Done",
+  UPSCAYL_PROGRESS: "Send Progress from Main to Renderer",
+};
+
+module.exports = commands;

main/index.js

@@ -19,7 +19,7 @@ const {
 } = require("electron");
 const isDev = require("electron-is-dev");
 const prepareNext = require("electron-next");
-const commands = require("../constants/commands");
+const commands = require("./commands");
 const sharp = require("sharp");
 
 // Prepare the renderer once the app is ready
@@ -96,6 +96,7 @@ ipcMain.handle(commands.SELECT_FOLDER, async (event, message) => {
 });
 
 ipcMain.on(commands.UPSCAYL, async (event, payload) => {
+  //console.log(execPath)
   console.log(payload);
   const model = payload.model;
   const scale = payload.scaleFactor;

next.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+    experimental: {
+        images: {
+            unoptimized: true
+        }
+    }
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "upscayl",
   "private": true,
-  "version": "1.0.0",
+  "version": "1.0.3",
   "productName": "Upscayl",
   "author": "TGS963 <nayam@nay.am>",
   "email": "nay@am.com",
@@ -27,11 +27,14 @@
     "asar": true,
     "extraFiles": [
       {
-        "from": "resources/linux/bin",
-        "to": "Resources/bin",
-        "filter": [
-          "**/*"
-        ]
+        "from": "constants",
+        "to": "constants",
+        "filter": ["**/*"]
+      },
+      {
+        "from": "resources",
+        "to": "resources",
+        "filter": ["**/*"]
       }
     ],
     "linux": {
@@ -39,8 +42,10 @@
         "github"
       ],
       "target": [
-        "AppImage",
-        "flatpak"
+        "AppImage"
+      ],
+      "asarUnpack": [
+         "**/node_modules/sharp/**"
       ]
     },
     "files": [

renderer/pages/index.jsx

@@ -1,10 +1,14 @@
 import { useState, useEffect, useRef } from "react";
-import commands from "../../constants/commands";
+import commands from "../../main/commands";
 import {
   ReactCompareSlider,
   ReactCompareSliderImage,
 } from "react-compare-slider";
 
+import Animated from '../public/loading.svg'
+import Image from 'next/image'
+
+
 const Home = () => {
   const [imagePath, SetImagePath] = useState("");
   const [upscaledImagePath, setUpscaledImagePath] = useState("");
@@ -195,7 +199,7 @@ const Home = () => {
         {progress.length > 0 && (
           <div className="absolute flex h-full w-full flex-col items-center justify-center bg-black/50 backdrop-blur-lg">
             <div className="flex flex-col items-center gap-2">
-              <img src="/loading.svg" className="w-10" alt="Loading" />
+              <Image src={Animated} />
               <p className="font-bold text-neutral-50">{progress}</p>
             </div>
           </div>