Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature: add session data consumption information in GUI/text UIs (#287)

Browse Source 
* Feature: add session data consumption information in GUI/text UIs

Adds the total bytes downloaded and uploaded in the current session as well as the average data transfer rate for both UL/DL. The information is not added to the 1-line UI as the line will take 150+ characters in the screen.
This commit is contained in:
Luis Uguina
2020-09-12 10:00:24 +10:00
committed by GitHub
parent 4fa886c4de
commit d152e0b0ff
9 changed files with 126 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/sheepit/client/standalone/GuiSwing.java
View File

@@ -50,6 +50,7 @@ import com.sheepit.client.Configuration;
import com.sheepit.client.Gui;
import com.sheepit.client.SettingsLoader;
import com.sheepit.client.Stats;
import com.sheepit.client.TransferStats;
import com.sheepit.client.standalone.swing.activity.Settings;
import com.sheepit.client.standalone.swing.activity.Working;
import lombok.Getter;
@@ -223,6 +224,10 @@ public class GuiSwing extends JFrame implements Gui {
}
}
@Override public synchronized void displayTransferStats(TransferStats downloads, TransferStats uploads) {
this.activityWorking.displayTransferStats(downloads, uploads);
}
@Override public void AddFrameRendered() {
framesRendered++;

7
src/com/sheepit/client/standalone/GuiText.java
View File

@@ -23,6 +23,7 @@ import com.sheepit.client.Client;
import com.sheepit.client.Gui;
import com.sheepit.client.Log;
import com.sheepit.client.Stats;
import com.sheepit.client.TransferStats;
import com.sheepit.client.standalone.text.CLIInputActionHandler;
import com.sheepit.client.standalone.text.CLIInputObserver;
@@ -132,6 +133,12 @@ public class GuiText implements Gui {
System.out.println(String.format("%s Frames rendered: %d", this.df.format(new Date()), this.framesRendered));
}
@Override public synchronized void displayTransferStats(TransferStats downloads, TransferStats uploads) {
System.out.println(String
.format("%s Session downloads: %s @ %s/s / Uploads: %s @ %s/s", this.df.format(new Date()), downloads.getSessionTraffic(),
downloads.getAverageSessionSpeed(), uploads.getSessionTraffic(), uploads.getAverageSessionSpeed()));
}
@Override public void displayStats(Stats stats) {
System.out.println(String.format("%s Frames remaining: %d", this.df.format(new Date()), stats.getRemainingFrame()));
System.out.println(String.format("%s Credits earned: %d", this.df.format(new Date()), stats.getCreditsEarnedDuringSession()));

5
src/com/sheepit/client/standalone/GuiTextOneLine.java
View File

@@ -22,6 +22,7 @@ package com.sheepit.client.standalone;
import com.sheepit.client.Client;
import com.sheepit.client.Gui;
import com.sheepit.client.Stats;
import com.sheepit.client.TransferStats;
import com.sheepit.client.standalone.text.CLIInputActionHandler;
import com.sheepit.client.standalone.text.CLIInputObserver;
@@ -154,6 +155,10 @@ public class GuiTextOneLine implements Gui {
updateLine();
}
@Override public synchronized void displayTransferStats(TransferStats downloads, TransferStats uploads) {
// Session traffic stats not shown in the 1 line UI to avoid increasing the line length above 120 chars
}
@Override public void displayStats(Stats stats) {
remaining = stats.getRemainingFrame();
creditsEarned = String.valueOf(stats.getCreditsEarnedDuringSession());

27
src/com/sheepit/client/standalone/swing/activity/Working.java
View File

@@ -49,6 +49,7 @@ import com.sheepit.client.Client;
import com.sheepit.client.Job;
import com.sheepit.client.Log;
import com.sheepit.client.Stats;
import com.sheepit.client.TransferStats;
import com.sheepit.client.Utils;
import com.sheepit.client.standalone.GuiSwing;
import com.sheepit.client.standalone.GuiSwing.ActivityType;
@@ -75,6 +76,8 @@ public class Working implements Activity {
private JLabel connected_machines_value;
private JLabel user_info_total_rendertime_this_session_value;
private JLabel userInfoQueuedUploadsAndSizeValue;
private JLabel sessionDownloadsStatsValue;
private JLabel sessionUploadsStatsValue;
private String currentTheme;
private Log log;
@@ -97,6 +100,8 @@ public class Working implements Activity {
lastRenderTime = new JLabel("");
lastRender = new JLabel("");
userInfoQueuedUploadsAndSizeValue = new JLabel("0");
sessionDownloadsStatsValue = new JLabel("0KB");
sessionUploadsStatsValue = new JLabel("0KB");
currentTheme = UIManager.getLookAndFeel().getName(); // Capture the theme on component instantiation
previousStatus = "";
log = Log.getInstance(parent_.getConfiguration());
@@ -126,6 +131,8 @@ public class Working implements Activity {
lastRenderTime = new JLabel(lastRenderTime.getText());
lastRender = new JLabel(lastRender.getText());
userInfoQueuedUploadsAndSizeValue = new JLabel(userInfoQueuedUploadsAndSizeValue.getText());
sessionDownloadsStatsValue = new JLabel(sessionDownloadsStatsValue.getText());
sessionUploadsStatsValue = new JLabel(sessionUploadsStatsValue.getText());
// set the new theme as the current one
currentTheme = UIManager.getLookAndFeel().getName();
@@ -163,6 +170,8 @@ public class Working implements Activity {
JLabel user_info_credits_this_session = new JLabel("Points earned: ", JLabel.TRAILING);
JLabel user_info_total_rendertime_this_session = new JLabel("Duration: ", JLabel.TRAILING);
JLabel user_info_pending_uploads_and_size = new JLabel("Queued uploads: ", JLabel.TRAILING);
JLabel session_download_stats = new JLabel("Total Downloads: ", JLabel.TRAILING);
JLabel session_upload_stats = new JLabel("Total Uploads: ", JLabel.TRAILING);
JLabel user_info_rendered_frame_this_session = new JLabel("Rendered frames: ", JLabel.TRAILING);
JLabel global_static_renderable_project = new JLabel("Renderable projects: ", JLabel.TRAILING);
@@ -175,6 +184,12 @@ public class Working implements Activity {
session_info_panel.add(user_info_pending_uploads_and_size);
session_info_panel.add(userInfoQueuedUploadsAndSizeValue);
session_info_panel.add(session_download_stats);
session_info_panel.add(sessionDownloadsStatsValue);
session_info_panel.add(session_upload_stats);
session_info_panel.add(sessionUploadsStatsValue);
session_info_panel.add(global_static_renderable_project);
session_info_panel.add(renderable_projects_value);
@@ -260,10 +275,10 @@ public class Working implements Activity {
widthLeftColumn = Spring.max(widthLeftColumn, getBestWidth(session_info_panel, 4, 2));
alignPanel(current_project_panel, 5, 2, widthLeftColumn);
alignPanel(global_stats_panel, 4, 2, widthLeftColumn);
alignPanel(session_info_panel, 5, 2, widthLeftColumn);
alignPanel(session_info_panel, 7, 2, widthLeftColumn);
// Set the proper size for the Working (if coming from Settings screen, the window size will be too big for the content!)
parent.setSize(520, 760);
parent.setSize(520, 820);
}
public void setStatus(String msg_) {
@@ -303,6 +318,12 @@ public class Working implements Activity {
this.current_project_compute_method_value.setText(computeMethod_);
}
public void displayTransferStats(TransferStats downloads, TransferStats uploads) {
sessionDownloadsStatsValue.setText(String.format("%s @ %s/s", downloads.getSessionTraffic(), downloads.getAverageSessionSpeed()));
sessionUploadsStatsValue.setText(String.format("%s @ %s/s", uploads.getSessionTraffic(), uploads.getAverageSessionSpeed()));
updateTime();
}
public void displayStats(Stats stats) {
DecimalFormat df = new DecimalFormat("##,##,##,##,##,##,##0");
remainingFrameContent.setText(df.format(stats.getRemainingFrame()));
@@ -334,7 +355,7 @@ public class Working implements Activity {
}
}
public void updateTime() {
public synchronized void updateTime() {
if (this.parent.getClient().getStartTime() != 0) {
user_info_total_rendertime_this_session_value
.setText(Utils.humanDuration(new Date((new Date().getTime() - this.parent.getClient().getStartTime()))));