version 1.3.0

Merge pull request 'Parse the year of a timetable' (#21 ) from hannesbraun/TheCitadelofRicks:feature/parse-year into master
Reviewed-on: #21
2021-10-31 22:09:12 +01:00 · 2021-10-24 15:00:13 +02:00 · 2021-10-24 14:39:22 +02:00 · 2021-10-24 14:38:12 +02:00 · 2021-10-24 14:34:00 +02:00 · 2021-10-24 14:34:00 +02:00
12 changed files with 82 additions and 81 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,30 +0,0 @@
-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
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -0,0 +1,21 @@
+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
--- a/README.md
+++ b/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://drone.mosad.xyz/api/badges/Seil0/TheCitadelofRicks/status.svg)](https://drone.mosad.xyz/Seil0/TheCitadelofRicks)
+[![Build Status](https://ci.mosad.xyz/api/badges/Seil0/TheCitadelofRicks/status.svg)](https://ci.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
--- a/build.gradle
+++ b/build.gradle
@ -6,7 +6,7 @@ plugins {
 }

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

 repositories {
    mavenCentral()
--- a/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt
+++ b/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.2.0"
-        const val softwareVersion = "1.2.7"
+        const val apiVersion = "1.3.0"
+        const val softwareVersion = "1.3.0"
        val startTime = System.currentTimeMillis() / 1000
    }

--- a/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt
@ -46,6 +46,9 @@ 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,
@ -58,7 +61,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 link: String = "")
+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 TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek = TimetableWeek())

--- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt
@ -33,9 +33,9 @@ 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
@ -53,7 +53,7 @@ class CacheController {

        var courseList = CoursesList(CoursesMeta(), sortedMapOf())
        var mensaMenu = MensaMenu(MensaMeta(0, ""), MensaWeek(), MensaWeek())
-        var timetableList = HashMap<String, TimetableCourseWeek>() // this list contains all timetables
+        var timetableList = ConcurrentHashMap<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
@ -68,6 +68,7 @@ class CacheController {
                val currentTime = System.currentTimeMillis() / 1000
                val timetableLink = "https://mosad.xyz"
                val weekNumberYear = 0
+                val year = 0
                val instr = CacheController::class.java.getResourceAsStream("/html/Timetable_normal-week.html")

                val timetableParser =
@ -80,6 +81,7 @@ class CacheController {
                        courseName,
                        weekIndex,
                        weekNumberYear,
+                        year,
                        timetableLink
                    ), timetableTest ?: TimetableWeek()
                )
@ -95,7 +97,7 @@ class CacheController {
                val currentTime = System.currentTimeMillis() / 1000

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

                TimetableCourseWeek(
@ -103,10 +105,11 @@ class CacheController {
                        currentTime,
                        courseName,
                        weekIndex,
-                        weekNumberYear ?: 0,
+                        calendarWeek?.week ?: 0,
+                        calendarWeek?.year ?: 0,
                        timetableLink
                    ), timetable ?: TimetableWeek()
-                ).also { timetableList[key] = it }
+                ).also { if (timetable != null) timetableList[key] = it }
            }
        }

@ -198,7 +201,7 @@ class CacheController {
                        val timetableParser = TimetableParser(timetableCourse.value.meta.link)
                        timetableCourse.value.timetable = timetableParser.parseTimeTable() ?: return@execute
                        timetableCourse.value.meta.weekNumberYear =
-                            timetableParser.parseWeekNumberYear() ?: return@execute
+                            timetableParser.parseCalendarWeek()?.week ?: return@execute
                        timetableCourse.value.meta.updateTime = System.currentTimeMillis() / 1000

                        saveTimetableToCache(timetableCourse.value) // save the updated timetable to the cache directory
--- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/StartupController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/StartupController.kt
@ -44,7 +44,7 @@ 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/de/essen-trinken/speiseplaene/mensa-offenburg/"
+        var mensaMenuURL = "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/"
        var mensaName = "Offenburg"
    }

@ -92,7 +92,7 @@ class StartupController {
        mensaMenuURL = try {
            properties.getProperty("mensaMenuURL")
        } catch (ex: Exception) {
-            "https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/"
+            "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/"
        }

        mensaName = try {
@ -113,7 +113,7 @@ class StartupController {

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

        val outputStream = FileOutputStream(fileConfig)
--- a/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParser.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParser.kt
@ -22,8 +22,11 @@

 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
@ -36,31 +39,33 @@ 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")

-    private val htmlDoc: Document? =
-        htmlDoc
-            ?: if (timetableURL == null) {
+    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
-            } else {
-                try {
-                    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
     * 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? {
-        if (htmlDoc == null) {
-            return null
-        }
-
+    fun parseTimeTable(): TimetableWeek? = htmlDoc?.let {
        val timetableWeek = TimetableWeek()
-        val rows = htmlDoc.select("table.timetable").select("tr[scope=\"row\"]")
+        val rows = it.select("table.timetable").select("tr[scope=\"row\"]")

        var sDay = -1
        var sRow = -1
@ -127,15 +132,13 @@ class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
    }

    /**
-     * parse the week number of the year for the timetable
+     * parse the calendar week and the associated year for the timetable
     */
-    fun parseWeekNumberYear(): Int? {
-        if (htmlDoc == null) {
-            return null
-        }
-
-        return htmlDoc.select("h1.timetable-caption").text().substringAfter("- ")
-            .substringBefore(".").replace(" ", "").toInt()
+    fun parseCalendarWeek(): CalendarWeek? = htmlDoc?.let {
+        val dateStr = it.select("h1.timetable-caption").text().substringAfter("- ")
+        val week = dateStr.substringBefore(".").replace(" ", "").toInt()
+        val year = dateStr.substringAfter("Woche ").replace(" ", "").toInt()
+        CalendarWeek(week, year)
    }

    @Suppress("unused")
--- a/src/test/kotlin/org/mosad/thecitadelofricks/hsoparser/MensaParserTest.kt
+++ b/src/test/kotlin/org/mosad/thecitadelofricks/hsoparser/MensaParserTest.kt
@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test
 import java.io.File

 internal class MensaParserTest {
-    private val mensaMenuURL = "https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/"
+    private val mensaMenuURL = "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/"

    @Test
    fun parseMensaMenuNormalWeek() {
--- a/src/test/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParserTest.kt
+++ b/src/test/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParserTest.kt
@ -25,6 +25,7 @@ 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 {
@ -50,11 +51,11 @@ class TimetableParserTest {
    }

    @Test
-    fun parseWeekNumberYear() {
+    fun parseCalendarWeek() {
        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 actualWeekNumberYear = TimetableParser(htmlDoc = htmlDoc).parseWeekNumberYear()
+        val actualCalendarWeek = TimetableParser(htmlDoc = htmlDoc).parseCalendarWeek()

-        Assertions.assertEquals(42, actualWeekNumberYear)
+        Assertions.assertEquals(CalendarWeek(42, 2019), actualCalendarWeek)
    }
 }
--- a/src/test/resources/html/Mensa_normal-week.html
+++ b/src/test/resources/html/Mensa_normal-week.html
@ -1,7 +1,7 @@
 <div id="speiseplan-tabs">
    <div id="tab-menu-container" class="row">
        <div class="col-md-1 col-xs-6">
-            <a class="prev-week" title="eine Woche zurück" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Baction%5D=show&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=ad074b11cc01a680e4c0d0675dd1f91c"><img src="/fileadmin/templates/images/keil-grau-links.png" width="16" height="16" alt="" /><span class="d-inline d-sm-none">vorherige Woche</span></a>
+            <a class="prev-week" title="eine Woche zurück" href="/essen-trinken/speiseplaene/mensa-offenburg/?tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Baction%5D=show&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=ad074b11cc01a680e4c0d0675dd1f91c"><img src="/fileadmin/templates/images/keil-grau-links.png" width="16" height="16" alt="" /><span class="d-inline d-sm-none">vorherige Woche</span></a>
        </div>
        <div class="col-md-10">
            <ul class="nav classic-tabs tabs-primary" role="tablist">
@ -13,7 +13,7 @@
                <li class="col-md-2"><a href="#tab-sat" class="nav-link" data-toggle="tab" role="tab">Sa 14.03.</a></li>
            </ul>
        </div>
-        <div class="col-md-1 col-xs-6 pull-right"><a class="next-week text-right" title="eine Woche weiter" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?tx_swfrspeiseplan_pi1%5BweekToShow%5D=2&amp;tx_swfrspeiseplan_pi1%5Baction%5D=show&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=3c3048ebdd7f42a104bd780a0a6a0fd1"><span class="d-inline d-sm-none">nächste Woche</span><img src="/fileadmin/templates/images/keil-grau-rechts.png" width="16" height="16" alt="" /></a></div>
+        <div class="col-md-1 col-xs-6 pull-right"><a class="next-week text-right" title="eine Woche weiter" href="/essen-trinken/speiseplaene/mensa-offenburg/?tx_swfrspeiseplan_pi1%5BweekToShow%5D=2&amp;tx_swfrspeiseplan_pi1%5Baction%5D=show&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=3c3048ebdd7f42a104bd780a0a6a0fd1"><span class="d-inline d-sm-none">nächste Woche</span><img src="/fileadmin/templates/images/keil-grau-rechts.png" width="16" height="16" alt="" /></a></div>
    </div>
    <div class="row">
        <div class="col-sm-4">
@ -34,12 +34,12 @@
        </div>
        <div class="col-sm-4 pt-3">
            <div class="hide-with-allergenes">
-                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=4de091579c564e42f79473da2701f179"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
-                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=84edf4562bdc95f103b70ef99e4d7af6"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
+                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=4de091579c564e42f79473da2701f179"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
+                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=84edf4562bdc95f103b70ef99e4d7af6"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
            </div>
            <div class="show-with-allergenes">
-                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=51f0f1e0083f9ef48038920dfb676eb6"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
-                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=c3a9d1eafce78d8f8d281c6060be989c"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
+                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=51f0f1e0083f9ef48038920dfb676eb6"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
+                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=c3a9d1eafce78d8f8d281c6060be989c"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
            </div>
        </div>
        <div class="col-sm-4 pt-3">
Author	SHA1	Message	Date
Jannik	f49e600613	version 1.3.0 All checks were successful continuous-integration/woodpecker the build was successful Details	2021-10-31 22:09:12 +01:00
Jannik	940a30e9aa	Merge pull request 'Parse the year of a timetable' (#21 ) from hannesbraun/TheCitadelofRicks:feature/parse-year into master All checks were successful continuous-integration/woodpecker the build was successful Details Reviewed-on: #21	2021-10-24 15:00:13 +02:00
Hannes Braun	d863f4fb1e	TimetableParser: parse year All checks were successful continuous-integration/woodpecker the build was successful Details This also adds the parsed year to the meta object included in the timetable response	2021-10-24 14:39:22 +02:00
Jannik	dc57a0d0c1	Merge pull request 'Various improvements' (#17 ) from hannesbraun/TheCitadelofRicks:fix/timeout-resilience into master All checks were successful continuous-integration/woodpecker the build was successful Details Reviewed-on: #17	2021-10-24 14:38:12 +02:00
Hannes Braun	5ba9dfc263	Better null checks	2021-10-24 14:34:00 +02:00
Hannes Braun	ca8efdaa85	Only add timetable to cache on success	2021-10-24 14:34:00 +02:00
Hannes Braun	8e3af696e0	Limit sending timetable requests in parallel to 3 Otherwise, the requests may fail (from my experience). Also we don't want to look suspicious (flooding their server with tons of requests at the same time).	2021-10-24 14:34:00 +02:00
Hannes Braun	fb6291792d	Use ConcurrentHashMap for timetableList Multiple requests may be processed at the same time and could otherwise cause problems (concurrent write operations)	2021-10-24 14:34:00 +02:00
Hannes Braun	993b8f6a71	Small improvements - Improve formatting - Fix some typos - Mini code improvements	2021-10-24 14:34:00 +02:00
Hannes Braun	f9cc9b5e14	Make the update scheduling more readable (hopefully)	2021-10-24 14:34:00 +02:00
Hannes Braun	460d1ee131	StatusController: use properties instead of getters	2021-10-24 14:33:59 +02:00
Hannes Braun	90847a2730	Also set JVM target to 11 for Java	2021-10-24 14:33:59 +02:00
Hannes Braun	a292b45fcb	Dependency updates This also replaces JCenter with Maven Central since JCenter is now read-only	2021-10-24 14:33:59 +02:00
Hannes Braun	22f17d10e0	Timetable fixes - Only one request is made to get the timetable HTML document for parsing the timetable and the weekNumberYear - On timeouts or other errors, the cached data won't be overwritten with emptiness anymore - The scheduled updates will now also update the weekNumberYear	2021-10-24 14:33:59 +02:00
Hannes Braun	ae9bf2a562	Update Kotlin to 1.5.31	2021-10-24 14:33:58 +02:00
Jannik	6394a7c880	fix secrets (1st try) All checks were successful continuous-integration/drone the build was successful Details	2021-10-16 15:48:34 +02:00
Jannik	5ab5e850bd	execute the docker build/deploy image with privileged: true Some checks failed continuous-integration/drone the build failed Details	2021-10-16 15:21:01 +02:00
Jannik	a97a464a83	Merge pull request 'use techknowlogick's drone-docker image' (#20 ) from fix/docker-build into master Some checks failed continuous-integration/drone the build failed Details Reviewed-on: #20	2021-10-16 14:39:38 +02:00
Jannik	2b06efeece	use techknowlogick's drone-docker image All checks were successful continuous-integration/drone the build was successful Details this should fix the docker build issues	2021-10-16 14:35:37 +02:00
Jannik	024f2b04ce	„README.md“ ändern All checks were successful continuous-integration/drone the build was successful Details	2021-10-13 20:09:46 +02:00
Jannik	bf71d62dc5	version 1.2.8 Some checks failed continuous-integration/drone the build failed Details	2021-10-13 20:03:14 +02:00
Jannik	7dce2c6cfd	Merge pull request 'updated mensa URL' (#16 ) from fix/mensa_url into master All checks were successful continuous-integration/drone the build was successful Details Reviewed-on: #16	2021-10-13 19:49:53 +02:00
localhorst	a1dc5656b8	updated mensa URL, thanks to Hannes B. All checks were successful continuous-integration/drone the build was successful Details	2021-10-13 19:47:38 +02:00
Jannik	dd4c5259d2	Merge pull request 'move ci config from drone to woodpecker' (#18 ) from fix/ci into master Some checks failed continuous-integration/drone the build failed Details Reviewed-on: #18	2021-10-13 19:45:32 +02:00
Jannik	884aab08ed	move ci config from drone to woodpecker Some checks failed continuous-integration/drone the build failed Details	2021-10-13 19:39:37 +02:00