Merge pull request #1 from EllandeVED/v1.6.1

V1.6.1

Author: EllandeVED

NumWorksWebView.xcodeproj/project.pbxproj

@@ -186,6 +186,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.NumWorksWebView;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				STRIPFLAGS = "";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
 			};
@@ -213,6 +214,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.NumWorksWebView;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				STRIPFLAGS = "";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
 			};

NumWorksWebView.xcodeproj/xcshareddata/xcschemes/NumWorksWebView.xcscheme

@@ -50,6 +50,12 @@
             ReferencedContainer = "container:NumWorksWebView.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "--force-update-check-outside-applications"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

NumWorksWebView/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleVersion</key>
 	<string>10</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6</string>
+	<string>1.6.1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

NumWorksWebView/NWUpdateChecker.swift

@@ -95,6 +95,8 @@ final class NWUpdateChecker {
 
         if nwIsRemote(remoteTag, newerThan: current) {
             lastAlertedVersion = remoteTag
+            // Signal the status bar to show an “update available” badge
+            NotificationCenter.default.post(name: .showUpdateBadge, object: nil)
             let notes = remote.body?.trimmingCharacters(in: .whitespacesAndNewlines)
 
             // Prefer a .zip asset if available
@@ -114,6 +116,7 @@ final class NWUpdateChecker {
             )
         } else if userInitiated {
             nwShowInfoAlert(title: "You’re Up To Date", text: "You have the latest version (\(current)).")
+            NotificationCenter.default.post(name: .hideUpdateBadge, object: nil)
         }
     }
 
@@ -179,16 +182,33 @@ final class NWUpdateChecker {
         return formatter.string(fromByteCount: bytes)
     }
 
+    @objc private func progressNextClicked(_ sender: Any?) {
+        // When the user clicks Next, show the final instructions and turn the button into "Finish (Go to Finder)"
+        if let label = progressLabel {
+            label.stringValue = "File has been downloaded. Open the zip and launch the new app."
+        }
+        if let button = finderButton {
+            button.title = "Finish (Go to Finder)"
+            button.target = self
+            button.action = #selector(progressGoToFinderClicked(_:))
+        }
+    }
+
     @objc private func progressGoToFinderClicked(_ sender: Any?) {
         if let url = downloadedFileURL {
             NSWorkspace.shared.activateFileViewerSelecting([url])
         }
+
+        // Clean up the progress window UI
         progressWindow?.close()
         progressWindow = nil
         progressBar = nil
         progressLabel = nil
         finderButton = nil
         downloadedFileURL = nil
+
+        // Quit the app so the user can open the new app without conflicts
+        NSApp.terminate(nil)
     }
 
     // MARK: - Alerts
@@ -332,17 +352,20 @@ final class NWUpdateChecker {
         label.alignment = .center
         content.addSubview(label)
 
-        // “Go to Finder” button centered under the label, initially hidden until download completes
-        // “Go to Finder” button centered under the label, initially hidden until download completes
-        let finderWidth: CGFloat = 120
-        let finderX = (windowWidth - finderWidth) / 2
-        let finder = NSButton(title: "Go to Finder", target: self, action: #selector(progressGoToFinderClicked(_:)))
-        // Slightly lower Y to increase spacing between label and button
-        finder.frame = NSRect(x: finderX, y: 14, width: finderWidth, height: 30)
+        // “Next” button near the bottom-right, initially hidden until download completes.
+        // After the user clicks it, it will turn into “Finish (Go to Finder)”.
+        let finderWidth: CGFloat = 150   // about one-quarter wider than the original button
+        let finderHeight: CGFloat = 32
+        let finderPadding: CGFloat = 16
+        let finderX = windowWidth - finderPadding - finderWidth
+        let finderY: CGFloat = 8
+        let finder = NSButton(title: "Next", target: self, action: #selector(progressNextClicked(_:)))
+        finder.frame = NSRect(x: finderX, y: finderY, width: finderWidth, height: finderHeight)
         finder.isHidden = true
         finder.alphaValue = 0          // start hidden for fade-in
         finder.bezelStyle = .rounded
-        finder.contentTintColor = .systemBlue   // blue button
+        finder.bezelColor = .systemBlue
+        finder.contentTintColor = .white   // white text on blue background
         content.addSubview(finder)
 
         window.contentView = content
@@ -408,28 +431,14 @@ final class NWUpdateChecker {
                         context.duration = 0.25
                         bar.animator().doubleValue = 1.0
                     }, completionHandler: {
-                        // 2) Fade in the completion text
-                        if let label = self.progressLabel {
-                            label.stringValue = "File has been downloaded. Open the zip and launch the new app."
-                            label.alphaValue = 0.0
-                            NSAnimationContext.runAnimationGroup({ context in
-                                context.duration = 0.25
-                                label.animator().alphaValue = 1.0
-                            }, completionHandler: {
-                                // 3) Fade in the “Go to Finder” button
-                                if let button = self.finderButton {
-                                    button.isHidden = false
-                                    button.alphaValue = 0.0
-                                    NSAnimationContext.runAnimationGroup { context in
-                                        context.duration = 0.25
-                                        button.animator().alphaValue = 1.0
-                                    }
-                                }
-                            })
-                        } else if let button = self.finderButton {
-                            // No label; just show the button if label is missing
+                        // After the bar is full, fade in the "Next" button.
+                        if let button = self.finderButton {
                             button.isHidden = false
-                            button.alphaValue = 1.0
+                            button.alphaValue = 0.0
+                            NSAnimationContext.runAnimationGroup { context in
+                                context.duration = 0.25
+                                button.animator().alphaValue = 1.0
+                            }
                         }
                     })
                 }
@@ -450,7 +459,6 @@ final class NWUpdateChecker {
         DockProgress.style = .squircle(color: .blue)
         DockProgress.progressInstance = task.progress
 
-        // Observe progress to update the small window's bar
         // Observe progress to update the small window's bar
         activeDownloadObservation = task.progress.observe(\.fractionCompleted, options: [.initial, .new]) { [weak self] progressObj, _ in
             guard let self else { return }
@@ -468,7 +476,11 @@ final class NWUpdateChecker {
                 if let label = self.progressLabel {
                     let clamped = max(0, min(1, fraction))
                     let percent = Int((clamped * 100).rounded())
-                    label.stringValue = "Downloading… \(percent)%"
+                    if clamped >= 1.0 {
+                        label.stringValue = "Finished downloading (\(percent)%)"
+                    } else {
+                        label.stringValue = "Downloading… \(percent)%"
+                    }
                 }
             }
         }

NumWorksWebView/NumWorksWebViewApp.swift

@@ -11,6 +11,8 @@ extension Notification.Name {
     static let calculatorDidLoad = Notification.Name("CalculatorDidLoad")
     static let reloadCalculatorNow = Notification.Name("ReloadCalculatorNow")
     static let openSettingsRequest = Notification.Name("OpenSettingsRequest")
+    static let showUpdateBadge = Notification.Name("ShowUpdateBadge")
+    static let hideUpdateBadge = Notification.Name("HideUpdateBadge")
 }
 
 private struct SettingsOpenerView: View {
@@ -76,6 +78,14 @@ extension KeyboardShortcuts.Name {
         return path.hasPrefix("/Applications/") || path.hasPrefix(NSHomeDirectory() + "/Applications/")
     }
 
+    /// When this launch argument is present, always run the auto-updater
+    /// even if the app bundle is not in an Applications folder.
+    /// Usage (in Xcode scheme or command line):
+    ///   --force-update-check-outside-applications
+    private var forceUpdateCheckOutsideApplications: Bool {
+        return CommandLine.arguments.contains("--force-update-check-outside-applications")
+    }
+
     private let status = StatusBarController()
 
 
@@ -163,9 +173,9 @@ extension KeyboardShortcuts.Name {
                     guard let self else { return }
                     self.maybePromptMoveToApplications()
 
-                    // Only schedule the update check when we are already in an Applications folder.
-                    // This avoids showing an update alert on the same run where the user might decide to move the app.
-                    if self.isInApplicationsFolder {
+                    // Normally only schedule the update check when we are already in an Applications folder.
+                    // If the special launch flag is present, force the updater even outside Applications.
+                    if self.isInApplicationsFolder || self.forceUpdateCheckOutsideApplications {
                         DispatchQueue.main.asyncAfter(deadline: .now() + 2.5) {
                             NWUpdateChecker.shared.nwCheckOnLaunch()
                         }
@@ -191,7 +201,15 @@ extension KeyboardShortcuts.Name {
                 }
             }
         }
-        
+
+        // Show / hide update badge in the menu bar icon
+        NotificationCenter.default.addObserver(forName: .showUpdateBadge, object: nil, queue: .main) { [weak self] _ in
+            self?.status.setUpdateBadgeVisible(true)
+        }
+        NotificationCenter.default.addObserver(forName: .hideUpdateBadge, object: nil, queue: .main) { [weak self] _ in
+            self?.status.setUpdateBadgeVisible(false)
+        }
+
         // +++ Start monitoring connectivity
         startNetworkMonitoring()
         showWaitingScreen = true
@@ -439,6 +457,37 @@ extension KeyboardShortcuts.Name {
 
     // (Settings window management is now handled by SwiftUI Windows.)
 
+    /// Attempts to move the app bundle into /Applications via Finder / AppleScript.
+    /// This path will trigger the standard macOS authorization dialog if needed
+    /// (for example when writing into the system Applications folder).
+    private func moveToApplicationsViaFinder(bundleURL: URL, destinationDir: URL) throws {
+        // We ask Finder to move the app bundle into the Applications folder.
+        // Using Finder ensures macOS shows the normal permission/auth dialog
+        // instead of failing silently with a "no permission" error.
+        let fromPath = bundleURL.path.replacingOccurrences(of: "\"", with: "\\\"")
+        let destPath = destinationDir.path.replacingOccurrences(of: "\"", with: "\\\"")
+
+        let scriptSource = """
+        tell application "Finder"
+            move POSIX file "\(fromPath)" to POSIX file "\(destPath)"
+        end tell
+        """
+
+        var errorDict: NSDictionary?
+        if let appleScript = NSAppleScript(source: scriptSource) {
+            _ = appleScript.executeAndReturnError(&errorDict)
+            if let errorDict,
+               let message = errorDict[NSAppleScript.errorMessage] as? String {
+                throw NSError(domain: "AppleScriptMoveError",
+                              code: 1,
+                              userInfo: [NSLocalizedDescriptionKey: message])
+            }
+        } else {
+            throw NSError(domain: "AppleScriptMoveError",
+                          code: 0,
+                          userInfo: [NSLocalizedDescriptionKey: "Could not create AppleScript for move operation."])
+        }
+    }
     // Moves the app bundle to /Applications if not already there.
     func moveToApplicationsIfNeeded(userInitiated: Bool) {
         if isInApplicationsFolder {
@@ -464,15 +513,30 @@ extension KeyboardShortcuts.Name {
             NSLog("Move to Applications failed: \(error.localizedDescription)")
 
             let nsError = error as NSError
-            // If the failure is due to a permissions issue, explain this to the user
+
+            // If the failure is due to a permissions issue, try again via Finder / AppleScript.
             if nsError.domain == NSCocoaErrorDomain,
-               nsError.code == NSFileWriteNoPermissionError || nsError.code == NSFileWriteVolumeReadOnlyError {
-                let alert = NSAlert()
-                alert.alertStyle = .warning
-                alert.messageText = "Can’t Move to Applications"
-                alert.informativeText = "NumWorksWebView doesn’t have permission to move itself to the Applications folder.\n\nYou may need to enter your macOS password or move the app manually by dragging it into the Applications folder in Finder."
-                alert.addButton(withTitle: "OK")
-                alert.runModal()
+               (nsError.code == NSFileWriteNoPermissionError || nsError.code == NSFileWriteVolumeReadOnlyError) {
+                do {
+                    try moveToApplicationsViaFinder(bundleURL: bundleURL, destinationDir: destinationDir)
+                    // If Finder successfully moved the app, relaunch from /Applications.
+                    relaunchFromApplications(at: destinationURL)
+                } catch {
+                    // Finder/AppleScript path also failed: explain this to the user.
+                    let finalError = error as NSError
+                    let alert = NSAlert()
+                    alert.alertStyle = .warning
+                    alert.messageText = "Can’t Move to Applications"
+                    alert.informativeText = """
+                    NumWorksWebView tried to move itself to the Applications folder, but macOS did not allow it.
+
+                    Please move the app manually by dragging it into the Applications folder in Finder.
+
+                    Error: \(finalError.localizedDescription)
+                    """
+                    alert.addButton(withTitle: "OK")
+                    alert.runModal()
+                }
             } else if userInitiated {
                 // For other errors, show a generic failure alert if the user explicitly requested the move
                 let alert = NSAlert()