Update pacakge

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);

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"
           ]

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);

renderer/utils/flags.ts

@@ -1,3 +1,3 @@
 export const FLAGS = {
-  APP_STORE_BUILD: false,
+  APP_STORE_BUILD: true,
 };

resources/entitlements.mas.plist

@@ -2,27 +2,31 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.security.automation.apple-events</key>
-	<true/>
-	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
+	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.cs.allow-jit</key>
 	<true/>
+	<key>com.apple.security.files.bookmarks.app-scope</key>
+	<true/>
 	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
 	<true/>
-	<key>com.apple.security.cs.debugger</key>
-	<true/>
-	<key>com.apple.security.application-groups</key>
-	<string>W2T4W74X87.org.upscayl.Upscayl</string>
 	<key>com.apple.security.cs.disable-library-validation</key>
 	<true/>
-	<key>com.apple.security.files.user-selected.read-write</key>
-	<true/>
-	<key>com.apple.security.inherit</key>
+	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
 	<true/>
 	<key>com.apple.security.network.client</key>
 	<true/>
 	<key>com.apple.security.network.server</key>
 	<true/>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
+	<key>com.apple.security.application-groups</key>
+	<array>
+	<string>W2T4W74X87.org.upscayl.Upscayl</string>
+	</array>
+	<key>com.apple.application-identifier</key>
+	<string>W2T4W74X87.org.upscayl.Upscayl</string>
+	<key>com.apple.developer.team-identifier</key>
+	<string>W2T4W74X87</string>
 </dict>
 </plist>

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."