#212 optimized podcasts channel deletion

kagemomiji · Dec 6, 2023 · bac3668 · bac3668
1 parent 7172810
commit bac3668
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java b/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
@@ -142,6 +142,7 @@ public MediaFile getMediaFile(Path fullPath) {
 
     // This may be an expensive op
     public MediaFile getMediaFile(Path fullPath, boolean minimizeDiskAccess) {
+        if (Objects.isNull(fullPath)) return null;
         MusicFolder folder = mediaFolderService.getMusicFolderForFile(fullPath, true, true);
         if (folder == null) {
             // can't look outside folders and not present in folder
@@ -1510,7 +1511,7 @@ public void markNonPresent(Instant lastScanned) {
      * @param file media file to delete
      * @return deleted media file
      */
-    private MediaFile delete(MediaFile file) {
+    public MediaFile delete(MediaFile file) {
         if (file == null) {
             return null;
         }

diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/PodcastPersistenceService.java b/airsonic-main/src/main/java/org/airsonic/player/service/PodcastPersistenceService.java
@@ -502,15 +502,23 @@ public PodcastEpisode updateEpisode(PodcastEpisode episode) {
      */
     public boolean deleteChannel(int channelId) {
         // Delete all associated episodes (in case they have files that need to be deleted).
-        getEpisodes(channelId).parallelStream().forEach(ep -> deleteEpisode(ep, false));
-
         return podcastChannelRepository.findById(channelId).map(channel -> {
+            podcastEpisodeRepository.findByChannel(channel).parallelStream()
+                .filter(filterAllowed)
+                .forEach(episode -> {
+                    MediaFile mediaFile = episode.getMediaFile();
+                    if (mediaFile != null) {
+                        FileUtil.delete(mediaFile.getFullPath());
+                        mediaFileService.delete(mediaFile);
+                    }
+                });
             MediaFile mediaFile = channel.getMediaFile();
             FileUtil.delete(mediaFile.getFullPath());
             mediaFileService.refreshMediaFile(mediaFile);
             podcastChannelRepository.delete(channel);
             return true;
         }).orElse(false);
+
     }
 
     /**

diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastChannels.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastChannels.jsp
@@ -273,10 +273,10 @@
             onPlayEpisode(newestPodcastTable.row( $(this).parents('tr') ).data().id);
         } );
         $("#newestPodcastTable tbody").on( "click", ".addSongLast", function () {
-            onAddLastMediaFile(newestPodcastTable.row( $(this).parents('tr') ).data().mediaFileId);
+            onAddLastMediaFile(newestPodcastTable.row( $(this).parents('tr') ).data().mediaFile.id);
         } );
         $("#newestPodcastTable tbody").on( "click", ".addSongNext", function () {
-            onAddNextMediaFile(newestPodcastTable.row( $(this).parents('tr') ).data().mediaFileId);
+            onAddNextMediaFile(newestPodcastTable.row( $(this).parents('tr') ).data().mediaFile.id);
         } );
         $(".newestPodcastSelectAll").on( "change", function (e) {
             selectAll(newestPodcastTable, e.target.checked);