Added sorting drives by case insensitive alphabetical order

Signed-off-by: Austin Kootz <[email protected]>
pilotchute · Apr 18, 2018 · fa06244 · fa06244
1 parent 7a9db51
commit fa06244
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/...roj/project.xcworkspace/xcuserdata/austinkootz.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/austinkootz.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/EjectionSeat/AppDelegate.swift b/EjectionSeat/AppDelegate.swift
@@ -12,7 +12,7 @@ import Cocoa
 class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
 
     let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
-    var menu: NSMenu = NSMenu()
+    let menu: NSMenu = NSMenu()
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         //statusItem.title = "EjectionSeat"
@@ -31,7 +31,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         menu.setSubmenu(makeSubMenu(), for: (menu.item(withTitle: "Eject"))!)
         menu.addItem(NSMenuItem.separator())
         menu.addItem(NSMenuItem(title: "Quit", action: #selector(AppDelegate.quit(_:)), keyEquivalent: "q"))
-
     }
 
     func menuNeedsUpdate(_ menu: NSMenu) {
@@ -43,10 +42,15 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
             return nil
         }
         let subMenu = NSMenu()
-        var numKey = 0
+        var titles: [String] = []
         for url in urls {
+            titles.append(url.pathComponents[url.pathComponents.endIndex-1])
+        }
+        titles = titles.sorted{$0.caseInsensitiveCompare($1) == .orderedAscending}
+        var numKey = 0
+        for title in titles {
         numKey += 1
-            subMenu.addItem(NSMenuItem(title: url.pathComponents[url.pathComponents.endIndex-1], action: #selector(AppDelegate.eject(_:)), keyEquivalent: "\(numKey)"))
+            subMenu.addItem(NSMenuItem(title: title, action: #selector(AppDelegate.eject(_:)), keyEquivalent: "\(numKey)"))
         }
         return subMenu
     }
@@ -97,11 +101,5 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         }
         return urls;
     }
-
-
-    func applicationWillTerminate(_ aNotification: Notification) {
-    }
-
-
 }