- moved files into new project-specific subpackage
- adjusted package declarations and imports
This commit is contained in:
@@ -1,170 +1,170 @@
|
|||||||
package de.szimnau;
|
package de.szimnau.zeitlaeufer;
|
||||||
|
|
||||||
import de.szimnau.tools.FormatTools;
|
import de.szimnau.zeitlaeufer.tools.FormatTools;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
import java.time.temporal.ChronoUnit;
|
import java.time.temporal.ChronoUnit;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import static de.szimnau.tools.CommonTools.print;
|
import static de.szimnau.zeitlaeufer.tools.CommonTools.print;
|
||||||
import static de.szimnau.tools.CommonTools.println;
|
import static de.szimnau.zeitlaeufer.tools.CommonTools.println;
|
||||||
|
|
||||||
|
|
||||||
public abstract class AbstractLoadingBar {
|
public abstract class AbstractLoadingBar {
|
||||||
|
|
||||||
private final LocalTime startTime;
|
private final LocalTime startTime;
|
||||||
private LocalTime endTime;
|
private LocalTime endTime;
|
||||||
private long totalMinutes;
|
private long totalMinutes;
|
||||||
private BigDecimal totalMinutesBD;
|
private BigDecimal totalMinutesBD;
|
||||||
|
|
||||||
|
|
||||||
protected AbstractLoadingBar(LocalTime startTime) {
|
protected AbstractLoadingBar(LocalTime startTime) {
|
||||||
this.startTime = startTime;
|
this.startTime = startTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected AbstractLoadingBar(LocalTime startTime, LocalTime endTime) {
|
protected AbstractLoadingBar(LocalTime startTime, LocalTime endTime) {
|
||||||
this.startTime = startTime;
|
this.startTime = startTime;
|
||||||
setEndTime(endTime);
|
setEndTime(endTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected AbstractLoadingBar(LocalTime startTime, long totalMinutes) {
|
protected AbstractLoadingBar(LocalTime startTime, long totalMinutes) {
|
||||||
this.startTime = startTime;
|
this.startTime = startTime;
|
||||||
setTotalMinutes(totalMinutes);
|
setTotalMinutes(totalMinutes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public LocalTime getStartTime() {
|
public LocalTime getStartTime() {
|
||||||
return startTime;
|
return startTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public LocalTime getEndTime() {
|
public LocalTime getEndTime() {
|
||||||
return endTime;
|
return endTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected final void setEndTime(LocalTime endTime) {
|
protected final void setEndTime(LocalTime endTime) {
|
||||||
this.endTime = endTime;
|
this.endTime = endTime;
|
||||||
this.totalMinutes = startTime.until(endTime, ChronoUnit.MINUTES);
|
this.totalMinutes = startTime.until(endTime, ChronoUnit.MINUTES);
|
||||||
this.totalMinutesBD = BigDecimal.valueOf(totalMinutes);
|
this.totalMinutesBD = BigDecimal.valueOf(totalMinutes);
|
||||||
extraInitEndTimeTotalMinutes();
|
extraInitEndTimeTotalMinutes();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected void extraInitEndTimeTotalMinutes() {}
|
protected void extraInitEndTimeTotalMinutes() {}
|
||||||
|
|
||||||
|
|
||||||
protected long getTotalMinutes() {
|
protected long getTotalMinutes() {
|
||||||
return totalMinutes;
|
return totalMinutes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected final void setTotalMinutes(long totalMinutes) {
|
protected final void setTotalMinutes(long totalMinutes) {
|
||||||
this.totalMinutes = totalMinutes;
|
this.totalMinutes = totalMinutes;
|
||||||
this.totalMinutesBD = BigDecimal.valueOf(totalMinutes);
|
this.totalMinutesBD = BigDecimal.valueOf(totalMinutes);
|
||||||
this.endTime = startTime.plusMinutes(totalMinutes);
|
this.endTime = startTime.plusMinutes(totalMinutes);
|
||||||
extraInitEndTimeTotalMinutes();
|
extraInitEndTimeTotalMinutes();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected BigDecimal getTotalMinutesBD() {
|
protected BigDecimal getTotalMinutesBD() {
|
||||||
return totalMinutesBD;
|
return totalMinutesBD;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected long getPassedMinutes() {
|
protected long getPassedMinutes() {
|
||||||
return getPassedMinutes(false);
|
return getPassedMinutes(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected long getPassedMinutes(boolean passedMinutesZero) {
|
protected long getPassedMinutes(boolean passedMinutesZero) {
|
||||||
return passedMinutesZero ? 0 : startTime.until(LocalTime.now().truncatedTo(ChronoUnit.MINUTES), ChronoUnit.MINUTES);
|
return passedMinutesZero ? 0 : startTime.until(LocalTime.now().truncatedTo(ChronoUnit.MINUTES), ChronoUnit.MINUTES);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void showLoadingBar() {
|
public void showLoadingBar() {
|
||||||
showLoadingBar(false, false, 0);
|
showLoadingBar(false, false, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void showLoadingBar(boolean debug, boolean passedMinutesZero) {
|
public void showLoadingBar(boolean debug, boolean passedMinutesZero) {
|
||||||
showLoadingBar(debug, passedMinutesZero, 100L);
|
showLoadingBar(debug, passedMinutesZero, 100L);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void showLoadingBarDebug() {
|
public void showLoadingBarDebug() {
|
||||||
showLoadingBar(true, true, 100L);
|
showLoadingBar(true, true, 100L);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void showLoadingBarDebug(long millisWaiting) {
|
public void showLoadingBarDebug(long millisWaiting) {
|
||||||
showLoadingBar(true, true, millisWaiting);
|
showLoadingBar(true, true, millisWaiting);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void showLoadingBarDebug(boolean passedMinutesZero) {
|
public void showLoadingBarDebug(boolean passedMinutesZero) {
|
||||||
showLoadingBar(true, passedMinutesZero, 100L);
|
showLoadingBar(true, passedMinutesZero, 100L);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void showLoadingBarDebug(boolean passedMinutesZero, long millisWaiting) {
|
public void showLoadingBarDebug(boolean passedMinutesZero, long millisWaiting) {
|
||||||
showLoadingBar(true, passedMinutesZero, millisWaiting);
|
showLoadingBar(true, passedMinutesZero, millisWaiting);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void showLoadingBar(boolean debug, boolean passedMinutesZero, long millisWaiting) {
|
private void showLoadingBar(boolean debug, boolean passedMinutesZero, long millisWaiting) {
|
||||||
long passedMinutes = getPassedMinutes(debug && passedMinutesZero);
|
long passedMinutes = getPassedMinutes(debug && passedMinutesZero);
|
||||||
if (passedMinutes > totalMinutes) {
|
if (passedMinutes > totalMinutes) {
|
||||||
passedMinutes = totalMinutes;
|
passedMinutes = totalMinutes;
|
||||||
} else if (passedMinutes < 0) {
|
} else if (passedMinutes < 0) {
|
||||||
var now = LocalTime.now().truncatedTo(ChronoUnit.SECONDS);
|
var now = LocalTime.now().truncatedTo(ChronoUnit.SECONDS);
|
||||||
println("!ACHTUNG! Startzeit \"" + startTime + ":00\" liegt in der Zukunft von jetzt an (" + now + ") gesehen.");
|
println("!ACHTUNG! Startzeit \"" + startTime + ":00\" liegt in der Zukunft von jetzt an (" + now + ") gesehen.");
|
||||||
}
|
}
|
||||||
println(FormatTools.minutesToTimeString(totalMinutes) + " gesamt; Endzeit: " + FormatTools.TIME_FORMATTER.format(endTime));
|
println(FormatTools.minutesToTimeString(totalMinutes) + " gesamt; Endzeit: " + FormatTools.TIME_FORMATTER.format(endTime));
|
||||||
while (passedMinutes < totalMinutes) {
|
while (passedMinutes < totalMinutes) {
|
||||||
print(fillLoadingBar(passedMinutes, true));
|
print(fillLoadingBar(passedMinutes, true));
|
||||||
waitUntilNextMinute(debug, millisWaiting);
|
waitUntilNextMinute(debug, millisWaiting);
|
||||||
passedMinutes++;
|
passedMinutes++;
|
||||||
}
|
}
|
||||||
println(fillLoadingBar(passedMinutes, false));
|
println(fillLoadingBar(passedMinutes, false));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected abstract String fillLoadingBar(long passedMinutes, boolean progressive);
|
protected abstract String fillLoadingBar(long passedMinutes, boolean progressive);
|
||||||
|
|
||||||
|
|
||||||
protected void waitUntilNextMinute() {
|
protected void waitUntilNextMinute() {
|
||||||
waitUntilNextMinute(false, 0L);
|
waitUntilNextMinute(false, 0L);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected void waitUntilNextMinuteDebug() {
|
protected void waitUntilNextMinuteDebug() {
|
||||||
waitUntilNextMinute(true, 100L);
|
waitUntilNextMinute(true, 100L);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected void waitUntilNextMinuteDebug(long millisWaiting) {
|
protected void waitUntilNextMinuteDebug(long millisWaiting) {
|
||||||
waitUntilNextMinute(true, millisWaiting);
|
waitUntilNextMinute(true, millisWaiting);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void waitUntilNextMinute(boolean debug, long millisWaiting) {
|
private void waitUntilNextMinute(boolean debug, long millisWaiting) {
|
||||||
try {
|
try {
|
||||||
if (debug) {
|
if (debug) {
|
||||||
TimeUnit.MILLISECONDS.sleep(millisWaiting);
|
TimeUnit.MILLISECONDS.sleep(millisWaiting);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var now = LocalTime.now();
|
var now = LocalTime.now();
|
||||||
var oneMinuteLater = now.plusMinutes(1).truncatedTo(ChronoUnit.MINUTES);
|
var oneMinuteLater = now.plusMinutes(1).truncatedTo(ChronoUnit.MINUTES);
|
||||||
/* We wait whole seconds to not make it overly complicated.
|
/* 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.
|
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 */
|
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.SECONDS.sleep(now.until(oneMinuteLater, ChronoUnit.SECONDS) + 1);
|
||||||
} catch (InterruptedException ie) {
|
} catch (InterruptedException ie) {
|
||||||
Thread.currentThread().interrupt();
|
Thread.currentThread().interrupt();
|
||||||
throw new RuntimeException(ie);
|
throw new RuntimeException(ie);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,50 +1,50 @@
|
|||||||
package de.szimnau;
|
package de.szimnau.zeitlaeufer;
|
||||||
|
|
||||||
import de.szimnau.tools.FormatTools;
|
import de.szimnau.zeitlaeufer.tools.FormatTools;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.math.MathContext;
|
import java.math.MathContext;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
|
|
||||||
|
|
||||||
public abstract class AbstractProgressBar extends AbstractLoadingBar {
|
public abstract class AbstractProgressBar extends AbstractLoadingBar {
|
||||||
|
|
||||||
protected static final int LINE_LENGTH = 100;
|
protected static final int LINE_LENGTH = 100;
|
||||||
protected static final BigDecimal ONE_HUNDRED_PERCENT = BigDecimal.valueOf(100);
|
protected static final BigDecimal ONE_HUNDRED_PERCENT = BigDecimal.valueOf(100);
|
||||||
|
|
||||||
|
|
||||||
protected AbstractProgressBar(LocalTime startTime) {
|
protected AbstractProgressBar(LocalTime startTime) {
|
||||||
super(startTime);
|
super(startTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected AbstractProgressBar(LocalTime startTime, LocalTime endTime) {
|
protected AbstractProgressBar(LocalTime startTime, LocalTime endTime) {
|
||||||
super(startTime, endTime);
|
super(startTime, endTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String fillLoadingBar(long passedMinutes, boolean progressive) {
|
protected String fillLoadingBar(long passedMinutes, boolean progressive) {
|
||||||
var nonNegativePassedMinutes = BigDecimal.valueOf(passedMinutes < 0 ? 0 : passedMinutes);
|
var nonNegativePassedMinutes = BigDecimal.valueOf(passedMinutes < 0 ? 0 : passedMinutes);
|
||||||
BigDecimal wholePercentage = ONE_HUNDRED_PERCENT
|
BigDecimal wholePercentage = ONE_HUNDRED_PERCENT
|
||||||
// kind of reverse dreisatz to avoid having e.g. 99.9999 instead of 100 %
|
// kind of reverse dreisatz to avoid having e.g. 99.9999 instead of 100 %
|
||||||
.multiply(nonNegativePassedMinutes)
|
.multiply(nonNegativePassedMinutes)
|
||||||
.divide(getTotalMinutesBD(), MathContext.DECIMAL64);
|
.divide(getTotalMinutesBD(), MathContext.DECIMAL64);
|
||||||
int numberOfEquals = wholePercentage.intValue();
|
int numberOfEquals = wholePercentage.intValue();
|
||||||
var sb = new StringBuilder("[");
|
var sb = new StringBuilder("[");
|
||||||
for (int i = 0; i < LINE_LENGTH; i++) {
|
for (int i = 0; i < LINE_LENGTH; i++) {
|
||||||
if (i < numberOfEquals) {
|
if (i < numberOfEquals) {
|
||||||
sb.append("=");
|
sb.append("=");
|
||||||
} else {
|
} else {
|
||||||
sb.append("-");
|
sb.append("-");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
BigDecimal remainingMinutes = getTotalMinutesBD().subtract(nonNegativePassedMinutes);
|
BigDecimal remainingMinutes = getTotalMinutesBD().subtract(nonNegativePassedMinutes);
|
||||||
sb.append("] ").append(FormatTools.PERCENTAGE_FORMAT.format(wholePercentage)).append("% ")
|
sb.append("] ").append(FormatTools.PERCENTAGE_FORMAT.format(wholePercentage)).append("% ")
|
||||||
.append(FormatTools.minutesToTimeString(nonNegativePassedMinutes)).append(" - ")
|
.append(FormatTools.minutesToTimeString(nonNegativePassedMinutes)).append(" - ")
|
||||||
.append(FormatTools.minutesToTimeString(remainingMinutes));
|
.append(FormatTools.minutesToTimeString(remainingMinutes));
|
||||||
if (progressive) {
|
if (progressive) {
|
||||||
sb.append("\r");
|
sb.append("\r");
|
||||||
}
|
}
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,96 +1,96 @@
|
|||||||
package de.szimnau;
|
package de.szimnau.zeitlaeufer;
|
||||||
|
|
||||||
import de.szimnau.tools.CommonTools;
|
import de.szimnau.zeitlaeufer.tools.CommonTools;
|
||||||
import de.szimnau.tools.FormatTools;
|
import de.szimnau.zeitlaeufer.tools.FormatTools;
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.math.MathContext;
|
import java.math.MathContext;
|
||||||
import java.math.RoundingMode;
|
import java.math.RoundingMode;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.text.DecimalFormat;
|
import java.text.DecimalFormat;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
import java.time.temporal.ChronoUnit;
|
import java.time.temporal.ChronoUnit;
|
||||||
|
|
||||||
import static de.szimnau.tools.CommonTools.print;
|
import static de.szimnau.zeitlaeufer.tools.CommonTools.print;
|
||||||
|
|
||||||
|
|
||||||
public class DrinkingBar extends AbstractLoadingBar {
|
public class DrinkingBar extends AbstractLoadingBar {
|
||||||
|
|
||||||
private static final int MINS_PER_HALF_HOUR = CommonTools.MINS_PER_HOUR / 2;
|
private static final int MINS_PER_HALF_HOUR = CommonTools.MINS_PER_HOUR / 2;
|
||||||
private static final int MINUTES_BEFORE_PAUSE = 4 * CommonTools.MINS_PER_HOUR + MINS_PER_HALF_HOUR;
|
private static final int MINUTES_BEFORE_PAUSE = 4 * CommonTools.MINS_PER_HOUR + MINS_PER_HALF_HOUR;
|
||||||
private static final int MINUTES_WITH_PAUSE = 6 * CommonTools.MINS_PER_HOUR;
|
private static final int MINUTES_WITH_PAUSE = 6 * CommonTools.MINS_PER_HOUR;
|
||||||
private static final int DEFAULT_TOTAL_TIME = 8 * CommonTools.MINS_PER_HOUR + MINS_PER_HALF_HOUR;
|
private static final int DEFAULT_TOTAL_TIME = 8 * CommonTools.MINS_PER_HOUR + MINS_PER_HALF_HOUR;
|
||||||
private static final BigDecimal DEFAULT_TOTAL_TIME_BD = BigDecimal.valueOf(DEFAULT_TOTAL_TIME);
|
private static final BigDecimal DEFAULT_TOTAL_TIME_BD = BigDecimal.valueOf(DEFAULT_TOTAL_TIME);
|
||||||
private static final BigDecimal DEFAULT_TOTAL_LITRES = BigDecimal.valueOf(2.0);
|
private static final BigDecimal DEFAULT_TOTAL_LITRES = BigDecimal.valueOf(2.0);
|
||||||
private static final BigDecimal QUARTER_LITRE = BigDecimal.valueOf(0.25);
|
private static final BigDecimal QUARTER_LITRE = BigDecimal.valueOf(0.25);
|
||||||
private static final DecimalFormat LITRE_FORMAT = new DecimalFormat("0.00");
|
private static final DecimalFormat LITRE_FORMAT = new DecimalFormat("0.00");
|
||||||
|
|
||||||
private BigDecimal totalLitres;
|
private BigDecimal totalLitres;
|
||||||
|
|
||||||
|
|
||||||
public static void main(String[] args) throws IOException {
|
public static void main(String[] args) throws IOException {
|
||||||
var br = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
|
var br = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
|
||||||
print("Ankunftszeit: ");
|
print("Ankunftszeit: ");
|
||||||
var startTime = LocalTime.parse(br.readLine(), FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
var startTime = LocalTime.parse(br.readLine(), FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
||||||
var db = new DrinkingBar(startTime);
|
var db = new DrinkingBar(startTime);
|
||||||
db.showLoadingBar();
|
db.showLoadingBar();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected DrinkingBar(LocalTime startTime) {
|
protected DrinkingBar(LocalTime startTime) {
|
||||||
super(startTime, DEFAULT_TOTAL_TIME);
|
super(startTime, DEFAULT_TOTAL_TIME);
|
||||||
this.totalLitres = DEFAULT_TOTAL_LITRES;
|
this.totalLitres = DEFAULT_TOTAL_LITRES;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void extraInitEndTimeTotalMinutes() {
|
protected void extraInitEndTimeTotalMinutes() {
|
||||||
// correct necessary litres to drink based on the end time.
|
// correct necessary litres to drink based on the end time.
|
||||||
// lower the volume in quarter litre steps
|
// lower the volume in quarter litre steps
|
||||||
BigDecimal calcTotalLitres = DEFAULT_TOTAL_LITRES;
|
BigDecimal calcTotalLitres = DEFAULT_TOTAL_LITRES;
|
||||||
BigDecimal totalLitresFromMinutes = DEFAULT_TOTAL_LITRES
|
BigDecimal totalLitresFromMinutes = DEFAULT_TOTAL_LITRES
|
||||||
.multiply(getTotalMinutesBD()) // reverse dreisatz
|
.multiply(getTotalMinutesBD()) // reverse dreisatz
|
||||||
.divide(DEFAULT_TOTAL_TIME_BD, MathContext.DECIMAL64);
|
.divide(DEFAULT_TOTAL_TIME_BD, MathContext.DECIMAL64);
|
||||||
do {
|
do {
|
||||||
calcTotalLitres = calcTotalLitres.subtract(QUARTER_LITRE);
|
calcTotalLitres = calcTotalLitres.subtract(QUARTER_LITRE);
|
||||||
} while (calcTotalLitres.compareTo(totalLitresFromMinutes) >= 0);
|
} while (calcTotalLitres.compareTo(totalLitresFromMinutes) >= 0);
|
||||||
// add quarter since we always did a step "too many", due to the do ... while loop
|
// add quarter since we always did a step "too many", due to the do ... while loop
|
||||||
this.totalLitres = calcTotalLitres.add(QUARTER_LITRE);
|
this.totalLitres = calcTotalLitres.add(QUARTER_LITRE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String fillLoadingBar(long passedMinutes, boolean progressive) {
|
protected String fillLoadingBar(long passedMinutes, boolean progressive) {
|
||||||
long effectivePassedMinutes = passedMinutes < 0 ? 0 : passedMinutes;
|
long effectivePassedMinutes = passedMinutes < 0 ? 0 : passedMinutes;
|
||||||
if (getTotalMinutes() > MINUTES_WITH_PAUSE && passedMinutes > MINUTES_BEFORE_PAUSE && passedMinutes <= MINUTES_WITH_PAUSE) {
|
if (getTotalMinutes() > MINUTES_WITH_PAUSE && passedMinutes > MINUTES_BEFORE_PAUSE && passedMinutes <= MINUTES_WITH_PAUSE) {
|
||||||
effectivePassedMinutes = MINUTES_BEFORE_PAUSE;
|
effectivePassedMinutes = MINUTES_BEFORE_PAUSE;
|
||||||
}
|
}
|
||||||
var effectivePassedMinutesBD = BigDecimal.valueOf(effectivePassedMinutes);
|
var effectivePassedMinutesBD = BigDecimal.valueOf(effectivePassedMinutes);
|
||||||
BigDecimal currentLitres = totalLitres
|
BigDecimal currentLitres = totalLitres
|
||||||
.multiply(effectivePassedMinutesBD) // reverse dreisatz
|
.multiply(effectivePassedMinutesBD) // reverse dreisatz
|
||||||
.divide(getTotalMinutesBD(), MathContext.DECIMAL64)
|
.divide(getTotalMinutesBD(), MathContext.DECIMAL64)
|
||||||
.add(QUARTER_LITRE);
|
.add(QUARTER_LITRE);
|
||||||
BigDecimal printedLitres = currentLitres.subtract(currentLitres.remainder(QUARTER_LITRE, MathContext.DECIMAL64));
|
BigDecimal printedLitres = currentLitres.subtract(currentLitres.remainder(QUARTER_LITRE, MathContext.DECIMAL64));
|
||||||
/* BigDecimal currentProgressToNextStep = ONE_HUNDRED_PERCENT
|
/* BigDecimal currentProgressToNextStep = ONE_HUNDRED_PERCENT
|
||||||
.multiply(currentLitres.subtract(printedLitres)) // reverse dreisatz
|
.multiply(currentLitres.subtract(printedLitres)) // reverse dreisatz
|
||||||
.divide(QUARTER_LITRE, MathContext.DECIMAL64); */
|
.divide(QUARTER_LITRE, MathContext.DECIMAL64); */
|
||||||
BigDecimal minutesToNextStep = getMinutesToNextStep(currentLitres);
|
BigDecimal minutesToNextStep = getMinutesToNextStep(currentLitres);
|
||||||
String progressivePart = progressive ? "\r" : "";
|
String progressivePart = progressive ? "\r" : "";
|
||||||
return progressivePart + "Aktuelles Volumen: " + LITRE_FORMAT.format(printedLitres) + "L - "
|
return progressivePart + "Aktuelles Volumen: " + LITRE_FORMAT.format(printedLitres) + "L - "
|
||||||
// + FormatTools.PERCENTAGE_FORMAT.format(currentProgressToNextStep) + "% - "
|
// + FormatTools.PERCENTAGE_FORMAT.format(currentProgressToNextStep) + "% - "
|
||||||
+ FormatTools.minutesToTimeString(minutesToNextStep);
|
+ FormatTools.minutesToTimeString(minutesToNextStep);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private BigDecimal getMinutesToNextStep(BigDecimal currentLitres) {
|
private BigDecimal getMinutesToNextStep(BigDecimal currentLitres) {
|
||||||
// berechne Liter benötigt bis zum nächsten 0.25er Schritt
|
// berechne Liter benötigt bis zum nächsten 0.25er Schritt
|
||||||
BigDecimal litresToNextStep = QUARTER_LITRE.subtract(currentLitres.remainder(QUARTER_LITRE));
|
BigDecimal litresToNextStep = QUARTER_LITRE.subtract(currentLitres.remainder(QUARTER_LITRE));
|
||||||
// berechne Minuten benötigt für 1 Liter
|
// berechne Minuten benötigt für 1 Liter
|
||||||
BigDecimal minutesPerLitre = getTotalMinutesBD().divide(totalLitres, MathContext.DECIMAL64);
|
BigDecimal minutesPerLitre = getTotalMinutesBD().divide(totalLitres, MathContext.DECIMAL64);
|
||||||
// berechne Minuten benötigt bis zum nächsten 0.25er Schritt
|
// berechne Minuten benötigt bis zum nächsten 0.25er Schritt
|
||||||
// runde auf ganze Zahl, da wir nur ganze Minuten anzeigen und damit 1.999 = 2 Minuten sind
|
// runde auf ganze Zahl, da wir nur ganze Minuten anzeigen und damit 1.999 = 2 Minuten sind
|
||||||
return minutesPerLitre.multiply(litresToNextStep).setScale(0, RoundingMode.HALF_EVEN);
|
return minutesPerLitre.multiply(litresToNextStep).setScale(0, RoundingMode.HALF_EVEN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,139 +1,139 @@
|
|||||||
package de.szimnau;
|
package de.szimnau.zeitlaeufer;
|
||||||
|
|
||||||
import de.szimnau.tools.CommonTools;
|
import de.szimnau.zeitlaeufer.tools.CommonTools;
|
||||||
import de.szimnau.tools.FormatTools;
|
import de.szimnau.zeitlaeufer.tools.FormatTools;
|
||||||
import java.io.IOException;
|
import de.szimnau.zeitlaeufer.tools.LoadingBarCliTools;
|
||||||
import java.time.LocalTime;
|
import java.io.IOException;
|
||||||
import java.time.temporal.ChronoUnit;
|
import java.time.LocalTime;
|
||||||
import java.util.*;
|
import java.time.temporal.ChronoUnit;
|
||||||
import de.szimnau.tools.LoadingBarCliTools;
|
import java.util.*;
|
||||||
|
|
||||||
import static de.szimnau.tools.CommonTools.print;
|
import static de.szimnau.zeitlaeufer.tools.CommonTools.print;
|
||||||
|
|
||||||
|
|
||||||
public class LoadingBar extends AbstractProgressBar {
|
public class LoadingBar extends AbstractProgressBar {
|
||||||
|
|
||||||
public static final long MAX_NUMBER_WORK_MINS = 8L * CommonTools.MINS_PER_HOUR;
|
public static final long MAX_NUMBER_WORK_MINS = 8L * CommonTools.MINS_PER_HOUR;
|
||||||
public static final int MIN_LUNCH_DURATION = 30;
|
public static final int MIN_LUNCH_DURATION = 30;
|
||||||
public static final LocalTime LATEST_LUNCH_TIME = LocalTime.of(13, 30);
|
public static final LocalTime LATEST_LUNCH_TIME = LocalTime.of(13, 30);
|
||||||
public static final int MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH = 6 * CommonTools.MINS_PER_HOUR;
|
public static final int MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH = 6 * CommonTools.MINS_PER_HOUR;
|
||||||
protected static final long DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH = 5L * CommonTools.MINS_PER_HOUR;
|
protected static final long DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH = 5L * CommonTools.MINS_PER_HOUR;
|
||||||
|
|
||||||
|
|
||||||
protected LoadingBar(LocalTime startTime) {
|
protected LoadingBar(LocalTime startTime) {
|
||||||
super(startTime);
|
super(startTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static void main(String[] args) throws IOException {
|
public static void main(String[] args) throws IOException {
|
||||||
if (args.length == 0) {
|
if (args.length == 0) {
|
||||||
LoadingBarCliTools.askParametersAndRun(LoadingBar::new);
|
LoadingBarCliTools.askParametersAndRun(LoadingBar::new);
|
||||||
} else {
|
} else {
|
||||||
LoadingBarCliTools.parseParametersAndRun(args, LoadingBar::new);
|
LoadingBarCliTools.parseParametersAndRun(args, LoadingBar::new);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public boolean hasMittagspauseArrived() {
|
public boolean hasMittagspauseArrived() {
|
||||||
return hasMittagspauseArrived(false);
|
return hasMittagspauseArrived(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public boolean hasMittagspauseArrived(boolean debugWithPassedMinutesZero) {
|
public boolean hasMittagspauseArrived(boolean debugWithPassedMinutesZero) {
|
||||||
return getPassedMinutes(debugWithPassedMinutesZero) < DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH;
|
return getPassedMinutes(debugWithPassedMinutesZero) < DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void initMittagspause() {
|
public void initMittagspause() {
|
||||||
LocalTime defaultEndTime = getStartTime().plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH);
|
LocalTime defaultEndTime = getStartTime().plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH);
|
||||||
realInitMittagspause(defaultEndTime);
|
realInitMittagspause(defaultEndTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void initMittagspause(int endTimeOffset) {
|
public void initMittagspause(int endTimeOffset) {
|
||||||
LocalTime offsetEndTime = getStartTime().plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH + endTimeOffset);
|
LocalTime offsetEndTime = getStartTime().plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH + endTimeOffset);
|
||||||
realInitMittagspause(offsetEndTime);
|
realInitMittagspause(offsetEndTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void initMittagspause(LocalTime manualEndTime) {
|
public void initMittagspause(LocalTime manualEndTime) {
|
||||||
LocalTime effectiveEndTime = manualEndTime != null ? manualEndTime : getStartTime().plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH);
|
LocalTime effectiveEndTime = manualEndTime != null ? manualEndTime : getStartTime().plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH);
|
||||||
realInitMittagspause(effectiveEndTime);
|
realInitMittagspause(effectiveEndTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void realInitMittagspause(LocalTime theoreticalEndTime) {
|
private void realInitMittagspause(LocalTime theoreticalEndTime) {
|
||||||
setEndTime(theoreticalEndTime.isAfter(LATEST_LUNCH_TIME) ? LATEST_LUNCH_TIME : theoreticalEndTime);
|
setEndTime(theoreticalEndTime.isAfter(LATEST_LUNCH_TIME) ? LATEST_LUNCH_TIME : theoreticalEndTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void initZapfenstreich() {
|
public void initZapfenstreich() {
|
||||||
LocalTime trueEndTime = getStartTime().plusMinutes(MAX_NUMBER_WORK_MINS + MIN_LUNCH_DURATION);
|
LocalTime trueEndTime = getStartTime().plusMinutes(MAX_NUMBER_WORK_MINS + MIN_LUNCH_DURATION);
|
||||||
realInitZapfenstreich(MIN_LUNCH_DURATION, trueEndTime);
|
realInitZapfenstreich(MIN_LUNCH_DURATION, trueEndTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void initZapfenstreich(Integer manualLunchDuration) {
|
public void initZapfenstreich(Integer manualLunchDuration) {
|
||||||
initZapfenstreich(manualLunchDuration, 0);
|
initZapfenstreich(manualLunchDuration, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void initZapfenstreich(Integer manualLunchDuration, int endTimeOffset) {
|
public void initZapfenstreich(Integer manualLunchDuration, int endTimeOffset) {
|
||||||
long minLunchDuration = getMinLunchDuration(endTimeOffset);
|
long minLunchDuration = getMinLunchDuration(endTimeOffset);
|
||||||
long realLunchDuration = getRealLunchDuration(manualLunchDuration, minLunchDuration);
|
long realLunchDuration = getRealLunchDuration(manualLunchDuration, minLunchDuration);
|
||||||
LocalTime trueEndTime = getStartTime().plusMinutes(MAX_NUMBER_WORK_MINS + realLunchDuration + endTimeOffset);
|
LocalTime trueEndTime = getStartTime().plusMinutes(MAX_NUMBER_WORK_MINS + realLunchDuration + endTimeOffset);
|
||||||
realInitZapfenstreich(realLunchDuration, trueEndTime);
|
realInitZapfenstreich(realLunchDuration, trueEndTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void initZapfenstreich(Integer manualLunchDuration, LocalTime manualEndTime) {
|
public void initZapfenstreich(Integer manualLunchDuration, LocalTime manualEndTime) {
|
||||||
LocalTime trueEndTime = manualEndTime;
|
LocalTime trueEndTime = manualEndTime;
|
||||||
long minLunchDuration = getMinLunchDuration(trueEndTime);
|
long minLunchDuration = getMinLunchDuration(trueEndTime);
|
||||||
long realLunchDuration = getRealLunchDuration(manualLunchDuration, minLunchDuration);
|
long realLunchDuration = getRealLunchDuration(manualLunchDuration, minLunchDuration);
|
||||||
if (trueEndTime == null) {
|
if (trueEndTime == null) {
|
||||||
trueEndTime = getStartTime().plusMinutes(MAX_NUMBER_WORK_MINS + realLunchDuration);
|
trueEndTime = getStartTime().plusMinutes(MAX_NUMBER_WORK_MINS + realLunchDuration);
|
||||||
}
|
}
|
||||||
realInitZapfenstreich(realLunchDuration, trueEndTime);
|
realInitZapfenstreich(realLunchDuration, trueEndTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private long getMinLunchDuration(int endTimeOffset) {
|
private long getMinLunchDuration(int endTimeOffset) {
|
||||||
if (endTimeOffset <= 0) {
|
if (endTimeOffset <= 0) {
|
||||||
return MIN_LUNCH_DURATION;
|
return MIN_LUNCH_DURATION;
|
||||||
}
|
}
|
||||||
long totalDuration = MAX_NUMBER_WORK_MINS + endTimeOffset;
|
long totalDuration = MAX_NUMBER_WORK_MINS + endTimeOffset;
|
||||||
return getMinLunchDuration(totalDuration);
|
return getMinLunchDuration(totalDuration);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private long getMinLunchDuration(LocalTime manualEndTime) {
|
private long getMinLunchDuration(LocalTime manualEndTime) {
|
||||||
if (manualEndTime == null) {
|
if (manualEndTime == null) {
|
||||||
return MIN_LUNCH_DURATION;
|
return MIN_LUNCH_DURATION;
|
||||||
}
|
}
|
||||||
long totalDuration = getStartTime().until(manualEndTime, ChronoUnit.MINUTES);
|
long totalDuration = getStartTime().until(manualEndTime, ChronoUnit.MINUTES);
|
||||||
return getMinLunchDuration(totalDuration);
|
return getMinLunchDuration(totalDuration);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private long getMinLunchDuration(long precalculatedTotalDuration) {
|
private long getMinLunchDuration(long precalculatedTotalDuration) {
|
||||||
long effectiveLunchDuration = precalculatedTotalDuration - MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH;
|
long effectiveLunchDuration = precalculatedTotalDuration - MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH;
|
||||||
if (effectiveLunchDuration < 0) {
|
if (effectiveLunchDuration < 0) {
|
||||||
effectiveLunchDuration = 0;
|
effectiveLunchDuration = 0;
|
||||||
}
|
}
|
||||||
return Math.min(effectiveLunchDuration, MIN_LUNCH_DURATION);
|
return Math.min(effectiveLunchDuration, MIN_LUNCH_DURATION);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private long getRealLunchDuration(Integer manualLunchDuration, long minLunchDuration) {
|
private long getRealLunchDuration(Integer manualLunchDuration, long minLunchDuration) {
|
||||||
return manualLunchDuration != null && manualLunchDuration >= minLunchDuration ? manualLunchDuration : minLunchDuration;
|
return manualLunchDuration != null && manualLunchDuration >= minLunchDuration ? manualLunchDuration : minLunchDuration;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void realInitZapfenstreich(long effectiveLunchDuration, LocalTime effectiveEndTime) {
|
private void realInitZapfenstreich(long effectiveLunchDuration, LocalTime effectiveEndTime) {
|
||||||
if (effectiveLunchDuration > 0) {
|
if (effectiveLunchDuration > 0) {
|
||||||
var totalWorkTime = LocalTime.MIDNIGHT.plusMinutes(getStartTime().until(effectiveEndTime, ChronoUnit.MINUTES) - effectiveLunchDuration);
|
var totalWorkTime = LocalTime.MIDNIGHT.plusMinutes(getStartTime().until(effectiveEndTime, ChronoUnit.MINUTES) - effectiveLunchDuration);
|
||||||
print("Arbeitszeit: " + FormatTools.TIME_FORMATTER.format(totalWorkTime) + "; ");
|
print("Arbeitszeit: " + FormatTools.TIME_FORMATTER.format(totalWorkTime) + "; ");
|
||||||
}
|
}
|
||||||
setEndTime(effectiveEndTime);
|
setEndTime(effectiveEndTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,102 +1,102 @@
|
|||||||
package de.szimnau;
|
package de.szimnau.zeitlaeufer;
|
||||||
|
|
||||||
import de.szimnau.tools.FormatTools;
|
import de.szimnau.zeitlaeufer.tools.FormatTools;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
import static de.szimnau.tools.CommonTools.println;
|
import static de.szimnau.zeitlaeufer.tools.CommonTools.println;
|
||||||
|
|
||||||
|
|
||||||
public class SimpleLoadingBar extends AbstractProgressBar {
|
public class SimpleLoadingBar extends AbstractProgressBar {
|
||||||
|
|
||||||
private final String title;
|
private final String title;
|
||||||
|
|
||||||
|
|
||||||
private SimpleLoadingBar(LocalTime startTime, LocalTime endTime, String title) {
|
private SimpleLoadingBar(LocalTime startTime, LocalTime endTime, String title) {
|
||||||
super(startTime, endTime);
|
super(startTime, endTime);
|
||||||
this.title = initTitle(title);
|
this.title = initTitle(title);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
if (args.length > 0 && Objects.equals(args[0], "--help")) {
|
if (args.length > 0 && Objects.equals(args[0], "--help")) {
|
||||||
printHelp();
|
printHelp();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
verifyMinimumNumberOfArgs(args);
|
verifyMinimumNumberOfArgs(args);
|
||||||
String nextArg = args[0];
|
String nextArg = args[0];
|
||||||
verifyTimeFormat(nextArg, "Erstes Argument");
|
verifyTimeFormat(nextArg, "Erstes Argument");
|
||||||
var firstTime = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER);
|
var firstTime = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER);
|
||||||
LocalTime startTime;
|
LocalTime startTime;
|
||||||
String title = "";
|
String title = "";
|
||||||
LocalTime endTime = null;
|
LocalTime endTime = null;
|
||||||
if (args.length > 1) {
|
if (args.length > 1) {
|
||||||
nextArg = args[1];
|
nextArg = args[1];
|
||||||
if ("-msg".equals(nextArg)) {
|
if ("-msg".equals(nextArg)) {
|
||||||
title = args.length > 2 ? args[2] : title;
|
title = args.length > 2 ? args[2] : title;
|
||||||
} else {
|
} else {
|
||||||
verifyTimeFormat(nextArg, "Zweites Argument");
|
verifyTimeFormat(nextArg, "Zweites Argument");
|
||||||
endTime = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER);
|
endTime = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (endTime == null) {
|
if (endTime == null) {
|
||||||
startTime = LocalTime.now();
|
startTime = LocalTime.now();
|
||||||
endTime = firstTime;
|
endTime = firstTime;
|
||||||
} else {
|
} else {
|
||||||
startTime = firstTime;
|
startTime = firstTime;
|
||||||
}
|
}
|
||||||
if (args.length == 2 || !title.isBlank()) {
|
if (args.length == 2 || !title.isBlank()) {
|
||||||
new SimpleLoadingBar(startTime, endTime, title).showLoadingBar();
|
new SimpleLoadingBar(startTime, endTime, title).showLoadingBar();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// if there are 3 arguments, the third will be discarded.
|
// if there are 3 arguments, the third will be discarded.
|
||||||
boolean hasTitleArg = args.length > 3 && "-msg".equals(args[2]);
|
boolean hasTitleArg = args.length > 3 && "-msg".equals(args[2]);
|
||||||
title = hasTitleArg ? args[3] : title;
|
title = hasTitleArg ? args[3] : title;
|
||||||
new SimpleLoadingBar(startTime, endTime, title).showLoadingBar();
|
new SimpleLoadingBar(startTime, endTime, title).showLoadingBar();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void printHelp() {
|
private static void printHelp() {
|
||||||
println("Mögliche Argumente für LoadingBar:\n"
|
println("Mögliche Argumente für LoadingBar:\n"
|
||||||
+ "Startzeit, Endzeit, Endnachricht (Optional)\n"
|
+ "Startzeit, Endzeit, Endnachricht (Optional)\n"
|
||||||
+ FormatTools.TIME_FORMAT + " " + FormatTools.TIME_FORMAT + " -msg <Nachricht>\n"
|
+ FormatTools.TIME_FORMAT + " " + FormatTools.TIME_FORMAT + " -msg <Nachricht>\n"
|
||||||
+ "Endzeit (Startzeit = jetzt), Endnachricht (Optional)\n"
|
+ "Endzeit (Startzeit = jetzt), Endnachricht (Optional)\n"
|
||||||
+ FormatTools.TIME_FORMAT + " -msg <Nachricht>\n"
|
+ FormatTools.TIME_FORMAT + " -msg <Nachricht>\n"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void verifyMinimumNumberOfArgs(String[] args) {
|
private static void verifyMinimumNumberOfArgs(String[] args) {
|
||||||
if (args.length >= 1) {
|
if (args.length >= 1) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
println("Mindestens 1 Argument muss gegeben sein.");
|
println("Mindestens 1 Argument muss gegeben sein.");
|
||||||
printHelp();
|
printHelp();
|
||||||
System.exit(1);
|
System.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void verifyTimeFormat(String param, String errMsgPrefix) {
|
private static void verifyTimeFormat(String param, String errMsgPrefix) {
|
||||||
if (FormatTools.TIME_PATTERN.matcher(param).matches()) {
|
if (FormatTools.TIME_PATTERN.matcher(param).matches()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
println(errMsgPrefix + " \"" + param + "\" muss Uhrzeitformat (" + FormatTools.TIME_FORMAT + ") entsprechen.");
|
println(errMsgPrefix + " \"" + param + "\" muss Uhrzeitformat (" + FormatTools.TIME_FORMAT + ") entsprechen.");
|
||||||
System.exit(1);
|
System.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private String initTitle(String inputTitle) {
|
private String initTitle(String inputTitle) {
|
||||||
String fallbackTitle = "Ende! Endzeit " + FormatTools.TIME_FORMATTER.format(getEndTime()) + " erreicht.";
|
String fallbackTitle = "Ende! Endzeit " + FormatTools.TIME_FORMATTER.format(getEndTime()) + " erreicht.";
|
||||||
String effectiveTitle = inputTitle == null || inputTitle.isBlank() ? fallbackTitle : inputTitle;
|
String effectiveTitle = inputTitle == null || inputTitle.isBlank() ? fallbackTitle : inputTitle;
|
||||||
String separator = "*".repeat(effectiveTitle.length());
|
String separator = "*".repeat(effectiveTitle.length());
|
||||||
return separator + "\n" + effectiveTitle + "\n" + separator;
|
return separator + "\n" + effectiveTitle + "\n" + separator;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void showLoadingBar() {
|
public void showLoadingBar() {
|
||||||
super.showLoadingBar();
|
super.showLoadingBar();
|
||||||
// showLoadingBarDebug(); // DEBUG
|
// showLoadingBarDebug(); // DEBUG
|
||||||
println(title);
|
println(title);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,44 +1,44 @@
|
|||||||
package de.szimnau;
|
package de.szimnau.zeitlaeufer;
|
||||||
|
|
||||||
import de.szimnau.tools.LoadingBarCliTools;
|
import de.szimnau.zeitlaeufer.tools.LoadingBarCliTools;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
|
|
||||||
|
|
||||||
public class WorkLoadingBar extends LoadingBar {
|
public class WorkLoadingBar extends LoadingBar {
|
||||||
|
|
||||||
private final LoadingBar loadingBar;
|
private final LoadingBar loadingBar;
|
||||||
private final DrinkingBar drinkingBar;
|
private final DrinkingBar drinkingBar;
|
||||||
|
|
||||||
|
|
||||||
private WorkLoadingBar(LocalTime startTime) {
|
private WorkLoadingBar(LocalTime startTime) {
|
||||||
super(startTime);
|
super(startTime);
|
||||||
this.loadingBar = new LoadingBar(startTime);
|
this.loadingBar = new LoadingBar(startTime);
|
||||||
this.drinkingBar = new DrinkingBar(startTime);
|
this.drinkingBar = new DrinkingBar(startTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static void main(String[] args) throws IOException {
|
public static void main(String[] args) throws IOException {
|
||||||
if (args.length == 0) {
|
if (args.length == 0) {
|
||||||
LoadingBarCliTools.askParametersAndRun(WorkLoadingBar::new);
|
LoadingBarCliTools.askParametersAndRun(WorkLoadingBar::new);
|
||||||
} else {
|
} else {
|
||||||
LoadingBarCliTools.parseParametersAndRun(args, WorkLoadingBar::new);
|
LoadingBarCliTools.parseParametersAndRun(args, WorkLoadingBar::new);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void extraInitEndTimeTotalMinutes() {
|
protected void extraInitEndTimeTotalMinutes() {
|
||||||
LocalTime endTime = getEndTime();
|
LocalTime endTime = getEndTime();
|
||||||
loadingBar.setEndTime(endTime);
|
loadingBar.setEndTime(endTime);
|
||||||
drinkingBar.setEndTime(endTime);
|
drinkingBar.setEndTime(endTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String fillLoadingBar(long passedMinutes, boolean progressive) {
|
protected String fillLoadingBar(long passedMinutes, boolean progressive) {
|
||||||
String filledLoadingBar = loadingBar.fillLoadingBar(passedMinutes, false);
|
String filledLoadingBar = loadingBar.fillLoadingBar(passedMinutes, false);
|
||||||
filledLoadingBar += " | " + drinkingBar.fillLoadingBar(passedMinutes, false);
|
filledLoadingBar += " | " + drinkingBar.fillLoadingBar(passedMinutes, false);
|
||||||
return filledLoadingBar + (progressive ? "\r" : "");
|
return filledLoadingBar + (progressive ? "\r" : "");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,26 +1,26 @@
|
|||||||
package de.szimnau.tools;
|
package de.szimnau.zeitlaeufer.tools;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.math.MathContext;
|
import java.math.MathContext;
|
||||||
import java.math.RoundingMode;
|
import java.math.RoundingMode;
|
||||||
|
|
||||||
|
|
||||||
public class CommonTools {
|
public class CommonTools {
|
||||||
|
|
||||||
public static final int MINS_PER_HOUR = 60;
|
public static final int MINS_PER_HOUR = 60;
|
||||||
public static final BigDecimal MINS_PER_HOUR_BD = BigDecimal.valueOf(MINS_PER_HOUR);
|
public static final BigDecimal MINS_PER_HOUR_BD = BigDecimal.valueOf(MINS_PER_HOUR);
|
||||||
public static final MathContext MC_INTEGER = new MathContext(1, RoundingMode.HALF_EVEN);
|
public static final MathContext MC_INTEGER = new MathContext(1, RoundingMode.HALF_EVEN);
|
||||||
|
|
||||||
|
|
||||||
private CommonTools() {}
|
private CommonTools() {}
|
||||||
|
|
||||||
|
|
||||||
public static void print(Object o) {
|
public static void print(Object o) {
|
||||||
System.out.print(o);
|
System.out.print(o);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static void println(Object o) {
|
public static void println(Object o) {
|
||||||
System.out.println(o);
|
System.out.println(o);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,31 +1,31 @@
|
|||||||
package de.szimnau.tools;
|
package de.szimnau.zeitlaeufer.tools;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.text.DecimalFormat;
|
import java.text.DecimalFormat;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
|
||||||
public class FormatTools {
|
public class FormatTools {
|
||||||
|
|
||||||
public static final String TIME_FORMAT = "HH:mm";
|
public static final String TIME_FORMAT = "HH:mm";
|
||||||
public static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern(TIME_FORMAT);
|
public static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern(TIME_FORMAT);
|
||||||
public static final Pattern TIME_PATTERN = Pattern.compile("(?>[01]\\d|2[0-4]):[0-5]\\d");
|
public static final Pattern TIME_PATTERN = Pattern.compile("(?>[01]\\d|2[0-4]):[0-5]\\d");
|
||||||
public static final DecimalFormat PERCENTAGE_FORMAT = new DecimalFormat("00.00");
|
public static final DecimalFormat PERCENTAGE_FORMAT = new DecimalFormat("00.00");
|
||||||
|
|
||||||
|
|
||||||
private FormatTools() {}
|
private FormatTools() {}
|
||||||
|
|
||||||
|
|
||||||
public static String minutesToTimeString(long minutes) {
|
public static String minutesToTimeString(long minutes) {
|
||||||
return minutesToTimeString(BigDecimal.valueOf(minutes));
|
return minutesToTimeString(BigDecimal.valueOf(minutes));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static String minutesToTimeString(BigDecimal minutes) {
|
public static String minutesToTimeString(BigDecimal minutes) {
|
||||||
BigDecimal[] hoursAndMinutes = minutes.divideAndRemainder(CommonTools.MINS_PER_HOUR_BD, CommonTools.MC_INTEGER);
|
BigDecimal[] hoursAndMinutes = minutes.divideAndRemainder(CommonTools.MINS_PER_HOUR_BD, CommonTools.MC_INTEGER);
|
||||||
return LocalTime.of(hoursAndMinutes[0].intValue(), hoursAndMinutes[1].intValue()).format(TIME_FORMATTER);
|
return LocalTime.of(hoursAndMinutes[0].intValue(), hoursAndMinutes[1].intValue()).format(TIME_FORMATTER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,281 +1,281 @@
|
|||||||
package de.szimnau.tools;
|
package de.szimnau.zeitlaeufer.tools;
|
||||||
|
|
||||||
import de.szimnau.LoadingBar;
|
import de.szimnau.zeitlaeufer.LoadingBar;
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
import java.time.temporal.ChronoUnit;
|
import java.time.temporal.ChronoUnit;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import static de.szimnau.tools.CommonTools.print;
|
import static de.szimnau.zeitlaeufer.tools.CommonTools.print;
|
||||||
import static de.szimnau.tools.CommonTools.println;
|
import static de.szimnau.zeitlaeufer.tools.CommonTools.println;
|
||||||
|
|
||||||
public class LoadingBarCliTools {
|
public class LoadingBarCliTools {
|
||||||
|
|
||||||
private static final Pattern OFFSET_PATTERN = Pattern.compile("[+-]\\d+");
|
private static final Pattern OFFSET_PATTERN = Pattern.compile("[+-]\\d+");
|
||||||
private static final Pattern LUNCH_DURATION_PATTERN = Pattern.compile("\\d+");
|
private static final Pattern LUNCH_DURATION_PATTERN = Pattern.compile("\\d+");
|
||||||
|
|
||||||
|
|
||||||
private enum DaySection {
|
private enum DaySection {
|
||||||
MITTAG("-m", "Mittag"),
|
MITTAG("-m", "Mittag"),
|
||||||
ZAPFENSTREICH("-z", "Zapfenstreich");
|
ZAPFENSTREICH("-z", "Zapfenstreich");
|
||||||
|
|
||||||
private final String param;
|
private final String param;
|
||||||
private final String description;
|
private final String description;
|
||||||
|
|
||||||
|
|
||||||
DaySection(String param, String description) {
|
DaySection(String param, String description) {
|
||||||
this.param = param;
|
this.param = param;
|
||||||
this.description = description;
|
this.description = description;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static DaySection byParam(String param) {
|
public static DaySection byParam(String param) {
|
||||||
return Arrays.stream(DaySection.values()).filter((DaySection section) -> section.getParam().equals(param)).findFirst().orElse(null);
|
return Arrays.stream(DaySection.values()).filter((DaySection section) -> section.getParam().equals(param)).findFirst().orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public String getParam() {
|
public String getParam() {
|
||||||
return param;
|
return param;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
return description;
|
return description;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private LoadingBarCliTools() {}
|
private LoadingBarCliTools() {}
|
||||||
|
|
||||||
|
|
||||||
public static void askParametersAndRun(Function<LocalTime, ? extends LoadingBar> constructor) throws IOException {
|
public static void askParametersAndRun(Function<LocalTime, ? extends LoadingBar> constructor) throws IOException {
|
||||||
var br = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
|
var br = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
|
||||||
print("Ankunftszeit: ");
|
print("Ankunftszeit: ");
|
||||||
var startTime = LocalTime.parse(br.readLine(), FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
var startTime = LocalTime.parse(br.readLine(), FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
||||||
LoadingBar lb = constructor.apply(startTime);
|
LoadingBar lb = constructor.apply(startTime);
|
||||||
boolean debug = false;
|
boolean debug = false;
|
||||||
boolean passedMinutesZero = false;
|
boolean passedMinutesZero = false;
|
||||||
if (lb.hasMittagspauseArrived(debug && passedMinutesZero)) {
|
if (lb.hasMittagspauseArrived(debug && passedMinutesZero)) {
|
||||||
handleMittagspause(br, lb);
|
handleMittagspause(br, lb);
|
||||||
lb.showLoadingBar(debug, passedMinutesZero);
|
lb.showLoadingBar(debug, passedMinutesZero);
|
||||||
}
|
}
|
||||||
handleZapfenstreich(br, lb);
|
handleZapfenstreich(br, lb);
|
||||||
lb.showLoadingBar(debug, passedMinutesZero);
|
lb.showLoadingBar(debug, passedMinutesZero);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void handleMittagspause(BufferedReader br, LoadingBar lb) throws IOException {
|
private static void handleMittagspause(BufferedReader br, LoadingBar lb) throws IOException {
|
||||||
print("Mittagspause verschieben um (optional): ");
|
print("Mittagspause verschieben um (optional): ");
|
||||||
String mittagspauseOffsetRaw = br.readLine();
|
String mittagspauseOffsetRaw = br.readLine();
|
||||||
if (mittagspauseOffsetRaw != null && !mittagspauseOffsetRaw.isBlank()) {
|
if (mittagspauseOffsetRaw != null && !mittagspauseOffsetRaw.isBlank()) {
|
||||||
var mittagspauseOffset = Integer.parseInt(mittagspauseOffsetRaw);
|
var mittagspauseOffset = Integer.parseInt(mittagspauseOffsetRaw);
|
||||||
lb.initMittagspause(mittagspauseOffset);
|
lb.initMittagspause(mittagspauseOffset);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
print("Mittagspause um (optional): ");
|
print("Mittagspause um (optional): ");
|
||||||
String manualMittagspauseRaw = br.readLine();
|
String manualMittagspauseRaw = br.readLine();
|
||||||
if (manualMittagspauseRaw != null && !manualMittagspauseRaw.isBlank()) {
|
if (manualMittagspauseRaw != null && !manualMittagspauseRaw.isBlank()) {
|
||||||
var manualMittagspause = LocalTime.parse(manualMittagspauseRaw, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
var manualMittagspause = LocalTime.parse(manualMittagspauseRaw, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
||||||
lb.initMittagspause(manualMittagspause);
|
lb.initMittagspause(manualMittagspause);
|
||||||
} else {
|
} else {
|
||||||
lb.initMittagspause();
|
lb.initMittagspause();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void handleZapfenstreich(BufferedReader br, LoadingBar lb) throws IOException {
|
private static void handleZapfenstreich(BufferedReader br, LoadingBar lb) throws IOException {
|
||||||
print("Mittagspause hat gedauert (optional): ");
|
print("Mittagspause hat gedauert (optional): ");
|
||||||
String mittagspauseDurationRaw = br.readLine();
|
String mittagspauseDurationRaw = br.readLine();
|
||||||
Integer mittagspauseDuration = null;
|
Integer mittagspauseDuration = null;
|
||||||
if (mittagspauseDurationRaw != null && !mittagspauseDurationRaw.isBlank()) {
|
if (mittagspauseDurationRaw != null && !mittagspauseDurationRaw.isBlank()) {
|
||||||
mittagspauseDuration = Integer.valueOf(mittagspauseDurationRaw);
|
mittagspauseDuration = Integer.valueOf(mittagspauseDurationRaw);
|
||||||
}
|
}
|
||||||
LocalTime vorlaeufigeEndzeit = lb.getStartTime().plusMinutes(LoadingBar.MAX_NUMBER_WORK_MINS)
|
LocalTime vorlaeufigeEndzeit = lb.getStartTime().plusMinutes(LoadingBar.MAX_NUMBER_WORK_MINS)
|
||||||
.plusMinutes(mittagspauseDuration != null ? mittagspauseDuration : LoadingBar.MIN_LUNCH_DURATION);
|
.plusMinutes(mittagspauseDuration != null ? mittagspauseDuration : LoadingBar.MIN_LUNCH_DURATION);
|
||||||
println("Endzeit: " + FormatTools.TIME_FORMATTER.format(vorlaeufigeEndzeit));
|
println("Endzeit: " + FormatTools.TIME_FORMATTER.format(vorlaeufigeEndzeit));
|
||||||
print("Feierabend verschieben um (optional): ");
|
print("Feierabend verschieben um (optional): ");
|
||||||
String zapfenstreichOffsetRaw = br.readLine();
|
String zapfenstreichOffsetRaw = br.readLine();
|
||||||
if (zapfenstreichOffsetRaw != null && !zapfenstreichOffsetRaw.isBlank()) {
|
if (zapfenstreichOffsetRaw != null && !zapfenstreichOffsetRaw.isBlank()) {
|
||||||
int zapfenstreichOffset = Integer.parseInt(zapfenstreichOffsetRaw);
|
int zapfenstreichOffset = Integer.parseInt(zapfenstreichOffsetRaw);
|
||||||
lb.initZapfenstreich(mittagspauseDuration, zapfenstreichOffset);
|
lb.initZapfenstreich(mittagspauseDuration, zapfenstreichOffset);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
print("Manuelle Uhrzeit Feierabend (optional): ");
|
print("Manuelle Uhrzeit Feierabend (optional): ");
|
||||||
String manualZapfenstreichRaw = br.readLine();
|
String manualZapfenstreichRaw = br.readLine();
|
||||||
if (manualZapfenstreichRaw != null && !manualZapfenstreichRaw.isBlank()) {
|
if (manualZapfenstreichRaw != null && !manualZapfenstreichRaw.isBlank()) {
|
||||||
LocalTime manualZapfenstreich = LocalTime.parse(manualZapfenstreichRaw, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
LocalTime manualZapfenstreich = LocalTime.parse(manualZapfenstreichRaw, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
||||||
lb.initZapfenstreich(mittagspauseDuration, manualZapfenstreich);
|
lb.initZapfenstreich(mittagspauseDuration, manualZapfenstreich);
|
||||||
} else {
|
} else {
|
||||||
lb.initZapfenstreich(mittagspauseDuration);
|
lb.initZapfenstreich(mittagspauseDuration);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static void parseParametersAndRun(String[] args, Function<LocalTime, ? extends LoadingBar> constructor) {
|
public static void parseParametersAndRun(String[] args, Function<LocalTime, ? extends LoadingBar> constructor) {
|
||||||
String nextArg = args[0];
|
String nextArg = args[0];
|
||||||
if ("--help".equals(nextArg)) {
|
if ("--help".equals(nextArg)) {
|
||||||
printHelp();
|
printHelp();
|
||||||
System.exit(1);
|
System.exit(1);
|
||||||
}
|
}
|
||||||
verifyMinimumNumberOfArgs(args);
|
verifyMinimumNumberOfArgs(args);
|
||||||
verifyTimeFormat(nextArg, "Erstes Argument");
|
verifyTimeFormat(nextArg, "Erstes Argument");
|
||||||
var startTime = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
var startTime = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
||||||
nextArg = args[1];
|
nextArg = args[1];
|
||||||
var section = DaySection.byParam(nextArg);
|
var section = DaySection.byParam(nextArg);
|
||||||
verifyDaySection(section, nextArg);
|
verifyDaySection(section, nextArg);
|
||||||
LoadingBar lb = constructor.apply(startTime);
|
LoadingBar lb = constructor.apply(startTime);
|
||||||
if (section == DaySection.MITTAG) {
|
if (section == DaySection.MITTAG) {
|
||||||
initLoadingBarMittagspause(args, lb);
|
initLoadingBarMittagspause(args, lb);
|
||||||
} else {
|
} else {
|
||||||
initLoadingBarZapfenstreich(args, lb);
|
initLoadingBarZapfenstreich(args, lb);
|
||||||
}
|
}
|
||||||
boolean debug = false;
|
boolean debug = false;
|
||||||
boolean passedMinutesZero = false;
|
boolean passedMinutesZero = false;
|
||||||
lb.showLoadingBar(debug, passedMinutesZero);
|
lb.showLoadingBar(debug, passedMinutesZero);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void initLoadingBarMittagspause(String[] args, LoadingBar lb) {
|
private static void initLoadingBarMittagspause(String[] args, LoadingBar lb) {
|
||||||
if (args.length == 2) {
|
if (args.length == 2) {
|
||||||
lb.initMittagspause();
|
lb.initMittagspause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
String nextArg = args[2];
|
String nextArg = args[2];
|
||||||
if (OFFSET_PATTERN.matcher(nextArg).matches()) {
|
if (OFFSET_PATTERN.matcher(nextArg).matches()) {
|
||||||
lb.initMittagspause(Integer.parseInt(nextArg));
|
lb.initMittagspause(Integer.parseInt(nextArg));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
verifyTimeFormat(nextArg, "Argument nach " + DaySection.MITTAG.getParam());
|
verifyTimeFormat(nextArg, "Argument nach " + DaySection.MITTAG.getParam());
|
||||||
var manualMittagspause = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
var manualMittagspause = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
||||||
lb.initMittagspause(manualMittagspause);
|
lb.initMittagspause(manualMittagspause);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void initLoadingBarZapfenstreich(String[] args, LoadingBar lb) {
|
private static void initLoadingBarZapfenstreich(String[] args, LoadingBar lb) {
|
||||||
if (args.length == 2) {
|
if (args.length == 2) {
|
||||||
lb.initZapfenstreich();
|
lb.initZapfenstreich();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
String nextArg = args[2];
|
String nextArg = args[2];
|
||||||
LocalTime maxZapfenstreich = null;
|
LocalTime maxZapfenstreich = null;
|
||||||
int endTimeOffset = 0;
|
int endTimeOffset = 0;
|
||||||
Integer lunchDuration = null;
|
Integer lunchDuration = null;
|
||||||
if (FormatTools.TIME_PATTERN.matcher(nextArg).matches()) {
|
if (FormatTools.TIME_PATTERN.matcher(nextArg).matches()) {
|
||||||
maxZapfenstreich = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
maxZapfenstreich = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
||||||
} else if (OFFSET_PATTERN.matcher(nextArg).matches()) {
|
} else if (OFFSET_PATTERN.matcher(nextArg).matches()) {
|
||||||
endTimeOffset = Integer.parseInt(nextArg);
|
endTimeOffset = Integer.parseInt(nextArg);
|
||||||
} else {
|
} else {
|
||||||
verifyDurationFormat(nextArg, "Argument nach " + DaySection.ZAPFENSTREICH.getParam());
|
verifyDurationFormat(nextArg, "Argument nach " + DaySection.ZAPFENSTREICH.getParam());
|
||||||
lunchDuration = Integer.parseInt(nextArg);
|
lunchDuration = Integer.parseInt(nextArg);
|
||||||
}
|
}
|
||||||
if (args.length == 3) {
|
if (args.length == 3) {
|
||||||
if (maxZapfenstreich == null && endTimeOffset == 0) {
|
if (maxZapfenstreich == null && endTimeOffset == 0) {
|
||||||
lb.initZapfenstreich(lunchDuration);
|
lb.initZapfenstreich(lunchDuration);
|
||||||
} else if (maxZapfenstreich == null) {
|
} else if (maxZapfenstreich == null) {
|
||||||
lb.initZapfenstreich(lunchDuration, endTimeOffset);
|
lb.initZapfenstreich(lunchDuration, endTimeOffset);
|
||||||
} else {
|
} else {
|
||||||
lb.initZapfenstreich(lunchDuration, maxZapfenstreich);
|
lb.initZapfenstreich(lunchDuration, maxZapfenstreich);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
nextArg = args[3];
|
nextArg = args[3];
|
||||||
if (lunchDuration == null) {
|
if (lunchDuration == null) {
|
||||||
println("Letztes Argument darf nur auf Mittagspausendauer folgen.");
|
println("Letztes Argument darf nur auf Mittagspausendauer folgen.");
|
||||||
System.exit(1);
|
System.exit(1);
|
||||||
}
|
}
|
||||||
if (maxZapfenstreich == null && !OFFSET_PATTERN.matcher(nextArg).matches()) {
|
if (maxZapfenstreich == null && !OFFSET_PATTERN.matcher(nextArg).matches()) {
|
||||||
verifyTimeFormat(nextArg, "Letztes Argument nach " + DaySection.ZAPFENSTREICH.getParam() + " und Mittagspausendauer");
|
verifyTimeFormat(nextArg, "Letztes Argument nach " + DaySection.ZAPFENSTREICH.getParam() + " und Mittagspausendauer");
|
||||||
maxZapfenstreich = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
maxZapfenstreich = LocalTime.parse(nextArg, FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
||||||
lb.initZapfenstreich(lunchDuration, maxZapfenstreich);
|
lb.initZapfenstreich(lunchDuration, maxZapfenstreich);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
verifyOffsetFormat(nextArg, "Letztes Argument nach " + DaySection.ZAPFENSTREICH.getParam() + " und Enduhrzeit");
|
verifyOffsetFormat(nextArg, "Letztes Argument nach " + DaySection.ZAPFENSTREICH.getParam() + " und Enduhrzeit");
|
||||||
endTimeOffset = Integer.parseInt(nextArg);
|
endTimeOffset = Integer.parseInt(nextArg);
|
||||||
lb.initZapfenstreich(lunchDuration, endTimeOffset);
|
lb.initZapfenstreich(lunchDuration, endTimeOffset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void verifyMinimumNumberOfArgs(String[] args) {
|
private static void verifyMinimumNumberOfArgs(String[] args) {
|
||||||
if (args.length >= 2) {
|
if (args.length >= 2) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
println("Mindestens 2 Argumente müssen gegeben sein.");
|
println("Mindestens 2 Argumente müssen gegeben sein.");
|
||||||
printHelp();
|
printHelp();
|
||||||
System.exit(1);
|
System.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void verifyTimeFormat(String param, String errMsgPrefix) {
|
private static void verifyTimeFormat(String param, String errMsgPrefix) {
|
||||||
verifyInputFormat(FormatTools.TIME_PATTERN, param, errMsgPrefix, "Uhrzeitformat (" + FormatTools.TIME_FORMAT + ")", false);
|
verifyInputFormat(FormatTools.TIME_PATTERN, param, errMsgPrefix, "Uhrzeitformat (" + FormatTools.TIME_FORMAT + ")", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void verifyDurationFormat(String param, String errMsgPrefix) {
|
private static void verifyDurationFormat(String param, String errMsgPrefix) {
|
||||||
verifyInputFormat(LUNCH_DURATION_PATTERN, param, errMsgPrefix, "Minutenanzahl (ganze Zahl)", true);
|
verifyInputFormat(LUNCH_DURATION_PATTERN, param, errMsgPrefix, "Minutenanzahl (ganze Zahl)", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void verifyOffsetFormat(String param, String errMsgPrefix) {
|
private static void verifyOffsetFormat(String param, String errMsgPrefix) {
|
||||||
verifyInputFormat(OFFSET_PATTERN, param, errMsgPrefix, "Minutendifferenz (ganze Zahl mit Vorzeichen)", false);
|
verifyInputFormat(OFFSET_PATTERN, param, errMsgPrefix, "Minutendifferenz (ganze Zahl mit Vorzeichen)", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void verifyInputFormat(Pattern pattern, String param, String errMsgPrefix, String firstInputPart, boolean timeInputPossible) {
|
private static void verifyInputFormat(Pattern pattern, String param, String errMsgPrefix, String firstInputPart, boolean timeInputPossible) {
|
||||||
if (pattern.matcher(param).matches()) {
|
if (pattern.matcher(param).matches()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var possibleTimeInputPart = timeInputPossible ? " oder Uhrzeitformat (" + FormatTools.TIME_FORMAT + ")" : "";
|
var possibleTimeInputPart = timeInputPossible ? " oder Uhrzeitformat (" + FormatTools.TIME_FORMAT + ")" : "";
|
||||||
println(errMsgPrefix + " \"" + param + "\" muss " + firstInputPart + possibleTimeInputPart + " entsprechen.");
|
println(errMsgPrefix + " \"" + param + "\" muss " + firstInputPart + possibleTimeInputPart + " entsprechen.");
|
||||||
System.exit(1);
|
System.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void verifyDaySection(DaySection section, String param) {
|
private static void verifyDaySection(DaySection section, String param) {
|
||||||
if (section != null) {
|
if (section != null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
List<String> sectionDescs = Arrays.stream(DaySection.values()).map((DaySection ds) -> ds.getDescription() + " (" + ds.getParam() + ")")
|
List<String> sectionDescs = Arrays.stream(DaySection.values()).map((DaySection ds) -> ds.getDescription() + " (" + ds.getParam() + ")")
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
String sectionDescsJoined = String.join(" oder ", sectionDescs);
|
String sectionDescsJoined = String.join(" oder ", sectionDescs);
|
||||||
println("Argument nach Startzeit \"" + param + "\" muss Angabe für " + sectionDescsJoined + " sein.");
|
println("Argument nach Startzeit \"" + param + "\" muss Angabe für " + sectionDescsJoined + " sein.");
|
||||||
System.exit(1);
|
System.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void printHelp() {
|
private static void printHelp() {
|
||||||
println("Mögliche Argumente für LoadingBar:\n"
|
println("Mögliche Argumente für LoadingBar:\n"
|
||||||
+ "Normalfall Vormittag (Mittagspause <= " + LoadingBar.LATEST_LUNCH_TIME + ")\n"
|
+ "Normalfall Vormittag (Mittagspause <= " + LoadingBar.LATEST_LUNCH_TIME + ")\n"
|
||||||
+ FormatTools.TIME_FORMAT + " " + DaySection.MITTAG.getParam() + "\n"
|
+ FormatTools.TIME_FORMAT + " " + DaySection.MITTAG.getParam() + "\n"
|
||||||
+ "Vormittag mit expliziter Mittagspause (<= " + LoadingBar.LATEST_LUNCH_TIME + ")\n"
|
+ "Vormittag mit expliziter Mittagspause (<= " + LoadingBar.LATEST_LUNCH_TIME + ")\n"
|
||||||
+ FormatTools.TIME_FORMAT + " " + DaySection.MITTAG.getParam() + " " + FormatTools.TIME_FORMAT + "\n"
|
+ FormatTools.TIME_FORMAT + " " + DaySection.MITTAG.getParam() + " " + FormatTools.TIME_FORMAT + "\n"
|
||||||
+ "Vormittag mit abweichender Minutenanzahl Arbeitszeit\n"
|
+ "Vormittag mit abweichender Minutenanzahl Arbeitszeit\n"
|
||||||
+ FormatTools.TIME_FORMAT + " " + DaySection.MITTAG.getParam() + " -+mm\n"
|
+ FormatTools.TIME_FORMAT + " " + DaySection.MITTAG.getParam() + " -+mm\n"
|
||||||
+ "Normalfall Nachmittag (Mittagspause " + LoadingBar.MIN_LUNCH_DURATION + " min)\n"
|
+ "Normalfall Nachmittag (Mittagspause " + LoadingBar.MIN_LUNCH_DURATION + " min)\n"
|
||||||
+ FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + "\n"
|
+ FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + "\n"
|
||||||
+ "Nachmittag mit expliziter Länge Mittagspause (Mittagspause unter " + LoadingBar.MIN_LUNCH_DURATION + " min wird auf "
|
+ "Nachmittag mit expliziter Länge Mittagspause (Mittagspause unter " + LoadingBar.MIN_LUNCH_DURATION + " min wird auf "
|
||||||
+ LoadingBar.MIN_LUNCH_DURATION + " min korrigiert)\n"
|
+ LoadingBar.MIN_LUNCH_DURATION + " min korrigiert)\n"
|
||||||
+ FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " mm\n"
|
+ FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " mm\n"
|
||||||
+ "Nachmittag mit explizitem Feierabend (Mittagspause je nach Minimum (s.u.))\n"
|
+ "Nachmittag mit explizitem Feierabend (Mittagspause je nach Minimum (s.u.))\n"
|
||||||
+ FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " " + FormatTools.TIME_FORMAT + "\n"
|
+ FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " " + FormatTools.TIME_FORMAT + "\n"
|
||||||
+ "Nachmittag mit abweichender Minutenanzahl Arbeitszeit\n"
|
+ "Nachmittag mit abweichender Minutenanzahl Arbeitszeit\n"
|
||||||
+ FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " -+mm\n"
|
+ FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " -+mm\n"
|
||||||
+ "Nachmittag mit explizitem Feierabend u. expliziter Länge Mittagspause (Mittagspause unter Minimum (s.u.) wird auf Minimum korrigiert)\n"
|
+ "Nachmittag mit explizitem Feierabend u. expliziter Länge Mittagspause (Mittagspause unter Minimum (s.u.) wird auf Minimum korrigiert)\n"
|
||||||
+ FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " mm " + FormatTools.TIME_FORMAT + "\n"
|
+ FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " mm " + FormatTools.TIME_FORMAT + "\n"
|
||||||
+ "Nachmittag mit explizitem Feierabend u. abweichender Minutenanzahl Arbeitszeit\n"
|
+ "Nachmittag mit explizitem Feierabend u. abweichender Minutenanzahl Arbeitszeit\n"
|
||||||
+ FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " " + FormatTools.TIME_FORMAT + " -+mm\n\n"
|
+ FormatTools.TIME_FORMAT + " " + DaySection.ZAPFENSTREICH.getParam() + " " + FormatTools.TIME_FORMAT + " -+mm\n\n"
|
||||||
+ "Mittagspause minimum in Minuten:\n"
|
+ "Mittagspause minimum in Minuten:\n"
|
||||||
+ " - bis " + LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min ("
|
+ " - bis " + LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min ("
|
||||||
+ LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH / CommonTools.MINS_PER_HOUR + " std): 0\n"
|
+ LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH / CommonTools.MINS_PER_HOUR + " std): 0\n"
|
||||||
+ " - bis " + LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min + "
|
+ " - bis " + LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min + "
|
||||||
+ LoadingBar.MIN_LUNCH_DURATION + " min: Arbeitszeit - " + LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min\n"
|
+ LoadingBar.MIN_LUNCH_DURATION + " min: Arbeitszeit - " + LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min\n"
|
||||||
+ " - ab " + LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min + " + LoadingBar.MIN_LUNCH_DURATION + " min: "
|
+ " - ab " + LoadingBar.MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH + " min + " + LoadingBar.MIN_LUNCH_DURATION + " min: "
|
||||||
+ LoadingBar.MIN_LUNCH_DURATION + " min\n"
|
+ LoadingBar.MIN_LUNCH_DURATION + " min\n"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user