From c2585f9bf45c9ffaab30c690f6d5cc904171ac77 Mon Sep 17 00:00:00 2001
From: Nico Verbruggen <mail@nicoverbruggen.be>
Date: Wed, 31 Mar 2021 23:57:10 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20Cleanup,=20add=20separator=20bef?=
 =?UTF-8?q?ore=20refresh=20item?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 phpmon/Domain/Menu/MainMenu.swift   | 14 +++++++++-----
 phpmon/Domain/Menu/StatusMenu.swift |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/phpmon/Domain/Menu/MainMenu.swift b/phpmon/Domain/Menu/MainMenu.swift
index c17fc29..1515add 100644
--- a/phpmon/Domain/Menu/MainMenu.swift
+++ b/phpmon/Domain/Menu/MainMenu.swift
@@ -181,16 +181,16 @@ class MainMenu: NSObject, NSWindowDelegate {
     }
     
     @objc func reloadPhpMonitorMenu() {
-        waitAndExecute({
+        waitAndExecute {
             // This automatically reloads the menu
             print("Reloading information about the PHP installation...")
-        }, completion: {
+        } completion: {
             // Add a slight delay to make sure it loads the new menu
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                 // Open the menu again
                 MainMenu.shared.statusItem.button?.performClick(nil)
             }
-        })
+        }
     }
     
     @objc func setBusyImage() {
@@ -202,9 +202,9 @@ class MainMenu: NSObject, NSWindowDelegate {
     // MARK: - Actions
     
     @objc func restartPhpFpm() {
-        waitAndExecute({
+        waitAndExecute {
             Actions.restartPhpFpm()
-        })
+        }
     }
     
     @objc func restartAllServices() {
@@ -235,9 +235,13 @@ class MainMenu: NSObject, NSWindowDelegate {
     
     @objc func openPhpInfo() {
         waitAndExecute {
+            // Write a file called `phpmon_phpinfo.php` to /tmp
             try! "<?php phpinfo();".write(toFile: "/tmp/phpmon_phpinfo.php", atomically: true, encoding: .utf8)
+            
+            // Tell php-cgi to run the PHP and output as an .html file
             Shell.run("\(Paths.binPath)/php-cgi -q /tmp/phpmon_phpinfo.php > /tmp/phpmon_phpinfo.html")
         } completion: {
+            // When this has been completed, open the URL to the file in the browser
             NSWorkspace.shared.open(URL(string: "file:///private/tmp/phpmon_phpinfo.html")!)
         }
     }
diff --git a/phpmon/Domain/Menu/StatusMenu.swift b/phpmon/Domain/Menu/StatusMenu.swift
index a5c3aa0..b4466f7 100644
--- a/phpmon/Domain/Menu/StatusMenu.swift
+++ b/phpmon/Domain/Menu/StatusMenu.swift
@@ -110,6 +110,8 @@ class StatusMenu : NSMenu {
             self.addExtensionItem(phpExtension)
         }
         
+        self.addItem(NSMenuItem.separator())
+        
         self.addItem(NSMenuItem(title: "mi_php_refresh".localized, action: #selector(MainMenu.reloadPhpMonitorMenu), keyEquivalent: "r"))
     }