Update year when updating cached timetables #25
@ -61,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 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, var weekNumberYear: Int = 0, var year: Int = 0, val link: String = "")
|
||||||
|
|
||||||
data class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek = TimetableWeek())
|
data class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek = TimetableWeek())
|
||||||
|
|
||||||
|
@ -201,8 +201,10 @@ class CacheController {
|
|||||||
executor.execute {
|
executor.execute {
|
||||||
val timetableParser = TimetableParser(timetableCourse.value.meta.link)
|
val timetableParser = TimetableParser(timetableCourse.value.meta.link)
|
||||||
timetableCourse.value.timetable = timetableParser.parseTimeTable() ?: return@execute
|
timetableCourse.value.timetable = timetableParser.parseTimeTable() ?: return@execute
|
||||||
timetableCourse.value.meta.weekNumberYear =
|
timetableParser.parseCalendarWeek()?.also {
|
||||||
timetableParser.parseCalendarWeek()?.week ?: return@execute
|
timetableCourse.value.meta.weekNumberYear = it.week
|
||||||
|
timetableCourse.value.meta.year = it.year
|
||||||
|
} ?: return@execute
|
||||||
timetableCourse.value.meta.updateTime = System.currentTimeMillis() / 1000
|
timetableCourse.value.meta.updateTime = System.currentTimeMillis() / 1000
|
||||||
|
|
||||||
saveTimetableToCache(timetableCourse.value) // save the updated timetable to the cache directory
|
saveTimetableToCache(timetableCourse.value) // save the updated timetable to the cache directory
|
||||||
|
Loading…
Reference in New Issue
Block a user