Merge branch 'main' into issue271-fix-stream-api-offset

kagemomiji · Feb 5, 2024 · 270a871 · 270a871
2 parents a9bf568 + fded47f
commit 270a871
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/airsonic-main/src/main/java/org/airsonic/player/repository/AlbumRepository.java b/airsonic-main/src/main/java/org/airsonic/player/repository/AlbumRepository.java
@@ -44,6 +44,8 @@ public interface AlbumRepository extends JpaRepository<Album, Integer> {
 
     public Optional<Album> findByIdAndStarredAlbumsUsername(Integer id, String username);
 
+    public boolean existsByLastScannedBeforeAndPresentTrue(Instant lastScanned);
+
     @Transactional
     public void deleteAllByPresentFalse();
 

diff --git a/airsonic-main/src/main/java/org/airsonic/player/repository/ArtistRepository.java b/airsonic-main/src/main/java/org/airsonic/player/repository/ArtistRepository.java
@@ -49,6 +49,8 @@ public List<Artist> findByFolderInAndPresentTrue(Iterable<MusicFolder> musicFold
 
     public boolean existsByName(String name);
 
+    public boolean existsByLastScannedBeforeAndPresentTrue(Instant lastScanned);
+
     @Transactional
     public void deleteAllByPresentFalse();
 

diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/AlbumService.java b/airsonic-main/src/main/java/org/airsonic/player/service/AlbumService.java
@@ -362,7 +362,9 @@ public int getAlbumCount(List<MusicFolder> musicFolders) {
      */
     @Transactional
     public void markNonPresent(Instant lastScanned) {
-        albumRepository.markNonPresent(lastScanned);
+        if (albumRepository.existsByLastScannedBeforeAndPresentTrue(lastScanned)) {
+            albumRepository.markNonPresent(lastScanned);
+        }
     }
 
     /**

diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/ArtistService.java b/airsonic-main/src/main/java/org/airsonic/player/service/ArtistService.java
@@ -187,7 +187,9 @@ public void expunge() {
      */
     @Transactional
     public void markNonPresent(Instant lastScanned) {
-        artistRepository.markNonPresent(lastScanned);
+        if (artistRepository.existsByLastScannedBeforeAndPresentTrue(lastScanned)) {
+            artistRepository.markNonPresent(lastScanned);
+        }
     }
 
     /**