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

Some AID 2,0 modifications

Browse Source
This commit is contained in:
Richard Cordovano 2017-09-06 20:37:06 -04:00
parent a1fe4cb351
commit d0f7ce26bf
4 changed files with 249 additions and 760 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestDashboard.java
View File

@ -1,7 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2015-2017 Basis Technology Corp. * Copyright 2011-2017 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org * Contact: carrier <at> sleuthkit <dot> org
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -166,7 +166,7 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
* controlling automated ingest for a single node within the cluster. * controlling automated ingest for a single node within the cluster.
*/ */
private AutoIngestDashboard() { private AutoIngestDashboard() {
autoIngestMonitor = AutoIngestMonitor.getInstance(); autoIngestMonitor = AutoIngestMonitor.createMonitor();
pendingTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) { pendingTableModel = new DefaultTableModel(JobsTableModelColumns.headers, 0) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -524,7 +524,7 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
try { try {
autoIngestMonitor.startUp(); autoIngestMonitor.startUp();
autoIngestStarted = true; autoIngestStarted = true;
} catch (AutoIngestMonitor.AutoIngestMonitorStartupException ex) { } catch (AutoIngestMonitor.AutoIngestMonitorException ex) {
SYS_LOGGER.log(Level.SEVERE, "Dashboard error starting up auto ingest", ex); SYS_LOGGER.log(Level.SEVERE, "Dashboard error starting up auto ingest", ex);
tbStatusMessage.setText(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.AutoIngestStartupError")); tbStatusMessage.setText(NbBundle.getMessage(AutoIngestControlPanel.class, "AutoIngestDashboard.AutoIngestStartupError"));
autoIngestMonitor = null; autoIngestMonitor = null;
@ -557,7 +557,7 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
*/ */
updateExecutor = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat(UPDATE_TASKS_THREAD_NAME).build()); updateExecutor = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat(UPDATE_TASKS_THREAD_NAME).build());
updateExecutor.submit(new UpdateAllJobsTablesTask()); updateExecutor.submit(new UpdateAllJobsTablesTask());
autoIngestMonitor.scanInputDirsNow(); autoIngestMonitor.queryCoordinationService();
//bnPause.setEnabled(true); //bnPause.setEnabled(true);
bnPause.setText(org.openide.util.NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.bnPause.text")); bnPause.setText(org.openide.util.NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.bnPause.text"));
@ -657,27 +657,6 @@ public final class AutoIngestDashboard extends JPanel implements Observer {
case CASE_DELETED: case CASE_DELETED:
updateExecutor.submit(new UpdateAllJobsTablesTask()); updateExecutor.submit(new UpdateAllJobsTablesTask());
break; break;
case PAUSED_BY_REQUEST:
EventQueue.invokeLater(() -> {
tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.bnPause.paused"));
bnRefresh.setEnabled(false);
isPaused = true;
});
break;
case PAUSED_FOR_SYSTEM_ERROR:
EventQueue.invokeLater(() -> {
tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.PauseDueToSystemError"));
bnRefresh.setEnabled(false);
pause(false);
isPaused = true;
setServicesStatusMessage();
});
break;
case RESUMED:
EventQueue.invokeLater(() -> {
tbStatusMessage.setText(org.openide.util.NbBundle.getMessage(AutoIngestDashboard.class, "AutoIngestDashboard.bnPause.running"));
});
break;
case CASE_PRIORITIZED: case CASE_PRIORITIZED:
updateExecutor.submit(new UpdatePendingJobsTableTask()); updateExecutor.submit(new UpdatePendingJobsTableTask());
break; break;

2
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestDashboardTopComponent.form
View File

@ -25,4 +25,4 @@
</Group> </Group>
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
</Form> </Form>

2
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestDashboardTopComponent.java
View File

@ -1,7 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2017 Basis Technology Corp. * Copyright 2011 - 2017 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org * Contact: carrier <at> sleuthkit <dot> org
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");

976
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMonitor.java
View File

File diff suppressed because it is too large Load Diff