From 073b7cf943bcd28ffeb9842feb87635b68f0c3f5 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Tue, 6 Dec 2022 20:53:42 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=97=20WIP:=20Interactions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 10 --------- .../Valet/Domains/ValetInteractable.swift | 21 ------------------- .../Valet/Domains/ValetInteractor.swift | 4 ++-- .../Valet/Proxies/ValetProxy.swift | 6 ++++++ .../Integrations/Valet/Sites/ValetSite.swift | 12 ++++------- 5 files changed, 12 insertions(+), 41 deletions(-) delete mode 100644 phpmon/Domain/Integrations/Valet/Domains/ValetInteractable.swift diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 595cc1c..c195d59 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -35,10 +35,6 @@ 54FCFD2E276C8D67004CE748 /* HotkeyPreferenceView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 54FCFD2C276C8D67004CE748 /* HotkeyPreferenceView.xib */; }; 54FCFD30276C8DA4004CE748 /* HotkeyPreferenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54FCFD2F276C8DA4004CE748 /* HotkeyPreferenceView.swift */; }; 54FCFD31276C8DA4004CE748 /* HotkeyPreferenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54FCFD2F276C8DA4004CE748 /* HotkeyPreferenceView.swift */; }; - C40175B229030F4600763A68 /* ValetInteractable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40175B129030F4600763A68 /* ValetInteractable.swift */; }; - C40175B329030F4600763A68 /* ValetInteractable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40175B129030F4600763A68 /* ValetInteractable.swift */; }; - C40175B429030F4600763A68 /* ValetInteractable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40175B129030F4600763A68 /* ValetInteractable.swift */; }; - C40175B529030F4600763A68 /* ValetInteractable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40175B129030F4600763A68 /* ValetInteractable.swift */; }; C40175B82903108900763A68 /* ValetInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40175B72903108900763A68 /* ValetInteractor.swift */; }; C40175B92903108900763A68 /* ValetInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40175B72903108900763A68 /* ValetInteractor.swift */; }; C40175BA2903108900763A68 /* ValetInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40175B72903108900763A68 /* ValetInteractor.swift */; }; @@ -725,7 +721,6 @@ 54FCFD29276C8AA4004CE748 /* CheckboxPreferenceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxPreferenceView.swift; sourceTree = ""; }; 54FCFD2C276C8D67004CE748 /* HotkeyPreferenceView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HotkeyPreferenceView.xib; sourceTree = ""; }; 54FCFD2F276C8DA4004CE748 /* HotkeyPreferenceView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HotkeyPreferenceView.swift; sourceTree = ""; }; - C40175B129030F4600763A68 /* ValetInteractable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetInteractable.swift; sourceTree = ""; }; C40175B72903108900763A68 /* ValetInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetInteractor.swift; sourceTree = ""; }; C40508AE28ADA23D008FAC1F /* NoDomainResultsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoDomainResultsView.swift; sourceTree = ""; }; C40508B028ADAB44008FAC1F /* NSMenuItemExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSMenuItemExtension.swift; sourceTree = ""; }; @@ -1033,7 +1028,6 @@ isa = PBXGroup; children = ( C42F26722805B4B400938AC7 /* ValetListable.swift */, - C40175B129030F4600763A68 /* ValetInteractable.swift */, C40175B72903108900763A68 /* ValetInteractor.swift */, ); path = Domains; @@ -1960,7 +1954,6 @@ C4C8900728F0E3EF00CE5E97 /* ActiveFileSystem.swift in Sources */, C4D8016622B1584700C6DA1B /* Startup.swift in Sources */, C42C49DB27C2806F0074ABAC /* MainMenu+FixMyValet.swift in Sources */, - C40175B229030F4600763A68 /* ValetInteractable.swift in Sources */, C48D6C70279CD2AC00F26D7E /* PhpVersionNumber.swift in Sources */, C4998F0A2617633900B2526E /* PreferencesWindowController.swift in Sources */, C46FA9882822EFDC00D78807 /* PhpConfigurationFile.swift in Sources */, @@ -2168,7 +2161,6 @@ C471E85C28F9BB650021E251 /* DomainListWindowController.swift in Sources */, C471E85D28F9BB650021E251 /* DomainListVC.swift in Sources */, C471E85E28F9BB650021E251 /* DomainListVC+ContextMenu.swift in Sources */, - C40175B429030F4600763A68 /* ValetInteractable.swift in Sources */, C4E2E86628FC2F1B003B070C /* XCPMApplication.swift in Sources */, C471E85F28F9BB650021E251 /* DomainListVC+Actions.swift in Sources */, C471E86028F9BB650021E251 /* SelectionVC.swift in Sources */, @@ -2277,7 +2269,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C40175B529030F4600763A68 /* ValetInteractable.swift in Sources */, C471E89028F9BB8F0021E251 /* AlertableError.swift in Sources */, C471E89128F9BB8F0021E251 /* Errors.swift in Sources */, C471E89228F9BB8F0021E251 /* Alert.swift in Sources */, @@ -2522,7 +2513,6 @@ C485706D28BF450900539B36 /* NSMenuItemExtension.swift in Sources */, C481F79726164A78004FBCFF /* PrefsVC.swift in Sources */, C495F5B028A42E080087F70A /* EnvironmentCheck.swift in Sources */, - C40175B329030F4600763A68 /* ValetInteractable.swift in Sources */, C41E871B2763D42300161EE0 /* DomainListVC+ContextMenu.swift in Sources */, C40C7F3127722E8D00DDDCDC /* Logger.swift in Sources */, C4068CAB27B0890D00544CD5 /* MenuBarIcons.swift in Sources */, diff --git a/phpmon/Domain/Integrations/Valet/Domains/ValetInteractable.swift b/phpmon/Domain/Integrations/Valet/Domains/ValetInteractable.swift deleted file mode 100644 index 38156ec..0000000 --- a/phpmon/Domain/Integrations/Valet/Domains/ValetInteractable.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// ValetInteractable.swift -// PHP Monitor -// -// Created by Nico Verbruggen on 21/10/2022. -// Copyright © 2022 Nico Verbruggen. All rights reserved. -// - -import Foundation - -protocol ValetInteractable { - - func secure() async throws - - func unsecure() async throws - - func isolate(version: PhpVersionNumber) async throws - - func unlink() async throws - -} diff --git a/phpmon/Domain/Integrations/Valet/Domains/ValetInteractor.swift b/phpmon/Domain/Integrations/Valet/Domains/ValetInteractor.swift index 7b2067a..0e90616 100644 --- a/phpmon/Domain/Integrations/Valet/Domains/ValetInteractor.swift +++ b/phpmon/Domain/Integrations/Valet/Domains/ValetInteractor.swift @@ -10,11 +10,11 @@ import Foundation #warning("ValetInteractor needs to be implemented and used") class ValetInteractor { - public static func secure(site: ValetSite) async throws { + public static func toggleSecure(site: ValetSite) async throws { // TODO } - public static func unsecure(site: ValetSite) async throws { + public static func toggleSecure(proxy: ValetProxy) async throws { // TODO } diff --git a/phpmon/Domain/Integrations/Valet/Proxies/ValetProxy.swift b/phpmon/Domain/Integrations/Valet/Proxies/ValetProxy.swift index 3bc067a..d0ea2ab 100644 --- a/phpmon/Domain/Integrations/Valet/Proxies/ValetProxy.swift +++ b/phpmon/Domain/Integrations/Valet/Proxies/ValetProxy.swift @@ -50,4 +50,10 @@ class ValetProxy: ValetListable { func getListableUrl() -> URL? { return URL(string: "\(self.secured ? "https://" : "http://")\(self.domain).\(self.tld)") } + + // MARK: - Interactions + + func toggleSecure() async throws { + try await ValetInteractor.toggleSecure(proxy: self) + } } diff --git a/phpmon/Domain/Integrations/Valet/Sites/ValetSite.swift b/phpmon/Domain/Integrations/Valet/Sites/ValetSite.swift index 1367aa4..86ddb88 100644 --- a/phpmon/Domain/Integrations/Valet/Sites/ValetSite.swift +++ b/phpmon/Domain/Integrations/Valet/Sites/ValetSite.swift @@ -8,7 +8,7 @@ import Foundation -class ValetSite: ValetListable, ValetInteractable { +class ValetSite: ValetListable { /// Name of the site. Does not include the TLD. var name: String @@ -263,14 +263,10 @@ class ValetSite: ValetListable, ValetInteractable { return URL(string: "\(self.secured ? "https://" : "http://")\(self.name).\(Valet.shared.config.tld)") } - // MARK: ValetInteractable + // MARK: - Interactions - func secure() async throws { - try await ValetInteractor.secure(site: self) - } - - func unsecure() async throws { - try await ValetInteractor.unsecure(site: self) + func toggleSecure() async throws { + try await ValetInteractor.toggleSecure(site: self) } func isolate(version: PhpVersionNumber) async throws {