Update app store build and binaries

.gitignore

@@ -48,4 +48,5 @@ build-dir/
 main/*.js
 main/utils/*.js
 
-.env
+.env
+*.provisionprofile

electron/index.ts

@@ -40,7 +40,7 @@ app.on("ready", async () => {
     autoUpdater.checkForUpdates();
   }
 
-  log.info("🚀 UPSCAYL EXEC PATH: ", execPath("realesrgan"));
+  log.info("🚀 UPSCAYL EXEC PATH: ", execPath("bin"));
   log.info("🚀 MODELS PATH: ", modelsPath);
 });
 

electron/utils/get-resource-paths.ts

@@ -15,8 +15,7 @@ const binariesPath = isDev
   ? join(appRootDir, "resources", getPlatform()!, "bin")
   : join(dirname(appRootDir), "bin");
 
-const execPath = (execName) =>
+const execPath = (execName) => resolve(join(binariesPath, `./upscayl-bin`));
-  resolve(join(binariesPath, `./upscayl-${execName}`));
 
 const modelsPath = isDev
   ? resolve(join(appRootDir, "resources", "models"))

electron/utils/spawn-upscayl.ts

@@ -8,7 +8,7 @@ export const spawnUpscayl = (
 ) => {
   logit("📢 Upscayl Command: ", command);
 
-  const spawnedProcess = spawn(execPath(binaryName), command, {
+  const spawnedProcess = spawn(execPath("bin"), command, {
     cwd: undefined,
     detached: false,
   });

package.json

@@ -48,6 +48,7 @@
     "dist:pkg": "tsc && npm run build && cross-env DEBUG=* electron-builder build -m pkg",
     "dist:mac": "tsc && npm run build && electron-builder --mac --universal",
     "dist:mac-arm64": "tsc && npm run build && electron-builder --mac --arm64",
+    "dist:mac-mas": "tsc && npm run build && electron-builder --mac mas --universal",
     "dist:win": "tsc && npm run build && electron-builder --win",
     "dist:linux": "tsc && npm run build && electron-builder --linux",
     "publish-app": "tsc && npm run build && electron-builder -wlm --publish always",
@@ -95,6 +96,7 @@
       }
     ],
     "mac": {
+      "type": "distribution",
       "category": "public.app-category.photography",
       "hardenedRuntime": true,
       "gatekeeperAssess": false,
@@ -113,9 +115,34 @@
           "arch": [
             "universal"
           ]
+        },
+        {
+          "target": "mas",
+          "arch": [
+            "universal"
+          ]
         }
       ],
-      "x64ArchFiles": "*"
+      "x64ArchFiles": "*",
+      "provisioningProfile": "embedded.provisionprofile"
+    },
+    "mas": {
+      "hardenedRuntime": false,
+      "type": "distribution",
+      "category": "public.app-category.photography",
+      "entitlements": "resources/entitlements.mac.plist",
+      "entitlementsInherit": "resources/entitlements.mac.plist",
+      "provisioningProfile": "embedded.provisionprofile",
+      "mergeASARs": false,
+      "x64ArchFiles": "*",
+      "target": [
+        {
+          "target": "pkg",
+          "arch": [
+            "universal"
+          ]
+        }
+      ]
     },
     "dmg": {
       "sign": "false",

renderer/components/Footer.tsx

@@ -18,7 +18,7 @@ function Footer() {
           href="https://github.com/upscayl"
           className="font-bold"
           target="_blank">
-          TGS963 and Nayam Amarshe
+          The Upscayl Team
         </a>
       </p>
     </div>

renderer/components/settings-tab/index.tsx

@@ -21,6 +21,7 @@ import OverwriteToggle from "./OverwriteToggle";
 import { UpscaylCloudModal } from "../UpscaylCloudModal";
 import { ResetSettings } from "./ResetSettings";
 import ProcessImageToggle from "./ProcessImageToggle";
+import { flag } from "@/utils/flags";
 
 interface IProps {
   batchMode: boolean;
@@ -189,7 +190,7 @@ function SettingsTab({
           target="_blank">
           Read Wiki Guide
         </a>
-        <DonateButton />
+        {flag("IS_APPLE_STORE_BUILD") && <DonateButton />}
       </div>
 
       <LogArea

renderer/pages/index.tsx

@@ -605,7 +605,7 @@ const Home = () => {
                 }}
                 draggable="false"
                 alt=""
-                className="h-full w-full bg-[#1d1c23] object-contain"
+                className="h-full w-full bg-gradient-to-br from-base-300 to-base-100 object-contain"
               />
             </>
           )}
@@ -659,7 +659,7 @@ const Home = () => {
                       backgroundPosition: "0% 0%",
                       transformOrigin: backgroundPosition,
                     }}
-                    className={`h-full w-full bg-[#1d1c23] transition-transform group-hover:scale-[${zoomAmount}]`}
+                    className={`h-full w-full bg-gradient-to-br from-base-300 to-base-100 transition-transform group-hover:scale-[${zoomAmount}]`}
                   />
                 </>
               }
@@ -678,7 +678,7 @@ const Home = () => {
                       transformOrigin: backgroundPosition,
                     }}
                     onMouseMove={handleMouseMove}
-                    className={`h-full w-full bg-[#1d1c23] transition-transform group-hover:scale-[${zoomAmount}]`}
+                    className={`h-full w-full bg-gradient-to-br from-base-300 to-base-100 transition-transform group-hover:scale-[${zoomAmount}]`}
                   />
                 </>
               }

renderer/styles/globals.css

@@ -180,6 +180,28 @@
   -webkit-app-region: drag;
 }
 
+.checkerboard {
+  background-color: rgba(255, 255, 255);
+  background-image: linear-gradient(
+      45deg,
+      #000 25%,
+      transparent 25%,
+      transparent 75%,
+      #000 75%,
+      #000
+    ),
+    linear-gradient(
+      -45deg,
+      #000 25%,
+      transparent 25%,
+      transparent 75%,
+      #000 75%,
+      #000
+    );
+  background-size: 40px 40px;
+  background-repeat: repeat;
+}
+
 @keyframes animate-step-in {
   0% {
     opacity: 0;

renderer/tsconfig.json

@@ -15,7 +15,7 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "paths": {
-      "@/*": ["./src/*"],
+      "@/*": ["./*"],
       "@common/*": ["../common/*"]
     }
   },

renderer/utils/flags.ts

@@ -0,0 +1,8 @@
+export const FLAGS = {
+  IS_APPLE_STORE_BUILD: "IS_APPLE_STORE_BUILD",
+};
+
+// Get flag from process.env
+export const flag = (flag: keyof typeof FLAGS) => {
+  return process.env[flag];
+};

resources/entitlements.mac.plist

@@ -2,6 +2,12 @@
 <!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.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>W2T4W74X87.org.upscayl.Upscayl</string>
+	</array>
 	<key>com.apple.security.automation.apple-events</key>
 	<true/>
 	<key>com.apple.security.cs.allow-dyld-environment-variables</key>

resources/entitlements.mas.inherit.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.cs.allow-jit</key>
+	<true/>
+	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+	<true/>
+	<key>com.apple.security.inherit</key>
+	<true/>
+</dict>
+</plist>

resources/entitlements.mas.loginhelper.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.app-sandbox</key>
+	<true/>
+</dict>
+</plist>