updated mensa URL, thanks to Hannes B.

.drone.yml

@@ -0,0 +1,30 @@
+kind: pipeline
+name: default
+
+steps:
+- name: test
+  image: gradle:jdk11
+  commands:
+  - gradle test
+  
+- name: build
+  image: gradle:jdk11
+  commands:
+    - gradle bootJar
+  when:
+    event:
+      - tag
+        
+- name: docker  
+  image: plugins/docker
+  settings:
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    repo: mosadxyz/tcor
+    tags:
+      - latest
+  when:
+    event:
+      - tag

.woodpecker.yml

@@ -1,21 +0,0 @@
-pipeline:
-  test:
-    image: gradle:jdk11
-    commands:
-      - gradle test
-  build:
-    image: gradle:jdk11
-    commands:
-      - gradle bootJar
-    when:
-      event:
-        - tag
-  docker:
-    image: techknowlogick/drone-docker
-    privileged: true
-    repo: mosadxyz/tcor
-    secrets: [docker_username, docker_password]
-    tags: latest
-    when:
-      event:
-        - tag

README.md

@@ -1,5 +1,5 @@
 ![Website](https://img.shields.io/website?down_color=red&down_message=offline&label=tcor.mosad.xyz&up_color=brightgreen&up_message=online&url=https%3A%2F%2Ftcor.mosad.xyz%2Fhealth)
-[![Build Status](https://ci.mosad.xyz/api/badges/Seil0/TheCitadelofRicks/status.svg)](https://ci.mosad.xyz/Seil0/TheCitadelofRicks)
+[![Build Status](https://drone.mosad.xyz/api/badges/Seil0/TheCitadelofRicks/status.svg)](https://drone.mosad.xyz/Seil0/TheCitadelofRicks)
 [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://git.mosad.xyz/api/v1/repos/Seil0/TheCitadelofRicks/releases&query=$[0].tag_name)](https://git.mosad.xyz/Seil0/TheCitadelofRicks/releases)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 # TheCitadelofRicks

build.gradle

@@ -1,25 +1,25 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.6.20'
+    id 'org.jetbrains.kotlin.jvm' version '1.4.10'
-    id 'org.jetbrains.kotlin.plugin.spring' version '1.6.20'
+    id 'org.jetbrains.kotlin.plugin.spring' version '1.4.10'
-    id 'org.springframework.boot' version '2.6.6'
+    id 'org.springframework.boot' version '2.3.3.RELEASE'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'io.spring.dependency-management' version '1.0.9.RELEASE'
 }
 
 group 'org.mosad'
-version '1.3.1'
+version '1.2.7'
 
 repositories {
-    mavenCentral()
+    jcenter()
 }
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
-    implementation 'org.jsoup:jsoup:1.14.3'
+    implementation 'org.jsoup:jsoup:1.13.1'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.8.6'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
 }
 
 test {
@@ -30,17 +30,9 @@ test {
     }
 }
 
-def jvmTargetVersion = "11"
 compileKotlin {
-    kotlinOptions.jvmTarget = jvmTargetVersion
+    kotlinOptions.jvmTarget = "11"
-    kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
-}
-compileJava {
-    targetCompatibility = jvmTargetVersion
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = jvmTargetVersion
+    kotlinOptions.jvmTarget = "11"
-}
-compileTestJava {
-    targetCompatibility = jvmTargetVersion
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,101 +17,67 @@
 #
 
 ##############################################################################
-#
+##
-#   Gradle start up script for POSIX generated by Gradle.
+##  Gradle start up script for UN*X
-#
+##
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
+PRG="$0"
-
+# Need this for relative symlinks.
-# Need this for daisy-chained symlinks.
+while [ -h "$PRG" ] ; do
-while
+    ls=`ls -ld "$PRG"`
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    link=`expr "$ls" : '.*-> \(.*\)$'`
-    [ -h "$app_path" ]
+    if expr "$link" : '/.*' > /dev/null; then
-do
+        PRG="$link"
-    ls=$( ls -ld "$app_path" )
+    else
-    link=${ls#*' -> '}
+        PRG=`dirname "$PRG"`"/$link"
-    case $link in             #(
+    fi
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
 done
-
+SAVED="`pwd`"
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
+case "`uname`" in
-  CYGWIN* )         cygwin=true  ;; #(
+  CYGWIN* )
-  Darwin* )         darwin=true  ;; #(
+    cygwin=true
-  MSYS* | MINGW* )  msys=true    ;; #(
+    ;;
-  NONSTOP* )        nonstop=true ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -121,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -140,95 +106,80 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    case $MAX_FD in #(
+    MAX_FD_LIMIT=`ulimit -H -n`
-      max*)
+    if [ $? -eq 0 ] ; then
-        MAX_FD=$( ulimit -H -n ) ||
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            warn "Could not query maximum file descriptor limit"
+            MAX_FD="$MAX_FD_LIMIT"
-    esac
+        fi
-    case $MAX_FD in  #(
+        ulimit -n $MAX_FD
-      '' | soft) :;; #(
+        if [ $? -ne 0 ] ; then
-      *)
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        ulimit -n "$MAX_FD" ||
+        fi
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    else
-    esac
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
+# For Darwin, add options to specify how the application appears in the dock
-#   * args from the command line
+if $darwin; then
-#   * the main class name
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-#   * -classpath
+fi
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    # We build the pattern for arguments to be converted via cygpath
-    for arg do
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-        if
+    SEP=""
-            case $arg in                                #(
+    for dir in $ROOTDIRSRAW ; do
-              -*)   false ;;                            # don't mess with options #(
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+        SEP="|"
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
-# Collect all arguments for the java command;
+# Escape application args
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+save () {
-#     shell script including quotes and variable substitutions, so put them in
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-#     double quotes to make sure that they get re-expanded; and
+    echo " "
-#   * put everything else in single quotes, so that it's not re-expanded.
+}
+APP_ARGS=`save "$@"`
 
-set -- \
+# Collect all arguments for the java command, following the shell quoting and substitution rules
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,6 +64,21 @@ echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
 @rem Setup the command line
 
@@ -71,7 +86,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt

@@ -48,8 +48,8 @@ class APIController {
     private val logger: Logger = LoggerFactory.getLogger(APIController::class.java)
 
     companion object {
-        const val apiVersion = "1.3.0"
+        const val apiVersion = "1.2.0"
-        const val softwareVersion = "1.3.1"
+        const val softwareVersion = "1.2.7"
         val startTime = System.currentTimeMillis() / 1000
     }
 

src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt

@@ -46,9 +46,6 @@ data class MensaMeta(val updateTime: Long, val mensaName: String)
 data class MensaMenu(val meta: MensaMeta, val currentWeek: MensaWeek, val nextWeek: MensaWeek)
 
 // data classes for the timetable part
-
-data class CalendarWeek(val week: Int, val year: Int)
-
 data class Lesson(
     val lessonID: String,
     val lessonSubject: String,
@@ -61,7 +58,7 @@ data class TimetableDay(val timeslots: Array<ArrayList<Lesson>> = Array(6) { Arr
 
 data class TimetableWeek(val days: Array<TimetableDay> = Array(6) { TimetableDay() })
 
-data class TimetableCourseMeta(var updateTime: Long = 0, val courseName: String = "", val weekIndex: Int = 0, var weekNumberYear: Int = 0, val year: Int = 0, val link: String = "")
+data class TimetableCourseMeta(var updateTime: Long = 0, val courseName: String = "", val weekIndex: Int = 0, val weekNumberYear: Int = 0, val link: String = "")
 
 data class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek = TimetableWeek())
 

src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt

@@ -33,14 +33,11 @@ import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.*
 import java.util.*
-import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executors
 import kotlin.collections.ArrayList
+import kotlin.collections.HashMap
 import kotlin.collections.HashSet
 import kotlin.concurrent.scheduleAtFixedRate
-import kotlin.time.Duration.Companion.hours
-import kotlin.time.Duration.Companion.minutes
-import kotlin.time.ExperimentalTime
 
 class CacheController {
 
@@ -49,12 +46,12 @@ class CacheController {
         scheduledUpdates()
     }
 
-    companion object {
+    companion object{
         private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
 
         var courseList = CoursesList(CoursesMeta(), sortedMapOf())
-        var mensaMenu = MensaMenu(MensaMeta(0, ""), MensaWeek(), MensaWeek())
+        var mensaMenu = MensaMenu(MensaMeta(0,""), MensaWeek(), MensaWeek())
-        var timetableList = ConcurrentHashMap<String, TimetableCourseWeek>() // this list contains all timetables
+        var timetableList = HashMap<String, TimetableCourseWeek>() // this list contains all timetables
 
         /**
          * get a timetable, since they may not be cached, we need to make sure it's cached, otherwise download
@@ -62,55 +59,36 @@ class CacheController {
          * @param weekIndex request week number (current week = 0)
          * @return timetable of the course (Type: [TimetableCourseWeek])
          */
-        fun getTimetable(courseName: String, weekIndex: Int): TimetableCourseWeek {
+        fun getTimetable(courseName: String, weekIndex: Int): TimetableCourseWeek = runBlocking {
 
             // TODO just for testing
             if (courseName == "TEST_A" || courseName == "TEST_B") {
                 val currentTime = System.currentTimeMillis() / 1000
                 val timetableLink = "https://mosad.xyz"
                 val weekNumberYear = 0
-                val year = 0
+                val instr = javaClass.getResourceAsStream("/html/Timetable_normal-week.html")
-                val instr = CacheController::class.java.getResourceAsStream("/html/Timetable_normal-week.html")
 
-                val timetableParser =
+                val htmlDoc = Jsoup.parse(instr,"UTF-8", "https://www.hs-offenburg.de/")
-                    TimetableParser(htmlDoc = Jsoup.parse(instr!!, "UTF-8", "https://www.hs-offenburg.de/"))
+                val timetableTest = TimetableParser().parseTimeTable(htmlDoc)
-                val timetableTest = timetableParser.parseTimeTable()
 
-                return TimetableCourseWeek(
+                return@runBlocking TimetableCourseWeek(TimetableCourseMeta(currentTime, courseName, weekIndex, weekNumberYear, timetableLink), timetableTest)
-                    TimetableCourseMeta(
-                        currentTime,
-                        courseName,
-                        weekIndex,
-                        weekNumberYear,
-                        year,
-                        timetableLink
-                    ), timetableTest ?: TimetableWeek()
-                )
             }
 
-            val key = "$courseName-$weekIndex"
+            return@runBlocking timetableList.getOrPut("$courseName-$weekIndex") {
-            return if (timetableList.containsKey(key)) {
-                timetableList[key]!!
-            } else {
                 val timetableLink = courseList.courses[courseName]
                     ?.courseLink
                     ?.replace("week=0", "week=$weekIndex") ?: ""
                 val currentTime = System.currentTimeMillis() / 1000
+                var timetable = TimetableWeek()
+                var weekNumberYear = 0
 
-                val timetableParser = TimetableParser(timetableLink)
+                val timetableJobs = listOf(
-                val calendarWeek = timetableParser.parseCalendarWeek()
+                    async { timetable = TimetableParser().getTimeTable(timetableLink) },
-                val timetable = timetableParser.parseTimeTable()
+                    async { weekNumberYear = TimetableParser().getWeekNumberYear(timetableLink) }
+                )
 
-                TimetableCourseWeek(
+                timetableJobs.awaitAll()
-                    TimetableCourseMeta(
+                TimetableCourseWeek(TimetableCourseMeta(currentTime, courseName, weekIndex, weekNumberYear, timetableLink), timetable)
-                        currentTime,
-                        courseName,
-                        weekIndex,
-                        calendarWeek?.week ?: 0,
-                        calendarWeek?.year ?: 0,
-                        timetableLink
-                    ), timetable ?: TimetableWeek()
-                ).also { if (timetable != null) timetableList[key] = it }
             }
         }
 
@@ -155,7 +133,7 @@ class CacheController {
 
         /**
          * this function updates the courseList
-         * during the update process the old data will be returned for an API request
+         * during the update process the old data will be returned for a API request
          */
         private fun asyncUpdateCourseList() = GlobalScope.launch {
             CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
@@ -171,7 +149,7 @@ class CacheController {
 
         /**
          * this function updates the mensa menu list
-         * during the update process the old data will be returned for an API request
+         * during the update process the old data will be returned for a API request
          */
         private fun asyncUpdateMensa() = GlobalScope.launch {
             val mensaCurrentWeek = MensaParser().getMensaMenu(StartupController.mensaMenuURL)
@@ -187,7 +165,7 @@ class CacheController {
 
         /**
          * this function updates all existing timetables
-         * during the update process the old data will be returned for an API request
+         * during the update process the old data will be returned for a API request
          * a FixedThreadPool is used to make parallel requests for faster updates
          */
         private fun asyncUpdateTimetables() = GlobalScope.launch {
@@ -199,10 +177,7 @@ class CacheController {
             try {
                 timetableList.forEach { timetableCourse ->
                     executor.execute {
-                        val timetableParser = TimetableParser(timetableCourse.value.meta.link)
+                        timetableCourse.value.timetable = TimetableParser().getTimeTable(timetableCourse.value.meta.link)
-                        timetableCourse.value.timetable = timetableParser.parseTimeTable() ?: return@execute
-                        timetableCourse.value.meta.weekNumberYear =
-                            timetableParser.parseCalendarWeek()?.week ?: return@execute
                         timetableCourse.value.meta.updateTime = System.currentTimeMillis() / 1000
 
                         saveTimetableToCache(timetableCourse.value) // save the updated timetable to the cache directory
@@ -253,39 +228,30 @@ class CacheController {
          * update the CourseList every 24h, the Timetables every 3h and the Mensa Menu every hour
          * doesn't account the change between winter and summer time!
          */
-        @OptIn(ExperimentalTime::class)
         private fun scheduledUpdates() {
             val currentTime = System.currentTimeMillis()
-
+            val initDelay24h = (86400000 - ((currentTime + 3600000) % 86400000)) + 60000
-            val duration24h = 24.hours.inWholeMilliseconds
+            val initDelay3h = (10800000 - ((currentTime + 3600000) % 10800000)) + 60000
-            val duration3h = 3.hours.inWholeMilliseconds
+            val initDelay1h = (3600000 - ((currentTime + 3600000) % 3600000)) + 60000
-            val duration1h = 1.hours.inWholeMilliseconds
-            val duration1m = 1.minutes.inWholeMilliseconds
-
-            // Calculate the initial delay to make the update time independent of the start time
-            fun calcInitDelay(period: Long) = (period - ((currentTime + duration1h) % period)) + duration1m
-            val initDelay24h = calcInitDelay(duration24h)
-            val initDelay3h = calcInitDelay(duration3h)
-            val initDelay1h = calcInitDelay(duration1h)
 
             // update courseList every 24 hours (time in ms)
-            Timer().scheduleAtFixedRate(initDelay24h, duration24h) {
+            Timer().scheduleAtFixedRate(initDelay24h, 86400000) {
                 asyncUpdateCourseList()
             }
 
             // update all already existing timetables every 3 hours (time in ms)
-            Timer().scheduleAtFixedRate(initDelay3h, duration3h) {
+            Timer().scheduleAtFixedRate(initDelay3h, 10800000) {
                 asyncUpdateTimetables()
             }
 
             // update courses every hour (time in ms)
-            Timer().scheduleAtFixedRate(initDelay1h, duration1h) {
+            Timer().scheduleAtFixedRate(initDelay1h, 3600000) {
                 asyncUpdateMensa()
             }
 
             // post to status.mosad.xyz every hour, if an API key is present
             if (StartupController.cachetAPIKey != "0") {
-                Timer().scheduleAtFixedRate(initDelay1h, duration1h) {
+                Timer().scheduleAtFixedRate(initDelay1h, 3600000) {
                     CachetAPIController.postTotalRequests()
                 }
             }

src/main/kotlin/org/mosad/thecitadelofricks/controller/CachetAPIController.kt

@@ -22,7 +22,7 @@
 
 package org.mosad.thecitadelofricks.controller
 
-import org.mosad.thecitadelofricks.controller.StatusController.Companion.totalRequests
+import org.mosad.thecitadelofricks.controller.StatusController.Companion.getTotalRequests
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.BufferedReader
@@ -42,8 +42,8 @@ class CachetAPIController {
          fun postTotalRequests() {
              try {
                  val url = URL("${StartupController.cachetBaseURL}/api/v1/metrics/1/points")
-                 val jsonInputString = "{\"value\": ${totalRequests -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}"
+                 val jsonInputString = "{\"value\": ${getTotalRequests() -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}"
-                 oldTotalRequests = totalRequests
+                 oldTotalRequests = getTotalRequests()
 
                  val con = url.openConnection() as HttpURLConnection
                  con.requestMethod = "POST"

src/main/kotlin/org/mosad/thecitadelofricks/controller/StartupController.kt

@@ -135,8 +135,7 @@ class StartupController {
                 try {
                     val timetableObject = JsonParser.parseString(bufferedReader.readLine()).asJsonObject
                     val timetable = Gson().fromJson(timetableObject, TimetableCourseWeek().javaClass)
-                    CacheController.timetableList["${timetable.meta.courseName}-${timetable.meta.weekIndex}"] =
+                    CacheController.timetableList.put("${timetable.meta.courseName}-${timetable.meta.weekIndex}", timetable)
-                        timetable
                 } catch (ex: Exception) {
                     logger.error("error while reading cache", ex)
                 } finally {

src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt

@@ -39,14 +39,10 @@ class StatusController {
     companion object {
         private val logger: Logger = LoggerFactory.getLogger(StatusController::class.java)
 
-        var totalRequests = 0
+        private var totalRequests = 0
-            private set
+        private var mensaMenuRequests = 0
-        var mensaMenuRequests = 0
+        private var courseListRequests = 0
-            private set
+        private var timetableRequests = HashMap<String, Int>()
-        var courseListRequests = 0
-            private set
-        var timetableRequests = HashMap<String, Int>()
-            private set
 
         /**
          * if a mensamenu/courseList/timetable is requested update the specific and total request count
@@ -62,10 +58,29 @@ class StatusController {
         }
 
         fun updateTimetableRequests(courseName: String) {
-            timetableRequests[courseName] = (timetableRequests[courseName] ?: 0) + 1
+            timetableRequests[courseName] = timetableRequests.getOrPut(courseName) {0} + 1
             totalRequests++
         }
 
+        /**
+         * getters and setters
+         */
+        fun getTotalRequests(): Int {
+            return totalRequests
+        }
+
+        fun getMensaMenuRequests(): Int {
+            return mensaMenuRequests
+        }
+
+        fun getCourseListRequests(): Int {
+            return courseListRequests
+        }
+
+        fun getTimetableRequests(): HashMap<String, Int> {
+            return timetableRequests
+        }
+
         fun getStatus(): Status {
             val currentTime = System.currentTimeMillis() / 1000
             val minutes = (currentTime - startTime) % 3600 / 60
@@ -97,10 +112,10 @@ class StatusController {
                 "$days days, $hours:$minutes",
                 apiVersion,
                 softwareVersion,
-                totalRequests,
+                getTotalRequests(),
-                mensaMenuRequests,
+                getMensaMenuRequests(),
-                courseListRequests,
+                getCourseListRequests(),
-                timetableRequests,
+                getTimetableRequests(),
                 CacheController.timetableList.size,
                 Date(CacheController.courseList.meta.updateTime * 1000),
                 Date(CacheController.mensaMenu.meta.updateTime * 1000),

src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/MensaParser.kt

@@ -63,7 +63,7 @@ class MensaParser {
                 .forEachIndexed { dayIndex, day ->
                     val strDay = day.select("h3").text()
 
-                    day.select("div.row").forEachIndexed { _, meal ->
+                    day.select("div.row").forEachIndexed { mealIndex, meal ->
                         val heading = meal.select("h4.menu-header").text()
                         val parts = ArrayList(meal.select("div.menu-info").html().substringBefore("<br><span").replace("\n", "").split("<br>"))
                         val additives = meal.select("span.show-with-allergenes").text()

src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParser.kt

@@ -22,50 +22,34 @@
 
 package org.mosad.thecitadelofricks.hsoparser
 
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.sync.Semaphore
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
-import org.mosad.thecitadelofricks.CalendarWeek
 import org.mosad.thecitadelofricks.Lesson
 import org.mosad.thecitadelofricks.TimetableWeek
 import org.slf4j.LoggerFactory
 
-/**
+class TimetableParser {
- * @param timetableURL the URL of the timetable you want to get
- * @param htmlDoc the html document to use (the timetableURL will be ignored if this value is present)
- */
-class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
     private var logger: org.slf4j.Logger = LoggerFactory.getLogger(TimetableParser::class.java)
     private val days = arrayOf("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday")
 
-    companion object {
-        val semaphore = Semaphore(3, 0)
-    }
-
-    private val htmlDoc: Document? = htmlDoc ?: timetableURL?.let {
-        runBlocking {
-            try {
-                // Only allow sending a limited amount of requests at the same time
-                semaphore.acquire()
-                Jsoup.connect(timetableURL).get()
-            } catch (gex: Exception) {
-                logger.error("general TimetableParser error", gex)
-                null
-            } finally {
-                semaphore.release()
-            }
-        }
-    }
-
     /**
-     * parse the timetable from the previously given url
+     * get the timetable from the given url
      * the timetable is organised per row not per column;
      * Mon 1, Tue 1, Wed 1, Thur 1, Fri 1, Sat 1, Mon 2 and so on
+     * @param timetableURL the URL of the timetable you want to get
      */
-    fun parseTimeTable(): TimetableWeek? = htmlDoc?.let {
+    fun getTimeTable(timetableURL: String): TimetableWeek {
+        return try {
+            parseTimeTable(Jsoup.connect(timetableURL).get())
+        } catch (gex: Exception) {
+            logger.error("general TimetableParser error", gex)
+            TimetableWeek()
+        }
+    }
+
+    fun parseTimeTable(htmlDoc: Document): TimetableWeek {
         val timetableWeek = TimetableWeek()
-        val rows = it.select("table.timetable").select("tr[scope=\"row\"]")
+        val rows = htmlDoc.select("table.timetable").select("tr[scope=\"row\"]")
 
         var sDay = -1
         var sRow = -1
@@ -77,7 +61,7 @@ class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
             var lessonIndexDay = 0 // the index of the lesson per timeslot
 
             // elements are now all lessons, including empty ones
-            row.select("td.lastcol, td[style]").forEach { element ->
+            row.select("td.lastcol, td[style]").forEach {element ->
 
                 // if there is a lecture with rowspan="2", we need to shift everything by one to the left. This is stupid and ugly there needs to bee an API
                 if ((sDay > -1 && sRow > -1) && (sDay == day && ((sRow + 1) == rowIndex))) {
@@ -120,7 +104,8 @@ class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
 
                 lessonIndexDay++
 
-                if (element.hasClass("lastcol")) {
+                if (element.hasClass("lastcol"))
+                {
                     day++
                     lessonIndexDay = 0
                 }
@@ -132,13 +117,21 @@ class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
     }
 
     /**
-     * parse the calendar week and the associated year for the timetable
+     * get the week number of the year for the timetable
+     * @param timetableURL the URL of the timetable you want to get
      */
-    fun parseCalendarWeek(): CalendarWeek? = htmlDoc?.let {
+    fun getWeekNumberYear(timetableURL: String): Int {
-        val dateStr = it.select("h1.timetable-caption").text().substringAfter("- ")
+        return try {
-        val week = dateStr.substringBefore(".").replace(" ", "").toInt()
+            parseWeekNumberYear(Jsoup.connect(timetableURL).get())
-        val year = dateStr.substringAfter("Woche ").replace(" ", "").toInt()
+        } catch (gex: Exception) {
-        CalendarWeek(week, year)
+            logger.error("general TimetableParser error", gex)
+            0
+        }
+    }
+
+    fun parseWeekNumberYear(htmlDoc: Document): Int {
+        return htmlDoc.select("h1.timetable-caption").text().substringAfter("- ")
+            .substringBefore(".").replace(" ", "").toInt()
     }
 
     @Suppress("unused")

src/test/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParserTest.kt

@@ -25,7 +25,6 @@ package org.mosad.thecitadelofricks.hsoparser
 import org.jsoup.Jsoup
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
-import org.mosad.thecitadelofricks.CalendarWeek
 import java.io.File
 
 class TimetableParserTest {
@@ -33,8 +32,8 @@ class TimetableParserTest {
     @Test
     fun parseTimetableNormalWeek() {
         val htmlFile = File(TimetableParserTest::class.java.getResource("/html/Timetable_normal-week.html").path)
-        val htmlDoc = Jsoup.parse(htmlFile, "UTF-8", "https://www.hs-offenburg.de/")
+        val htmlDoc = Jsoup.parse(htmlFile,"UTF-8", "https://www.hs-offenburg.de/")
-        val actualTimetable = TimetableParser(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
+        val actualTimetable = TimetableParser().parseTimeTable(htmlDoc).toString().trim()
         val expectedTimetable = TimetableParserTest::class.java.getResource("/expected/Timetable_normal-week.txt").readText().trim()
 
         Assertions.assertEquals(expectedTimetable, actualTimetable)
@@ -43,19 +42,19 @@ class TimetableParserTest {
     @Test
     fun parseTimetableEmptyWeek() {
         val htmlFile = File(TimetableParserTest::class.java.getResource("/html/Timetable_empty-week.html").path)
-        val htmlDoc = Jsoup.parse(htmlFile, "UTF-8", "https://www.hs-offenburg.de/")
+        val htmlDoc = Jsoup.parse(htmlFile,"UTF-8", "https://www.hs-offenburg.de/")
-        val actualTimetable = TimetableParser(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
+        val actualTimetable = TimetableParser().parseTimeTable(htmlDoc).toString().trim()
         val expectedTimetable = TimetableParserTest::class.java.getResource("/expected/Timetable_empty-week.txt").readText().trim()
 
         Assertions.assertEquals(expectedTimetable, actualTimetable)
     }
 
     @Test
-    fun parseCalendarWeek() {
+    fun parseWeekNumberYear() {
         val htmlFile = File(TimetableParserTest::class.java.getResource("/html/Timetable_normal-week.html").path)
-        val htmlDoc = Jsoup.parse(htmlFile, "UTF-8", "https://www.hs-offenburg.de/")
+        val htmlDoc = Jsoup.parse(htmlFile,"UTF-8", "https://www.hs-offenburg.de/")
-        val actualCalendarWeek = TimetableParser(htmlDoc = htmlDoc).parseCalendarWeek()
+        val actualWeekNumberYear = TimetableParser().parseWeekNumberYear(htmlDoc)
 
-        Assertions.assertEquals(CalendarWeek(42, 2019), actualCalendarWeek)
+        Assertions.assertEquals(42, actualWeekNumberYear)
     }
 }