InsanusMokrassar/krontab
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/krontab.git synced 2025-12-03 03:26:02 +00:00
Code Issues Projects Releases Wiki Activity

tests and fixes in week work

Browse Source
This commit is contained in:
InsanusMokrassar
2021-04-22 12:24:26 +06:00
parent bfa546ad1f
commit 86cdda51a1
3 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTime.kt
View File

@@ -54,7 +54,7 @@ internal fun CronDateTime.toNearDateTime(relativelyTo: DateTime = DateTime.now()
current = (current + diff.days).startOfDay
val next = toNearDateTime(current)
if (next ?.dayOfWeek ?.index0 == weekDay) {
if (next == null || next.dayOfWeek.index0 == weekDay) {
return next
}
} while (true)

4
src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeScheduler.kt
View File

@@ -27,8 +27,8 @@ internal data class CronDateTimeScheduler internal constructor(
*
* @see toNearDateTime
*/
override suspend fun next(relatively: DateTime): DateTime {
return cronDateTimes.mapNotNull { it.toNearDateTime(relatively) }.minOrNull() ?: getAnyNext(relatively)
override suspend fun next(relatively: DateTime): DateTime? {
return cronDateTimes.mapNotNull { it.toNearDateTime(relatively) }.minOrNull()
}
}