admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split source preferences from PreferencesHelper (#8029)

Browse Source 
(cherry picked from commit 30b3b2d3ff)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesFilterPresenter.kt
This commit is contained in:
Andreas
2022-09-18 16:36:41 +02:00
committed by Jobobby04
parent 41c9c20e26
commit 5d1dfb5290
59 changed files with 286 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source-api/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt
+2 -2
View File
@@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga
import exh.log.maybeInjectEHLogger
import exh.pref.SourcePreferences
import exh.pref.DelegateSourcePreferences
import exh.source.DelegatedHttpSource
import okhttp3.Headers
import okhttp3.OkHttpClient
@@ -410,7 +410,7 @@ abstract class HttpSource : CatalogueSource {
// EXH -->
private var delegate: DelegatedHttpSource? = null
get() = if (Injekt.get<SourcePreferences>().delegateSources().get()) {
get() = if (Injekt.get<DelegateSourcePreferences>().delegateSources().get()) {
field
} else {
null
source-api/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt
+2 -2
View File
@@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.copy
import exh.metadata.MetadataUtil
import exh.metadata.metadata.base.RaisedSearchMetadata
import exh.pref.SourcePreferences
import exh.pref.DelegateSourcePreferences
import kotlinx.serialization.Serializable
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@@ -53,7 +53,7 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
// No title bug?
val title = altTitle
?.takeIf { Injekt.get<SourcePreferences>().useJapaneseTitle().get() } // todo
?.takeIf { Injekt.get<DelegateSourcePreferences>().useJapaneseTitle().get() } // todo
?: title
// Set artist (if we can find one)
source-api/src/main/java/exh/source/EnhancedHttpSource.kt
+2 -2
View File
@@ -6,7 +6,7 @@ import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.HttpSource
import exh.pref.SourcePreferences
import exh.pref.DelegateSourcePreferences
import okhttp3.Response
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@@ -249,7 +249,7 @@ class EnhancedHttpSource(
override fun getFilterList() = source().getFilterList()
fun source(): HttpSource {
return if (Injekt.get<SourcePreferences>().delegateSources().get()) {
return if (Injekt.get<DelegateSourcePreferences>().delegateSources().get()) {
enhancedSource
} else {
originalSource