Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
1d614a06c4
|
|||
3f10c8afaa
|
@ -6,7 +6,7 @@ plugins {
|
||||
}
|
||||
|
||||
group 'org.mosad'
|
||||
version '1.2.6'
|
||||
version '1.2.7'
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
@ -15,7 +15,7 @@ repositories {
|
||||
dependencies {
|
||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||
implementation 'org.jetbrains.kotlin:kotlin-stdlib'
|
||||
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
|
||||
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
|
||||
implementation 'org.jsoup:jsoup:1.13.1'
|
||||
implementation 'com.google.code.gson:gson:2.8.6'
|
||||
|
||||
|
@ -49,7 +49,7 @@ class APIController {
|
||||
|
||||
companion object {
|
||||
const val apiVersion = "1.2.0"
|
||||
const val softwareVersion = "1.2.6"
|
||||
const val softwareVersion = "1.2.7"
|
||||
val startTime = System.currentTimeMillis() / 1000
|
||||
}
|
||||
|
||||
|
@ -31,7 +31,7 @@ data class Course(val courseName: String, val courseLink: String)
|
||||
|
||||
data class CoursesMeta(val updateTime: Long = 0, val totalCourses: Int = 0)
|
||||
|
||||
data class CoursesList(val meta: CoursesMeta = CoursesMeta(), val courses: HashMap<String, Course> = HashMap())
|
||||
data class CoursesList(val meta: CoursesMeta = CoursesMeta(), val courses: SortedMap<String, Course>)
|
||||
data class CoursesListRet(val meta: CoursesMeta = CoursesMeta(), val courses: ArrayList<Course> = ArrayList())
|
||||
|
||||
// data classes for the Mensa part
|
||||
|
@ -49,7 +49,7 @@ class CacheController {
|
||||
companion object{
|
||||
private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
|
||||
|
||||
var courseList = CoursesList()
|
||||
var courseList = CoursesList(CoursesMeta(), sortedMapOf())
|
||||
var mensaMenu = MensaMenu(MensaMeta(0,""), MensaWeek(), MensaWeek())
|
||||
var timetableList = HashMap<String, TimetableCourseWeek>() // this list contains all timetables
|
||||
|
||||
@ -137,7 +137,7 @@ class CacheController {
|
||||
*/
|
||||
private fun asyncUpdateCourseList() = GlobalScope.launch {
|
||||
CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
|
||||
courseList = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it)
|
||||
courseList = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it.toSortedMap())
|
||||
}
|
||||
|
||||
// TODO just for testing
|
||||
|
Reference in New Issue
Block a user