Trigger MediaScanner once MOVE is complete

Author: BURG3R5

app/src/main/java/co/adityarajput/fileflow/data/models/Action.kt

@@ -2,6 +2,7 @@ package co.adityarajput.fileflow.data.models
 
 import android.content.Context
 import android.content.Intent
+import android.media.MediaScannerConnection
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.buildAnnotatedString
@@ -108,6 +109,8 @@ sealed class Action {
                         listOf(it.maxByOrNull(superlative.selector) ?: return)
                 } ?: return
 
+            val destPaths = mutableListOf<String?>()
+
             for (srcFile in srcFiles) {
                 val srcFileName = srcFile.name ?: continue
                 val destFileName = getDestFileName(srcFile)
@@ -143,12 +146,14 @@ sealed class Action {
                         "Action",
                         "Moving $srcFileName to ${destSubDir.path}/$destFileName",
                     )
-                    srcFile.moveTo(
-                        destSubDir,
-                        destFileName,
-                        keepOriginal,
-                        overwriteExisting,
-                        context,
+                    destPaths.add(
+                        srcFile.moveTo(
+                            destSubDir,
+                            destFileName,
+                            keepOriginal,
+                            overwriteExisting,
+                            context,
+                        ),
                     )
                 } catch (e: FileAlreadyExistsException) {
                     Logger.e("Action", "$destFileName already exists", e)
@@ -160,6 +165,14 @@ sealed class Action {
 
                 registerExecution(srcFileName)
             }
+
+            MediaScannerConnection.scanFile(
+                context,
+                destPaths.filterNotNull().distinct().toTypedArray(),
+                null,
+            ) { path, _ ->
+                Logger.d("Action", "Scanned media at $path")
+            }
         }
     }
 

app/src/main/java/co/adityarajput/fileflow/utils/Files.kt

@@ -43,7 +43,7 @@ sealed class File {
             keepOriginal: Boolean,
             overwriteExisting: Boolean,
             context: Context,
-        ) {
+        ): String? {
             if (destDir !is SAFFile)
                 throw IllegalArgumentException("Destination directory must be a SAFFile")
 
@@ -63,6 +63,8 @@ sealed class File {
             }
 
             if (!keepOriginal) delete()
+
+            return null
         }
     }
 
@@ -73,16 +75,18 @@ sealed class File {
             keepOriginal: Boolean,
             overwriteExisting: Boolean,
             context: Context,
-        ) {
+        ): String? {
             if (destDir !is FSFile)
                 throw IllegalArgumentException("Destination directory must be a FSFile")
 
             val options = mutableListOf<StandardCopyOption>()
             if (keepOriginal) options.add(StandardCopyOption.COPY_ATTRIBUTES)
             if (overwriteExisting) options.add(StandardCopyOption.REPLACE_EXISTING)
+            var destFilePath: String? = null
 
             try {
                 withContext(Dispatchers.IO) {
+                    destFilePath = destDir.ioFile.toPath().resolve(destFileName).toString()
                     if (keepOriginal) {
                         Files.copy(
                             this@FSFile.ioFile.toPath(),
@@ -106,9 +110,11 @@ sealed class File {
                     e,
                 )
 
-                val destFile = IOFile(destDir.ioFile, destFileName)
                 withContext(Dispatchers.IO) {
+                    val destFile = IOFile(destDir.ioFile, destFileName)
+
                     destFile.createNewFile()
+                    destFilePath = destFile.absolutePath
 
                     this@FSFile.ioFile.inputStream().use { srcStream ->
                         destFile.outputStream().use { destStream ->
@@ -119,6 +125,8 @@ sealed class File {
 
                 if (!keepOriginal) delete()
             }
+
+            return destFilePath
         }
     }
 
@@ -277,7 +285,7 @@ sealed class File {
         keepOriginal: Boolean,
         overwriteExisting: Boolean,
         context: Context,
-    )
+    ): String?
 
     fun delete() = when (this) {
         is SAFFile -> documentFile.delete()