mirror of
https://github.com/InsanusMokrassar/krontab.git
synced 2024-09-30 06:26:14 +00:00
Compare commits
42 Commits
Author | SHA1 | Date | |
---|---|---|---|
4651a290d0 | |||
30df50c192 | |||
05c6d74f7b | |||
7269833c6f | |||
6e97a365e5 | |||
0c497f5dcb | |||
552ec14d66 | |||
3845f6e0c5 | |||
3bd4a7a245 | |||
f90d8d03d9 | |||
36671cb379 | |||
68be768763 | |||
9546eb5aec | |||
2efd7e6157 | |||
6845537afd | |||
af28fce6f5 | |||
237b42c2d3 | |||
49f852f27e | |||
|
470dc92f54 | ||
b5dcdc185f | |||
8df9f9c086 | |||
484f46223f | |||
1ce654fa06 | |||
6da04f54da | |||
e1d716688a | |||
e247de9e24 | |||
a153bc7996 | |||
9753cda961 | |||
e8ef6e6935 | |||
b41bf0ea07 | |||
09d811e2c4 | |||
3faadefced | |||
f3883a8678 | |||
5ff02a2a9d | |||
f56215ee10 | |||
e66acb34de | |||
78ac446311 | |||
697b4e81b8 | |||
d1288de032 | |||
eb867e7366 | |||
4aa10e00cf | |||
170d443517 |
5
.github/workflows/kdocs.yml
vendored
5
.github/workflows/kdocs.yml
vendored
@ -10,10 +10,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-java@v1
|
- uses: actions/setup-java@v1
|
||||||
with:
|
with:
|
||||||
java-version: 11
|
java-version: 17
|
||||||
- name: Fix android 32.0.0 dx
|
|
||||||
continue-on-error: true
|
|
||||||
run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && cp d8 dx && cd lib && cp d8.jar dx.jar
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: ./gradlew dokkaHtml
|
run: ./gradlew dokkaHtml
|
||||||
- name: Publish KDocs
|
- name: Publish KDocs
|
||||||
|
2
.github/workflows/publishing_packages.yml
vendored
2
.github/workflows/publishing_packages.yml
vendored
@ -7,7 +7,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-java@v1
|
- uses: actions/setup-java@v1
|
||||||
with:
|
with:
|
||||||
java-version: 11
|
java-version: 17
|
||||||
- name: Update version
|
- name: Update version
|
||||||
run: |
|
run: |
|
||||||
branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
|
branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,4 +1,5 @@
|
|||||||
.idea
|
.idea
|
||||||
|
.kotlin
|
||||||
out/*
|
out/*
|
||||||
*.iml
|
*.iml
|
||||||
target
|
target
|
||||||
|
65
CHANGELOG.md
65
CHANGELOG.md
@ -1,5 +1,70 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2.5.0
|
||||||
|
|
||||||
|
* `Version`:
|
||||||
|
* `Kotlin`: `2.0.20`
|
||||||
|
* `Coroutines`: `1.9.0`
|
||||||
|
* `Serialization`: `1.7.3`
|
||||||
|
|
||||||
|
## 2.4.0
|
||||||
|
|
||||||
|
* `Version`:
|
||||||
|
* `Kotlin`: `2.0.10`
|
||||||
|
* `Coroutines`: `1.8.1`
|
||||||
|
* `Serialization`: `1.7.1`
|
||||||
|
* `Klock`: `5.4.0`
|
||||||
|
* `AndroidXWork`: `2.9.1`
|
||||||
|
|
||||||
|
## 2.3.0
|
||||||
|
|
||||||
|
* `doWhile` now will guarantee that it will not call `doOnce` more than once for time
|
||||||
|
|
||||||
|
## 2.2.9
|
||||||
|
|
||||||
|
* `Version`:
|
||||||
|
* `Kotlin`: `1.9.23`
|
||||||
|
* `Serialization`: `1.6.3`
|
||||||
|
* `Klock`: `5.3.2`
|
||||||
|
* Fixes in build-in schedulers
|
||||||
|
|
||||||
|
## 2.2.8
|
||||||
|
|
||||||
|
* `Version`:
|
||||||
|
* `Coroutines`: `1.8.0`
|
||||||
|
|
||||||
|
## 2.2.7
|
||||||
|
|
||||||
|
* `Version`:
|
||||||
|
* `Klock`: `5.3.1`
|
||||||
|
* `AndroidXWork`: `2.9.0`
|
||||||
|
|
||||||
|
## 2.2.6
|
||||||
|
|
||||||
|
**Since this version klock depdendency replaced with `com.soywiz.korge:korlibs-time`**
|
||||||
|
|
||||||
|
* `Version`:
|
||||||
|
* `Klock`: `5.3.0`
|
||||||
|
|
||||||
|
## 2.2.5
|
||||||
|
|
||||||
|
* `Versions`
|
||||||
|
* `Kotlin`: `1.9.22`
|
||||||
|
* `Serialization`: `1.6.2`
|
||||||
|
|
||||||
|
## 2.2.4
|
||||||
|
|
||||||
|
* `Versions`
|
||||||
|
* `Kotlin`: `1.9.21`
|
||||||
|
* `Serialization`: `1.6.1`
|
||||||
|
|
||||||
|
## 2.2.3
|
||||||
|
|
||||||
|
**THIS UPDATE CONTAINS UPGRADE OF USED JDK UP TO 17**
|
||||||
|
|
||||||
|
* Versions
|
||||||
|
* `Kotlin`: `1.9.20`
|
||||||
|
|
||||||
## 2.2.2
|
## 2.2.2
|
||||||
|
|
||||||
* Versions
|
* Versions
|
||||||
|
12
build.gradle
12
build.gradle
@ -71,7 +71,7 @@ kotlin {
|
|||||||
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
|
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
|
||||||
api "org.jetbrains.kotlinx:kotlinx-serialization-core:$kotlin_serialization_version"
|
api "org.jetbrains.kotlinx:kotlinx-serialization-core:$kotlin_serialization_version"
|
||||||
|
|
||||||
api "com.soywiz.korlibs.klock:klock:$klockVersion"
|
api "com.soywiz.korge:korlibs-time:$klockVersion"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -110,7 +110,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdk "$android_compileSdkVersion".toInteger()
|
compileSdk "$android_compileSdkVersion".toInteger()
|
||||||
buildToolsVersion "$android_buildToolsVersion"
|
buildToolsVersion = "$android_buildToolsVersion"
|
||||||
namespace "${group}.${project.name}"
|
namespace "${group}.${project.name}"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
@ -129,8 +129,8 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_17
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
@ -142,6 +142,6 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
@ -18,13 +18,13 @@ if (new File(projectDir, "secret.gradle").exists()) {
|
|||||||
githubRelease {
|
githubRelease {
|
||||||
token "${project.property('GITHUB_RELEASE_TOKEN')}"
|
token "${project.property('GITHUB_RELEASE_TOKEN')}"
|
||||||
|
|
||||||
owner "InsanusMokrassar"
|
owner = "InsanusMokrassar"
|
||||||
repo "${rootProject.name}"
|
repo = "${rootProject.name}"
|
||||||
|
|
||||||
tagName "v${project.version}"
|
tagName = "v${project.version}"
|
||||||
releaseName "${project.version}"
|
releaseName = "${project.version}"
|
||||||
targetCommitish "${project.version}"
|
targetCommitish = "${project.version}"
|
||||||
|
|
||||||
body getCurrentVersionChangelog("${project.version}")
|
body = getCurrentVersionChangelog("${project.version}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,32 +9,32 @@ android.useAndroidX=true
|
|||||||
android.enableJetifier=false
|
android.enableJetifier=false
|
||||||
|
|
||||||
|
|
||||||
kotlin_version=1.9.20-RC
|
kotlin_version=2.0.20
|
||||||
kotlin_coroutines_version=1.7.3
|
kotlin_coroutines_version=1.9.0
|
||||||
kotlin_serialization_version=1.6.0
|
kotlin_serialization_version=1.7.3
|
||||||
|
|
||||||
dokka_version=1.9.10
|
dokka_version=1.9.20
|
||||||
|
|
||||||
klockVersion=4.0.10
|
klockVersion=5.4.0
|
||||||
|
|
||||||
## Github reease
|
## Github reease
|
||||||
|
|
||||||
github_release_plugin_version=2.4.1
|
github_release_plugin_version=2.5.2
|
||||||
|
|
||||||
## Android
|
## Android
|
||||||
|
|
||||||
android_gradle_version=7.4.2
|
android_gradle_version=8.2.2
|
||||||
android_minSdkVersion=21
|
android_minSdkVersion=21
|
||||||
android_compileSdkVersion=34
|
android_compileSdkVersion=35
|
||||||
android_buildToolsVersion=34.0.0
|
android_buildToolsVersion=35.0.0
|
||||||
dexcount_version=4.0.0
|
dexcount_version=4.0.0
|
||||||
junit_version=4.12
|
junit_version=4.12
|
||||||
test_ext_junit_version=1.1.3
|
test_ext_junit_version=1.1.3
|
||||||
espresso_core=3.4.0
|
espresso_core=3.4.0
|
||||||
|
|
||||||
androidx_work_version=2.8.1
|
androidx_work_version=2.9.1
|
||||||
|
|
||||||
## Common
|
## Common
|
||||||
|
|
||||||
version=2.2.2
|
version=2.5.0
|
||||||
android_code_version=32
|
android_code_version=42
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
|||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
|
|
||||||
task javadocsJar(type: Jar) {
|
task javadocsJar(type: Jar) {
|
||||||
classifier = 'javadoc'
|
archiveClassifier = 'javadoc'
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
@ -50,18 +50,14 @@ publishing {
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
|
if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
|
||||||
maven {
|
maven {
|
||||||
name = "Gitea"
|
name = "InmoNexus"
|
||||||
url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
|
url = uri("https://nexus.inmo.dev/repository/maven-releases/")
|
||||||
|
|
||||||
credentials(HttpHeaderCredentials) {
|
credentials {
|
||||||
name = "Authorization"
|
username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
|
||||||
value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
|
password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
|
||||||
}
|
|
||||||
|
|
||||||
authentication {
|
|
||||||
header(HttpHeaderAuthentication)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -96,4 +92,27 @@ if (project.hasProperty("signing.gnupg.keyName")) {
|
|||||||
dependsOn(it)
|
dependsOn(it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Workaround to make android sign operations depend on signing tasks
|
||||||
|
project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
|
||||||
|
def signingTasks = project.getTasks().withType(Sign.class)
|
||||||
|
mustRunAfter(signingTasks)
|
||||||
|
}
|
||||||
|
// Workaround to make test tasks use sign
|
||||||
|
project.getTasks().withType(Sign.class).configureEach { signTask ->
|
||||||
|
def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
|
||||||
|
def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
|
||||||
|
// These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
|
||||||
|
|
||||||
|
// Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
|
||||||
|
def debugTestTask = tasks.findByName("linkDebugTest$pubName")
|
||||||
|
if (debugTestTask != null) {
|
||||||
|
signTask.mustRunAfter(debugTestTask)
|
||||||
|
}
|
||||||
|
// Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
|
||||||
|
def testTask = tasks.findByName("compileTestKotlin$pubName")
|
||||||
|
if (testTask != null) {
|
||||||
|
signTask.mustRunAfter(testTask)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1 +1 @@
|
|||||||
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/krontab/blob/master/LICENSE"}],"mavenConfig":{"name":"Krontab","description":"It is an analog of crontab util for Kotlin Coroutines","url":"https://github.com/InsanusMokrassar/krontab","vcsUrl":"https://github.com/InsanusMokrassar/krontab.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/krontab"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
|
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/krontab/blob/master/LICENSE"}],"mavenConfig":{"name":"Krontab","description":"It is an analog of crontab util for Kotlin Coroutines","url":"https://github.com/InsanusMokrassar/krontab","vcsUrl":"https://github.com/InsanusMokrassar/krontab.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/krontab"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
|
@ -3,6 +3,7 @@ package dev.inmo.krontab
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.work.*
|
import androidx.work.*
|
||||||
import korlibs.time.DateTime
|
import korlibs.time.DateTime
|
||||||
|
import korlibs.time.millisecondsLong
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -138,10 +139,14 @@ abstract class KronSchedulerWork(
|
|||||||
}
|
}
|
||||||
throw e
|
throw e
|
||||||
}
|
}
|
||||||
when (result) {
|
result.checkResults(
|
||||||
is Result.Failure -> if (prolongOnFailure) prolong()
|
onFailure = {
|
||||||
is Result.Success -> if (prolongOnSuccess) prolong()
|
if (prolongOnFailure) prolong()
|
||||||
|
},
|
||||||
|
onSuccess = {
|
||||||
|
if (prolongOnSuccess) prolong()
|
||||||
}
|
}
|
||||||
|
)
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
15
src/androidMain/kotlin/ResultChecker.kt
Normal file
15
src/androidMain/kotlin/ResultChecker.kt
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
package dev.inmo.krontab
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
|
import androidx.work.ListenableWorker
|
||||||
|
|
||||||
|
@SuppressLint("RestrictedApi")
|
||||||
|
internal inline fun ListenableWorker.Result.checkResults(
|
||||||
|
onFailure: () -> Unit,
|
||||||
|
onSuccess: () -> Unit
|
||||||
|
) {
|
||||||
|
when (this) {
|
||||||
|
is ListenableWorker.Result.Failure -> onFailure()
|
||||||
|
is ListenableWorker.Result.Success -> onSuccess()
|
||||||
|
}
|
||||||
|
}
|
@ -2,6 +2,7 @@ package dev.inmo.krontab
|
|||||||
|
|
||||||
import korlibs.time.DateTime
|
import korlibs.time.DateTime
|
||||||
import korlibs.time.DateTimeTz
|
import korlibs.time.DateTimeTz
|
||||||
|
import korlibs.time.millisecondsLong
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.isActive
|
import kotlinx.coroutines.isActive
|
||||||
import kotlin.coroutines.coroutineContext
|
import kotlin.coroutines.coroutineContext
|
||||||
@ -70,9 +71,18 @@ suspend inline fun <T> doOnceTz(
|
|||||||
* Will execute [block] while it will return true as a result of its calculation
|
* Will execute [block] while it will return true as a result of its calculation
|
||||||
*/
|
*/
|
||||||
suspend inline fun KronScheduler.doWhile(block: (DateTime) -> Boolean) {
|
suspend inline fun KronScheduler.doWhile(block: (DateTime) -> Boolean) {
|
||||||
|
var latest: DateTime? = null
|
||||||
do {
|
do {
|
||||||
delay(1L)
|
delay(1L)
|
||||||
} while (doOnce(block))
|
val result = doOnce {
|
||||||
|
if (latest != it) {
|
||||||
|
latest = it
|
||||||
|
block(it)
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} while (result == null || result)
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Will execute [block] while it will return true as a result of its calculation
|
* Will execute [block] while it will return true as a result of its calculation
|
||||||
@ -84,9 +94,18 @@ suspend inline fun KronScheduler.doWhileLocal(block: (DateTime) -> Boolean) = do
|
|||||||
* Will execute [block] while it will return true as a result of its calculation
|
* Will execute [block] while it will return true as a result of its calculation
|
||||||
*/
|
*/
|
||||||
suspend inline fun KronScheduler.doWhileTz(noinline block: suspend (DateTimeTz) -> Boolean) {
|
suspend inline fun KronScheduler.doWhileTz(noinline block: suspend (DateTimeTz) -> Boolean) {
|
||||||
|
var latest: DateTimeTz? = null
|
||||||
do {
|
do {
|
||||||
delay(1L)
|
delay(1L)
|
||||||
} while (doOnceTz(block))
|
val result = doOnceTz {
|
||||||
|
if (latest != it) {
|
||||||
|
latest = it
|
||||||
|
block(it)
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} while (result == null || result)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -34,35 +34,60 @@ val EverySecondScheduler: KronScheduler by lazy {
|
|||||||
* [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one minute
|
* [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one minute
|
||||||
*/
|
*/
|
||||||
val EveryMinuteScheduler: KronScheduler by lazy {
|
val EveryMinuteScheduler: KronScheduler by lazy {
|
||||||
buildSchedule { minutes { 0 every 1 } }
|
buildSchedule {
|
||||||
|
seconds { at(0) }
|
||||||
|
minutes { 0 every 1 }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one hour
|
* [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one hour
|
||||||
*/
|
*/
|
||||||
val EveryHourScheduler: KronScheduler by lazy {
|
val EveryHourScheduler: KronScheduler by lazy {
|
||||||
buildSchedule { hours { 0 every 1 } }
|
buildSchedule {
|
||||||
|
seconds { at(0) }
|
||||||
|
minutes { at(0) }
|
||||||
|
hours { 0 every 1 }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one day
|
* [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one day
|
||||||
*/
|
*/
|
||||||
val EveryDayOfMonthScheduler: KronScheduler by lazy {
|
val EveryDayOfMonthScheduler: KronScheduler by lazy {
|
||||||
buildSchedule { dayOfMonth { 0 every 1 } }
|
buildSchedule {
|
||||||
|
seconds { at(0) }
|
||||||
|
minutes { at(0) }
|
||||||
|
hours { at(0) }
|
||||||
|
dayOfMonth { 0 every 1 }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one month
|
* [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one month
|
||||||
*/
|
*/
|
||||||
val EveryMonthScheduler: KronScheduler by lazy {
|
val EveryMonthScheduler: KronScheduler by lazy {
|
||||||
buildSchedule { months { 0 every 1 } }
|
buildSchedule {
|
||||||
|
seconds { at(0) }
|
||||||
|
minutes { at(0) }
|
||||||
|
hours { at(0) }
|
||||||
|
dayOfMonth { at(0) }
|
||||||
|
months { 0 every 1 }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one year
|
* [KronScheduler.next] will always return [korlibs.time.DateTime.now] + one year
|
||||||
*/
|
*/
|
||||||
val EveryYearScheduler: KronScheduler by lazy {
|
val EveryYearScheduler: KronScheduler by lazy {
|
||||||
buildSchedule { years { 0 every 1 } }
|
buildSchedule {
|
||||||
|
seconds { at(0) }
|
||||||
|
minutes { at(0) }
|
||||||
|
hours { at(0) }
|
||||||
|
dayOfMonth { at(0) }
|
||||||
|
months { at(0) }
|
||||||
|
years { 0 every 1 }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -182,15 +182,24 @@ class SchedulerBuilder(
|
|||||||
*/
|
*/
|
||||||
fun build(): KronScheduler = offset ?.let {
|
fun build(): KronScheduler = offset ?.let {
|
||||||
createKronSchedulerWithOffset(
|
createKronSchedulerWithOffset(
|
||||||
seconds,
|
seconds = seconds,
|
||||||
minutes,
|
minutes = minutes,
|
||||||
hours,
|
hours = hours,
|
||||||
dayOfMonth,
|
dayOfMonth = dayOfMonth,
|
||||||
month,
|
month = month,
|
||||||
year,
|
years = year,
|
||||||
dayOfWeek,
|
weekDays = dayOfWeek,
|
||||||
TimezoneOffset(it.minutes),
|
offset = TimezoneOffset(it.minutes),
|
||||||
milliseconds ?: millisecondsArrayDefault
|
milliseconds = milliseconds ?: millisecondsArrayDefault
|
||||||
|
)
|
||||||
|
} ?: createKronScheduler(
|
||||||
|
seconds = seconds,
|
||||||
|
minutes = minutes,
|
||||||
|
hours = hours,
|
||||||
|
dayOfMonth = dayOfMonth,
|
||||||
|
month = month,
|
||||||
|
years = year,
|
||||||
|
weekDays = dayOfWeek,
|
||||||
|
milliseconds = milliseconds ?: millisecondsArrayDefault
|
||||||
)
|
)
|
||||||
} ?: createKronScheduler(seconds, minutes, hours, dayOfMonth, month, year, dayOfWeek, milliseconds ?: millisecondsArrayDefault)
|
|
||||||
}
|
}
|
||||||
|
@ -5,6 +5,7 @@ import korlibs.time.DateTimeTz
|
|||||||
import korlibs.time.milliseconds
|
import korlibs.time.milliseconds
|
||||||
import dev.inmo.krontab.KronScheduler
|
import dev.inmo.krontab.KronScheduler
|
||||||
import dev.inmo.krontab.next
|
import dev.inmo.krontab.next
|
||||||
|
import korlibs.time.millisecondsLong
|
||||||
import kotlinx.coroutines.currentCoroutineContext
|
import kotlinx.coroutines.currentCoroutineContext
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.flow.Flow
|
import kotlinx.coroutines.flow.Flow
|
||||||
|
38
src/commonTest/kotlin/BuildersTest.kt
Normal file
38
src/commonTest/kotlin/BuildersTest.kt
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
package dev.inmo.krontab.utils
|
||||||
|
|
||||||
|
import dev.inmo.krontab.*
|
||||||
|
import korlibs.time.*
|
||||||
|
import kotlinx.coroutines.test.runTest
|
||||||
|
import kotlin.test.Test
|
||||||
|
import kotlin.test.assertEquals
|
||||||
|
import kotlin.time.Duration.Companion.milliseconds
|
||||||
|
import kotlin.time.Duration.Companion.minutes
|
||||||
|
import kotlin.time.Duration.Companion.seconds
|
||||||
|
|
||||||
|
class BuildersTest {
|
||||||
|
@Test
|
||||||
|
fun presetsWorksCorrectly() {
|
||||||
|
val data = mapOf(
|
||||||
|
EverySecondScheduler to { it: DateTime -> if (it.milliseconds > 0 ) it + 1.seconds - it.milliseconds.milliseconds else it },
|
||||||
|
EveryMinuteScheduler to { it: DateTime -> if (it.seconds > 0 || it.milliseconds > 0 ) it + 1.minutes - it.seconds.seconds - it.milliseconds.milliseconds else it },
|
||||||
|
EveryHourScheduler to { it: DateTime -> if (it.minutes > 0 || it.seconds > 0 || it.milliseconds > 0 ) it + 1.hours - it.minutes.minutes - it.seconds.seconds - it.milliseconds.milliseconds else it },
|
||||||
|
EveryDayOfMonthScheduler to { it: DateTime -> if (it.hours > 0 || it.minutes > 0 || it.seconds > 0 || it.milliseconds > 0 ) it + 1.days - it.hours.hours - it.minutes.minutes - it.seconds.seconds - it.milliseconds.milliseconds else it },
|
||||||
|
EveryMonthScheduler to { it: DateTime -> if (it.dayOfMonth > 1 || it.hours > 0 || it.minutes > 0 || it.seconds > 0 || it.milliseconds > 0 ) (it + 1.months).copy(dayOfMonth = 1, hour = 0, minute = 0, second = 0, milliseconds = 0) else it },
|
||||||
|
)
|
||||||
|
val samples = 10000
|
||||||
|
|
||||||
|
runTest {
|
||||||
|
var now = DateTime.now()
|
||||||
|
for (i in 0 until samples) {
|
||||||
|
data.forEach { (scheduler, expectCalculator) ->
|
||||||
|
val expectValue = expectCalculator(now)
|
||||||
|
val newNow = scheduler.nextOrRelative(now)
|
||||||
|
|
||||||
|
assertEquals(expectValue, newNow, "For time ${now.toStringDefault()} calculated wrong value: ${newNow.toStringDefault()} is not equal to ${expectValue.toStringDefault()}")
|
||||||
|
|
||||||
|
now = newNow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user