diff --git a/CHANGELOG.md b/CHANGELOG.md index 172f804e..569d1eee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Show release details for failed and ignored history events - Show when a release was previously grabbed or failed in Radarr's interactive search - Show when a release was previously grabbed or failed in Sonarr v5's interactive search +- Filter Sonarr v5 releases by multi-season pack ### Fixed - Open the exact movie on Letterboxd instead of a search diff --git a/Ruddarr/Models/Series/SeriesRelease.swift b/Ruddarr/Models/Series/SeriesRelease.swift index 18b7dc42..248a0402 100644 --- a/Ruddarr/Models/Series/SeriesRelease.swift +++ b/Ruddarr/Models/Series/SeriesRelease.swift @@ -52,6 +52,7 @@ struct SeriesRelease: Identifiable, Codable { let episodeIds: [Series.ID]? let seasonNumber: Season.ID + let seasonNumbers: [Season.ID]? let mappedSeasonNumber: Season.ID? let episodeNumbers: [Episode.ID]? @@ -94,6 +95,7 @@ struct SeriesRelease: Identifiable, Codable { case episodeId case episodeIds case seasonNumber + case seasonNumbers case mappedSeasonNumber case episodeNumbers case mappedEpisodeNumbers @@ -132,6 +134,10 @@ struct SeriesRelease: Identifiable, Codable { quality.revision.isRepack } + var isMultiSeason: Bool { + fullSeason && (seasonNumbers?.count ?? 0) > 1 + } + var hasCustomFormats: Bool { if let formats = customFormats { return !formats.isEmpty diff --git a/Ruddarr/Models/Series/SeriesReleaseSort.swift b/Ruddarr/Models/Series/SeriesReleaseSort.swift index 2febe355..82429939 100644 --- a/Ruddarr/Models/Series/SeriesReleaseSort.swift +++ b/Ruddarr/Models/Series/SeriesReleaseSort.swift @@ -79,22 +79,25 @@ struct SeriesReleaseSort: Equatable { var id: Self { self } case any - case season case episode + case season + case multiSeason var label: String { switch self { case .any: String(localized: "Any", comment: "Season pack or single episode option") - case .season: String(localized: "Season Pack") case .episode: String(localized: "Single Episode") + case .season: String(localized: "Season Pack") + case .multiSeason: String(localized: "Multi-Season Pack") } } var icon: String { switch self { case .any: "square.stack.3d.up" - case .season: "shippingbox" case .episode: "numbersign" + case .season: "shippingbox" + case .multiSeason: "archivebox" } } } @@ -140,6 +143,7 @@ struct SeriesReleaseSort: Equatable { (customFormat == .all || release.customFormats?.contains { $0.name == customFormat } ?? false) && (releaseGroup == .all || release.releaseGroupLabel?.caseInsensitiveCompare(releaseGroup) == .orderedSame) && (seasonPack != .season || release.fullSeason) && + (seasonPack != .multiSeason || release.isMultiSeason) && (seasonPack != .episode || !release.fullSeason) && (!approved || !release.rejected) && (!freeleech || release.isFreeleech) && diff --git a/Ruddarr/Models/Series/SeriesReleases.swift b/Ruddarr/Models/Series/SeriesReleases.swift index 57f80f75..0b8ead06 100644 --- a/Ruddarr/Models/Series/SeriesReleases.swift +++ b/Ruddarr/Models/Series/SeriesReleases.swift @@ -20,6 +20,10 @@ class SeriesReleases { var customFormats: [String] = [] var releaseGroups: [String] = [] + var hasMultiSeasonPacks: Bool { + items.contains(where: \.isMultiSeason) + } + init(_ instance: Instance) { self.instance = instance } diff --git a/Ruddarr/Views/Series/Releases/SeriesReleasesView.swift b/Ruddarr/Views/Series/Releases/SeriesReleasesView.swift index 59966f88..a64fdf4d 100644 --- a/Ruddarr/Views/Series/Releases/SeriesReleasesView.swift +++ b/Ruddarr/Views/Series/Releases/SeriesReleasesView.swift @@ -340,7 +340,9 @@ extension SeriesReleasesView { var seasonPackPicker: some View { Picker("Season Pack", selection: $sort.seasonPack) { ForEach(SeriesReleaseSort.SeasonPack.allCases) { item in - Label(item.label, systemImage: item.icon).tag(Optional.some(item)) + if item != .multiSeason || instance.releases.hasMultiSeasonPacks { + Label(item.label, systemImage: item.icon).tag(Optional.some(item)) + } } } .pickerStyle(.inline) diff --git a/TestFlight/WhatToTest.en-US.txt b/TestFlight/WhatToTest.en-US.txt index d35ed56a..060950fb 100644 --- a/TestFlight/WhatToTest.en-US.txt +++ b/TestFlight/WhatToTest.en-US.txt @@ -3,6 +3,7 @@ Added - Show release details for failed and ignored history events - Show when a release was previously grabbed or failed in Radarr's interactive search - Show when a release was previously grabbed or failed in Sonarr v5's interactive search +- Filter Sonarr v5 releases by multi-season pack Fixed - Open the exact movie on Letterboxd instead of a search