-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Adds a dynamic group mirroring the file system (#10930) #14252
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
…sting group sibling (JabRef#10930)
…group or edit its type (JabRef#10930)
…irectory was suppressed (JabRef#10930)
…x-issue-10930 # Conflicts: # jabgui/src/main/java/org/jabref/gui/groups/GroupDialogView.java # jabgui/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java # jabgui/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java # jabgui/src/main/resources/org/jabref/gui/groups/GroupDialog.fxml
Hey @ErwanGou!Thank you for contributing to JabRef! Your help is truly appreciated ❤️. We have automatic checks in place, based on which you will soon get automated feedback if any of them are failing. We also use TragBot with custom rules that scans your changes and provides some preliminary comments, before a maintainer takes a look. TragBot is still learning, and may not always be accurate. In the "Files changed" tab, you can go through its comments and just click on "Resolve conversation" if you are sure that it is incorrect, or comment on the conversation if you are doubtful. Please re-check our contribution guide in case of any other doubts related to our contribution workflow. |
CHANGELOG.md
Outdated
| - We added "IEEE" as another option for parsing plain text citations. [#14233](github.com/JabRef/jabref/pull/14233) | ||
| - We added automatic date-based groups that create year/month/day subgroups from an entry’s date fields. [#10822](https://github.com/JabRef/jabref/issues/10822) | ||
| - We added `doi-to-bibtex` to `JabKit`. [#14244](https://github.com/JabRef/jabref/pull/14244) | ||
| - We added groups that mirror the local structure. [#10930](https://github.com/JabRef/jabref/issues/10930) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Proposal to refinement, because "structure" alone is a very vague term.
| - We added groups that mirror the local structure. [#10930](https://github.com/JabRef/jabref/issues/10930) | |
| - We added groups that mirror the local file directory structure. [#10930](https://github.com/JabRef/jabref/issues/10930) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for your review, I applied the change.
|
I recently added the last features and modified the PR message. Apart from what I explained in the Next steps section --which can't be fixed-- it should work properly. I won't commit new code anymore to this branch, you can review it freely now. |
|
@ErwanGou can you fix merge conflicts in |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CachyOS (Arch Linux) x86_64.
I can't add a PDF to an empty DirectoryGroup.
Unfortunately, getting error:
java.lang.UnsupportedOperationException: Don't know how to serialize grouporg.jabref.model.groups.DirectoryGroup
at org.jabref.jablib/org.jabref.logic.exporter.GroupSerializer.serializeGroup(GroupSerializer.java:152)
at org.jabref.jablib/org.jabref.logic.exporter.GroupSerializer.serializeTree(GroupSerializer.java:119)
at org.jabref.jablib/org.jabref.logic.exporter.GroupSerializer.serializeTree(GroupSerializer.java:123)
at org.jabref.jablib/org.jabref.logic.exporter.MetaDataSerializer.serializeGroups(MetaDataSerializer.java:152)
at org.jabref.jablib/org.jabref.logic.exporter.MetaDataSerializer.lambda$getSerializedStringMap$9(MetaDataSerializer.java:74)
at java.base/java.util.Optional.ifPresent(Optional.java:178)
at org.jabref.jablib/org.jabref.logic.exporter.MetaDataSerializer.getSerializedStringMap(MetaDataSerializer.java:73)
at org.jabref.jablib/org.jabref.logic.exporter.BibDatabaseWriter.writeMetaData(BibDatabaseWriter.java:281)
at org.jabref.jablib/org.jabref.logic.exporter.BibDatabaseWriter.writePartOfDatabase(BibDatabaseWriter.java:240)
at org.jabref.jablib/org.jabref.logic.exporter.BibDatabaseWriter.writeDatabase(BibDatabaseWriter.java:184)
at org.jabref/org.jabref.gui.exporter.SaveDatabaseAction.saveDatabase(SaveDatabaseAction.java:276)
at org.jabref/org.jabref.gui.exporter.SaveDatabaseAction.save(SaveDatabaseAction.java:240)
at org.jabref/org.jabref.gui.exporter.SaveDatabaseAction.save(SaveDatabaseAction.java:215)
at org.jabref/org.jabref.gui.exporter.SaveDatabaseAction.save(SaveDatabaseAction.java:83)
at org.jabref/org.jabref.gui.exporter.SaveAction.execute(SaveAction.java:58)
at org.jabref/org.jabref.gui.actions.JabRefAction.lambda$new$1(JabRefAction.java:25)
at [email protected]/org.controlsfx.control.action.Action.handle(Action.java:423)
at [email protected]/org.controlsfx.control.action.Action.handle(Action.java:64)
at [email protected]/com.sun.javafx.event.CompositeEventHandler.dispatchBubblingEvent(CompositeEventHandler.java:86)
at [email protected]/com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(EventHandlerManager.java:232)
at [email protected]/com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(EventHandlerManager.java:189)
at [email protected]/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:58)
at [email protected]/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114)
at [email protected]/com.sun.javafx.event.EventUtil.fireEventImpl(EventUtil.java:74)
at [email protected]/com.sun.javafx.event.EventUtil.fireEvent(EventUtil.java:49)
at [email protected]/javafx.event.Event.fireEvent(Event.java:199)
at [email protected]/javafx.scene.control.MenuItem.fire(MenuItem.java:459)
at [email protected]/com.sun.javafx.scene.control.ControlAcceleratorSupport.lambda$doAcceleratorInstall$0(ControlAcceleratorSupport.java:215)
at [email protected]/com.sun.javafx.scene.KeyboardShortcutsHandler.processAccelerators(KeyboardShortcutsHandler.java:383)
at [email protected]/com.sun.javafx.scene.KeyboardShortcutsHandler.dispatchBubblingEvent(KeyboardShortcutsHandler.java:163)
at [email protected]/com.sun.javafx.event.CompositeEventDispatcher.dispatchBubblingEvent(CompositeEventDispatcher.java:59)
at [email protected]/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:58)
at [email protected]/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114)
at [email protected]/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:56)
at [email protected]/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114)
at [email protected]/com.sun.javafx.event.EventUtil.fireEventImpl(EventUtil.java:74)
at [email protected]/com.sun.javafx.event.EventUtil.fireEvent(EventUtil.java:54)
at [email protected]/javafx.scene.Scene.processKeyEvent(Scene.java:2257)
at [email protected]/javafx.scene.Scene$ScenePeerListener.keyEvent(Scene.java:2791)
at [email protected]/com.sun.javafx.tk.quantum.GlassViewEventHandler$KeyEventNotification.get(GlassViewEventHandler.java:176)
at [email protected]/com.sun.javafx.tk.quantum.GlassViewEventHandler$KeyEventNotification.get(GlassViewEventHandler.java:120)
at [email protected]/com.sun.javafx.tk.quantum.QuantumToolkit.runWithoutRenderLock(QuantumToolkit.java:424)
at [email protected]/com.sun.javafx.tk.quantum.GlassViewEventHandler.handleKeyEvent(GlassViewEventHandler.java:204)
at [email protected]/com.sun.glass.ui.View.handleKeyEvent(View.java:563)
at [email protected]/com.sun.glass.ui.View.notifyKey(View.java:1004)
at [email protected]/com.sun.glass.ui.gtk.GtkApplication._runLoop(Native Method)
at [email protected]/com.sun.glass.ui.gtk.GtkApplication.lambda$runLoop$0(GtkApplication.java:240)
at java.base/java.lang.Thread.run(Thread.java:1447)
|
@InAnYan |
|
@InAnYan |
|
I will not be available during next 2-3 hours, so, if you have time fixing the conflicts now, you can do this before my aprobation. Thanks for looking into the issue! |
|
In fact I managed to pull the most recent version of Jabref without committing my changes so I can now run |
|
@InAnYan |
InAnYan
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for working on this PR, but, sadly, there is a new error
Please check your library file for wrong syntax.
Group tree could not be parsed. If you save the BibTeX library, all groups will be lost. Caused by: Unknown group: DirectoryGroup:/mnt/data/test/with_pdfs;2;/mnt/data/test/with_pdfs;1;;;;
|
Error log: |
Closes #10930
Changed or Added files
The class DirectoryGroup.java contains the new type of group. There are some tests in DirectoryGroupTest.java but most of the feature cannot be tested because it needs the WatchService.
The changes in GroupNodeViewModel.java allow directory groups to be edited or removed. The root node of the mirrored structure can be dragged.
The changes in GroupDialog.fxml, GroupDialogView.java and GroupDialogViewModel.java add the button to mirror the user's local structure within JabRef. The GroupDialogViewModelTest.java was updated to fit the new constructor and to test the new feature.
The new version of JabRef_en.properties contains the English text displayed to the user when trying to mirror its local structure.
The files DirectoryUpdateListener.java, DirectoryUpdateMonitor.java, DummyDirectoryUpdateMonitor.java and DefaultDirectoryUpdateMonitor.java implement a watcher for directories. The file JabRefGUI.java is now able to initialize this watcher.
The file GroupTreeViewModel.java can now create a directory structure. It needed new attributes in the constructor so GroupTreeViewModelTest.java has been updated.
The changes in GroupTreeView.java correct a bug : the user could use "Sort subgroups Z-A" on groups that are not sortable.
In the file CHANGELOG.md there is the description of what was changed in the code.
Next steps
There is an issue with the watcher on Windows : the user can't rename, move or delete a local directory which contains a folder that is not empty because it is detected as opened in an application.
I chose not to allow the user to add entries in a directory group because it is supposed to work only automatically, but due to this choice they are not sortable. About this point I think the existing implementation of
sortAlphabeticallyRecursive()andsortReverseAlphabeticallyRecursive()in GroupTreeViewModel.java is a bit weird :group.canAddEntriesIn()should be true because it seems the sorted method never uses that.Steps to test
Start JabRef and open a library, empty or not :
You can add a new group by clicking on the 'Add group' button. A dialog should show up. Select 'Directory structure' under the 'Collect by' title :
Here you can select the root folder of the structure you want to mirror by clicking on the folder icon button :
Once the root is set it should automatically fill the 'Root path'. It also fills the 'Name' of the group if and only if it was empty and set the hierarchical context to 'Union', which means a group contains the entries of its subgroups -it is not mandatory to use that but it is recommended because it is how local folders work. You can also write or paste the root path instead of selecting the folder but remember that the 'OK' button won't be active until a valid path and a valid name are provided. You can add a description, an icon, a color or even change the hierarchical context if you want :
Then click on the 'OK' button, your local structure should appear :

The entries created with the local PDFs should appear a little while later :
Now feel free to test the feature. You can either add, delete, rename or move PDFs or folders in your local directory structure, you should see the consequences on your library groups. You can also edit those groups with a right-click. Remember that if you remove a group or change its type it won't adapt to your local changes anymore. If you create an entry that has a file within the mirrored structure it should automatically be added to the respective group. The feature also works if you have multiple opened libraries.
Mandatory checks