Desktop app (#308)
* Implement build profiles and feature policy for offline desktop builds * Introduce unified cross-platform Settings Hub * Refactor main settings into a hierarchical page-based navigation model * Refactor library projection to use shared multiplatform logic * Refactor UI state consumption by removing intermediate screen models * Introduce AndroidSharedStateBridge to centralize state mapping and reduction logic * Refactor state management for tabs, selection, and pinning to use shared bridge logic * Refactor file type management and validation into a centralized shared module * Centralize file type resolution and improve handling of unknown types * Centralize book import logic with SharedImportPlanner * Refactor magnifier geometry logic and coordinate mapping * Properly handle orientation changes in scroll-locked PDF reader * Add screen orientation controls to EPUB and PDF readers * Implement right-to-left (RTL) pagination support and refactor reader menus * Separate right-to-left pagination settings for PDF and EPUB * Ensure PDF page data is scoped by document key for multi tab support * Implement theme-aware link styling for the epub reader * Implement jump history for back and forward navigation in the epub reader * Improve locator handling and navigation logic in paginated reader mode * Implement stable pagination navigation and location tracking * Centralize banner message management and auto-dismiss logic in MainViewModel * Implement zoom and pan state preservation for PDF pan lock mode * Enhance reader navigation UI and workspace layout management in desktop app * Refactor reader navigation sidebar and relocate search controls in desktop app * Enhance reader UI with redesigned selection menus and bottom sheet overlays * Implement custom highlight palettes and reader theme customization in desktop app * Implement cross-platform modal layer and refine reader UI styling * Improve highlight accuracy and implement metadata enrichment on book open in desktop app * Implement two-page spread layout for paginated reader on desktop * Implement persistent caching for book loading and pagination in desktop app * Implement persistent caching for book loading and pagination in desktop app * Optimize reader settings updates by separating layout and appearance changes in desktop app * Improve desktop window branding and native Windows styling * Enhance reader selection interactions and UI across EPUB and PDF viewers in desktop app * Refine selection handle positioning and interaction logic * Implement EPUB selection debug logging and improve handle targeting * Optimize desktop book loading performance and UI responsiveness * Implement anchored zoom gestures and rendering optimizations for the Desktop PDF viewer. * Implement smooth zoom preview for the PDF reader in desktop app * Optimize PDF rendering performance and responsiveness in the desktop reader * Implement conditional diagnostic logging and update desktop build configuration * Implemented hierarchical TOC, custom scrollbars, and improved desktop modal handling * Added management options for annotations and highlights in the sidebar in desktop app * Implemented `SharedStableOutlinedTextField` and updated text input fields to use `TextFieldValue` for improved cursor and selection stability. * Refined library filters and enhanced OPDS functionality in desktop app * Improved EPUB pagination measurement and implemented layout diagnostic logging for desktop app * Added PPTX support including document parsing, rendering, and indexing * Improved PPTX rendering and layout accuracy * Implemented text autofit support for PPTX rendering * Enhanced PPTX rendering with support for custom geometry, automatic numbering, table styles, and image opacity * Improved EPUB pagination accuracy and added layout telemetry in desktop app * Improved folder synchronization with metadata-only mode and hashed sidecar management in desktop app * Implemented rich text font scaling and migrated desktop ink tools to custom pointer input handling * Implemented billing account obfuscation * Implemented hierarchical folder navigation and improved library selection functionality in desktop app * Implemented platform-aware directory resolution and multi-platform native library support for desktop * Added full-screen mode for the reader workspace * Added PDF zoom indicator and interactive vertical scrollbar with page tooltips * Refactored speech bubble prefetching to use a limited radius and improved ML detector initialization and lifecycle management * Updated PDF indexing to replace existing page text and removed search result item keys * Implemented "preparing" foreground notification for TTS service * Optimized PDF rendering performance by pre-calculating page-specific annotations * Refactored desktop packaging tasks and improved distribution configuration * Optimized EPUB parser memory usage and added path traversal protection * Refactored WorkManager monitoring logic and added work pruning * Implemented comprehensive resource cleanup and memory management for WebView-based components to prevent memory leaks * Implemented bitmap size limits and scaling to prevent canvas rendering errors * Split long text paragraphs into multiple semantic blocks during HTML parsing * Implemented local ActionMode for text selection to prevent platform crashes * Refactored PPTX text layout, optimized HtmlParser block detection, and improved banner dismissal logic * Added desktop startup splash screen and deferred WebView initialization * Reorganized settings hub and added separate PDF reader defaults * Implemented embedded cover extraction and metadata support for MOBI and FB2 formats * Implemented batching for MetadataExtractionWorker and optimized EPUB metadata extraction performance. * Implemented procedurally generated book covers and replaced static placeholders * Redesigned search UI with a top bar and results overlay in desktop app * Added PDF page gap and overlay visibility options and implemented DesktopBookImporter * Refactored PDF reader UI with tabbed inspector and improved theme background handling in desktop * Implemented PDF viewport persistence for zoom and scroll positions in desktop app * Improved desktop fullscreen implementation and state restoration * Implemented desktop window state persistence * Implemented flavor-based branding and ProGuard configuration for desktop builds * Implemented precise reader positioning and improved highlight rendering logic in desktop app * Added support for user-editable book metadata * Enhanced book metadata support and integrated info/edit dialogs * Implemented embedded EPUB metadata editing * Improved highlight mapping and added custom scrollbar styling for the reader. * Reduced desktop WebView bundle size by excluding unused locales and runtime files * Added neutral pan mode as the default PDF interaction state. * Refactored library empty states and updated primary navigation tabs in desktop app * Implemented native paginated reader and unified content rendering architecture in desktop epub reader * Implemented native EPUB image rendering for desktop and improved block layout spacing with margin collapsing. * Improved pagination overflow detection in desktop * Implemented multi-block text selection with interactive handles and CFI support in desktop epub pagination
This commit is contained in:
Aryan
GitHub
parent
c0d0e57e79
commit
b20ade9946
247 changed files with 43321 additions and 7087 deletions
|
|
@ -35,9 +35,11 @@ import org.w3c.dom.Node
|
|||
import java.io.File
|
||||
import java.io.FileOutputStream
|
||||
import java.io.InputStream
|
||||
import java.io.ByteArrayOutputStream
|
||||
import java.net.URLDecoder
|
||||
import java.nio.file.Paths
|
||||
import java.util.UUID
|
||||
import java.util.zip.ZipEntry
|
||||
import java.util.zip.ZipFile
|
||||
import kotlinx.coroutines.async
|
||||
import kotlinx.coroutines.awaitAll
|
||||
|
|
@ -78,7 +80,8 @@ class EpubParser(private val context: Context) {
|
|||
val originalBookNameHint: String,
|
||||
val parserVersion: Int,
|
||||
val parseContent: Boolean,
|
||||
val shouldUseToc: Boolean
|
||||
val shouldUseToc: Boolean,
|
||||
val sourceFingerprint: String? = null
|
||||
)
|
||||
|
||||
// EpubFile can still represent in-memory file data during initial parsing before extraction
|
||||
|
|
@ -109,6 +112,9 @@ class EpubParser(private val context: Context) {
|
|||
private const val BOOK_METADATA_FILE = "book_metadata.json"
|
||||
private const val CACHE_MANIFEST_FILE = "epub_cache_manifest.json"
|
||||
private const val EPUB_EXTRACTION_CACHE_VERSION = 1
|
||||
private const val MAX_METADATA_ENTRY_BYTES = 4 * 1024 * 1024
|
||||
private const val EPUB_COVER_MAX_DIMENSION = 1024
|
||||
private val EPUB_IMAGE_EXTENSIONS = setOf(".png", ".jpg", ".jpeg", ".gif", ".webp", ".svg")
|
||||
}
|
||||
|
||||
internal val String.decodedURL: String
|
||||
|
|
@ -185,7 +191,8 @@ class EpubParser(private val context: Context) {
|
|||
shouldUseToc: Boolean = true,
|
||||
originalBookNameHint: String = "streamed_book",
|
||||
parseContent: Boolean = true,
|
||||
extractionDirOverride: File? = null
|
||||
extractionDirOverride: File? = null,
|
||||
sourceFingerprint: String? = null
|
||||
): EpubBook {
|
||||
return withContext(Dispatchers.IO) {
|
||||
Timber.d("Parsing EPUB input stream for bookId: $bookId")
|
||||
|
|
@ -201,7 +208,8 @@ class EpubParser(private val context: Context) {
|
|||
extractionDir = activeDir,
|
||||
bookId = bookId,
|
||||
originalBookNameHint = originalBookNameHint,
|
||||
shouldUseToc = shouldUseToc
|
||||
shouldUseToc = shouldUseToc,
|
||||
sourceFingerprint = sourceFingerprint
|
||||
)?.let { cachedBook ->
|
||||
Timber.tag("FileOpenPerf").d("[EPUB] Loaded extracted book from cache | bookId=$bookId")
|
||||
return@withContext cachedBook
|
||||
|
|
@ -215,7 +223,12 @@ class EpubParser(private val context: Context) {
|
|||
tempFile.outputStream().use { output ->
|
||||
inputStream.copyTo(output)
|
||||
}
|
||||
filesMap = extractEpubContents(ZipFile(tempFile), extractionDir, parseContent)
|
||||
filesMap = extractEpubContents(
|
||||
zipFile = ZipFile(tempFile),
|
||||
extractionDir = extractionDir,
|
||||
parseContent = parseContent,
|
||||
extractImagesForMetadata = shouldDeleteExtractionDir
|
||||
)
|
||||
} finally {
|
||||
tempFile.delete()
|
||||
}
|
||||
|
|
@ -229,6 +242,7 @@ class EpubParser(private val context: Context) {
|
|||
bookId = bookId,
|
||||
originalBookNameHint = originalBookNameHint,
|
||||
shouldUseToc = shouldUseToc,
|
||||
sourceFingerprint = sourceFingerprint,
|
||||
book = book
|
||||
)
|
||||
}
|
||||
|
|
@ -243,7 +257,8 @@ class EpubParser(private val context: Context) {
|
|||
extractionDir: File,
|
||||
bookId: String,
|
||||
originalBookNameHint: String,
|
||||
shouldUseToc: Boolean
|
||||
shouldUseToc: Boolean,
|
||||
sourceFingerprint: String?
|
||||
): EpubBook? {
|
||||
val metadataFile = File(extractionDir, BOOK_METADATA_FILE)
|
||||
val manifestFile = File(extractionDir, CACHE_MANIFEST_FILE)
|
||||
|
|
@ -255,7 +270,8 @@ class EpubParser(private val context: Context) {
|
|||
manifest.originalBookNameHint == originalBookNameHint &&
|
||||
manifest.parserVersion == EPUB_EXTRACTION_CACHE_VERSION &&
|
||||
manifest.parseContent &&
|
||||
manifest.shouldUseToc == shouldUseToc
|
||||
manifest.shouldUseToc == shouldUseToc &&
|
||||
manifest.sourceFingerprint == sourceFingerprint
|
||||
|
||||
if (!isCompatible) {
|
||||
Timber.d("EPUB extraction cache manifest is stale for bookId=$bookId")
|
||||
|
|
@ -277,6 +293,7 @@ class EpubParser(private val context: Context) {
|
|||
bookId: String,
|
||||
originalBookNameHint: String,
|
||||
shouldUseToc: Boolean,
|
||||
sourceFingerprint: String?,
|
||||
book: EpubBook
|
||||
) {
|
||||
try {
|
||||
|
|
@ -288,7 +305,8 @@ class EpubParser(private val context: Context) {
|
|||
originalBookNameHint = originalBookNameHint,
|
||||
parserVersion = EPUB_EXTRACTION_CACHE_VERSION,
|
||||
parseContent = true,
|
||||
shouldUseToc = shouldUseToc
|
||||
shouldUseToc = shouldUseToc,
|
||||
sourceFingerprint = sourceFingerprint
|
||||
)
|
||||
)
|
||||
)
|
||||
|
|
@ -297,22 +315,40 @@ class EpubParser(private val context: Context) {
|
|||
}
|
||||
}
|
||||
|
||||
private fun extractEpubContents(zipFile: ZipFile, extractionDir: File, parseContent: Boolean): Map<String, EpubFile> {
|
||||
internal fun extractEpubContents(
|
||||
zipFile: ZipFile,
|
||||
extractionDir: File,
|
||||
parseContent: Boolean,
|
||||
extractImagesForMetadata: Boolean
|
||||
): Map<String, EpubFile> {
|
||||
val filesMap = mutableMapOf<String, EpubFile>()
|
||||
zipFile.use { zf ->
|
||||
zf.entries().asSequence().filterNot { it.isDirectory }.forEach { entry ->
|
||||
val isEssential = isEssentialFile(entry.name, parseContent)
|
||||
val isImage = entry.name.matches(Regex(".*\\.(png|jpg|jpeg|gif|webp|svg)$", RegexOption.IGNORE_CASE))
|
||||
val isImage = isEpubImageFile(entry.name)
|
||||
|
||||
if (!parseContent) {
|
||||
if (isEssential || isImage) {
|
||||
val data = zf.getInputStream(entry).readBytes()
|
||||
filesMap[entry.name] = EpubFile(absPath = entry.name, data = data)
|
||||
when {
|
||||
isEssential -> {
|
||||
val data = zf.readSmallEntryBytes(entry) ?: return@forEach
|
||||
filesMap[entry.name] = EpubFile(absPath = entry.name, data = data)
|
||||
}
|
||||
isImage && extractImagesForMetadata -> {
|
||||
val outputFile = safeExtractionFile(extractionDir, entry.name)
|
||||
?: return@forEach
|
||||
outputFile.parentFile?.mkdirs()
|
||||
zf.getInputStream(entry).use { input ->
|
||||
FileOutputStream(outputFile).use { output ->
|
||||
input.copyTo(output)
|
||||
}
|
||||
}
|
||||
filesMap[entry.name] = EpubFile(absPath = entry.name, data = ByteArray(0))
|
||||
}
|
||||
}
|
||||
return@forEach
|
||||
}
|
||||
|
||||
val outputFile = File(extractionDir, entry.name)
|
||||
val outputFile = safeExtractionFile(extractionDir, entry.name) ?: return@forEach
|
||||
outputFile.parentFile?.mkdirs()
|
||||
zf.getInputStream(entry).use { input ->
|
||||
FileOutputStream(outputFile).use { output ->
|
||||
|
|
@ -329,6 +365,59 @@ class EpubParser(private val context: Context) {
|
|||
return filesMap
|
||||
}
|
||||
|
||||
private fun isEpubImageFile(fileName: String): Boolean {
|
||||
val lowerName = fileName.lowercase()
|
||||
return EPUB_IMAGE_EXTENSIONS.any { lowerName.endsWith(it) }
|
||||
}
|
||||
|
||||
private fun safeExtractionFile(extractionDir: File, entryName: String): File? {
|
||||
val outputFile = File(extractionDir, entryName)
|
||||
val root = extractionDir.canonicalFile
|
||||
val target = outputFile.canonicalFile
|
||||
val rootPath = root.path
|
||||
val targetPath = target.path
|
||||
val isInsideRoot = targetPath == rootPath || targetPath.startsWith(rootPath + File.separator)
|
||||
|
||||
if (!isInsideRoot) {
|
||||
Timber.w("Skipping unsafe EPUB entry outside extraction root: $entryName")
|
||||
return null
|
||||
}
|
||||
|
||||
return outputFile
|
||||
}
|
||||
|
||||
private fun ZipFile.readSmallEntryBytes(entry: ZipEntry): ByteArray? {
|
||||
if (entry.size > MAX_METADATA_ENTRY_BYTES.toLong()) {
|
||||
Timber.w("Skipping oversized EPUB metadata entry: ${entry.name} (${entry.size} bytes)")
|
||||
return null
|
||||
}
|
||||
|
||||
val initialSize = entry.size
|
||||
.takeIf { it in 0..MAX_METADATA_ENTRY_BYTES.toLong() }
|
||||
?.toInt()
|
||||
?: DEFAULT_BUFFER_SIZE
|
||||
val buffer = ByteArray(DEFAULT_BUFFER_SIZE)
|
||||
var totalBytes = 0
|
||||
|
||||
return getInputStream(entry).use { input ->
|
||||
ByteArrayOutputStream(initialSize).use { output ->
|
||||
while (true) {
|
||||
val read = input.read(buffer)
|
||||
if (read == -1) break
|
||||
|
||||
totalBytes += read
|
||||
if (totalBytes > MAX_METADATA_ENTRY_BYTES) {
|
||||
Timber.w("Skipping oversized EPUB metadata entry while reading: ${entry.name}")
|
||||
return null
|
||||
}
|
||||
|
||||
output.write(buffer, 0, read)
|
||||
}
|
||||
output.toByteArray()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun parseAndCreateEbook(
|
||||
filesContentMap: Map<String, EpubFile>,
|
||||
document: EpubDocument,
|
||||
|
|
@ -712,8 +801,6 @@ class EpubParser(private val context: Context) {
|
|||
filesContentMap: Map<String, EpubFile>,
|
||||
@Suppress("UNUSED_PARAMETER") extractionRoot: File
|
||||
): List<EpubImage> {
|
||||
val imageExtensions = setOf(".png", ".gif", ".jpg", ".jpeg", ".webp", ".svg")
|
||||
|
||||
val listedImages = manifestItems.values
|
||||
.filter { it.mediaType.startsWith("image/") }
|
||||
.map { manifestItem ->
|
||||
|
|
@ -725,7 +812,7 @@ class EpubParser(private val context: Context) {
|
|||
val unlistedImages = filesContentMap.keys
|
||||
.filter { path ->
|
||||
val lowerPath = path.lowercase()
|
||||
imageExtensions.any { lowerPath.endsWith(it) } && !listedPaths.contains(path)
|
||||
EPUB_IMAGE_EXTENSIONS.any { lowerPath.endsWith(it) } && !listedPaths.contains(path)
|
||||
}
|
||||
.map { path ->
|
||||
EpubImage(absPath = path)
|
||||
|
|
@ -743,11 +830,9 @@ class EpubParser(private val context: Context) {
|
|||
): Bitmap? {
|
||||
val coverManifestItem = manifestItems[metadataCoverId]
|
||||
if (coverManifestItem != null) {
|
||||
val coverImageBytes = filesContentMap[coverManifestItem.absPath]?.data?.takeIf { it.isNotEmpty() }
|
||||
?: File(extractionRoot, coverManifestItem.absPath).takeIf { it.exists() }?.readBytes()
|
||||
|
||||
if (coverImageBytes != null) {
|
||||
return BitmapFactory.decodeByteArray(coverImageBytes, 0, coverImageBytes.size)
|
||||
val coverImage = decodeEpubImage(coverManifestItem.absPath, filesContentMap, extractionRoot)
|
||||
if (coverImage != null) {
|
||||
return coverImage
|
||||
} else {
|
||||
Timber.e("Cover image file content not found for path: ${coverManifestItem.absPath}")
|
||||
}
|
||||
|
|
@ -768,21 +853,15 @@ class EpubParser(private val context: Context) {
|
|||
)
|
||||
for (path in possiblePaths) {
|
||||
if (filesContentMap.containsKey(path)) {
|
||||
val bytes = filesContentMap[path]?.data?.takeIf { it.isNotEmpty() }
|
||||
?: File(extractionRoot, path).takeIf { it.exists() }?.readBytes()
|
||||
|
||||
bytes?.let {
|
||||
decodeEpubImage(path, filesContentMap, extractionRoot)?.let {
|
||||
Timber.d("Found fallback cover image at $path")
|
||||
return BitmapFactory.decodeByteArray(it, 0, it.size)
|
||||
return it
|
||||
}
|
||||
}
|
||||
manifestItems.values.find { item -> item.absPath.equals(path, ignoreCase = true) && item.mediaType.startsWith("image/") }?.let { manifestItem ->
|
||||
val bytes = filesContentMap[manifestItem.absPath]?.data?.takeIf { it.isNotEmpty() }
|
||||
?: File(extractionRoot, manifestItem.absPath).takeIf { it.exists() }?.readBytes()
|
||||
|
||||
bytes?.let {
|
||||
decodeEpubImage(manifestItem.absPath, filesContentMap, extractionRoot)?.let {
|
||||
Timber.d("Found fallback cover image via manifest item (case-insensitive) at ${manifestItem.absPath}")
|
||||
return BitmapFactory.decodeByteArray(it, 0, it.size)
|
||||
return it
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -791,6 +870,53 @@ class EpubParser(private val context: Context) {
|
|||
return null
|
||||
}
|
||||
|
||||
private fun decodeEpubImage(
|
||||
path: String,
|
||||
filesContentMap: Map<String, EpubFile>,
|
||||
extractionRoot: File
|
||||
): Bitmap? {
|
||||
filesContentMap[path]?.data?.takeIf { it.isNotEmpty() }?.let { bytes ->
|
||||
return decodeSampledByteArray(bytes)
|
||||
}
|
||||
|
||||
val imageFile = File(extractionRoot, path).takeIf { it.exists() && it.isFile } ?: return null
|
||||
return decodeSampledFile(imageFile)
|
||||
}
|
||||
|
||||
private fun decodeSampledByteArray(bytes: ByteArray): Bitmap? {
|
||||
val bounds = BitmapFactory.Options().apply {
|
||||
inJustDecodeBounds = true
|
||||
}
|
||||
BitmapFactory.decodeByteArray(bytes, 0, bytes.size, bounds)
|
||||
val options = BitmapFactory.Options().apply {
|
||||
inSampleSize = calculateBitmapSampleSize(bounds)
|
||||
}
|
||||
return BitmapFactory.decodeByteArray(bytes, 0, bytes.size, options)
|
||||
}
|
||||
|
||||
private fun decodeSampledFile(file: File): Bitmap? {
|
||||
val bounds = BitmapFactory.Options().apply {
|
||||
inJustDecodeBounds = true
|
||||
}
|
||||
BitmapFactory.decodeFile(file.absolutePath, bounds)
|
||||
val options = BitmapFactory.Options().apply {
|
||||
inSampleSize = calculateBitmapSampleSize(bounds)
|
||||
}
|
||||
return BitmapFactory.decodeFile(file.absolutePath, options)
|
||||
}
|
||||
|
||||
private fun calculateBitmapSampleSize(options: BitmapFactory.Options): Int {
|
||||
val width = options.outWidth
|
||||
val height = options.outHeight
|
||||
if (width <= 0 || height <= 0) return 1
|
||||
|
||||
var sampleSize = 1
|
||||
while ((width / sampleSize) > EPUB_COVER_MAX_DIMENSION || (height / sampleSize) > EPUB_COVER_MAX_DIMENSION) {
|
||||
sampleSize *= 2
|
||||
}
|
||||
return sampleSize
|
||||
}
|
||||
|
||||
private fun isEssentialFile(fileName: String, parseContent: Boolean): Boolean {
|
||||
val lowerName = fileName.lowercase()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue