⚡ limit PV search results to PvService.currentlyRenderableEntries

CXwudi · Jan 3, 2024 · a04e505 · a04e505
1 parent a390aef
commit a04e505
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/songfinder-app/src/main/kotlin/mikufan/cx/songfinder/backend/db/entity/Pv.kt b/songfinder-app/src/main/kotlin/mikufan/cx/songfinder/backend/db/entity/Pv.kt
@@ -40,4 +40,13 @@ enum class PvService {
   Bandcamp;
 
   fun isOnlineService() = this != File && this != LocalFile
+
+  companion object {
+    val currentlyRenderableEntries = listOf(
+      NicoNicoDouga,
+      Youtube,
+      SoundCloud,
+      Bilibili,
+    )
+  }
 }
diff --git a/songfinder-app/src/main/kotlin/mikufan/cx/songfinder/backend/db/repository/PvRepository.kt b/songfinder-app/src/main/kotlin/mikufan/cx/songfinder/backend/db/repository/PvRepository.kt
@@ -1,9 +1,13 @@
 package mikufan.cx.songfinder.backend.db.repository
 
 import mikufan.cx.songfinder.backend.db.entity.Pv
+import mikufan.cx.songfinder.backend.db.entity.PvService
 import org.springframework.stereotype.Repository
 
 @Repository
 interface PvRepository : VocaDbRepository<Pv, Long> {
-  fun findAllBySongIdIn(songIds: List<Long>): List<Pv>
+  fun findAllBySongIdInAndPvServiceIn(
+    songIds: List<Long>,
+    pvServices: List<PvService> = PvService.currentlyRenderableEntries
+  ): List<Pv>
 }
diff --git a/songfinder-app/src/main/kotlin/mikufan/cx/songfinder/backend/service/SongSearchService.kt b/songfinder-app/src/main/kotlin/mikufan/cx/songfinder/backend/service/SongSearchService.kt
@@ -80,7 +80,7 @@ class SongSearchService(
 
     // 3. search all PVs
     val songIdToPv: Map<SongId, List<Pv>> = withContext(ioDispatcher) {
-      pvRepo.findAllBySongIdIn(songIds)
+      pvRepo.findAllBySongIdInAndPvServiceIn(songIds)
     }
       .groupBy { it.songId }
     log.debug { "found $songIdToPv PVs" }
@@ -166,8 +166,7 @@ class SongSearchService(
     songId: SongId,
     songIdToPvs: Map<SongId, List<Pv>>
   ): List<PVInfo> = songIdToPvs[songId]?.let { pvs ->
-    pvs.filter { it.pvService.isOnlineService() }
-      .map { PVInfo(it.pvId, it.pvService, it.pvType, it.extendedMetadata) }
+    pvs.map { PVInfo(it.pvId, it.pvService, it.pvType, it.extendedMetadata) }
   } ?: emptyList<PVInfo>().also {
     log.warn { "No PV found for song $songId" }
   }

diff --git a/songfinder-app/src/main/kotlin/mikufan/cx/songfinder/ui/component/main/ResultGridCell.kt b/songfinder-app/src/main/kotlin/mikufan/cx/songfinder/ui/component/main/ResultGridCell.kt
@@ -79,25 +79,16 @@ fun LazyGridItemScope.RealResultGridCell(
   callbacks: ResultCellCallbacks,
   modifier: Modifier = Modifier
 ) {
-  val filteredPvs: List<PVInfo> by produceState(listOf()) {
-    value = result.pvs.filter {
-      it.pvService in listOf(
-        PvService.Youtube,
-        PvService.NicoNicoDouga,
-        PvService.SoundCloud,
-        PvService.Bilibili
-      )
-    }
-  }
+  val pvs = result.pvs
   MusicCardTemplate(
     onCardClicked = { callbacks.onCardClicked(result) },
     modifier.animateItemPlacement()
   ) {
     LazilyFetchedThumbnail(
-      filteredPvs,
+      pvs,
       provideThumbnailInfoCallback = callbacks.provideThumbnailInfo,
     )
-    MusicInfo(result, filteredPvs)
+    MusicInfo(result, pvs)
   }
 }