#79

glushchenko · Jan 11, 2018 · afe9f63 · afe9f63
1 parent a0d0a87
commit afe9f63
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/FSNotes/EditTextView.swift b/FSNotes/EditTextView.swift
@@ -103,6 +103,7 @@ class EditTextView: NSTextView {
         viewController.emptyEditAreaImage.isHidden = true
 
         EditTextView.note = note
+        UserDefaultsManagement.lastSelectedURL = note.url
 
         subviews.removeAll()
         undoManager?.removeAllActions()

diff --git a/FSNotes/Model/UserDefaultsManagement.swift b/FSNotes/Model/UserDefaultsManagement.swift
@@ -38,6 +38,7 @@ public class UserDefaultsManagement {
         static let SortBy = "sortBy"
         static let codeBlockHighlight = "codeBlockHighlight"
         static let codeTheme = "codeTheme"
+        static let LastSelectedPath = "lastSelectedPath"
     }
 
     static var fontName: String {
@@ -405,4 +406,18 @@ public class UserDefaultsManagement {
         }
     }
 
+    static var lastSelectedURL: URL? {
+        get {
+            if let path = UserDefaults.standard.object(forKey: Constants.LastSelectedPath) as? String, let encodedPath = path.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) {
+                return URL(string: "file://" + encodedPath)
+            }
+            return nil
+        }
+        set {
+            if let url = newValue {
+                UserDefaults.standard.set(url.path, forKey: Constants.LastSelectedPath)
+            }
+        }
+    }
+
 }
diff --git a/FSNotes/ViewController.swift b/FSNotes/ViewController.swift
@@ -79,7 +79,11 @@ class ViewController: NSViewController,
 
         if storage.noteList.count == 0 {
             storage.loadDocuments()
-            updateTable(filter: "") {}
+            updateTable(filter: "") {
+                if let url = UserDefaultsManagement.lastSelectedURL, let lastNote = self.storage.getBy(url: url), let i = self.notesTableView.getIndex(lastNote) {
+                    self.notesTableView.selectRowIndexes([i], byExtendingSelection: false)
+                }
+            }
         }
 
         let font = UserDefaultsManagement.noteFont
@@ -759,11 +763,6 @@ class ViewController: NSViewController,
         }
     }
 
-    func reloadStorage() {
-        storage.loadDocuments()
-        updateTable(filter: "") {}
-    }
-
     func loadMoveMenu() {
         let storageItemList = CoreDataManager.instance.fetchStorageList()