initial commit
This commit is contained in:
22
.gitignore
vendored
Normal file
22
.gitignore
vendored
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
# Rust
|
||||||
|
/target/
|
||||||
|
|
||||||
|
/build_all.sh
|
||||||
|
|
||||||
|
/bindings/kotlin/src/main/kotlin/uniffi/
|
||||||
|
/bindings/kotlin/src/main/resources/lib/
|
||||||
|
/bindings/kotlin/src/main/resources/linux-x86-64/
|
||||||
|
/bindings/kotlin/src/main/resources/win32-x86-64/
|
||||||
|
|
||||||
|
/bindings/kotlin/build/
|
||||||
|
/bindings/kotlin/target/
|
||||||
|
/bindings/kotlin/.gradle/
|
||||||
|
|
||||||
|
/bindings/kotlin/gradle.properties
|
||||||
|
/bindings/kotlin/local.properties
|
||||||
|
|
||||||
|
.DS_Store
|
||||||
|
.idea/
|
||||||
|
.vscode/
|
||||||
|
*.swp
|
||||||
|
*.bak
|
||||||
165
COPYING.LESSER
Normal file
165
COPYING.LESSER
Normal file
@@ -0,0 +1,165 @@
|
|||||||
|
GNU LESSER GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
|
||||||
|
This version of the GNU Lesser General Public License incorporates
|
||||||
|
the terms and conditions of version 3 of the GNU General Public
|
||||||
|
License, supplemented by the additional permissions listed below.
|
||||||
|
|
||||||
|
0. Additional Definitions.
|
||||||
|
|
||||||
|
As used herein, "this License" refers to version 3 of the GNU Lesser
|
||||||
|
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
||||||
|
General Public License.
|
||||||
|
|
||||||
|
"The Library" refers to a covered work governed by this License,
|
||||||
|
other than an Application or a Combined Work as defined below.
|
||||||
|
|
||||||
|
An "Application" is any work that makes use of an interface provided
|
||||||
|
by the Library, but which is not otherwise based on the Library.
|
||||||
|
Defining a subclass of a class defined by the Library is deemed a mode
|
||||||
|
of using an interface provided by the Library.
|
||||||
|
|
||||||
|
A "Combined Work" is a work produced by combining or linking an
|
||||||
|
Application with the Library. The particular version of the Library
|
||||||
|
with which the Combined Work was made is also called the "Linked
|
||||||
|
Version".
|
||||||
|
|
||||||
|
The "Minimal Corresponding Source" for a Combined Work means the
|
||||||
|
Corresponding Source for the Combined Work, excluding any source code
|
||||||
|
for portions of the Combined Work that, considered in isolation, are
|
||||||
|
based on the Application, and not on the Linked Version.
|
||||||
|
|
||||||
|
The "Corresponding Application Code" for a Combined Work means the
|
||||||
|
object code and/or source code for the Application, including any data
|
||||||
|
and utility programs needed for reproducing the Combined Work from the
|
||||||
|
Application, but excluding the System Libraries of the Combined Work.
|
||||||
|
|
||||||
|
1. Exception to Section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
You may convey a covered work under sections 3 and 4 of this License
|
||||||
|
without being bound by section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
2. Conveying Modified Versions.
|
||||||
|
|
||||||
|
If you modify a copy of the Library, and, in your modifications, a
|
||||||
|
facility refers to a function or data to be supplied by an Application
|
||||||
|
that uses the facility (other than as an argument passed when the
|
||||||
|
facility is invoked), then you may convey a copy of the modified
|
||||||
|
version:
|
||||||
|
|
||||||
|
a) under this License, provided that you make a good faith effort to
|
||||||
|
ensure that, in the event an Application does not supply the
|
||||||
|
function or data, the facility still operates, and performs
|
||||||
|
whatever part of its purpose remains meaningful, or
|
||||||
|
|
||||||
|
b) under the GNU GPL, with none of the additional permissions of
|
||||||
|
this License applicable to that copy.
|
||||||
|
|
||||||
|
3. Object Code Incorporating Material from Library Header Files.
|
||||||
|
|
||||||
|
The object code form of an Application may incorporate material from
|
||||||
|
a header file that is part of the Library. You may convey such object
|
||||||
|
code under terms of your choice, provided that, if the incorporated
|
||||||
|
material is not limited to numerical parameters, data structure
|
||||||
|
layouts and accessors, or small macros, inline functions and templates
|
||||||
|
(ten or fewer lines in length), you do both of the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the object code that the
|
||||||
|
Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the object code with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
4. Combined Works.
|
||||||
|
|
||||||
|
You may convey a Combined Work under terms of your choice that,
|
||||||
|
taken together, effectively do not restrict modification of the
|
||||||
|
portions of the Library contained in the Combined Work and reverse
|
||||||
|
engineering for debugging such modifications, if you also do each of
|
||||||
|
the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the Combined Work that
|
||||||
|
the Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
c) For a Combined Work that displays copyright notices during
|
||||||
|
execution, include the copyright notice for the Library among
|
||||||
|
these notices, as well as a reference directing the user to the
|
||||||
|
copies of the GNU GPL and this license document.
|
||||||
|
|
||||||
|
d) Do one of the following:
|
||||||
|
|
||||||
|
0) Convey the Minimal Corresponding Source under the terms of this
|
||||||
|
License, and the Corresponding Application Code in a form
|
||||||
|
suitable for, and under terms that permit, the user to
|
||||||
|
recombine or relink the Application with a modified version of
|
||||||
|
the Linked Version to produce a modified Combined Work, in the
|
||||||
|
manner specified by section 6 of the GNU GPL for conveying
|
||||||
|
Corresponding Source.
|
||||||
|
|
||||||
|
1) Use a suitable shared library mechanism for linking with the
|
||||||
|
Library. A suitable mechanism is one that (a) uses at run time
|
||||||
|
a copy of the Library already present on the user's computer
|
||||||
|
system, and (b) will operate properly with a modified version
|
||||||
|
of the Library that is interface-compatible with the Linked
|
||||||
|
Version.
|
||||||
|
|
||||||
|
e) Provide Installation Information, but only if you would otherwise
|
||||||
|
be required to provide such information under section 6 of the
|
||||||
|
GNU GPL, and only to the extent that such information is
|
||||||
|
necessary to install and execute a modified version of the
|
||||||
|
Combined Work produced by recombining or relinking the
|
||||||
|
Application with a modified version of the Linked Version. (If
|
||||||
|
you use option 4d0, the Installation Information must accompany
|
||||||
|
the Minimal Corresponding Source and Corresponding Application
|
||||||
|
Code. If you use option 4d1, you must provide the Installation
|
||||||
|
Information in the manner specified by section 6 of the GNU GPL
|
||||||
|
for conveying Corresponding Source.)
|
||||||
|
|
||||||
|
5. Combined Libraries.
|
||||||
|
|
||||||
|
You may place library facilities that are a work based on the
|
||||||
|
Library side by side in a single library together with other library
|
||||||
|
facilities that are not Applications and are not covered by this
|
||||||
|
License, and convey such a combined library under terms of your
|
||||||
|
choice, if you do both of the following:
|
||||||
|
|
||||||
|
a) Accompany the combined library with a copy of the same work based
|
||||||
|
on the Library, uncombined with any other library facilities,
|
||||||
|
conveyed under the terms of this License.
|
||||||
|
|
||||||
|
b) Give prominent notice with the combined library that part of it
|
||||||
|
is a work based on the Library, and explaining where to find the
|
||||||
|
accompanying uncombined form of the same work.
|
||||||
|
|
||||||
|
6. Revised Versions of the GNU Lesser General Public License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the GNU Lesser General Public License from time to time. Such new
|
||||||
|
versions will be similar in spirit to the present version, but may
|
||||||
|
differ in detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Library as you received it specifies that a certain numbered version
|
||||||
|
of the GNU Lesser General Public License "or any later version"
|
||||||
|
applies to it, you have the option of following the terms and
|
||||||
|
conditions either of that published version or of any later version
|
||||||
|
published by the Free Software Foundation. If the Library as you
|
||||||
|
received it does not specify a version number of the GNU Lesser
|
||||||
|
General Public License, you may choose any version of the GNU Lesser
|
||||||
|
General Public License ever published by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Library as you received it specifies that a proxy can decide
|
||||||
|
whether future versions of the GNU Lesser General Public License shall
|
||||||
|
apply, that proxy's public statement of acceptance of any version is
|
||||||
|
permanent authorization for you to choose that version for the
|
||||||
|
Library.
|
||||||
2132
Cargo.lock
generated
Normal file
2132
Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
22
Cargo.toml
Normal file
22
Cargo.toml
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
[package]
|
||||||
|
name = "jecna_supl_client"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
chrono = { version = "0.4.43", features = ["serde"] }
|
||||||
|
futures = "0.3.31"
|
||||||
|
once_cell = "1.21.3"
|
||||||
|
reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] }
|
||||||
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
|
serde_json = "1.0"
|
||||||
|
thiserror = "2.0.18"
|
||||||
|
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
|
||||||
|
tracing = "0.1.44"
|
||||||
|
tracing-subscriber = "0.3.22"
|
||||||
|
android_logger = "0.14"
|
||||||
|
log = "0.4"
|
||||||
|
uniffi = { version = "0.27", features = ["cli"] }
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
crate-type = ["cdylib"]
|
||||||
3
README.md
Normal file
3
README.md
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
# Jecna Supl Client
|
||||||
|
|
||||||
|
Simple rust library with Kotlin bindings for getting SPŠE Ječná Suplování from JecnaRozvrh parser API.
|
||||||
153
bindings/kotlin/build.gradle.kts
Normal file
153
bindings/kotlin/build.gradle.kts
Normal file
@@ -0,0 +1,153 @@
|
|||||||
|
plugins {
|
||||||
|
kotlin("jvm") version "2.1.0"
|
||||||
|
id("org.jetbrains.dokka") version "1.9.10"
|
||||||
|
`maven-publish`
|
||||||
|
signing
|
||||||
|
}
|
||||||
|
|
||||||
|
group = "cz.jzitnik"
|
||||||
|
version = "0.1.0"
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation(kotlin("stdlib"))
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
|
||||||
|
implementation("net.java.dev.jna:jna:5.14.0")
|
||||||
|
}
|
||||||
|
|
||||||
|
kotlin {
|
||||||
|
jvmToolchain(17)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Exclude native libs from the main JAR
|
||||||
|
tasks.named<Jar>("jar") {
|
||||||
|
exclude("linux-x86-64/**", "win32-x86-64/**")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Maven Central requires unique Javadoc and Sources for EVERY artifact
|
||||||
|
fun createComponentJars(componentName: String, artifactBaseName: String): Pair<TaskProvider<Jar>, TaskProvider<Jar>> {
|
||||||
|
val javadoc = tasks.register<Jar>("${componentName}JavadocJar") {
|
||||||
|
archiveBaseName.set(artifactBaseName)
|
||||||
|
archiveClassifier.set("javadoc")
|
||||||
|
from(tasks.dokkaJavadoc)
|
||||||
|
}
|
||||||
|
val sources = tasks.register<Jar>("${componentName}SourcesJar") {
|
||||||
|
archiveBaseName.set(artifactBaseName)
|
||||||
|
archiveClassifier.set("sources")
|
||||||
|
from(sourceSets.main.get().allSource)
|
||||||
|
}
|
||||||
|
return javadoc to sources
|
||||||
|
}
|
||||||
|
|
||||||
|
val (commonJavadoc, commonSources) = createComponentJars("common", "jecna-supl-client")
|
||||||
|
val (linuxJavadoc, linuxSources) = createComponentJars("linux", "jecna-supl-client-linux-x64")
|
||||||
|
val (androidJavadoc, androidSources) = createComponentJars("android", "jecna-supl-client-android")
|
||||||
|
val (windowsJavadoc, windowsSources) = createComponentJars("windows", "jecna-supl-client-windows-x64")
|
||||||
|
|
||||||
|
// Platform-specific JARs
|
||||||
|
val linuxX64Jar by tasks.registering(Jar::class) {
|
||||||
|
archiveBaseName.set("jecna-supl-client-linux-x64")
|
||||||
|
from(sourceSets.main.get().resources) {
|
||||||
|
include("linux-x86-64/**")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val androidJar by tasks.registering(Jar::class) {
|
||||||
|
archiveBaseName.set("jecna-supl-client-android")
|
||||||
|
from(sourceSets.main.get().resources) {
|
||||||
|
include("lib/**")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val windowsX64Jar by tasks.registering(Jar::class) {
|
||||||
|
archiveBaseName.set("jecna-supl-client-windows-x64")
|
||||||
|
from(sourceSets.main.get().resources) {
|
||||||
|
include("win32-x86-64/**")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
create<MavenPublication>("common") {
|
||||||
|
artifactId = "jecna-supl-client"
|
||||||
|
from(components["java"])
|
||||||
|
artifact(commonJavadoc)
|
||||||
|
artifact(commonSources)
|
||||||
|
pom.configureMetadata("Jecna Supl Client")
|
||||||
|
}
|
||||||
|
|
||||||
|
create<MavenPublication>("linux") {
|
||||||
|
artifactId = "jecna-supl-client-linux-x64"
|
||||||
|
artifact(linuxX64Jar)
|
||||||
|
artifact(linuxJavadoc)
|
||||||
|
artifact(linuxSources)
|
||||||
|
pom.configureMetadata("Jecna Supl Client - Linux x64")
|
||||||
|
}
|
||||||
|
|
||||||
|
create<MavenPublication>("android") {
|
||||||
|
artifactId = "jecna-supl-client-android"
|
||||||
|
artifact(androidJar)
|
||||||
|
artifact(androidJavadoc)
|
||||||
|
artifact(androidSources)
|
||||||
|
pom.configureMetadata("Jecna Supl Client - Android")
|
||||||
|
}
|
||||||
|
|
||||||
|
create<MavenPublication>("windows") {
|
||||||
|
artifactId = "jecna-supl-client-windows-x64"
|
||||||
|
artifact(windowsX64Jar)
|
||||||
|
artifact(windowsJavadoc)
|
||||||
|
artifact(windowsSources)
|
||||||
|
pom.configureMetadata("Jecna Supl Client - Windows x64")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
maven {
|
||||||
|
name = "Staging"
|
||||||
|
url = uri(layout.buildDirectory.dir("staging-deploy"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun org.gradle.api.publish.maven.MavenPom.configureMetadata(nameStr: String) {
|
||||||
|
name.set(nameStr)
|
||||||
|
description.set("Kotlin bindings for the Jecna Supl Rust library")
|
||||||
|
url.set("https://gitea.jzitnik.dev/jzitnik/jecna-supl-client")
|
||||||
|
licenses {
|
||||||
|
license {
|
||||||
|
name.set("GNU Lesser General Public License, Version 3.0")
|
||||||
|
url.set("https://www.gnu.org/licenses/lgpl-3.0.txt")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
developers {
|
||||||
|
developer {
|
||||||
|
id.set("jzitnik")
|
||||||
|
name.set("Jakub Žitník")
|
||||||
|
email.set("email@jzitnik.dev")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
scm {
|
||||||
|
connection.set("scm:git:git://gitea.jzitnik.dev/jzitnik/jecna-supl-client.git")
|
||||||
|
developerConnection.set("scm:git:ssh://gitea.jzitnik.dev/jzitnik/jecna-supl-client.git")
|
||||||
|
url.set("https://gitea.jzitnik.dev/jzitnik/jecna-supl-client")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
signing {
|
||||||
|
useGpgCmd()
|
||||||
|
sign(publishing.publications)
|
||||||
|
}
|
||||||
|
|
||||||
|
val zipBundle by tasks.registering(Zip::class) {
|
||||||
|
group = "publishing"
|
||||||
|
description = "Create a bundle for Sonatype Central manual upload"
|
||||||
|
from(layout.buildDirectory.dir("staging-deploy"))
|
||||||
|
archiveFileName.set("sonatype-bundle.zip")
|
||||||
|
dependsOn("publishCommonPublicationToStagingRepository",
|
||||||
|
"publishLinuxPublicationToStagingRepository",
|
||||||
|
"publishAndroidPublicationToStagingRepository",
|
||||||
|
"publishWindowsPublicationToStagingRepository")
|
||||||
|
}
|
||||||
7
bindings/kotlin/gradle.properties.example
Normal file
7
bindings/kotlin/gradle.properties.example
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
# Sonatype Central User Token
|
||||||
|
sonatypeUsername=AWUj0F
|
||||||
|
sonatypePassword=dcOYghgesyckc4UXdwqaGIFkTumEcfbCo
|
||||||
|
|
||||||
|
# GPG Signing (using local GPG command)
|
||||||
|
signing.gnupg.keyName=A6AF4EF3
|
||||||
|
# signing.gnupg.passphrase=... (if not using gpg-agent)
|
||||||
BIN
bindings/kotlin/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
bindings/kotlin/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
7
bindings/kotlin/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
7
bindings/kotlin/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-rc-4-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
||||||
249
bindings/kotlin/gradlew
vendored
Executable file
249
bindings/kotlin/gradlew
vendored
Executable file
@@ -0,0 +1,249 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
#
|
||||||
|
# Copyright © 2015-2021 the original authors.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
#
|
||||||
|
# Gradle start up script for POSIX generated by Gradle.
|
||||||
|
#
|
||||||
|
# Important for running:
|
||||||
|
#
|
||||||
|
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||||
|
# noncompliant, but you have some other compliant shell such as ksh or
|
||||||
|
# bash, then to run this script, type that shell name before the whole
|
||||||
|
# command line, like:
|
||||||
|
#
|
||||||
|
# ksh Gradle
|
||||||
|
#
|
||||||
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
|
# requires all of these POSIX shell features:
|
||||||
|
# * functions;
|
||||||
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
|
#
|
||||||
|
# Important for patching:
|
||||||
|
#
|
||||||
|
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||||
|
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||||
|
#
|
||||||
|
# The "traditional" practice of packing multiple parameters into a
|
||||||
|
# space-separated string is a well documented source of bugs and security
|
||||||
|
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||||
|
# options in "$@", and eventually passing that to Java.
|
||||||
|
#
|
||||||
|
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||||
|
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||||
|
# see the in-line comments for details.
|
||||||
|
#
|
||||||
|
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||||
|
# Darwin, MinGW, and NonStop.
|
||||||
|
#
|
||||||
|
# (3) This script is generated from the Groovy template
|
||||||
|
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
|
# within the Gradle project.
|
||||||
|
#
|
||||||
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
#
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
# Attempt to set APP_HOME
|
||||||
|
|
||||||
|
# Resolve links: $0 may be a link
|
||||||
|
app_path=$0
|
||||||
|
|
||||||
|
# Need this for daisy-chained symlinks.
|
||||||
|
while
|
||||||
|
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||||
|
[ -h "$app_path" ]
|
||||||
|
do
|
||||||
|
ls=$( ls -ld "$app_path" )
|
||||||
|
link=${ls#*' -> '}
|
||||||
|
case $link in #(
|
||||||
|
/*) app_path=$link ;; #(
|
||||||
|
*) app_path=$APP_HOME$link ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# This is normally unused
|
||||||
|
# shellcheck disable=SC2034
|
||||||
|
APP_BASE_NAME=${0##*/}
|
||||||
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||||
|
|
||||||
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
|
MAX_FD=maximum
|
||||||
|
|
||||||
|
warn () {
|
||||||
|
echo "$*"
|
||||||
|
} >&2
|
||||||
|
|
||||||
|
die () {
|
||||||
|
echo
|
||||||
|
echo "$*"
|
||||||
|
echo
|
||||||
|
exit 1
|
||||||
|
} >&2
|
||||||
|
|
||||||
|
# OS specific support (must be 'true' or 'false').
|
||||||
|
cygwin=false
|
||||||
|
msys=false
|
||||||
|
darwin=false
|
||||||
|
nonstop=false
|
||||||
|
case "$( uname )" in #(
|
||||||
|
CYGWIN* ) cygwin=true ;; #(
|
||||||
|
Darwin* ) darwin=true ;; #(
|
||||||
|
MSYS* | MINGW* ) msys=true ;; #(
|
||||||
|
NONSTOP* ) nonstop=true ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
|
# Determine the Java command to use to start the JVM.
|
||||||
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
|
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||||
|
else
|
||||||
|
JAVACMD=$JAVA_HOME/bin/java
|
||||||
|
fi
|
||||||
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
JAVACMD=java
|
||||||
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
|
case $MAX_FD in #(
|
||||||
|
max*)
|
||||||
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC2039,SC3045
|
||||||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
|
warn "Could not query maximum file descriptor limit"
|
||||||
|
esac
|
||||||
|
case $MAX_FD in #(
|
||||||
|
'' | soft) :;; #(
|
||||||
|
*)
|
||||||
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC2039,SC3045
|
||||||
|
ulimit -n "$MAX_FD" ||
|
||||||
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Collect all arguments for the java command, stacking in reverse order:
|
||||||
|
# * args from the command line
|
||||||
|
# * the main class name
|
||||||
|
# * -classpath
|
||||||
|
# * -D...appname settings
|
||||||
|
# * --module-path (only if needed)
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||||
|
|
||||||
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
|
if "$cygwin" || "$msys" ; then
|
||||||
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||||
|
|
||||||
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
for arg do
|
||||||
|
if
|
||||||
|
case $arg in #(
|
||||||
|
-*) false ;; # don't mess with options #(
|
||||||
|
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||||
|
[ -e "$t" ] ;; #(
|
||||||
|
*) false ;;
|
||||||
|
esac
|
||||||
|
then
|
||||||
|
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||||
|
fi
|
||||||
|
# Roll the args list around exactly as many times as the number of
|
||||||
|
# args, so each arg winds up back in the position where it started, but
|
||||||
|
# possibly modified.
|
||||||
|
#
|
||||||
|
# NB: a `for` loop captures its iteration list before it begins, so
|
||||||
|
# changing the positional parameters here affects neither the number of
|
||||||
|
# iterations, nor the values presented in `arg`.
|
||||||
|
shift # remove old arg
|
||||||
|
set -- "$@" "$arg" # push replacement arg
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
|
# Collect all arguments for the java command:
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
|
# and any embedded shellness will be escaped.
|
||||||
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
|
set -- \
|
||||||
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
-classpath "$CLASSPATH" \
|
||||||
|
org.gradle.wrapper.GradleWrapperMain \
|
||||||
|
"$@"
|
||||||
|
|
||||||
|
# Stop when "xargs" is not available.
|
||||||
|
if ! command -v xargs >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "xargs is not available"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use "xargs" to parse quoted args.
|
||||||
|
#
|
||||||
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
#
|
||||||
|
# In Bash we could simply go:
|
||||||
|
#
|
||||||
|
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||||
|
# set -- "${ARGS[@]}" "$@"
|
||||||
|
#
|
||||||
|
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||||
|
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||||
|
# character that might be a shell metacharacter, then use eval to reverse
|
||||||
|
# that process (while maintaining the separation between arguments), and wrap
|
||||||
|
# the whole thing up as a single "set" statement.
|
||||||
|
#
|
||||||
|
# This will of course break if any of these variables contains a newline or
|
||||||
|
# an unmatched quote.
|
||||||
|
#
|
||||||
|
|
||||||
|
eval "set -- $(
|
||||||
|
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||||
|
xargs -n1 |
|
||||||
|
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||||
|
tr '\n' ' '
|
||||||
|
)" '"$@"'
|
||||||
|
|
||||||
|
exec "$JAVACMD" "$@"
|
||||||
133
bindings/kotlin/pom.xml
Normal file
133
bindings/kotlin/pom.xml
Normal file
@@ -0,0 +1,133 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<groupId>cz.jzitnik</groupId>
|
||||||
|
<artifactId>jecna-supl-client</artifactId>
|
||||||
|
<version>0.1.0</version>
|
||||||
|
<name>Jecna Supl Client</name>
|
||||||
|
<description>Kotlin bindings for the Jecna Supl Rust library</description>
|
||||||
|
<url>https://gitea.jzitnik.dev/jzitnik/jecna-supl-client</url>
|
||||||
|
|
||||||
|
<licenses>
|
||||||
|
<license>
|
||||||
|
<name>GNU Lesser General Public License v3.0</name>
|
||||||
|
<url>https://www.gnu.org/licenses/lgpl-3.0.html</url>
|
||||||
|
<distribution>repo</distribution>
|
||||||
|
</license>
|
||||||
|
</licenses>
|
||||||
|
|
||||||
|
<developers>
|
||||||
|
<developer>
|
||||||
|
<id>jzitnik</id>
|
||||||
|
<name>Jakub Žitník</name>
|
||||||
|
<email>email@jzitnik.dev</email>
|
||||||
|
</developer>
|
||||||
|
</developers>
|
||||||
|
|
||||||
|
<scm>
|
||||||
|
<connection>scm:git:git://gitea.jzitnik.dev/jzitnik/jecna-supl-client.git</connection>
|
||||||
|
<developerConnection>scm:git:ssh://gitea.jzitnik.dev/jzitnik/jecna-supl-client.git</developerConnection>
|
||||||
|
<url>https://gitea.jzitnik.dev/jzitnik/jecna-supl-client</url>
|
||||||
|
</scm>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<kotlin.version>2.1.0</kotlin.version>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
|
<artifactId>kotlin-stdlib</artifactId>
|
||||||
|
<version>${kotlin.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jetbrains.kotlinx</groupId>
|
||||||
|
<artifactId>kotlinx-coroutines-core</artifactId>
|
||||||
|
<version>1.7.3</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.java.dev.jna</groupId>
|
||||||
|
<artifactId>jna</artifactId>
|
||||||
|
<version>5.14.0</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<sourceDirectory>src/main/kotlin</sourceDirectory>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
|
<artifactId>kotlin-maven-plugin</artifactId>
|
||||||
|
<version>${kotlin.version}</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>compile</id>
|
||||||
|
<phase>compile</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>compile</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<!-- GPG Signing Plugin for Maven -->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-gpg-plugin</artifactId>
|
||||||
|
<version>3.1.0</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>sign-artifacts</id>
|
||||||
|
<phase>verify</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>sign</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<!-- Sources and Javadoc plugins are also required for Maven Central -->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
|
<version>3.3.0</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>attach-sources</id>
|
||||||
|
<goals>
|
||||||
|
<goal>jar-no-fork</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.jetbrains.dokka</groupId>
|
||||||
|
<artifactId>dokka-maven-plugin</artifactId>
|
||||||
|
<version>1.9.10</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>javadocJar</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
<distributionManagement>
|
||||||
|
<snapshotRepository>
|
||||||
|
<id>ossrh</id>
|
||||||
|
<url>https://central.sonatype.com/content/repositories/snapshots</url>
|
||||||
|
</snapshotRepository>
|
||||||
|
<repository>
|
||||||
|
<id>ossrh</id>
|
||||||
|
<url>https://central.sonatype.com/maven2/</url>
|
||||||
|
</repository>
|
||||||
|
</distributionManagement>
|
||||||
|
</project>
|
||||||
8
bindings/kotlin/settings.gradle
Normal file
8
bindings/kotlin/settings.gradle
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
pluginManagement {
|
||||||
|
repositories {
|
||||||
|
gradlePluginPortal()
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
rootProject.name = "jecna-supl-client"
|
||||||
12
bindings/kotlin/settings.xml
Normal file
12
bindings/kotlin/settings.xml
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
|
||||||
|
https://maven.apache.org/xsd/settings-1.0.0.xsd">
|
||||||
|
<servers>
|
||||||
|
<server>
|
||||||
|
<id>ossrh</id>
|
||||||
|
<username>AWUj0F</username>
|
||||||
|
<password>dcOYghgesyckc4UXdwqaGIFkTumEcfbCo</password>
|
||||||
|
</server>
|
||||||
|
</servers>
|
||||||
|
</settings>
|
||||||
3
src/bin/uniffi-bindgen.rs
Normal file
3
src/bin/uniffi-bindgen.rs
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
fn main() {
|
||||||
|
uniffi::uniffi_bindgen_main()
|
||||||
|
}
|
||||||
239
src/lib.rs
Normal file
239
src/lib.rs
Normal file
@@ -0,0 +1,239 @@
|
|||||||
|
use chrono::{Datelike, Local, NaiveDate, Weekday};
|
||||||
|
use once_cell::sync::Lazy;
|
||||||
|
use serde::Deserialize;
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::sync::{Once, RwLock};
|
||||||
|
use tokio::runtime::Runtime;
|
||||||
|
use tracing::{debug, error, info};
|
||||||
|
|
||||||
|
uniffi::setup_scaffolding!();
|
||||||
|
|
||||||
|
static RUNTIME: Lazy<Runtime> =
|
||||||
|
Lazy::new(|| Runtime::new().expect("Failed to create Tokio runtime"));
|
||||||
|
|
||||||
|
static INIT_TRACING: Once = Once::new();
|
||||||
|
|
||||||
|
#[derive(Debug, thiserror::Error, uniffi::Error)]
|
||||||
|
pub enum SuplError {
|
||||||
|
#[error("Network error: {reason}")]
|
||||||
|
NetworkError { reason: String },
|
||||||
|
#[error("Parse error: {reason}")]
|
||||||
|
ParseError { reason: String },
|
||||||
|
#[error("Invalid date format: {reason}")]
|
||||||
|
DateFormatError { reason: String },
|
||||||
|
#[error("Internal runtime error: {reason}")]
|
||||||
|
RuntimeError { reason: String },
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct ApiResponse {
|
||||||
|
schedule: Vec<HashMap<String, serde_json::Value>>,
|
||||||
|
props: Vec<DayProp>,
|
||||||
|
status: Status,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct DayProp {
|
||||||
|
date: String,
|
||||||
|
#[allow(dead_code)]
|
||||||
|
priprava: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, uniffi::Record)]
|
||||||
|
pub struct Status {
|
||||||
|
#[serde(rename = "lastUpdated")]
|
||||||
|
pub last_updated: String,
|
||||||
|
|
||||||
|
#[serde(rename = "currentUpdateSchedule")]
|
||||||
|
pub current_update_schedule: u16,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(uniffi::Record)]
|
||||||
|
pub struct SuplResult {
|
||||||
|
pub status: Status,
|
||||||
|
pub schedule: Vec<DailySchedule>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(uniffi::Record)]
|
||||||
|
pub struct DailySchedule {
|
||||||
|
pub date: String,
|
||||||
|
pub lessons: Vec<Option<String>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(uniffi::Object)]
|
||||||
|
pub struct JecnaSuplClient {
|
||||||
|
provider_url: RwLock<String>,
|
||||||
|
client: reqwest::Client,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[uniffi::export]
|
||||||
|
impl JecnaSuplClient {
|
||||||
|
#[uniffi::constructor]
|
||||||
|
pub fn new() -> Self {
|
||||||
|
INIT_TRACING.call_once(|| {
|
||||||
|
#[cfg(target_os = "android")]
|
||||||
|
android_logger::init_once(
|
||||||
|
android_logger::Config::default()
|
||||||
|
.with_max_level(log::LevelFilter::Debug)
|
||||||
|
.with_tag("JecnaSuplClient"),
|
||||||
|
);
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "android"))]
|
||||||
|
tracing_subscriber::fmt()
|
||||||
|
.with_max_level(tracing::Level::DEBUG)
|
||||||
|
.init();
|
||||||
|
});
|
||||||
|
|
||||||
|
info!("Initializing JecnaSuplClient");
|
||||||
|
Self {
|
||||||
|
provider_url: RwLock::new("https://jecnarozvrh.jzitnik.dev".to_string()),
|
||||||
|
client: reqwest::Client::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_provider(&self, url: String) {
|
||||||
|
let mut provider = self.provider_url.write().unwrap();
|
||||||
|
*provider = url;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_schedule(&self, class_name: String) -> Result<SuplResult, SuplError> {
|
||||||
|
let url = {
|
||||||
|
let provider = self.provider_url.read().unwrap();
|
||||||
|
let trimmed = provider.trim_end_matches('/');
|
||||||
|
format!("{}/versioned/v2", trimmed)
|
||||||
|
};
|
||||||
|
debug!("Target URL: {}", url);
|
||||||
|
|
||||||
|
let client = self.client.clone();
|
||||||
|
let class_name_clone = class_name.clone();
|
||||||
|
|
||||||
|
let (tx, rx) = std::sync::mpsc::channel();
|
||||||
|
|
||||||
|
RUNTIME.spawn(async move {
|
||||||
|
let result = async {
|
||||||
|
let resp = client.get(&url).send().await.map_err(|e| {
|
||||||
|
error!("Network request failed: {}", e);
|
||||||
|
SuplError::NetworkError {
|
||||||
|
reason: e.to_string(),
|
||||||
|
}
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let resp_text = resp.text().await.map_err(|e| {
|
||||||
|
error!("Failed to read response text: {}", e);
|
||||||
|
SuplError::NetworkError {
|
||||||
|
reason: e.to_string(),
|
||||||
|
}
|
||||||
|
})?;
|
||||||
|
|
||||||
|
if resp_text.trim().is_empty() {
|
||||||
|
error!("Received empty response body from {}", url);
|
||||||
|
return Err(SuplError::ParseError {
|
||||||
|
reason: "Empty response body".to_string(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
let resp: ApiResponse = serde_json::from_str(&resp_text).map_err(|e| {
|
||||||
|
error!("JSON parse error: {}. Position: line {}, col {}. Response content: {}", e, e.line(), e.column(), resp_text);
|
||||||
|
SuplError::ParseError {
|
||||||
|
reason: e.to_string(),
|
||||||
|
}
|
||||||
|
})?;
|
||||||
|
|
||||||
|
debug!("Successfully parsed response");
|
||||||
|
Ok::<ApiResponse, SuplError>(resp)
|
||||||
|
}
|
||||||
|
.await;
|
||||||
|
|
||||||
|
let _ = tx.send(result);
|
||||||
|
});
|
||||||
|
|
||||||
|
let result = rx.recv().map_err(|e| {
|
||||||
|
error!("Mpsc receive error: {}", e);
|
||||||
|
SuplError::RuntimeError {
|
||||||
|
reason: "Channel closed".to_string(),
|
||||||
|
}
|
||||||
|
})??;
|
||||||
|
|
||||||
|
let today = Local::now().date_naive();
|
||||||
|
let current_weekday = today.weekday();
|
||||||
|
debug!("Current date: {}, weekday: {:?}", today, current_weekday);
|
||||||
|
|
||||||
|
let start_date;
|
||||||
|
let end_date;
|
||||||
|
|
||||||
|
match current_weekday {
|
||||||
|
Weekday::Sat | Weekday::Sun => {
|
||||||
|
// Next Monday
|
||||||
|
let days_until_mon = 7 - current_weekday.num_days_from_monday();
|
||||||
|
let next_mon = today + chrono::Duration::days(days_until_mon as i64);
|
||||||
|
start_date = next_mon;
|
||||||
|
end_date = next_mon + chrono::Duration::days(4); // Mon -> Fri is 4 days diff
|
||||||
|
info!(
|
||||||
|
"Weekend detected. Showing next week: {} to {}",
|
||||||
|
start_date, end_date
|
||||||
|
);
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
// Current Monday
|
||||||
|
let days_from_mon = current_weekday.num_days_from_monday();
|
||||||
|
let curr_mon = today - chrono::Duration::days(days_from_mon as i64);
|
||||||
|
start_date = curr_mon;
|
||||||
|
end_date = curr_mon + chrono::Duration::days(4);
|
||||||
|
info!(
|
||||||
|
"Weekday detected. Showing current week: {} to {}",
|
||||||
|
start_date, end_date
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut output = Vec::new();
|
||||||
|
|
||||||
|
for (i, day_prop) in result.props.iter().enumerate() {
|
||||||
|
let date = NaiveDate::parse_from_str(&day_prop.date, "%Y-%m-%d").map_err(|e| {
|
||||||
|
error!("Date parsing error for {}: {}", day_prop.date, e);
|
||||||
|
SuplError::DateFormatError {
|
||||||
|
reason: e.to_string(),
|
||||||
|
}
|
||||||
|
})?;
|
||||||
|
|
||||||
|
if date >= start_date && date <= end_date {
|
||||||
|
if let Some(day_schedule_map) = result.schedule.get(i) {
|
||||||
|
if let Some(class_schedule_val) = day_schedule_map.get(&class_name_clone) {
|
||||||
|
match serde_json::from_value::<Vec<Option<String>>>(
|
||||||
|
class_schedule_val.clone(),
|
||||||
|
) {
|
||||||
|
Ok(lessons) => {
|
||||||
|
output.push(DailySchedule {
|
||||||
|
date: day_prop.date.clone(),
|
||||||
|
lessons,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
error!(
|
||||||
|
"Failed to parse schedule for class {}: {}",
|
||||||
|
class_name_clone, e
|
||||||
|
);
|
||||||
|
return Err(SuplError::ParseError {
|
||||||
|
reason: format!(
|
||||||
|
"Invalid schedule format for class {}",
|
||||||
|
class_name_clone
|
||||||
|
),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
debug!(
|
||||||
|
"Class {} not found in schedule for {}",
|
||||||
|
class_name_clone, date
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(SuplResult {
|
||||||
|
status: result.status,
|
||||||
|
schedule: output,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user