Merge branch 'refs/heads/main' into worktree-searcher

Author: d4rken

app-common-adb/src/main/java/eu/darken/butler/common/adb/service/AdbHostOptions.kt

@@ -8,6 +8,5 @@ import kotlinx.parcelize.Parcelize
 data class AdbHostOptions(
     val isDebug: Boolean = BuildConfigWrap.DEBUG,
     val isTrace: Boolean = false,
-    val isDryRun: Boolean = false,
     val recorderPath: String? = null
 ) : Parcelable

app-common-io/src/main/aidl/eu/darken/butler/common/files/local/ipc/FileOpsConnection.aidl

@@ -21,7 +21,7 @@ interface FileOpsConnection {
 
     boolean exists(in LocalPath path);
 
-    boolean delete(in LocalPath path, boolean recursive, boolean dryRun);
+    boolean delete(in LocalPath path, boolean recursive);
 
     RemoteInputStream listFilesStream(in LocalPath path);
 

app-common-io/src/main/aidl/eu/darken/butler/common/pkgs/pkgops/ipc/PkgOpsConnection.aidl

@@ -15,11 +15,11 @@ interface PkgOpsConnection {
 
     boolean forceStop(String packageName);
 
-    boolean clearCacheAsUser(String packageName, int handleId, boolean dryRun);
+    boolean clearCacheAsUser(String packageName, int handleId);
 
-    boolean clearCache(String packageName, boolean dryRun);
+    boolean clearCache(String packageName);
 
-    boolean trimCaches(long desiredBytes, String storageId, boolean dryRun);
+    boolean trimCaches(long desiredBytes, String storageId);
 
     List<PackageInfo> getInstalledPackagesAsUser(long flags, int handleId);
 

app-common-io/src/main/java/eu/darken/butler/common/adb/service/AdbHost.kt

@@ -87,7 +87,6 @@ class AdbHost(
 
                 Bugs.isDebug = options.isDebug
                 Bugs.isTrace = options.isTrace
-                Bugs.isDryRun = options.isDryRun
             }
             .launchIn(hostScope)
     }

app-common-io/src/main/java/eu/darken/butler/common/adb/service/AdbServiceClient.kt

@@ -53,7 +53,6 @@ class AdbServiceClient @Inject constructor(
         val optionsInitial = AdbHostOptions(
             isDebug = debugSettings.isDebugMode.value(),
             isTrace = debugSettings.isTraceMode.value(),
-            isDryRun = debugSettings.isDryRunMode.value(),
             recorderPath = debugSettings.recorderPath.value(),
         )
 
@@ -69,14 +68,12 @@ class AdbServiceClient @Inject constructor(
         combine(
             debugSettings.isDebugMode.flow,
             debugSettings.isTraceMode.flow,
-            debugSettings.isDryRunMode.flow,
             debugSettings.recorderPath.flow,
             lastInternal.filterNotNull(),
-        ) { isDebug, isTrace, isDryRun, recorderPath, lastConnection ->
+        ) { isDebug, isTrace, recorderPath, lastConnection ->
             val optionsDynamic = AdbHostOptions(
                 isDebug = isDebug,
                 isTrace = isTrace,
-                isDryRun = isDryRun,
                 recorderPath = recorderPath,
             )
             log(TAG) { "Updating debug settings: $optionsDynamic" }

app-common-io/src/main/java/eu/darken/butler/common/files/APath.kt

@@ -12,6 +12,7 @@ import kotlinx.serialization.Serializable
 sealed interface APath : Parcelable {
     val path: String
     val name: String
+    val parent: APath?
 
     val userReadablePath: CaString
         get() = path.toCaString()

app-common-io/src/main/java/eu/darken/butler/common/files/APathGateway.kt

@@ -1,36 +1,40 @@
 package eu.darken.butler.common.files
 
+import eu.darken.butler.common.files.actions.CopyAction
+import eu.darken.butler.common.files.actions.DeleteAction
+import eu.darken.butler.common.files.actions.MoveAction
 import eu.darken.butler.common.files.metadata.Ownership
 import eu.darken.butler.common.files.metadata.Permissions
-import eu.darken.butler.common.files.operations.CopyOperation
-import eu.darken.butler.common.files.operations.MoveOperation
 import eu.darken.butler.common.sharedresource.HasSharedResource
 import kotlinx.coroutines.flow.Flow
 import okio.FileHandle
 import kotlin.time.Instant
 
 interface APathGateway<
     P : APath,
-    PLU : APathLookup<P>,
-    PLUE : APathLookupExtended<P>,
-    > : HasSharedResource<Any>, CopyOperation<P>, MoveOperation<P> {
+    PL : APathLookup<P>,
+    PLE : APathLookupExtended<P>,
+    > : HasSharedResource<Any>,
+    CopyAction<P>,
+    MoveAction<P>,
+    DeleteAction<P, PL> {
 
     suspend fun createDir(path: P)
 
     suspend fun createFile(path: P)
 
     suspend fun listFiles(path: P): Collection<P>
 
-    suspend fun lookup(path: P): PLU
+    suspend fun lookup(path: P): PL
 
-    suspend fun lookupFiles(path: P): Collection<PLU>
+    suspend fun lookupFiles(path: P): Collection<PL>
 
-    suspend fun lookupFilesExtended(path: P): Collection<PLUE>
+    suspend fun lookupFilesExtended(path: P): Collection<PLE>
 
     suspend fun walk(
         path: P,
-        options: WalkOptions<P, PLU> = WalkOptions()
-    ): Flow<PLU>
+        options: WalkOptions<P, PL> = WalkOptions()
+    ): Flow<PL>
 
     data class WalkOptions<P : APath, PLU : APathLookup<P>>(
         val pathDoesNotContain: Set<String>? = null,
@@ -43,7 +47,7 @@ interface APathGateway<
 
     suspend fun du(
         path: P,
-        options: DuOptions<P, PLU> = DuOptions()
+        options: DuOptions<P, PL> = DuOptions()
     ): Long
 
     data class DuOptions<P : APath, PLU : APathLookup<P>>(
@@ -58,25 +62,11 @@ interface APathGateway<
 
     suspend fun file(path: P, readWrite: Boolean): FileHandle
 
-    suspend fun delete(path: P, recursive: Boolean)
-
     suspend fun createSymlink(linkPath: P, targetPath: P): Boolean
 
     suspend fun setModifiedAt(path: P, modifiedAt: Instant): Boolean
 
     suspend fun setPermissions(path: P, permissions: Permissions): Boolean
 
     suspend fun setOwnership(path: P, ownership: Ownership): Boolean
-
-    override suspend fun copy(
-        source: P,
-        destination: P,
-        options: CopyOperation.Options
-    ): Flow<CopyOperation.Result>
-
-    override suspend fun move(
-        source: P,
-        destination: P,
-        options: MoveOperation.Options
-    ): Flow<MoveOperation.Result>
 }