Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New column with item's processing time in a task (#1904) #1907

Merged
merged 5 commits into from
Oct 11, 2023
Merged

New column with item's processing time in a task (#1904) #1907

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41cbdaa
'#1904: New column with item's processing time in a task.
wladimirleite Sep 29, 2023
d1327ad
'#1904: Small enhancement to RenderingHints handling in ProgressFrame.
wladimirleite Sep 29, 2023
dd6ac34
'#1904: Limit color intensity to avoid bad contrast with the text.
wladimirleite Sep 29, 2023
1933b15
'#1904: Use Item's ID instead of path to check if the evidence changed.
wladimirleite Sep 29, 2023
f875dde
Merge branch 'master' into #1904_TimeInATaskGUI
lfcnassif Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 61 additions & 11 deletions iped-app/src/main/java/iped/app/processing/ui/ProgressFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.RenderingHints.Key;
import java.awt.Taskbar;
import java.awt.Taskbar.State;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
Expand All @@ -36,6 +38,8 @@
import java.nio.file.Files;
import java.text.NumberFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicLong;

Expand Down Expand Up @@ -83,25 +87,45 @@ public class ProgressFrame extends JFrame implements PropertyChangeListener, Act
long secsToEnd;
private Date indexStart;
private Worker[] workers;
private String[] lastWorkerTaskItemId;
private long[] lastWorkerTime;
private static final NumberFormat nf = LocalizedFormat.getNumberInstance();
private boolean paused = false;
private String decodingDir = null;
private long physicalMemory;

private class RestrictedSizeLabel extends JLabel {
private static class RestrictedSizeLabel extends JLabel {

private static final long serialVersionUID = 1L;

private static final RenderingHints renderingHints;

static {
Map<Key, Object> hints = new HashMap<>();
try {
@SuppressWarnings("unchecked")
Map<Key, Object> desktopHints = (Map<Key, Object>) Toolkit.getDefaultToolkit()
.getDesktopProperty("awt.font.desktophints");
if (desktopHints != null) {
hints.putAll(desktopHints);
}
} catch (Exception e) {
}
hints.put(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
hints.put(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
renderingHints = new RenderingHints(hints);
}

public Dimension getMaximumSize() {
return this.getPreferredSize();
}

public void paintComponent(Graphics g) {
Graphics2D g2 = (Graphics2D) g;
g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
RenderingHints saveHints = g2.getRenderingHints();
g2.setRenderingHints(renderingHints);
super.paintComponent(g2);
g2.setRenderingHints(saveHints);
}
}

Expand Down Expand Up @@ -240,6 +264,8 @@ public void propertyChange(PropertyChangeEvent evt) {

} else if ("workers".equals(evt.getPropertyName())) { //$NON-NLS-1$
workers = (Worker[]) evt.getNewValue();
lastWorkerTaskItemId = new String[workers.length];
lastWorkerTime = new long[workers.length];
}

}
Expand All @@ -249,27 +275,51 @@ private String getItemList() {
return "";
StringBuilder msg = new StringBuilder();
startTable(msg);
addTitle(msg, 3, Messages.getString("ProgressFrame.CurrentItems"));
addTitle(msg, 4, Messages.getString("ProgressFrame.CurrentItems"));

long now = System.currentTimeMillis();
boolean hasWorkerAlive = false;
for (Worker worker : workers) {
for (int i = 0; i < workers.length; i++) {
Worker worker = workers[i];
if (!worker.isAlive())
continue;
hasWorkerAlive = true;
startRow(msg, worker.getName(), worker.state != STATE.PAUSED);

AbstractTask task = worker.runningTask;
String taskName = task == null ? null : task.getName();

IItem evidence = worker.evidence;

String wt = "-";
int pct = -1;
if (taskName != null && evidence != null) {
String taskId = taskName + evidence.getId();
if (!taskId.equals(lastWorkerTaskItemId[i])) {
lastWorkerTime[i] = now;
lastWorkerTaskItemId[i] = taskId;
} else if (worker.state != STATE.PAUSED) {
long t = (now - lastWorkerTime[i]) / 1000;
wt = t < 60 ? t + "s" : t / 60 + "m";
pct = (int) Math.min(t / 30, 60);
}
} else {
lastWorkerTaskItemId[i] = null;
}

startRow(msg, worker.getName(), worker.state != STATE.PAUSED, pct);

if (worker.state == STATE.PAUSED) {
addCell(msg, Messages.getString("ProgressFrame.Paused"), Align.CENTER);
} else if (worker.state == STATE.PAUSING) {
addCell(msg, Messages.getString("ProgressFrame.Pausing"), Align.CENTER);
} else if (task != null) {
addCell(msg, task.getName());
addCell(msg, taskName);
} else {
addCell(msg, "-", Align.CENTER);
}

IItem evidence = worker.evidence;
addCell(msg, wt, wt.equals("-") ? Align.CENTER : Align.RIGHT);

if (evidence != null) {
String len = "";
if (evidence.getLength() != null && evidence.getLength() > 0)
Expand Down Expand Up @@ -563,7 +613,7 @@ private void startRow(StringBuilder sb, Object content, boolean enabled, int pct
sb.append("<tr");
if (pct >= 0) {
// Color based on percentage can be adjusted here
int c = pct == 0 ? 255 : 245 - pct * 3 / 2;
int c = pct == 0 ? 255 : 245 - Math.min(75, pct) * 3 / 2;
sb.append(" bgcolor=#").append(String.format("%02X%02X%02X", c, c, 255));
}
sb.append(" class=").append(enabled ? "a" : "d");
Expand Down Expand Up @@ -638,7 +688,7 @@ private void updateTaskBar() {
}
}
}

private static String formatMB(long value) {
return nf.format(value >>> 20) + " MB";
}
Expand Down