From 000d6de425fab9a74ff0dde0b986c79a77634877 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Fri, 12 Apr 2024 09:33:41 +0300 Subject: [PATCH] Update AddFragment.kt --- .../torrserve/ui/fragments/add/AddFragment.kt | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/ru/yourok/torrserve/ui/fragments/add/AddFragment.kt b/app/src/main/java/ru/yourok/torrserve/ui/fragments/add/AddFragment.kt index 1ed8d26b..41f12caf 100644 --- a/app/src/main/java/ru/yourok/torrserve/ui/fragments/add/AddFragment.kt +++ b/app/src/main/java/ru/yourok/torrserve/ui/fragments/add/AddFragment.kt @@ -183,12 +183,7 @@ class AddFragment : TSFragment() { torrsAdapter.onClick = { lifecycleScope.launch(Dispatchers.IO) { try { - val category = when { - it.Categories.equals("series", true) -> "tv" - it.Categories.equals("tvshow", true) -> "tv" - it.Categories.equals("movie", true) -> "movie" - else -> it.Categories.lowercase() - } + val category = it.Categories.normalize() val torrent = addTorrent("", it.Magnet, it.Title, "", category, "", true) torrent?.let { App.toast("${getString(R.string.stat_string_added)}: ${it.title}") } ?: App.toast(getString(R.string.error_add_torrent)) } catch (e: Exception) { @@ -200,12 +195,7 @@ class AddFragment : TSFragment() { } torrsAdapter.onLongClick = { lifecycleScope.launch(Dispatchers.IO) { - val category = when { - it.Categories.equals("series", true) -> "tv" - it.Categories.equals("tvshow", true) -> "tv" - it.Categories.equals("movie", true) -> "movie" - else -> it.Categories.lowercase() - } + val category = it.Categories.normalize() val torrent: Torrent val torr = addTorrent("", it.Magnet, it.Title, "", category, "", false) ?: let { return@launch @@ -241,12 +231,7 @@ class AddFragment : TSFragment() { if (itemPosition in torrsAdapter.list.indices) { torrsAdapter.list[itemPosition].let { lifecycleScope.launch(Dispatchers.IO) { - val category = when { - it.Categories.equals("series", true) -> "tv" - it.Categories.equals("tvshow", true) -> "tv" - it.Categories.equals("movie", true) -> "movie" - else -> it.Categories.lowercase() - } + val category = it.Categories.normalize() val torrent: Torrent val torr = addTorrent("", it.Magnet, it.Title, "", category, "", false) ?: let { return@launch @@ -379,4 +364,14 @@ class AddFragment : TSFragment() { null } } + + // https://github.com/YouROK/NUMParser/blob/be9eb56f1b4b53ff251d84f75186f162019ddac4/db/models/torrentDetails.go#L9 + private fun String.normalize(): String { + return when { + this.contains("movie", true) -> "movie" + this.contains("series", true) -> "tv" + this.equals("tvshow", true) -> "tv" + else -> this.lowercase() + } + } } \ No newline at end of file