Merge branch 'dev'

api/src/main/kotlin/nebulosa/api/Nebulosa.kt

@@ -22,6 +22,7 @@ import nebulosa.log.loggerFor
 import org.koin.core.context.startKoin
 import org.slf4j.LoggerFactory
 import java.net.ConnectException
+import java.util.concurrent.ExecutionException
 import java.util.concurrent.ExecutorService
 
 @Command(name = "nebulosa")
@@ -80,6 +81,7 @@ class Nebulosa : Runnable, AutoCloseable {
         val message = when (ex) {
             is ConnectException -> "connection refused"
             is NumberFormatException -> "invalid number: ${ex.message}"
+            is ExecutionException -> ex.cause!!.message!!
             else -> ex.message!!
         }
 

api/src/main/kotlin/nebulosa/api/alignment/polar/tppa/TPPAStartRequest.kt

@@ -15,7 +15,6 @@ data class TPPAStartRequest(
     @JsonIgnoreProperties("camera", "focuser", "wheel") @JvmField val capture: CameraStartCaptureRequest = CameraStartCaptureRequest.EMPTY,
     @JvmField val plateSolver: PlateSolverRequest = PlateSolverRequest.EMPTY,
     @JvmField val startFromCurrentPosition: Boolean = true,
-    @JvmField val compensateRefraction: Boolean = false,
     @JvmField val stopTrackingWhenDone: Boolean = true,
     @JvmField val stepDirection: GuideDirection = GuideDirection.EAST,
     @field:DurationUnit(ChronoUnit.SECONDS) @JvmField val stepDuration: Duration = Duration.ZERO,

api/src/main/kotlin/nebulosa/api/alignment/polar/tppa/TPPATask.kt

@@ -8,17 +8,10 @@ data class TPPATask(
     @JvmField val alignment: ThreePointPolarAlignment,
 ) : Task {
 
-    private val mount = job.mount
-    private val request = job.request
-
     override fun run() {
+        val mount = job.mount
         val radius = ATTEMPT_RADIUS * (job.noSolutionAttempts + 1)
-
-        val result = alignment.align(
-            job.savedPath!!, mount.rightAscension, mount.declination, radius,
-            request.compensateRefraction // TODO: CANCELLATION TOKEN?
-        )
-
+        val result = alignment.align(job.savedPath!!, mount.rightAscension, mount.declination, radius)
         job.accept(result)
     }
 

api/src/main/kotlin/nebulosa/api/atlas/SkyAtlasUpdateTask.kt

@@ -36,11 +36,12 @@ class SkyAtlasUpdateTask(
         httpClient.newCall(request).execute().use { response ->
             if (response.isSuccessful) {
                 val newestVersion = response.body!!.string().trim()
+                val currentVersion = preferenceService.getText(VERSION_KEY)
 
-                if (newestVersion != preferenceService.getText(VERSION_KEY) || skyObjectEntityRepository.size == 0L) {
+                if (newestVersion != currentVersion || skyObjectEntityRepository.size == 0L) {
                     skyObjectEntityRepository.clear()
 
-                    LOG.i("Sky Atlas database is out of date. downloading...")
+                    LOG.i("Sky Atlas database is out of date. current={}, newest={}", currentVersion, newestVersion)
 
                     messageService.sendMessage(SkyAtlasUpdateNotificationEvent.Started)
 

api/src/main/kotlin/nebulosa/api/preference/PreferenceRepository.kt

@@ -32,7 +32,7 @@ class PreferenceRepository(private val connection: Database) {
     }
 
     fun update(entity: PreferenceEntity) = transaction(connection) {
-        PreferenceTable.update { entity.mapTo(it, true) }
+        PreferenceTable.update({ PreferenceTable.key eq entity.key }) { entity.mapTo(it, true) }
     }
 
     fun delete(key: String) = transaction(connection) {

api/src/main/kotlin/nebulosa/api/stardetector/StarDetectionRequest.kt

@@ -32,7 +32,7 @@ data class StarDetectionRequest(
         StarDetectorType.SIRIL -> SirilStarDetector(executablePath!!, maxStars)
         StarDetectorType.PIXINSIGHT -> {
             val runner = startPixInsight(executablePath!!, slot)
-            PixInsightStarDetector(runner, slot, minSNR, timeout)
+            PixInsightStarDetector(runner, minSNR, timeout, slot)
         }
     }