Automatic merge branch 'current-stable' into 'develop'

AndBible · Nov 4, 2023 · 6334da1 · 6334da1
2 parents 791033f + 8263786
commit 6334da1
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/app/src/main/java/net/bible/service/sword/epub/EpubOptimization.kt b/app/src/main/java/net/bible/service/sword/epub/EpubOptimization.kt
@@ -37,6 +37,9 @@ import java.net.URLDecoder
 import java.util.zip.GZIPOutputStream
 
 private val urlRe = Regex("""^https?://.*""")
+
+const val EPUB_OPTIMIZER_VERSION = 2
+
 fun EpubBackendState.readOriginal(origId: String): Pair<Document?, Int> {
     val file = fileForOriginalId(origId)?: return Pair(null, 0)
     val parentFolder = file.parentFile!!
@@ -232,7 +235,9 @@ fun EpubBackendState.optimizeEpub() {
         val (origDocument, maxOrdinal) = readOriginal(k)
         origDocument ?: continue
 
-        val fragments = splitIntoFragments(k, origDocument, maxOrdinal)
+        val fragments = splitIntoFragments(k, origDocument, maxOrdinal).let {
+            it.ifEmpty{ listOf(EpubFragment(k, 0, 0).apply { element = origDocument.rootElement }) }
+        }
         val ids = writeDao.insert(*fragments.toTypedArray())
         for((id, frag) in ids.zip(fragments)) {
             frag.id = id
@@ -257,6 +262,10 @@ fun EpubBackendState.optimizeEpub() {
         }
         fileForOriginalId(k)?.delete()
     }
+    val versionFile = File(fragDir, "version.txt")
+    versionFile.outputStream().use {
+        it.write("$EPUB_OPTIMIZER_VERSION".toByteArray())
+    }
     val total = (System.currentTimeMillis() - start) / 1000
     writeDb.close()
     optimizeLockFile.delete()