mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 16:06:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
millmanorama 2018-09-15 12:46:01 +02:00
parent 037181192f
commit df567df149
3 changed files with 42 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/NextUnseenGroup.java
View File

@ -69,7 +69,7 @@ public class NextUnseenGroup extends Action {
Optional.ofNullable(controller.getViewState())
.flatMap(GroupViewState::getGroup)
.ifPresent(group -> {
groupManager.setGroupSeen(group, true)
groupManager.markGroupSeen(group, true)
.addListener(this::advanceToNextUnseenGroup, MoreExecutors.newDirectExecutorService());
});
});

89
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
View File

@ -42,6 +42,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Function;
import java.util.logging.Level;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
@ -629,6 +630,41 @@ public final class DrawableDB {
return names;
}
// Callback to process result of seen query
private static class GroupSeenQueryResultProcessor implements CaseDbAccessQueryCallback {
private interface SQLFunction<T1, T2> {
T2 apply(T1 rs) throws SQLException;
}
private final SQLFunction<ResultSet, Boolean> resultExtractor;
GroupSeenQueryResultProcessor(SQLFunction<ResultSet, Boolean> resultExtractor) {
this.resultExtractor = resultExtractor;
}
private boolean seen = false;
boolean getGroupSeen() {
return seen;
}
@Override
public void process(ResultSet resultSet) {
try {
if (resultSet != null) {
while (resultSet.next()) {
seen = resultExtractor.apply(resultSet); //NON-NLS;
return;
}
}
} catch (SQLException ex) {
logger.log(Level.SEVERE, "failed to get group seen", ex); //NON-NLS
}
}
}
/**
* Returns true if the specified group has been any examiner
*
@ -637,30 +673,9 @@ public final class DrawableDB {
* @return
*/
public boolean isGroupSeen(GroupKey<?> groupKey) {
// Callback to process result of seen query
class GroupSeenQueryResultProcessor implements CaseDbAccessQueryCallback {
private boolean seen = false;
boolean getGroupSeen() {
return seen;
}
@Override
public void process(ResultSet resultSet) {
try {
if (resultSet != null) {
while (resultSet.next()) {
seen = resultSet.getInt("count") > 0;
return;
}
}
} catch (SQLException ex) {
logger.log(Level.SEVERE, "failed to get group seen", ex); //NON-NLS
}
}
}
GroupSeenQueryResultProcessor queryResultProcessor
= new GroupSeenQueryResultProcessor(rs -> rs.getInt("count") > 0);
try {
@ -674,8 +689,6 @@ public final class DrawableDB {
String groupSeenQueryStmt = "COUNT((*) as count FROM " + GROUPS_SEEN_TABLENAME
+ " WHERE seen = 1 AND group_id in ( " + groupIdQuery + ")";
GroupSeenQueryResultProcessor queryResultProcessor = new GroupSeenQueryResultProcessor();
tskCase.getCaseDbAccessManager().select(groupSeenQueryStmt, queryResultProcessor);
return queryResultProcessor.getGroupSeen();
} catch (TskCoreException ex) {
@ -696,38 +709,16 @@ public final class DrawableDB {
* @return true if the examine has this group, false otherwise
*/
public boolean isGroupSeenByExaminer(GroupKey<?> groupKey, long examinerId) {
// Callback to process result of seen query
class GroupSeenQueryResultProcessor implements CaseDbAccessQueryCallback {
GroupSeenQueryResultProcessor queryResultProcessor
= new GroupSeenQueryResultProcessor(rs -> rs.getBoolean("seen"));
private boolean seen = false;
boolean getGroupSeen() {
return seen;
}
@Override
public void process(ResultSet resultSet) {
try {
if (resultSet != null) {
while (resultSet.next()) {
seen = resultSet.getBoolean("seen"); //NON-NLS;
return;
}
}
} catch (SQLException ex) {
logger.log(Level.SEVERE, "failed to get group seen", ex); //NON-NLS
}
}
}
try {
// query to find the group id from attribute/value
String groupIdQuery = String.format("( SELECT group_id FROM " + GROUPS_TABLENAME
+ " WHERE attribute = \'%s\' AND value = \'%s\' )", groupKey.getAttribute().attrName.toString(), groupKey.getValueDisplayName());
String groupSeenQueryStmt = String.format("seen FROM " + GROUPS_SEEN_TABLENAME + " WHERE examiner_id = %d AND group_id in ( %s )", examinerId, groupIdQuery);
GroupSeenQueryResultProcessor queryResultProcessor = new GroupSeenQueryResultProcessor();
tskCase.getCaseDbAccessManager().select(groupSeenQueryStmt, queryResultProcessor);
return queryResultProcessor.getGroupSeen();

4
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
View File

@ -47,7 +47,6 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javafx.application.Platform;
import javafx.beans.property.ReadOnlyDoubleProperty;
import javafx.beans.property.ReadOnlyDoubleWrapper;
import javafx.beans.property.ReadOnlyObjectProperty;
import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.collections.FXCollections;
@ -60,7 +59,6 @@ import javax.annotation.Nullable;
import javax.annotation.concurrent.GuardedBy;
import javax.swing.SortOrder;
import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
import org.apache.commons.lang3.ObjectUtils;
import static org.apache.commons.lang3.ObjectUtils.notEqual;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
@ -100,7 +98,7 @@ public class GroupManager {
/** An executor to submit async UI related background tasks to. */
private final ListeningExecutorService exec = MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor(
new BasicThreadFactory.Builder().namingPattern("GUI Task -%d").build())); //NON-NLS
new BasicThreadFactory.Builder().namingPattern("GroupManager BG Thread-%d").build())); //NON-NLS
private final ImageGalleryController controller;