Add basic export and import commands #75
Conversation
In preparation for implementing export/ import commands. Create StorageStub in CommandUtil to maintain existing JUnit tests.
Export all of Mark's data into a given file in /data/bookmarks/. First increment of the export command.
Replace all of Mark's bookmarks with bookmarks from a given file.
Allow a Storage to be specified when asserting command success or command failure using the CommandTestUtil methods.
Avoid throwing raw exception type, and use requireAllNonNull to reduce number of statements.
Modify import functionality: add imported bookmarks to Mark instead of replacing existing bookmarks. Duplicate bookmarks are skipped and shown in the command result.
Add logging for ExportCommand and improve ImportCommand log messages. Append the file extension (.json) to the given filename when parsing export and import commands. Replace usage of Paths#get(...) with Path#of(...).
Remove unused import statements and update parser tests to include file extension. To Do: Abstract the conversion of a filename to a Path into a separate method.
dorcastan
changed the title
There was a problem hiding this comment.
wow your javadocs are legit
ok ya it's quite strange to see so much logic going on in the commands, but then it doesn't make sense to do it in the Model as well, since that's more for updating stuff related to Mark.
Maybe you can put importMarkFrom and exportMarkTo in the Storage interface, and then call methods from there instead?
So Model handles all the mark related stuff, and Storage handles all the file io stuff
| * Adds bookmarks from the given list of bookmarks to the model and adds | ||
| * duplicate bookmarks to the list of skipped bookmarks. | ||
| */ | ||
| private void addBookmarksToModel(Model model, ObservableList<Bookmark> bookmarksToAdd, |
There was a problem hiding this comment.
I'm starting to have a feeling all these methods should be somewhere in the model, doesn't feel right to have so much logic going on here.
There was a problem hiding this comment.
Right... I'll go figure out where to put it. And likewise for readMarkFromStorageFile (moving to Storage).
Modify ImportCommandTest to account for folder structure not being imported yet. Modify AddFolderCommandTest to account for additional storage parameter in Command#execute(). Bug to fix: Folder structure is ignored during import
Resolve conflicts between Redo/Undo and Import/Export.
Move StorageStub from CommandTestUtil to seedu.mark.storage in test module, to match ModelStub.
Move the "add bookmarks/folders to the model" logic into a separate class for better OOP. Modify Model to handle the addition of multiple bookmarks or folders. To-Do: implement folder addition.
Fix equals() method and add a JUnit test for it.
| MarkImporter(Model model, ReadOnlyMark markToImport) { | ||
| this.model = model; | ||
| this.foldersToImport = markToImport.getFolderStructure(); | ||
| for (Bookmark bookmark : markToImport.getBookmarkList()) { |
There was a problem hiding this comment.
Executing logic in the constructor seems a bit weird, but I'm not sure how to fix it without making ImportCommand call another MarkImporter method after instantiating it.
Update signature of GotoCommand and TabCommand.
And update variable name in ImportCommand#equals()
dorcastan
changed the title
|
@openorclose I ended up moving most of the logic into an inner class However, for importing Mark from In any case, is this implementation okay for the current PR? |
|
@Na-Nazhou okay to merge? |
Resolves #33 and resolves #36.
data/bookmarks.exportapplies to all of Mark's data, whileimportonly imports bookmarks.importis an undoable command (Mark's state is saved).