fix: rename file

lib/view/page/storage/local.dart

@@ -11,6 +11,7 @@ import 'package:server_box/data/res/misc.dart';
 
 import 'package:server_box/core/route.dart';
 import 'package:server_box/data/model/app/path_with_prefix.dart';
+import 'package:server_box/view/page/editor.dart';
 
 final class LocalFilePageArgs {
   final bool? isPickFile;
@@ -183,7 +184,7 @@ class _LocalFilePageState extends State<LocalFilePage>
   Future<void> _showFileActionDialog(FileSystemEntity file) async {
     final fileName = file.path.split('/').last;
     if (isPickFile) {
-      await context.showRoundDialog(
+      context.showRoundDialog(
         title: libL10n.file,
         child: Text(fileName),
         actions: [
@@ -199,9 +200,9 @@ class _LocalFilePageState extends State<LocalFilePage>
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          ListTile(
-            leading: const Icon(Icons.edit),
-            title: Text(libL10n.edit),
+          Btn.tile(
+            icon: const Icon(Icons.edit),
+            text: libL10n.edit,
             onTap: () async {
               context.pop();
               final stat = await file.stat();
@@ -212,34 +213,35 @@ class _LocalFilePageState extends State<LocalFilePage>
                 );
                 return;
               }
-              final result = await AppRoutes.editor(
-                path: file.absolute.path,
-              ).go<bool>(context);
-              if (result == true) {
+              final ret = await EditorPage.route.go(
+                context,
+                args: EditorPageArgs(path: file.absolute.path),
+              );
+              if (ret?.editExistedOk == true) {
                 context.showSnackBar(l10n.saved);
                 setState(() {});
               }
             },
           ),
-          ListTile(
-            leading: const Icon(Icons.abc),
-            title: Text(libL10n.rename),
+          Btn.tile(
+            icon: const Icon(Icons.abc),
+            text: libL10n.rename,
             onTap: () {
               context.pop();
               _showRenameDialog(file);
             },
           ),
-          ListTile(
-            leading: const Icon(Icons.delete),
-            title: Text(libL10n.delete),
+          Btn.tile(
+            icon: const Icon(Icons.delete),
+            text: libL10n.delete,
             onTap: () {
               context.pop();
               _showDeleteDialog(file);
             },
           ),
-          ListTile(
-            leading: const Icon(Icons.upload),
-            title: Text(l10n.upload),
+          Btn.tile(
+            icon: const Icon(Icons.upload),
+            text: l10n.upload,
             onTap: () async {
               context.pop();
 
@@ -270,9 +272,9 @@ class _LocalFilePageState extends State<LocalFilePage>
               context.showSnackBar(l10n.added2List);
             },
           ),
-          ListTile(
-            leading: const Icon(Icons.open_in_new),
-            title: Text(libL10n.open),
+          Btn.tile(
+            icon: const Icon(Icons.open_in_new),
+            text: libL10n.open,
             onTap: () {
               Pfs.share(path: file.absolute.path);
             },
@@ -283,7 +285,7 @@ class _LocalFilePageState extends State<LocalFilePage>
   }
 
   void _showRenameDialog(FileSystemEntity file) {
-    final fileName = file.path.split('/').last;
+    final fileName = file.path.split(Pfs.seperator).last;
     final ctrl = TextEditingController(text: fileName);
     void onSubmit() async {
       final newName = ctrl.text;
@@ -293,7 +295,7 @@ class _LocalFilePageState extends State<LocalFilePage>
       }
 
       context.pop();
-      final newPath = '${file.parent.path}/$newName';
+      final newPath = '${file.parent.path}${Pfs.seperator}$newName';
       await context.showLoadingDialog(fn: () => file.rename(newPath));
 
       setState(() {});
@@ -305,7 +307,7 @@ class _LocalFilePageState extends State<LocalFilePage>
         autoFocus: true,
         icon: Icons.abc,
         label: libL10n.name,
-        controller: TextEditingController(text: fileName),
+        controller: ctrl,
         suggestion: true,
         maxLines: 3,
         onSubmitted: (p0) => onSubmit(),

lib/view/page/storage/sftp.dart

@@ -14,6 +14,7 @@ import 'package:server_box/data/model/sftp/worker.dart';
 import 'package:server_box/data/provider/sftp.dart';
 import 'package:server_box/data/res/misc.dart';
 import 'package:server_box/data/res/store.dart';
+import 'package:server_box/view/page/editor.dart';
 import 'package:server_box/view/page/storage/local.dart';
 import 'package:server_box/view/widget/omit_start_text.dart';
 import 'package:server_box/view/widget/two_line_text.dart';
@@ -302,7 +303,7 @@ class _SftpPageState extends State<SftpPage> with AfterLayoutMixin {
     }
 
     final remotePath = _getRemotePath(name);
-    final localPath = await _getLocalPath(remotePath);
+    final localPath = _getLocalPath(remotePath);
     final completer = Completer();
     final req = SftpReq(
       widget.spi,
@@ -316,8 +317,11 @@ class _SftpPageState extends State<SftpPage> with AfterLayoutMixin {
     );
     if (suc == null || err != null) return;
 
-    final result = await AppRoutes.editor(path: localPath).go<bool>(context);
-    if (result != null && result) {
+    final ret = await EditorPage.route.go(
+      context,
+      args: EditorPageArgs(path: localPath),
+    );
+    if (ret?.editExistedOk == true) {
       SftpProvider.add(SftpReq(
         req.spi,
         remotePath,
@@ -346,7 +350,7 @@ class _SftpPageState extends State<SftpPage> with AfterLayoutMixin {
               SftpReq(
                 widget.spi,
                 remotePath,
-                await _getLocalPath(remotePath),
+                _getLocalPath(remotePath),
                 SftpReqType.download,
               ),
             );
@@ -554,11 +558,8 @@ class _SftpPageState extends State<SftpPage> with AfterLayoutMixin {
         onSubmitted: (_) => onSubmitted(),
       ),
       actions: [
-        TextButton(onPressed: () => context.pop(), child: Text(libL10n.cancel)),
-        TextButton(
-          onPressed: onSubmitted,
-          child: Text(libL10n.rename, style: UIs.textRed),
-        ),
+        Btn.cancel(),
+        Btn.ok(onTap: onSubmitted, red: true),
       ],
     );
   }
@@ -593,8 +594,9 @@ class _SftpPageState extends State<SftpPage> with AfterLayoutMixin {
     return prePath.joinPath(name.filename, seperator: '/');
   }
 
-  Future<String> _getLocalPath(String remotePath) async {
-    return Paths.file.joinPath(remotePath);
+  /// Local file dir + server id + remote path
+  String _getLocalPath(String remotePath) {
+    return Paths.file.joinPath(widget.spi.id).joinPath(remotePath);
   }
 
   /// Only return true if the path is changed