From 7f7aaa180a72affd06a6686bcac8c0f0c14a8d3f Mon Sep 17 00:00:00 2001 From: Hannes Braun Date: Fri, 13 Jan 2023 20:21:15 +0100 Subject: [PATCH] Update year when updating cached timetables --- src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt | 2 +- .../mosad/thecitadelofricks/controller/CacheController.kt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt b/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt index 9c9b178..dbc5225 100644 --- a/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt +++ b/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt @@ -61,7 +61,7 @@ data class TimetableDay(val timeslots: Array> = Array(6) { Arr data class TimetableWeek(val days: Array = 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, var weekNumberYear: Int = 0, var year: Int = 0, val link: String = "") data class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek = TimetableWeek()) diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt b/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt index 62bc7a9..1683233 100644 --- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt +++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt @@ -201,8 +201,10 @@ class CacheController { executor.execute { val timetableParser = TimetableParser(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