-
Step 2
-
- Select Upscaling Type
+ {/* STEP 2 */}
+
+
Step 2
+
Select Upscaling Type
+ {props.model !== "models-DF2K" && !props.batchMode && (
+
+
{
+ if (e.target.checked) {
+ props.setDoubleUpscayl(true);
+ } else {
+ props.setDoubleUpscayl(false);
+ }
+ }}
+ />
+
{
+ props.setDoubleUpscayl(!props.doubleUpscayl);
+ }}
+ >
+ Double Upscayl
- {props.model !== "models-DF2K" && (
-
-
{
- if (e.target.checked) {
- props.setDoubleUpscayl(true);
- } else {
- props.setDoubleUpscayl(false);
- }
- }}
- />
-
{
- props.setDoubleUpscayl(!props.doubleUpscayl);
- }}
- >
- Double Upscayl
-
-
- )}
-
+ )}
+
+
- {/* STEP 3 */}
-
-
Step 3
-
- Defaults to Image's path
-
-
-
+ {/* STEP 3 */}
+
+
Step 3
+
+ Defaults to Image's path
+
+
+
- {/* STEP 4 */}
-
-
Step 4
-
-
-
- ) : (
- <>
- {/* STEP 1 */}
-
-
Step 1
-
-
+ {/* STEP 4 */}
+
+
Step 4
+
+
- {/* STEP 2 */}
-
-
Step 2
-
- Select Upscaling Type
-
-
-
-
- {/* STEP 3 */}
-
-
Step 3
-
- Defaults to Folder's path
-
-
-
-
- {/* STEP 4 */}
-
-
Step 4
-
-
-
- )}
Reset
diff --git a/renderer/components/RightPaneInfo.jsx b/renderer/components/RightPaneInfo.jsx
index 69d94f7..c7b1f22 100644
--- a/renderer/components/RightPaneInfo.jsx
+++ b/renderer/components/RightPaneInfo.jsx
@@ -1,10 +1,10 @@
import React from "react";
-function RightPaneInfo({ version }) {
+function RightPaneInfo({ version, batchMode }) {
return (
<>
- Select an Image to Upscale
+ Select {batchMode ? "a Folder" : "an Image"} to Upscale
Upscayl v{version}
diff --git a/renderer/pages/index.jsx b/renderer/pages/index.jsx
index 8d460c4..52d5839 100644
--- a/renderer/pages/index.jsx
+++ b/renderer/pages/index.jsx
@@ -27,8 +27,12 @@ const Home = () => {
const resetImagePaths = () => {
setProgress("");
+
SetImagePath("");
setUpscaledImagePath("");
+
+ setBatchFolderPath("");
+ setUpscaledBatchFolderPath("");
};
useEffect(() => {
@@ -44,6 +48,7 @@ const Home = () => {
);
resetImagePaths();
} else if (data.includes("failed")) {
+ if (batchMode) return;
alert(
data.includes("encode") ? "ENCODING ERROR => " : "DECODING ERROR => ",
"This image is possibly corrupt or not supported by Upscayl. You could try converting the image into another format and upscaling again. Otherwise, make sure that the output path is correct and you have the proper write permissions for the directory. If not, then unfortuantely this image is not supported by Upscayl, sorry."
@@ -100,6 +105,7 @@ const Home = () => {
const selectImageHandler = async () => {
resetImagePaths();
+
var path = await window.electron.invoke(commands.SELECT_FILE);
if (path !== "cancelled") {
@@ -110,7 +116,10 @@ const Home = () => {
};
const selectFolderHandler = async () => {
+ resetImagePaths();
+
var path = await window.electron.invoke(commands.SELECT_FOLDER);
+
if (path !== "cancelled") {
setBatchFolderPath(path);
SetOutputPath(path + "_upscayled");
@@ -271,11 +280,18 @@ const Home = () => {
) : null}
- {imagePath.length === 0 && batchFolderPath.length === 0 ? (
-
- ) : upscaledImagePath.length === 0 &&
- upscaledBatchFolderPath.length === 0 ? (
- !batchMode ? (
+ {((!batchMode &&
+ imagePath.length === 0 &&
+ upscaledImagePath.length === 0) ||
+ (batchMode &&
+ batchFolderPath.length === 0 &&
+ upscaledBatchFolderPath.length === 0)) && (
+
+ )}
+
+ {!batchMode &&
+ upscaledImagePath.length === 0 &&
+ imagePath.length > 0 && (
{
draggable="false"
alt=""
/>
- ) : (
+ )}
+
+ {batchMode &&
+ upscaledBatchFolderPath.length === 0 &&
+ batchFolderPath.length > 0 && (
Selected folder: {batchFolderPath}
- )
- ) : !batchMode ? (
-
- }
- itemTwo={
-
- }
- className="h-screen"
- />
- ) : (
+ )}
+
+ {batchMode && upscaledBatchFolderPath.length > 0 && (
<>
- Finished Upscaling Folder!
+ All done!
)}
+
+ {!batchMode && imagePath.length > 0 && upscaledImagePath.length > 0 && (
+
+
+ Original
+
+
+
+ }
+ itemTwo={
+ <>
+
+ Upscayled
+
+
+
+ }
+ className="h-screen"
+ />
+ )}
+
+ {/* {imagePath.length === 0 && batchFolderPath.length === 0 ? (
+
+ ) : upscaledImagePath.length === 0 &&
+ upscaledBatchFolderPath.length === 0 ? (
+ !batchMode ? (
+
+ ) : (
+
+ )
+ ) : !batchMode ? (
+
+ ) : (
+
+ )} */}
+