Fix TimetableParserTest

update gradle wrapper to version 8.4
Merge pull request 'Parse course name for room occupancies' (#30 ) from parse-lessoncourse into master
2023-12-05 19:31:03 +01:00 · 2023-11-14 22:26:25 +01:00 · 2023-09-29 23:12:06 +02:00 · 2023-09-29 16:39:46 +02:00 · 2023-09-29 12:36:06 +02:00 · 2023-09-25 15:33:42 +02:00
22 changed files with 1110 additions and 929 deletions
--- a/1
+++ b/1
@ -1,6 +1,7 @@
 FROM adoptopenjdk/openjdk11:alpine-jre
 RUN addgroup -S spring && adduser -S spring -G spring
 #RUN groupadd -r spring && useradd -r -g spring spring # for openjdk:xx builds
+RUN mkdir /tcor && chown spring:spring /tcor
 USER spring:spring
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} thecitadelofricks.jar
--- a/build.gradle
+++ b/build.gradle
@ -1,25 +1,25 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.5.31'
-    id 'org.jetbrains.kotlin.plugin.spring' version '1.5.31'
-    id 'org.springframework.boot' version '2.5.5'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'org.jetbrains.kotlin.jvm' version '1.7.20'
+    id 'org.jetbrains.kotlin.plugin.spring' version '1.7.20'
+    id 'org.springframework.boot' version '2.7.6'
+    id 'io.spring.dependency-management' version '1.1.0'
 }

 group 'org.mosad'
-version '1.3.0'
+version '1.3.1'

 repositories {
    mavenCentral()
 }

 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
-    implementation 'org.jsoup:jsoup:1.14.3'
-    implementation 'com.google.code.gson:gson:2.8.8'
+    implementation 'org.springframework.boot:spring-boot-starter-web:2.7.6'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.7.22'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    implementation 'org.jsoup:jsoup:1.15.3'
+    implementation 'com.google.code.gson:gson:2.10'

-    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
 }

 test {
@ -33,7 +33,6 @@ test {
 def jvmTargetVersion = "11"
 compileKotlin {
    kotlinOptions.jvmTarget = jvmTargetVersion
-    kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
 }
 compileJava {
    targetCompatibility = jvmTargetVersion
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/285
+++ b/285
@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh

 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@ -17,67 +17,101 @@
 #

 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   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/HEAD/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
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null

-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 # 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
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@ -87,9 +121,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
@ -98,7 +132,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
@ -106,80 +140,105 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    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" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -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
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# 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" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -54,7 +55,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute

 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@ -64,21 +65,6 @@ 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

@ -86,17 +72,19 @@ 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 %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

 :end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
--- a/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt
@ -26,12 +26,16 @@ import org.mosad.thecitadelofricks.controller.CacheController
 import org.mosad.thecitadelofricks.controller.CacheController.Companion.courseList
 import org.mosad.thecitadelofricks.controller.CacheController.Companion.getLesson
 import org.mosad.thecitadelofricks.controller.CacheController.Companion.getLessonSubjectList
+import org.mosad.thecitadelofricks.controller.CacheController.Companion.getRoomSchedule
 import org.mosad.thecitadelofricks.controller.CacheController.Companion.getTimetable
 import org.mosad.thecitadelofricks.controller.CacheController.Companion.mensaMenu
+import org.mosad.thecitadelofricks.controller.CacheController.Companion.roomList
 import org.mosad.thecitadelofricks.controller.StartupController
 import org.mosad.thecitadelofricks.controller.StatusController.Companion.getStatus
 import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateCourseListRequests
 import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateMensaMenuRequests
+import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateRoomListRequests
+import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateRoomScheduleRequests
 import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateTimetableRequests
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@ -48,8 +52,8 @@ class APIController {
    private val logger: Logger = LoggerFactory.getLogger(APIController::class.java)

    companion object {
-        const val apiVersion = "1.3.0"
-        const val softwareVersion = "1.3.0"
+        const val apiVersion = "1.4.0"
+        const val softwareVersion = "1.3.1"
        val startTime = System.currentTimeMillis() / 1000
    }

@ -98,12 +102,29 @@ class APIController {
        @RequestParam(value = "course", defaultValue = "AI4") courseName: String,
        @RequestParam(value = "subject", defaultValue = "Mathematik 4") lessonSubject: String,
        @RequestParam(value = "week", defaultValue = "0") week: Int
-    ): ArrayList<Lesson> {
+    ): ArrayList<LessonWithRoom> {
        logger.info("lesson request at ${LocalDateTime.now()}!")
        updateTimetableRequests(courseName)
        return getLesson(courseName, lessonSubject, week)
    }

+    @RequestMapping("/roomList")
+    fun roomList(): RoomsListRet {
+        logger.info("roomList request at ${LocalDateTime.now()}!")
+        updateRoomListRequests()
+        return RoomsListRet(roomList.meta, ArrayList(roomList.rooms.values))
+    }
+
+    @RequestMapping("/roomSchedule")
+    fun roomSchedule(
+        @RequestParam(value = "room", defaultValue = "B040") roomName: String,
+        @RequestParam(value = "week", defaultValue = "0") week: Int
+    ): RoomScheduleWeekRet {
+        logger.info("roomSchedule request at ${LocalDateTime.now()}!")
+        updateRoomScheduleRequests(roomName)
+        return getRoomSchedule(roomName, week)
+    }
+
    @RequestMapping("/status")
    fun status(): Status {
        logger.info("status request at ${LocalDateTime.now()}!")
--- a/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt
@ -49,7 +49,7 @@ data class MensaMenu(val meta: MensaMeta, val currentWeek: MensaWeek, val nextWe

 data class CalendarWeek(val week: Int, val year: Int)

-data class Lesson(
+data class LessonWithRoom(
    val lessonID: String,
    val lessonSubject: String,
    val lessonTeacher: String,
@ -57,13 +57,33 @@ data class Lesson(
    val lessonRemark: String
 )

-data class TimetableDay(val timeslots: Array<ArrayList<Lesson>> = Array(6) { ArrayList<Lesson>() })
+data class LessonWithCourse(
+    val lessonID: String,
+    val lessonSubject: String,
+    val lessonTeacher: String,
+    val lessonCourse: String,
+    val lessonRemark: String
+)

-data class TimetableWeek(val days: Array<TimetableDay> = Array(6) { TimetableDay() })
+data class TimetableDay<Lesson>(val timeslots: Array<ArrayList<Lesson>> = Array(6) { ArrayList<Lesson>() })

-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 TimetableWeek<Lesson>(val days: Array<TimetableDay<Lesson>> = Array(6) { TimetableDay() })

-data class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek = TimetableWeek())
+data class TimetableCourseMeta(var updateTime: Long = 0, val courseName: String = "", val weekIndex: Int = 0, var weekNumberYear: Int = 0, var year: Int = 0, val link: String = "")
+
+data class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek<LessonWithRoom> = TimetableWeek())
+
+// data classes for the room occupancy part
+data class Room(val roomName: String, val roomLink: String)
+
+data class RoomsMeta(val updateTime: Long = 0, val totalRooms: Int = 0)
+
+data class RoomsList(val meta: RoomsMeta = RoomsMeta(), val rooms: SortedMap<String, Room>)
+data class RoomsListRet(val meta: RoomsMeta = RoomsMeta(), val rooms: ArrayList<Room> = ArrayList())
+
+data class RoomScheduleMeta(var updateTime: Long = 0, val roomName: String = "", val weekIndex: Int = 0, var weekNumberYear: Int = 0, var year: Int = 0, val link: String = "")
+
+data class RoomScheduleWeekRet(val meta: RoomScheduleMeta = RoomScheduleMeta(), var timetable: TimetableWeek<LessonWithCourse> = TimetableWeek())


 // data classes for the status part
@ -79,6 +99,10 @@ data class Status(
    val timetableRequests: HashMap<String, Int>,
    val timetableListSize: Int,
    val coursesLastUpdate: Date,
+    val roomListRequests: Int,
+    val roomScheduleRequests: HashMap<String, Int>,
+    val roomScheduleListSize: Int,
+    val roomsLastUpdate: Date,
    val mensaLastUpdate: Date,
    val hsoResponseCode: Int,
    val swfrResponseCode: Int
--- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt
@ -27,8 +27,10 @@ import kotlinx.coroutines.*
 import org.jsoup.Jsoup
 import org.mosad.thecitadelofricks.*
 import org.mosad.thecitadelofricks.hsoparser.CourseListParser
+import org.mosad.thecitadelofricks.hsoparser.CourseTimetableParser
 import org.mosad.thecitadelofricks.hsoparser.MensaParser
-import org.mosad.thecitadelofricks.hsoparser.TimetableParser
+import org.mosad.thecitadelofricks.hsoparser.RoomListParser
+import org.mosad.thecitadelofricks.hsoparser.RoomTimetableParser
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.*
@ -38,8 +40,8 @@ import java.util.concurrent.Executors
 import kotlin.collections.ArrayList
 import kotlin.collections.HashSet
 import kotlin.concurrent.scheduleAtFixedRate
-import kotlin.time.Duration
-import kotlin.time.ExperimentalTime
+import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.minutes

 class CacheController {

@ -54,6 +56,8 @@ class CacheController {
        var courseList = CoursesList(CoursesMeta(), sortedMapOf())
        var mensaMenu = MensaMenu(MensaMeta(0, ""), MensaWeek(), MensaWeek())
        var timetableList = ConcurrentHashMap<String, TimetableCourseWeek>() // this list contains all timetables
+        var roomList = RoomsList(RoomsMeta(), sortedMapOf())
+        var roomScheduleList = ConcurrentHashMap<String, RoomScheduleWeekRet>() // this list contains all room schedules

        /**
         * get a timetable, since they may not be cached, we need to make sure it's cached, otherwise download
@ -72,7 +76,7 @@ class CacheController {
                val instr = CacheController::class.java.getResourceAsStream("/html/Timetable_normal-week.html")

                val timetableParser =
-                    TimetableParser(htmlDoc = Jsoup.parse(instr, "UTF-8", "https://www.hs-offenburg.de/"))
+                    CourseTimetableParser(htmlDoc = Jsoup.parse(instr!!, "UTF-8", "https://www.hs-offenburg.de/"))
                val timetableTest = timetableParser.parseTimeTable()

                return TimetableCourseWeek(
@ -88,7 +92,7 @@ class CacheController {
            }

            val key = "$courseName-$weekIndex"
-            return if (timetableList.contains(key)) {
+            return if (timetableList.containsKey(key)) {
                timetableList[key]!!
            } else {
                val timetableLink = courseList.courses[courseName]
@ -96,7 +100,7 @@ class CacheController {
                    ?.replace("week=0", "week=$weekIndex") ?: ""
                val currentTime = System.currentTimeMillis() / 1000

-                val timetableParser = TimetableParser(timetableLink)
+                val timetableParser = CourseTimetableParser(timetableLink)
                val calendarWeek = timetableParser.parseCalendarWeek()
                val timetable = timetableParser.parseTimeTable()

@ -138,8 +142,8 @@ class CacheController {
         * @param weekIndex request week number (current week = 0)
         * @return a ArrayList<[Lesson]> of every lesson with lessonSubject for one week
         */
-        fun getLesson(courseName: String, lessonSubject: String, weekIndex: Int): ArrayList<Lesson> {
-            val lessonList = ArrayList<Lesson>()
+        fun getLesson(courseName: String, lessonSubject: String, weekIndex: Int): ArrayList<LessonWithRoom> {
+            val lessonList = ArrayList<LessonWithRoom>()

            // get all lessons from the weeks timetable
            val flatMap = getTimetable(courseName, weekIndex).timetable.days.flatMap { it.timeslots.asIterable() }
@ -150,14 +154,48 @@ class CacheController {
            return lessonList
        }

+        /**
+         * Get a room schedule.
+         * Since they may not be cached, we need to make sure it's cached. Download the schedule if it is not cached.
+         * @param roomName the name of the room to be requested
+         * @param weekIndex request week number (current week = 0)
+         * @return room schedule of the room (Type: [RoomScheduleWeekRet])
+         */
+        fun getRoomSchedule(roomName: String, weekIndex: Int): RoomScheduleWeekRet {
+            val key = "$roomName-$weekIndex"
+            return if (roomScheduleList.containsKey(key)) {
+                roomScheduleList[key]!!
+            } else {
+                val roomScheduleLink = roomList.rooms[roomName]
+                    ?.roomLink
+                    ?.replace("week=0", "week=$weekIndex") ?: ""
+                val currentTime = System.currentTimeMillis() / 1000
+
+                val roomScheduleParser = RoomTimetableParser(roomScheduleLink)
+                val calendarWeek = roomScheduleParser.parseCalendarWeek()
+                val roomSchedule = roomScheduleParser.parseTimeTable()
+
+                RoomScheduleWeekRet(
+                    RoomScheduleMeta(
+                        currentTime,
+                        roomName,
+                        weekIndex,
+                        calendarWeek?.week ?: 0,
+                        calendarWeek?.year ?: 0,
+                        roomScheduleLink
+                    ), roomSchedule ?: TimetableWeek()
+                ).also { if (roomSchedule != null) roomScheduleList[key] = it }
+            }
+        }
+
        // private cache functions

        /**
         * this function updates the courseList
         * during the update process the old data will be returned for an API request
         */
-        private fun asyncUpdateCourseList() = GlobalScope.launch {
-            CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
+        private fun asyncUpdateCourseList() = CoroutineScope(Dispatchers.IO).launch {
+            CourseListParser().getLinks(StartupController.courseListURL)?.let {
                courseList = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it.toSortedMap())
            }

@ -165,14 +203,26 @@ class CacheController {
            courseList.courses["TEST_A"] = Course("TEST_A", "https://mosad.xyz")
            courseList.courses["TEST_B"] = Course("TEST_B", "https://mosad.xyz")

-            logger.info("Updated courses successful at ${Date(courseList.meta.updateTime * 1000)}")
+            logger.info("Updated courses successfully at ${Date(courseList.meta.updateTime * 1000)}")
+        }
+
+        /**
+         * this function updates the roomList
+         * during the update process the old data will be returned for an API request
+         */
+        private fun asyncUpdateRoomList() = CoroutineScope(Dispatchers.IO).launch {
+            RoomListParser().getLinks(StartupController.roomListURL)?.let {
+                roomList = RoomsList(RoomsMeta(System.currentTimeMillis() / 1000, it.size), it.toSortedMap())
+            }
+
+            logger.info("Updated room list successfully at ${Date(courseList.meta.updateTime * 1000)}")
        }

        /**
         * this function updates the mensa menu list
         * during the update process the old data will be returned for an API request
         */
-        private fun asyncUpdateMensa() = GlobalScope.launch {
+        private fun asyncUpdateMensa() = CoroutineScope(Dispatchers.IO).launch {
            val mensaCurrentWeek = MensaParser().getMensaMenu(StartupController.mensaMenuURL)
            val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(StartupController.mensaMenuURL))

@ -181,7 +231,7 @@ class CacheController {
                mensaMenu = MensaMenu(MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek)
            }

-            logger.info("Updated mensamenu successful at ${Date(mensaMenu.meta.updateTime * 1000)}")
+            logger.info("Updated mensa menu successfully at ${Date(mensaMenu.meta.updateTime * 1000)}")
        }

        /**
@ -189,7 +239,7 @@ class CacheController {
         * during the update process the old data will be returned for an API request
         * a FixedThreadPool is used to make parallel requests for faster updates
         */
-        private fun asyncUpdateTimetables() = GlobalScope.launch {
+        private fun asyncUpdateTimetables() = CoroutineScope(Dispatchers.IO).launch {
            logger.info("Updating ${timetableList.size} timetables ...")

            // create a new ThreadPool with 5 threads
@ -198,10 +248,12 @@ class CacheController {
            try {
                timetableList.forEach { timetableCourse ->
                    executor.execute {
-                        val timetableParser = TimetableParser(timetableCourse.value.meta.link)
+                        val timetableParser = CourseTimetableParser(timetableCourse.value.meta.link)
                        timetableCourse.value.timetable = timetableParser.parseTimeTable() ?: return@execute
-                        timetableCourse.value.meta.weekNumberYear =
-                            timetableParser.parseCalendarWeek()?.week ?: return@execute
+                        timetableParser.parseCalendarWeek()?.also {
+                            timetableCourse.value.meta.weekNumberYear = it.week
+                            timetableCourse.value.meta.year = it.year
+                        } ?: return@execute
                        timetableCourse.value.meta.updateTime = System.currentTimeMillis() / 1000

                        saveTimetableToCache(timetableCourse.value) // save the updated timetable to the cache directory
@ -233,6 +285,52 @@ class CacheController {
            }
        }

+        private fun asyncUpdateRoomSchedules() = CoroutineScope(Dispatchers.IO).launch {
+            logger.info("Updating ${roomScheduleList.size} room schedules ...")
+
+            // create a new ThreadPool with 5 threads
+            val executor = Executors.newFixedThreadPool(5)
+
+            try {
+                roomScheduleList.forEach { roomSchedule ->
+                    executor.execute {
+                        val roomScheduleParser = RoomTimetableParser(roomSchedule.value.meta.link)
+                        roomSchedule.value.timetable = roomScheduleParser.parseTimeTable() ?: return@execute
+                        roomScheduleParser.parseCalendarWeek()?.also {
+                            roomSchedule.value.meta.weekNumberYear = it.week
+                            roomSchedule.value.meta.year = it.year
+                        } ?: return@execute
+                        roomSchedule.value.meta.updateTime = System.currentTimeMillis() / 1000
+
+                        saveRoomScheduleToCache(roomSchedule.value) // save the updated timetable to the cache directory
+                    }
+
+                }
+            } catch (ex: Exception) {
+                logger.error("Error while updating the room schedules", ex)
+            } finally {
+                executor.shutdown()
+            }
+        }
+
+        /**
+         * save a timetable to the cache directory
+         * this is only call on async updates, it is NOT call when first getting the timetable
+         * @param roomSchedule a room schedule of the type [RoomScheduleWeekRet]
+         */
+        private fun saveRoomScheduleToCache(roomSchedule: RoomScheduleWeekRet) {
+            val file = File(StartupController.dirTcorCache, "roomSchedule-${roomSchedule.meta.roomName}-${roomSchedule.meta.weekIndex}.json")
+            val writer = BufferedWriter(FileWriter(file))
+
+            try {
+                writer.write(Gson().toJson(roomSchedule))
+            } catch (e: Exception) {
+                logger.error("something went wrong while trying to write a cache file", e)
+            } finally {
+                writer.close()
+            }
+        }
+
        /**
         * before the APIController is up, get the data fist
         * runBlocking: otherwise the api would return no data to requests for a few seconds after startup
@ -241,9 +339,11 @@ class CacheController {
            // get all course links on startup, make sure there are course links
            val jobCourseUpdate = asyncUpdateCourseList()
            val jobMensa = asyncUpdateMensa()
+            val jobRoomListUpdate = asyncUpdateRoomList()

            jobCourseUpdate.join()
            jobMensa.join()
+            jobRoomListUpdate.join()

            logger.info("Initial updates successful")
        }
@ -252,14 +352,13 @@ 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 duration24h = Duration.hours(24).inWholeMilliseconds
-            val duration3h = Duration.hours(3).inWholeMilliseconds
-            val duration1h = Duration.hours(1).inWholeMilliseconds
-            val duration1m = Duration.minutes(1).inWholeMilliseconds
+            val duration24h = 24.hours.inWholeMilliseconds
+            val duration3h = 3.hours.inWholeMilliseconds
+            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
@ -267,17 +366,23 @@ class CacheController {
            val initDelay3h = calcInitDelay(duration3h)
            val initDelay1h = calcInitDelay(duration1h)

-            // update courseList every 24 hours (time in ms)
+            // update courseList and roomList every 24 hours (time in ms)
            Timer().scheduleAtFixedRate(initDelay24h, duration24h) {
                asyncUpdateCourseList()
            }
+            Timer().scheduleAtFixedRate(initDelay24h, duration24h) {
+                asyncUpdateRoomList()
+            }

-            // update all already existing timetables every 3 hours (time in ms)
+            // update all already existing timetables and room schedules every 3 hours (time in ms)
            Timer().scheduleAtFixedRate(initDelay3h, duration3h) {
                asyncUpdateTimetables()
            }
+            Timer().scheduleAtFixedRate(initDelay3h, duration3h) {
+                asyncUpdateRoomSchedules()
+            }

-            // update courses every hour (time in ms)
+            // update mensa menu every hour (time in ms)
            Timer().scheduleAtFixedRate(initDelay1h, duration1h) {
                asyncUpdateMensa()
            }
--- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/StartupController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/StartupController.kt
@ -44,7 +44,8 @@ class StartupController {
        var cachetAPIKey = "0"
        var cachetBaseURL = "https://status.mosad.xyz"
        var courseListURL = "https://www.hs-offenburg.de/studium/vorlesungsplaene/"
-        var mensaMenuURL = "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/"
+        val roomListURL = "https://www.hs-offenburg.de/die-hochschule/organisation/infos-services/raumbelegungen"
+        var mensaMenuURL = "https://www.swfr.de/essen/mensen-cafes-speiseplaene/mensa-offenburg"
        var mensaName = "Offenburg"
    }

@ -77,29 +78,21 @@ class StartupController {
        val properties = Properties()
        properties.loadFromXML(FileInputStream(fileConfig))

-        cachetAPIKey = try {
-            properties.getProperty("cachetAPIKey")
-        } catch (ex: Exception) {
-            "0"
-        }
+        try {
+            cachetAPIKey = properties.getProperty("cachetAPIKey")
+        } catch (_: Exception) {}

-        cachetBaseURL = try {
-            properties.getProperty("cachetBaseURL")
-        } catch (ex: Exception) {
-            "https://status.mosad.xyz"
-        }
+        try {
+            cachetBaseURL = properties.getProperty("cachetBaseURL")
+        } catch (_: Exception) {}

-        mensaMenuURL = try {
-            properties.getProperty("mensaMenuURL")
-        } catch (ex: Exception) {
-            "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/"
-        }
+        try {
+            mensaMenuURL = properties.getProperty("mensaMenuURL")
+        } catch (_: Exception) {}

-        mensaName = try {
-            properties.getProperty("mensaName")
-        } catch (ex: Exception) {
-            "Offenburg"
-        }
+        try {
+            mensaName = properties.getProperty("mensaName")
+        } catch (_: Exception) {}

    } catch (ex: Exception) {
        logger.error("error while loading config", ex)
@ -111,10 +104,10 @@ class StartupController {
    private fun createConfig() = try {
        val properties = Properties()

-        properties.setProperty("cachetAPIKey", "0")
-        properties.setProperty("cachetBaseURL", "https://status.mosad.xyz")
-        properties.setProperty("mensaMenuURL", "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/")
-        properties.setProperty("mensaName", "Offenburg")
+        properties.setProperty("cachetAPIKey", cachetAPIKey)
+        properties.setProperty("cachetBaseURL", cachetBaseURL)
+        properties.setProperty("mensaMenuURL", mensaMenuURL)
+        properties.setProperty("mensaName", mensaName)

        val outputStream = FileOutputStream(fileConfig)
        properties.storeToXML(outputStream, "tcor configuration")
--- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt
@ -47,6 +47,10 @@ class StatusController {
            private set
        var timetableRequests = HashMap<String, Int>()
            private set
+        var roomListRequests = 0
+            private set
+        var roomScheduleRequests = HashMap<String, Int>()
+            private set

        /**
         * if a mensamenu/courseList/timetable is requested update the specific and total request count
@ -66,6 +70,16 @@ class StatusController {
            totalRequests++
        }

+        fun updateRoomListRequests() {
+            roomListRequests++
+            totalRequests++
+        }
+
+        fun updateRoomScheduleRequests(roomName: String) {
+            roomScheduleRequests[roomName] = (roomScheduleRequests[roomName] ?: 0) + 1
+            totalRequests++
+        }
+
        fun getStatus(): Status {
            val currentTime = System.currentTimeMillis() / 1000
            val minutes = (currentTime - startTime) % 3600 / 60
@ -103,6 +117,10 @@ class StatusController {
                timetableRequests,
                CacheController.timetableList.size,
                Date(CacheController.courseList.meta.updateTime * 1000),
+                roomListRequests,
+                roomScheduleRequests,
+                CacheController.roomScheduleList.size,
+                Date(CacheController.roomList.meta.updateTime * 1000),
                Date(CacheController.mensaMenu.meta.updateTime * 1000),
                hsoCode,
                swfrCode
--- a/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/CourseListParser.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/CourseListParser.kt
@ -1,61 +0,0 @@
-/**
- * TheCitadelofRicks
- *
- * Copyright 2019-2020  <seil0@mosad.xyz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-
-package org.mosad.thecitadelofricks.hsoparser
-
-import org.jsoup.Jsoup
-import org.mosad.thecitadelofricks.Course
-import org.slf4j.LoggerFactory
-import java.net.SocketTimeoutException
-
-class CourseListParser {
-
-    private var logger: org.slf4j.Logger = LoggerFactory.getLogger(CourseListParser::class.java)
-
-    /**
-     * return a list of all courses at courseListURL
-     * @param courseListURL the url to the course list page
-     * @return a ArrayList<Course> with all courses or null if the request was not successful
-     */
-    fun getCourseLinks(courseListURL: String): HashMap<String, Course>? {
-        val courseLinkList = HashMap<String, Course>()
-        try {
-            val courseHTML = Jsoup.connect(courseListURL).get()
-
-            courseHTML.select("ul.index-group").select("li.Class").select("a[href]").forEachIndexed { _, element ->
-                courseLinkList[element.text()] = Course(
-                    element.text(),
-                    element.attr("href").replace("http", "https")
-                )
-            }
-            logger.info("successfully retrieved course List")
-        } catch (ex: SocketTimeoutException) {
-            logger.warn("timeout from hs-offenburg.de, updating on next attempt!")
-            return null
-        } catch (gex: Exception) {
-            logger.error("general CourseListParser error", gex)
-            return null
-        }
-
-        return courseLinkList
-    }
-}
--- a/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/MensaParser.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/MensaParser.kt
@ -59,19 +59,24 @@ class MensaParser {
        val mealWeekList = MensaWeek()

        try {
-            htmlDoc.select("#speiseplan-tabs").select("div.tab-content").select("div.menu-tagesplan")
+            htmlDoc.select("#tabsWeekdaysMenu").select("div.menu-tagesplan")
                .forEachIndexed { dayIndex, day ->
+                    val meals = mealWeekList.days[dayIndex].meals
                    val strDay = day.select("h3").text()

-                    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()
+                    day.select("div.menu-tagesplan > div.grid").first()?.select("div.flex-col")?.forEachIndexed { _, meal ->
+                        val heading = meal.select("h5").text()
+                        val parts = ArrayList(meal.select("small.extra-text").html().split("<br>").map { it.trim() })
+                        val additives = meal.select("small.zusatzsstoffe[x-show=showAllergenes]").text()
                        parts.removeIf { x -> x.isEmpty() || x.isBlank() }

-                        mealWeekList.days[dayIndex].meals.add(Meal(strDay, heading, parts, additives))
+                        meals.add(Meal(strDay, heading, parts, additives))
                    }

+                    if (meals.isEmpty()) {
+                        // Add an empty Meal entry to preserve the day information
+                        meals.add(Meal(strDay, "", ArrayList(), ""))
+                    }
                }
        } catch (pex: Exception) {
            logger.error("error while parsing the html file", pex)
@ -87,8 +92,7 @@ class MensaParser {
     */
    fun getMenuLinkNextWeek(mensaMenuURL: String): String {
        val menuHTML = Jsoup.connect(mensaMenuURL).get()
-
-        return "https://www.swfr.de" + menuHTML.select("#speiseplan-tabs").select("a.next-week").attr("href")
+        return "https://www.swfr.de" + menuHTML.select("div.section-mensa").select("a.next-week").attr("href")
    }

 }
--- a/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableLinkListParser.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableLinkListParser.kt
@ -0,0 +1,86 @@
+/**
+ * TheCitadelofRicks
+ *
+ * Copyright 2019-2020  <seil0@mosad.xyz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.thecitadelofricks.hsoparser
+
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Element
+import org.mosad.thecitadelofricks.Course
+import org.mosad.thecitadelofricks.Room
+import org.slf4j.LoggerFactory
+import java.net.SocketTimeoutException
+
+sealed class TimetableLinkListParser<T> {
+
+    private var logger: org.slf4j.Logger = LoggerFactory.getLogger(TimetableLinkListParser::class.java)
+
+    abstract fun constructValue(key: String, link: String): T
+
+    abstract val blacklist: List<String>
+
+    abstract val liClass: String
+
+    /**
+     * return a list of all elements at listURL
+     * @param listURL the url to the list page
+     * @return a ArrayList<T> with all links or null if the request was not successful
+     */
+    fun getLinks(listURL: String): HashMap<String, T>? {
+        val linkList = HashMap<String, T>()
+        try {
+            val courseHTML = Jsoup.connect(listURL).get()
+
+            courseHTML
+                .select("ul.index-group")
+                .select("li.$liClass")
+                .select("a[href]")
+                .filter{ it: Element -> !blacklist.contains(it.text()) }
+                .forEach {
+                    linkList[it.text()] = constructValue(
+                        it.text(),
+                        it.attr("href").replace("http:", "https:")
+                    )
+                }
+            logger.info("successfully retrieved link List")
+        } catch (ex: SocketTimeoutException) {
+            logger.warn("timeout from hs-offenburg.de, updating on next attempt!")
+            return null
+        } catch (gex: Exception) {
+            logger.error("general TimetableLinkListParser error", gex)
+            return null
+        }
+
+        return linkList
+    }
+}
+
+class CourseListParser : TimetableLinkListParser<Course>() {
+    override fun constructValue(key: String, link: String) = Course(key, link)
+    override val blacklist = emptyList<String>()
+    override val liClass = "Class"
+}
+
+class RoomListParser : TimetableLinkListParser<Room>() {
+    override fun constructValue(key: String, link: String) = Room(key, link)
+    override val blacklist = listOf("STÜBER SYSTEMS")
+    override val liClass = "Room"
+}
--- a/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParser.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParser.kt
@ -27,7 +27,8 @@ 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.LessonWithCourse
+import org.mosad.thecitadelofricks.LessonWithRoom
 import org.mosad.thecitadelofricks.TimetableWeek
 import org.slf4j.LoggerFactory

@ -35,10 +36,13 @@ import org.slf4j.LoggerFactory
 * @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) {
+sealed class TimetableParser<Lesson>(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")

+    abstract fun constructLesson(lessonID: String, lessonSubject: String, lessonTeacher: String, value4: String, lessonRemark: String): Lesson
+    abstract val value4Class: String
+
    companion object {
        val semaphore = Semaphore(3, 0)
    }
@ -63,13 +67,13 @@ class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
     * 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
     */
-    fun parseTimeTable(): TimetableWeek? = htmlDoc?.let {
-        val timetableWeek = TimetableWeek()
+    fun parseTimeTable(): TimetableWeek<Lesson>? = htmlDoc?.let {
+        val timetableWeek = TimetableWeek<Lesson>()
        val rows = it.select("table.timetable").select("tr[scope=\"row\"]")

        var sDay = -1
        var sRow = -1
-        var sLesson = Lesson("", "", "", "", "")
+        var sLesson = constructLesson("", "", "", "", "")

        // get each row with index, reflects 1 timeslot per day
        for ((rowIndex, row) in rows.withIndex()) {
@ -86,11 +90,11 @@ class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {

                    // adjust the following slot
                    sDay++
-                    sLesson = Lesson(
+                    sLesson = constructLesson(
                        "$day.$rowIndex.$lessonIndexDay",
                        element.select("div.lesson-subject").text(),
                        element.select("div.lesson-teacher").text(),
-                        element.</
Author	SHA1	Message	Date
Hannes Braun	f40afe84ed	Fix TimetableParserTest	2023-12-05 19:31:03 +01:00
Jannik	3c1d5ac6c7	update gradle wrapper to version 8.4	2023-11-14 22:26:25 +01:00
Jannik	302e1c7307	Merge pull request 'Parse course name for room occupancies' (#30 ) from parse-lessoncourse into master Reviewed-on: #30	2023-09-29 23:12:06 +02:00
Hannes Braun	22ba5d5f7f	Parse course name for room occupancies	2023-09-29 16:39:46 +02:00
Jannik	b2a429cc48	Merge pull request 'Add API for room occupancy' (#29 ) from room-api into master Reviewed-on: #29	2023-09-29 12:36:06 +02:00
Hannes Braun	1a768e1188	Add API for room occupancy	2023-09-25 15:33:42 +02:00
Hannes Braun	b78d28a6d3	Fix some more typos	2023-09-15 18:59:11 +02:00
Hannes Braun	954e8ec359	Fix typo in comment about mensa menu update	2023-08-24 23:26:57 +02:00
Jannik	a5d13629e5	Merge pull request 'CourseListParser: don't replace https with httpss' (#28 ) from fix-course-list-parser into master Reviewed-on: #28	2023-06-30 13:18:24 +02:00
Hannes Braun	a3b3c40d77	CourseListParser: don't replace https with httpss	2023-05-15 14:35:55 +02:00
Jannik	0f59fb51b4	Merge pull request 'Remove -Xopt-in compiler argument' (#27 ) from opt-out into master Reviewed-on: #27	2023-04-05 11:06:34 +02:00
Hannes Braun	97f32069fa	Remove -Xopt-in compiler argument We don't need to opt in to the experimental Time class any longer.	2023-04-03 21:17:54 +02:00
Jannik	9f8ca744bc	Merge pull request 'Fix permissions of TCoR volume in Docker container' (#26 ) from fix-docker-permissions into master Reviewed-on: #26	2023-02-19 14:23:17 +01:00
Hannes Braun	14b212dcf8	Fix permissions of TCoR volume in Docker container	2023-01-31 18:53:41 +01:00
Jannik	be415a8ee4	Merge pull request 'Update year when updating cached timetables' (#25 ) from fix-year-update into master Reviewed-on: #25	2023-01-14 12:45:31 +01:00
Hannes Braun	7f7aaa180a	Update year when updating cached timetables	2023-01-13 20:21:15 +01:00
Jannik	3e17a788d7	update gradle wrapper to version 7.6	2022-12-22 16:15:17 +01:00
Jannik	fb838f5a32	update dependencies * kotlin 1.6.20 -> 1.7.20 * spring boot 2.6.6 -> 2.7.6 * coroutines 1.6.1 -> 1.6.4 * gson 2.9.0 -> 2.10	2022-12-22 15:56:10 +01:00
Jannik	7581dc058c	Merge pull request 'Replace GlobalScope with CoroutineScope in CacheController' (#22 ) from feature/CoroutineScope into master Reviewed-on: #22	2022-12-22 15:47:16 +01:00
Jannik	a212539366	replace GlobalScope with CoroutineScope in CacheController	2022-12-22 15:42:46 +01:00
Jannik	dc6c41578a	Merge pull request 'Update MensaParser for new Mensa website' (#24 ) from fix-mensaparser into master Reviewed-on: #24	2022-12-22 15:38:20 +01:00
Hannes Braun	a39da6deba	Update MensaParser for new Mensa website	2022-12-19 21:02:50 +01:00
Hannes Braun	d457627e00	Update jsoup from 1.14.3 to 1.15.3 Version 1.14.3 also included a vulnerability (CVE-2022-36033) that got fixed with 1.15.3.	2022-12-19 20:30:14 +01:00
Hannes Braun	795ddc516d	Deduplicate default values in StartupController	2022-12-19 20:26:45 +01:00
Jannik	e6f09c11ba	update libraries * spring boot 2.5.5 -> 2.6.6 * kotlin 1.5.31 -> 1.6.20 * coroutines 1.5.2 -> 1.6.1 * gson 2.8.8 -> 2.9.0 * gradle wrapper 7.2 -> 7.4.2	2022-04-08 14:54:06 +02:00
Jannik	f7c8958d20	Merge pull request 'Fix CacheController lookup' (#23 ) from fix/cache-controller into master continuous-integration/woodpecker the build was successful Details Reviewed-on: #23	2022-01-14 18:46:24 +01:00
Hannes Braun	006e962bf1	Fix CacheController lookup continuous-integration/woodpecker the build was successful Details	2022-01-14 15:42:25 +01:00