diff --git a/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureTask.kt b/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureTask.kt index 3d2d6362d..6e5ac9411 100644 --- a/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureTask.kt +++ b/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureTask.kt @@ -6,7 +6,7 @@ import nebulosa.api.calibration.CalibrationFrameProvider import nebulosa.api.guiding.DitherAfterExposureEvent import nebulosa.api.guiding.DitherAfterExposureTask import nebulosa.api.guiding.WaitForSettleTask -import nebulosa.api.livestacking.LiveStackingRequest +import nebulosa.api.livestacker.LiveStackingRequest import nebulosa.api.tasks.AbstractTask import nebulosa.api.tasks.SplitTask import nebulosa.api.tasks.delay.DelayEvent @@ -17,7 +17,7 @@ import nebulosa.guiding.Guider import nebulosa.indi.device.camera.Camera import nebulosa.indi.device.camera.CameraEvent import nebulosa.indi.device.filterwheel.FilterWheel -import nebulosa.livestacking.LiveStacker +import nebulosa.livestacker.LiveStacker import nebulosa.log.loggerFor import java.nio.file.Path import java.time.Duration diff --git a/api/src/main/kotlin/nebulosa/api/cameras/CameraStartCaptureRequest.kt b/api/src/main/kotlin/nebulosa/api/cameras/CameraStartCaptureRequest.kt index 0549aa8ea..ac243e9d7 100644 --- a/api/src/main/kotlin/nebulosa/api/cameras/CameraStartCaptureRequest.kt +++ b/api/src/main/kotlin/nebulosa/api/cameras/CameraStartCaptureRequest.kt @@ -4,7 +4,7 @@ import jakarta.validation.Valid import jakarta.validation.constraints.Positive import jakarta.validation.constraints.PositiveOrZero import nebulosa.api.guiding.DitherAfterExposureRequest -import nebulosa.api.livestacking.LiveStackingRequest +import nebulosa.api.livestacker.LiveStackingRequest import nebulosa.indi.device.camera.FrameType import org.hibernate.validator.constraints.Range import org.hibernate.validator.constraints.time.DurationMax diff --git a/api/src/main/kotlin/nebulosa/api/livestacking/LiveStackerType.kt b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackerType.kt similarity index 63% rename from api/src/main/kotlin/nebulosa/api/livestacking/LiveStackerType.kt rename to api/src/main/kotlin/nebulosa/api/livestacker/LiveStackerType.kt index d5f5f6c09..c6d1dbe84 100644 --- a/api/src/main/kotlin/nebulosa/api/livestacking/LiveStackerType.kt +++ b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackerType.kt @@ -1,4 +1,4 @@ -package nebulosa.api.livestacking +package nebulosa.api.livestacker enum class LiveStackerType { SIRIL, diff --git a/api/src/main/kotlin/nebulosa/api/livestacking/LiveStackingController.kt b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingController.kt similarity index 95% rename from api/src/main/kotlin/nebulosa/api/livestacking/LiveStackingController.kt rename to api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingController.kt index b953b7ee4..03acb8096 100644 --- a/api/src/main/kotlin/nebulosa/api/livestacking/LiveStackingController.kt +++ b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingController.kt @@ -1,4 +1,4 @@ -package nebulosa.api.livestacking +package nebulosa.api.livestacker import jakarta.validation.Valid import jakarta.validation.constraints.NotBlank diff --git a/api/src/main/kotlin/nebulosa/api/livestacking/LiveStackingRequest.kt b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingRequest.kt similarity index 90% rename from api/src/main/kotlin/nebulosa/api/livestacking/LiveStackingRequest.kt rename to api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingRequest.kt index 62dd939e9..c9cbbb573 100644 --- a/api/src/main/kotlin/nebulosa/api/livestacking/LiveStackingRequest.kt +++ b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingRequest.kt @@ -1,13 +1,13 @@ -package nebulosa.api.livestacking +package nebulosa.api.livestacker import com.fasterxml.jackson.databind.annotation.JsonDeserialize import nebulosa.api.beans.converters.angle.DegreesDeserializer -import nebulosa.livestacking.LiveStacker -import nebulosa.pixinsight.livestacking.PixInsightLiveStacker +import nebulosa.livestacker.LiveStacker +import nebulosa.pixinsight.livestacker.PixInsightLiveStacker import nebulosa.pixinsight.script.PixInsightIsRunning import nebulosa.pixinsight.script.PixInsightScriptRunner import nebulosa.pixinsight.script.PixInsightStartup -import nebulosa.siril.livestacking.SirilLiveStacker +import nebulosa.siril.livestacker.SirilLiveStacker import org.jetbrains.annotations.NotNull import java.nio.file.Files import java.nio.file.Path diff --git a/api/src/main/kotlin/nebulosa/api/livestacking/LiveStackingService.kt b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingService.kt similarity index 89% rename from api/src/main/kotlin/nebulosa/api/livestacking/LiveStackingService.kt rename to api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingService.kt index a749b6361..deebb2c68 100644 --- a/api/src/main/kotlin/nebulosa/api/livestacking/LiveStackingService.kt +++ b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingService.kt @@ -1,7 +1,7 @@ -package nebulosa.api.livestacking +package nebulosa.api.livestacker import nebulosa.indi.device.camera.Camera -import nebulosa.livestacking.LiveStacker +import nebulosa.livestacker.LiveStacker import org.springframework.stereotype.Service import java.nio.file.Path import java.util.concurrent.ConcurrentHashMap diff --git a/api/src/test/kotlin/SirilLiveStackerTest.kt b/api/src/test/kotlin/SirilLiveStackerTest.kt index 41220e34e..02c1262e0 100644 --- a/api/src/test/kotlin/SirilLiveStackerTest.kt +++ b/api/src/test/kotlin/SirilLiveStackerTest.kt @@ -1,6 +1,6 @@ import io.kotest.core.annotation.EnabledIf import io.kotest.core.spec.style.StringSpec -import nebulosa.siril.livestacking.SirilLiveStacker +import nebulosa.siril.livestacker.SirilLiveStacker import nebulosa.test.NonGitHubOnlyCondition import java.nio.file.Path import kotlin.io.path.listDirectoryEntries diff --git a/nebulosa-livestacking/build.gradle.kts b/nebulosa-livestacker/build.gradle.kts similarity index 100% rename from nebulosa-livestacking/build.gradle.kts rename to nebulosa-livestacker/build.gradle.kts diff --git a/nebulosa-livestacking/src/main/kotlin/nebulosa/livestacking/LiveStacker.kt b/nebulosa-livestacker/src/main/kotlin/nebulosa/livestacker/LiveStacker.kt similarity index 89% rename from nebulosa-livestacking/src/main/kotlin/nebulosa/livestacking/LiveStacker.kt rename to nebulosa-livestacker/src/main/kotlin/nebulosa/livestacker/LiveStacker.kt index 34e9aa2d4..78dbe6454 100644 --- a/nebulosa-livestacking/src/main/kotlin/nebulosa/livestacking/LiveStacker.kt +++ b/nebulosa-livestacker/src/main/kotlin/nebulosa/livestacker/LiveStacker.kt @@ -1,4 +1,4 @@ -package nebulosa.livestacking +package nebulosa.livestacker import java.io.Closeable import java.nio.file.Path diff --git a/nebulosa-pixinsight/build.gradle.kts b/nebulosa-pixinsight/build.gradle.kts index 3c1861730..4501e3ac2 100644 --- a/nebulosa-pixinsight/build.gradle.kts +++ b/nebulosa-pixinsight/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { api(project(":nebulosa-common")) api(project(":nebulosa-math")) api(project(":nebulosa-star-detection")) - api(project(":nebulosa-livestacking")) + api(project(":nebulosa-livestacker")) api(libs.bundles.jackson) api(libs.apache.codec) implementation(project(":nebulosa-log")) diff --git a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/livestacking/PixInsightLiveStacker.kt b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/livestacker/PixInsightLiveStacker.kt similarity index 98% rename from nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/livestacking/PixInsightLiveStacker.kt rename to nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/livestacker/PixInsightLiveStacker.kt index 6c4d52115..b617684b6 100644 --- a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/livestacking/PixInsightLiveStacker.kt +++ b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/livestacker/PixInsightLiveStacker.kt @@ -1,6 +1,6 @@ -package nebulosa.pixinsight.livestacking +package nebulosa.pixinsight.livestacker -import nebulosa.livestacking.LiveStacker +import nebulosa.livestacker.LiveStacker import nebulosa.log.loggerFor import nebulosa.pixinsight.script.* import java.nio.file.Path diff --git a/nebulosa-siril/build.gradle.kts b/nebulosa-siril/build.gradle.kts index 289bcd126..5df6ca750 100644 --- a/nebulosa-siril/build.gradle.kts +++ b/nebulosa-siril/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { api(project(":nebulosa-common")) api(project(":nebulosa-math")) - api(project(":nebulosa-livestacking")) + api(project(":nebulosa-livestacker")) implementation(project(":nebulosa-log")) } diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/livestacking/SirilLiveStacker.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/livestacker/SirilLiveStacker.kt similarity index 98% rename from nebulosa-siril/src/main/kotlin/nebulosa/siril/livestacking/SirilLiveStacker.kt rename to nebulosa-siril/src/main/kotlin/nebulosa/siril/livestacker/SirilLiveStacker.kt index af8907462..fa20816da 100644 --- a/nebulosa-siril/src/main/kotlin/nebulosa/siril/livestacking/SirilLiveStacker.kt +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/livestacker/SirilLiveStacker.kt @@ -1,10 +1,10 @@ -package nebulosa.siril.livestacking +package nebulosa.siril.livestacker import nebulosa.common.concurrency.latch.CountUpDownLatch import nebulosa.common.exec.CommandLine import nebulosa.common.exec.LineReadListener import nebulosa.common.exec.commandLine -import nebulosa.livestacking.LiveStacker +import nebulosa.livestacker.LiveStacker import nebulosa.log.debug import nebulosa.log.loggerFor import nebulosa.math.Angle diff --git a/settings.gradle.kts b/settings.gradle.kts index 9133d6756..a9606412d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -69,7 +69,7 @@ include(":nebulosa-indi-client") include(":nebulosa-indi-device") include(":nebulosa-indi-protocol") include(":nebulosa-io") -include(":nebulosa-livestacking") +include(":nebulosa-livestacker") include(":nebulosa-log") include(":nebulosa-lx200-protocol") include(":nebulosa-math")