Skip to content
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.

Sign up for GitHub

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

Fix indexing task progress #11822

Merged
merged 1 commit into from
Sep 24, 2024
Merged

Fix indexing task progress #11822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/main/java/org/jabref/gui/util/UiTaskExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,17 @@ public static void runInJavaFXThread(Runnable runnable) {
@Override
public <V> Future<V> execute(BackgroundTask<V> task) {
Task<V> javafxTask = getJavaFXTask(task);
if (task.showToUser()) {
StateManager stateManager = Injector.instantiateModelOrService(StateManager.class);
if (stateManager != null) {
stateManager.addBackgroundTask(task, javafxTask);
} else {
LOGGER.info("Background task visible without GUI");

StateManager stateManager = Injector.instantiateModelOrService(StateManager.class);
task.showToUserProperty().subscribe(showToUser -> {
if (showToUser) {
if (stateManager != null) {
runInJavaFXThread(() -> stateManager.addBackgroundTask(task, javafxTask));
} else {
LOGGER.info("Background task visible without GUI");
}
}
}
});
return execute(javafxTask);
}

Expand Down
21 changes: 10 additions & 11 deletions src/main/java/org/jabref/logic/search/LuceneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public Object call() {
linkedFilesIndexer.updateOnStart(this);
return null;
}
}.showToUser(true).executeWith(taskExecutor);
}.executeWith(taskExecutor);
} else {
linkedFilesIndexer.removeAllFromIndex();
}
Expand All @@ -81,8 +81,7 @@ public Object call() {
bibFieldsIndexer.updateOnStart(this);
return null;
}
}.showToUser(true)
.willBeRecoveredAutomatically(true)
}.willBeRecoveredAutomatically(true)
.onFinished(() -> this.databaseContext.getDatabase().postEvent(new IndexStartedEvent()))
.executeWith(taskExecutor);

Expand All @@ -93,7 +92,7 @@ public Object call() {
linkedFilesIndexer.updateOnStart(this);
return null;
}
}.showToUser(true).executeWith(taskExecutor);
}.executeWith(taskExecutor);
}
}

Expand All @@ -105,7 +104,7 @@ public Object call() {
return null;
}
}.onFinished(() -> this.databaseContext.getDatabase().postEvent(new IndexAddedOrUpdatedEvent(entries)))
.showToUser(true).executeWith(taskExecutor);
.executeWith(taskExecutor);

if (shouldIndexLinkedFiles.get() && !isLinkedFilesIndexerBlocked.get()) {
new BackgroundTask<>() {
Expand All @@ -114,7 +113,7 @@ public Object call() {
linkedFilesIndexer.addToIndex(entries, this);
return null;
}
}.showToUser(true).executeWith(taskExecutor);
}.executeWith(taskExecutor);
}
}

Expand All @@ -126,7 +125,7 @@ public Object call() {
return null;
}
}.onFinished(() -> this.databaseContext.getDatabase().postEvent(new IndexRemovedEvent(entries)))
.showToUser(true).executeWith(taskExecutor);
.executeWith(taskExecutor);

if (shouldIndexLinkedFiles.get()) {
new BackgroundTask<>() {
Expand All @@ -135,7 +134,7 @@ public Object call() {
linkedFilesIndexer.removeFromIndex(entries, this);
return null;
}
}.showToUser(true).executeWith(taskExecutor);
}.executeWith(taskExecutor);
}
}

Expand Down Expand Up @@ -177,7 +176,7 @@ public Object call() {
linkedFilesIndexer.addToIndex(List.of(entry), this);
return null;
}
}.showToUser(true).executeWith(taskExecutor);
}.executeWith(taskExecutor);
}
}

Expand All @@ -189,7 +188,7 @@ public Object call() {
return null;
}
}.onFinished(() -> this.databaseContext.getDatabase().postEvent(new IndexStartedEvent()))
.showToUser(true).executeWith(taskExecutor);
.executeWith(taskExecutor);

if (shouldIndexLinkedFiles.get()) {
new BackgroundTask<>() {
Expand All @@ -198,7 +197,7 @@ public Object call() {
linkedFilesIndexer.rebuildIndex(this);
return null;
}
}.showToUser(true).executeWith(taskExecutor);
}.executeWith(taskExecutor);
}
}

Expand Down
10 changes: 8 additions & 2 deletions src/main/java/org/jabref/logic/search/indexing/BibFieldsIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ public void updateOnStart(BackgroundTask<?> task) {

@Override
public void addToIndex(Collection<BibEntry> entries, BackgroundTask<?> task) {
task.setTitle(Localization.lang("Indexing bib fields for %0", libraryName));
if (entries.size() > 1) {
task.showToUser(true);
task.setTitle(Localization.lang("Indexing bib fields for %0", libraryName));
}
int i = 1;
long startTime = System.currentTimeMillis();
LOGGER.debug("Adding {} entries to index", entries.size());
Expand Down Expand Up @@ -99,7 +102,10 @@ private void addToIndex(BibEntry bibEntry) {

@Override
public void removeFromIndex(Collection<BibEntry> entries, BackgroundTask<?> task) {
task.setTitle(Localization.lang("Removing entries from index for %0", libraryName));
if (entries.size() > 1) {
task.showToUser(true);
task.setTitle(Localization.lang("Removing entries from index for %0", libraryName));
}
int i = 1;
for (BibEntry entry : entries) {
if (task.isCancelled()) {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/jabref/logic/search/indexing/DefaultLinkedFilesIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ private void addToIndex(Map<String, Pair<Long, Path>> linkedFiles, BackgroundTas
}

task.setTitle(Localization.lang("Indexing PDF files for %0", libraryName));
task.showToUser(true);
LOGGER.debug("Adding {} files to index", linkedFiles.size());
int i = 1;
for (Map.Entry<String, Pair<Long, Path>> entry : linkedFiles.entrySet()) {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/org/jabref/logic/util/BackgroundTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ public boolean showToUser() {
return showToUser.get();
}

public BooleanProperty showToUserProperty() {
return showToUser;
}

public BackgroundTask<V> showToUser(boolean show) {
showToUser.set(show);
return this;
Expand Down