Merge pull request #143 from andannn/detail_page_ndc

andannn · web-flow · commit d91c43ef945d · 2025-07-18T11:16:50.000+09:00
Detail page ndc
diff --git a/core/data/src/commonMain/kotlin/me/andannn/aozora/core/data/mapper/BookEntityMapper.kt b/core/data/src/commonMain/kotlin/me/andannn/aozora/core/data/mapper/BookEntityMapper.kt
@@ -8,6 +8,7 @@ import me.andannn.aozora.core.database.entity.BookEntity
 import me.andannn.aozora.core.domain.model.AozoraBookCard
 import me.andannn.aozora.core.domain.model.AuthorData
 import me.andannn.aozora.core.domain.model.StaffData
+import me.andannn.aozora.core.domain.model.asNDCClassification
 
 internal fun BookEntity.toModel() =
     AozoraBookCard(
@@ -19,7 +20,7 @@ internal fun BookEntity.toModel() =
         zipUrl = textFileUrl,
         htmlUrl = htmlFileUrl,
         authorUrl = null,
-        category = categoryNo,
+        categories = categoryNo?.asNDCClassification() ?: emptyList(),
         source = firstAppearance,
         characterType = orthography,
         haveCopyRight = this.workCopyrightFlag == "あり",
diff --git a/core/domain/src/commonMain/kotlin/me/andannn/aozora/core/domain/model/AozoraBookCard.kt b/core/domain/src/commonMain/kotlin/me/andannn/aozora/core/domain/model/AozoraBookCard.kt
@@ -19,10 +19,10 @@ data class AozoraBookCard constructor(
     val zipUrl: String?,
     val subTitle: String? = null,
     val htmlUrl: String? = null,
-    val category: String? = null,
     val source: String? = null,
     val characterType: String? = null,
     val staffData: StaffData? = null,
+    val categories: List<NDCClassification> = emptyList(),
     val authorDataList: List<AuthorData>,
 )
 
diff --git a/core/domain/src/commonMain/kotlin/me/andannn/aozora/core/domain/model/NdcData.kt b/core/domain/src/commonMain/kotlin/me/andannn/aozora/core/domain/model/NdcData.kt
@@ -4,6 +4,7 @@
  */
 package me.andannn.aozora.core.domain.model
 
+import io.github.aakira.napier.Napier
 import kotlin.jvm.JvmInline
 
 data class NdcData(
@@ -70,3 +71,31 @@ fun NDCClassification.isChildOf(other: NDCClassification): Boolean =
                 this.mainClassNum == other.mainClassNum &&
                 this.divisionNum == other.divisionNum
     }
+
+/**
+ * Parses the NDC classification from a string.
+ *
+ * Patterns:
+ * - "NDC 931" -> [NDCClassification("931")]
+ * - "NDC 931 123" -> [NDCClassification("931"), NDCClassification("123")]
+ */
+fun String.asNDCClassification(): List<NDCClassification> =
+    split(" ")
+        .let { splitList ->
+            if (splitList.size >= 2) {
+                splitList
+                    .subList(1, splitList.size)
+                    .filter { it.isNotBlank() && it.isNotEmpty() }
+                    .map {
+                        NDCClassification(it.parseDigits())
+                    }
+            } else {
+                Napier.e { "Invalid NDC classification format: $this" }
+                emptyList()
+            }
+        }
+
+private fun String.parseDigits() =
+    this.filter {
+        it.isDigit()
+    }
diff --git a/core/domain/src/commonMain/kotlin/me/andannn/aozora/core/domain/pagesource/BookPageSource.kt b/core/domain/src/commonMain/kotlin/me/andannn/aozora/core/domain/pagesource/BookPageSource.kt
@@ -18,6 +18,10 @@ import me.andannn.aozora.core.domain.model.TableOfContentsModel
 val LocalBookPageSource: ProvidableCompositionLocal<BookPageSource> =
     compositionLocalOf { error("no book source") }
 
+class SourceNotFoundException(
+    override val cause: Throwable?,
+) : Exception("Book source not found", cause)
+
 /**
  * Book page source.
  */
@@ -27,7 +31,8 @@ interface BookPageSource {
      *
      * @param pageMetaData page meta data.
      * @param readingProgress initial start progress of book page source. every 64 bytes is One Unit of progress.
-     * @throws Exception when error occurred.
+     * @throws SourceNotFoundException when error occurred.
+     * @throws CopyRightRetainedException when try to download source with copyright.
      */
     fun getPagerSnapShotFlow(
         pageMetaData: PageMetaData,
@@ -36,11 +41,15 @@ interface BookPageSource {
 
     /**
      * get book meta. return empty list when error occurred.
+     * @throws SourceNotFoundException when error occurred.
+     * @throws CopyRightRetainedException when try to download source with copyright.
      */
     suspend fun getTableOfContents(): List<TableOfContentsModel>
 
     /**
      * get total block count. return null when error occurred.
+     * @throws SourceNotFoundException when error occurred.
+     * @throws CopyRightRetainedException when try to download source with copyright.
      */
     suspend fun getTotalBlockCount(): Int?
 
diff --git a/core/domain/src/commonTest/kotlin/me/andannn/aozora/core/domain/model/NDCClassificationTest.kt b/core/domain/src/commonTest/kotlin/me/andannn/aozora/core/domain/model/NDCClassificationTest.kt
@@ -5,6 +5,7 @@
 package me.andannn.aozora.core.domain.model
 
 import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlin.test.assertFails
 import kotlin.test.assertTrue
 
@@ -62,4 +63,26 @@ class NDCClassificationTest {
         assertTrue(!section.isChildOf(section))
         assertTrue(!mainClass.isChildOf(mainClass))
     }
+
+    @Test
+    fun testParseStringAsNDCClassification() {
+        val input1 = "NDC 931"
+        val input2 = "NDC 931 123"
+        val input3 = "NDC K726"
+        val input4 = "NDC 369 453 524"
+
+        val result1 = input1.asNDCClassification()
+        val result2 = input2.asNDCClassification()
+        val result3 = input3.asNDCClassification()
+        val result4 = input4.asNDCClassification()
+
+        assertEquals(1, result1.size)
+        assertEquals("931", result1[0].value)
+        assertEquals(2, result2.size)
+        assertEquals("931", result2[0].value)
+        assertEquals("123", result2[1].value)
+        assertEquals(1, result3.size)
+        assertEquals("726", result3[0].value)
+        assertEquals(3, result4.size)
+    }
 }
diff --git a/core/pagesource/src/commonMain/kotlin/me/andannn/aozora/core/pagesource/measure/Measurer.kt b/core/pagesource/src/commonMain/kotlin/me/andannn/aozora/core/pagesource/measure/Measurer.kt
@@ -19,13 +19,13 @@ import kotlin.math.ceil
 import kotlin.math.floor
 import kotlin.math.min
 
-data class ElementMeasureResult(
+internal data class ElementMeasureResult(
     val widthDp: Dp,
     val heightDp: Dp,
     val fontStyle: FontStyle? = null,
 )
 
-data class BlockMeasureResult(
+internal data class BlockMeasureResult(
     val lineCount: Int,
     val lineHeightDpPerLine: Dp,
     val availableTextCountPerLine: Int,
@@ -39,7 +39,7 @@ internal fun interface BlockMeasurer {
     fun measure(block: AozoraBlock): BlockMeasureResult
 }
 
-fun interface ElementMeasurer {
+internal fun interface ElementMeasurer {
     fun measure(
         element: AozoraElement,
         style: AozoraTextStyle?,
diff --git a/core/pagesource/src/commonMain/kotlin/me/andannn/aozora/core/pagesource/parser/html/matchers/SpecialParagraphMatcher.kt b/core/pagesource/src/commonMain/kotlin/me/andannn/aozora/core/pagesource/parser/html/matchers/SpecialParagraphMatcher.kt
@@ -10,7 +10,7 @@ import me.andannn.aozora.core.domain.model.AozoraElement
 import me.andannn.aozora.core.pagesource.parser.html.ElementMatcher
 import me.andannn.aozora.core.pagesource.parser.html.parseAsAozoraElements
 
-object SpecialParagraphMatcher : ElementMatcher {
+internal object SpecialParagraphMatcher : ElementMatcher {
     override fun match(node: Node): AozoraElement? {
         if (node !is Element) return null
         if (node.tagName() != "div") return null
diff --git a/core/pagesource/src/commonMain/kotlin/me/andannn/aozora/core/pagesource/raw/RemoteOrLocalCacheBookRawSource.kt b/core/pagesource/src/commonMain/kotlin/me/andannn/aozora/core/pagesource/raw/RemoteOrLocalCacheBookRawSource.kt
@@ -31,6 +31,7 @@ import me.andannn.aozora.core.domain.exceptions.CopyRightRetainedException
 import me.andannn.aozora.core.domain.exceptions.DownloadBookFailedException
 import me.andannn.aozora.core.domain.model.AozoraBookCard
 import me.andannn.aozora.core.domain.model.AozoraElement
+import me.andannn.aozora.core.domain.pagesource.SourceNotFoundException
 import me.andannn.aozora.core.pagesource.page.AozoraBlock
 import me.andannn.aozora.core.pagesource.parser.DefaultAozoraBlockParser
 import me.andannn.aozora.core.pagesource.parser.html.HtmlLineParser
@@ -61,9 +62,12 @@ internal class RemoteOrLocalCacheBookRawSource(
             try {
                 bookModelStateFlow.value =
                     SourceState.Success(createBookRawSource(card, cacheDictionary))
+            } catch (e: CopyRightRetainedException) {
+                Napier.e { "CopyRightRetainedException thrown when create book raw source. $e" }
+                bookModelStateFlow.value = SourceState.Error(e)
             } catch (e: Exception) {
                 Napier.e { "Exception thrown when create book raw source. $e" }
-                bookModelStateFlow.value = SourceState.Error(e)
+                bookModelStateFlow.value = SourceState.Error(SourceNotFoundException(cause = e))
             }
         }
     }
diff --git a/core/syncer/src/commonMain/kotlin/me/andannn/aozora/syncer/internal/util/NdcParserUtil.kt b/core/syncer/src/commonMain/kotlin/me/andannn/aozora/syncer/internal/util/NdcParserUtil.kt
@@ -4,10 +4,9 @@
  */
 package me.andannn.aozora.syncer.internal.util
 
-import io.github.aakira.napier.Napier
 import me.andannn.aozora.core.database.entity.BookEntity
 import me.andannn.aozora.core.database.entity.BookIdWithBookCategory
-import me.andannn.aozora.core.domain.model.NDCClassification
+import me.andannn.aozora.core.domain.model.asNDCClassification
 
 internal fun BookEntity.parseAsBookIdWithBookCategory(): List<BookIdWithBookCategory> {
     val parsed = categoryNo?.asNDCClassification() ?: emptyList()
@@ -21,31 +20,3 @@ internal fun BookEntity.parseAsBookIdWithBookCategory(): List<BookIdWithBookCate
         )
     }
 }
-
-/**
- * Parses the NDC classification from a string.
- *
- * Patterns:
- * - "NDC 931" -> [NDCClassification("931")]
- * - "NDC 931 123" -> [NDCClassification("931"), NDCClassification("123")]
- */
-internal fun String.asNDCClassification(): List<NDCClassification> =
-    split(" ")
-        .let { splitList ->
-            if (splitList.size >= 2) {
-                splitList
-                    .subList(1, splitList.size)
-                    .filter { it.isNotBlank() && it.isNotEmpty() }
-                    .map {
-                        NDCClassification(it.parseDigits())
-                    }
-            } else {
-                Napier.e { "Invalid NDC classification format: $this" }
-                emptyList()
-            }
-        }
-
-private fun String.parseDigits() =
-    this.filter {
-        it.isDigit()
-    }
diff --git a/core/syncer/src/commonTest/kotlin/me/andannn/aozora/syncer/internal/util/NdcParserUtilTest.kt b/core/syncer/src/commonTest/kotlin/me/andannn/aozora/syncer/internal/util/NdcParserUtilTest.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -56,7 +56,6 @@ kotlinx-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.re
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
 okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
-ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
 ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
 ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
 ktor-client-resources = { module = "io.ktor:ktor-client-resources", version.ref = "ktor" }
diff --git a/ui/common/src/androidMain/kotlin/me/andannn/aozora/ui/common/widgets/BookColumnItemView.android.kt b/ui/common/src/androidMain/kotlin/me/andannn/aozora/ui/common/widgets/BookColumnItemView.android.kt
@@ -25,7 +25,6 @@ private fun BookColumnItemViewPreview() {
                     zipUrl = null,
                     subTitle = "subTitle",
                     htmlUrl = null,
-                    category = null,
                     source = null,
                     characterType = null,
                     staffData = null,
diff --git a/ui/feature/src/commonMain/kotlin/me/andannn/aozora/ui/feature/bookcard/BookCard.kt b/ui/feature/src/commonMain/kotlin/me/andannn/aozora/ui/feature/bookcard/BookCard.kt
@@ -35,6 +35,7 @@ import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.unit.dp
 import io.github.aakira.napier.Napier
 import me.andannn.aozora.core.domain.model.AozoraBookCard
+import me.andannn.aozora.core.domain.model.NDCClassification
 import me.andannn.aozora.ui.common.widgets.BannerAdView
 import me.andannn.aozora.ui.common.widgets.ClickableOrText
 import me.andannn.aozora.ui.common.widgets.Heading
@@ -53,6 +54,7 @@ fun BookCard(
     BookCardContent(
         modifier = modifier,
         bookCardInfo = state.bookCardInfo,
+        ndcClassificationToDescription = state.ndcClassificationToDescription,
         isAddedToShelf = state.isAddedToShelf,
         onEvent = state.evenSink,
     )
@@ -63,6 +65,7 @@ fun BookCard(
 private fun BookCardContent(
     modifier: Modifier = Modifier,
     bookCardInfo: AozoraBookCard?,
+    ndcClassificationToDescription: Map<NDCClassification, String>,
     isAddedToShelf: Boolean,
     onEvent: (BookCardUiEvent) -> Unit = {},
 ) {
@@ -165,9 +168,13 @@ private fun BookCardContent(
             }
 
             item {
-                bookCardInfo.category?.let {
-                    ItemRow(title = "分類：", value = it)
-                }
+                NdcCategoryRow(
+                    title = "分類：",
+                    ndcClassificationToDescription = ndcClassificationToDescription,
+                    onNdcClick = { ndcClassification ->
+                        onEvent.invoke(BookCardUiEvent.OnNdcClick(ndcClassification))
+                    },
+                )
                 bookCardInfo.source?.let {
                     ItemRow(title = "初出：", value = it)
                 }
@@ -176,7 +183,10 @@ private fun BookCardContent(
                 }
                 bookCardInfo.takeIf { it.haveCopyRight }?.let {
                     Text(
-                        modifier = modifier.fillMaxWidth().padding(vertical = 4.dp, horizontal = 12.dp),
+                        modifier =
+                            modifier
+                                .fillMaxWidth()
+                                .padding(vertical = 4.dp, horizontal = 12.dp),
                         text = "＊著作権存続＊",
                         color = MaterialTheme.colorScheme.error,
                     )
@@ -284,3 +294,34 @@ private fun BookCardContent(
         }
     }
 }
+
+@Composable
+private fun NdcCategoryRow(
+    modifier: Modifier = Modifier,
+    title: String,
+    ndcClassificationToDescription: Map<NDCClassification, String>,
+    onNdcClick: (NDCClassification) -> Unit = {},
+) {
+    Row(
+        modifier = modifier.fillMaxWidth().padding(vertical = 4.dp, horizontal = 12.dp),
+    ) {
+        Text(
+            modifier = Modifier.weight(1f),
+            text = title,
+            color = MaterialTheme.colorScheme.inverseSurface,
+        )
+
+        Column(
+            modifier = Modifier.weight(2f),
+        ) {
+            ndcClassificationToDescription.forEach { (ndcClassification, description) ->
+                ClickableOrText(
+                    value = description,
+                    onClick = {
+                        onNdcClick.invoke(ndcClassification)
+                    },
+                )
+            }
+        }
+    }
+}
diff --git a/ui/feature/src/commonMain/kotlin/me/andannn/aozora/ui/feature/bookcard/BookCardPresenter.kt b/ui/feature/src/commonMain/kotlin/me/andannn/aozora/ui/feature/bookcard/BookCardPresenter.kt
diff --git a/ui/feature/src/commonMain/kotlin/me/andannn/aozora/ui/feature/reader/viewer/BookViewerPresenter.kt b/ui/feature/src/commonMain/kotlin/me/andannn/aozora/ui/feature/reader/viewer/BookViewerPresenter.kt
