flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-06-27 17:29:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

NotesFolder: Implement more fine grained notifications

Browse Source
This commit is contained in:
Vishesh Handa
2020-02-06 01:28:50 +01:00
parent 55b05926c1
commit 9d29710d59
1 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/core/notes_folder.dart
View File

@ -116,9 +116,6 @@ class NotesFolder with NotesFolderNotifier implements Comparable<NotesFolder> {
Future<void> load() async { Future<void> load() async {
Set<String> pathsFound = {}; Set<String> pathsFound = {};
var entitiesAdded = false;
var entitiesRemoved = false;
final dir = Directory(folderPath); final dir = Directory(folderPath);
var lister = dir.list(recursive: false, followLinks: false); var lister = dir.list(recursive: false, followLinks: false);
await for (var fsEntity in lister) { await for (var fsEntity in lister) {
@ -144,7 +141,7 @@ class NotesFolder with NotesFolderNotifier implements Comparable<NotesFolder> {
_entityMap[fsEntity.path] = subFolder; _entityMap[fsEntity.path] = subFolder;
pathsFound.add(fsEntity.path); pathsFound.add(fsEntity.path);
entitiesAdded = true; notifyFolderAdded(_folders.length - 1, subFolder);
continue; continue;
} }
@ -158,7 +155,7 @@ class NotesFolder with NotesFolderNotifier implements Comparable<NotesFolder> {
_entityMap[fsEntity.path] = note; _entityMap[fsEntity.path] = note;
pathsFound.add(fsEntity.path); pathsFound.add(fsEntity.path);
entitiesAdded = true; notifyNoteAdded(_notes.length - 1, note);
} }
Set<String> pathsRemoved = _entityMap.keys.toSet().difference(pathsFound); Set<String> pathsRemoved = _entityMap.keys.toSet().difference(pathsFound);
@ -169,15 +166,21 @@ class NotesFolder with NotesFolderNotifier implements Comparable<NotesFolder> {
assert(e is NotesFolder || e is Note); assert(e is NotesFolder || e is Note);
e.removeListener(_entityChanged); e.removeListener(_entityChanged);
_entityMap.remove(path); _entityMap.remove(path);
});
_folders.removeWhere((f) => pathsRemoved.contains(f.folderPath)); if (e is Note) {
_notes.removeWhere((n) => pathsRemoved.contains(n.filePath)); var i = _notes.indexWhere((n) => n.filePath == path);
assert(i != -1);
entitiesRemoved = pathsRemoved.isNotEmpty; var note = _notes[i];
if (entitiesAdded || entitiesRemoved) { _notes.removeAt(i);
notifyListeners(); notifyNoteRemoved(i, note);
} else {
var i = _folders.indexWhere((f) => f.folderPath == path);
assert(i != -1);
var folder = _folders[i];
_folders.removeAt(i);
notifyFolderRemoved(i, folder);
} }
});
} }
void add(Note note) { void add(Note note) {
@ -187,7 +190,7 @@ class NotesFolder with NotesFolderNotifier implements Comparable<NotesFolder> {
_notes.add(note); _notes.add(note);
_entityMap[note.filePath] = note; _entityMap[note.filePath] = note;
notifyListeners(); notifyNoteAdded(_notes.length - 1, note);
} }
void insert(int index, Note note) { void insert(int index, Note note) {
@ -197,7 +200,8 @@ class NotesFolder with NotesFolderNotifier implements Comparable<NotesFolder> {
_notes.insert(index, note); _notes.insert(index, note);
_entityMap[note.filePath] = note; _entityMap[note.filePath] = note;
notifyListeners();
notifyNoteAdded(index, note);
} }
void remove(Note note) { void remove(Note note) {
@ -207,10 +211,12 @@ class NotesFolder with NotesFolderNotifier implements Comparable<NotesFolder> {
assert(_notes.indexWhere((n) => n.filePath == note.filePath) != -1); assert(_notes.indexWhere((n) => n.filePath == note.filePath) != -1);
assert(_entityMap.containsKey(note.filePath)); assert(_entityMap.containsKey(note.filePath));
_notes.removeWhere((n) => n.filePath == note.filePath); var index = _notes.indexWhere((n) => n.filePath == note.filePath);
assert(index != -1);
_notes.removeAt(index);
_entityMap.remove(note.filePath); _entityMap.remove(note.filePath);
notifyListeners(); notifyNoteRemoved(index, note);
} }
void create() { void create() {
@ -231,7 +237,7 @@ class NotesFolder with NotesFolderNotifier implements Comparable<NotesFolder> {
_folders.add(folder); _folders.add(folder);
_entityMap[folder.folderPath] = folder; _entityMap[folder.folderPath] = folder;
notifyListeners(); notifyFolderAdded(_folders.length - 1, folder);
} }
void removeFolder(NotesFolder folder) { void removeFolder(NotesFolder folder) {
@ -240,10 +246,12 @@ class NotesFolder with NotesFolderNotifier implements Comparable<NotesFolder> {
assert(_folders.indexWhere((f) => f.folderPath == folder.folderPath) != -1); assert(_folders.indexWhere((f) => f.folderPath == folder.folderPath) != -1);
assert(_entityMap.containsKey(folder.folderPath)); assert(_entityMap.containsKey(folder.folderPath));
_folders.removeWhere((f) => f.folderPath == folder.folderPath); var index = _folders.indexWhere((f) => f.folderPath == folder.folderPath);
assert(index != -1);
_folders.removeAt(index);
_entityMap.remove(folder.folderPath); _entityMap.remove(folder.folderPath);
notifyListeners(); notifyFolderRemoved(index, folder);
} }
void rename(String newName) { void rename(String newName) {