Skip to content

fix docear/Desktop#500 (search orphaned nodes perf.) #501

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

Open
ftes wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix docear/Desktop#500 (search orphaned nodes perf.) #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b967bc4
fix docear/Desktop#500 (search orphaned nodes perf.)
ftes Mar 3, 2017
4bd8d71
fix progress update for docear/Desktop#500
ftes Mar 3, 2017
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
77 changes: 52 additions & 25 deletions docear_plugin_pdfutilities/src/org/docear/plugin/pdfutilities/features/MonitoringWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,15 @@ private boolean searchingOrphanedNodes(NodeModel target) throws InterruptedExcep
fireStatusUpdate(SwingWorkerDialog.SET_PROGRESS_BAR_DETERMINATE, null, null);
fireStatusUpdate(SwingWorkerDialog.PROGRESS_BAR_TEXT, null, TextUtils.getText("AbstractMonitoringAction.11")); //$NON-NLS-1$
int count = 0;
int progressForStep1 = 30;
int progressForStep2 = 100 - progressForStep1;

// Step 1: collect all files that have to be checked.
Map<File, List<NodeModel>> filesWithAnnotations = new HashMap<File, List<NodeModel>>();
for (AnnotationID id : nodeIndex.keySet()) {
if (canceled()) return false;
count++;
fireProgressUpdate(100 * count / nodeIndex.keySet().size());
fireProgressUpdate(progressForStep1 * count / nodeIndex.keySet().size());
if (importedFiles.containsKey(id)) continue;
for (NodeModel node : nodeIndex.get(id)) {
if (!isMonitoringNodeChild(target, node)) continue;
Expand All @@ -239,39 +244,61 @@ private boolean searchingOrphanedNodes(NodeModel target) throws InterruptedExcep
if (annotation.getAnnotationType() == null) continue;
if (annotation.getAnnotationType().equals(AnnotationType.FILE)) continue;
if (orphanedNodes.contains(node)) continue;
try {
File file = URIUtils.getAbsoluteFile(URIUtils.getAbsoluteURI(node));
if (file != null && !file.exists()) {
orphanedNodes.add(node);
continue;
}
else if (file != null) {
File monitoringDirectory = MonitoringUtils.getPdfDirFromMonitoringNode(target);
boolean ok = false;
if(monitoringDirectory instanceof AVirtualDirectory) {
for(File repo : monitoringDirectory.listFiles()) {
if (file.getPath().startsWith(repo.getPath())) {
ok = true;
}
}
}
else if (file.getPath().startsWith(monitoringDirectory.getPath())) {

File file = URIUtils.getAbsoluteFile(URIUtils.getAbsoluteURI(node));
List<NodeModel> annotationsForFile = filesWithAnnotations.get(file);
if (annotationsForFile == null) {
annotationsForFile = new ArrayList<NodeModel>();
filesWithAnnotations.put(file, annotationsForFile);
}
annotationsForFile.add(node);
}
}

count = 0;
int numberOfFiles = filesWithAnnotations.keySet().size();
// Step 2: Open each file only once, and check for orphaned annotations
for (File file : filesWithAnnotations.keySet()) {
count++;
fireProgressUpdate(progressForStep1 + progressForStep2 * count / numberOfFiles);
List<NodeModel> nodes = filesWithAnnotations.get(file);

if (file != null && !file.exists()) {
orphanedNodes.addAll(nodes);
continue;
}
else if (file != null) {
File monitoringDirectory = MonitoringUtils.getPdfDirFromMonitoringNode(target);
boolean ok = false;
if(monitoringDirectory instanceof AVirtualDirectory) {
for(File repo : monitoringDirectory.listFiles()) {
if (file.getPath().startsWith(repo.getPath())) {
ok = true;
}
if(ok) {
AnnotationModel annoation = new PdfAnnotationImporter().searchAnnotation(URIUtils.getAbsoluteURI(node), node);
if (annoation == null) {
}
}
else if (file.getPath().startsWith(monitoringDirectory.getPath())) {
ok = true;
}
if(ok) {
PdfAnnotationImporter importer = new PdfAnnotationImporter();
importer.setImportAll(true);
try {
List<AnnotationModel> annotationsInFile = importer.importAnnotations(file.toURI());
for (NodeModel node : nodes) {
AnnotationModel foundAnnotation =
importer.searchAnnotation(annotationsInFile, node);
if (foundAnnotation == null) {
orphanedNodes.add(node);
}
}
} catch (Exception e) {
LogUtils.info("Exception during import file: " + file.toURI()); //$NON-NLS-1$
}

}
catch (Exception e) {
LogUtils.info("Exception during import file: " + URIUtils.getAbsoluteURI(node)); //$NON-NLS-1$
}
}
}

return true;
}

Expand Down
3 changes: 1 addition & 2 deletions docear_plugin_pdfutilities/src/org/docear/plugin/pdfutilities/pdf/PdfAnnotationImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,7 @@ public AnnotationModel searchAnnotation(IAnnotation annotation) throws Exception
}
}


private AnnotationModel searchAnnotation(List<AnnotationModel> annotations, NodeModel node) {
public AnnotationModel searchAnnotation(List<AnnotationModel> annotations, NodeModel node) {
for(AnnotationModel annotation : annotations){
AnnotationModel extensionModel = AnnotationController.getModel(node, false);
if(extensionModel == null){
Expand Down