✨ Small fixes

Author: mrkai77

Loop/Config.xcconfig

@@ -5,5 +5,5 @@
 //  Created by Kai Azim on 2023-08-09.
 //
 
-VERSION = 1.3.0
-BUILD_NUMBER = 1533
+VERSION = 0.0.0
+BUILD_NUMBER = 0

Loop/Settings Window/Loop/AboutConfiguration.swift

@@ -240,8 +240,7 @@ struct AboutConfigurationView: View {
         LuminareSection {
             Button {
                 Task {
-                    // Pass force=true to bypass the guard check
-                    await updater.fetchLatestInfo(force: true)
+                    await updater.fetchLatestInfo(bypassUpdatesEnabled: true)
 
                     switch updater.updateState {
                     case .available:

Loop/Updater/UpdateChecker.swift

@@ -20,12 +20,11 @@ actor UpdateChecker {
         .ignoresCase()
 
     func checkForUpdate(
-        bundleId: String,
         currentVersion: String,
         currentBuild: Int = 0,
         channel: UpdateChannel
     ) async throws -> UpdateManifest? {
-        log.info("Checking for updates: \(bundleId) v\(currentVersion) build \(currentBuild) [\(channel.rawValue)]")
+        log.info("Checking for updates: \(currentVersion) build \(currentBuild) [\(channel.rawValue)]")
 
         let endpoint = URL(string: channel.githubReleasesEndpoint)!
         var candidateRelease: GitHubRelease?
@@ -84,7 +83,7 @@ actor UpdateChecker {
         }
 
         // Extract checksum from asset digest (format: "sha256:checksum")
-        let zipChecksum = asset.digest?.replacingOccurrences(of: "sha256:", with: "") ?? ""
+        let zipChecksum = asset.digest?.replacing(/sha256:/, with: "") ?? ""
         log.debug("Asset digest: \(asset.digest ?? "none"), extracted checksum: \(zipChecksum)")
 
         let compatibility = extractCompatibilityRequirements(from: release.body)
@@ -113,7 +112,7 @@ actor UpdateChecker {
         // Verify system requirements before returning the manifest
         try verifySystemRequirements(manifest: manifest)
 
-        log.info("Found update: v\(manifest.version) (build \(manifest.buildNumber))")
+        log.info("Found update: \(manifest.version) (\(manifest.buildNumber))")
         return manifest
     }
 

Loop/Updater/Updater.swift

@@ -88,7 +88,8 @@ final class Updater: ObservableObject {
                 if !NSApp.isActive, NSApp.windows.allSatisfy({ !$0.isVisible }) {
                     log.info("Automatic updates enabled, installing update...")
                     Task {
-                        try await installUpdate()
+                        try await downloadAndInstallUpdate()
+                        await relaunchAfterUpdate()
                     }
                 }
 
@@ -173,7 +174,7 @@ final class Updater: ObservableObject {
     }
 
     // Pulls the latest release information from GitHub and updates the app state accordingly.
-    func fetchLatestInfo(force: Bool = false) async {
+    func fetchLatestInfo(bypassUpdatesEnabled: Bool = false) async {
         // Don't run update checks while actively downloading
         if downloader.isDownloading == true {
             return
@@ -194,8 +195,9 @@ final class Updater: ObservableObject {
             }
 
             // Early return if updates are disabled and not forcing
-            guard updatesEnabled || force else {
+            guard updatesEnabled || bypassUpdatesEnabled else {
                 updateState = .unavailable
+                log.warn("Updates are disabled. Not fetching latest info.")
                 return
             }
 
@@ -210,7 +212,6 @@ final class Updater: ObservableObject {
                 let currentBuild = Bundle.main.appBuild ?? 0
 
                 if let manifest = try await updateChecker.checkForUpdate(
-                    bundleId: Bundle.main.bundleIdentifier ?? "com.MrKai77.Loop",
                     currentVersion: currentVersion,
                     currentBuild: currentBuild,
                     channel: channel
@@ -257,7 +258,7 @@ final class Updater: ObservableObject {
     }
 
     // Downloads the update from GitHub and installs it
-    func installUpdate() async throws {
+    func downloadAndInstallUpdate() async throws {
         guard let manifest = updateManifest else {
             progressBar = 0
             return
@@ -293,9 +294,12 @@ final class Updater: ObservableObject {
         }
     }
 
-    func relaunchAfterUpdate() {
-        Task {
-            await installer.restartApplication()
+    func relaunchAfterUpdate() async {
+        guard installState == .readyToRestart else {
+            log.error("Cannot restart as the install state is \(installState)")
+            return
         }
+
+        await installer.restartApplication()
     }
 }

Loop/Updater/Views/UpdateView.swift

@@ -182,6 +182,7 @@ struct UpdateView: View {
                 Updater.shared.dismissWindow()
             } label: {
                 Text(updater.installState.isFailure ? "Try again later" : "Remind me later")
+                    .contentTransition(.numericText())
                     .padding(.trailing, 4)
                     .luminarePopover(attachedTo: .topTrailing, hidden: updater.installState.errorDescription == nil) {
                         HStack(spacing: 4) {
@@ -197,15 +198,16 @@ struct UpdateView: View {
                         .padding(12)
                     }
             }
+            .disabled(updater.installState == .installing || updater.installState == .readyToRestart)
 
             Button(role: updater.installState.isFailure ? .destructive : nil) {
-                if updater.installState == .readyToRestart {
-                    Updater.shared.relaunchAfterUpdate()
-                    return
-                }
-
                 Task {
-                    try? await Updater.shared.installUpdate()
+                    if updater.installState == .readyToRestart {
+                        await Updater.shared.relaunchAfterUpdate()
+                        return
+                    }
+
+                    try await Updater.shared.downloadAndInstallUpdate()
                 }
             } label: {
                 ZStack {

Loop/Updater/Views/VersionDisplay.swift

@@ -39,7 +39,7 @@ struct VersionDisplay {
         let buildString = if let build { "(\(build))" } else { "" }
 
         let baseVersion = version
-            .replacingOccurrences(of: devBuildEmoji, with: "")
+            .replacing(devBuildEmoji, with: "")
             .trimmingCharacters(in: .whitespaces)
 
         let shortDisplay: String = if shouldTreatAsPrerelease {