- calculate mittagspause with offset correctly

- show provisionary mittagspause
- handle zapfenstreich the same way

runProject.sh

@@ -2,13 +2,25 @@
 set -uo pipefail
 
 # when executed as executable file in "git for windows" bash some things won't work, so always run with prefixed command
-originDir=$(pwd);
+jarDir=/g/zeitlaeufer/dist/;
-cd /g/zeitlaeufer/;
+if [[ $# == 0 || ($1 != -quick && $1 != -class) ]]; then
-tmpDir="/tmp/zeitlaeufer_$RANDOM";
+   tmpDir=/tmp/zeitlaeufer_$RANDOM;
-mkdir $tmpDir;
+   mkdir $tmpDir;
-cp dist/zeitlaeufer.jar $tmpDir;
+   cp ${jarDir}zeitlaeufer.jar $tmpDir;
-cd $originDir;
+   jarDir=$tmpDir;
+elif [[ $1 == -quick ]]; then
+   shift;
+elif [[ $1 == -class ]]; then
+   originDir=$(pwd);
+   cd /g/zeitlaeufer/target/;
+   java de.szimnau.zeitlaeufer.$2;
+   exitCode=$?;
+   cd originDir;
+   return $exitCode;
+fi
 # java -jar $tmpDir/zeitlaeufer.jar $@;
 # -p <=> --module-path | -m <=> --module
-java --module-path $tmpDir/zeitlaeufer.jar --module zeitlaeufer $@;
+java --module-path $jarDir/zeitlaeufer.jar --module zeitlaeufer $@;
-rm -r $tmpDir;
+if [[ -n $tmpDir && -d $tmpDir ]]; then
+   rm -r $tmpDir;
+fi

src/main/java/de/szimnau/zeitlaeufer/DrinkingBar.java

@@ -21,7 +21,8 @@ public class DrinkingBar extends AbstractLoadingBar implements WorkdayLoadingBar
 
    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_WITH_PAUSE = 6 * CommonTools.MINS_PER_HOUR;
+   private static final int MAX_MINUTES_WITHOUT_PAUSE = 6 * CommonTools.MINS_PER_HOUR;
+   private static final int MAX_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 BigDecimal DEFAULT_TOTAL_TIME_BD = BigDecimal.valueOf(DEFAULT_TOTAL_TIME);
    private static final BigDecimal DEFAULT_TOTAL_LITRES = BigDecimal.valueOf(2.0);
@@ -65,7 +66,10 @@ public class DrinkingBar extends AbstractLoadingBar implements WorkdayLoadingBar
    @Override
    protected String fillLoadingBar(long passedMinutes, boolean progressive) {
       long effectivePassedMinutes = passedMinutes < 0 ? 0 : passedMinutes;
-      if (getTotalMinutes() > MINUTES_WITH_PAUSE && passedMinutes > MINUTES_BEFORE_PAUSE && passedMinutes <= MINUTES_WITH_PAUSE) {
+      /* the pause in counting up passed minutes could be more precise.
+         there IS a way to find out how LONG the lunch break was (known until WorkdayLoadingBar.realInitZapfenstreich),
+         but NOT the exact time slot from when to when the lunch break did take place... */
+      if (getTotalMinutes() > MAX_MINUTES_WITHOUT_PAUSE && passedMinutes > MINUTES_BEFORE_PAUSE && passedMinutes <= MAX_MINUTES_WITH_PAUSE) {
          effectivePassedMinutes = MINUTES_BEFORE_PAUSE;
       }
       var effectivePassedMinutesBD = BigDecimal.valueOf(effectivePassedMinutes);

src/main/java/de/szimnau/zeitlaeufer/Main.java

@@ -5,10 +5,15 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 import java.util.stream.Collectors;
 
 import static de.szimnau.zeitlaeufer.tools.CommonTools.print;
@@ -27,26 +32,34 @@ public class Main {
 
    private static void askParametersAndRun() throws IOException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
       var br = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
-      Map<Integer, Class<?>> classes = getAllrelevantClasses();
+      SortedMap<Integer, Class<?>> classes = getAllrelevantClasses();
       String printedClasses = classes.entrySet().stream()
           .map(e -> e.getKey() + ": " + e.getValue().getCanonicalName().substring(e.getValue().getCanonicalName().lastIndexOf('.') + 1))
           .reduce("", (a, b) -> a + "\n" + b);
       print("Welcher Zeitläufer soll verwendet werden? " + printedClasses + "\n: ");
       var num = Integer.parseInt(br.readLine());
       Class<?> selectedClass = classes.get(num);
-      var mainMethod = selectedClass.getMethod("main", String[].class);
+      Method mainMethod = selectedClass.getMethod("main", String[].class);
       mainMethod.invoke(null, (Object) new String[0]);
    }
 
 
-   private static Map<Integer, Class<?>> getAllrelevantClasses() {
+   private static SortedMap<Integer, Class<?>> getAllrelevantClasses() {
-      InputStream stream = ClassLoader.getSystemClassLoader()
+      ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-          .getResourceAsStream("de/szimnau/zeitlaeufer");
+      URL resourceUrl = classLoader.getResource("de/szimnau/zeitlaeufer");
-      var br = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8));
+      if (resourceUrl == null) {
+         throw new RuntimeException("Kann ausführbare Klassen nicht eruieren, da keine Ressource \"de/szimnau/zeitlaeufer\" verfügbar.");
+      }
+      Set<String> fileNames;
+      if (resourceUrl.getPath().contains(".jar")) {
+         fileNames = getFileNamesStreamFromJar(resourceUrl);
+      } else {
+         fileNames = getFileNamesStreamFromPackage(resourceUrl);
+      }
       var increment = new AtomicInteger();
       return Collections.unmodifiableSortedMap(new TreeMap<>(
-          br.lines()
+          fileNames.stream()
-              .filter(line -> line.endsWith(".class") && !"Main.class".equals(line))
+              .filter(line -> line.endsWith(".class") && !line.endsWith("module-info.class") && !line.endsWith("Main.class"))
               .sorted()
               .map(Main::getClass)
               .filter(Objects::nonNull)
@@ -60,24 +73,57 @@ public class Main {
    }
 
 
+   private static Set<String> getFileNamesStreamFromJar(URL resourceUrl) {
+      Set<String> fileNames = new HashSet<>();
+      String path = resourceUrl.getPath().split(":", 2)[1];
+      String cleanPath = path.substring(0, path.lastIndexOf('!'));
+      Enumeration<JarEntry> entries;
+      try (var jarFile = new JarFile(URLDecoder.decode(cleanPath, StandardCharsets.UTF_8))) {
+         entries = jarFile.entries();
+         while (entries.hasMoreElements()) {
+            JarEntry entry = entries.nextElement();
+            if (entry.isDirectory()) {
+               continue;
+            }
+            fileNames.add(entry.getName());
+         }
+      } catch (IOException e) {
+         throw new RuntimeException("Kann JAR-Datei zwecks Reflection nicht öffnen:", e);
+      }
+      return fileNames;
+   }
+
+
+   private static Set<String> getFileNamesStreamFromPackage(URL resourceUrl) {
+      try (InputStream stream = resourceUrl.openStream();
+           var br = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
+         return br.lines()
+             .map(line -> "de/szimnau/zeitlaeufer." + line)
+             .collect(Collectors.toSet());
+      } catch (IOException e) {
+         throw new RuntimeException("ausführbare Klassen nicht eruieren, da Ressource " + resourceUrl + " nicht auslesbar.", e);
+      }
+   }
+
+
    private static Class<?> getClass(String className) {
-      return getClassForName(className.substring(0, className.lastIndexOf('.')));
+      String classWithPath = className.replace("/", ".");
+      return getClassForName(classWithPath.substring(0, className.lastIndexOf('.')));
    }
 
 
    private static Class<?> getClassForName(String className) {
-      String fqnClassName = "de.szimnau.zeitlaeufer." + className;
       try {
-         return Class.forName(fqnClassName);
+         return Class.forName(className);
       } catch (ClassNotFoundException cnfe) {
-         println("ERROR: could not find Class for Name: de.szimnau.zeitlaeufer." + fqnClassName);
+         println("ERROR: could not find Class for Name: de.szimnau.zeitlaeufer." + className);
       }
       return null;
    }
 
 
    private static void parseParametersAndRun(String[] args) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-      Class<?> selectedClass = getClassForName(args[0]);
+      Class<?> selectedClass = getClassForName("de.szimnau.zeitlaeufer." + args[0]);
       if (selectedClass == null) {
          System.exit(1);
       }

src/main/java/de/szimnau/zeitlaeufer/WorkdayLoadingBar.java

@@ -20,12 +20,12 @@ public interface WorkdayLoadingBar {
    void showLoadingBar(boolean debug, boolean passedMinutesZero);
 
 
-   default boolean hasMittagspauseArrived() {
+   default boolean couldHaveHadNoMittagspauseYet() {
-      return hasMittagspauseArrived(false);
+      return couldHaveHadNoMittagspauseYet(false);
    }
 
 
-   default boolean hasMittagspauseArrived(boolean debugWithPassedMinutesZero) {
+   default boolean couldHaveHadNoMittagspauseYet(boolean debugWithPassedMinutesZero) {
       return getPassedMinutes(debugWithPassedMinutesZero) < DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH;
    }
 
@@ -33,6 +33,12 @@ public interface WorkdayLoadingBar {
    long getPassedMinutes(boolean passedMinutesZero);
 
 
+   default LocalTime estimateMittagspause() {
+      LocalTime defaultEndTime = getStartTime().plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH);
+      return calculateRealMittagspause(defaultEndTime);
+   }
+
+
    default void initMittagspause() {
       LocalTime defaultEndTime = getStartTime().plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH);
       realInitMittagspause(defaultEndTime);
@@ -43,7 +49,7 @@ public interface WorkdayLoadingBar {
 
 
    default void initMittagspause(int endTimeOffset) {
-      LocalTime offsetEndTime = getStartTime().plusMinutes(DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH + endTimeOffset);
+      LocalTime offsetEndTime = estimateMittagspause().plusMinutes(endTimeOffset);
       realInitMittagspause(offsetEndTime);
    }
 
@@ -55,13 +61,24 @@ public interface WorkdayLoadingBar {
 
 
    private void realInitMittagspause(LocalTime theoreticalEndTime) {
-      setEndTime(theoreticalEndTime.isAfter(LATEST_LUNCH_TIME) ? LATEST_LUNCH_TIME : theoreticalEndTime);
+      setEndTime(calculateRealMittagspause(theoreticalEndTime));
+   }
+
+
+   private LocalTime calculateRealMittagspause(LocalTime theoreticalMittagspause) {
+      return theoreticalMittagspause.isAfter(LATEST_LUNCH_TIME) ? LATEST_LUNCH_TIME : theoreticalMittagspause;
    }
 
 
    void setEndTime(LocalTime endTime);
 
 
+   default LocalTime estimateZapfenstreich(Integer mittagspauseDuration) {
+      int estMittagspauseDuration = mittagspauseDuration != null ? mittagspauseDuration : MIN_LUNCH_DURATION;
+      return getStartTime().plusMinutes(MAX_NUMBER_WORK_MINS + estMittagspauseDuration);
+   }
+
+
    default void initZapfenstreich() {
       LocalTime trueEndTime = getStartTime().plusMinutes(MAX_NUMBER_WORK_MINS + MIN_LUNCH_DURATION);
       realInitZapfenstreich(MIN_LUNCH_DURATION, trueEndTime);

src/main/java/de/szimnau/zeitlaeufer/tools/LoadingBarCliTools.java

@@ -61,7 +61,7 @@ public class LoadingBarCliTools {
       WorkdayLoadingBar lb = constructor.apply(startTime);
       boolean debug = false;
       boolean passedMinutesZero = false;
-      if (lb.hasMittagspauseArrived(debug && passedMinutesZero)) {
+      if (lb.couldHaveHadNoMittagspauseYet(debug && passedMinutesZero)) {
          handleMittagspause(br, lb);
          lb.showLoadingBar(debug, passedMinutesZero);
       }
@@ -71,6 +71,8 @@ public class LoadingBarCliTools {
 
 
    private static void handleMittagspause(BufferedReader br, WorkdayLoadingBar lb) throws IOException {
+      LocalTime vorlaeufigeEndzeit = lb.estimateMittagspause();
+      println("Mittagspause: " + FormatTools.TIME_FORMATTER.format(vorlaeufigeEndzeit));
       print("Mittagspause verschieben um (optional): ");
       String mittagspauseOffsetRaw = br.readLine();
       if (mittagspauseOffsetRaw != null && !mittagspauseOffsetRaw.isBlank()) {
@@ -96,8 +98,7 @@ public class LoadingBarCliTools {
       if (mittagspauseDurationRaw != null && !mittagspauseDurationRaw.isBlank()) {
          mittagspauseDuration = Integer.valueOf(mittagspauseDurationRaw);
       }
-      LocalTime vorlaeufigeEndzeit = lb.getStartTime().plusMinutes(WorkdayLoadingBar.MAX_NUMBER_WORK_MINS)
+      LocalTime vorlaeufigeEndzeit = lb.estimateZapfenstreich(mittagspauseDuration);
-         .plusMinutes(mittagspauseDuration != null ? mittagspauseDuration : WorkdayLoadingBar.MIN_LUNCH_DURATION);
       println("Endzeit: " + FormatTools.TIME_FORMATTER.format(vorlaeufigeEndzeit));
       print("Feierabend verschieben um (optional): ");
       String zapfenstreichOffsetRaw = br.readLine();