Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

musikr: fix hidden files setting

Browse source
This commit is contained in:
Alexander Capehart 2025-03-03 20:46:44 -07:00
parent 20a06ba2fb
commit 387a36a3f8
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
musikr/src/main/java/org/oxycblt/musikr/Config.kt
View file

@ -57,5 +57,5 @@ data class Interpretation(
val separators: Separators, val separators: Separators,
/** Whether to ignore hidden files and directories (those starting with a dot). */ /** Whether to ignore hidden files and directories (those starting with a dot). */
val ignoreHidden: Boolean = true val ignoreHidden: Boolean
) )

2
musikr/src/main/java/org/oxycblt/musikr/Musikr.kt
View file

@ -71,7 +71,7 @@ interface Musikr {
fun new(context: Context, storage: Storage, interpretation: Interpretation): Musikr = fun new(context: Context, storage: Storage, interpretation: Interpretation): Musikr =
MusikrImpl( MusikrImpl(
storage, storage,
ExploreStep.from(context, storage), ExploreStep.from(context, storage, interpretation),
ExtractStep.from(context, storage), ExtractStep.from(context, storage),
EvaluateStep.new(storage, interpretation)) EvaluateStep.new(storage, interpretation))
} }

8
musikr/src/main/java/org/oxycblt/musikr/fs/device/DeviceFiles.kt
View file

@ -31,16 +31,16 @@ import org.oxycblt.musikr.fs.MusicLocation
import org.oxycblt.musikr.fs.Path import org.oxycblt.musikr.fs.Path
internal interface DeviceFiles { internal interface DeviceFiles {
fun explore(locations: Flow<MusicLocation>, ignoreHidden: Boolean = true): Flow<DeviceNode> fun explore(locations: Flow<MusicLocation>): Flow<DeviceNode>
companion object { companion object {
fun from(context: Context): DeviceFiles = DeviceFilesImpl(context.contentResolverSafe) fun from(context: Context, ignoreHidden: Boolean): DeviceFiles = DeviceFilesImpl(context.contentResolverSafe, ignoreHidden)
} }
} }
@OptIn(ExperimentalCoroutinesApi::class) @OptIn(ExperimentalCoroutinesApi::class)
private class DeviceFilesImpl(private val contentResolver: ContentResolver) : DeviceFiles { private class DeviceFilesImpl(private val contentResolver: ContentResolver, private val ignoreHidden: Boolean) : DeviceFiles {
override fun explore(locations: Flow<MusicLocation>, ignoreHidden: Boolean): Flow<DeviceNode> = override fun explore(locations: Flow<MusicLocation>): Flow<DeviceNode> =
locations.flatMapMerge { location -> locations.flatMapMerge { location ->
// Create a root directory for each location // Create a root directory for each location
val rootDirectory = val rootDirectory =

5
musikr/src/main/java/org/oxycblt/musikr/pipeline/ExploreStep.kt
View file

@ -30,6 +30,7 @@ import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.merge
import org.oxycblt.musikr.Interpretation
import org.oxycblt.musikr.Storage import org.oxycblt.musikr.Storage
import org.oxycblt.musikr.fs.MusicLocation import org.oxycblt.musikr.fs.MusicLocation
import org.oxycblt.musikr.fs.device.DeviceDirectory import org.oxycblt.musikr.fs.device.DeviceDirectory
@ -44,8 +45,8 @@ internal interface ExploreStep {
fun explore(locations: List<MusicLocation>): Flow<ExploreNode> fun explore(locations: List<MusicLocation>): Flow<ExploreNode>
companion object { companion object {
fun from(context: Context, storage: Storage): ExploreStep = fun from(context: Context, storage: Storage, interpretation: Interpretation): ExploreStep =
ExploreStepImpl(DeviceFiles.from(context), storage.storedPlaylists) ExploreStepImpl(DeviceFiles.from(context, interpretation.ignoreHidden), storage.storedPlaylists)
} }
} }