Major Kotatsu-Redo port: tracker, reader, Cloudflare, library, sources and more

app/build.gradle

@@ -219,6 +219,7 @@ dependencies {
 	implementation libs.coil.gif
 	implementation libs.coil.svg
 	implementation libs.avif.decoder
+	implementation libs.jxl.coder
 	implementation libs.ssiv
 	implementation libs.disk.lru.cache
 	implementation libs.markwon

app/src/androidTest/kotlin/io/github/landwarderer/futon/reader/ProgressUpdateRaceTest.kt

@@ -74,6 +74,19 @@ class ProgressUpdateRaceTest {
         assertEquals(result, saved.percent)
     }
 
+    @Test
+    fun recalculationKeepsChaptersCountForSmartResume() = runBlocking {
+        val fixture = fixture()
+        val dao = database.getHistoryDao()
+        // read while the source had 29 chapters; chapter 30 has been released since
+        dao.update(dao.find(fixture.manga.id)!!.copy(chaptersCount = 29))
+        val job = async(Dispatchers.IO) { recalculate(fixture.manga) }
+        withTimeout(30_000) { fixture.started.await() }
+        fixture.release()
+        withTimeout(30_000) { job.await() }
+        assertEquals(29, dao.find(fixture.manga.id)!!.chaptersCount)
+    }
+
     @Test
     fun historyRemovedDuringRecalculationStaysRemoved() = runBlocking {
         val fixture = fixture()

app/src/androidTest/kotlin/io/github/landwarderer/futon/settings/backup/AppBackupAgentTest.kt

@@ -90,6 +90,29 @@ class AppBackupAgentTest {
 		assertTrue(SampleData.tag in allTags)
 	}
 
+	@Test
+	fun restoreReplacesEnabledSources() = runTest {
+		val dao = database.getSourcesDao()
+		dao.setEnabled("MANGADEX", true)
+		dao.setEnabled("MANGAPARK", true)
+
+		val agent = AppBackupAgent()
+		val backup = agent.createBackupFile(
+			context = InstrumentationRegistry.getInstrumentation().targetContext,
+			repository = backupRepository,
+		)
+
+		// as after a fresh install, where other sources are enabled by default
+		dao.setEnabled("MANGADEX", false)
+		dao.setEnabled("NHENTAI", true)
+
+		backup.inputStream().use {
+			agent.restoreBackupFile(it.fd, backup.length(), backupRepository)
+		}
+
+		assertEquals(setOf("MANGADEX", "MANGAPARK"), dao.findAllEnabledNames().toSet())
+	}
+
 	@Test
 	fun restoreOldBackup() {
 		val agent = AppBackupAgent()

app/src/main/AndroidManifest.xml

@@ -230,6 +230,13 @@
 			android:autoRemoveFromRecents="true"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
+		<activity
+			android:name="io.github.landwarderer.futon.browser.cloudflare.CloudFlareHiddenActivity"
+			android:autoRemoveFromRecents="true"
+			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
+			android:excludeFromRecents="true"
+			android:theme="@style/Theme.Futon.CloudFlareHidden"
+			android:windowSoftInputMode="adjustNothing" />
 		<activity
 			android:name="io.github.landwarderer.futon.settings.sources.auth.SourceAuthActivity"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
@@ -278,6 +285,9 @@
 		<activity
 			android:name="io.github.landwarderer.futon.settings.override.OverrideConfigActivity"
 			android:label="@string/edit" />
+		<activity
+			android:name="io.github.landwarderer.futon.alternatives.ui.covers.AlternativeCoversActivity"
+			android:label="@string/alternative_covers" />
 		<activity
 			android:name="io.github.landwarderer.futon.sync.ui.SyncAuthActivity"
 			android:exported="true"
@@ -342,6 +352,13 @@
 		<activity
 			android:name="io.github.landwarderer.futon.alternatives.ui.AlternativesActivity"
 			android:label="@string/alternatives" />
+		<activity
+			android:name="io.github.landwarderer.futon.alternatives.ui.SourceReplacementActivity"
+			android:label="@string/replace_source" />
+		<activity android:name="io.github.landwarderer.futon.explore.ui.preset.SourcePresetEditActivity" />
+		<activity
+			android:name="io.github.landwarderer.futon.explore.ui.preset.SourcePresetListActivity"
+			android:label="@string/source_presets" />
 		<activity
 			android:name="io.github.landwarderer.futon.tracker.ui.debug.TrackerDebugActivity"
 			android:label="@string/tracker_debug_info" />

app/src/main/kotlin/io/github/landwarderer/futon/alternatives/domain/AlternativesSearchOptions.kt

@@ -0,0 +1,71 @@
+package io.github.landwarderer.futon.alternatives.domain
+
+import org.koitharu.kotatsu.parsers.model.Manga
+
+data class AlternativesSearchOptions(
+	val query: String,
+	val sourceScope: AlternativeSourceScope = AlternativeSourceScope.Enabled,
+	val sameLanguageOnly: Boolean = false,
+	val sameContentTypeOnly: Boolean = false,
+	val hideNoChapters: Boolean = false,
+	val sortOrder: AlternativeSortOrder = AlternativeSortOrder.BEST_MATCH,
+) {
+
+	fun isDefaultFor(title: String, defaultScope: AlternativeSourceScope): Boolean =
+		this == AlternativesSearchOptions(query = title, sourceScope = defaultScope)
+}
+
+/** Which sources an alternatives search or a source replacement runs across. */
+sealed interface AlternativeSourceScope {
+
+	data object Enabled : AlternativeSourceScope
+
+	/** The sources the user has not enabled - where an alternative is most often hiding. */
+	data object Disabled : AlternativeSourceScope
+
+	/** Any saved preset, not only the active one. */
+	data class Preset(val id: Long) : AlternativeSourceScope
+}
+
+enum class AlternativeSortOrder {
+	BEST_MATCH,
+	MOST_CHAPTERS,
+	CLOSEST_CHAPTER_COUNT,
+	SOURCE_PRIORITY,
+}
+
+sealed interface AlternativeSearchEvent {
+
+	data class Result(val manga: Manga) : AlternativeSearchEvent
+
+	data class Progress(
+		val completedSources: Int,
+		val totalSources: Int,
+	) : AlternativeSearchEvent
+}
+
+data class AlternativeSearchStatus(
+	val completedSources: Int = 0,
+	val totalSources: Int = 0,
+	val resultsCount: Int = 0,
+	val isRunning: Boolean = false,
+)
+
+data class AlternativeSourceScopeOptions(
+	val defaultScope: AlternativeSourceScope,
+	/** Presets that have at least one candidate source, in the user's preset order. */
+	val presets: List<PresetChoice> = emptyList(),
+	/** False when every candidate is already enabled, or every source is enabled. */
+	val hasDisabledSources: Boolean = false,
+) {
+
+	data class PresetChoice(val id: Long, val title: String)
+
+	fun isAvailable(scope: AlternativeSourceScope): Boolean = when (scope) {
+		AlternativeSourceScope.Enabled -> true
+		AlternativeSourceScope.Disabled -> hasDisabledSources
+		is AlternativeSourceScope.Preset -> presets.any { it.id == scope.id }
+	}
+
+	fun presetTitle(id: Long): String? = presets.firstOrNull { it.id == id }?.title
+}