-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
Enable triggering offline parsing explicitely #11565
Merged
Merged
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
7c57a8c
Enable triggering offline parsing explicitely
koppor 607dd4d
Add support to show clipboard contents
koppor e0801bf
Merge branch 'main' into grobid-preferences
koppor d99f49d
Add reference to CHANGELOG.md
koppor 485ba99
"Inline" Localization.lang("offline") and Localization.lang("online")
koppor cf50892
Some intermediate result. Feels really bad, therefore migrating to if…
koppor 5cb4bff
Migrate to if/then
koppor ab6f56e
Remove "(online)" suffix from button in toolbar
koppor 71ffa34
Discard changes to build.gradle
koppor 9920fb0
Discard changes to src/main/java/org/jabref/gui/bibtexextractor/Extra…
koppor b449d14
Merge remote-tracking branch 'origin/main' into grobid-preferences
koppor c1483a1
Merge remote-tracking branch 'upstream/main' into grobid-preferences
koppor 1446102
Remove obsolete .controller(this)
koppor 61b29bb
Merge branch 'main' into grobid-preferences
koppor dc61c8d
Merge branch 'main' into grobid-preferences
calixtus 5848f83
Fix checkstyle
koppor File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModelGrobid.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package org.jabref.gui.bibtexextractor; | ||
|
|
||
| import javax.swing.undo.UndoManager; | ||
|
|
||
| import org.jabref.gui.DialogService; | ||
| import org.jabref.gui.StateManager; | ||
| import org.jabref.gui.util.BackgroundTask; | ||
| import org.jabref.gui.util.TaskExecutor; | ||
| import org.jabref.logic.importer.FetcherException; | ||
| import org.jabref.logic.importer.fetcher.GrobidCitationFetcher; | ||
| import org.jabref.logic.l10n.Localization; | ||
| import org.jabref.model.database.BibDatabaseContext; | ||
| import org.jabref.model.util.FileUpdateMonitor; | ||
| import org.jabref.preferences.PreferencesService; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class BibtexExtractorViewModelGrobid extends BibtexExtractorViewModel { | ||
|
|
||
| private static final Logger LOGGER = LoggerFactory.getLogger(BibtexExtractorViewModelGrobid.class); | ||
|
|
||
| private final DialogService dialogService; | ||
| private final PreferencesService preferencesService; | ||
| private final TaskExecutor taskExecutor; | ||
|
|
||
| public BibtexExtractorViewModelGrobid(BibDatabaseContext bibdatabaseContext, | ||
| DialogService dialogService, | ||
| PreferencesService preferencesService, | ||
| FileUpdateMonitor fileUpdateMonitor, | ||
| TaskExecutor taskExecutor, | ||
| UndoManager undoManager, | ||
| StateManager stateManager) { | ||
| super(bibdatabaseContext, dialogService, preferencesService, fileUpdateMonitor, taskExecutor, undoManager, stateManager); | ||
| this.dialogService = dialogService; | ||
| this.preferencesService = preferencesService; | ||
| this.taskExecutor = taskExecutor; | ||
| } | ||
|
|
||
| @Override | ||
| public void startParsing() { | ||
| GrobidCitationFetcher grobidCitationFetcher = new GrobidCitationFetcher(preferencesService.getGrobidPreferences(), preferencesService.getImportFormatPreferences()); | ||
| BackgroundTask.wrap(() -> grobidCitationFetcher.performSearch(inputTextProperty.getValue())) | ||
| .onRunning(() -> dialogService.notify(Localization.lang("Your text is being parsed..."))) | ||
| .onFailure(e -> { | ||
| if (e instanceof FetcherException) { | ||
| String msg = Localization.lang("There are connection issues with a JabRef server. Detailed information: %0", | ||
| e.getMessage()); | ||
| dialogService.notify(msg); | ||
| } else { | ||
| LOGGER.warn("Missing exception handling.", e); | ||
| } | ||
| }) | ||
| .onSuccess(parsedEntries -> { | ||
| dialogService.notify(Localization.lang("%0 entries were parsed from your query.", String.valueOf(parsedEntries.size()))); | ||
| importHandler.importEntries(parsedEntries); | ||
| }).executeWith(taskExecutor); | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModelOffline.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package org.jabref.gui.bibtexextractor; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import javax.swing.undo.UndoManager; | ||
|
|
||
| import org.jabref.gui.DialogService; | ||
| import org.jabref.gui.StateManager; | ||
| import org.jabref.gui.util.TaskExecutor; | ||
| import org.jabref.model.database.BibDatabaseContext; | ||
| import org.jabref.model.entry.BibEntry; | ||
| import org.jabref.model.util.FileUpdateMonitor; | ||
| import org.jabref.preferences.PreferencesService; | ||
|
|
||
| public class BibtexExtractorViewModelOffline extends BibtexExtractorViewModel { | ||
|
|
||
| public BibtexExtractorViewModelOffline(BibDatabaseContext bibdatabaseContext, | ||
| DialogService dialogService, | ||
| PreferencesService preferencesService, | ||
| FileUpdateMonitor fileUpdateMonitor, | ||
| TaskExecutor taskExecutor, | ||
| UndoManager undoManager, | ||
| StateManager stateManager) { | ||
| super(bibdatabaseContext, dialogService, preferencesService, fileUpdateMonitor, taskExecutor, undoManager, stateManager); | ||
| } | ||
|
|
||
| @Override | ||
| public void startParsing() { | ||
| BibEntry parsedEntry = new BibtexExtractor().extract(inputTextProperty.getValue()); | ||
| importHandler.importEntries(List.of(parsedEntry)); | ||
| } | ||
| } |
30 changes: 0 additions & 30 deletions
30
src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexAction.java
This file was deleted.
Oops, something went wrong.
22 changes: 22 additions & 0 deletions
22
src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexActionOffline.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package org.jabref.gui.bibtexextractor; | ||
|
|
||
| import org.jabref.gui.DialogService; | ||
| import org.jabref.gui.StateManager; | ||
| import org.jabref.gui.actions.SimpleCommand; | ||
|
|
||
| import static org.jabref.gui.actions.ActionHelper.needsDatabase; | ||
|
|
||
| public class ExtractBibtexActionOffline extends SimpleCommand { | ||
|
|
||
| private final DialogService dialogService; | ||
|
|
||
| public ExtractBibtexActionOffline(DialogService dialogService, StateManager stateManager) { | ||
| this.dialogService = dialogService; | ||
| this.executable.bind(needsDatabase(stateManager)); | ||
| } | ||
|
|
||
| @Override | ||
| public void execute() { | ||
| dialogService.showCustomDialogAndWait(new ExtractBibtexDialogOffline()); | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexActionOnline.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package org.jabref.gui.bibtexextractor; | ||
|
|
||
| import javafx.beans.binding.Bindings; | ||
|
|
||
| import org.jabref.gui.DialogService; | ||
| import org.jabref.gui.StateManager; | ||
| import org.jabref.gui.actions.SimpleCommand; | ||
| import org.jabref.gui.importer.GrobidOptInDialogHelper; | ||
| import org.jabref.preferences.PreferencesService; | ||
|
|
||
| import static org.jabref.gui.actions.ActionHelper.needsDatabase; | ||
|
|
||
| public class ExtractBibtexActionOnline extends SimpleCommand { | ||
|
|
||
| private final PreferencesService preferencesService; | ||
| private final DialogService dialogService; | ||
|
|
||
| public ExtractBibtexActionOnline(DialogService dialogService, PreferencesService preferencesService, StateManager stateManager, boolean requiresGrobid) { | ||
| this.preferencesService = preferencesService; | ||
| this.dialogService = dialogService; | ||
| if (requiresGrobid) { | ||
| this.executable.bind( | ||
| Bindings.and( | ||
| preferencesService.getGrobidPreferences().grobidEnabledProperty(), | ||
| needsDatabase(stateManager) | ||
| )); | ||
| } else { | ||
| this.executable.bind(needsDatabase(stateManager)); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void execute() { | ||
| boolean useGrobid = GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferencesService.getGrobidPreferences()); | ||
| if (useGrobid) { | ||
| dialogService.showCustomDialogAndWait(new ExtractBibtexDialogGrobid()); | ||
| } else { | ||
| dialogService.showCustomDialogAndWait(new ExtractBibtexDialogOffline()); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
remove
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.
I needed
mavenLocal()to be able to load the patched versionorg.jabref:afterburner.fx:2.0.0-SNAPSHOT.Not required any more.