Fix subject search position sort

open-ani · Nov 3, 2024 · 29a6205 · 29a6205
1 parent bea1c14
commit 29a6205
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/app/shared/ui-exploration/src/commonMain/kotlin/ui/exploration/search/RoleSet.kt b/app/shared/ui-exploration/src/commonMain/kotlin/ui/exploration/search/RoleSet.kt
@@ -26,6 +26,8 @@ value class RoleSet(
     operator fun minus(other: RoleSet): RoleSet = RoleSet(delegate - other.delegate.toSet())
     operator fun contains(role: Role): Boolean = role in delegate
 
+    fun indexOf(role: Role): Int = delegate.indexOf(role)
+
     @Stable
     companion object {
         @Stable
@@ -40,10 +42,17 @@ value class RoleSet(
 /**
  * 过滤 [RelatedPersonInfo] 中的角色, 返回符合条件的 [RelatedPersonInfo]
  */
-fun List<RelatedPersonInfo>.filter(roleSet: RoleSet): Sequence<RelatedPersonInfo> {
-    return asSequence().filter f@{ person ->
+fun Sequence<RelatedPersonInfo>.filter(roleSet: RoleSet): Sequence<RelatedPersonInfo> {
+    return filter f@{ person ->
         person.position in roleSet
     }
 }
 
+fun Sequence<RelatedPersonInfo>.sortedWith(roleSet: RoleSet): Sequence<RelatedPersonInfo> {
+    return sortedBy { person ->
+        val index = roleSet.indexOf(person.position)
+        if (index == -1) Int.MAX_VALUE else index
+    }
+}
+
 typealias Role = PersonPosition
diff --git a/app/shared/ui-exploration/src/commonMain/kotlin/ui/exploration/search/SubjectPreviewItem.kt b/app/shared/ui-exploration/src/commonMain/kotlin/ui/exploration/search/SubjectPreviewItem.kt
@@ -73,9 +73,16 @@ class SubjectPreviewItemInfo(
                 )
             }
             val staff = relatedPersonList?.let {
+                val persons = relatedPersonList.asSequence()
+                    .filter(roleSet)
+                    .sortedWith(roleSet)
+                    .take(4)
+                    .toList()
+
+                if (persons.isEmpty()) return@let null
+
                 buildString {
                     append("制作:  ")
-                    val persons = relatedPersonList.filter(roleSet).take(4).toList()
                     persons.forEachIndexed { index, relatedPersonInfo ->
                         append(relatedPersonInfo.personInfo.displayName)
                         if (index != persons.lastIndex) {
@@ -84,7 +91,7 @@ class SubjectPreviewItemInfo(
                     }
                 }
             }
-            val actors = characters?.let {
+            val actors = characters?.takeIf { it.isNotEmpty() }?.let {
                 buildString {
                     append("配音:  ")