Skip to content

fix: don't delete requests when removing media from arr #3288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fallenbagel wants to merge 1 commit into from
+23 −13
Open

fix: don't delete requests when removing media from arr #3288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 15 additions & 11 deletions server/entity/Media.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,17 +203,21 @@ class Media {
Object.assign(this, init);
}

public resetServiceData(): void {
this.serviceId = null;
this.serviceId4k = null;
this.externalServiceId = null;
this.externalServiceId4k = null;
this.externalServiceSlug = null;
this.externalServiceSlug4k = null;
this.ratingKey = null;
this.ratingKey4k = null;
this.jellyfinMediaId = null;
this.jellyfinMediaId4k = null;
public resetServiceData(is4k?: boolean): void {
if (is4k === undefined || !is4k) {
this.serviceId = null;
this.externalServiceId = null;
this.externalServiceSlug = null;
this.ratingKey = null;
this.jellyfinMediaId = null;
}
if (is4k === undefined || is4k) {
this.serviceId4k = null;
this.externalServiceId4k = null;
this.externalServiceSlug4k = null;
this.ratingKey4k = null;
this.jellyfinMediaId4k = null;
}
}

@AfterLoad()
Expand Down
8 changes: 8 additions & 0 deletions server/routes/media.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,16 @@ mediaRoutes.delete(
throw new Error('TVDB ID not found');
}
await (service as SonarrAPI).removeSeries(tvdbId);

for (const season of media.seasons) {
season[is4k ? 'status4k' : 'status'] = MediaStatus.DELETED;
}
}

media[is4k ? 'status4k' : 'status'] = MediaStatus.DELETED;
media.resetServiceData(is4k);
await mediaRepository.save(media);

return res.status(204).send();
} catch (e) {
if (e instanceof EntityNotFoundError) {
Expand Down
1 change: 0 additions & 1 deletion src/components/ManageSlideOver/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ const ManageSlideOver = ({
await axios.delete(
`/api/v1/media/${data.mediaInfo.id}/file?is4k=${is4k}`
);
await axios.delete(`/api/v1/media/${data.mediaInfo.id}`);
} catch (e) {
if (!axios.isAxiosError(e) || e.response?.status !== 404) {
addToast(intl.formatMessage(messages.removemediaerror), {
Expand Down
1 change: 0 additions & 1 deletion src/components/RequestList/RequestItem/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,6 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
await axios.delete(
`/api/v1/media/${request.media.id}/file?is4k=${request.is4k}`
);
await axios.delete(`/api/v1/media/${request.media.id}`);
} catch (e) {
if (!axios.isAxiosError(e) || e.response?.status !== 404) {
addToast(intl.formatMessage(messages.removemediaerror), {
Expand Down
Loading