Refatorar Auto Focus (#625)

tiagohm · Oct 10, 2024 · 30e8b52 · 30e8b52
2 parents aec0e2e + e34dfb8
commit 30e8b52
Show file tree

Hide file tree

Showing 30 changed files with 855 additions and 415 deletions.
diff --git a/api/Main.run.xml b/api/Main.run.xml
@@ -1,19 +1,11 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false"
-                   name="Main"
-                   type="JetRunConfigurationType">
-        <option name="MAIN_CLASS_NAME"
-                value="nebulosa.api.MainKt"/>
+    <configuration default="false" name="Main" type="JetRunConfigurationType">
+        <option name="MAIN_CLASS_NAME" value="nebulosa.api.MainKt"/>
         <module name="nebulosa.api.main"/>
-        <option name="PROGRAM_PARAMETERS"
-                value="--port=7000"/>
+        <option name="PROGRAM_PARAMETERS" value="--port=7000 --debug"/>
         <shortenClasspath name="NONE"/>
         <method v="2">
-            <option name="Gradle.BeforeRunTask"
-                    enabled="true"
-                    tasks="build"
-                    externalProjectPath="$PROJECT_DIR$/api"
-                    vmOptions=""
+            <option name="Gradle.BeforeRunTask" enabled="true" tasks="build" externalProjectPath="$PROJECT_DIR$/api" vmOptions=""
                     scriptParameters="-x test"/>
         </method>
     </configuration>

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     implementation(project(":nebulosa-astap"))
     implementation(project(":nebulosa-astrometrynet"))
     implementation(project(":nebulosa-alpaca-indi"))
+    implementation(project(":nebulosa-autofocus"))
     implementation(project(":nebulosa-curve-fitting"))
     implementation(project(":nebulosa-guiding-phd2"))
     implementation(project(":nebulosa-hips2fits"))

diff --git a/api/src/main/kotlin/nebulosa/api/Nebulosa.kt b/api/src/main/kotlin/nebulosa/api/Nebulosa.kt
@@ -1,5 +1,6 @@
 package nebulosa.api
 
+import ch.qos.logback.classic.Level
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
@@ -14,6 +15,7 @@ import nebulosa.api.inject.*
 import nebulosa.json.PathModule
 import nebulosa.log.loggerFor
 import org.koin.core.context.startKoin
+import org.slf4j.LoggerFactory
 import java.util.concurrent.ConcurrentHashMap
 
 @Command(name = "nebulosa")
@@ -25,9 +27,18 @@ class Nebulosa : Runnable, AutoCloseable {
     @Option(name = ["-p", "--port"])
     private var port = 0
 
+    @Option(name = ["-d", "--debug"])
+    private var debug = false
+
     private lateinit var app: Javalin
 
     override fun run() {
+        if (debug) {
+            with(LoggerFactory.getLogger("nebulosa") as ch.qos.logback.classic.Logger) {
+                level = Level.DEBUG
+            }
+        }
+
         // Run the server.
         app = Javalin.create { config ->
             config.showJavalinBanner = false
@@ -55,16 +66,6 @@ class Nebulosa : Runnable, AutoCloseable {
         app.stop()
     }
 
-    private data object LocationConverter : (String) -> Location? {
-
-        private val CACHED_LOCATION = ConcurrentHashMap<String, Location>(4)
-
-        override fun invoke(value: String): Location? {
-            return if (value.isBlank()) null
-            else CACHED_LOCATION.computeIfAbsent(value) { OBJECT_MAPPER.readValue(value, Location::class.java) }
-        }
-    }
-
     companion object {
 
         @JvmStatic private val LOG = loggerFor<Nebulosa>()

diff --git a/api/src/main/kotlin/nebulosa/api/atlas/IERSUpdateTask.kt b/api/src/main/kotlin/nebulosa/api/atlas/IERSUpdateTask.kt
@@ -52,19 +52,19 @@ class IERSUpdateTask(
                 .use { it.headers.getDate(Header.LAST_MODIFIED) }
 
             if (modifiedAt != null && "$modifiedAt" == preferenceService.getText(key)) {
-                LOG.info("$url is up to date. modifiedAt={}", modifiedAt)
+                LOG.info("{} is up to date. modifiedAt={}", url, modifiedAt)
                 return
             }
 
             request = request.newBuilder().get().build()
 
-            LOG.info("downloading $url")
+            LOG.debug("downloading {}", url)
 
             httpClient.newCall(request).execute().use {
                 it.body!!.byteStream().transferAndClose(outputStream())
                 modifiedAt = it.headers.getDate(Header.LAST_MODIFIED)
                 preferenceService.putText(key, "$modifiedAt")
-                LOG.info("$url downloaded. modifiedAt={}", modifiedAt)
+                LOG.debug("{} downloaded. modifiedAt={}", url, modifiedAt)
             }
         } catch (e: Throwable) {
             LOG.error("failed to download finals2000A.all", e)

diff --git a/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusController.kt b/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusController.kt
@@ -5,6 +5,7 @@ import io.javalin.http.Context
 import io.javalin.http.bodyAsClass
 import nebulosa.api.connection.ConnectionService
 import nebulosa.api.javalin.notNull
+import nebulosa.api.javalin.valid
 
 class AutoFocusController(
     app: Javalin,
@@ -21,7 +22,7 @@ class AutoFocusController(
     private fun start(ctx: Context) {
         val camera = connectionService.camera(ctx.pathParam("camera")).notNull()
         val focuser = connectionService.focuser(ctx.pathParam("focuser")).notNull()
-        val body = ctx.bodyAsClass<AutoFocusRequest>()
+        val body = ctx.bodyAsClass<AutoFocusRequest>().valid()
         autoFocusService.start(camera, focuser, body)
     }