diff --git a/app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt b/app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt
index 280a66506..50ffa61d2 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/covers/CoverSilo.kt
@@ -20,7 +20,6 @@ package org.oxycblt.auxio.image.covers
import java.util.UUID
import org.oxycblt.musikr.cover.CoverParams
-import timber.log.Timber
data class CoverSilo(val revision: UUID, val params: CoverParams?) {
override fun toString() =
diff --git a/musikr/src/main/java/org/oxycblt/musikr/fs/device/DeviceFile.kt b/musikr/src/main/java/org/oxycblt/musikr/fs/device/DeviceFile.kt
index e2ce0e210..cee785cb0 100644
--- a/musikr/src/main/java/org/oxycblt/musikr/fs/device/DeviceFile.kt
+++ b/musikr/src/main/java/org/oxycblt/musikr/fs/device/DeviceFile.kt
@@ -20,7 +20,6 @@ package org.oxycblt.musikr.fs.device
import android.net.Uri
import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.flow.Flow
import org.oxycblt.musikr.fs.Path
sealed interface DeviceNode {
diff --git a/musikr/src/main/java/org/oxycblt/musikr/fs/device/DeviceFiles.kt b/musikr/src/main/java/org/oxycblt/musikr/fs/device/DeviceFiles.kt
index 4ba3dc491..5ee0d3417 100644
--- a/musikr/src/main/java/org/oxycblt/musikr/fs/device/DeviceFiles.kt
+++ b/musikr/src/main/java/org/oxycblt/musikr/fs/device/DeviceFiles.kt
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
package org.oxycblt.musikr.fs.device
import android.content.ContentResolver
@@ -28,7 +28,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.asFlow
import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.emptyFlow
import kotlinx.coroutines.flow.flatMapMerge
import kotlinx.coroutines.flow.flattenMerge
import kotlinx.coroutines.flow.flow
@@ -56,8 +55,7 @@ private class DeviceFilesImpl(
location.uri,
DocumentsContract.getTreeDocumentId(location.uri),
location.path,
- null
- )
+ null)
}
private fun exploreDirectoryImpl(
@@ -67,14 +65,11 @@ private class DeviceFilesImpl(
parent: Deferred?
): Flow = flow {
// Make a kotlin future
- val uri =
- DocumentsContract.buildChildDocumentsUriUsingTree(rootUri, treeDocumentId)
+ val uri = DocumentsContract.buildChildDocumentsUriUsingTree(rootUri, treeDocumentId)
val directoryDeferred = CompletableDeferred()
val recursive = mutableListOf>()
val children = mutableListOf()
- contentResolver.useQuery(
- uri, PROJECTION
- ) { cursor ->
+ contentResolver.useQuery(uri, PROJECTION) { cursor ->
val childUriIndex =
cursor.getColumnIndexOrThrow(DocumentsContract.Document.COLUMN_DOCUMENT_ID)
val displayNameIndex =
@@ -128,7 +123,6 @@ private class DeviceFilesImpl(
DocumentsContract.Document.COLUMN_DISPLAY_NAME,
DocumentsContract.Document.COLUMN_MIME_TYPE,
DocumentsContract.Document.COLUMN_SIZE,
- DocumentsContract.Document.COLUMN_LAST_MODIFIED
- )
+ DocumentsContract.Document.COLUMN_LAST_MODIFIED)
}
}
diff --git a/musikr/src/main/java/org/oxycblt/musikr/pipeline/ExploreStep.kt b/musikr/src/main/java/org/oxycblt/musikr/pipeline/ExploreStep.kt
index 62c67cc96..761b0d047 100644
--- a/musikr/src/main/java/org/oxycblt/musikr/pipeline/ExploreStep.kt
+++ b/musikr/src/main/java/org/oxycblt/musikr/pipeline/ExploreStep.kt
@@ -20,13 +20,11 @@ package org.oxycblt.musikr.pipeline
import android.content.Context
import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.asFlow
import kotlinx.coroutines.flow.buffer
import kotlinx.coroutines.flow.emitAll
import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.flattenMerge
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
@@ -34,10 +32,8 @@ import kotlinx.coroutines.flow.merge
import org.oxycblt.musikr.Interpretation
import org.oxycblt.musikr.Storage
import org.oxycblt.musikr.fs.MusicLocation
-import org.oxycblt.musikr.fs.device.DeviceDirectory
import org.oxycblt.musikr.fs.device.DeviceFile
import org.oxycblt.musikr.fs.device.DeviceFiles
-import org.oxycblt.musikr.fs.device.DeviceNode
import org.oxycblt.musikr.playlist.PlaylistFile
import org.oxycblt.musikr.playlist.db.StoredPlaylists
import org.oxycblt.musikr.playlist.m3u.M3U