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

Extract source api from app module (#8014)

Browse Source 
* Extract source api from app module

* Extract source online api from app module

(cherry picked from commit 86fe850794)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
#	core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
#	source-api/src/main/java/eu/kanade/tachiyomi/source/Source.kt
#	source-api/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
This commit is contained in:
Andreas
2022-09-16 00:12:27 +02:00
committed by Jobobby04
parent b975b9b86f
commit 8a322ea28e
117 changed files with 547 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/exh/util/ListUtil.kt
-3
View File
@@ -1,3 +0,0 @@
package exh.util
fun <C : Collection<R>, R> C.nullIfEmpty() = ifEmpty { null }
app/src/main/java/exh/util/SourceTagsUtil.kt
+4 -4
View File
@@ -34,12 +34,12 @@ object SourceTagsUtil {
}
if (parsed?.namespace != null) {
when (sourceId) {
in hitomiSourceIds -> wrapTagHitomi(parsed.namespace, parsed.name.substringBefore('|').trim())
in nHentaiSourceIds -> wrapTagNHentai(parsed.namespace, parsed.name.substringBefore('|').trim())
in hitomiSourceIds -> wrapTagHitomi(parsed.namespace!!, parsed.name.substringBefore('|').trim())
in nHentaiSourceIds -> wrapTagNHentai(parsed.namespace!!, parsed.name.substringBefore('|').trim())
in mangaDexSourceIds -> parsed.name
PURURIN_SOURCE_ID -> parsed.name.substringBefore('|').trim()
TSUMINO_SOURCE_ID -> wrapTagTsumino(parsed.namespace, parsed.name.substringBefore('|').trim())
else -> wrapTag(parsed.namespace, parsed.name.substringBefore('|').trim())
TSUMINO_SOURCE_ID -> wrapTagTsumino(parsed.namespace!!, parsed.name.substringBefore('|').trim())
else -> wrapTag(parsed.namespace!!, parsed.name.substringBefore('|').trim())
}
} else {
null
app/src/main/java/exh/util/String.kt
-12
View File
@@ -1,12 +0,0 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
package exh.util
import java.util.Locale
fun String.capitalize(locale: Locale = Locale.getDefault()) =
replaceFirstChar { if (it.isLowerCase()) it.titlecase(locale) else it.toString() }
app/src/main/java/exh/util/StringBuilderExtensions.kt
-3
View File
@@ -1,3 +0,0 @@
package exh.util
operator fun StringBuilder.plusAssign(other: String) { append(other) }
app/src/main/java/exh/util/StringUtil.kt
-15
View File
@@ -1,15 +0,0 @@
package exh.util
fun Collection<String>.trimAll() = map { it.trim() }
fun Collection<String>.dropBlank() = filter { it.isNotBlank() }
fun Collection<String>.dropEmpty() = filter { it.isNotEmpty() }
private val articleRegex by lazy { "^(an|a|the) ".toRegex(RegexOption.IGNORE_CASE) }
fun String.removeArticles(): String {
return replace(articleRegex, "")
}
fun String.trimOrNull() = trim().nullIfBlank()
fun String.nullIfBlank(): String? = ifBlank { null }