Select project from previous session when launching Hearth

Fixes #94
EmberTown · May 31, 2015 · b470eef · b470eef
1 parent e1f7f6d
commit b470eef
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/Ember Hearth/AppDelegate.swift b/Ember Hearth/AppDelegate.swift
@@ -13,12 +13,15 @@ import Sparkle
 import MASPreferences
 import MASShortcut
 
+let currentProjectPathKey = "currentProjectPathKey"
+
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDelegate {
     var projects: [Project]?
     var activeProject: Project? {
         didSet {
             if activeProject != nil {
+                NSUserDefaults.standardUserDefaults().setObject(activeProject!.path, forKey: currentProjectPathKey)
                 NSNotificationCenter.defaultCenter().postNotificationName("activeProjectSet", object: activeProject)
             } else {
                 NSNotificationCenter.defaultCenter().postNotificationName("noActiveProject", object: activeProject)

diff --git a/Ember Hearth/ProjectListController.swift b/Ember Hearth/ProjectListController.swift
@@ -55,6 +55,15 @@ class ProjectListController: NSViewController, NSTableViewDataSource, NSTableVie
         refreshList(nil)
     }
 
+    override func viewDidAppear() {
+        let delegate = NSApplication.sharedApplication().delegate! as! AppDelegate
+        if (self.tableView.selectedRow < 0 && delegate.activeProject != nil && self.projects != nil) {
+            if let index = find(self.projects!, delegate.activeProject!) {
+                self.tableView.selectRowIndexes(NSIndexSet(index: index), byExtendingSelection: false)
+            }
+        }
+    }
+
     // MARK: Drag-and-drop
     func dragEntered(notification: NSNotification?) {
         selectedRow = self.tableView.selectedRow
@@ -212,7 +221,17 @@ class ProjectListController: NSViewController, NSTableViewDataSource, NSTableVie
             if indexOfActiveProject != nil {
                 self.tableView.selectRowIndexes(NSIndexSet(index: indexOfActiveProject!), byExtendingSelection: false)
             }
-        } else {
+        } else if let currentProjectPath = NSUserDefaults.standardUserDefaults().stringForKey(currentProjectPathKey) {
+            if let projects = self.projects {
+                for project in projects {
+                    if project.path == currentProjectPath {
+                        appDelegate.activeProject = project
+                    }
+                }
+            }
+        }
+
+        if appDelegate.activeProject == nil {
             appDelegate.activeProject = projects?.first
         }
     }