[Weekly-Episode-Deletion] Don't count not-yet-aired episodes in numbe…

…r to keep
Schaka · Oct 28, 2024 · b34fcff · b34fcff
1 parent 1caf097
commit b34fcff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/kotlin/com/github/schaka/janitorr/cleanup/WeeklyEpisodeCleanupSchedule.kt b/src/main/kotlin/com/github/schaka/janitorr/cleanup/WeeklyEpisodeCleanupSchedule.kt
@@ -14,6 +14,8 @@ import org.springframework.aot.hint.annotation.RegisterReflectionForBinding
 import org.springframework.cache.annotation.CacheEvict
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Service
+import sun.jvm.hotspot.HelloWorld.e
+import java.time.LocalDate
 import java.time.LocalDateTime
 
 /**
@@ -57,7 +59,11 @@ class WeeklyEpisodeCleanupSchedule(
 
         for (show in series) {
             val latestSeason = show.seasons.maxBy { season -> season.seasonNumber }
-            val episodes = sonarrClient.getAllEpisodes(show.id, latestSeason.seasonNumber).toMutableList()
+            val episodes = sonarrClient.getAllEpisodes(show.id, latestSeason.seasonNumber)
+                .filter { it.airDate != null }
+                .filter { LocalDate.parse(it.airDate!!) <= today.toLocalDate() }
+                .toMutableList()
+
             val episodesHistory = sonarrClient.getHistory(show.id, latestSeason.seasonNumber)
                     .sortedBy { parseDate(it.date)}
                     .distinctBy { it.episodeId }
@@ -85,13 +91,12 @@ class WeeklyEpisodeCleanupSchedule(
                 val leftoverEpisodes = episodes.sortedByDescending { it.episodeNumber }.take(applicationProperties.episodeDeletion.maxEpisodes)
                 episodes.removeAll(leftoverEpisodes) // remove the most recent episodes from the list, as we want to keep those
 
-                for (episode in leftoverEpisodes) {
+                for (episode in episodes) {
                     log.trace("Deleting episode ${episode.episodeNumber} of ${show.title} S${latestSeason.seasonNumber} because there are too many episodes")
 
                     if (episode.episodeFileId != null && episode.episodeFileId != 0) {
                         if (!applicationProperties.dryRun) {
                             sonarrClient.deleteEpisodeFile(episode.episodeFileId)
-                            episodes.remove(episode)
                         }
                     }
                 }

diff --git a/src/main/kotlin/com/github/schaka/janitorr/servarr/sonarr/episodes/EpisodeResponse.kt b/src/main/kotlin/com/github/schaka/janitorr/servarr/sonarr/episodes/EpisodeResponse.kt
@@ -10,5 +10,6 @@ data class EpisodeResponse(
         val folder: String?,
         val episodeFile: EpisodeFile?,
         val path: String?,
+        val airDate: String?,
         val hasFile: Boolean
 )