From 13f54c0da636e7093d347bba5c126f8e895ebfe1 Mon Sep 17 00:00:00 2001
From: ByteDream <bytedream@protonmail.com>
Date: Sun, 8 Jan 2023 18:06:37 +0100
Subject: [PATCH] Fix interactive season choosing activation on url filter
 excluded seasons

---
 crunchy-cli-core/src/cli/archive.rs  |  5 ++++-
 crunchy-cli-core/src/cli/download.rs | 11 +++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/crunchy-cli-core/src/cli/archive.rs b/crunchy-cli-core/src/cli/archive.rs
index 2c952d6..b9b7de0 100644
--- a/crunchy-cli-core/src/cli/archive.rs
+++ b/crunchy-cli-core/src/cli/archive.rs
@@ -379,7 +379,10 @@ async fn formats_from_series(
                     .locale
                     .iter()
                     .any(|l| s.metadata.audio_locales.contains(l))
-        })
+        });
+        // remove seasons which match the url filter. this is mostly done to not trigger the
+        // interactive season choosing when dupilcated seasons are excluded by the filter
+        seasons.retain(|s| url_filter.is_season_valid(s.metadata.season_number))
     }
 
     if !archive.yes && !find_multiple_seasons_with_same_number(&seasons).is_empty() {
diff --git a/crunchy-cli-core/src/cli/download.rs b/crunchy-cli-core/src/cli/download.rs
index 8da833a..25c1262 100644
--- a/crunchy-cli-core/src/cli/download.rs
+++ b/crunchy-cli-core/src/cli/download.rs
@@ -349,7 +349,10 @@ async fn formats_from_series(
         seasons.retain(|s| {
             s.metadata.season_number != season.first().unwrap().metadata.season_number
                 || s.metadata.audio_locales.contains(&download.audio)
-        })
+        });
+        // remove seasons which match the url filter. this is mostly done to not trigger the
+        // interactive season choosing when dupilcated seasons are excluded by the filter
+        seasons.retain(|s| url_filter.is_season_valid(s.metadata.season_number))
     }
 
     if !download.yes && !find_multiple_seasons_with_same_number(&seasons).is_empty() {
@@ -373,14 +376,14 @@ async fn formats_from_season(
     season: Media<Season>,
     url_filter: &UrlFilter,
 ) -> Result<Option<Vec<Format>>> {
-    if !season.metadata.audio_locales.contains(&download.audio) {
+    if !url_filter.is_season_valid(season.metadata.season_number) {
+        return Ok(None);
+    } else if !season.metadata.audio_locales.contains(&download.audio) {
         error!(
             "Season {} ({}) is not available with {} audio",
             season.metadata.season_number, season.title, download.audio
         );
         return Ok(None);
-    } else if !url_filter.is_season_valid(season.metadata.season_number) {
-        return Ok(None);
     }
 
     let mut formats = vec![];