made CacheCOntroller() static
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
f20279a4b4
commit
be95af43c2
|
@ -44,14 +44,11 @@ import kotlin.concurrent.scheduleAtFixedRate
|
||||||
|
|
||||||
class CacheController {
|
class CacheController {
|
||||||
|
|
||||||
private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
|
|
||||||
|
|
||||||
init {
|
init {
|
||||||
initUpdates()
|
initUpdates()
|
||||||
scheduledUpdates()
|
scheduledUpdates()
|
||||||
}
|
}
|
||||||
|
|
||||||
// cache objects
|
|
||||||
companion object{
|
companion object{
|
||||||
private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
|
private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
|
||||||
|
|
||||||
|
@ -77,18 +74,13 @@ class CacheController {
|
||||||
val courseLink = courseList.courses.stream().filter { x -> x.courseName == courseName }.findFirst().orElse(null).courseLink
|
val courseLink = courseList.courses.stream().filter { x -> x.courseName == courseName }.findFirst().orElse(null).courseLink
|
||||||
val timetableLink = courseLink.replace("week=0","week=$weekIndex")
|
val timetableLink = courseLink.replace("week=0","week=$weekIndex")
|
||||||
|
|
||||||
val jobTimetable = GlobalScope.async {
|
val jobTimetable = async {
|
||||||
timetable = TimetableParser().getTimeTable(timetableLink)
|
timetable = TimetableParser().getTimeTable(timetableLink)
|
||||||
weekNumberYear = TimetableParser().getWeekNumberYear(timetableLink)
|
weekNumberYear = TimetableParser().getWeekNumberYear(timetableLink)
|
||||||
}
|
}
|
||||||
|
|
||||||
jobTimetable.await()
|
jobTimetable.await()
|
||||||
|
timetableList.add(TimetableCourseWeek(TimetableCourseMeta(currentTime, courseName, weekIndex, weekNumberYear, timetableLink), timetable))
|
||||||
timetableList.add(
|
|
||||||
TimetableCourseWeek(TimetableCourseMeta(currentTime, courseName, weekIndex, weekNumberYear, timetableLink),
|
|
||||||
timetable
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
logger.info("added new timetable for $courseName, week $weekIndex")
|
logger.info("added new timetable for $courseName, week $weekIndex")
|
||||||
}
|
}
|
||||||
|
@ -133,7 +125,8 @@ class CacheController {
|
||||||
|
|
||||||
return lessonList
|
return lessonList
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
// private cache functions
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* this function updates the courseList
|
* this function updates the courseList
|
||||||
|
@ -141,9 +134,7 @@ class CacheController {
|
||||||
*/
|
*/
|
||||||
private fun asyncUpdateCourseList() = GlobalScope.launch {
|
private fun asyncUpdateCourseList() = GlobalScope.launch {
|
||||||
CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
|
CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
|
||||||
courseList = CoursesList(
|
courseList = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it)
|
||||||
CoursesMeta(System.currentTimeMillis() / 1000, it.size), it
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.info("Updated courses successful at ${Date(courseList.meta.updateTime * 1000)}")
|
logger.info("Updated courses successful at ${Date(courseList.meta.updateTime * 1000)}")
|
||||||
|
@ -159,9 +150,7 @@ class CacheController {
|
||||||
|
|
||||||
// only update if we get valid data
|
// only update if we get valid data
|
||||||
if (mensaCurrentWeek != null && mensaNextWeek != null) {
|
if (mensaCurrentWeek != null && mensaNextWeek != null) {
|
||||||
mensaMenu = MensaMenu(
|
mensaMenu = MensaMenu(MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek)
|
||||||
MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.info("Updated mensamenu successful at ${Date(mensaMenu.meta.updateTime * 1000)}")
|
logger.info("Updated mensamenu successful at ${Date(mensaMenu.meta.updateTime * 1000)}")
|
||||||
|
@ -215,29 +204,11 @@ class CacheController {
|
||||||
*/
|
*/
|
||||||
private fun initUpdates() = runBlocking {
|
private fun initUpdates() = runBlocking {
|
||||||
// get all course links on startup, make sure there are course links
|
// get all course links on startup, make sure there are course links
|
||||||
val jobCourseUpdate = GlobalScope.async {
|
val jobCourseUpdate = asyncUpdateCourseList()
|
||||||
CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
|
val jobMensa = asyncUpdateMensa()
|
||||||
courseList = CoursesList(
|
|
||||||
CoursesMeta(System.currentTimeMillis() / 1000, it.size), it
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// get the current and next weeks mensa menu
|
jobCourseUpdate.join()
|
||||||
val jobMensa = GlobalScope.async{
|
jobMensa.join()
|
||||||
val mensaCurrentWeek = MensaParser().getMensaMenu(StartupController.mensaMenuURL)
|
|
||||||
val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(StartupController.mensaMenuURL))
|
|
||||||
|
|
||||||
// only update if we get valid data
|
|
||||||
if (mensaCurrentWeek != null && mensaNextWeek != null) {
|
|
||||||
mensaMenu = MensaMenu(
|
|
||||||
MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
jobCourseUpdate.await()
|
|
||||||
jobMensa.await()
|
|
||||||
|
|
||||||
logger.info("Initial updates successful")
|
logger.info("Initial updates successful")
|
||||||
}
|
}
|
||||||
|
@ -276,3 +247,4 @@ class CacheController {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue