From 1a27695bf3374f8485657378e09d902cb9cafac6 Mon Sep 17 00:00:00 2001 From: Zyrouge Date: Sun, 10 Nov 2024 23:30:29 +0530 Subject: [PATCH] fix: whitelist & blacklist folders being ignored (#651) --- .../zyrouge/symphony/services/groove/MediaExposer.kt | 10 ++++++---- .../ui/components/settings/MultiGrooveFolderTile.kt | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/github/zyrouge/symphony/services/groove/MediaExposer.kt b/app/src/main/java/io/github/zyrouge/symphony/services/groove/MediaExposer.kt index 8e6cdcc2..9ac9ca24 100644 --- a/app/src/main/java/io/github/zyrouge/symphony/services/groove/MediaExposer.kt +++ b/app/src/main/java/io/github/zyrouge/symphony/services/groove/MediaExposer.kt @@ -85,7 +85,7 @@ class MediaExposer(private val symphony: Symphony) { private suspend fun scanMediaTree(cycle: ScanCycle, path: SimplePath, file: DocumentFileX) { try { - if (!cycle.filter.isWhitelisted(file.name)) { + if (!cycle.filter.isWhitelisted(path.pathString)) { return } coroutineScope { @@ -222,12 +222,14 @@ class MediaExposer(private val symphony: Symphony) { return false } } - val bFilter = blacklisted.findLast { x -> path.startsWith(x) } + val bFilter = blacklisted.findLast { + path.startsWith(it) + } if (bFilter == null) { return true } - val wFilter = whitelisted.findLast { x -> - x.startsWith(bFilter) && path.startsWith(x) + val wFilter = whitelisted.findLast { + it.startsWith(bFilter) && path.startsWith(it) } return wFilter != null } diff --git a/app/src/main/java/io/github/zyrouge/symphony/ui/components/settings/MultiGrooveFolderTile.kt b/app/src/main/java/io/github/zyrouge/symphony/ui/components/settings/MultiGrooveFolderTile.kt index 303640f4..289b2b4f 100644 --- a/app/src/main/java/io/github/zyrouge/symphony/ui/components/settings/MultiGrooveFolderTile.kt +++ b/app/src/main/java/io/github/zyrouge/symphony/ui/components/settings/MultiGrooveFolderTile.kt @@ -155,7 +155,7 @@ fun SettingsMultiGrooveFolderTile( explorer = explorer, onSelect = { if (it != null) { - val path = "/" + it.parts.subList(1, it.size).joinToString("/") + val path = SimplePath(it.parts.subList(1, it.size)).pathString if (!values.contains(path)) { values.add(path) }