mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-18 10:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5370-AddFileSearchCaching' of https://github.com/wschaeferB/autopsy into 5369-DedupingCodeChanges

Browse Source
This commit is contained in:
William Schaefer 2019-08-13 16:06:03 -04:00
commit e1fb17040c
5 changed files with 111 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/filequery/Bundle.properties-MERGED
View File

@ -158,7 +158,7 @@ ResultsPanel.currentPage.displayValue=Page: {0} of {1}
ResultsPanel.currentPageLabel.text=Page: - ResultsPanel.currentPageLabel.text=Page: -
# {0} - selectedPage # {0} - selectedPage
# {1} - maxPage # {1} - maxPage
ResultsPanel.invalidPageNumber.message=The selected page number {0} does not exist. Please select a value of at least 1 and at most {1} ResultsPanel.invalidPageNumber.message=The selected page number {0} does not exist. Please select a value from 1 to {1}.
ResultsPanel.invalidPageNumber.title=Invalid Page Number ResultsPanel.invalidPageNumber.title=Invalid Page Number
ResultsPanel.pageControlsLabel.text=Pages: ResultsPanel.pageControlsLabel.text=Pages:
ResultsPanel.gotoPageLabel.text=Go to Page: ResultsPanel.gotoPageLabel.text=Go to Page:

7
Core/src/org/sleuthkit/autopsy/filequery/DiscoveryEvents.java
View File

@ -201,6 +201,13 @@ final class DiscoveryEvents {
} }
} }
static final class NoResultsEvent {
NoResultsEvent(){
//no arg conustructor
}
}
/** /**
* Event to signal that a group has been selected. * Event to signal that a group has been selected.
*/ */

41
Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java
View File

@ -43,8 +43,7 @@ class FileSearchData {
"FileSearchData.Frequency.count_50.displayName=21 - 50", "FileSearchData.Frequency.count_50.displayName=21 - 50",
"FileSearchData.Frequency.count_100.displayName=51 - 100", "FileSearchData.Frequency.count_100.displayName=51 - 100",
"FileSearchData.Frequency.common.displayName=Common", "FileSearchData.Frequency.common.displayName=Common",
"FileSearchData.Frequency.unknown.displayName=Unknown", "FileSearchData.Frequency.unknown.displayName=Unknown",})
})
enum Frequency { enum Frequency {
UNIQUE(0, 1, Bundle.FileSearchData_Frequency_unique_displayName()), UNIQUE(0, 1, Bundle.FileSearchData_Frequency_unique_displayName()),
RARE(1, 5, Bundle.FileSearchData_Frequency_rare_displayName()), RARE(1, 5, Bundle.FileSearchData_Frequency_rare_displayName()),
@ -122,15 +121,14 @@ class FileSearchData {
"FileSearchData.FileSize.OVER_50MB.displayName=50 - 200 MB", "FileSearchData.FileSize.OVER_50MB.displayName=50 - 200 MB",
"FileSearchData.FileSize.OVER_1MB.displayName=1 - 50 MB", "FileSearchData.FileSize.OVER_1MB.displayName=1 - 50 MB",
"FileSearchData.FileSize.OVER_100KB.displayName=100 KB - 1 MB", "FileSearchData.FileSize.OVER_100KB.displayName=100 KB - 1 MB",
"FileSearchData.FileSize.UNDER_100KB.displayName=Under 100 KB", "FileSearchData.FileSize.UNDER_100KB.displayName=Under 100 KB",})
})
enum FileSize { enum FileSize {
OVER_1GB(0, 1000 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_OVER_1GB_displayName()), OVER_1GB(0, 1000 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_OVER_1GB_displayName()),
OVER_200MB(1, 200 * BYTES_PER_MB, 1000, Bundle.FileSearchData_FileSize_OVER_200MB_displayName()), OVER_200MB(1, 200 * BYTES_PER_MB, 1000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_OVER_200MB_displayName()),
OVER_50MB(2, 50 * BYTES_PER_MB, 200, Bundle.FileSearchData_FileSize_OVER_50MB_displayName()), OVER_50MB(2, 50 * BYTES_PER_MB, 200 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_OVER_50MB_displayName()),
OVER_1MB(3, 1 * BYTES_PER_MB, 50, Bundle.FileSearchData_FileSize_OVER_1MB_displayName()), OVER_1MB(3, 1 * BYTES_PER_MB, 50 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_OVER_1MB_displayName()),
OVER_100KB(4, 1000, 1 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_OVER_100KB_displayName()), OVER_100KB(4, 100000, 1 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_OVER_100KB_displayName()),
UNDER_100KB(5, 0, 1000, Bundle.FileSearchData_FileSize_UNDER_100KB_displayName()); UNDER_100KB(5, 0, 100000, Bundle.FileSearchData_FileSize_UNDER_100KB_displayName());
private final int ranking; // Must be unique for each value private final int ranking; // Must be unique for each value
private final long minBytes; // Note that the size must be strictly greater than this to match private final long minBytes; // Note that the size must be strictly greater than this to match
@ -138,11 +136,11 @@ class FileSearchData {
private final String displayName; private final String displayName;
final static long NO_MAXIMUM = -1; final static long NO_MAXIMUM = -1;
FileSize(int ranking, long minMB, long maxMB, String displayName) { FileSize(int ranking, long minB, long maxB, String displayName) {
this.ranking = ranking; this.ranking = ranking;
this.minBytes = minMB; this.minBytes = minB;
if (maxMB >= 0) { if (maxB >= 0) {
this.maxBytes = maxMB; this.maxBytes = maxB;
} else { } else {
this.maxBytes = NO_MAXIMUM; this.maxBytes = NO_MAXIMUM;
} }
@ -150,8 +148,8 @@ class FileSearchData {
} }
/** /**
* Get the enum corresponding to the given file size. * Get the enum corresponding to the given file size. The file size must
* The file size must be strictly greater than minBytes. * be strictly greater than minBytes.
* *
* @param size the file size * @param size the file size
* *
@ -207,10 +205,10 @@ class FileSearchData {
} }
/** /**
* Enum representing the file type. * Enum representing the file type. We don't simply use
* We don't simply use FileTypeUtils.FileTypeCategory because: * FileTypeUtils.FileTypeCategory because: - Some file types categories
* - Some file types categories overlap * overlap - It is convenient to have the "OTHER" option for files that
* - It is convenient to have the "OTHER" option for files that don't match the given types * don't match the given types
*/ */
@NbBundle.Messages({ @NbBundle.Messages({
"FileSearchData.FileType.Audio.displayName=Audio", "FileSearchData.FileType.Audio.displayName=Audio",
@ -232,7 +230,7 @@ class FileSearchData {
private final String displayName; private final String displayName;
private final Collection<String> mediaTypes; private final Collection<String> mediaTypes;
private FileType (int value, String displayName, Collection<String> mediaTypes) { private FileType(int value, String displayName, Collection<String> mediaTypes) {
this.ranking = value; this.ranking = value;
this.displayName = displayName; this.displayName = displayName;
this.mediaTypes = mediaTypes; this.mediaTypes = mediaTypes;
@ -293,8 +291,7 @@ class FileSearchData {
@NbBundle.Messages({ @NbBundle.Messages({
"FileSearchData.Score.notable.displayName=Notable", "FileSearchData.Score.notable.displayName=Notable",
"FileSearchData.Score.interesting.displayName=Interesting", "FileSearchData.Score.interesting.displayName=Interesting",
"FileSearchData.Score.unknown.displayName=Unknown", "FileSearchData.Score.unknown.displayName=Unknown",})
})
enum Score { enum Score {
NOTABLE(0, Bundle.FileSearchData_Score_notable_displayName()), NOTABLE(0, Bundle.FileSearchData_Score_notable_displayName()),
INTERESTING(1, Bundle.FileSearchData_Score_interesting_displayName()), INTERESTING(1, Bundle.FileSearchData_Score_interesting_displayName()),

6
Core/src/org/sleuthkit/autopsy/filequery/GroupListPanel.java
View File

@ -121,15 +121,19 @@ class GroupListPanel extends javax.swing.JPanel {
*/ */
private void groupSelected(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_groupSelected private void groupSelected(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_groupSelected
if (!evt.getValueIsAdjusting()) { if (!evt.getValueIsAdjusting()) {
if (groupDisplayNameList.getSelectedValue() != null) {
String selectedGroup = groupDisplayNameList.getSelectedValue().replaceAll(" \\([0-9]+\\)$", ""); String selectedGroup = groupDisplayNameList.getSelectedValue().replaceAll(" \\([0-9]+\\)$", "");
for (String groupName : groupMap.keySet()) { for (String groupName : groupMap.keySet()) {
if (selectedGroup.equalsIgnoreCase(groupName)) { if (selectedGroup.equalsIgnoreCase(groupName)) {
selectedGroupName = groupName; selectedGroupName = groupName;
DiscoveryEvents.getDiscoveryEventBus().post(new DiscoveryEvents.GroupSelectedEvent( DiscoveryEvents.getDiscoveryEventBus().post(new DiscoveryEvents.GroupSelectedEvent(
searchfilters, groupingAttribute, groupSort, fileSortMethod, selectedGroupName, groupMap.get(selectedGroupName), resultType)); searchfilters, groupingAttribute, groupSort, fileSortMethod, selectedGroupName, groupMap.get(selectedGroupName), resultType));
break;
} }
} }
} else {
DiscoveryEvents.getDiscoveryEventBus().post(new DiscoveryEvents.NoResultsEvent());
}
} }
}//GEN-LAST:event_groupSelected }//GEN-LAST:event_groupSelected

19
Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java
View File

@ -77,6 +77,7 @@ public class ResultsPanel extends javax.swing.JPanel {
currentPage = pageRetrievedEvent.getPageNumber(); currentPage = pageRetrievedEvent.getPageNumber();
updateControls(); updateControls();
thumbnailViewer.resetComponent(); thumbnailViewer.resetComponent();
tableViewer.resetComponent();
resultsViewerPanel.remove(thumbnailViewer); resultsViewerPanel.remove(thumbnailViewer);
resultsViewerPanel.remove(tableViewer); resultsViewerPanel.remove(tableViewer);
if (pageRetrievedEvent.getType() == FileSearchData.FileType.IMAGE || pageRetrievedEvent.getType() == FileSearchData.FileType.VIDEO) { if (pageRetrievedEvent.getType() == FileSearchData.FileType.IMAGE || pageRetrievedEvent.getType() == FileSearchData.FileType.VIDEO) {
@ -104,7 +105,7 @@ public class ResultsPanel extends javax.swing.JPanel {
* @param groupSelectedEvent The GroupSelectedEvent received. * @param groupSelectedEvent The GroupSelectedEvent received.
*/ */
@Subscribe @Subscribe
void handlePageChangedEvent(DiscoveryEvents.GroupSelectedEvent groupSelectedEvent) { void handleGroupSelectedEvent(DiscoveryEvents.GroupSelectedEvent groupSelectedEvent) {
SwingUtilities.invokeLater(() -> { SwingUtilities.invokeLater(() -> {
searchFilters = groupSelectedEvent.getFilters(); searchFilters = groupSelectedEvent.getFilters();
groupingAttribute = groupSelectedEvent.getGroupingAttr(); groupingAttribute = groupSelectedEvent.getGroupingAttr();
@ -117,6 +118,20 @@ public class ResultsPanel extends javax.swing.JPanel {
}); });
} }
@Subscribe
void handleNoResultsEvent(DiscoveryEvents.NoResultsEvent noResultsEven) {
SwingUtilities.invokeLater(() -> {
groupSize = 0;
currentPage = 0;
updateControls();
thumbnailViewer.resetComponent();
thumbnailViewer.setNode(new TableFilterNode(new DataResultFilterNode(Node.EMPTY), true));
tableViewer.setNode(new TableFilterNode(new DataResultFilterNode(Node.EMPTY), true));
resultsViewerPanel.revalidate();
resultsViewerPanel.repaint();
});
}
/** /**
* Set the page number and retrieve its contents. * Set the page number and retrieve its contents.
* *
@ -332,7 +347,7 @@ public class ResultsPanel extends javax.swing.JPanel {
*/ */
@Messages({"# {0} - selectedPage", @Messages({"# {0} - selectedPage",
"# {1} - maxPage", "# {1} - maxPage",
"ResultsPanel.invalidPageNumber.message=The selected page number {0} does not exist. Please select a value of at least 1 and at most {1}", "ResultsPanel.invalidPageNumber.message=The selected page number {0} does not exist. Please select a value from 1 to {1}.",
"ResultsPanel.invalidPageNumber.title=Invalid Page Number"}) "ResultsPanel.invalidPageNumber.title=Invalid Page Number"})
private void gotoPageFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_gotoPageFieldActionPerformed private void gotoPageFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_gotoPageFieldActionPerformed
int newPage; int newPage;