fix courseList sorting
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
closes #15
This commit is contained in:
parent
9de1e295dd
commit
3f10c8afaa
|
@ -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 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 class CoursesListRet(val meta: CoursesMeta = CoursesMeta(), val courses: ArrayList<Course> = ArrayList())
|
||||||
|
|
||||||
// data classes for the Mensa part
|
// data classes for the Mensa part
|
||||||
|
|
|
@ -49,7 +49,7 @@ class CacheController {
|
||||||
companion object{
|
companion object{
|
||||||
private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
|
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 mensaMenu = MensaMenu(MensaMeta(0,""), MensaWeek(), MensaWeek())
|
||||||
var timetableList = HashMap<String, TimetableCourseWeek>() // this list contains all timetables
|
var timetableList = HashMap<String, TimetableCourseWeek>() // this list contains all timetables
|
||||||
|
|
||||||
|
@ -137,7 +137,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(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it)
|
courseList = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it.toSortedMap())
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO just for testing
|
// TODO just for testing
|
||||||
|
|
Loading…
Reference in New Issue