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 Permissions of LaTeXintegration #5134

Merged
merged 4 commits into from
Aug 18, 2019
Merged

Fix Permissions of LaTeXintegration #5134

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f6a440
Differentiate Causes of Errors
LinusDietz Jul 17, 2019
b08d80f
Refactor Failure Mode
LinusDietz Jul 18, 2019
08bd82e
Remove unnecessary return
LinusDietz Jul 18, 2019
f6790ca
Remove redundant lines
LinusDietz Aug 1, 2019
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
18 changes: 16 additions & 2 deletions src/main/java/org/jabref/gui/texparser/ParseTexDialogViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.jabref.gui.texparser;

import java.io.IOException;
import java.nio.file.FileSystemException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down Expand Up @@ -117,18 +118,31 @@ public void searchButtonClicked() {
noFilesFound.set(true);
searchInProgress.set(true);
successfulSearch.set(false);

})
.onFinished(() -> searchInProgress.set(false))
.onSuccess(newRoot -> {
root.set(newRoot);
noFilesFound.set(false);
successfulSearch.set(true);
})
.onFailure(dialogService::showErrorDialogAndWait)
.onFailure(this::handleFailure)
.executeWith(taskExecutor);
}

private void handleFailure(Exception exception) {
root.set(null);
noFilesFound.set(true);
searchInProgress.set(false);
successfulSearch.set(false);
LinusDietz marked this conversation as resolved.
Show resolved Hide resolved

final boolean permissionProblem = exception instanceof IOException && exception.getCause() instanceof FileSystemException && exception.getCause().getMessage().endsWith("Operation not permitted");
if (permissionProblem) {
dialogService.showErrorDialogAndWait(String.format(Localization.lang("JabRef does not have permission to access %s"), exception.getCause().getMessage()));
} else {
dialogService.showErrorDialogAndWait(exception);
}
}

private FileNodeViewModel searchDirectory(Path directory) throws IOException {
if (directory == null || !directory.toFile().exists() || !directory.toFile().isDirectory()) {
throw new IOException("An error occurred while searching an invalid directory.");
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/l10n/JabRef_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,6 +1381,7 @@ Open\ %0\ file=Open %0 file

Cannot\ delete\ file=Cannot delete file
File\ permission\ error=File permission error
JabRef\ does\ not\ have\ permission\ to\ access\ %s=JabRef does not have permission to access %s
Push\ to\ %0=Push to %0
Path\ to\ %0=Path to %0
Convert=Convert
Expand Down