Parse catalogs and images.

Author: io7m

org.thepalaceproject.opds2.core/src/main/kotlin/org/thepalaceproject/opds2/core/O2Catalog.kt

@@ -0,0 +1,40 @@
+package org.thepalaceproject.opds2.core
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonProperty
+
+/**
+ * The OPDS 2.0 catalog section.
+ */
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class O2Catalog(
+
+  /**
+   * The catalog metadata.
+   */
+
+  @JsonProperty(
+    value = "metadata",
+    required = true
+  )
+  val metadata : O2Metadata,
+
+  /**
+   * The set of catalog links.
+   */
+
+  @JsonProperty(
+    value = "links"
+  )
+  val links : List<O2Link> = listOf(),
+
+  /**
+   * The set of image links.
+   */
+
+  @JsonProperty(
+    value = "images"
+  )
+  val images : List<O2Link> = listOf()
+) : O2Element()

org.thepalaceproject.opds2.core/src/main/kotlin/org/thepalaceproject/opds2/core/O2Feed.kt

@@ -39,11 +39,20 @@ data class O2Feed @JsonCreator constructor(
   val links : List<O2Link> = listOf(),
 
   /**
-   * The feed links
+   * The feed publications
    */
 
   @JsonProperty(
     value = "publications"
   )
-  val publications : List<O2Publication> = listOf()
+  val publications : List<O2Publication> = listOf(),
+
+  /**
+   * The feed catalogs
+   */
+
+  @JsonProperty(
+    value = "catalogs"
+  )
+  val catalogs : List<O2Catalog> = listOf()
 ) : O2Element()

org.thepalaceproject.opds2.core/src/main/kotlin/org/thepalaceproject/opds2/core/O2LinkDeserializer.kt

@@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer
 import one.irradia.mime.api.MIMEType
 import java.net.URI
+import java.net.URISyntaxException
+
 
 class O2LinkDeserializer : StdDeserializer<O2Link>(O2Link::class.java) {
 
@@ -36,11 +38,48 @@ class O2LinkDeserializer : StdDeserializer<O2Link>(O2Link::class.java) {
         relation = raw.relation
       )
     } else {
-      O2LinkBasic(
-        href = URI.create(raw.href),
-        type = raw.type,
-        relation = raw.relation
-      )
+      val input = raw.href
+
+      try {
+        return O2LinkBasic(
+          href = URI(raw.href),
+          type = raw.type,
+          relation = raw.relation
+        )
+      } catch (_ : URISyntaxException) {
+        val colon : Int =
+          input.indexOf(':')
+        if (colon <= 0) {
+          throw URISyntaxException(input, "Missing scheme")
+        }
+
+        val scheme =
+          input.take(colon)
+        val sspAndFrag =
+          input.substring(colon + 1)
+        val hash =
+          sspAndFrag.indexOf('#')
+
+        val schemeSpecific =
+          if (hash >= 0) {
+            sspAndFrag.take(hash)
+          } else {
+            sspAndFrag
+          }
+
+        val frag =
+          if (hash >= 0) {
+            sspAndFrag.substring(hash + 1)
+          } else {
+            null
+          }
+
+        return O2LinkBasic(
+          href = URI(scheme, schemeSpecific, frag),
+          type = raw.type,
+          relation = raw.relation
+        )
+      }
     }
   }
 }

org.thepalaceproject.opds2.core/src/main/kotlin/org/thepalaceproject/opds2/core/O2Module.kt

@@ -16,6 +16,7 @@ object O2Module {
       .allowClass(Double::class.javaPrimitiveType)
       .allowClass(Int::class.javaPrimitiveType)
       .allowClass(MIMEType::class.java)
+      .allowClass(O2Catalog::class.java)
       .allowClass(O2Feed::class.java)
       .allowClass(O2Link::class.java)
       .allowClass(O2LinkDeserializer.O2LinkRaw::class.java)
@@ -28,6 +29,7 @@ object O2Module {
       .allowClass(String::class.java)
       .allowClass(URI::class.java)
       .allowClassName("java.util.List<java.lang.String>")
+      .allowClassName("java.util.List<org.thepalaceproject.opds2.core.O2Catalog>")
       .allowClassName("java.util.List<org.thepalaceproject.opds2.core.O2Link>")
       .allowClassName("java.util.List<org.thepalaceproject.opds2.core.O2NavigationLink>")
       .allowClassName("java.util.List<org.thepalaceproject.opds2.core.O2Publication>")

org.thepalaceproject.opds2.core/src/main/kotlin/org/thepalaceproject/opds2/core/O2Publication.kt

@@ -28,5 +28,14 @@ data class O2Publication @JsonCreator constructor(
   @JsonProperty(
     value = "links"
   )
-  val links : List<O2Link> = listOf()
+  val links : List<O2Link> = listOf(),
+
+  /**
+   * The set of image links.
+   */
+
+  @JsonProperty(
+    value = "images"
+  )
+  val images : List<O2Link> = listOf()
 ) : O2Element()

org.thepalaceproject.opds2.tests/pom.xml

@@ -34,6 +34,10 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>net.jqwik</groupId>

org.thepalaceproject.opds2.tests/src/main/kotlin/org/thepalaceproject/opds2/tests/O2FeedTest.kt

@@ -1,6 +1,7 @@
 package org.thepalaceproject.opds2.tests
 
 import com.fasterxml.jackson.databind.json.JsonMapper
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
@@ -30,6 +31,23 @@ class O2FeedTest {
         this.resource("groups-20250821.json"),
         O2Feed::class.java
       )
+
+    assertEquals(0, feed.catalogs.size)
+    assertEquals(14, feed.links.size)
+    assertEquals(217, feed.publications.size)
+  }
+
+  @Test
+  fun testRegistry20250826() {
+    val feed =
+      this.mapper.readValue<O2Feed>(
+        this.resource("registry-20250826.json"),
+        O2Feed::class.java
+      )
+
+    assertEquals(708, feed.catalogs.size)
+    assertEquals(4, feed.links.size)
+    assertEquals(0, feed.publications.size)
   }
 
   private fun resource(