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

merge cleanup

Browse Source 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaDataBuilder.java
This commit is contained in:
Andrew Ziehl 2018-04-17 17:00:18 -07:00 committed by Brian Sweeney
parent a3038ac395
commit 4f89d62ef3
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/commonfilesearch/AllDataSources.java
View File

@ -32,14 +32,14 @@ final class AllDataSources extends CommonFilesMetaDataBuilder {
* Implements the algorithm for getting common files across all data sources.
* @param dataSourceIdMap a map of obj_id to datasource name
*/
public AllDataSources(Map<Long, String> dataSourceIdMap, boolean filterByMediaMimeType, boolean filterByDocMimeType) {
AllDataSources(Map<Long, String> dataSourceIdMap, boolean filterByMediaMimeType, boolean filterByDocMimeType) {
super(dataSourceIdMap, filterByMediaMimeType, filterByDocMimeType);
}
@Override
protected String buildSqlSelectStatement() {
Object[] args = new String[] {CommonFilesMetaDataBuilder.SELECT_PREFIX, determineMimeTypeFilter()};
Object[] args = new String[] {SELECT_PREFIX, determineMimeTypeFilter()};
return String.format(WHERE_CLAUSE, args);
}
}

11
Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaDataBuilder.java
View File

@ -22,8 +22,8 @@ package org.sleuthkit.autopsy.commonfilesearch;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -115,7 +115,7 @@ abstract class CommonFilesMetaDataBuilder {
* <li>If you do not use this string, you must use at least the columns selected below, in that order.</li>
* </ul>
*/
protected static String SELECT_PREFIX = "SELECT obj_id, md5, data_source_obj_id from tsk_files where";
static final String SELECT_PREFIX = "SELECT obj_id, md5, data_source_obj_id from tsk_files where";
/**
* Should build a SQL SELECT statement to be passed to
@ -168,7 +168,7 @@ abstract class CommonFilesMetaDataBuilder {
}
String determineMimeTypeFilter() {
StringBuilder mimeTypeFilter = new StringBuilder();
Set<String> mimeTypesToFilterOn = new HashSet<>();
String mimeTypeString = "";
if(filterByMedia) {
@ -177,12 +177,15 @@ abstract class CommonFilesMetaDataBuilder {
if(filterByDoc) {
mimeTypesToFilterOn.addAll(TEXT_FILES_MIME_TYPES);
}
StringBuilder mimeTypeFilter = new StringBuilder(mimeTypesToFilterOn.size());
if(mimeTypesToFilterOn.size() > 0) {
for (String mimeType : mimeTypesToFilterOn) {
mimeTypeFilter.append("\"" + mimeType + "\",");
mimeTypeFilter.append("\"").append(mimeType).append("\",");
}
mimeTypeString = mimeTypeFilter.toString().substring(0, mimeTypeFilter.length() - 1);
}
return String.format(filterByMimeTypesWhereClause, new Object[]{mimeTypeString});
}
}

6
Core/src/org/sleuthkit/autopsy/commonfilesearch/SingleDataSource.java
View File

@ -19,9 +19,7 @@
*/
package org.sleuthkit.autopsy.commonfilesearch;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
/**
* Provides logic for selecting common files from a single data source.
@ -37,14 +35,14 @@ final class SingleDataSource extends CommonFilesMetaDataBuilder {
* @param dataSourceId data source id for which common files must appear at least once
* @param dataSourceIdMap map of obj_id to data source name
*/
public SingleDataSource(Long dataSourceId, Map<Long, String> dataSourceIdMap, boolean filterByMediaMimeType, boolean filterByDocMimeType) {
SingleDataSource(Long dataSourceId, Map<Long, String> dataSourceIdMap, boolean filterByMediaMimeType, boolean filterByDocMimeType) {
super(dataSourceIdMap, filterByMediaMimeType, filterByDocMimeType);
this.selectedDataSourceId = dataSourceId;
}
@Override
protected String buildSqlSelectStatement() {
Object[] args = new String[]{CommonFilesMetaDataBuilder.SELECT_PREFIX, Long.toString(this.selectedDataSourceId), determineMimeTypeFilter()};
Object[] args = new String[]{SELECT_PREFIX, Long.toString(this.selectedDataSourceId), determineMimeTypeFilter()};
return String.format(SingleDataSource.WHERE_CLAUSE, args);
}
}