From 9be2e514d93ed963718a20836836e9396919fa11 Mon Sep 17 00:00:00 2001 From: AbdallahMehiz Date: Mon, 29 Jan 2024 16:34:01 +0100 Subject: [PATCH] simpler format logic --- .../kotlin/tachiyomi/source/local/io/Format.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source-local/src/commonMain/kotlin/tachiyomi/source/local/io/Format.kt b/source-local/src/commonMain/kotlin/tachiyomi/source/local/io/Format.kt index 57e71cafa..eb9cb5a3c 100644 --- a/source-local/src/commonMain/kotlin/tachiyomi/source/local/io/Format.kt +++ b/source-local/src/commonMain/kotlin/tachiyomi/source/local/io/Format.kt @@ -14,13 +14,13 @@ sealed interface Format { companion object { - fun valueOf(file: UniFile) = with(file) { - when { - isDirectory -> Directory(this) - extension.equals("zip", true) || extension.equals("cbz", true) -> Zip(this) - extension.equals("7z", true) || extension.equals("cb7", true) -> SevenZip(this) - extension.equals("rar", true) || extension.equals("cbr", true) -> Rar(this) - extension.equals("epub", true) -> Epub(this) + fun valueOf(file: UniFile): Format { + if (file.isDirectory) return Directory(file) + return when (file.extension?.lowercase()) { + "zip", "cbz" -> Zip(file) + "7z", "cb7" -> SevenZip(file) + "rar", "cbr" -> Rar(file) + "epub" -> Epub(file) else -> throw UnknownFormatException() } }