🚀 Version 5.7.1

This now recommends the appropriate solution for #208.

PHP Monitor.xcodeproj/project.pbxproj

@@ -2831,7 +2831,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1030;
+				CURRENT_PROJECT_VERSION = 1031;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -2843,7 +2843,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 5.7;
+				MARKETING_VERSION = 5.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2860,7 +2860,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1030;
+				CURRENT_PROJECT_VERSION = 1031;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -2872,7 +2872,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 5.7;
+				MARKETING_VERSION = 5.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3088,7 +3088,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1030;
+				CURRENT_PROJECT_VERSION = 1031;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -3099,7 +3099,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 5.7;
+				MARKETING_VERSION = 5.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev;
 				PRODUCT_NAME = "$(TARGET_NAME) DEV";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3198,7 +3198,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1030;
+				CURRENT_PROJECT_VERSION = 1031;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -3209,7 +3209,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 5.7;
+				MARKETING_VERSION = 5.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

phpmon/Common/Core/Actions.swift

@@ -25,9 +25,9 @@ class Actions {
     }
 
     public static func stopValetServices() async {
-        await brew("services stop \(Homebrew.Formulae.php)", sudo: Homebrew.Formulae.php.elevated)
-        await brew("services stop \(Homebrew.Formulae.nginx)", sudo: Homebrew.Formulae.nginx.elevated)
-        await brew("services stop \(Homebrew.Formulae.dnsmasq)", sudo: Homebrew.Formulae.dnsmasq.elevated)
+        await brew("services stop \(Homebrew.Formulae.php.name)", sudo: Homebrew.Formulae.php.elevated)
+        await brew("services stop \(Homebrew.Formulae.nginx.name)", sudo: Homebrew.Formulae.nginx.elevated)
+        await brew("services stop \(Homebrew.Formulae.dnsmasq.name)", sudo: Homebrew.Formulae.dnsmasq.elevated)
     }
 
     public static func fixHomebrewPermissions() throws {

phpmon/Domain/App/ServicesManager.swift

@@ -0,0 +1,78 @@
+//
+//  ServicesManager.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 11/06/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+import SwiftUI
+
+class ServicesManager: ObservableObject {
+
+    static var shared = ServicesManager()
+
+    @Published var rootServices: [String: HomebrewService] = [:]
+    @Published var userServices: [String: HomebrewService] = [:]
+
+    public static func loadHomebrewServices(completed: (() -> Void)? = nil) {
+        let rootServiceNames = [
+            Homebrew.Formulae.php,
+            Homebrew.Formulae.nginx,
+            Homebrew.Formulae.dnsmasq
+        ]
+
+        DispatchQueue.global(qos: .background).async {
+            let data = Shell
+                .pipe("sudo \(Paths.brew) services info --all --json", requiresPath: true)
+                .data(using: .utf8)!
+
+            let services = try! JSONDecoder()
+                .decode([HomebrewService].self, from: data)
+                .filter({ return rootServiceNames.contains($0.name) })
+
+            DispatchQueue.main.async {
+                ServicesManager.shared.rootServices = Dictionary(
+                    uniqueKeysWithValues: services.map { ($0.name, $0) }
+                )
+            }
+        }
+
+        let userServiceNames = Preferences.custom.services ?? []
+
+        DispatchQueue.global(qos: .background).async {
+            let data = Shell
+                .pipe("\(Paths.brew) services info --all --json", requiresPath: true)
+                .data(using: .utf8)!
+
+            let services = try! JSONDecoder()
+                .decode([HomebrewService].self, from: data)
+                .filter({ return userServiceNames.contains($0.name) })
+
+            DispatchQueue.main.async {
+                ServicesManager.shared.userServices = Dictionary(
+                    uniqueKeysWithValues: services.map { ($0.name, $0) }
+                )
+                completed?()
+            }
+        }
+    }
+
+    func loadData() {
+        Self.loadHomebrewServices()
+    }
+
+    /**
+     Dummy data for preview purposes.
+     */
+    func withDummyServices(_ services: [String: Bool]) -> Self {
+        for (service, enabled) in services {
+            let item = HomebrewService.dummy(named: service, enabled: enabled)
+            self.rootServices[service] = item
+        }
+
+        return self
+    }
+
+}