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

Made final status message more detailed

Browse Source
This commit is contained in:
Brian Carrier 2013-08-23 10:08:17 -04:00
parent c1719f6928
commit 91dded9b8b
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
API-CHANGES.txt
View File

@ -2,4 +2,5 @@ Changes to make to API when we are ready to make backward incompatible changes:
- HTMLReport has special API for more context on columns and special handling in REportGenerator. Change all reports to the new API. - HTMLReport has special API for more context on columns and special handling in REportGenerator. Change all reports to the new API.
- DataContentViewer.isPreferred does not need isSupported to be passed in - DataContentViewer.isPreferred does not need isSupported to be passed in
- DataContentViewerHex and STrings can have the public setDataView methods removed in favor of the new private ones - DataContentViewerHex and STrings can have the public setDataView methods removed in favor of the new private ones
Content.getUniquePath() shoudl not thrown TskException. We should deal with it in the method.

53
Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
View File

@ -687,7 +687,7 @@ public class IngestManager {
private Date startTime; private Date startTime;
private Date endTime; private Date endTime;
private int errorsTotal; private int errorsTotal;
private Map<IngestModuleAbstract, Integer> errors; private Map<String, Integer> errors;
private final DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private final DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
private final StopWatch timer = new StopWatch(); private final StopWatch timer = new StopWatch();
private IngestModuleAbstract currentModuleForTimer; private IngestModuleAbstract currentModuleForTimer;
@ -695,7 +695,7 @@ public class IngestManager {
private final Map<String, Long> fileModuleTimers = new HashMap<String, Long>(); private final Map<String, Long> fileModuleTimers = new HashMap<String, Long>();
IngestManagerStats() { IngestManagerStats() {
errors = new HashMap<IngestModuleAbstract, Integer>(); errors = new HashMap<String, Integer>();
} }
/** /**
@ -754,17 +754,8 @@ public class IngestManager {
sb.append("Total errors: ").append(errorsTotal).append(EOL); sb.append("Total errors: ").append(errorsTotal).append(EOL);
if (errorsTotal > 0) { if (errorsTotal > 0) {
sb.append("Errors per module:"); sb.append("Errors per module:");
for (IngestModuleAbstract module : errors.keySet()) { for (String moduleName : errors.keySet()) {
final int errorsModule = errors.get(module); sb.append("\t").append(moduleName).append(": ").append(errors.get(moduleName)).append(EOL);
String moduleName;
if (module != null) {
moduleName = module.getName();
} else {
//manager message
moduleName = "System";
}
sb.append("\t").append(moduleName).append(": ").append(errorsModule).append(EOL);
} }
} }
return sb.toString(); return sb.toString();
@ -775,6 +766,19 @@ public class IngestManager {
sb.append("<html><body>"); sb.append("<html><body>");
sb.append("Ingest time: ").append(getTotalTimeString()).append("<br />"); sb.append("Ingest time: ").append(getTotalTimeString()).append("<br />");
sb.append("Total errors: ").append(errorsTotal).append("<br />"); sb.append("Total errors: ").append(errorsTotal).append("<br />");
sb.append("<table><tr><th>Module</th><th>Time</th><th>Errors</th></tr>\n");
for (final String moduleName : fileModuleTimers.keySet()) {
sb.append("<tr><td>").append(moduleName).append("</td><td>");
sb.append(msToString(fileModuleTimers.get(moduleName))).append("</td><td>");
if (errors.get(moduleName) == null) {
sb.append("0");
} else {
sb.append(errors.get(moduleName));
}
sb.append("</td></tr>\n");
}
sb.append("</table>");
sb.append("</body></html>"); sb.append("</body></html>");
return sb.toString(); return sb.toString();
} }
@ -806,8 +810,12 @@ public class IngestManager {
return dateFormatter.format(endTime); return dateFormatter.format(endTime);
} }
String getTotalTimeString() { /**
long ms = getTotalTime(); * convert time in miliseconds to printable string in XX:YY:ZZ format.
* @param ms
* @return
*/
private String msToString(long ms) {
long hours = TimeUnit.MILLISECONDS.toHours(ms); long hours = TimeUnit.MILLISECONDS.toHours(ms);
ms -= TimeUnit.HOURS.toMillis(hours); ms -= TimeUnit.HOURS.toMillis(hours);
long minutes = TimeUnit.MILLISECONDS.toMinutes(ms); long minutes = TimeUnit.MILLISECONDS.toMinutes(ms);
@ -817,14 +825,20 @@ public class IngestManager {
sb.append(hours < 10 ? "0" : "").append(hours).append(':').append(minutes < 10 ? "0" : "").append(minutes).append(':').append(seconds < 10 ? "0" : "").append(seconds); sb.append(hours < 10 ? "0" : "").append(hours).append(':').append(minutes < 10 ? "0" : "").append(minutes).append(':').append(seconds < 10 ? "0" : "").append(seconds);
return sb.toString(); return sb.toString();
} }
String getTotalTimeString() {
long ms = getTotalTime();
return msToString(ms);
}
synchronized void addError(IngestModuleAbstract source) { synchronized void addError(IngestModuleAbstract source) {
++errorsTotal; ++errorsTotal;
Integer curModuleErrorI = errors.get(source); String moduleName = source.getName();
Integer curModuleErrorI = errors.get(moduleName);
if (curModuleErrorI == null) { if (curModuleErrorI == null) {
errors.put(source, 1); errors.put(moduleName, 1);
} else { } else {
errors.put(source, curModuleErrorI + 1); errors.put(moduleName, curModuleErrorI + 1);
} }
} }
} }
@ -890,13 +904,14 @@ public class IngestManager {
} }
//logger.log(Level.INFO, "IngestManager: Processing: {0}", fileToProcess.getName()); //logger.log(Level.INFO, "IngestManager: Processing: {0}", fileToProcess.getName());
progress.progress(fileToProcess.getName(), processedFiles);
for (IngestModuleAbstractFile module : fileIngestTask.getModules()) { for (IngestModuleAbstractFile module : fileIngestTask.getModules()) {
//process the file with every file module //process the file with every file module
if (isCancelled()) { if (isCancelled()) {
logger.log(Level.INFO, "Terminating file ingest due to cancellation."); logger.log(Level.INFO, "Terminating file ingest due to cancellation.");
return null; return null;
} }
progress.progress(fileToProcess.getName() + " (" + module.getName() + ")", processedFiles);
try { try {
stats.logFileModuleStartProcess(module); stats.logFileModuleStartProcess(module);