yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
arkon 2021-09-18 16:13:14 -04:00
parent 45fad147bf
commit d7d46f4447
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
View File

@ -271,18 +271,13 @@ class LocalSource(private val context: Context) : CatalogueSource {
throw Exception(context.getString(R.string.chapter_not_found)) throw Exception(context.getString(R.string.chapter_not_found))
} }
private fun getFormat(file: File): Format { private fun getFormat(file: File) = with(file) {
return file.run { when {
when { isDirectory -> Format.Directory(this)
isDirectory -> Format.Directory(file) extension.equals("zip", true) || extension.equals("cbz", true) -> Format.Zip(this)
extension.equals("zip", true) -> Format.Zip(file) extension.equals("rar", true) || extension.equals("cbr", true) -> Format.Rar(this)
extension.equals("cbz", true) -> Format.Zip(file) extension.equals("epub", true) -> Format.Epub(this)
extension.equals("rar", true) -> Format.Rar(file) else -> throw Exception(context.getString(R.string.local_invalid_format))
extension.equals("cbr", true) -> Format.Rar(file)
extension.equals("epub", true) -> Format.Epub(file)
else -> throw Exception("Invalid chapter format")
}
} }
} }

3
app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
View File

@ -368,7 +368,8 @@ class MangaInfoHeaderAdapter(
private fun updateDescription(description: String?, isCurrentlyExpanded: Boolean): CharSequence { private fun updateDescription(description: String?, isCurrentlyExpanded: Boolean): CharSequence {
return when { return when {
description.isNullOrBlank() -> view.context.getString(R.string.unknown) description.isNullOrBlank() -> view.context.getString(R.string.unknown)
isCurrentlyExpanded -> description isCurrentlyExpanded ->
description
.replace(Regex(" +\$", setOf(RegexOption.MULTILINE)), "") .replace(Regex(" +\$", setOf(RegexOption.MULTILINE)), "")
.replace(Regex("[\\r\\n]{2,}", setOf(RegexOption.MULTILINE)), "\n") .replace(Regex("[\\r\\n]{2,}", setOf(RegexOption.MULTILINE)), "\n")
else -> description else -> description