flavien/Projet_JAVA_P2P_STRI2A
3
2
Fork 0
Code Issues 11 Pull Requests Releases 13 Activity

Print progress bar less frequently
All checks were successful
flavien's git/Projet_JAVA_P2P_STRI2A/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Louis Royer 2020-04-02 16:36:04 +02:00
parent 039c3ff2b0
commit 58add14fa9
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/clientP2P/ClientDownload.java
View File

@ -46,6 +46,7 @@ import tools.ServeErrors;
import java.net.SocketException; import java.net.SocketException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.io.IOException; import java.io.IOException;
import java.time.Instant;
/** Class to download file /** Class to download file
* @author Louis Royer * @author Louis Royer
@ -70,6 +71,10 @@ public abstract class ClientDownload extends ServeErrors implements Runnable {
protected Logger logger; protected Logger logger;
protected HostItem client; protected HostItem client;
protected HostItem tracker; protected HostItem tracker;
protected int lastPercentProgress;
protected Instant lastTimeProgress;
final static int DIFF_TIME_PROGRESS_MILLIS = 2000;
final static int DIFF_PERCENT_PROGRESS = 5;
/** Constructor with parameters: filename, list of hosts, parts subdirectory and dirStorage /** Constructor with parameters: filename, list of hosts, parts subdirectory and dirStorage
* @param filename name of file to download * @param filename name of file to download
@ -89,6 +94,8 @@ public abstract class ClientDownload extends ServeErrors implements Runnable {
this.client = client; this.client = client;
this.tracker = tracker; this.tracker = tracker;
this.stop = false; this.stop = false;
lastPercentProgress = - DIFF_PERCENT_PROGRESS;
lastTimeProgress = Instant.now().minusMillis(DIFF_TIME_PROGRESS_MILLIS);
} }
/** Success getter. /** Success getter.
@ -399,6 +406,10 @@ public abstract class ClientDownload extends ServeErrors implements Runnable {
progression += dl.longValue(); progression += dl.longValue();
} }
double percent = 100.0*progression/size; double percent = 100.0*progression/size;
if (percent != 100 && percent < lastPercentProgress + DIFF_PERCENT_PROGRESS
&& lastTimeProgress.plusMillis(DIFF_TIME_PROGRESS_MILLIS).isAfter(Instant.now())) {
return;
}
String bar = "["; String bar = "[";
for(int i=0;i<=100;i+=10) { for(int i=0;i<=100;i+=10) {
if (i>percent) { if (i>percent) {
@ -408,7 +419,9 @@ public abstract class ClientDownload extends ServeErrors implements Runnable {
} }
} }
bar += "]"; bar += "]";
writeLog("[[" + filename + "]] " + bar + " " + String.format("%.2f", percent) + "%", LogLevel.Progression); writeLog("[[" + filename + "]] " + bar + " " + String.format("%.2f", percent) + "%", LogLevel.Progression);
lastPercentProgress = (int)percent;
lastTimeProgress = Instant.now();
} }
/** Initialize infos about file to download (size, hash512sum, partslist to dl). /** Initialize infos about file to download (size, hash512sum, partslist to dl).