fix(rules): Season action 'unmonitor and delete existing episodes' wi…

…ll now correctly remove and unmonitor existing episodes. The season itself will stay monitored. (#951)
jorenn92 · Mar 4, 2024 · c5a135b · c5a135b
1 parent 070b381
commit c5a135b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/server/src/modules/api/servarr-api/helpers/sonarr.helper.ts b/server/src/modules/api/servarr-api/helpers/sonarr.helper.ts
@@ -314,14 +314,29 @@ export class SonarrApi extends ServarrApi<{
       const data: SonarrSeries = (await this.axios.get(`series/${seriesId}`))
         .data;
 
+      const episodes: SonarrEpisode[] = await this.get(
+        `episodefile?seriesId=${seriesId}`,
+      );
+
+      // loop seasons
       data.seasons = data.seasons.map((s) => {
-        if (
-          type === 'all' ||
-          ((type === 'existing' ||
-            (forceExisting && type === s.seasonNumber)) &&
-            s.statistics?.episodeFileCount > 0)
-        ) {
+        if (type === 'all') {
           s.monitored = false;
+        } else if (
+          type === 'existing' ||
+          (forceExisting && type === s.seasonNumber)
+        ) {
+          // existing episodes only, so don't unmonitor season
+          episodes.forEach((e) => {
+            if (e.seasonNumber === s.seasonNumber) {
+              this.UnmonitorDeleteEpisodes(
+                +seriesId,
+                e.seasonNumber,
+                [e.id],
+                false,
+              );
+            }
+          });
         } else if (typeof type === 'number') {
           // specific season
           if (s.seasonNumber === type) {
@@ -334,10 +349,6 @@ export class SonarrApi extends ServarrApi<{
 
       // delete files
       if (deleteFiles) {
-        const episodes: SonarrEpisode[] = await this.get(
-          `episodefile?seriesId=${seriesId}`,
-        );
-
         for (const e of episodes) {
           if (typeof type === 'number') {
             if (e.seasonNumber === type) {

diff --git a/server/src/modules/api/servarr-api/radarr.controller.ts b/server/src/modules/api/servarr-api/radarr.controller.ts
@@ -8,8 +8,4 @@ export class RadarrController {
   getMovie() {
     return this.servarr.RadarrApi.getMovie({ id: 2780 });
   }
-  @Get('/test')
-  testRadarr() {
-    this.servarr.SonarrApi.unmonitorSeasons(87, 'existing', false);
-  }
 }