Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Ruddarr/Dependencies/API/API+Error.swift
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,17 @@ extension API.Error: LocalizedError {
}
}

extension API.Error {
var isNotFound: Bool {
switch self {
case .badStatusCode(code: 404), .errorResponse(code: 404, _):
true
default:
false
}
}
}

extension DecodingError {
var context: DecodingError.Context {
switch self {
Expand Down
13 changes: 9 additions & 4 deletions Ruddarr/Models/Movies/Movies.swift
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,15 @@ class Movies {

case .get(let movie):
if let index = items.firstIndex(where: { $0.id == movie.id }) {
let item = try await dependencies.api.getMovie(movie.id, instance)

if items[index] != item {
items[index] = item
do {
let item = try await dependencies.api.getMovie(movie.id, instance)

if items[index] != item {
items[index] = item
}
} catch let apiError as API.Error where apiError.isNotFound {
items.remove(at: index)
throw apiError
}
}

Expand Down
13 changes: 9 additions & 4 deletions Ruddarr/Models/Series/SeriesModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,15 @@ class SeriesModel {

case .get(let series):
if let index = items.firstIndex(where: { $0.id == series.id }) {
let item = try await dependencies.api.getSeries(series.id, instance)

if items[index] != item {
items[index] = item
do {
let item = try await dependencies.api.getSeries(series.id, instance)

if items[index] != item {
items[index] = item
}
} catch let apiError as API.Error where apiError.isNotFound {
items.remove(at: index)
throw apiError
}
}

Expand Down
8 changes: 7 additions & 1 deletion Ruddarr/Views/Movies/MovieView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,13 @@ extension MovieView {
}

func reload() async {
_ = await instance.movies.get(movie)
guard await instance.movies.get(movie) else {
if instance.movies.error?.isNotFound == true {
instance.movies.error = nil
dependencies.router.moviesPath = .init()
}
return
}
}

func refresh() async {
Expand Down
8 changes: 7 additions & 1 deletion Ruddarr/Views/Series/SeasonView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,13 @@ extension SeasonView {
}

func reload() async {
_ = await instance.series.get(series)
guard await instance.series.get(series) else {
if instance.series.error?.isNotFound == true {
instance.series.error = nil
dependencies.router.seriesPath = .init()
}
return
}
await instance.episodes.fetch(series)
await instance.files.fetch(series)
}
Expand Down
8 changes: 7 additions & 1 deletion Ruddarr/Views/Series/SeriesItemView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,13 @@ extension SeriesDetailView {
}

func reload() async {
_ = await instance.series.get(series)
guard await instance.series.get(series) else {
if instance.series.error?.isNotFound == true {
instance.series.error = nil
dependencies.router.seriesPath = .init()
}
return
}
await instance.episodes.fetch(series)
await instance.files.fetch(series)
}
Expand Down