- optimised with SonarQube/ IntelliJ Inspections
- smaller own optimisations
This commit is contained in:
@ -6,12 +6,14 @@ import java.util.Objects;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
class SimpleLoadingBar {
|
||||
public class SimpleLoadingBar {
|
||||
|
||||
private static final String TIME_FORMAT = "HH:mm";
|
||||
private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern(TIME_FORMAT);
|
||||
private static final Pattern TIME_PATTERN = Pattern.compile("(?>[01][0-9]|2[0-4]):[0-5][0-9]");
|
||||
private static final Pattern TIME_PATTERN = Pattern.compile("(?>[01]\\d|2[0-4]):[0-5]\\d");
|
||||
private static final DecimalFormat PERCENTAGE_FORMAT = new DecimalFormat("00.00");
|
||||
private static final int MINS_PER_HOUR = 60;
|
||||
private static final int LINE_LENGTH = 100;
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
@ -29,7 +31,7 @@ class SimpleLoadingBar {
|
||||
if (args.length > 1) {
|
||||
startTime = firstTime;
|
||||
nextArg = args[1];
|
||||
if (nextArg.equals("-msg")) {
|
||||
if ("-msg".equals(nextArg)) {
|
||||
title = args.length > 2 ? args[2] : title;
|
||||
} else {
|
||||
verifyTimeFormat(nextArg, "Zweites Argument");
|
||||
@ -47,7 +49,7 @@ class SimpleLoadingBar {
|
||||
return;
|
||||
}
|
||||
// if there are 3 arguments, the third will be discarded.
|
||||
boolean hasTitleArg = args.length > 3 && args[2].equals("-msg");
|
||||
boolean hasTitleArg = args.length > 3 && "-msg".equals(args[2]);
|
||||
title = hasTitleArg ? args[3] : title;
|
||||
title = title.isBlank() ? fallbackTitle : title;
|
||||
showLoadingBar(startTime, endTime, title);
|
||||
@ -55,11 +57,11 @@ class SimpleLoadingBar {
|
||||
|
||||
|
||||
private static void printHelp() {
|
||||
System.out.println(new StringBuilder().append("Mögliche Argumente für LoadingBar:\n")
|
||||
.append("Startzeit, Endzeit, Endnachricht (Optional)\n")
|
||||
.append(TIME_FORMAT).append(" ").append(TIME_FORMAT).append("-msg <Nachricht>\n")
|
||||
.append("Endzeit (Startzeit = jetzt), Endnachricht (Optional)\n")
|
||||
.append(TIME_FORMAT).append("-msg <Nachricht>\n")
|
||||
System.out.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"
|
||||
+ TIME_FORMAT + " -msg <Nachricht>\n"
|
||||
);
|
||||
}
|
||||
|
||||
@ -78,12 +80,11 @@ class SimpleLoadingBar {
|
||||
if (TIME_PATTERN.matcher(param).matches()) {
|
||||
return;
|
||||
}
|
||||
System.out.println(errMsgPrefix + " \"" + param + "\" muss Uhrzeitformat ("+ TIME_FORMAT + ") entsprechen.");
|
||||
System.out.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");
|
||||
@ -117,7 +118,7 @@ class SimpleLoadingBar {
|
||||
long remainingMinutes = initialMinutes - passedMinutes;
|
||||
int numberOfEquals = (int) wholePercentage;
|
||||
var sb = new StringBuilder("[");
|
||||
for (int i = 0; i < 100; i++) {
|
||||
for (int i = 0; i < LINE_LENGTH; i++) {
|
||||
if (i < numberOfEquals) {
|
||||
sb.append("=");
|
||||
} else {
|
||||
@ -125,7 +126,7 @@ class SimpleLoadingBar {
|
||||
}
|
||||
}
|
||||
sb.append("] ").append(PERCENTAGE_FORMAT.format(wholePercentage)).append("% ")
|
||||
.append(minutesToTimeString(passedMinutes)).append(" - ").append(minutesToTimeString(remainingMinutes));
|
||||
.append(minutesToTimeString(passedMinutes)).append(" - ").append(minutesToTimeString(remainingMinutes));
|
||||
if (progressive) {
|
||||
sb.append("\r");
|
||||
}
|
||||
@ -134,15 +135,12 @@ class SimpleLoadingBar {
|
||||
|
||||
|
||||
private static String minutesToTimeString(long minutes) {
|
||||
return LocalTime.of((int) minutes / 60, (int) minutes % 60).format(TIME_FORMATTER);
|
||||
return LocalTime.of((int) minutes / MINS_PER_HOUR, (int) minutes % MINS_PER_HOUR).format(TIME_FORMATTER);
|
||||
}
|
||||
|
||||
|
||||
private static String formatTitle(String title) {
|
||||
var sb = new StringBuilder();
|
||||
for (int i = 0; i < title.length(); i++) {
|
||||
sb.append("*");
|
||||
}
|
||||
return sb.toString() + "\n" + title + "\n" + sb.toString();
|
||||
String separator = "*".repeat(title.length());
|
||||
return separator + "\n" + title + "\n" + separator;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user