Skip to content

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

Fix batch upscayl scale skip and refactor error detection

Nayam Amarshe618b46f553df
diff --git a/electron/commands/double-upscayl.ts b/electron/commands/double-upscayl.ts
index af1d4ae..0696895 100644
--- a/electron/commands/double-upscayl.ts
+++ b/electron/commands/double-upscayl.ts
@@ -23,6 +23,7 @@ import { DoubleUpscaylPayload } from "../../common/types/types";
import { ImageFormat } from "../types/types";
import showNotification from "../utils/show-notification";
import { DEFAULT_MODELS } from "../../common/models-list";
+import getModelScale from "../../common/check-model-scale";
const doubleUpscayl = async (event, payload: DoubleUpscaylPayload) => {
const mainWindow = getMainWindow();
@@ -49,7 +50,8 @@ const doubleUpscayl = async (event, payload: DoubleUpscaylPayload) => {
const fullfileName = imagePath.split(slash).slice(-1)[0] as string;
const fileName = parse(fullfileName).name;
- const scale = parseInt(payload.scale) * parseInt(payload.scale);
+ const modelScale = getModelScale(model);
+ const scale = parseInt(payload.scale) ** 2;
const useCustomWidth = payload.useCustomWidth;
const customWidth = useCustomWidth ? payload.customWidth : "";
@@ -112,9 +114,11 @@ const doubleUpscayl = async (event, payload: DoubleUpscaylPayload) => {
// SEND UPSCAYL PROGRESS TO RENDERER
mainWindow.webContents.send(COMMAND.DOUBLE_UPSCAYL_PROGRESS, data);
// IF PROGRESS HAS ERROR, UPSCAYL FAILED
- if (data.includes("invalid gpu") || data.includes("failed")) {
+ if (data.includes("Error")) {
upscayl2.kill();
failed2 = true;
+ } else if (data.includes("Resizing")) {
+ mainWindow.webContents.send(COMMAND.SCALING_AND_CONVERTING);
}
};
@@ -187,6 +191,7 @@ const doubleUpscayl = async (event, payload: DoubleUpscaylPayload) => {
}),
logit,
);
+ logit("πŸš€ Upscaling Second Pass");
childProcesses.push(upscayl2);
upscayl2.process.stderr.on("data", onData2);
upscayl2.process.on("error", onError2);
diff --git a/electron/commands/image-upscayl.ts b/electron/commands/image-upscayl.ts
index de3e0f4..ea7e3e2 100644
--- a/electron/commands/image-upscayl.ts
+++ b/electron/commands/image-upscayl.ts
@@ -118,7 +118,6 @@ const imageUpscayl = async (event, payload: ImageUpscaylPayload) => {
setChildProcesses(upscayl);
setStopped(false);
- let isAlpha = false;
let failed = false;
const onData = (data: string) => {
@@ -126,7 +125,7 @@ const imageUpscayl = async (event, payload: ImageUpscaylPayload) => {
mainWindow.setProgressBar(parseFloat(data.slice(0, data.length)) / 100);
data = data.toString();
mainWindow.webContents.send(COMMAND.UPSCAYL_PROGRESS, data.toString());
- if (data.includes("invalid gpu") || data.includes("failed")) {
+ if (data.includes("Error")) {
upscayl.kill();
failed = true;
} else if (data.includes("Resizing")) {
diff --git a/electron/utils/get-arguments.ts b/electron/utils/get-arguments.ts
index 8aa4968..03bb572 100644
--- a/electron/utils/get-arguments.ts
+++ b/electron/utils/get-arguments.ts
@@ -110,7 +110,7 @@ export const getDoubleUpscaleSecondPassArguments = ({
scale: string;
customWidth: string;
}) => {
- const modelScale = getModelScale(model);
+ const modelScale = (parseInt(getModelScale(model)) ** 2).toString();
let includeScale = modelScale !== scale && !customWidth;
return [
// INPUT IMAGE