diff --git a/Network Share Mounter/AppDelegate.swift b/Network Share Mounter/AppDelegate.swift
index 3feb8f743442993cb9787a95406906841b70435c..04ebe6a020bb4f85abfe6017563b781ed71d6f9d 100644
--- a/Network Share Mounter/AppDelegate.swift
+++ b/Network Share Mounter/AppDelegate.swift
@@ -13,56 +13,106 @@ import OSLog
import Sparkle
import Sentry
-/// The main application delegate class responsible for managing the app's lifecycle and core functionality.
+/// A delegate that manages the application lifecycle and network share mounting functionality.
+///
+/// The `AppDelegate` class is responsible for:
+/// - Managing the app's menu bar item and context menu
+/// - Monitoring network connectivity and enabling/disabling share mounting
+/// - Handling authentication with Kerberos (when enabled)
+/// - Mounting and unmounting network shares
+/// - Managing user preferences
+///
+/// It serves as the central coordinator for all major app functions, connecting the UI elements
+/// with the underlying mounting and authentication logic.
+///
+/// ## Menu Bar Integration
+/// The app appears as an icon in the macOS menu bar, with a context menu allowing users to:
+/// - Mount and unmount network shares
+/// - Access mounted shares through Finder
+/// - Configure app preferences
+/// - Check for updates (if enabled)
+///
+/// ## Authentication Support
+/// The app supports different authentication methods:
+/// - Standard macOS credentials
+/// - Kerberos Single Sign-On (when configured)
+///
+/// ## Menu States
+/// The menu bar icon changes color to indicate various states:
+/// - Default: Standard icon when operating normally
+/// - Green: Kerberos authentication successful
+/// - Yellow: Authentication issue (non-Kerberos)
+/// - Red: Kerberos authentication failure
@main
class AppDelegate: NSObject, NSApplicationDelegate {
- /// The status item displayed in the system menu bar
+ /// The status item displayed in the system menu bar.
+ /// This provides the app's primary user interface through a context menu.
let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
- /// The main application window
+ /// The main application window used for displaying preferences.
var window = NSWindow()
- /// The path where network shares are mounted
+ /// The path where network shares are mounted.
+ /// This path is used as the default location for all mounted shares.
var mountpath = ""
- /// The object responsible for mounting network shares
+ /// The object responsible for mounting network shares.
+ /// This handles all operations related to connecting, authenticating, and mounting shares.
var mounter: Mounter?
- /// Manages user preferences
+ /// Manages user preferences for the application.
+ /// Provides access to stored settings like auto-mount configuration, menu behavior, etc.
var prefs = PreferenceManager()
- /// Flag to enable Kerberos authentication
+ /// Flag indicating whether Kerberos authentication is enabled.
+ /// When true, the app will attempt to use Kerberos for Single Sign-On authentication.
var enableKerberos = false
- /// Flag to indicate if authentication is complete
+ /// Flag indicating if authentication has completed successfully.
+ /// This helps track the authentication state throughout the app lifecycle.
var authDone = false
- /// Handles automatic sign-in functionality
+ /// Handles automatic sign-in functionality.
+ /// Manages credential storage and retrieval for network shares.
var automaticSignIn = AutomaticSignIn.shared
- /// Monitors network changes
+ /// Monitors network changes to trigger appropriate mount/unmount operations.
+ /// Detects when the network becomes available or unavailable.
let monitor = Monitor.shared
- /// Timer for scheduling mount operations
+ /// Timer for scheduling periodic mount operations.
+ /// Triggers mount attempts at regular intervals defined by `Defaults.mountTriggerTimer`.
var mountTimer = Timer()
- /// Timer for scheduling authentication operations
+ /// Timer for scheduling periodic authentication operations.
+ /// Triggers authentication checks at regular intervals defined by `Defaults.authTriggerTimer`.
var authTimer = Timer()
- /// Dispatch source for handling unmount signals
+ /// Dispatch source for handling unmount signals from external sources.
+ /// Responds to SIGUSR1 signals to unmount all shares.
var unmountSignalSource: DispatchSourceSignal?
- /// Dispatch source for handling mount signals
+ /// Dispatch source for handling mount signals from external sources.
+ /// Responds to SIGUSR2 signals to mount configured shares.
var mountSignalSource: DispatchSourceSignal?
- /// Controller for managing app updates
+ /// Controller for managing application updates.
+ /// Handles checking for, downloading, and installing app updates when enabled.
var updaterController: SPUStandardUpdaterController?
- /// Controller for monitoring system activity
+ /// Controller for monitoring system activity.
+ /// Tracks user activity to optimize mount/unmount operations.
var activityController: ActivityController?
- /// Initializes the AppDelegate and sets up the auto-updater if enabled
+ /// Initializes the AppDelegate and sets up the auto-updater if enabled.
+ ///
+ /// This method:
+ /// - Checks if the auto-updater is enabled in user preferences
+ /// - Initializes the Sparkle updater controller if updates are enabled
+ ///
+ /// The updater controller is configured with default settings, which can be
+ /// customized for more specific control over the update process.
override init() {
if prefs.bool(for: .enableAutoUpdater) == true {
// Initialize the updater controller with default configuration
@@ -71,7 +121,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
}
- /// Application entry point after launch
+ /// Performs initial setup when the application launches.
+ ///
+ /// This method:
+ /// 1. Configures diagnostic reporting (if enabled)
+ /// 2. Initializes the application window
+ /// 3. Sets up the menu bar status item
+ /// 4. Configures login item status
+ /// 5. Initializes the network share mounter
+ /// 6. Sets up signal handlers for external command support
+ ///
+ /// - Parameter aNotification: The notification object sent when the app finishes launching
func applicationDidFinishLaunching(_ aNotification: Notification) {
#if DEBUG
@@ -126,56 +186,75 @@ class AppDelegate: NSObject, NSApplicationDelegate {
activityController = ActivityController(appDelegate: self)
}
+ /// Performs asynchronous initialization tasks for the application.
+ ///
+ /// This method:
+ /// 1. Initializes the mounter component
+ /// 2. Sets up the menu
+ /// 3. Configures Kerberos if needed
+ /// 4. Reports installation statistics
+ /// 5. Sets up notification observers
+ /// 6. Configures timers for periodic operations
+ /// 7. Starts network monitoring
+ ///
+ /// This method is called asynchronously after the app finishes launching.
+ /// It handles tasks that may take longer to complete and should not block
+ /// the main application launch sequence.
private func initializeApp() async {
Task {
await mounter?.asyncInit()
- // check if a kerberos domain/realm is set and is not empty
+ // Always build the menu, regardless of the mounter status
+ await self.constructMenu(withMounter: self.mounter)
+
+ // Check if a kerberos domain/realm is set and is not empty
if let krbRealm = self.prefs.string(for: .kerberosRealm), !krbRealm.isEmpty {
self.enableKerberos = true
}
- //
- // initialize statistics reporting struct
+ // Initialize statistics reporting
let stats = AppStatistics.init()
await stats.reportAppInstallation()
await AccountsManager.shared.initialize()
- // Do any additional setup after loading the view.
+ // Set up notification observer for error handling
if mounter != nil {
NotificationCenter.default.addObserver(self, selector: #selector(handleErrorNotification(_:)), name: .nsmNotification, object: nil)
} else {
Logger.app.error("Could not initialize mounter class, this should never happen.")
}
- // trigger user authentication on app start
+ // Trigger user authentication on app start
Logger.app.debug("Trigger user authentication on app startup.")
NotificationCenter.default.post(name: Defaults.nsmAuthTriggerNotification, object: nil)
- // set a timer to perform a mount every n seconds
+
+ // Set up periodic mount timer
mountTimer = Timer.scheduledTimer(withTimeInterval: Defaults.mountTriggerTimer, repeats: true, block: { _ in
Logger.app.info("Passed \(Defaults.mountTriggerTimer, privacy: .public) seconds, performing operartions:")
NotificationCenter.default.post(name: Defaults.nsmTimeTriggerNotification, object: nil)
})
- // set a timer to perform authentication every n seconds
+
+ // Set up periodic authentication timer
authTimer = Timer.scheduledTimer(withTimeInterval: Defaults.authTriggerTimer, repeats: true, block: { _ in
Logger.app.info("Passed \(Defaults.authTriggerTimer, privacy: .public) seconds, performing operartions:")
NotificationCenter.default.post(name: Defaults.nsmAuthTriggerNotification, object: nil)
})
- //
- // start monitoring network connectivity and perform mount/unmount on network changes
+ // Start network connectivity monitoring
monitor.startMonitoring { connection, reachable in
if reachable.rawValue == "yes" {
+ // Network is available - trigger connection and authentication
NotificationCenter.default.post(name: Defaults.nsmNetworkChangeTriggerNotification, object: nil)
NotificationCenter.default.post(name: Defaults.nsmAuthTriggerNotification, object: nil)
} else {
+ // Network is unavailable - unmount shares and reset status
Task {
NotificationCenter.default.post(name: Defaults.nsmAuthTriggerNotification, object: nil)
- // since the mount status after a network change is unknown it will be set
- // to unknown so it can be tested and maybe remounted if the network connects again
+ // Since the mount status after a network change is unknown it will be set
+ // to undefined so it can be tested and maybe remounted if the network connects again
Logger.app.debug("Got network monitoring callback, unmount shares.")
if let mounter = self.mounter {
await mounter.setAllMountStatus(to: MountStatus.undefined)
- // trying to unmount all shares
+ // Trying to unmount all shares
NotificationCenter.default.post(name: Defaults.nsmUnmountTriggerNotification, object: nil)
await mounter.unmountAllMountedShares()
} else {
@@ -184,24 +263,44 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
}
}
+
+ // Trigger initial mount operation
NotificationCenter.default.post(name: Defaults.nsmTimeTriggerNotification, object: nil)
}
}
+ /// Performs cleanup when the application is about to terminate.
+ ///
+ /// This method:
+ /// 1. Stops network monitoring
+ /// 2. Unmounts all shares if configured to do so in preferences
+ ///
+ /// - Parameter aNotification: The notification object sent when the app is terminating
func applicationWillTerminate(_ aNotification: Notification) {
- // end network monitoring
+ // End network monitoring
monitor.monitor.cancel()
- //
- // unmount all shares before leaving
+
+ // Unmount all shares before exiting if configured in preferences
if prefs.bool(for: .unmountOnExit) == true {
Logger.app.debug("Exiting app, unmounting shares...")
unmountShares(self)
- // OK, I know, this is ugly, but a little sleep on app exit does not harm ;-)
+ // Wait briefly to allow unmount operations to complete
+ // This ensures shares are properly unmounted before the app exits
sleep(3)
}
}
/// Handles various error notifications and updates the menu bar icon accordingly.
+ ///
+ /// This method processes notifications related to authentication and connectivity status,
+ /// updating the menu bar icon color to reflect the current state:
+ /// - Red: Kerberos authentication error
+ /// - Yellow: General authentication error
+ /// - Green: Successful Kerberos authentication
+ /// - Default: Normal operation or error cleared
+ ///
+ /// It also updates the menu structure based on the current error state.
+ ///
/// - Parameter notification: The notification containing error information.
@objc func handleErrorNotification(_ notification: NSNotification) {
// Handle Kerberos authentication error
@@ -209,12 +308,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
DispatchQueue.main.async {
if let button = self.statusItem.button, self.enableKerberos {
button.image = NSImage(named: NSImage.Name("networkShareMounterMenuRed"))
- if let mounter = self.mounter {
- Task { @MainActor in
- await self.constructMenu(withMounter: mounter, andStatus: .krbAuthenticationError)
- }
- } else {
- Logger.app.error("Could not initialize mounter class, this should never happen.")
+ Task { @MainActor in
+ await self.constructMenu(withMounter: self.mounter, andStatus: .krbAuthenticationError)
}
}
}
@@ -224,12 +319,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
DispatchQueue.main.async {
if let button = self.statusItem.button {
button.image = NSImage(named: NSImage.Name("networkShareMounterMenuYellow"))
- if let mounter = self.mounter {
- Task { @MainActor in
- await self.constructMenu(withMounter: mounter, andStatus: .authenticationError)
- }
- } else {
- Logger.app.error("Could not initialize mounter class, this should never happen.")
+ Task { @MainActor in
+ await self.constructMenu(withMounter: self.mounter, andStatus: .authenticationError)
}
}
}
@@ -237,15 +328,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
// Handle error clearance
else if notification.userInfo?["ClearError"] is Error {
DispatchQueue.main.async {
- // change the color of the menu symbol
+ // Change the color of the menu symbol to default
if let button = self.statusItem.button {
button.image = NSImage(named: NSImage.Name("networkShareMounter"))
- if let mounter = self.mounter {
- Task { @MainActor in
- await self.constructMenu(withMounter: mounter)
- }
- } else {
- Logger.app.error("Could not initialize mounter class, this should never happen.")
+ Task { @MainActor in
+ await self.constructMenu(withMounter: self.mounter)
}
}
}
@@ -269,7 +356,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
// Handle Kerberos off-domain status
else if notification.userInfo?["krbOffDomain"] is Error {
DispatchQueue.main.async {
- // change the color of the menu symbol
+ // Change the color of the menu symbol to default when off domain
if let button = self.statusItem.button, self.enableKerberos {
button.image = NSImage(named: NSImage.Name("networkShareMounter"))
}
@@ -278,6 +365,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
/// Indicates whether the application supports secure restorable state.
+ ///
+ /// This method always returns true, indicating that the application
+ /// supports secure state restoration in macOS.
+ ///
/// - Parameter app: The NSApplication instance.
/// - Returns: Always returns true for this application.
func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
@@ -285,13 +376,21 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
/// Displays information about the Network Share Mounter.
+ ///
+ /// Currently a placeholder that logs an informational message.
+ /// In the future, this could be implemented to show detailed information
+ /// about the application, such as version number, configuration, etc.
+ ///
/// - Parameter sender: The object that initiated this action.
- /// - Note: Currently a placeholder. Consider implementing actual info display in the future.
@objc func showInfo(_ sender: Any?) {
Logger.app.info("Some day maybe show some useful information about Network Share Mounter")
}
/// Opens the specified directory in Finder
+ ///
+ /// This method extracts a directory path from a menu item's `representedObject` property
+ /// and opens it in Finder. It's typically used to open mounted network shares.
+ ///
/// - Parameter sender: Menu item containing the directory path to open
///
/// The directory path is stored in the menu item's `representedObject` as a String.
@@ -315,7 +414,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
}
- /// Manually mounts all shares when triggered by the user
+ /// Manually triggers the mounting of all configured shares.
+ ///
+ /// This method is typically called when the user selects "Mount shares" from the menu.
+ /// It posts notifications to:
+ /// 1. Trigger authentication if needed
+ /// 2. Start the mounting process for all configured shares
+ ///
/// - Parameter sender: The object that triggered the action
@objc func mountManually(_ sender: Any?) {
Logger.app.debug("User triggered mount all shares")
@@ -323,7 +428,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
NotificationCenter.default.post(name: Defaults.nsmMountManuallyTriggerNotification, object: nil)
}
- /// Unmounts all currently mounted shares
+ /// Unmounts all currently mounted network shares.
+ ///
+ /// This method is typically called when the user selects "Unmount shares" from the menu.
+ /// It instructs the mounter to safely disconnect all mounted shares.
+ ///
/// - Parameter sender: The object that triggered the action
@objc func unmountShares(_ sender: Any?) {
Logger.app.debug("User triggered unmount all shares")
@@ -337,8 +446,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
}
- /// Unmounts all currently mounted shares
- /// - Parameter sender: The object that triggered the action
+ /// Mounts a specific network share when selected from the menu.
+ ///
+ /// This method is called when the user selects a specific unmounted share from the menu.
+ /// It attempts to mount only that share and then refreshes Finder to show the new mount.
+ ///
+ /// - Parameter sender: Menu item containing the share ID to mount
@objc func mountSpecificShare(_ sender: NSMenuItem) {
if let shareID = sender.representedObject as? String {
Logger.app.debug("User triggered to mount share with id \(shareID)")
@@ -354,7 +467,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
}
- /// Opens the help URL in the default web browser
+ /// Opens the help URL in the default web browser.
+ ///
+ /// This method opens the help URL configured in preferences in the system's default browser.
+ /// The URL is retrieved from preferences using the `.helpURL` key.
+ ///
/// - Parameter sender: The object that triggered the action
@objc func openHelpURL(_ sender: Any?) {
guard let url = prefs.string(for: .helpURL), let openURL = URL(string: url) else {
@@ -365,6 +482,14 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
/// Shows the preferences window.
+ ///
+ /// This method:
+ /// 1. Configures the window properties (title, style)
+ /// 2. Centers the window on screen
+ /// 3. Activates the app and brings the window to front
+ /// 4. Makes the window the key window to receive keyboard input
+ ///
+ /// - Parameter sender: The object that triggered the action
@objc func showWindow(_ sender: Any?) {
// Configure window appearance and behavior
window.title = NSLocalizedString("Preferences", comment: "Preferences")
@@ -389,6 +514,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
/// Sets up signal handlers for mounting and unmounting shares.
+ ///
+ /// This method configures the application to respond to UNIX signals:
+ /// - SIGUSR1: Unmount all shares
+ /// - SIGUSR2: Mount all configured shares
+ ///
+ /// These signals allow external processes to trigger mount/unmount operations.
func setupSignalHandlers() {
// Define custom signals for unmounting and mounting
let unmountSignal = SIGUSR1
@@ -423,33 +554,49 @@ class AppDelegate: NSObject, NSApplicationDelegate {
mountSignalSource?.resume()
}
- /// Constructs the app's menu based on configured profiles and current status
+ /// Constructs the app's menu based on configured profiles and current status.
+ ///
+ /// This method builds the context menu that appears when the user clicks
+ /// the app's menu bar icon. The menu adapts based on:
+ /// - The current error state (if any)
+ /// - Available network shares
+ /// - User preferences
+ /// - Auto-updater availability
+ ///
+ /// The menu is built dynamically each time it's shown, reflecting the
+ /// current state of network shares and app configuration.
+ ///
/// - Parameters:
/// - mounter: The Mounter object responsible for mounting/unmounting shares
/// - andStatus: Optional MounterError indicating any current error state
- @MainActor func constructMenu(withMounter mounter: Mounter, andStatus: MounterError? = nil) async {
+ @MainActor func constructMenu(withMounter mounter: Mounter?, andStatus: MounterError? = nil) async {
let menu = NSMenu()
menu.autoenablesItems = false
// Handle different error states and construct appropriate menu items
- switch andStatus {
- case .krbAuthenticationError:
- Logger.app.debug("🏗️ Constructing Kerberos authentication problem menu.")
- mounter.errorStatus = .authenticationError
- menu.addItem(NSMenuItem(title: NSLocalizedString("⚠️ Kerberos SSO Authentication problem...", comment: "Kerberos Authentication problem"),
- action: #selector(AppDelegate.showWindow(_:)), keyEquivalent: ""))
- menu.addItem(NSMenuItem.separator())
- case .authenticationError:
- Logger.app.debug("🏗️ Constructing authentication problem menu.")
- mounter.errorStatus = .authenticationError
- menu.addItem(NSMenuItem(title: NSLocalizedString("⚠️ Authentication problem...", comment: "Authentication problem"),
- action: #selector(AppDelegate.showWindow(_:)), keyEquivalent: ""))
- menu.addItem(NSMenuItem.separator())
-
- default:
- mounter.errorStatus = .noError
- Logger.app.debug("🏗️ Constructing default menu.")
+ if let mounter = mounter {
+ switch andStatus {
+ case .krbAuthenticationError:
+ Logger.app.debug("🏗️ Constructing Kerberos authentication problem menu.")
+ mounter.errorStatus = .authenticationError
+ menu.addItem(NSMenuItem(title: NSLocalizedString("⚠️ Kerberos SSO Authentication problem...", comment: "Kerberos Authentication problem"),
+ action: #selector(AppDelegate.showWindow(_:)), keyEquivalent: ""))
+ menu.addItem(NSMenuItem.separator())
+ case .authenticationError:
+ Logger.app.debug("🏗️ Constructing authentication problem menu.")
+ mounter.errorStatus = .authenticationError
+ menu.addItem(NSMenuItem(title: NSLocalizedString("⚠️ Authentication problem...", comment: "Authentication problem"),
+ action: #selector(AppDelegate.showWindow(_:)), keyEquivalent: ""))
+ menu.addItem(NSMenuItem.separator())
+
+ default:
+ mounter.errorStatus = .noError
+ Logger.app.debug("🏗️ Constructing default menu.")
+ }
+ } else {
+ Logger.app.debug("🏗️ Constructing basic menu without mounter.")
}
+
// Add "About" menu item if help URL is valid
if prefs.string(for: .helpURL)!.description.isValidURL {
if let newMenuItem = createMenuItem(title: "About Network Share Mounter",
@@ -462,35 +609,36 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
}
- // Add core functionality menu items:
-
- // Add "mount shares" menu item
- if let newMenuItem = createMenuItem(title: "Mount shares",
- comment: "Mount share",
- action: #selector(AppDelegate.mountManually(_:)),
- keyEquivalent: "m",
- preferenceKey: .menuConnectShares,
- prefs: prefs) {
- menu.addItem(newMenuItem)
- }
- // Add "unmount shares" menu item
- if let newMenuItem = createMenuItem(title: "Unmount shares",
- comment: "Unmount shares",
- action: #selector(AppDelegate.unmountShares(_:)),
- keyEquivalent: "u",
- preferenceKey: .menuDisconnectShares,
- prefs: prefs) {
- menu.addItem(newMenuItem)
- }
- // Add "Show mounted shares" menu item
- if let newMenuItem = createMenuItem(title: "Show mounted shares",
- comment: "Show mounted shares",
- action: #selector(AppDelegate.openDirectory(_:)),
- keyEquivalent: "f",
- preferenceKey: .menuShowSharesMountDir,
- prefs: prefs) {
- newMenuItem.representedObject = mounter.defaultMountPath
- menu.addItem(newMenuItem)
+ // Add core functionality menu items only if mounter is available
+ if mounter != nil {
+ // Add "mount shares" menu item
+ if let newMenuItem = createMenuItem(title: "Mount shares",
+ comment: "Mount share",
+ action: #selector(AppDelegate.mountManually(_:)),
+ keyEquivalent: "m",
+ preferenceKey: .menuConnectShares,
+ prefs: prefs) {
+ menu.addItem(newMenuItem)
+ }
+ // Add "unmount shares" menu item
+ if let newMenuItem = createMenuItem(title: "Unmount shares",
+ comment: "Unmount shares",
+ action: #selector(AppDelegate.unmountShares(_:)),
+ keyEquivalent: "u",
+ preferenceKey: .menuDisconnectShares,
+ prefs: prefs) {
+ menu.addItem(newMenuItem)
+ }
+ // Add "Show mounted shares" menu item
+ if let newMenuItem = createMenuItem(title: "Show mounted shares",
+ comment: "Show mounted shares",
+ action: #selector(AppDelegate.openDirectory(_:)),
+ keyEquivalent: "f",
+ preferenceKey: .menuShowSharesMountDir,
+ prefs: prefs) {
+ newMenuItem.representedObject = mounter?.defaultMountPath
+ menu.addItem(newMenuItem)
+ }
}
// Add "Check for Updates" menu item if auto-updater is enabled
@@ -507,49 +655,53 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
}
- let menuShowSharesValue = prefs.string(for: .menuShowShares) ?? ""
- if await !mounter.shareManager.getAllShares().isEmpty {
- menu.addItem(NSMenuItem.separator())
- for share in await mounter.shareManager.allShares {
- var menuItem: NSMenuItem
-
- // Wenn das Share gemountet ist, verwende das Mountpoint-Icon
- if let mountpoint = share.actualMountPoint {
- let mountDir = (mountpoint as NSString).lastPathComponent
- Logger.app.debug(" 🍰 Adding mountpoint \(mountDir) for \(share.networkShare) to menu.")
+ // Add share-specific menu items only if mounter is available and shares exist
+ if let mounter = mounter {
+ let menuShowSharesValue = prefs.string(for: .menuShowShares) ?? ""
+ // Only add separator and share entries if shares exist
+ if await !mounter.shareManager.getAllShares().isEmpty {
+ menu.addItem(NSMenuItem.separator())
+ for share in await mounter.shareManager.allShares {
+ var menuItem: NSMenuItem
- let menuIcon = createMenuIcon(withIcon: "externaldrive.connected.to.line.below.fill", backgroundColor: .systemBlue, symbolColor: .white)
- menuItem = NSMenuItem(title: NSLocalizedString(mountDir, comment: ""),
- action: #selector(AppDelegate.openDirectory(_:)),
- keyEquivalent: "")
- menuItem.representedObject = mountpoint
- menuItem.image = menuIcon
- } else {
- // Wenn das Share nicht gemountet ist, verwende das Standard-Icon
- Logger.app.debug(" 🍰 Adding remote share \(share.networkShare).")
- let menuIcon = createMenuIcon(withIcon: "externaldrive.connected.to.line.below", backgroundColor: .systemGray, symbolColor: .white)
- menuItem = NSMenuItem(title: NSLocalizedString(share.networkShare, comment: ""),
- action: #selector(AppDelegate.mountSpecificShare(_:)),
- keyEquivalent: "")
- menuItem.representedObject = share.id
- menuItem.image = menuIcon
- }
-
- // Konfiguriere den Menüeintrag basierend auf dem Präferenzwert
- switch menuShowSharesValue {
- case "hidden":
- // Menüeintrag wird nicht hinzugefügt
- continue
- case "disabled":
- // Menüeintrag wird hinzugefügt, aber deaktiviert
- menuItem.isEnabled = false
- default:
- // Menüeintrag wird normal hinzugefügt und ist aktiviert
- menuItem.isEnabled = true
+ // If share is mounted, use the mountpoint icon
+ if let mountpoint = share.actualMountPoint {
+ let mountDir = (mountpoint as NSString).lastPathComponent
+ Logger.app.debug(" 🍰 Adding mountpoint \(mountDir) for \(share.networkShare) to menu.")
+
+ let menuIcon = createMenuIcon(withIcon: "externaldrive.connected.to.line.below.fill", backgroundColor: .systemBlue, symbolColor: .white)
+ menuItem = NSMenuItem(title: NSLocalizedString(mountDir, comment: ""),
+ action: #selector(AppDelegate.openDirectory(_:)),
+ keyEquivalent: "")
+ menuItem.representedObject = mountpoint
+ menuItem.image = menuIcon
+ } else {
+ // If share is not mounted, use the standard icon
+ Logger.app.debug(" 🍰 Adding remote share \(share.networkShare).")
+ let menuIcon = createMenuIcon(withIcon: "externaldrive.connected.to.line.below", backgroundColor: .systemGray, symbolColor: .white)
+ menuItem = NSMenuItem(title: NSLocalizedString(share.networkShare, comment: ""),
+ action: #selector(AppDelegate.mountSpecificShare(_:)),
+ keyEquivalent: "")
+ menuItem.representedObject = share.id
+ menuItem.image = menuIcon
+ }
+
+ // Configure menu item based on preference value
+ switch menuShowSharesValue {
+ case "hidden":
+ // Skip adding this menu item
+ continue
+ case "disabled":
+ // Add menu item but disable it
+ menuItem.isEnabled = false
+ default:
+ // Add menu item normally and enable it
+ menuItem.isEnabled = true
+ }
+
+ // Add the configured menu item
+ menu.addItem(menuItem)
}
-
- // Füge den konfigurierten Menüeintrag hinzu
- menu.addItem(menuItem)
}
}
@@ -581,21 +733,23 @@ class AppDelegate: NSObject, NSApplicationDelegate {
statusItem.menu = menu
}
- /// Creates and configures a menu item based on user preferences
+ /// Creates and configures a menu item based on user preferences.
+ ///
+ /// This factory method creates menu items that respect user preferences for
+ /// visibility and enabled/disabled state. Menu items can be:
+ /// - Hidden (not added to menu)
+ /// - Disabled (shown but not clickable)
+ /// - Enabled (normal operation)
///
/// - Parameters:
/// - title: The localized title text for the menu item
+ /// - comment: A comment for localization context
/// - action: The selector to be called when menu item is clicked
/// - keyEquivalent: The keyboard shortcut for the menu item
/// - preferenceKey: The preference key to check the menu item's state
/// - prefs: The preference manager instance to retrieve settings
///
/// - Returns: A configured NSMenuItem instance, or nil if the menu item should be hidden
- ///
- /// The menu item's state is determined by the preference value:
- /// - "hidden": Returns nil, menu item won't be shown
- /// - "disabled": Menu item is shown but disabled
- /// - Any other value: Menu item is shown and enabled
func createMenuItem(title: String, comment: String, action: Selector, keyEquivalent: String, preferenceKey: PreferenceKeys, prefs: PreferenceManager) -> NSMenuItem? {
// Get preference value for the specified key
let preferenceValue = prefs.string(for: preferenceKey) ?? ""
@@ -621,13 +775,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
return menuItem
}
- /// Creates a custom menu bar icon with a colored background circle and SF Symbol
+ /// Creates a custom menu bar icon with a colored background circle and SF Symbol.
+ ///
+ /// This method generates custom icons for the menu, particularly for network shares
+ /// with different statuses (mounted/unmounted).
+ ///
/// - Parameters:
- /// - withIcon: The name of the SF Symbol to use (currently not used in implementation)
+ /// - withIcon: The name of the SF Symbol to use
/// - backgroundColor: The background color of the circular icon
/// - symbolColor: The color of the SF Symbol
+ ///
/// - Returns: An NSImage containing the composed icon
- /// - Note: The icon parameter is currently hardcoded to "externaldrive.connected.to.line.below.fill"
func createMenuIcon(withIcon: String, backgroundColor: NSColor, symbolColor: NSColor) -> NSImage {
// Create NSImage from SF Symbol
diff --git a/networkShareMounter.xcodeproj/project.pbxproj b/networkShareMounter.xcodeproj/project.pbxproj
index a71fd915913c361d5f4c430339823a9fcaf881e4..e9196b7cc0d7045b10f44830113cf3a748e749fc 100644
--- a/networkShareMounter.xcodeproj/project.pbxproj
+++ b/networkShareMounter.xcodeproj/project.pbxproj
@@ -647,7 +647,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 212;
+ CURRENT_PROJECT_VERSION = 213;
DEVELOPMENT_TEAM = C8F68RFW4L;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -677,7 +677,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 212;
+ CURRENT_PROJECT_VERSION = 213;
DEVELOPMENT_TEAM = C8F68RFW4L;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;