Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-02 03:36:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Shorten progress bar when it exceeds terminal width

Browse source
This commit is contained in:
Ivan Vilata-i-Balaguer 2016-05-12 09:40:04 +02:00
parent 3a9b2dd932
commit e7fd9d9ed7
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
network/src/test/java/io/bitsquare/p2p/network/NetworkStressTest.java
View file

@ -70,6 +70,8 @@ public class NetworkStressTest {
// Instance fields // Instance fields
/** Number of columns in terminal (for progress reporting). */
private int terminalColumns = 80;
/** A directory to (temporarily) hold seed and normal nodes' configuration and state files. */ /** A directory to (temporarily) hold seed and normal nodes' configuration and state files. */
private Path testDataDir; private Path testDataDir;
/** Whether to use localhost addresses instead of Tor hidden services. */ /** Whether to use localhost addresses instead of Tor hidden services. */
@ -112,8 +114,13 @@ public class NetworkStressTest {
private void countDownAndPrint(CountDownLatch latch, char c) { private void countDownAndPrint(CountDownLatch latch, char c) {
latch.countDown(); latch.countDown();
int remaining = (int)latch.getCount(); int remaining = (int)latch.getCount();
if (remaining > 0) if (remaining > 0) {
System.out.print(String.format("\r%s> %s ", this.getClass().getSimpleName(), nChars(c, remaining))); String hdr = String.format("\r%s> ", this.getClass().getSimpleName());
String msg = (hdr.length() - 1/*carriage return*/ + remaining + 1/*final space*/ > terminalColumns)
? String.format("%c*%d", c, remaining)
: nChars(c, remaining);
System.out.print(hdr + msg + ' ');
}
if (remaining == 1) if (remaining == 1)
System.out.print('\n'); System.out.print('\n');
System.out.flush(); System.out.flush();
@ -140,6 +147,11 @@ public class NetworkStressTest {
throw new IllegalArgumentException( throw new IllegalArgumentException(
String.format("Direct messages sent per peer must not be negative: %d", directCount) String.format("Direct messages sent per peer must not be negative: %d", directCount)
); );
final String terminalColumnsEnv = System.getenv("COLUMNS");
if (terminalColumnsEnv != null && !terminalColumnsEnv.equals(""))
terminalColumns = Integer.parseInt(terminalColumnsEnv);
/** A property where threads can indicate setup failure of local services (Tor node, hidden service). */ /** A property where threads can indicate setup failure of local services (Tor node, hidden service). */
final BooleanProperty localServicesFailed = new SimpleBooleanProperty(false); final BooleanProperty localServicesFailed = new SimpleBooleanProperty(false);
/** A barrier to wait for concurrent setup of local services (Tor node, hidden service). */ /** A barrier to wait for concurrent setup of local services (Tor node, hidden service). */