fix: assets loading with mixed <script> tags

fixes 15773
ankidroid · Mar 5, 2024 · 1bc053c · 1bc053c
1 parent a5e9c2b
commit 1bc053c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/TemplateManager.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/TemplateManager.kt
@@ -340,7 +340,7 @@ fun parseVideos(text: String, mediaDir: String): String {
 @NotInLibAnki
 @VisibleForTesting
 fun parseSourcesToFileScheme(content: String, mediaDir: String): String {
-    val doc = Jsoup.parse(content)
+    val doc = Jsoup.parseBodyFragment(content)
     doc.outputSettings(OutputSettings().prettyPrint(false))
 
     fun replaceWithFileScheme(tag: String, attr: String): Boolean {

diff --git a/AnkiDroid/src/test/java/com/ichi2/libanki/TemplateManagerTest.kt b/AnkiDroid/src/test/java/com/ichi2/libanki/TemplateManagerTest.kt
@@ -133,6 +133,33 @@ class TemplateManagerTest {
         assertEquals("""<img src="file:///storage/emulated/0/AnkiDroid@%23$%25/collection.media/magenta.png">""", result)
     }
 
+    @Test
+    fun `parseSourcesToFileScheme - mixed script`() {
+        @Language("HTML")
+        val input = """
+            <!-- VERSION 1.14 -->
+            <script>
+            var scroll = false;
+            </script>
+            <img src="lovely.jpg">
+            <!-- ENHANCED_CLOZE -->
+            hughes and kisses
+        """
+
+        @Language("HTML")
+        val expectedResult = """
+            <!-- VERSION 1.14 -->
+            <script>
+            var scroll = false;
+            </script>
+            <img src="file:///storage/emulated/0/15773/collection.media/lovely.jpg">
+            <!-- ENHANCED_CLOZE -->
+            hughes and kisses
+        """
+        val result = parseSourcesToFileScheme(input, "/storage/emulated/0/15773/collection.media")
+        assertEquals(expectedResult, result)
+    }
+
     /***********************************************************************************************
      * [parseVideos] tests
      **********************************************************************************************/