diff --git a/electron/index.ts b/electron/index.ts index 2f6af8b..1502784 100644 --- a/electron/index.ts +++ b/electron/index.ts @@ -51,9 +51,9 @@ app.on("window-all-closed", () => { }); // ! ENABLE THIS FOR MACOS APP STORE BUILD -// if (getPlatform() === "mac") { -// app.commandLine.appendSwitch("in-process-gpu"); -// } +if (getPlatform() === "mac") { + app.commandLine.appendSwitch("in-process-gpu"); +} ipcMain.on(COMMAND.STOP, stop); @@ -73,4 +73,4 @@ ipcMain.on(COMMAND.FOLDER_UPSCAYL, batchUpscayl); ipcMain.on(COMMAND.DOUBLE_UPSCAYL, doubleUpscayl); -autoUpdater.on("update-downloaded", autoUpdate); +// autoUpdater.on("update-downloaded", autoUpdate); diff --git a/package.json b/package.json index d8128b8..cfa00ef 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,8 @@ "publish-win-app": "tsc && npm run build && electron-builder -w --publish always", "publish-mac-universal-app": "tsc && npm run build && electron-builder --mac --universal --publish always", "publish-mac-app": "tsc && npm run build && electron-builder --mac --x64 --publish always", - "publish-mac-arm-app": "tsc && npm run build && electron-builder --mac --arm64 --publish always" + "publish-mac-arm-app": "tsc && npm run build && electron-builder --mac --arm64 --publish always", + "dist:appstore": "CSC_KEY_PASSWORD=$PASSWORD CSC_LINK=$(openssl base64 -in $CERTIFICATE_PATH) npm run dist:mac-mas" }, "build": { "productName": "Upscayl", @@ -101,13 +102,15 @@ "type": "distribution", "category": "public.app-category.photography", "entitlements": "resources/entitlements.mas.plist", + "entitlementsInherit": "resources/entitlements.mas.inherit.plist", "provisioningProfile": "embedded.provisionprofile", "mergeASARs": false, + "gatekeeperAssess": false, "icon": "build/icon.icns", "x64ArchFiles": "*", "target": [ { - "target": "pkg", + "target": "mas", "arch": [ "universal" ] diff --git a/renderer/components/upscayl-tab/view/ProgressBar.tsx b/renderer/components/upscayl-tab/view/ProgressBar.tsx index 593f550..09d7d34 100644 --- a/renderer/components/upscayl-tab/view/ProgressBar.tsx +++ b/renderer/components/upscayl-tab/view/ProgressBar.tsx @@ -6,11 +6,17 @@ function ProgressBar({ doubleUpscaylCounter, stopHandler, batchMode, +}: { + progress: string; + doubleUpscaylCounter: number; + stopHandler: () => void; + batchMode: boolean; }) { const [batchProgress, setBatchProgress] = React.useState(0); React.useEffect(() => { - const progressString = progress.replace(/\n/g, ""); + const progressString = progress.trim().replace(/\n/g, ""); + // Remove trailing and leading spaces console.log({ progressString }); if (progressString.length === 5 && progressString === "0.00%") { setBatchProgress((prev) => prev + 1); diff --git a/renderer/utils/flags.ts b/renderer/utils/flags.ts index e4f4a9a..ffd630e 100644 --- a/renderer/utils/flags.ts +++ b/renderer/utils/flags.ts @@ -1,3 +1,3 @@ export const FLAGS = { - APP_STORE_BUILD: false, + APP_STORE_BUILD: true, }; diff --git a/resources/entitlements.mas.plist b/resources/entitlements.mas.plist index e18efb4..811c1de 100644 --- a/resources/entitlements.mas.plist +++ b/resources/entitlements.mas.plist @@ -2,27 +2,31 @@ - com.apple.security.automation.apple-events - - com.apple.security.cs.allow-dyld-environment-variables + com.apple.security.app-sandbox com.apple.security.cs.allow-jit + com.apple.security.files.bookmarks.app-scope + com.apple.security.cs.allow-unsigned-executable-memory - com.apple.security.cs.debugger - - com.apple.security.application-groups - W2T4W74X87.org.upscayl.Upscayl com.apple.security.cs.disable-library-validation - com.apple.security.files.user-selected.read-write - - com.apple.security.inherit + com.apple.security.cs.allow-dyld-environment-variables com.apple.security.network.client com.apple.security.network.server + com.apple.security.files.user-selected.read-write + + com.apple.security.application-groups + + W2T4W74X87.org.upscayl.Upscayl + + com.apple.application-identifier + W2T4W74X87.org.upscayl.Upscayl + com.apple.developer.team-identifier + W2T4W74X87 \ No newline at end of file diff --git a/resources/linux/bin/upscayl-bin b/resources/linux/bin/upscayl-bin index 6b10886..343e66e 100755 Binary files a/resources/linux/bin/upscayl-bin and b/resources/linux/bin/upscayl-bin differ diff --git a/resources/mac/bin/upscayl-bin b/resources/mac/bin/upscayl-bin index d54e620..562e0d0 100755 Binary files a/resources/mac/bin/upscayl-bin and b/resources/mac/bin/upscayl-bin differ diff --git a/resources/win/bin/upscayl-bin.exe b/resources/win/bin/upscayl-bin.exe index f6b9916..32c13f7 100644 Binary files a/resources/win/bin/upscayl-bin.exe and b/resources/win/bin/upscayl-bin.exe differ diff --git a/update_upscayl_ncnn_binaries.sh b/update_upscayl_ncnn_binaries.sh new file mode 100644 index 0000000..1315c04 --- /dev/null +++ b/update_upscayl_ncnn_binaries.sh @@ -0,0 +1,19 @@ +#!/bin/bash + + +# Step 1: Download all the zip files from the GitHub releases page +curl -s https://api.github.com/repos/upscayl/upscayl-ncnn/releases/latest | grep "realesrgan-ncnn-vulkan" | cut -d : -f 2,3 | tr -d \" | wget -qi - > /dev/null 2>&1 + +# Get the latest version number +VERSION=curl -s https://api.github.com/repos/upscayl/upscayl-ncnn/releases/latest | jq -r ".tag_name" +echo "Latest version: $VERSION" + +# Step 2: Extract the required zip files to their respective directories +unzip -j ./realesrgan-ncnn-vulkan-$VERSION-ubuntu.zip -d resources/linux/bin +# unzip realesrgan-ncnn-vulkan-$VERSION-macos.zip -d resources/macos/bin +# unzip realesrgan-ncnn-vulkan-$VERSION-windows.zip -d resources/windows/bin + +# Step 4: Clean up the zip files +# rm *.zip + +echo "Script executed successfully." \ No newline at end of file