Add SVG support (PP-2691).

Author: io7m

README-CHANGES.xml

@@ -194,8 +194,14 @@
         </c:change>
       </c:changes>
     </c:release>
-    <c:release date="2025-01-13T20:49:03+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="6.8.0">
-      <c:changes/>
+    <c:release date="2025-08-18T11:42:05+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="6.8.0">
+      <c:changes>
+        <c:change date="2025-08-18T11:42:05+00:00" summary="Add SVG support.">
+          <c:tickets>
+            <c:ticket id="PP-2691"/>
+          </c:tickets>
+        </c:change>
+      </c:changes>
     </c:release>
   </c:releases>
   <c:ticket-systems>

org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Controller.kt

@@ -53,6 +53,9 @@ import org.readium.r2.shared.util.ErrorException
 import org.readium.r2.shared.util.Try
 import org.readium.r2.shared.util.Url
 import org.readium.r2.shared.util.asset.AssetRetriever
+import org.readium.r2.shared.util.asset.DefaultArchiveOpener
+import org.readium.r2.shared.util.asset.DefaultFormatSniffer
+import org.readium.r2.shared.util.asset.DefaultResourceFactory
 import org.readium.r2.shared.util.data.asInputStream
 import org.readium.r2.shared.util.getOrElse
 import org.readium.r2.shared.util.http.DefaultHttpClient
@@ -120,7 +123,13 @@ internal class SR2Controller private constructor(
       val httpClient =
         DefaultHttpClient(userAgent = "${BuildConfig.LIBRARY_PACKAGE_NAME}/${BuildConfig.R2_VERSION_NAME}")
       val assetRetriever =
-        AssetRetriever(context.contentResolver, httpClient)
+        AssetRetriever(
+          DefaultResourceFactory(context.contentResolver, httpClient),
+          DefaultArchiveOpener(),
+          DefaultFormatSniffer(
+            listOf(SVGSniffer()),
+          ),
+        )
 
       val publicationParser =
         DefaultPublicationParser(

org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SVGSniffer.kt

@@ -0,0 +1,32 @@
+package org.librarysimplified.r2.vanilla.internal
+
+import org.readium.r2.shared.util.FileExtension
+import org.readium.r2.shared.util.format.Format
+import org.readium.r2.shared.util.format.FormatHints
+import org.readium.r2.shared.util.format.FormatSniffer
+import org.readium.r2.shared.util.format.FormatSpecification
+import org.readium.r2.shared.util.format.Specification
+import org.readium.r2.shared.util.mediatype.MediaType
+
+class SVGSniffer : FormatSniffer {
+
+  private object Svg : Specification
+
+  private val svgFormat = Format(
+    specification = FormatSpecification(Svg),
+    fileExtension = FileExtension("svg"),
+    mediaType = MediaType.SVG,
+  )
+
+  override fun sniffHints(
+    hints: FormatHints,
+  ): Format? {
+    if (
+      hints.hasFileExtension("svg") ||
+      hints.hasMediaType(MediaType.SVG.toString())
+    ) {
+      return this.svgFormat
+    }
+    return null
+  }
+}