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

Better handle default reporting branding

Browse Source
This commit is contained in:
adam-m 2013-06-27 17:58:22 -04:00
parent f563eb2e38
commit c4090f7ecd
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Core/src/org/sleuthkit/autopsy/report/ReportBranding.java
View File

@ -79,26 +79,21 @@ public final class ReportBranding implements ReportBrandingProviderI {
@Override @Override
public String getGeneratorLogoPath() { public String getGeneratorLogoPath() {
String curPath = null; String curPath = null;
// try { try {
// curPath = ModuleSettings.getConfigSetting(MODULE_NAME, GENERATOR_LOGO_PATH_PROP); curPath = ModuleSettings.getConfigSetting(MODULE_NAME, GENERATOR_LOGO_PATH_PROP);
// if (curPath == null || curPath.isEmpty() || new File(curPath).canRead() == false) { if (curPath == null || (!curPath.isEmpty() && !new File(curPath).canRead() ) ) {
// //use default //use default
// logger.log(Level.INFO, "Using default report branding for generator logo"); logger.log(Level.INFO, "Using default report branding for generator logo");
// curPath = reportsBrandingDir + File.separator + "logo.png"; curPath = reportsBrandingDir + File.separator + "logo.png";
// InputStream in = getClass().getResourceAsStream(DEFAULT_GENERATOR_LOGO); InputStream in = getClass().getResourceAsStream(DEFAULT_GENERATOR_LOGO);
// OutputStream output = new FileOutputStream(new File(curPath)); OutputStream output = new FileOutputStream(new File(curPath));
// FileUtil.copy(in, output); FileUtil.copy(in, output);
// ModuleSettings.setConfigSetting(MODULE_NAME, GENERATOR_LOGO_PATH_PROP, curPath); ModuleSettings.setConfigSetting(MODULE_NAME, GENERATOR_LOGO_PATH_PROP, curPath);
// } }
// } catch (IOException e) { } catch (IOException e) {
// logger.log(Level.SEVERE, "Error extracting report branding resources for generator logo", e); logger.log(Level.SEVERE, "Error extracting report branding resources for generator logo", e);
// }
curPath = ModuleSettings.getConfigSetting(MODULE_NAME, GENERATOR_LOGO_PATH_PROP);
if (curPath != null && new File(curPath).canRead() == false) {
//use default
logger.log(Level.INFO, "Custom report branding for generator logo is not valid: " + curPath);
curPath = null;
} }
return curPath; return curPath;
} }

4
Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java
View File

@ -35,7 +35,7 @@ public interface ReportBrandingProviderI {
/** /**
* Sets custom generator logo path * Sets custom generator logo path
* *
* @param path path to set * @param path path to set, use empty string to disable
*/ */
public void setGeneratorLogoPath(String path); public void setGeneratorLogoPath(String path);
@ -51,7 +51,7 @@ public interface ReportBrandingProviderI {
/** /**
* Sets custom agency logo path * Sets custom agency logo path
* *
* @param path path to set * @param path path to set, use empty string to disable
*/ */
public void setAgencyLogoPath(String path); public void setAgencyLogoPath(String path);

8
Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
View File

@ -459,14 +459,14 @@ public class ReportHTML implements TableReportModule {
//pull generator and agency logo from branding, and the remaining resources from the core jar //pull generator and agency logo from branding, and the remaining resources from the core jar
String generatorLogoPath = reportBranding.getGeneratorLogoPath(); String generatorLogoPath = reportBranding.getGeneratorLogoPath();
if (generatorLogoPath != null) { if (generatorLogoPath != null && ! generatorLogoPath.isEmpty()) {
File from = new File(generatorLogoPath); File from = new File(generatorLogoPath);
File to = new File(path); File to = new File(path);
FileUtil.copyFile(FileUtil.toFileObject(from), FileUtil.toFileObject(to), "generator_logo"); FileUtil.copyFile(FileUtil.toFileObject(from), FileUtil.toFileObject(to), "generator_logo");
} }
String agencyLogoPath = reportBranding.getAgencyLogoPath(); String agencyLogoPath = reportBranding.getAgencyLogoPath();
if (agencyLogoPath != null) { if (agencyLogoPath != null && ! agencyLogoPath.isEmpty() ) {
File from = new File(agencyLogoPath); File from = new File(agencyLogoPath);
File to = new File(path); File to = new File(path);
FileUtil.copyFile(FileUtil.toFileObject(from), FileUtil.toFileObject(to), "agency_logo"); FileUtil.copyFile(FileUtil.toFileObject(from), FileUtil.toFileObject(to), "agency_logo");
@ -624,8 +624,8 @@ public class ReportHTML implements TableReportModule {
final String reportTitle = reportBranding.getReportTitle(); final String reportTitle = reportBranding.getReportTitle();
final String reportFooter = reportBranding.getReportFooter(); final String reportFooter = reportBranding.getReportFooter();
final boolean agencyLogoSet = reportBranding.getAgencyLogoPath() != null; final boolean agencyLogoSet = reportBranding.getAgencyLogoPath() != null && !reportBranding.getAgencyLogoPath().isEmpty();
final boolean generatorLogoSet = reportBranding.getGeneratorLogoPath() != null; final boolean generatorLogoSet = reportBranding.getGeneratorLogoPath() != null && !reportBranding.getGeneratorLogoPath().isEmpty();
summary.append("<div id=\"wrapper\">\n"); summary.append("<div id=\"wrapper\">\n");
summary.append("<h1>").append(reportTitle).append(running ? "<span>Warning, this report was run before ingest services completed!</span>" : "").append("</h1>\n"); summary.append("<h1>").append(reportTitle).append(running ? "<span>Warning, this report was run before ingest services completed!</span>" : "").append("</h1>\n");