Skip to content

πŸ†™ Upscayl - #1 Free and Open Source AI Image Upscaler for Linux, MacOS and Windows.

Fix models

Nayam Amarshe6cfaf45b2aae
diff --git a/common/models-list.ts b/common/models-list.ts
index b90583d..c6b7c3e 100644
--- a/common/models-list.ts
+++ b/common/models-list.ts
@@ -1,26 +1,26 @@
export const MODELS = {
- "realesrgan-x4plus": {
- id: "realesrgan-x4plus",
+ "upscayl-standard-4x": {
+ id: "upscayl-standard-4x",
name: "Upscayl Standard",
},
- "realesrgan-x4fast": {
- id: "realesrgan-x4fast",
+ "upscayl-lite-4x": {
+ id: "upscayl-lite-4x",
name: "Upscayl Lite",
},
remacri: {
- id: "remacri",
+ id: "remacri-4x",
name: "Remacri (Non-Commercial)",
},
ultramix_balanced: {
- id: "ultramix_balanced",
+ id: "ultramix-balanced-4x",
name: "Ultramix (Non-Commercial)",
},
ultrasharp: {
- id: "ultrasharp",
+ id: "ultrasharp-4x",
name: "Ultrasharp (Non-Commercial)",
},
- "realesrgan-x4plus-anime": {
- id: "realesrgan-x4plus-anime",
+ "digital-art-4x": {
+ id: "digital-art-4x",
name: "Digital Art",
},
};
diff --git a/renderer/atoms/user-settings-atom.ts b/renderer/atoms/user-settings-atom.ts
index 904edc8..6ef89ed 100644
--- a/renderer/atoms/user-settings-atom.ts
+++ b/renderer/atoms/user-settings-atom.ts
@@ -10,9 +10,9 @@ export const customModelsPathAtom = atomWithStorage<string | null>(
export const selectedModelIdAtom = atomWithStorage<ModelId | string>(
"selectedModelId",
- "realesrgan-x4plus",
+ "upscayl-standard-4x",
);
-export const doubleUpscaylAtom = atomWithStorage("selectedModelId", false);
+export const doubleUpscaylAtom = atomWithStorage("doubleUpscayl", false);
export const gpuIdAtom = atomWithStorage("gpuId", "");
export const saveImageAsAtom = atomWithStorage<ImageFormat>(
"saveImageAs",
diff --git a/renderer/components/main-content/index.tsx b/renderer/components/main-content/index.tsx
index 0b89aa5..8097546 100644
--- a/renderer/components/main-content/index.tsx
+++ b/renderer/components/main-content/index.tsx
@@ -167,6 +167,8 @@ const MainContent = ({
e.preventDefault();
const items = e.clipboardData.items;
const files = e.clipboardData.files;
+ console.log("πŸš€ => files:", files);
+
if (items.length === 0 || files.length === 0) {
toast({
title: t("ERRORS.INVALID_IMAGE_ERROR.TITLE"),
diff --git a/renderer/components/sidebar/index.tsx b/renderer/components/sidebar/index.tsx
index a185a08..d37e6c2 100644
--- a/renderer/components/sidebar/index.tsx
+++ b/renderer/components/sidebar/index.tsx
@@ -28,10 +28,10 @@ import {
import { useToast } from "@/components/ui/use-toast";
import UpscaylSteps from "./upscayl-tab/upscayl-steps";
import SettingsTab from "./settings-tab";
-import Footer from "../Footer";
+import Footer from "../footer";
import { NewsModal } from "../news-modal";
-import Tabs from "../Tabs";
-import Header from "../Header";
+import Tabs from "../tabs";
+import Header from "../header";
import { ChevronLeftIcon } from "lucide-react";
import { logAtom } from "@/atoms/log-atom";
import { ELECTRON_COMMANDS } from "@common/electron-commands";
@@ -90,15 +90,6 @@ const Sidebar = ({
const tileSize = useAtomValue(tileSizeAtom);
const [showSidebar, setShowSidebar] = useAtom(showSidebarAtom);
- const handleModelChange = (e: any) => {
- setSelectedModelId(e.value);
- logit("πŸ”€ Model changed: ", e.value);
- localStorage.setItem(
- "model",
- JSON.stringify({ label: e.label, value: e.value }),
- );
- };
-
const upscaylHandler = async () => {
logit("πŸ”„ Resetting Upscaled Image Path");
setUpscaledImagePath("");
diff --git a/renderer/components/sidebar/upscayl-tab/select-model.tsx b/renderer/components/sidebar/upscayl-tab/select-model.tsx
index d8ac0e9..de8b2f1 100644
--- a/renderer/components/sidebar/upscayl-tab/select-model.tsx
+++ b/renderer/components/sidebar/upscayl-tab/select-model.tsx
@@ -18,11 +18,15 @@ import { customModelIdsAtom } from "@/atoms/models-list-atom";
export default function SelectModel() {
const [selectedModelId, setSelectedModelId] = useAtom(selectedModelIdAtom);
+ console.log("πŸš€ => selectedModelId:", selectedModelId);
+
const customModelIds = useAtomValue(customModelIdsAtom);
const [open, setOpen] = useState(false);
const [zoomedModel, setZoomedModel] = useState<ModelId | null>(null);
const handleModelSelect = (model: ModelId | string) => {
+ console.log("πŸš€ => model:", model);
+
setSelectedModelId(model);
setOpen(false);
};
diff --git a/renderer/components/sidebar/upscayl-tab/upscayl-steps.tsx b/renderer/components/sidebar/upscayl-tab/upscayl-steps.tsx
index c2ca2ea..cc74e98 100644
--- a/renderer/components/sidebar/upscayl-tab/upscayl-steps.tsx
+++ b/renderer/components/sidebar/upscayl-tab/upscayl-steps.tsx
@@ -176,7 +176,7 @@ function UpscaylSteps({
<p
className="cursor-pointer text-sm"
onClick={(e) => {
- setDoubleUpscayl(!doubleUpscayl);
+ setDoubleUpscayl((prev) => !prev);
}}
>
{t("APP.DOUBLE_UPSCAYL.TITLE")}
diff --git a/renderer/public/model-comparison/realesrgan-x4plus-anime/after.webp b/renderer/public/model-comparison/digital-art-4x/after.webp
similarity index 100%
rename from renderer/public/model-comparison/realesrgan-x4plus-anime/after.webp
rename to renderer/public/model-comparison/digital-art-4x/after.webp
diff --git a/renderer/public/model-comparison/realesrgan-x4plus-anime/before.webp b/renderer/public/model-comparison/digital-art-4x/before.webp
similarity index 100%
rename from renderer/public/model-comparison/realesrgan-x4plus-anime/before.webp
rename to renderer/public/model-comparison/digital-art-4x/before.webp
diff --git a/renderer/public/model-comparison/realesrgan-x4fast/after.webp b/renderer/public/model-comparison/remacri-4x/after.webp
similarity index 100%
rename from renderer/public/model-comparison/realesrgan-x4fast/after.webp
rename to renderer/public/model-comparison/remacri-4x/after.webp
diff --git a/renderer/public/model-comparison/realesrgan-x4fast/before.webp b/renderer/public/model-comparison/remacri-4x/before.webp
similarity index 100%
rename from renderer/public/model-comparison/realesrgan-x4fast/before.webp
rename to renderer/public/model-comparison/remacri-4x/before.webp
diff --git a/renderer/public/model-comparison/realesrgan-x4plus/after.webp b/renderer/public/model-comparison/ultramix-balanced-4x/after.webp
similarity index 100%
rename from renderer/public/model-comparison/realesrgan-x4plus/after.webp
rename to renderer/public/model-comparison/ultramix-balanced-4x/after.webp
diff --git a/renderer/public/model-comparison/realesrgan-x4plus/before.webp b/renderer/public/model-comparison/ultramix-balanced-4x/before.webp
similarity index 100%
rename from renderer/public/model-comparison/realesrgan-x4plus/before.webp
rename to renderer/public/model-comparison/ultramix-balanced-4x/before.webp
diff --git a/renderer/public/model-comparison/remacri/after.webp b/renderer/public/model-comparison/ultrasharp-4x/after.webp
similarity index 100%
rename from renderer/public/model-comparison/remacri/after.webp
rename to renderer/public/model-comparison/ultrasharp-4x/after.webp
diff --git a/renderer/public/model-comparison/remacri/before.webp b/renderer/public/model-comparison/ultrasharp-4x/before.webp
similarity index 100%
rename from renderer/public/model-comparison/remacri/before.webp
rename to renderer/public/model-comparison/ultrasharp-4x/before.webp
diff --git a/renderer/public/model-comparison/ultramix_balanced/after.webp b/renderer/public/model-comparison/upscayl-lite-4x/after.webp
similarity index 100%
rename from renderer/public/model-comparison/ultramix_balanced/after.webp
rename to renderer/public/model-comparison/upscayl-lite-4x/after.webp
diff --git a/renderer/public/model-comparison/ultramix_balanced/before.webp b/renderer/public/model-comparison/upscayl-lite-4x/before.webp
similarity index 100%
rename from renderer/public/model-comparison/ultramix_balanced/before.webp
rename to renderer/public/model-comparison/upscayl-lite-4x/before.webp
diff --git a/renderer/public/model-comparison/ultrasharp/after.webp b/renderer/public/model-comparison/upscayl-standard-4x/after.webp
similarity index 100%
rename from renderer/public/model-comparison/ultrasharp/after.webp
rename to renderer/public/model-comparison/upscayl-standard-4x/after.webp
diff --git a/renderer/public/model-comparison/ultrasharp/before.webp b/renderer/public/model-comparison/upscayl-standard-4x/before.webp
similarity index 100%
rename from renderer/public/model-comparison/ultrasharp/before.webp
rename to renderer/public/model-comparison/upscayl-standard-4x/before.webp
diff --git a/resources/models/realesrgan-x4plus-anime.bin b/resources/models/digital-art-4x.bin
similarity index 100%
rename from resources/models/realesrgan-x4plus-anime.bin
rename to resources/models/digital-art-4x.bin
diff --git a/resources/models/realesrgan-x4plus-anime.param b/resources/models/digital-art-4x.param
similarity index 100%
rename from resources/models/realesrgan-x4plus-anime.param
rename to resources/models/digital-art-4x.param
diff --git a/resources/models/remacri.bin b/resources/models/remacri-4x.bin
similarity index 100%
rename from resources/models/remacri.bin
rename to resources/models/remacri-4x.bin
diff --git a/resources/models/remacri.param b/resources/models/remacri-4x.param
similarity index 100%
rename from resources/models/remacri.param
rename to resources/models/remacri-4x.param
diff --git a/resources/models/ultramix_balanced.bin b/resources/models/ultramix-balanced-4x.bin
similarity index 100%
rename from resources/models/ultramix_balanced.bin
rename to resources/models/ultramix-balanced-4x.bin
diff --git a/resources/models/ultramix_balanced.param b/resources/models/ultramix-balanced-4x.param
similarity index 100%
rename from resources/models/ultramix_balanced.param
rename to resources/models/ultramix-balanced-4x.param
diff --git a/resources/models/ultrasharp.bin b/resources/models/ultrasharp-4x.bin
similarity index 100%
rename from resources/models/ultrasharp.bin
rename to resources/models/ultrasharp-4x.bin
diff --git a/resources/models/ultrasharp.param b/resources/models/ultrasharp-4x.param
similarity index 100%
rename from resources/models/ultrasharp.param
rename to resources/models/ultrasharp-4x.param
diff --git a/resources/models/realesrgan-x4fast.bin b/resources/models/upscayl-lite-4x.bin
similarity index 100%
rename from resources/models/realesrgan-x4fast.bin
rename to resources/models/upscayl-lite-4x.bin
diff --git a/resources/models/realesrgan-x4fast.param b/resources/models/upscayl-lite-4x.param
similarity index 100%
rename from resources/models/realesrgan-x4fast.param
rename to resources/models/upscayl-lite-4x.param
diff --git a/resources/models/realesrgan-x4plus.bin b/resources/models/upscayl-standard-4x.bin
similarity index 100%
rename from resources/models/realesrgan-x4plus.bin
rename to resources/models/upscayl-standard-4x.bin
diff --git a/resources/models/realesrgan-x4plus.param b/resources/models/upscayl-standard-4x.param
similarity index 100%
rename from resources/models/realesrgan-x4plus.param
rename to resources/models/upscayl-standard-4x.param