codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-06 02:24:30 +00:00
Code Issues Releases Wiki Activity

use new Autopsy Tag events, don't fire extra events from ig, but listen to events from autopsy

Browse Source
This commit is contained in:
jmillman
2015-06-19 13:53:53 -04:00
parent 335b82bbc2
commit b5216cc87b
16 changed files with 208 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java
View File

@@ -250,7 +250,6 @@ public class TagsManager implements Closeable {
final ContentTag newContentTag = tskCase.addContentTag(content, tagName, comment, beginByteOffset, endByteOffset);
Case.getCurrentCase().notifyContentTagAdded(newContentTag);
return newContentTag;
return newContentTag;
}
/**

82
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/DrawableTagsManager.java
View File

@@ -27,11 +27,11 @@ import java.util.logging.Level;
import java.util.stream.Collectors;
import org.sleuthkit.autopsy.casemodule.services.TagsManager;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.events.ContentTagAddedEvent;
import org.sleuthkit.autopsy.events.ContentTagDeletedEvent;
import org.sleuthkit.autopsy.imagegallery.datamodel.Category;
import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager;
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableFile;
import org.sleuthkit.autopsy.ingest.IngestServices;
import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
import org.sleuthkit.datamodel.BlackboardArtifact;
import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.ContentTag;
import org.sleuthkit.datamodel.TagName;
@@ -59,6 +59,32 @@ public class DrawableTagsManager {
}
/**
* register an object to receive CategoryChangeEvents
*
* @param listner
*/
public void registerListener(Object listner) {
tagsEventBus.register(listner);
}
/**
* unregister an object from receiving CategoryChangeEvents
*
* @param listener
*/
public void unregisterListener(Object listener) {
tagsEventBus.unregister(listener);
}
public void fireTagAddedEvent(ContentTagAddedEvent event) {
tagsEventBus.post(event);
}
public void fireTagDeletedEvent(ContentTagDeletedEvent event) {
tagsEventBus.post(event);
}
/**
* assign a new TagsManager to back this one, ie when the current case
* changes
@@ -82,24 +108,6 @@ public class DrawableTagsManager {
}
}
/**
* register an object to receive CategoryChangeEvents
*
* @param listner
*/
public void registerListener(Object listner) {
tagsEventBus.register(listner);
}
/**
* unregister an object from receiving CategoryChangeEvents
*
* @param listener
*/
public void unregisterListener(Object listener) {
tagsEventBus.unregister(listener);
}
/**
* get the (cached) follow up TagName
*
@@ -120,7 +128,7 @@ public class DrawableTagsManager {
synchronized (autopsyTagsManagerLock) {
try {
return autopsyTagsManager.getAllTagNames().stream()
.filter(Category::isCategoryTagName)
.filter(CategoryManager::isCategoryTagName)
.collect(Collectors.toSet());
} catch (TskCoreException | IllegalStateException ex) {
Logger.getLogger(DrawableTagsManager.class.getName()).log(Level.WARNING, "couldn't access case", ex);
@@ -173,12 +181,10 @@ public class DrawableTagsManager {
}
}
public void addContentTag(DrawableFile<?> file, TagName tagName, String comment) throws TskCoreException {
ContentTag addContentTag;
public ContentTag addContentTag(DrawableFile<?> file, TagName tagName, String comment) throws TskCoreException {
synchronized (autopsyTagsManagerLock) {
addContentTag = autopsyTagsManager.addContentTag(file, tagName, comment);
return autopsyTagsManager.addContentTag(file, tagName, comment);
}
fireTagAdded(addContentTag);
}
public List<ContentTag> getContentTagsByTagName(TagName t) throws TskCoreException {
@@ -187,21 +193,6 @@ public class DrawableTagsManager {
}
}
/**
* Fire the ModuleDataEvent that we use as a place holder for a real Tag
* Event. This is used to refresh the autopsy tag tree and the ui in
* ImageGallery
*
*
* Note: this is a hack. In an ideal world, TagsManager would fire
* events so that the directory tree would refresh. But, we haven't
* had a chance to add that so, we fire these events and the tree
* refreshes based on them.
*/
static public void refreshTagsInAutopsy() {
IngestServices.getInstance().fireModuleDataEvent(new ModuleDataEvent("TagAction", BlackboardArtifact.ARTIFACT_TYPE.TSK_TAG_FILE)); //NON-NLS
}
public List<TagName> getAllTagNames() throws TskCoreException {
synchronized (autopsyTagsManagerLock) {
return autopsyTagsManager.getAllTagNames();
@@ -214,18 +205,9 @@ public class DrawableTagsManager {
}
}
public void fireTagAdded(ContentTag newTag) {
tagsEventBus.post(new TagsChangeEvent(Collections.singleton(newTag.getContent().getId())));
}
public void fireTagDeleted(ContentTag oldTag) {
tagsEventBus.post(new TagsChangeEvent(Collections.singleton(oldTag.getContent().getId())));
}
public void deleteContentTag(ContentTag ct) throws TskCoreException {
synchronized (autopsyTagsManagerLock) {
autopsyTagsManager.deleteContentTag(ct);
}
fireTagDeleted(ct);
}
}

30
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
View File

@@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.imagegallery;
import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.BlockingQueue;
@@ -58,10 +57,9 @@ import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.coreutils.History;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.coreutils.ThreadConfined;
import org.sleuthkit.autopsy.imagegallery.actions.CategorizeAction;
import org.sleuthkit.autopsy.imagegallery.datamodel.Category;
import org.sleuthkit.autopsy.events.ContentTagAddedEvent;
import org.sleuthkit.autopsy.events.ContentTagDeletedEvent;
import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager;
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableDB;
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableFile;
import org.sleuthkit.autopsy.imagegallery.datamodel.HashSetManager;
@@ -74,7 +72,6 @@ import org.sleuthkit.datamodel.AbstractFile;
import org.sleuthkit.datamodel.BlackboardArtifact;
import org.sleuthkit.datamodel.BlackboardAttribute;
import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.ContentTag;
import org.sleuthkit.datamodel.FileSystem;
import org.sleuthkit.datamodel.Image;
import org.sleuthkit.datamodel.SleuthkitCase;
@@ -366,6 +363,8 @@ public final class ImageGalleryController {
categoryManager.setDb(db);
tagsManager.setAutopsyTagsManager(theNewCase.getServices().getTagsManager());
tagsManager.registerListener(groupManager);
tagsManager.registerListener(categoryManager);
} else {
reset();
}
@@ -384,6 +383,7 @@ public final class ImageGalleryController {
});
tagsManager.clearFollowUpTagName();
tagsManager.unregisterListener(groupManager);
tagsManager.unregisterListener(categoryManager);
Toolbar.getDefault(this).reset();
groupManager.clear();
@@ -490,23 +490,15 @@ public final class ImageGalleryController {
}
break;
case CONTENT_TAG_ADDED:
ContentTag newTag = (ContentTag) evt.getNewValue();
if (Category.isCategoryTagName(newTag.getName())) {
new CategorizeAction(ImageGalleryController.this).addTag(newTag.getName(), "");
} else {
getTagsManager().fireTagAdded(newTag);
final ContentTagAddedEvent tagAddedEvent = (ContentTagAddedEvent) evt;
if (getDatabase().isInDB((tagAddedEvent).getAddedTag().getContent().getId())) {
getTagsManager().fireTagAddedEvent(tagAddedEvent);
}
break;
case CONTENT_TAG_DELETED:
ContentTag oldTag = (ContentTag) evt.getOldValue();
final long fileID = oldTag.getContent().getId();
if (getDatabase().isInDB(fileID)) {
if (Category.isCategoryTagName(oldTag.getName())) {
getCategoryManager().decrementCategoryCount(Category.fromTagName(oldTag.getName()));
getGroupManager().handleFileUpdate(FileUpdateEvent.newUpdateEvent(Collections.singleton(fileID), DrawableAttribute.CATEGORY));
} else {
getTagsManager().fireTagDeleted(oldTag);
}
final ContentTagDeletedEvent tagDeletedEvent = (ContentTagDeletedEvent) evt;
if (getDatabase().isInDB((tagDeletedEvent).getDeletedTag().getContent().getId())) {
getTagsManager().fireTagDeletedEvent(tagDeletedEvent);
}
break;
}

41
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/TagsChangeEvent.java
View File

@@ -1,41 +0,0 @@
/*
* Autopsy Forensic Browser
*
* Copyright 2015 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.sleuthkit.autopsy.imagegallery;
import java.util.Collection;
import java.util.Collections;
import javax.annotation.concurrent.Immutable;
/**
*
*/
@Immutable
public class TagsChangeEvent {
private final Collection<Long> fileIDs;
public Collection<Long> getFileIDs() {
return Collections.unmodifiableCollection(fileIDs);
}
public TagsChangeEvent(Collection<Long> fileIDs) {
this.fileIDs = fileIDs;
}
}

9
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddDrawableTagAction.java
View File

@@ -18,7 +18,6 @@
*/
package org.sleuthkit.autopsy.imagegallery.actions;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ExecutionException;
@@ -28,11 +27,8 @@ import javax.swing.JOptionPane;
import javax.swing.SwingWorker;
import org.openide.util.Utilities;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.imagegallery.DrawableTagsManager;
import org.sleuthkit.autopsy.imagegallery.FileIDSelectionModel;
import org.sleuthkit.autopsy.imagegallery.FileUpdateEvent;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableFile;
import org.sleuthkit.datamodel.AbstractFile;
import org.sleuthkit.datamodel.TagName;
@@ -87,10 +83,9 @@ public class AddDrawableTagAction extends AddTagAction {
JOptionPane.showMessageDialog(null, "Unable to tag " + fileID + ".", "Tagging Error", JOptionPane.ERROR_MESSAGE);
}
//make sure rest of ui hears category change.
controller.getGroupManager().handleFileUpdate(FileUpdateEvent.newUpdateEvent(Collections.singleton(fileID), DrawableAttribute.TAGS));
// //make sure rest of ui hears category change.
// controller.getGroupManager().handleFileUpdate(FileUpdateEvent.newUpdateEvent(Collections.singleton(fileID), DrawableAttribute.TAGS));
}
DrawableTagsManager.refreshTagsInAutopsy();
return null;
}

9
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddTagAction.java
View File

@@ -31,7 +31,7 @@ import org.sleuthkit.autopsy.casemodule.services.TagsManager;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.imagegallery.DrawableTagsManager;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
import org.sleuthkit.autopsy.imagegallery.datamodel.Category;
import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager;
import org.sleuthkit.datamodel.TagName;
import org.sleuthkit.datamodel.TskCoreException;
@@ -95,11 +95,10 @@ abstract class AddTagAction {
// a tag with the associated tag name.
if (null != tagNames && !tagNames.isEmpty()) {
for (final TagName tagName : tagNames) {
if (Category.isNotCategoryTagName(tagName)) {
if (CategoryManager.isNotCategoryTagName(tagName)) {
MenuItem tagNameItem = new MenuItem(tagName.getDisplayName());
tagNameItem.setOnAction((ActionEvent t) -> {
addTag(tagName, NO_COMMENT);
DrawableTagsManager.refreshTagsInAutopsy();
});
quickTagMenu.getItems().add(tagNameItem);
}
@@ -120,7 +119,6 @@ abstract class AddTagAction {
TagName tagName = GetTagNameDialog.doDialog();
if (tagName != null) {
addTag(tagName, NO_COMMENT);
}
});
});
@@ -134,12 +132,11 @@ abstract class AddTagAction {
SwingUtilities.invokeLater(() -> {
GetTagNameAndCommentDialog.TagNameAndComment tagNameAndComment = GetTagNameAndCommentDialog.doDialog();
if (null != tagNameAndComment) {
if (Category.isCategoryTagName(tagNameAndComment.getTagName())) {
if (CategoryManager.isCategoryTagName(tagNameAndComment.getTagName())) {
new CategorizeAction(controller).addTag(tagNameAndComment.getTagName(), tagNameAndComment.getComment());
} else {
new AddDrawableTagAction(controller).addTag(tagNameAndComment.getTagName(), tagNameAndComment.getComment());
}
}
});
});

27
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeAction.java
View File

@@ -18,7 +18,6 @@
*/
package org.sleuthkit.autopsy.imagegallery.actions;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -32,7 +31,6 @@ import javax.swing.JOptionPane;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.imagegallery.DrawableTagsManager;
import org.sleuthkit.autopsy.imagegallery.FileIDSelectionModel;
import org.sleuthkit.autopsy.imagegallery.FileUpdateEvent;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
import org.sleuthkit.autopsy.imagegallery.datamodel.Category;
import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager;
@@ -41,7 +39,6 @@ import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableFile;
import org.sleuthkit.autopsy.imagegallery.grouping.GroupKey;
import org.sleuthkit.autopsy.imagegallery.grouping.GroupManager;
import org.sleuthkit.datamodel.ContentTag;
import org.sleuthkit.datamodel.SleuthkitCase;
import org.sleuthkit.datamodel.TagName;
import org.sleuthkit.datamodel.TskCoreException;
@@ -87,6 +84,10 @@ public class CategorizeAction extends AddTagAction {
}
}
public void enforceOneCat(TagName name, String string) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
/**
* Instances of this class implement a context menu user interface for
* selecting a category
@@ -127,8 +128,8 @@ public class CategorizeAction extends AddTagAction {
@Override
public void run() {
final GroupManager groupManager = controller.getGroupManager();
final SleuthkitCase sleuthKitCase = controller.getSleuthKitCase();
final CategoryManager categoryManager = controller.getCategoryManager();
final DrawableTagsManager tagsManager = controller.getTagsManager();
try {
DrawableFile<?> file = controller.getFileFromId(fileID); //drawable db
@@ -138,27 +139,27 @@ public class CategorizeAction extends AddTagAction {
groupManager.removeFromGroup(new GroupKey<Category>(DrawableAttribute.CATEGORY, oldCat), fileID); //memory
//remove old category tag if necessary
List<ContentTag> allContentTags = sleuthKitCase.getContentTagsByContent(file); //tsk db
List<ContentTag> allContentTags = tagsManager.getContentTagsByContent(file); //tsk db
//JMTODO: move this to CategoryManager
for (ContentTag ct : allContentTags) {
if (Category.isCategoryTagName(ct.getName())) {
sleuthKitCase.deleteContentTag(ct); //tsk db
categoryManager.decrementCategoryCount(Category.fromDisplayName(ct.getName().getDisplayName())); //memory/drawable db
if (CategoryManager.isCategoryTagName(ct.getName())) {
tagsManager.deleteContentTag(ct); //tsk db
// categoryManager.decrementCategoryCount(Category.fromDisplayName(ct.getName().getDisplayName())); //memory/drawable db
}
}
categoryManager.incrementCategoryCount(Category.fromDisplayName(tagName.getDisplayName())); //memory/drawable db
// categoryManager.incrementCategoryCount(Category.fromDisplayName(tagName.getDisplayName())); //memory/drawable db
if (tagName != categoryManager.getTagName(Category.ZERO)) { // no tags for cat-0
controller.getTagsManager().addContentTag(file, tagName, comment); //tsk db
tagsManager.addContentTag(file, tagName, comment); //tsk db
}
//make sure rest of ui hears category change.
groupManager.handleFileUpdate(FileUpdateEvent.newUpdateEvent(Collections.singleton(fileID), DrawableAttribute.CATEGORY)); //memory/ui
// //make sure rest of ui hears category change.
// groupManager.handleFileUpdate(FileUpdateEvent.newUpdateEvent(Collections.singleton(fileID), DrawableAttribute.CATEGORY)); //memory/ui
} catch (TskCoreException ex) {
LOGGER.log(Level.SEVERE, "Error categorizing result", ex);
JOptionPane.showMessageDialog(null, "Unable to categorize " + fileID + ".", "Categorizing Error", JOptionPane.ERROR_MESSAGE);
}
DrawableTagsManager.refreshTagsInAutopsy();
}
}

7
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/DeleteFollowUpTagAction.java
View File

@@ -18,7 +18,6 @@
*/
package org.sleuthkit.autopsy.imagegallery.actions;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import javafx.event.ActionEvent;
@@ -26,14 +25,12 @@ import javax.swing.SwingWorker;
import org.controlsfx.control.action.Action;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.imagegallery.DrawableTagsManager;
import org.sleuthkit.autopsy.imagegallery.FileUpdateEvent;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableFile;
import org.sleuthkit.autopsy.imagegallery.grouping.GroupKey;
import org.sleuthkit.autopsy.imagegallery.grouping.GroupManager;
import org.sleuthkit.datamodel.ContentTag;
import org.sleuthkit.datamodel.SleuthkitCase;
import org.sleuthkit.datamodel.TagName;
import org.sleuthkit.datamodel.TskCoreException;
@@ -53,7 +50,6 @@ public class DeleteFollowUpTagAction extends Action {
@Override
protected Void doInBackground() throws Exception {
final SleuthkitCase sleuthKitCase = controller.getSleuthKitCase();
final GroupManager groupManager = controller.getGroupManager();
final DrawableTagsManager tagsManager = controller.getTagsManager();
@@ -69,9 +65,8 @@ public class DeleteFollowUpTagAction extends Action {
}
}
DrawableTagsManager.refreshTagsInAutopsy();
//make sure rest of ui hears category change.
groupManager.handleFileUpdate(FileUpdateEvent.newUpdateEvent(Collections.singleton(fileID), DrawableAttribute.TAGS));
// groupManager.handleFileUpdate(FileUpdateEvent.newUpdateEvent(Collections.singleton(fileID), DrawableAttribute.TAGS));
} catch (TskCoreException ex) {
LOGGER.log(Level.SEVERE, "Failed to delete follow up tag.", ex);
}

12
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Category.java
View File

@@ -23,7 +23,6 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javafx.scene.paint.Color;
import org.sleuthkit.datamodel.TagName;
/**
* Enum to represent the six categories in the DHs image categorization scheme.
@@ -49,17 +48,6 @@ public enum Category {
public static Category fromDisplayName(String displayName) {
return nameMap.get(displayName);
}
public static Category fromTagName(TagName tagName) {
return nameMap.get(tagName.getDisplayName());
}
public static boolean isCategoryTagName(TagName tName) {
return isCategoryName(tName.getDisplayName());
}
public static boolean isNotCategoryTagName(TagName tName) {
return isNotCategoryName(tName.getDisplayName());
}
public static boolean isCategoryName(String tName) {
return nameMap.containsKey(tName);

14
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryChangeEvent.java
View File

@@ -30,6 +30,16 @@ import javax.annotation.concurrent.Immutable;
public class CategoryChangeEvent {
private final Collection<Long> fileIDs;
private final Category newCategory;
public CategoryChangeEvent(Collection<Long> fileIDs, Category newCategory) {
this.fileIDs = fileIDs;
this.newCategory = newCategory;
}
public Category getNewCategory() {
return newCategory;
}
/**
* @return the fileIDs of the files whose categories have changed
@@ -37,8 +47,4 @@ public class CategoryChangeEvent {
public Collection<Long> getFileIDs() {
return Collections.unmodifiableCollection(fileIDs);
}
public CategoryChangeEvent(Collection<Long> fileIDs) {
this.fileIDs = fileIDs;
}
}

69
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
View File

@@ -24,11 +24,17 @@ import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.LongAdder;
import java.util.logging.Level;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.events.ContentTagAddedEvent;
import org.sleuthkit.autopsy.events.ContentTagDeletedEvent;
import org.sleuthkit.autopsy.imagegallery.DrawableTagsManager;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
import org.sleuthkit.datamodel.ContentTag;
import org.sleuthkit.datamodel.TagName;
import org.sleuthkit.datamodel.TskCoreException;
/**
* Provides a cached view of the number of files per category, and fires
@@ -94,13 +100,13 @@ public class CategoryManager {
this.db = db;
categoryCounts.invalidateAll();
catTagNameMap.invalidateAll();
fireChange(Collections.singleton(-1L));
fireChange(Collections.emptyList(), null);
}
synchronized public void invalidateCaches() {
categoryCounts.invalidateAll();
catTagNameMap.invalidateAll();
fireChange(Collections.singleton(-1L));
fireChange(Collections.emptyList(), null);
}
/**
@@ -173,8 +179,8 @@ public class CategoryManager {
*
* @param fileIDs
*/
public void fireChange(Collection<Long> fileIDs) {
categoryEventBus.post(new CategoryChangeEvent(fileIDs));
public void fireChange(Collection<Long> fileIDs, Category newCategory) {
categoryEventBus.post(new CategoryChangeEvent(fileIDs, newCategory));
}
/**
@@ -204,4 +210,59 @@ public class CategoryManager {
return catTagNameMap.getUnchecked(cat);
}
public static Category fromTagName(TagName tagName) {
return Category.fromDisplayName(tagName.getDisplayName());
}
public static boolean isCategoryTagName(TagName tName) {
return Category.isCategoryName(tName.getDisplayName());
}
public static boolean isNotCategoryTagName(TagName tName) {
return Category.isNotCategoryName(tName.getDisplayName());
}
public void handleTagAdded(ContentTagAddedEvent event) {
ContentTag addedTag = event.getAddedTag();
if (isCategoryTagName(addedTag.getName())) {
final DrawableTagsManager tagsManager = controller.getTagsManager();
try {
//remove old category tag(s) if necessary
List<ContentTag> allContentTags = tagsManager.getContentTagsByContent(addedTag.getContent());
for (ContentTag ct : allContentTags) {
if (ct.getId() != addedTag.getId()
&& CategoryManager.isCategoryTagName(ct.getName())) {
try {
tagsManager.deleteContentTag(ct);
} catch (TskCoreException tskException) {
LOGGER.log(Level.SEVERE, "Failed to delete content tag. Unable to maintain categories in a consistent state.", tskException);
}
}
}
} catch (TskCoreException tskException) {
LOGGER.log(Level.SEVERE, "Failed to get content tags for content. Unable to maintain category in a consistent state.", tskException);
}
Category newCat = CategoryManager.fromTagName(addedTag.getName());
if (newCat != Category.ZERO) {
incrementCategoryCount(newCat);
}
fireChange(Collections.singleton(addedTag.getId()), newCat);
}
}
public void handleTagDeleted(ContentTagDeletedEvent event) {
ContentTag deleted = event.getDeletedTag();
if (isCategoryTagName(deleted.getName())) {
Category deletedCat = CategoryManager.fromTagName(deleted.getName());
if (deletedCat != Category.ZERO) {
decrementCategoryCount(deletedCat);
}
fireChange(Collections.singleton(deleted.getId()), null);
}
}
}

2
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableFile.java
View File

@@ -272,7 +272,7 @@ public abstract class DrawableFile<T extends AbstractFile> extends AbstractFile
private void updateCategory() {
try {
category.set(getSleuthkitCase().getContentTagsByContent(this).stream()
.map(Tag::getName).filter(Category::isCategoryTagName)
.map(Tag::getName).filter(CategoryManager::isCategoryTagName)
.map(TagName::getDisplayName)
.map(Category::fromDisplayName)
.sorted().findFirst() //sort by severity and take the first

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

@@ -60,12 +60,14 @@ import org.sleuthkit.autopsy.coreutils.LoggedTask;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.coreutils.ThreadConfined;
import org.sleuthkit.autopsy.coreutils.ThreadConfined.ThreadType;
import org.sleuthkit.autopsy.events.ContentTagAddedEvent;
import org.sleuthkit.autopsy.events.ContentTagDeletedEvent;
import org.sleuthkit.autopsy.imagegallery.DrawableTagsManager;
import org.sleuthkit.autopsy.imagegallery.FileUpdateEvent;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryModule;
import org.sleuthkit.autopsy.imagegallery.TagsChangeEvent;
import org.sleuthkit.autopsy.imagegallery.datamodel.Category;
import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager;
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableDB;
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableFile;
@@ -161,7 +163,7 @@ public class GroupManager implements FileUpdateEvent.FileUpdateListener {
Set<GroupKey<?>> resultSet = new HashSet<>();
for (Comparable<?> val : groupBy.getValue(file)) {
if (groupBy == DrawableAttribute.TAGS) {
if (Category.isNotCategoryTagName((TagName) val)) {
if (CategoryManager.isNotCategoryTagName((TagName) val)) {
resultSet.add(new GroupKey(groupBy, val));
}
} else {
@@ -282,6 +284,10 @@ public class GroupManager implements FileUpdateEvent.FileUpdateListener {
});
}
}
} else { //group == null
// It may be that this was the last unanalyzed file in the group, so test
// whether the group is now fully analyzed.
popuplateIfAnalyzed(groupKey, null);
}
return group;
@@ -360,7 +366,7 @@ public class GroupManager implements FileUpdateEvent.FileUpdateListener {
break;
case TAGS:
values = (List<A>) controller.getTagsManager().getTagNamesInUse().stream()
.filter(Category::isNotCategoryTagName)
.filter(CategoryManager::isNotCategoryTagName)
.collect(Collectors.toList());
break;
case ANALYZED:
@@ -528,14 +534,31 @@ public class GroupManager implements FileUpdateEvent.FileUpdateListener {
}
@Subscribe
public void handleAutopsyTagChange(TagsChangeEvent evt) {
if (groupBy == DrawableAttribute.TAGS
&& evt.getFileIDs().size() == 1
&& evt.getFileIDs().contains(-1L)) {
regroup(groupBy, sortBy, sortOrder, Boolean.TRUE);
public void handleTagAdded(ContentTagAddedEvent evt) {
final GroupKey<TagName> groupKey = new GroupKey<>(DrawableAttribute.TAGS, evt.getAddedTag().getName());
final long fileID = evt.getAddedTag().getContent().getId();
DrawableGroup g = getGroupForKey(groupKey);
addFileToGroup(g, groupKey, fileID);
}
private void addFileToGroup(DrawableGroup g, final GroupKey<?> groupKey, final long fileID) {
if (g == null) {
//if there wasn't already a group check if there should be one now
popuplateIfAnalyzed(groupKey, null);
} else {
//if there is aleady a group that was previously deemed fully analyzed, then add this newly analyzed file to it.
g.addFile(fileID);
}
}
@Subscribe
public void handleTagDeleted(ContentTagDeletedEvent evt) {
final GroupKey<TagName> groupKey = new GroupKey<>(DrawableAttribute.TAGS, evt.getDeletedTag().getName());
final long fileID = evt.getDeletedTag().getContent().getId();
DrawableGroup g = removeFromGroup(groupKey, fileID);
}
@Override
synchronized public void handleFileRemoved(FileUpdateEvent evt) {
Validate.isTrue(evt.getUpdateType() == FileUpdateEvent.UpdateType.REMOVE);
@@ -545,13 +568,7 @@ public class GroupManager implements FileUpdateEvent.FileUpdateListener {
Set<GroupKey<?>> groupsForFile = getGroupKeysForFileID(fileId);
for (GroupKey<?> gk : groupsForFile) {
DrawableGroup g = removeFromGroup(gk, fileId);
if (g == null) {
// It may be that this was the last unanalyzed file in the group, so test
// whether the group is now fully analyzed.
popuplateIfAnalyzed(gk, null);
}
removeFromGroup(gk, fileId);
}
}
}
@@ -578,29 +595,21 @@ public class GroupManager implements FileUpdateEvent.FileUpdateListener {
//get grouping(s) this file would be in
Set<GroupKey<?>> groupsForFile = getGroupKeysForFileID(fileId);
for (GroupKey<?> gk : groupsForFile) {
DrawableGroup g = getGroupForKey(gk);
if (g == null) {
//if there wasn't already a group check if there should be one now
popuplateIfAnalyzed(gk, null);
} else {
//if there is aleady a group that was previously deemed fully analyzed, then add this newly analyzed file to it.
g.addFile(fileId);
}
addFileToGroup(g, gk, fileId);
}
}
//we fire this event for all files so that the category counts get updated during initial db population
controller.getCategoryManager().fireChange(fileIDs);
controller.getCategoryManager().fireChange(fileIDs, null);
// if (evt.getChangedAttribute() == DrawableAttribute.TAGS) {
// controller.getTagsManager().fireChange(fileIDs);
// }
}
private void popuplateIfAnalyzed(GroupKey<?> groupKey, ReGroupTask<?> task) {
private DrawableGroup popuplateIfAnalyzed(GroupKey<?> groupKey, ReGroupTask<?> task) {
if (Objects.nonNull(task) && (task.isCancelled())) {
/* if this method call is part of a ReGroupTask and that task is
@@ -609,6 +618,7 @@ public class GroupManager implements FileUpdateEvent.FileUpdateListener {
* this allows us to stop if a regroup task has been cancelled (e.g.
* the user picked a different group by attribute, while the
* current task was still running) */
} else { // no task or un-cancelled task
if ((groupKey.getAttribute() != DrawableAttribute.PATH) || db.isGroupAnalyzed(groupKey)) {
/* for attributes other than path we can't be sure a group is
@@ -639,12 +649,14 @@ public class GroupManager implements FileUpdateEvent.FileUpdateListener {
}
markGroupSeen(group, groupSeen);
});
return group;
}
} catch (TskCoreException ex) {
LOGGER.log(Level.SEVERE, "failed to get files for group: " + groupKey.getAttribute().attrName.toString() + " = " + groupKey.getValue(), ex);
}
}
}
return null;
}
/**

8
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/DrawableView.java
View File

@@ -12,8 +12,9 @@ import javafx.scene.layout.Region;
import javafx.scene.paint.Color;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.coreutils.ThreadConfined;
import org.sleuthkit.autopsy.events.ContentTagAddedEvent;
import org.sleuthkit.autopsy.events.ContentTagDeletedEvent;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
import org.sleuthkit.autopsy.imagegallery.TagsChangeEvent;
import org.sleuthkit.autopsy.imagegallery.datamodel.Category;
import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryChangeEvent;
import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager;
@@ -68,7 +69,10 @@ public interface DrawableView {
void handleCategoryChanged(CategoryChangeEvent evt);
@Subscribe
void handleTagsChanged(TagsChangeEvent evt);
void handleTagAdded(ContentTagAddedEvent evt);
@Subscribe
void handleTagDeleted(ContentTagDeletedEvent evt);
ImageGalleryController getController();

18
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/DrawableViewBase.java
View File

@@ -61,10 +61,11 @@ import org.sleuthkit.autopsy.datamodel.FileNode;
import org.sleuthkit.autopsy.directorytree.ExternalViewerAction;
import org.sleuthkit.autopsy.directorytree.ExtractAction;
import org.sleuthkit.autopsy.directorytree.NewWindowViewAction;
import org.sleuthkit.autopsy.events.ContentTagAddedEvent;
import org.sleuthkit.autopsy.events.ContentTagDeletedEvent;
import org.sleuthkit.autopsy.imagegallery.FileIDSelectionModel;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryTopComponent;
import org.sleuthkit.autopsy.imagegallery.TagsChangeEvent;
import org.sleuthkit.autopsy.imagegallery.actions.AddDrawableTagAction;
import org.sleuthkit.autopsy.imagegallery.actions.CategorizeAction;
import org.sleuthkit.autopsy.imagegallery.actions.DeleteFollowUpTagAction;
@@ -378,16 +379,21 @@ public abstract class DrawableViewBase extends AnchorPane implements DrawableVie
@Subscribe
@Override
synchronized public void handleTagsChanged(TagsChangeEvent evnt) {
if (fileID != null && (evnt.getFileIDs().contains(fileID) || evnt.getFileIDs().contains(-1L))) {
updateFollowUpIcon();
}
public void handleTagAdded(ContentTagAddedEvent evt) {
updateFollowUpIcon();
}
@Subscribe
@Override
public void handleTagDeleted(ContentTagDeletedEvent evt) {
updateFollowUpIcon();
}
@Subscribe
@Override
synchronized public void handleCategoryChanged(CategoryChangeEvent evt) {
if (evt.getFileIDs().contains(getFileID()) || evt.getFileIDs().contains(-1L)) {
if (fileID != null && evt.getFileIDs().contains(getFileID())) {
updateCategoryBorder();
}
}

18
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/MetaDataPane.java
View File

@@ -44,8 +44,9 @@ import javafx.scene.text.Text;
import javafx.util.Pair;
import org.apache.commons.lang3.StringUtils;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.events.ContentTagAddedEvent;
import org.sleuthkit.autopsy.events.ContentTagDeletedEvent;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
import org.sleuthkit.autopsy.imagegallery.TagsChangeEvent;
import org.sleuthkit.autopsy.imagegallery.datamodel.Category;
import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryChangeEvent;
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
@@ -225,16 +226,23 @@ public class MetaDataPane extends AnchorPane implements DrawableView {
@Subscribe
@Override
public void handleCategoryChanged(CategoryChangeEvent evt) {
if (getFile() != null && (evt.getFileIDs().contains(-1L) || evt.getFileIDs().contains(getFileID()))) {
if (getFile() != null && evt.getFileIDs().contains(getFileID())) {
updateUI();
}
}
@Override
@Subscribe
public void handleTagsChanged(TagsChangeEvent evt) {
if (getFile() != null && (evt.getFileIDs().contains(-1L) || evt.getFileIDs().contains(getFileID()))) {
public void handleTagAdded(ContentTagAddedEvent evt) {
if (getFile() != null && evt.getAddedTag().getContent().getId() == getFileID()) {
updateUI();
}
}
@Override
public void handleTagDeleted(ContentTagDeletedEvent evt) {
if (getFile() != null && evt.getDeletedTag().getContent().getId() == getFileID()) {
updateUI();
}
}
}