From 9153bb140a0661c92401f3db38c7f88337e4d55d Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Tue, 31 Aug 2021 11:03:55 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20Code=20style=20fixes=20(empty=20?= =?UTF-8?q?line=20before=20class=20closes)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/AppDelegate.swift | 1 + phpmon/Domain/Core/Actions.swift | 1 + phpmon/Domain/Core/Startup.swift | 1 + phpmon/Domain/Extensions/DateExtension.swift | 5 +++-- phpmon/Domain/Extensions/StringExtension.swift | 1 + phpmon/Domain/Extensions/XibLoadable.swift | 5 ++++- phpmon/Domain/Helpers/HomebrewPackage.swift | 2 ++ phpmon/Domain/Menu/HeaderView.swift | 2 ++ phpmon/Domain/Menu/StatsView.swift | 2 ++ phpmon/Domain/PHP/PhpExtension.swift | 1 + phpmon/Domain/PHP/PhpInstallation.swift | 1 + phpmon/Domain/Preferences/PrefsWC.swift | 1 + phpmon/Domain/Terminal/Paths.swift | 1 + phpmon/Domain/Terminal/Shell.swift | 14 ++++++++++---- 14 files changed, 31 insertions(+), 7 deletions(-) diff --git a/phpmon/AppDelegate.swift b/phpmon/AppDelegate.swift index 34d6651..3f52166 100644 --- a/phpmon/AppDelegate.swift +++ b/phpmon/AppDelegate.swift @@ -77,4 +77,5 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele ) -> Bool { return true } + } diff --git a/phpmon/Domain/Core/Actions.swift b/phpmon/Domain/Core/Actions.swift index 3ca6ea4..08faea9 100644 --- a/phpmon/Domain/Core/Actions.swift +++ b/phpmon/Domain/Core/Actions.swift @@ -217,4 +217,5 @@ class Actions { .trimmingCharacters(in: .whitespacesAndNewlines) .contains("YES") } + } diff --git a/phpmon/Domain/Core/Startup.swift b/phpmon/Domain/Core/Startup.swift index b7ff1d7..25f0d8c 100644 --- a/phpmon/Domain/Core/Startup.swift +++ b/phpmon/Domain/Core/Startup.swift @@ -124,4 +124,5 @@ class Startup { breaking ? failureCallback() : () } } + } diff --git a/phpmon/Domain/Extensions/DateExtension.swift b/phpmon/Domain/Extensions/DateExtension.swift index 72c3b61..52f508b 100644 --- a/phpmon/Domain/Extensions/DateExtension.swift +++ b/phpmon/Domain/Extensions/DateExtension.swift @@ -7,11 +7,12 @@ import Cocoa -extension Date -{ +extension Date { + func toString() -> String { let dateFormatter = DateFormatter() dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss" return dateFormatter.string(from: self) } + } diff --git a/phpmon/Domain/Extensions/StringExtension.swift b/phpmon/Domain/Extensions/StringExtension.swift index 21ea98b..778eebb 100644 --- a/phpmon/Domain/Extensions/StringExtension.swift +++ b/phpmon/Domain/Extensions/StringExtension.swift @@ -33,4 +33,5 @@ extension String { let end = r.upperBound return String(self[start ..< end]) } + } diff --git a/phpmon/Domain/Extensions/XibLoadable.swift b/phpmon/Domain/Extensions/XibLoadable.swift index b5a2bc8..87ff008 100644 --- a/phpmon/Domain/Extensions/XibLoadable.swift +++ b/phpmon/Domain/Extensions/XibLoadable.swift @@ -7,17 +7,19 @@ // import Foundation - import Cocoa // Adapted from: https://stackoverflow.com/a/46268778 protocol XibLoadable { + static var xibName: String? { get } static func createFromXib(in bundle: Bundle) -> Self? + } extension XibLoadable where Self: NSView { + static var xibName: String? { return String(describing: Self.self) } @@ -30,4 +32,5 @@ extension XibLoadable where Self: NSView { let views = Array(results).filter { $0 is Self } return views.last as? Self } + } diff --git a/phpmon/Domain/Helpers/HomebrewPackage.swift b/phpmon/Domain/Helpers/HomebrewPackage.swift index 9bdb1aa..ffd8ea3 100644 --- a/phpmon/Domain/Helpers/HomebrewPackage.swift +++ b/phpmon/Domain/Helpers/HomebrewPackage.swift @@ -8,6 +8,7 @@ import Foundation struct HomebrewPackage : Decodable { + let name: String let full_name: String let aliases: [String] @@ -15,4 +16,5 @@ struct HomebrewPackage : Decodable { public var version: String { return aliases.first!.replacingOccurrences(of: "php@", with: "") } + } diff --git a/phpmon/Domain/Menu/HeaderView.swift b/phpmon/Domain/Menu/HeaderView.swift index da1e409..c3d47f7 100644 --- a/phpmon/Domain/Menu/HeaderView.swift +++ b/phpmon/Domain/Menu/HeaderView.swift @@ -10,6 +10,7 @@ import Foundation import Cocoa class HeaderView: NSView, XibLoadable { + @IBOutlet weak var textField: NSTextField! static func asMenuItem(text: String) -> NSMenuItem { @@ -20,4 +21,5 @@ class HeaderView: NSView, XibLoadable { item.target = self return item } + } diff --git a/phpmon/Domain/Menu/StatsView.swift b/phpmon/Domain/Menu/StatsView.swift index f54038f..5f1e63d 100644 --- a/phpmon/Domain/Menu/StatsView.swift +++ b/phpmon/Domain/Menu/StatsView.swift @@ -10,6 +10,7 @@ import Foundation import Cocoa class StatsView: NSView, XibLoadable { + @IBOutlet weak var titleMemLimit: NSTextField! @IBOutlet weak var titleMaxPost: NSTextField! @IBOutlet weak var titleMaxUpload: NSTextField! @@ -31,4 +32,5 @@ class StatsView: NSView, XibLoadable { item.target = self return item } + } diff --git a/phpmon/Domain/PHP/PhpExtension.swift b/phpmon/Domain/PHP/PhpExtension.swift index d2a3f4b..5268649 100644 --- a/phpmon/Domain/PHP/PhpExtension.swift +++ b/phpmon/Domain/PHP/PhpExtension.swift @@ -104,4 +104,5 @@ class PhpExtension { return PhpExtension($0, file: path.path) } } + } diff --git a/phpmon/Domain/PHP/PhpInstallation.swift b/phpmon/Domain/PHP/PhpInstallation.swift index 068c4f9..e0eec3f 100644 --- a/phpmon/Domain/PHP/PhpInstallation.swift +++ b/phpmon/Domain/PHP/PhpInstallation.swift @@ -169,4 +169,5 @@ class PhpInstallation { var upload_max_filesize = "???" var post_max_size = "???" } + } diff --git a/phpmon/Domain/Preferences/PrefsWC.swift b/phpmon/Domain/Preferences/PrefsWC.swift index 08360a8..3d2dd55 100644 --- a/phpmon/Domain/Preferences/PrefsWC.swift +++ b/phpmon/Domain/Preferences/PrefsWC.swift @@ -14,6 +14,7 @@ struct Keys { } class PrefsWC: NSWindowController { + override func windowDidLoad() { super.windowDidLoad() } diff --git a/phpmon/Domain/Terminal/Paths.swift b/phpmon/Domain/Terminal/Paths.swift index 77d4031..d25cfb4 100644 --- a/phpmon/Domain/Terminal/Paths.swift +++ b/phpmon/Domain/Terminal/Paths.swift @@ -64,4 +64,5 @@ class Paths { public static var etcPath: String { return "\(shared.baseDir.rawValue)/etc" } + } diff --git a/phpmon/Domain/Terminal/Shell.swift b/phpmon/Domain/Terminal/Shell.swift index de1a377..a8b44ec 100644 --- a/phpmon/Domain/Terminal/Shell.swift +++ b/phpmon/Domain/Terminal/Shell.swift @@ -21,7 +21,7 @@ class Shell { // MARK: - Singleton - var shell = "/bin/sh" + var shell: String init() { // Determine if we're using macOS Catalina or newer (that support /bin/zsh as default shell) @@ -29,9 +29,14 @@ class Shell { .init(majorVersion: 10, minorVersion: 15, patchVersion: 0)) // If macOS Mojave is being used, we'll default to /bin/bash - shell = at_least_10_15 ? "/bin/sh" : "/bin/bash" - print(at_least_10_15 ? "Detected recent macOS (> 10.15): defaulting to /bin/sh" - : "Detected older macOS (< 10.15): so defaulting to /bin/bash") + shell = at_least_10_15 + ? "/bin/sh" + : "/bin/bash" + + print(at_least_10_15 + ? "Detected recent macOS (> 10.15): defaulting to /bin/sh" + : "Detected older macOS (< 10.15): defaulting to /bin/bash" + ) } /** @@ -78,4 +83,5 @@ class Shell { public static func fileExists(_ path: String) -> Bool { return Shell.pipe("if [ -f \(path) ]; then /bin/echo -n \"0\"; fi") == "0" } + }