Updated epub lib

Author: LagradOst

app/build.gradle

@@ -22,7 +22,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 35
         versionCode 56
-        versionName "3.3.5"
+        versionName "3.3.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -45,12 +45,12 @@ android {
     buildFeatures.buildConfig true
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_9
+        targetCompatibility JavaVersion.VERSION_1_9
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_1_9.toString()
     }
     namespace 'com.lagradost.quicknovel'
 }
@@ -82,10 +82,10 @@ dependencies {
     implementation "androidx.preference:preference-ktx:1.2.1"
     implementation "me.xdrop:fuzzywuzzy:1.4.0"
 
-    implementation('io.documentnode:epub4j-core:4.2.1') {
-        exclude group: 'org.slf4j'
-        exclude group: 'xmlpull'
-    }
+    //implementation('com.positiondev.epublib:epublib-core:3.1') {
+        //exclude group: 'org.slf4j'
+        //exclude group: 'xmlpull'
+    //}
     implementation 'org.slf4j:slf4j-android:1.7.25'
 
     implementation "androidx.recyclerview:recyclerview:1.4.0"

app/src/main/java/com/lagradost/quicknovel/BookDownloader2.kt

@@ -56,12 +56,12 @@ import com.lagradost.quicknovel.util.Event
 import com.lagradost.quicknovel.util.ResultCached
 import com.lagradost.quicknovel.util.UIHelper.colorFromAttribute
 import com.lagradost.quicknovel.util.pmap
-import io.documentnode.epub4j.domain.Author
-import io.documentnode.epub4j.domain.Book
-import io.documentnode.epub4j.domain.MediaType
-import io.documentnode.epub4j.domain.MediaTypes
-import io.documentnode.epub4j.domain.Resource
-import io.documentnode.epub4j.epub.EpubWriter
+import me.ag2s.epublib.domain.Author
+import me.ag2s.epublib.domain.EpubBook
+import me.ag2s.epublib.domain.MediaType
+import me.ag2s.epublib.domain.Resource
+import me.ag2s.epublib.epub.EpubWriter
+import me.ag2s.epublib.domain.MediaTypes
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.sync.Mutex
@@ -680,7 +680,7 @@ object BookDownloader2Helper {
                 setKey(DOWNLOAD_EPUB_SIZE, id.toString(), 1)
             } else {
 
-                val book = Book()
+                val book = EpubBook()
                 val metadata = book.metadata
                 if (author != null) {
                     metadata.addAuthor(Author(author))

app/src/main/java/com/lagradost/quicknovel/ReadActivity2.kt

@@ -930,18 +930,26 @@ class ReadActivity2 : AppCompatActivity(), ColorPickerDialogListener {
             }
         }
 
+        var last: Resource<Boolean> = Resource.Loading() // very dirty
         observe(viewModel.loadingStatus) { loading ->
+            val different = last != loading
+            last = loading
             when (loading) {
                 is Resource.Success -> {
                     binding.readLoading.isVisible = false
                     binding.readFail.isVisible = false
 
                     binding.readNormalLayout.isVisible = true
-                    binding.readNormalLayout.alpha = 0.01f
 
-                    ObjectAnimator.ofFloat(binding.readNormalLayout, "alpha", 1f).apply {
-                        duration = 300
-                        start()
+                    if (different) {
+                        binding.readNormalLayout.alpha = 0.01f
+
+                        ObjectAnimator.ofFloat(binding.readNormalLayout, "alpha", 1f).apply {
+                            duration = 300
+                            start()
+                        }
+                    } else {
+                        binding.readNormalLayout.alpha = 1.0f
                     }
                 }
 
@@ -1068,6 +1076,7 @@ class ReadActivity2 : AppCompatActivity(), ColorPickerDialogListener {
         observe(viewModel.chapter) { chapter ->
             cachedChapter = chapter.data
             textAdapter.submitList(chapter.data) {
+                viewModel._loadingStatus.postValue(Resource.Success(true)) // submitList can take 500ms, very dirty :(
                 if (chapter.seekToDesired) {
                     scrollToDesired()
                 }

app/src/main/java/com/lagradost/quicknovel/ReadActivityViewModel.kt

@@ -82,9 +82,10 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import io.documentnode.epub4j.domain.Book
-import io.documentnode.epub4j.domain.TOCReference
-import io.documentnode.epub4j.epub.EpubReader
+import me.ag2s.epublib.domain.EpubBook
+import me.ag2s.epublib.domain.TOCReference
+import me.ag2s.epublib.epub.EpubReader
+import me.ag2s.epublib.util.zip.AndroidZipFile
 import org.commonmark.node.Node
 import org.jsoup.Jsoup
 import java.io.File
@@ -285,7 +286,7 @@ class QuickBook(val data: QuickStreamData) : AbstractBook() {
     }
 }
 
-class RegularBook(val data: Book) : AbstractBook() {
+class RegularBook(val data: EpubBook) : AbstractBook() {
     init {
         var refs = mutableListOf<TOCReference>()
         data.tableOfContents.tocReferences.forEach { ref ->
@@ -429,7 +430,7 @@ class ReadActivityViewModel : ViewModel() {
     val chapter: LiveData<ChapterUpdate> = _chapterData
 
     // we use bool as we cant construct Nothing, does not represent anything
-    private val _loadingStatus: MutableLiveData<Resource<Boolean>> =
+    val _loadingStatus: MutableLiveData<Resource<Boolean>> =
         MutableLiveData<Resource<Boolean>>(null)
     val loadingStatus: LiveData<Resource<Boolean>> = _loadingStatus
 
@@ -1008,9 +1009,9 @@ class ReadActivityViewModel : ViewModel() {
         // update what we have read
         updateReadArea()
 
-        _loadingStatus.postValue(
+        /*_loadingStatus.postValue(
             Resource.Success(true)
-        )
+        )*/
     }
 
     private suspend fun initMLFromSettings(settings: MLSettings, allowDownload: Boolean) {
@@ -1055,15 +1056,17 @@ class ReadActivityViewModel : ViewModel() {
             if (intent == null) throw ErrorLoadingException("No intent")
 
             val data = intent.data ?: throw ErrorLoadingException("Empty intent")
-            val input = context.contentResolver.openInputStream(data)
-                ?: throw ErrorLoadingException("Empty data")
             val isFromEpub = intent.type != "quickstream"
 
             val epub = if (isFromEpub) {
-                val epubReader = EpubReader()
-                val book = epubReader.readEpub(input)
+                val fd = context.contentResolver.openFileDescriptor(data, "r")
+                    ?: throw ErrorLoadingException("Unable to open file descriptor")
+                val zipFile = AndroidZipFile(fd, "")
+                val book = EpubReader().readEpubLazy(zipFile, "utf-8")
                 RegularBook(book)
             } else {
+                val input = context.contentResolver.openInputStream(data)
+                    ?: throw ErrorLoadingException("Empty data")
                 QuickBook(DataStore.mapper.readValue(input.reader().readText()))
             }
 
@@ -1092,7 +1095,13 @@ class ReadActivityViewModel : ViewModel() {
 
                 // we the current loaded thing here, but because loadedChapter can be >= book.size (expand) we have to check
                 if (loadedChapterIndex < book.size()) {
-                    _loadingStatus.postValue(Resource.Loading(book.getLoadingStatus(loadedChapterIndex)))
+                    _loadingStatus.postValue(
+                        Resource.Loading(
+                            book.getLoadingStatus(
+                                loadedChapterIndex
+                            )
+                        )
+                    )
                 }
 
                 currentIndex = loadedChapterIndex
@@ -1129,9 +1138,9 @@ class ReadActivityViewModel : ViewModel() {
                 // notify once because initial load is 3 chapters I don't care about 10 notifications when the user cant see it
                 updateReadArea(seekToDesired = true)
 
-                _loadingStatus.postValue(
+                /*_loadingStatus.postValue(
                     Resource.Success(true)
-                )
+                )*/
             }
 
             is Resource.Failure -> {
@@ -1578,7 +1587,6 @@ class ReadActivityViewModel : ViewModel() {
 
         // load the chapters
         updateIndexAsync(index, notify = false)
-
         // set the keys
         setKey(EPUB_CURRENT_POSITION, book.title(), index)
         setKey(EPUB_CURRENT_POSITION_SCROLL_CHAR, book.title(), 0)
@@ -1590,10 +1598,9 @@ class ReadActivityViewModel : ViewModel() {
 
         // push the update
         updateReadArea(seekToDesired = true)
-
         // update the view
         _chapterTile.postValue(chaptersTitlesInternal[index])
-        _loadingStatus.postValue(Resource.Success(true))
+        //_loadingStatus.postValue(Resource.Success(true))
     }
 
     /*private fun changeIndex(index: Int, updateArea: Boolean = true) {

app/src/main/java/me/ag2s/LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.