fix: whitelist & blacklist folders being ignored (#651)

zyrouge · Nov 10, 2024 · 1a27695 · 1a27695
1 parent 249552e
commit 1a27695
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -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
@@ -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)
                         }