rest for download started; swagger (#99)

* rest for download started; swagger

* older swagger

* 2.10

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'dpozinen'
-version = '2.9'
+version = '2.10'
 
 repositories {
     mavenCentral()
@@ -29,6 +29,7 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:4.0.4'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
     implementation 'io.github.openfeign:feign-jackson:12.5'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
 
     implementation 'javax.xml.bind:jaxb-api:2.3.1'
 

src/main/kotlin/dpozinen/deluge/core/SonarrCallbacks.kt

@@ -1,7 +1,6 @@
 package dpozinen.deluge.core
 
 import dpozinen.deluge.domain.DownloadSonarrEvent
-import dpozinen.deluge.domain.GrabSonarrEvent
 import dpozinen.deluge.rest.DelugeRequest
 import dpozinen.deluge.rest.clients.DelugeActionsClient
 import mu.KotlinLogging.logger
@@ -18,7 +17,7 @@ class SonarrCallbacks(
 ) {
     private val log = logger {}
 
-    fun downloadStarted(event: GrabSonarrEvent) {
+    fun downloadStarted() {
         delugeService.followDownloading()
     }
 

src/main/kotlin/dpozinen/deluge/core/StatUpdateJob.kt

@@ -13,6 +13,7 @@ import kotlin.time.Duration
 @ConditionalOnProperty("tracker-ops.deluge.stats.enabled", havingValue = "true", matchIfMissing = true)
 open class StatUpdateJob(
     private val delugeStatsService: DelugeStatsService,
+    private val delugeService: DelugeService,
     @Value("\${tracker-ops.deluge.stats.poll-interval}") private val interval: String
 ) {
     private val log = KotlinLogging.logger { }
@@ -23,10 +24,12 @@ open class StatUpdateJob(
     fun startJob() {
         GlobalScope.launch(Dispatchers.IO) {
             while (true) {
-                runCatching { delugeStatsService.collectStats() }
-                    .onFailure {
-                        log.error { it }
-                    }
+                runCatching {
+                    delugeStatsService.collectStats()
+                    delugeService.followDownloading()
+                }.onFailure {
+                    log.error { it }
+                }
                 delay(Duration.parse(interval))
             }
         }

src/main/kotlin/dpozinen/deluge/rest/CallbacksController.kt

@@ -28,6 +28,11 @@ class CallbacksController(
         )
     }
 
+    @GetMapping("/api/callbacks/download-started")
+    fun follow() {
+        sonarrCallbacks.downloadStarted()
+    }
+
     @GetMapping("/api/callbacks/true-nas-move")
     fun trueNasMove() {
         downloadedCallbacks.trueNasMove()
@@ -37,7 +42,7 @@ class CallbacksController(
     fun sonarr(@RequestBody event: SonarrEvent) {
         log.info { jacksonObjectMapper().writeValueAsString(event) }
         when (event) {
-            is GrabSonarrEvent -> sonarrCallbacks.downloadStarted(event)
+            is GrabSonarrEvent -> sonarrCallbacks.downloadStarted()
             is DownloadSonarrEvent -> sonarrCallbacks.downloadCompleted(event)
         }
     }

src/test/kotlin/deluge/CallbacksControllerTest.kt

@@ -50,7 +50,7 @@ class CallbacksControllerTest(
                 }
             }
 
-        verify { sonarrCallbacks.downloadStarted(any()) }
+        verify { sonarrCallbacks.downloadStarted() }
     }
 
     @Test

src/test/kotlin/deluge/SonarrCallbacksTest.kt

@@ -5,7 +5,6 @@ import dpozinen.deluge.core.DelugeService
 import dpozinen.deluge.core.SonarrCallbacks
 import dpozinen.deluge.domain.DownloadSonarrEvent
 import dpozinen.deluge.domain.EpisodeFile
-import dpozinen.deluge.domain.GrabSonarrEvent
 import dpozinen.deluge.domain.Series
 import dpozinen.deluge.rest.DelugeRequest
 import dpozinen.deluge.rest.DelugeRequest.Method.move_storage
@@ -42,7 +41,7 @@ class SonarrCallbacksTest {
 
     @Test
     fun `should trigger follow on download started event`() {
-        sonarrCallbacks.downloadStarted(GrabSonarrEvent(Series("")))
+        sonarrCallbacks.downloadStarted()
 
         verify { delugeService.followDownloading() }
     }