Fix renaming, duplicating and moving on native and deep folders

Author: CodeDoctorDE

packages/lw_file_system/lib/src/api/base/directory.dart

@@ -156,8 +156,6 @@ mixin GeneralDirectoryFileSystem<T> on GeneralFileSystem {
     if (newName.startsWith('/')) {
       newName = newName.substring(1);
     }
-    final asset = await getAsset(path);
-    if (asset == null) return null;
     final newPath = '${path.substring(0, path.lastIndexOf('/') + 1)}$newName';
     return moveAsset(path, newPath);
   }
@@ -168,7 +166,7 @@ mixin GeneralDirectoryFileSystem<T> on GeneralFileSystem {
     bool forceSync = false,
   }) async {
     path = normalizePath(path);
-    final asset = await getAsset(path);
+    final asset = await getAsset(path, listLevel: allListLevel);
     if (asset == null) return null;
     if (asset is FileSystemFile<T>) {
       final data = asset.data;
@@ -229,15 +227,7 @@ mixin GeneralDirectoryFileSystem<T> on GeneralFileSystem {
     String path,
     String newPath, {
     bool forceSync = false,
-  }) async {
-    path = normalizePath(path);
-    newPath = normalizePath(newPath);
-    if (path == newPath) return getAsset(path);
-    var asset = await duplicateAsset(path, newPath, forceSync: forceSync);
-    if (asset == null) return null;
-    await deleteAsset(path);
-    return asset;
-  }
+  });
 
   @override
   Future<void> reset() async {

packages/lw_file_system/lib/src/api/file_system_dav.dart

@@ -31,6 +31,45 @@ class DavRemoteDirectoryFileSystem extends RemoteDirectoryFileSystem {
     return RawFileSystemDirectory(location);
   }
 
+  @override
+  Future<FileSystemEntity<Uint8List>?> moveAsset(
+    String path,
+    String newPath, {
+    bool forceSync = false,
+  }) async {
+    path = normalizePath(path);
+    newPath = normalizePath(newPath);
+    if (path == newPath) return getAsset(path);
+
+    if (path.startsWith('/')) {
+      path = path.substring(1);
+    }
+    if (newPath.startsWith('/')) {
+      newPath = newPath.substring(1);
+    }
+
+    final destinationUri = storage.buildVariantUri(
+      variant: config.currentPathVariant,
+      path: newPath.split('/'),
+    );
+
+    if (destinationUri == null) return null;
+
+    final response = await createRequest(
+      path.split('/'),
+      method: 'MOVE',
+      headers: {'Destination': destinationUri.toString(), 'Overwrite': 'T'},
+    );
+
+    if (response == null) return null;
+
+    if (response.statusCode != 201 && response.statusCode != 204) {
+      throw Exception('Failed to move asset: ${response.statusCode}');
+    }
+
+    return getAsset(newPath);
+  }
+
   @override
   Future<void> deleteAsset(String path) async {
     path = normalizePath(path);

packages/lw_file_system/lib/src/api/file_system_html.dart

@@ -84,6 +84,21 @@ mixin WebFileSystem on GeneralFileSystem {
 class WebDirectoryFileSystem extends DirectoryFileSystem with WebFileSystem {
   WebDirectoryFileSystem({required super.config, super.createDefault});
 
+  @override
+  Future<FileSystemEntity<Uint8List>?> moveAsset(
+    String path,
+    String newPath, {
+    bool forceSync = false,
+  }) async {
+    path = normalizePath(path);
+    newPath = normalizePath(newPath);
+    if (path == newPath) return getAsset(path);
+    var asset = await duplicateAsset(path, newPath, forceSync: forceSync);
+    if (asset == null) return null;
+    await deleteAsset(path);
+    return asset;
+  }
+
   @override
   Future<void> deleteAsset(String path) async {
     path = normalizePath(path);

packages/lw_file_system/lib/src/api/file_system_html_stub.dart

@@ -47,6 +47,16 @@ class WebDirectoryFileSystem extends DirectoryFileSystem {
   Future<void> runInitialize() {
     throw UnimplementedError();
   }
+
+  @override
+  Future<FileSystemEntity<Uint8List>?> moveAsset(
+    String path,
+    String newPath, {
+    bool forceSync = false,
+  }) {
+    // TODO: implement moveAsset
+    throw UnimplementedError();
+  }
 }
 
 class WebKeyFileSystem extends KeyFileSystem {

packages/lw_file_system/lib/src/api/file_system_io.dart

@@ -84,6 +84,35 @@ class IODirectoryFileSystem extends DirectoryFileSystem {
     });
   }
 
+  @override
+  Future<FileSystemEntity<Uint8List>?> moveAsset(
+    String path,
+    String newPath, {
+    bool forceSync = false,
+  }) async {
+    path = normalizePath(path);
+    newPath = normalizePath(newPath);
+    if (path == newPath) return getAsset(path);
+
+    return _lock.synchronized(() async {
+      final oldFile = File(await getAbsolutePath(path));
+      final oldDir = Directory(await getAbsolutePath(path));
+      final newAbsolutePath = await getAbsolutePath(newPath);
+
+      if (await oldFile.exists()) {
+        await oldFile.rename(newAbsolutePath);
+        return FileSystemFile(
+          AssetLocation.local(newPath),
+          data: await File(newAbsolutePath).readAsBytes(),
+        );
+      } else if (await oldDir.exists()) {
+        await oldDir.rename(newAbsolutePath);
+        return getAsset(newPath, listLevel: 0);
+      }
+      return null;
+    });
+  }
+
   @override
   Future<void> deleteAsset(String path) async {
     path = normalizePath(path);

packages/lw_file_system/lib/src/api/file_system_remote.dart

@@ -19,6 +19,7 @@ mixin RemoteFileSystem on GeneralFileSystem {
     String method = 'GET',
     List<int>? bodyBytes,
     String? body,
+    Map<String, String>? headers,
   }) async {
     final url = storage.buildVariantUri(
       variant: config.currentPathVariant,
@@ -33,6 +34,11 @@ mixin RemoteFileSystem on GeneralFileSystem {
       'Authorization',
       'Basic ${base64Encode(utf8.encode('${storage.username}:${await config.passwordStorage.read(storage)}'))}',
     );
+    if (headers != null) {
+      headers.forEach((key, value) {
+        request.headers.add(key, value);
+      });
+    }
     if (body != null) {
       final bytes = utf8.encode(body);
       request.headers.add('Content-Length', bytes.length.toString());

packages/lw_file_system/lib/src/api/typed.dart

@@ -143,6 +143,16 @@ class TypedDirectoryFileSystem<T> extends TypedFileSystem<T>
   @override
   Future<bool> moveAbsolute(String oldPath, String newPath) =>
       fileSystem.moveAbsolute(oldPath, newPath);
+
+  @override
+  Future<FileSystemEntity<T>?> moveAsset(
+    String path,
+    String newPath, {
+    bool forceSync = false,
+  }) {
+    // TODO: implement moveAsset
+    throw UnimplementedError();
+  }
 }
 
 class TypedKeyFileSystem<T> extends TypedFileSystem<T>