Merge pull request #164 from SamTV12345/fix/deleting-podcasts

Fixes deleting podcasts.
SamTV12345 · May 29, 2023 · 65449f2 · 65449f2
2 parents cefb26a + 9fc02b6
commit 65449f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/controllers/podcast_controller.rs b/src/controllers/podcast_controller.rs
@@ -612,7 +612,7 @@ pub async fn delete_podcast(data: web::Json<DeletePodcast>, db: Data<DbPool>, id
     let podcast = DB::get_podcast(&mut *db.get().unwrap(), id.clone()).expect("Error \
         finding podcast");
     if data.delete_files{
-        FileService::delete_podcast_files(&podcast.directory_id);
+        FileService::delete_podcast_files(&podcast.directory_name);
     }
 
     DB::delete_watchtime(&mut *db.get().unwrap(), id.clone()).expect("Error deleting \

diff --git a/ui/src/components/PodcastDelete.tsx b/ui/src/components/PodcastDelete.tsx
@@ -1,4 +1,4 @@
-import {setConfirmModalData, setPodcasts} from "../store/CommonSlice";
+import {Podcast, setConfirmModalData, setPodcasts} from "../store/CommonSlice";
 import {setModalOpen} from "../store/ModalSlice";
 import {useAppDispatch, useAppSelector} from "../store/hooks";
 import {useTranslation} from "react-i18next";
@@ -21,10 +21,10 @@ export const PodcastDelete = () => {
         }
     },[])
 
-    const deletePodcast = (withFiles:boolean, podcast_id: number)=>{
+    const deletePodcast = (withFiles: boolean, podcast_id: number, p: Podcast)=>{
         axios.delete(apiURL+"/podcast/"+podcast_id,{data: {delete_files: withFiles}})
             .then(()=>{
-                enqueueSnackbar(t('podcast-deleted'),{variant: "success"})
+                enqueueSnackbar(t('podcast-deleted', {name: p.name}),{variant: "success"})
             })
     }
 
@@ -40,7 +40,7 @@ export const PodcastDelete = () => {
                                 dispatch(setConfirmModalData({
                                     headerText: t('delete-podcast-with-files'),
                                     onAccept:()=>{
-                                        deletePodcast(true, p.id)
+                                        deletePodcast(true, p.id, p)
                                     },
                                     onReject: ()=>{
                                         dispatch(setModalOpen(false))
@@ -55,7 +55,7 @@ export const PodcastDelete = () => {
                                 dispatch(setConfirmModalData({
                                     headerText: t('delete-podcast-without-files'),
                                     onAccept:()=>{
-                                        deletePodcast(false, p.id)
+                                        deletePodcast(false, p.id, p)
                                     },
                                     onReject: ()=>{
                                         dispatch(setModalOpen(false))