From 0f464f5814dc5e09058389686bb75e8ebabc3ca4 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Mon, 7 Feb 2022 18:00:35 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 14 +++----- phpmon/{Domain => Common}/Helpers/Alert.swift | 0 .../Helpers/Application.swift | 0 phpmon/{Domain => Common}/Helpers/Async.swift | 0 .../Helpers/Filesystem.swift | 0 .../Helpers/LocalNotification.swift | 0 .../Helpers/MenuBarImageGenerator.swift | 0 .../Helpers/PMWindowController.swift | 0 .../Helpers/VersionExtractor.swift | 0 .../{Core => App}/App+ActivationPolicy.swift | 0 .../{Core => App}/App+GlobalHotkey.swift | 0 phpmon/Domain/{Core => App}/App.swift | 0 .../{Core => App}/AppDelegate+InterApp.swift | 0 .../AppDelegate+MenuOutlets.swift | 0 .../AppDelegate+Notifications.swift | 0 phpmon/Domain/{Core => App}/AppDelegate.swift | 0 .../{Core => App}/Base.lproj/Main.storyboard | 0 .../{Core => App}/InterAppHandler.swift | 0 phpmon/Domain/{Core => App}/Startup.swift | 0 phpmon/Domain/Helpers/Timer.swift | 32 ------------------- 20 files changed, 4 insertions(+), 42 deletions(-) rename phpmon/{Domain => Common}/Helpers/Alert.swift (100%) rename phpmon/{Domain => Common}/Helpers/Application.swift (100%) rename phpmon/{Domain => Common}/Helpers/Async.swift (100%) rename phpmon/{Domain => Common}/Helpers/Filesystem.swift (100%) rename phpmon/{Domain => Common}/Helpers/LocalNotification.swift (100%) rename phpmon/{Domain => Common}/Helpers/MenuBarImageGenerator.swift (100%) rename phpmon/{Domain => Common}/Helpers/PMWindowController.swift (100%) rename phpmon/{Domain => Common}/Helpers/VersionExtractor.swift (100%) rename phpmon/Domain/{Core => App}/App+ActivationPolicy.swift (100%) rename phpmon/Domain/{Core => App}/App+GlobalHotkey.swift (100%) rename phpmon/Domain/{Core => App}/App.swift (100%) rename phpmon/Domain/{Core => App}/AppDelegate+InterApp.swift (100%) rename phpmon/Domain/{Core => App}/AppDelegate+MenuOutlets.swift (100%) rename phpmon/Domain/{Core => App}/AppDelegate+Notifications.swift (100%) rename phpmon/Domain/{Core => App}/AppDelegate.swift (100%) rename phpmon/Domain/{Core => App}/Base.lproj/Main.storyboard (100%) rename phpmon/Domain/{Core => App}/InterAppHandler.swift (100%) rename phpmon/Domain/{Core => App}/Startup.swift (100%) delete mode 100644 phpmon/Domain/Helpers/Timer.swift diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 2b31bb1..2afbc71 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -9,8 +9,6 @@ /* Begin PBXBuildFile section */ 5420395926135DC100FB00FA /* PrefsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5420395826135DC100FB00FA /* PrefsVC.swift */; }; 5420395F2613607600FB00FA /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5420395E2613607600FB00FA /* Preferences.swift */; }; - 54AB03262763858F00A29D5F /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54AB03252763858F00A29D5F /* Timer.swift */; }; - 54AB03272763858F00A29D5F /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54AB03252763858F00A29D5F /* Timer.swift */; }; 54B48B5F275F66AE006D90C5 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54B48B5E275F66AE006D90C5 /* Application.swift */; }; 54B48B60275F66AE006D90C5 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54B48B5E275F66AE006D90C5 /* Application.swift */; }; 54EAC806262F212B0092D14E /* GlobalKeybindPreference.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41CD0282628D8EE0065BBED /* GlobalKeybindPreference.swift */; }; @@ -237,7 +235,6 @@ /* Begin PBXFileReference section */ 5420395826135DC100FB00FA /* PrefsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefsVC.swift; sourceTree = ""; }; 5420395E2613607600FB00FA /* Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = ""; }; - 54AB03252763858F00A29D5F /* Timer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Timer.swift; sourceTree = ""; }; 54B48B5E275F66AE006D90C5 /* Application.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = ""; }; 54FCFD25276C883F004CE748 /* SelectPreferenceView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SelectPreferenceView.xib; sourceTree = ""; }; 54FCFD29276C8AA4004CE748 /* CheckboxPreferenceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxPreferenceView.swift; sourceTree = ""; }; @@ -504,14 +501,13 @@ isa = PBXGroup; children = ( C4AF9F6B275445D300D44ED0 /* Integrations */, - C4B13B1D25C4915000548C3A /* Core */, + C4B13B1D25C4915000548C3A /* App */, C4D9ADBD27761084007277F4 /* PHP */, C47331A0247093AC009A0597 /* Menu */, C464ADAA275A7A25003FCD53 /* SiteList */, 5420395726135DB800FB00FA /* Preferences */, C44C198F276E3A380072762D /* Progress */, C4C8E81D276F5686003AC782 /* Watcher */, - C4811D2822D70D9C00B5F6B3 /* Helpers */, C4EE55B027708BB2001DF387 /* SwiftUI */, ); path = Domain; @@ -574,7 +570,6 @@ C474B00524C0E98C00066A22 /* LocalNotification.swift */, C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */, C4CCBA6B275C567B008C7055 /* PMWindowController.swift */, - 54AB03252763858F00A29D5F /* Timer.swift */, C4B5635D276AB09000F12CCB /* VersionExtractor.swift */, C4EC1E6C279DF87A0010F296 /* Async.swift */, ); @@ -616,7 +611,7 @@ path = Homebrew; sourceTree = ""; }; - C4B13B1D25C4915000548C3A /* Core */ = { + C4B13B1D25C4915000548C3A /* App */ = { isa = PBXGroup; children = ( C41C1B3C22B0098000E7CF16 /* Main.storyboard */, @@ -630,7 +625,7 @@ C4D8016522B1584700C6DA1B /* Startup.swift */, C4EED88827A48778006D7272 /* InterAppHandler.swift */, ); - path = Core; + path = App; sourceTree = ""; }; C4B5853A2770FE2500DA4FBE /* Common */ = { @@ -640,6 +635,7 @@ 54B20EDF263AA22C00D3250E /* PHP */, C44CCD4327AFE93300CE40E5 /* Errors */, C4F8C0A222D4F100002EFE61 /* Extensions */, + C4811D2822D70D9C00B5F6B3 /* Helpers */, ); path = Common; sourceTree = ""; @@ -954,7 +950,6 @@ C412E5FC25700D5300A1FB67 /* HomebrewPackage.swift in Sources */, C4D9ADBF277610E1007277F4 /* PhpSwitcher.swift in Sources */, C4068CAA27B0890D00544CD5 /* MenuBarIcons.swift in Sources */, - 54AB03262763858F00A29D5F /* Timer.swift in Sources */, C4C8E81B276F54E5003AC782 /* PhpConfigWatcher.swift in Sources */, C417DC74277614690015E6EE /* Helpers.swift in Sources */, C415D3E82770F692005EF286 /* AppDelegate+InterApp.swift in Sources */, @@ -997,7 +992,6 @@ C4EE55AE27708B9E001DF387 /* PMStatsView.swift in Sources */, C41CA5EE2774F8EE00A2C80E /* SiteListVC+Actions.swift in Sources */, C4F780C425D80B75000DBC97 /* MainMenu.swift in Sources */, - 54AB03272763858F00A29D5F /* Timer.swift in Sources */, 54FCFD2B276C8AA4004CE748 /* CheckboxPreferenceView.swift in Sources */, C415D3B82770F294005EF286 /* Actions.swift in Sources */, 54B48B60275F66AE006D90C5 /* Application.swift in Sources */, diff --git a/phpmon/Domain/Helpers/Alert.swift b/phpmon/Common/Helpers/Alert.swift similarity index 100% rename from phpmon/Domain/Helpers/Alert.swift rename to phpmon/Common/Helpers/Alert.swift diff --git a/phpmon/Domain/Helpers/Application.swift b/phpmon/Common/Helpers/Application.swift similarity index 100% rename from phpmon/Domain/Helpers/Application.swift rename to phpmon/Common/Helpers/Application.swift diff --git a/phpmon/Domain/Helpers/Async.swift b/phpmon/Common/Helpers/Async.swift similarity index 100% rename from phpmon/Domain/Helpers/Async.swift rename to phpmon/Common/Helpers/Async.swift diff --git a/phpmon/Domain/Helpers/Filesystem.swift b/phpmon/Common/Helpers/Filesystem.swift similarity index 100% rename from phpmon/Domain/Helpers/Filesystem.swift rename to phpmon/Common/Helpers/Filesystem.swift diff --git a/phpmon/Domain/Helpers/LocalNotification.swift b/phpmon/Common/Helpers/LocalNotification.swift similarity index 100% rename from phpmon/Domain/Helpers/LocalNotification.swift rename to phpmon/Common/Helpers/LocalNotification.swift diff --git a/phpmon/Domain/Helpers/MenuBarImageGenerator.swift b/phpmon/Common/Helpers/MenuBarImageGenerator.swift similarity index 100% rename from phpmon/Domain/Helpers/MenuBarImageGenerator.swift rename to phpmon/Common/Helpers/MenuBarImageGenerator.swift diff --git a/phpmon/Domain/Helpers/PMWindowController.swift b/phpmon/Common/Helpers/PMWindowController.swift similarity index 100% rename from phpmon/Domain/Helpers/PMWindowController.swift rename to phpmon/Common/Helpers/PMWindowController.swift diff --git a/phpmon/Domain/Helpers/VersionExtractor.swift b/phpmon/Common/Helpers/VersionExtractor.swift similarity index 100% rename from phpmon/Domain/Helpers/VersionExtractor.swift rename to phpmon/Common/Helpers/VersionExtractor.swift diff --git a/phpmon/Domain/Core/App+ActivationPolicy.swift b/phpmon/Domain/App/App+ActivationPolicy.swift similarity index 100% rename from phpmon/Domain/Core/App+ActivationPolicy.swift rename to phpmon/Domain/App/App+ActivationPolicy.swift diff --git a/phpmon/Domain/Core/App+GlobalHotkey.swift b/phpmon/Domain/App/App+GlobalHotkey.swift similarity index 100% rename from phpmon/Domain/Core/App+GlobalHotkey.swift rename to phpmon/Domain/App/App+GlobalHotkey.swift diff --git a/phpmon/Domain/Core/App.swift b/phpmon/Domain/App/App.swift similarity index 100% rename from phpmon/Domain/Core/App.swift rename to phpmon/Domain/App/App.swift diff --git a/phpmon/Domain/Core/AppDelegate+InterApp.swift b/phpmon/Domain/App/AppDelegate+InterApp.swift similarity index 100% rename from phpmon/Domain/Core/AppDelegate+InterApp.swift rename to phpmon/Domain/App/AppDelegate+InterApp.swift diff --git a/phpmon/Domain/Core/AppDelegate+MenuOutlets.swift b/phpmon/Domain/App/AppDelegate+MenuOutlets.swift similarity index 100% rename from phpmon/Domain/Core/AppDelegate+MenuOutlets.swift rename to phpmon/Domain/App/AppDelegate+MenuOutlets.swift diff --git a/phpmon/Domain/Core/AppDelegate+Notifications.swift b/phpmon/Domain/App/AppDelegate+Notifications.swift similarity index 100% rename from phpmon/Domain/Core/AppDelegate+Notifications.swift rename to phpmon/Domain/App/AppDelegate+Notifications.swift diff --git a/phpmon/Domain/Core/AppDelegate.swift b/phpmon/Domain/App/AppDelegate.swift similarity index 100% rename from phpmon/Domain/Core/AppDelegate.swift rename to phpmon/Domain/App/AppDelegate.swift diff --git a/phpmon/Domain/Core/Base.lproj/Main.storyboard b/phpmon/Domain/App/Base.lproj/Main.storyboard similarity index 100% rename from phpmon/Domain/Core/Base.lproj/Main.storyboard rename to phpmon/Domain/App/Base.lproj/Main.storyboard diff --git a/phpmon/Domain/Core/InterAppHandler.swift b/phpmon/Domain/App/InterAppHandler.swift similarity index 100% rename from phpmon/Domain/Core/InterAppHandler.swift rename to phpmon/Domain/App/InterAppHandler.swift diff --git a/phpmon/Domain/Core/Startup.swift b/phpmon/Domain/App/Startup.swift similarity index 100% rename from phpmon/Domain/Core/Startup.swift rename to phpmon/Domain/App/Startup.swift diff --git a/phpmon/Domain/Helpers/Timer.swift b/phpmon/Domain/Helpers/Timer.swift deleted file mode 100644 index f3b2ce3..0000000 --- a/phpmon/Domain/Helpers/Timer.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// BenchmarkTimer.swift -// PHP Monitor -// -// Created by Nico Verbruggen on 10/12/2021. -// Copyright © 2021 Nico Verbruggen. All rights reserved. -// - -import Foundation - -class BenchmarkTimer { - let startTime: CFAbsoluteTime - var endTime: CFAbsoluteTime? - - init() { - startTime = CFAbsoluteTimeGetCurrent() - } - - func stop() -> CFAbsoluteTime { - endTime = CFAbsoluteTimeGetCurrent() - - return duration! - } - - var duration: CFAbsoluteTime? { - if let endTime = endTime { - return endTime - startTime - } else { - return nil - } - } -}