CLI listen fixes

alin23 · Nov 13, 2024 · a8410d3 · a8410d3
1 parent 267c907
commit a8410d3
Show file tree

Hide file tree

Showing 7 changed files with 110 additions and 83 deletions.
diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg
@@ -3,7 +3,7 @@ Lunar/Resources/eddsa_priv:d079018c2b1c003c9e239ea8f8cc999b7d98adfd0616911ba0263
 Lunar/Modes/SensorMode.swift:63d6565bb8194d89abaa7998c640d3aebe8aa33edcaf687c0f5d385c5ad5f0eb
 Lunar/Modes/SyncMode.swift:99587e6a44dfd3620f154a34ac83e0a9c0fedc82b778c6cad71bbeacb437864e
 Lunar/Modes/LocationMode.swift:33f47b5788bdf89d343a5b64b64f132972b591195f716eac55091dea289b16ee
-Lunar/Data/Pro.swift:fd2a83e51d561ffb69d110579c9d74e2cb1d33f8575935ce646c1eb8d0e89066
+Lunar/Data/Pro.swift:fdbe7d7016fb7689b51ca68f36593d9b8ca73223c4fc2f76dbed7afdc40201c2
 Lunar/Modes/ClockMode.swift:d012d1b6cd91d0527ca6d6d00fd5b7742c3671855fba5d43ab31b6413d8afc84
 Lunar/DDC/DDC2.h:a6502f46ad8551d91300a58ff27b471352b827a10b73ff3fb62d76a10a315e1d
 Lunar/DDC/DDC2.c:8488fdfb13ca9525e44db616c773eb67f1f1d52dcf83115d7666b0d79bbeef5a

diff --git a/Lunar.xcodeproj/project.pbxproj b/Lunar.xcodeproj/project.pbxproj
@@ -1339,7 +1339,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6.8.4;
+				CURRENT_PROJECT_VERSION = 6.8.5b1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
@@ -1371,7 +1371,7 @@
 				);
 				LLVM_LTO = YES_THIN;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 6.8.4;
+				MARKETING_VERSION = 6.8.5b1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CODE_SIGN_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = fyi.lunar.Lunar;
@@ -1404,7 +1404,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6.8.4;
+				CURRENT_PROJECT_VERSION = 6.8.5b1;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = RDDXV84A73;
@@ -1435,7 +1435,7 @@
 				);
 				LLVM_LTO = YES;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 6.8.4;
+				MARKETING_VERSION = 6.8.5b1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = fyi.lunar.Lunar;

diff --git a/Lunar/AppDelegate.swift b/Lunar/AppDelegate.swift
@@ -2169,6 +2169,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, CLLocationManagerDeleg
                         var line = try socket.readString()
                         while let currentLine = line, !currentLine.isEmpty {
                             print(currentLine.trimmed)
+                            fflush(stdout)
                             line = try socket.readString()
                         }
                     }
@@ -2609,6 +2610,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, CLLocationManagerDeleg
     func startReceivingSignificantLocationChanges() {
         if CachedDefaults[.manualLocation] {
             LocationMode.specific.geolocation = CachedDefaults[.location]
+            return
         }
 
         if locationManager == nil {

diff --git a/Lunar/Data/Pro.swift.secret b/Lunar/Data/Pro.swift.secret