adjusted standalone classes (approximately) to state of classes in project
This commit is contained in:
@@ -19,6 +19,20 @@ public class SimpleLoadingBar {
|
||||
private static final BigDecimal MINS_PER_HOUR_BD = BigDecimal.valueOf(MINS_PER_HOUR);
|
||||
private static final int LINE_LENGTH = 100;
|
||||
private static final MathContext MC_INTEGER = new MathContext(1, RoundingMode.HALF_EVEN);
|
||||
private static final BigDecimal ONE_HUNDRED_PERCENT = BigDecimal.valueOf(100);
|
||||
|
||||
private final String title;
|
||||
private final LocalTime startTime;
|
||||
private LocalTime endTime;
|
||||
private long totalMinutes;
|
||||
private BigDecimal totalMinutesBD;
|
||||
|
||||
|
||||
private SimpleLoadingBar(LocalTime startTime, LocalTime endTime, String title) {
|
||||
this.startTime = startTime;
|
||||
setEndTime(endTime);
|
||||
this.title = initTitle(title);
|
||||
}
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
@@ -28,13 +42,12 @@ public class SimpleLoadingBar {
|
||||
}
|
||||
verifyMinimumNumberOfArgs(args);
|
||||
String nextArg = args[0];
|
||||
verifyTimeFormat(nextArg, "Erstes Argument"); // FSFIXME package
|
||||
var firstTime = LocalTime.parse(nextArg, TIME_FORMATTER); // FSFIXME package
|
||||
verifyTimeFormat(nextArg, "Erstes Argument");
|
||||
var firstTime = LocalTime.parse(nextArg, TIME_FORMATTER);
|
||||
LocalTime startTime = null;
|
||||
String title = "";
|
||||
LocalTime endTime = null;
|
||||
if (args.length > 1) {
|
||||
startTime = firstTime;
|
||||
nextArg = args[1];
|
||||
if ("-msg".equals(nextArg)) {
|
||||
title = args.length > 2 ? args[2] : title;
|
||||
@@ -46,23 +59,32 @@ public class SimpleLoadingBar {
|
||||
if (endTime == null) {
|
||||
startTime = LocalTime.now();
|
||||
endTime = firstTime;
|
||||
} else {
|
||||
startTime = firstTime;
|
||||
}
|
||||
String fallbackTitle = "Ende! Endzeit " + TIME_FORMATTER.format(endTime) + " erreicht.";
|
||||
if (args.length == 2 || !title.isBlank()) {
|
||||
title = title.isBlank() ? fallbackTitle : title;
|
||||
showLoadingBar(startTime, endTime, title);
|
||||
new SimpleLoadingBar(startTime, endTime, title).showLoadingBar();
|
||||
return;
|
||||
}
|
||||
// if there are 3 arguments, the third will be discarded.
|
||||
boolean hasTitleArg = args.length > 3 && "-msg".equals(args[2]);
|
||||
title = hasTitleArg ? args[3] : title;
|
||||
title = title.isBlank() ? fallbackTitle : title;
|
||||
showLoadingBar(startTime, endTime, title);
|
||||
new SimpleLoadingBar(startTime, endTime, title).showLoadingBar();
|
||||
}
|
||||
|
||||
|
||||
private static void println(Object o) {
|
||||
System.out.println(o);
|
||||
}
|
||||
|
||||
|
||||
private static void print(Object o) {
|
||||
System.out.print(o);
|
||||
}
|
||||
|
||||
|
||||
private static void printHelp() {
|
||||
System.out.println("Mögliche Argumente für LoadingBar:\n"
|
||||
println("Mögliche Argumente für LoadingBar:\n"
|
||||
+ "Startzeit, Endzeit, Endnachricht (Optional)\n"
|
||||
+ TIME_FORMAT + " " + TIME_FORMAT + " -msg <Nachricht>\n"
|
||||
+ "Endzeit (Startzeit = jetzt), Endnachricht (Optional)\n"
|
||||
@@ -75,7 +97,7 @@ public class SimpleLoadingBar {
|
||||
if (args.length >= 1) {
|
||||
return;
|
||||
}
|
||||
System.out.println("Mindestens 1 Argument muss gegeben sein.");
|
||||
println("Mindestens 1 Argument muss gegeben sein.");
|
||||
printHelp();
|
||||
System.exit(1);
|
||||
}
|
||||
@@ -85,44 +107,52 @@ public class SimpleLoadingBar {
|
||||
if (TIME_PATTERN.matcher(param).matches()) {
|
||||
return;
|
||||
}
|
||||
System.out.println(errMsgPrefix + " \"" + param + "\" muss Uhrzeitformat (" + TIME_FORMAT + ") entsprechen.");
|
||||
println(errMsgPrefix + " \"" + param + "\" muss Uhrzeitformat (" + TIME_FORMAT + ") entsprechen.");
|
||||
System.exit(1);
|
||||
}
|
||||
|
||||
|
||||
public static void showLoadingBar(LocalTime startTime, LocalTime endTime, String title) {
|
||||
long initialMinutes = startTime.until(endTime, ChronoUnit.MINUTES);
|
||||
System.out.print(minutesToTimeString(initialMinutes) + " gesamt; Endzeit: " + TIME_FORMATTER.format(endTime) + "\n");
|
||||
long passedMinutes = startTime.until(LocalTime.now(), ChronoUnit.MINUTES);
|
||||
if (passedMinutes > initialMinutes) {
|
||||
passedMinutes = initialMinutes;
|
||||
} else if (passedMinutes < 0) {
|
||||
System.out.println(fillLoadingBar(initialMinutes, 0, false));
|
||||
return;
|
||||
}
|
||||
while (passedMinutes < initialMinutes) {
|
||||
System.out.print(fillLoadingBar(initialMinutes, passedMinutes, true));
|
||||
try {
|
||||
var now = LocalTime.now();
|
||||
var oneMinuteLater = now.plusMinutes(1).truncatedTo(ChronoUnit.MINUTES);
|
||||
// +1 second to adjust for ignored milliseconds as it is better to switch between 00 and 01 as between 59 and 00
|
||||
TimeUnit.SECONDS.sleep(now.until(oneMinuteLater, ChronoUnit.SECONDS) + 1);
|
||||
// TimeUnit.SECONDS.sleep(1L); // DEBUG
|
||||
} catch (InterruptedException ie) {
|
||||
throw new RuntimeException(ie);
|
||||
}
|
||||
passedMinutes++;
|
||||
}
|
||||
System.out.println(fillLoadingBar(initialMinutes, passedMinutes, false));
|
||||
System.out.println(formatTitle(title));
|
||||
private void setEndTime(LocalTime endTime) {
|
||||
this.endTime = endTime;
|
||||
this.totalMinutes = startTime.until(endTime, ChronoUnit.MINUTES);
|
||||
this.totalMinutesBD = BigDecimal.valueOf(totalMinutes);
|
||||
}
|
||||
|
||||
|
||||
private static String fillLoadingBar(long initialMinutes, long passedMinutes, boolean progressive) {
|
||||
BigDecimal wholePercentage = BigDecimal.valueOf(100)
|
||||
.multiply(BigDecimal.valueOf(passedMinutes) // kind of reverse dreisatz to avoid to have e.g. 99.9999 instead of 100 %
|
||||
.divide(BigDecimal.valueOf(initialMinutes), MathContext.DECIMAL64));
|
||||
long remainingMinutes = initialMinutes - passedMinutes;
|
||||
private String initTitle(String inputTitle) {
|
||||
String fallbackTitle = "Ende! Endzeit " + TIME_FORMATTER.format(endTime) + " erreicht.";
|
||||
String effectiveTitle = inputTitle == null || inputTitle.isBlank() ? fallbackTitle : inputTitle;
|
||||
String separator = "*".repeat(effectiveTitle.length());
|
||||
return separator + "\n" + effectiveTitle + "\n" + separator;
|
||||
}
|
||||
|
||||
|
||||
private void showLoadingBar() {
|
||||
long passedMinutes = startTime.until(LocalTime.now().truncatedTo(ChronoUnit.MINUTES), ChronoUnit.MINUTES);
|
||||
// long passedMinutes = 0; // DEBUG
|
||||
if (passedMinutes > totalMinutes) {
|
||||
passedMinutes = totalMinutes;
|
||||
} else if (passedMinutes < 0) {
|
||||
var now = LocalTime.now().truncatedTo(ChronoUnit.SECONDS);
|
||||
println("!ACHTUNG! Startzeit \"" + startTime + ":00\" liegt in der Zukunft von jetzt an (" + now + ") gesehen.");
|
||||
}
|
||||
println(minutesToTimeString(totalMinutesBD) + " gesamt; Endzeit: " + TIME_FORMATTER.format(endTime));
|
||||
while (passedMinutes < totalMinutes) {
|
||||
print(fillLoadingBar(passedMinutes, true));
|
||||
waitUntilNextMinute();
|
||||
passedMinutes++;
|
||||
}
|
||||
println(fillLoadingBar(passedMinutes, false));
|
||||
println(title);
|
||||
}
|
||||
|
||||
|
||||
private String fillLoadingBar(long passedMinutes, boolean progressive) {
|
||||
var nonNegativePassedMinutes = BigDecimal.valueOf(passedMinutes < 0 ? 0 : passedMinutes);
|
||||
BigDecimal wholePercentage = ONE_HUNDRED_PERCENT
|
||||
// kind of reverse dreisatz to avoid having e.g. 99.9999 instead of 100 %
|
||||
.multiply(nonNegativePassedMinutes)
|
||||
.divide(totalMinutesBD, MathContext.DECIMAL64);
|
||||
int numberOfEquals = wholePercentage.intValue();
|
||||
var sb = new StringBuilder("[");
|
||||
for (int i = 0; i < LINE_LENGTH; i++) {
|
||||
@@ -132,8 +162,9 @@ public class SimpleLoadingBar {
|
||||
sb.append("-");
|
||||
}
|
||||
}
|
||||
BigDecimal remainingMinutes = totalMinutesBD.subtract(nonNegativePassedMinutes);
|
||||
sb.append("] ").append(PERCENTAGE_FORMAT.format(wholePercentage)).append("% ")
|
||||
.append(minutesToTimeString(passedMinutes)).append(" - ").append(minutesToTimeString(remainingMinutes));
|
||||
.append(minutesToTimeString(nonNegativePassedMinutes)).append(" - ").append(minutesToTimeString(remainingMinutes));
|
||||
if (progressive) {
|
||||
sb.append("\r");
|
||||
}
|
||||
@@ -141,15 +172,24 @@ public class SimpleLoadingBar {
|
||||
}
|
||||
|
||||
|
||||
private static String minutesToTimeString(long minutes) {
|
||||
var minutesBD = BigDecimal.valueOf(minutes);
|
||||
BigDecimal[] hoursAndMinutes = minutesBD.divideAndRemainder(MINS_PER_HOUR_BD, MC_INTEGER);
|
||||
private String minutesToTimeString(BigDecimal minutes) {
|
||||
BigDecimal[] hoursAndMinutes = minutes.divideAndRemainder(MINS_PER_HOUR_BD, MC_INTEGER);
|
||||
return LocalTime.of(hoursAndMinutes[0].intValue(), hoursAndMinutes[1].intValue()).format(TIME_FORMATTER);
|
||||
}
|
||||
|
||||
|
||||
private static String formatTitle(String title) {
|
||||
String separator = "*".repeat(title.length());
|
||||
return separator + "\n" + title + "\n" + separator;
|
||||
private void waitUntilNextMinute() {
|
||||
try {
|
||||
var now = LocalTime.now();
|
||||
var oneMinuteLater = now.plusMinutes(1).truncatedTo(ChronoUnit.MINUTES);
|
||||
/* We wait whole seconds to not make it overly complicated.
|
||||
That results in cut milliseconds: if we would have to wait 1 second and 526 milliseconds, we wait only 1 second.
|
||||
So, adjust for ignored milliseconds, add +1 second as it is better to switch between 00 and 01 as between 59 and 00 */
|
||||
TimeUnit.SECONDS.sleep(now.until(oneMinuteLater, ChronoUnit.SECONDS) + 1);
|
||||
// TimeUnit.MILLISECONDS.sleep(100L); // DEBUG
|
||||
} catch (InterruptedException ie) {
|
||||
Thread.currentThread().interrupt();
|
||||
throw new RuntimeException(ie);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user