diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 61b6521..2b31bb1 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -54,8 +54,6 @@ C415938027A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */; }; C415D3B72770F294005EF286 /* Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3B62770F294005EF286 /* Actions.swift */; }; C415D3B82770F294005EF286 /* Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3B62770F294005EF286 /* Actions.swift */; }; - C415D3E12770F34D005EF286 /* AllowedArguments.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3DE2770F34D005EF286 /* AllowedArguments.swift */; }; - C415D3E62770F540005EF286 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3E52770F540005EF286 /* main.swift */; }; C415D3E82770F692005EF286 /* AppDelegate+InterApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3E72770F692005EF286 /* AppDelegate+InterApp.swift */; }; C415D3E92770F692005EF286 /* AppDelegate+InterApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3E72770F692005EF286 /* AppDelegate+InterApp.swift */; }; C417DC74277614690015E6EE /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = C417DC73277614690015E6EE /* Helpers.swift */; }; @@ -257,8 +255,6 @@ C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpFrameworks.swift; sourceTree = ""; }; C415D3B62770F294005EF286 /* Actions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Actions.swift; sourceTree = ""; }; C415D3D62770F341005EF286 /* phpmon-cli */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "phpmon-cli"; sourceTree = BUILT_PRODUCTS_DIR; }; - C415D3DE2770F34D005EF286 /* AllowedArguments.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AllowedArguments.swift; sourceTree = ""; }; - C415D3E52770F540005EF286 /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; C415D3E72770F692005EF286 /* AppDelegate+InterApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+InterApp.swift"; sourceTree = ""; }; C4168F4427ADB4A3003B6C39 /* DEVELOPER.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = DEVELOPER.md; sourceTree = ""; }; C417DC73277614690015E6EE /* Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helpers.swift; sourceTree = ""; }; @@ -456,15 +452,6 @@ path = Core; sourceTree = ""; }; - C415D3D72770F341005EF286 /* phpmon-cli */ = { - isa = PBXGroup; - children = ( - C415D3E52770F540005EF286 /* main.swift */, - C415D3DE2770F34D005EF286 /* AllowedArguments.swift */, - ); - path = "phpmon-cli"; - sourceTree = ""; - }; C41C1B2A22B0097F00E7CF16 = { isa = PBXGroup; children = ( @@ -475,8 +462,6 @@ C4E713572570151400007428 /* docs */, C41C1B3522B0097F00E7CF16 /* phpmon */, C4F7807A25D7F84B000DBC97 /* phpmon-tests */, - C415D3D72770F341005EF286 /* phpmon-cli */, - C4B5853A2770FE2500DA4FBE /* phpmon-common */, C41C1B3422B0097F00E7CF16 /* Products */, C4D309E72770EF2F00958BCF /* Frameworks */, ); @@ -495,6 +480,7 @@ C41C1B3522B0097F00E7CF16 /* phpmon */ = { isa = PBXGroup; children = ( + C4B5853A2770FE2500DA4FBE /* Common */, C41E181722CB61EB0072CF09 /* Domain */, C41C1B3F22B0098000E7CF16 /* Info.plist */, C4232EE42612526500158FC6 /* Credits.html */, @@ -526,7 +512,6 @@ C44C198F276E3A380072762D /* Progress */, C4C8E81D276F5686003AC782 /* Watcher */, C4811D2822D70D9C00B5F6B3 /* Helpers */, - C4F8C0A222D4F100002EFE61 /* Extensions */, C4EE55B027708BB2001DF387 /* SwiftUI */, ); path = Domain; @@ -648,14 +633,15 @@ path = Core; sourceTree = ""; }; - C4B5853A2770FE2500DA4FBE /* phpmon-common */ = { + C4B5853A2770FE2500DA4FBE /* Common */ = { isa = PBXGroup; children = ( - C44CCD4327AFE93300CE40E5 /* Errors */, C40C7F2127721F7300DDDCDC /* Core */, 54B20EDF263AA22C00D3250E /* PHP */, + C44CCD4327AFE93300CE40E5 /* Errors */, + C4F8C0A222D4F100002EFE61 /* Extensions */, ); - path = "phpmon-common"; + path = Common; sourceTree = ""; }; C4C8E81D276F5686003AC782 /* Watcher */ = { @@ -900,7 +886,6 @@ C40C7F2427721F8200DDDCDC /* PhpExtension.swift in Sources */, C40C7F2627721FA200DDDCDC /* Constants.swift in Sources */, C4B585402770FE3900DA4FBE /* Paths.swift in Sources */, - C415D3E62770F540005EF286 /* main.swift in Sources */, C40B24F327A310780018C7D2 /* Events.swift in Sources */, C40C7F2227721F8200DDDCDC /* PhpInstallation.swift in Sources */, C4B585432770FE3900DA4FBE /* Shell.swift in Sources */, @@ -917,7 +902,6 @@ C417DC76277614690015E6EE /* Helpers.swift in Sources */, C40C7F3227722E8D00DDDCDC /* Logger.swift in Sources */, C40C7F2B2772201C00DDDCDC /* Actions.swift in Sources */, - C415D3E12770F34D005EF286 /* AllowedArguments.swift in Sources */, C40C7F202772136000DDDCDC /* PhpEnv.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor CLI.xcscheme b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor CLI.xcscheme deleted file mode 100644 index 41be842..0000000 --- a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor CLI.xcscheme +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/phpmon-cli/AllowedArguments.swift b/phpmon-cli/AllowedArguments.swift deleted file mode 100644 index e12a279..0000000 --- a/phpmon-cli/AllowedArguments.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// AllowedArguments.swift -// phpmon-cli -// -// Created by Nico Verbruggen on 20/12/2021. -// Copyright © 2021 Nico Verbruggen. All rights reserved. -// - -import Foundation - -enum AllowedArguments: String, CaseIterable { - case use = "use" - case performSwitch = "switch" - case fix = "fix" - case help = "help" - - static func has(_ string: String) -> Bool { - return Self.allCases.contains { arg in - return arg.rawValue == string - } - } - - static var rawValues: [String] { - return Self.allCases.map { $0.rawValue } - } -} diff --git a/phpmon-cli/main.swift b/phpmon-cli/main.swift deleted file mode 100644 index 8b986a2..0000000 --- a/phpmon-cli/main.swift +++ /dev/null @@ -1,103 +0,0 @@ -// -// main.swift -// phpmon-cli -// -// Created by Nico Verbruggen on 20/12/2021. -// Copyright © 2021 Nico Verbruggen. All rights reserved. -// - -import Foundation - -let toolver = "0.1 (early access)" - -let log = Log.shared -log.verbosity = .info - -if CommandLine.arguments.contains("-q") || CommandLine.arguments.contains("--quiet") { - Log.shared.verbosity = .warning -} -if CommandLine.arguments.contains("-p") || CommandLine.arguments.contains("--performance") { - Log.shared.verbosity = .performance -} - -var argument = "help" -if CommandLine.arguments.count > 1 { - argument = CommandLine.arguments[1] -} - -if !AllowedArguments.has(argument) { - Log.err("The supported arguments are: \(AllowedArguments.rawValues)") - exit(1) -} - -let action = AllowedArguments.init(rawValue: argument) - -switch action { -case .use, .performSwitch: - if !Shell.fileExists("\(Paths.binPath)/php") { - Log.err("PHP is currently not linked. Attempting quick fix...") - _ = Shell.user.executeSynchronously("brew link php", requiresPath: true) - } - - let phpenv = PhpEnv.shared - PhpEnv.detectPhpVersions() - - if CommandLine.arguments.count < 3 { - Log.err("You must enter at least two additional arguments when using this command.") - exit(1) - } - - let version = CommandLine.arguments[2].replacingOccurrences(of: "php@", with: "") - if phpenv.availablePhpVersions.contains(version) { - Log.info("Switching to PHP \(version)...") - Actions.switchToPhpVersion( - version: version, - availableVersions: phpenv.availablePhpVersions, - completed: { - Log.info("The switch has been completed.") - exit(0) - } - ) - } else { - Log.err("A PHP installation with version \(version) is not installed.") - Log.err("The installed versions are: \(phpenv.availablePhpVersions.joined(separator: ", ")).") - Log.err("If this version is available, you may be able to install it by using `brew install php@\(version)`.") - exit(1) - } -case .fix: - Log.info("Fixing your PHP installation...") - Actions.fixMyPhp() - Log.info("All operations completed. You can check which version of PHP is linked by using `php -v`.") - exit(0) -case .help: - print(""" - =============================================================== - PHP MONITOR CLI \(toolver) - by Nico Verbruggen - =============================================================== - - Gives access to the quick version switcher from PHP Monitor, - but without the GUI and 100% of the speed! - - SUPPORTED COMMANDS - - * use {version}: Switch to a specific version of PHP. - (e.g. `phpmon-cli use 8.0`) - * switch {version}: Alias for the `use` command. - * fix Attempts to unlink all PHP versions, - and link the latest version of PHP. - * help: Show this help. - - SUPPORTED FLAGS - - * `-q / --quiet`: Silences all logs except for warnings and exceptions. - * `-p / --perf`: Enables performance mode. - - """) - exit(0) -case .none: - Log.err("Action not recognized!") - exit(1) -} - -RunLoop.main.run() diff --git a/phpmon-common/Core/Actions.swift b/phpmon/Common/Core/Actions.swift similarity index 100% rename from phpmon-common/Core/Actions.swift rename to phpmon/Common/Core/Actions.swift diff --git a/phpmon-common/Core/Command.swift b/phpmon/Common/Core/Command.swift similarity index 100% rename from phpmon-common/Core/Command.swift rename to phpmon/Common/Core/Command.swift diff --git a/phpmon-common/Core/Constants.swift b/phpmon/Common/Core/Constants.swift similarity index 100% rename from phpmon-common/Core/Constants.swift rename to phpmon/Common/Core/Constants.swift diff --git a/phpmon-common/Core/Events.swift b/phpmon/Common/Core/Events.swift similarity index 100% rename from phpmon-common/Core/Events.swift rename to phpmon/Common/Core/Events.swift diff --git a/phpmon-common/Core/Helpers.swift b/phpmon/Common/Core/Helpers.swift similarity index 100% rename from phpmon-common/Core/Helpers.swift rename to phpmon/Common/Core/Helpers.swift diff --git a/phpmon-common/Core/Logger.swift b/phpmon/Common/Core/Logger.swift similarity index 100% rename from phpmon-common/Core/Logger.swift rename to phpmon/Common/Core/Logger.swift diff --git a/phpmon-common/Core/Paths.swift b/phpmon/Common/Core/Paths.swift similarity index 100% rename from phpmon-common/Core/Paths.swift rename to phpmon/Common/Core/Paths.swift diff --git a/phpmon-common/Core/Shell.swift b/phpmon/Common/Core/Shell.swift similarity index 100% rename from phpmon-common/Core/Shell.swift rename to phpmon/Common/Core/Shell.swift diff --git a/phpmon-common/Errors/AlertableError.swift b/phpmon/Common/Errors/AlertableError.swift similarity index 100% rename from phpmon-common/Errors/AlertableError.swift rename to phpmon/Common/Errors/AlertableError.swift diff --git a/phpmon-common/Errors/HomebrewPermissionError.swift b/phpmon/Common/Errors/HomebrewPermissionError.swift similarity index 100% rename from phpmon-common/Errors/HomebrewPermissionError.swift rename to phpmon/Common/Errors/HomebrewPermissionError.swift diff --git a/phpmon/Domain/Extensions/DateExtension.swift b/phpmon/Common/Extensions/DateExtension.swift similarity index 100% rename from phpmon/Domain/Extensions/DateExtension.swift rename to phpmon/Common/Extensions/DateExtension.swift diff --git a/phpmon/Domain/Extensions/NSMenuExtension.swift b/phpmon/Common/Extensions/NSMenuExtension.swift similarity index 100% rename from phpmon/Domain/Extensions/NSMenuExtension.swift rename to phpmon/Common/Extensions/NSMenuExtension.swift diff --git a/phpmon/Domain/Extensions/StringExtension.swift b/phpmon/Common/Extensions/StringExtension.swift similarity index 100% rename from phpmon/Domain/Extensions/StringExtension.swift rename to phpmon/Common/Extensions/StringExtension.swift diff --git a/phpmon/Domain/Extensions/XibLoadable.swift b/phpmon/Common/Extensions/XibLoadable.swift similarity index 100% rename from phpmon/Domain/Extensions/XibLoadable.swift rename to phpmon/Common/Extensions/XibLoadable.swift diff --git a/phpmon-common/PHP/ActivePhpInstallation.swift b/phpmon/Common/PHP/ActivePhpInstallation.swift similarity index 100% rename from phpmon-common/PHP/ActivePhpInstallation.swift rename to phpmon/Common/PHP/ActivePhpInstallation.swift diff --git a/phpmon-common/PHP/Homebrew/HomebrewPackage.swift b/phpmon/Common/PHP/Homebrew/HomebrewPackage.swift similarity index 100% rename from phpmon-common/PHP/Homebrew/HomebrewPackage.swift rename to phpmon/Common/PHP/Homebrew/HomebrewPackage.swift diff --git a/phpmon-common/PHP/Homebrew/HomebrewService.swift b/phpmon/Common/PHP/Homebrew/HomebrewService.swift similarity index 100% rename from phpmon-common/PHP/Homebrew/HomebrewService.swift rename to phpmon/Common/PHP/Homebrew/HomebrewService.swift diff --git a/phpmon-common/PHP/PHP Version/PhpEnv.swift b/phpmon/Common/PHP/PHP Version/PhpEnv.swift similarity index 100% rename from phpmon-common/PHP/PHP Version/PhpEnv.swift rename to phpmon/Common/PHP/PHP Version/PhpEnv.swift diff --git a/phpmon-common/PHP/PHP Version/PhpVersionNumber.swift b/phpmon/Common/PHP/PHP Version/PhpVersionNumber.swift similarity index 100% rename from phpmon-common/PHP/PHP Version/PhpVersionNumber.swift rename to phpmon/Common/PHP/PHP Version/PhpVersionNumber.swift diff --git a/phpmon-common/PHP/PhpExtension.swift b/phpmon/Common/PHP/PhpExtension.swift similarity index 100% rename from phpmon-common/PHP/PhpExtension.swift rename to phpmon/Common/PHP/PhpExtension.swift diff --git a/phpmon-common/PHP/PhpInstallation.swift b/phpmon/Common/PHP/PhpInstallation.swift similarity index 100% rename from phpmon-common/PHP/PhpInstallation.swift rename to phpmon/Common/PHP/PhpInstallation.swift diff --git a/phpmon-common/PHP/Switcher/InternalSwitcher.swift b/phpmon/Common/PHP/Switcher/InternalSwitcher.swift similarity index 100% rename from phpmon-common/PHP/Switcher/InternalSwitcher.swift rename to phpmon/Common/PHP/Switcher/InternalSwitcher.swift diff --git a/phpmon-common/PHP/Switcher/PhpSwitcher.swift b/phpmon/Common/PHP/Switcher/PhpSwitcher.swift similarity index 100% rename from phpmon-common/PHP/Switcher/PhpSwitcher.swift rename to phpmon/Common/PHP/Switcher/PhpSwitcher.swift diff --git a/phpmon/Domain/Menu/HeaderView.xib b/phpmon/Domain/Menu/HeaderView.xib index 1bed783..b0dbbe9 100644 --- a/phpmon/Domain/Menu/HeaderView.xib +++ b/phpmon/Domain/Menu/HeaderView.xib @@ -29,7 +29,7 @@ - + diff --git a/phpmon/Domain/Menu/ServicesView.xib b/phpmon/Domain/Menu/ServicesView.xib index c1371ff..964d4b2 100644 --- a/phpmon/Domain/Menu/ServicesView.xib +++ b/phpmon/Domain/Menu/ServicesView.xib @@ -9,18 +9,18 @@ - - + + - + - + - + @@ -28,7 +28,7 @@ - + @@ -47,10 +47,10 @@ - + - + @@ -58,7 +58,7 @@ - + @@ -77,10 +77,10 @@ - + - + @@ -88,7 +88,7 @@ - + @@ -145,6 +145,6 @@ - + diff --git a/phpmon/Domain/Menu/StatsView.xib b/phpmon/Domain/Menu/StatsView.xib index fd6bca0..0f83537 100644 --- a/phpmon/Domain/Menu/StatsView.xib +++ b/phpmon/Domain/Menu/StatsView.xib @@ -10,11 +10,11 @@ - + - + @@ -46,10 +46,10 @@ - + - + @@ -57,7 +57,7 @@ - + @@ -75,7 +75,7 @@ - + diff --git a/phpmon/Domain/SiteList/SiteListCell.swift b/phpmon/Domain/SiteList/SiteListCell.swift index bf95985..21606fb 100644 --- a/phpmon/Domain/SiteList/SiteListCell.swift +++ b/phpmon/Domain/SiteList/SiteListCell.swift @@ -47,7 +47,6 @@ class SiteListCell: NSTableCellView imageViewType.contentTintColor = NSColor.tertiaryLabelColor // Show the green or red lock based on whether the site was secured - // imageViewLock.image = NSImage(named: site.secured ? "Lock" : "LockUnlocked") imageViewLock.contentTintColor = site.secured ? NSColor(named: "IconColorGreen") // green : NSColor(named: "IconColorRed")