From 8055a32bdee49fa0c27b14247899eb527eeabbd4 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Thu, 29 Sep 2022 18:50:40 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20ComposerWindow=20deinit=20?= =?UTF-8?q?not=20firing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/Common/Helpers/PMWindowController.swift | 2 +- phpmon/Domain/App/AppDelegate.swift | 2 +- phpmon/Domain/DomainList/DomainListVC.swift | 2 +- .../Integrations/Composer/ComposerWindow.swift | 14 ++++++++++---- phpmon/Domain/Notice/BetterAlertVC.swift | 2 +- phpmon/Domain/Preferences/PrefsVC.swift | 2 +- phpmon/Domain/Progress/ProgressVC.swift | 2 +- .../TerminalProgressWindowController.swift | 2 +- phpmon/Domain/Watcher/PhpConfigWatcher.swift | 2 +- 9 files changed, 18 insertions(+), 12 deletions(-) diff --git a/phpmon/Common/Helpers/PMWindowController.swift b/phpmon/Common/Helpers/PMWindowController.swift index f9e75b4..24684dc 100644 --- a/phpmon/Common/Helpers/PMWindowController.swift +++ b/phpmon/Common/Helpers/PMWindowController.swift @@ -30,7 +30,7 @@ class PMWindowController: NSWindowController, NSWindowDelegate { } deinit { - Log.perf("Window controller '\(windowName)' was deinitialized") + Log.perf("deinit: \(String(describing: self)).\(#function)") } } diff --git a/phpmon/Domain/App/AppDelegate.swift b/phpmon/Domain/App/AppDelegate.swift index 96f5628..c455fff 100644 --- a/phpmon/Domain/App/AppDelegate.swift +++ b/phpmon/Domain/App/AppDelegate.swift @@ -65,7 +65,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele override init() { logger.verbosity = .info #if DEBUG - // logger.verbosity = .performance + logger.verbosity = .performance #endif if CommandLine.arguments.contains("--v") { logger.verbosity = .performance diff --git a/phpmon/Domain/DomainList/DomainListVC.swift b/phpmon/Domain/DomainList/DomainListVC.swift index 7c0f531..d3a26cd 100644 --- a/phpmon/Domain/DomainList/DomainListVC.swift +++ b/phpmon/Domain/DomainList/DomainListVC.swift @@ -292,6 +292,6 @@ class DomainListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource // MARK: - Deinitialization deinit { - Log.perf("DomainListVC deallocated") + Log.perf("deinit: \(String(describing: self)).\(#function)") } } diff --git a/phpmon/Domain/Integrations/Composer/ComposerWindow.swift b/phpmon/Domain/Integrations/Composer/ComposerWindow.swift index 2868636..4daa006 100644 --- a/phpmon/Domain/Integrations/Composer/ComposerWindow.swift +++ b/phpmon/Domain/Integrations/Composer/ComposerWindow.swift @@ -52,15 +52,15 @@ class ComposerWindow { } task.listen( - didReceiveStandardOutputData: { string in + didReceiveStandardOutputData: { [weak self] string in DispatchQueue.main.async { - self.window?.addToConsole(string) + self?.window?.addToConsole(string) } // Log.perf("\(string.trimmingCharacters(in: .newlines))") }, - didReceiveStandardErrorData: { string in + didReceiveStandardErrorData: { [weak self] string in DispatchQueue.main.async { - self.window?.addToConsole(string) + self?.window?.addToConsole(string) } // Log.perf("\(string.trimmingCharacters(in: .newlines))") } @@ -91,6 +91,7 @@ class ComposerWindow { } window = nil removeBusyStatus() + menu = nil completion(true) } } @@ -103,6 +104,7 @@ class ComposerWindow { window?.progressView?.labelDescription.stringValue = "alert.composer_failure.info".localized window = nil removeBusyStatus() + menu = nil completion(false) } } @@ -128,4 +130,8 @@ class ComposerWindow { .withPrimary(text: "OK") .show() } + + deinit { + Log.perf("deinit: \(String(describing: self)).\(#function)") + } } diff --git a/phpmon/Domain/Notice/BetterAlertVC.swift b/phpmon/Domain/Notice/BetterAlertVC.swift index 9f4797f..c6c3bdc 100644 --- a/phpmon/Domain/Notice/BetterAlertVC.swift +++ b/phpmon/Domain/Notice/BetterAlertVC.swift @@ -47,7 +47,7 @@ class BetterAlertVC: NSViewController { } deinit { - Log.perf("A BetterAlert has been deinitialized.") + Log.perf("deinit: \(String(describing: self)).\(#function)") } // MARK: Outlet Actions diff --git a/phpmon/Domain/Preferences/PrefsVC.swift b/phpmon/Domain/Preferences/PrefsVC.swift index 47179b0..346f6ec 100644 --- a/phpmon/Domain/Preferences/PrefsVC.swift +++ b/phpmon/Domain/Preferences/PrefsVC.swift @@ -25,7 +25,7 @@ class GenericPreferenceVC: NSViewController { // MARK: - Deinitialization deinit { - Log.perf("PrefsVC deallocated") + Log.perf("deinit: \(String(describing: self)).\(#function)") } func getDynamicIconPV() -> NSView { diff --git a/phpmon/Domain/Progress/ProgressVC.swift b/phpmon/Domain/Progress/ProgressVC.swift index 2b77bb2..9fc8f2c 100644 --- a/phpmon/Domain/Progress/ProgressVC.swift +++ b/phpmon/Domain/Progress/ProgressVC.swift @@ -18,7 +18,7 @@ class ProgressViewController: NSViewController { @IBOutlet weak var imageViewType: NSImageView! deinit { - Log.perf("Deinitializing ProgressViewController") + Log.perf("deinit: \(String(describing: self)).\(#function)") } } diff --git a/phpmon/Domain/Progress/TerminalProgressWindowController.swift b/phpmon/Domain/Progress/TerminalProgressWindowController.swift index c7c05ea..d60f7bc 100644 --- a/phpmon/Domain/Progress/TerminalProgressWindowController.swift +++ b/phpmon/Domain/Progress/TerminalProgressWindowController.swift @@ -56,7 +56,7 @@ class TerminalProgressWindowController: NSWindowController, NSWindowDelegate { } deinit { - Log.perf("Deinitializing ProgressWindowController") + Log.perf("deinit: \(String(describing: self)).\(#function)") } } diff --git a/phpmon/Domain/Watcher/PhpConfigWatcher.swift b/phpmon/Domain/Watcher/PhpConfigWatcher.swift index b1b1e45..cc6d231 100644 --- a/phpmon/Domain/Watcher/PhpConfigWatcher.swift +++ b/phpmon/Domain/Watcher/PhpConfigWatcher.swift @@ -68,7 +68,7 @@ class PhpConfigWatcher { } deinit { - Log.perf("A PhpConfigWatcher has been deinitialized.") + Log.perf("deinit: \(String(describing: self)).\(#function)") } }