fix: rename file

2025-12-18 07:44:26 +01:00 · 2024-09-22 16:06:09 +08:00
parent eab06abcaf
commit 47aedb2f2e
11 changed files with 164 additions and 142 deletions
--- a/lib/view/page/editor.dart
+++ b/lib/view/page/editor.dart
@@ -14,7 +14,17 @@ import 'package:server_box/data/res/store.dart';

 import 'package:server_box/view/widget/two_line_text.dart';

-class EditorPage extends StatefulWidget {
+final class EditorPageRet {
+  /// If edit text, this includes the edited result
+  final String? result;
+
+  /// Indicates whether it's ok to edit existing file
+  final bool? editExistedOk;
+
+  const EditorPageRet({this.result, this.editExistedOk});
+}
+
+final class EditorPageArgs {
  /// If path is not null, then it's a file editor
  /// If path is null, then it's a text editor
  final String? path;
@@ -28,13 +38,23 @@ class EditorPage extends StatefulWidget {

  final String? title;

-  const EditorPage({
-    super.key,
+  const EditorPageArgs({
    this.path,
    this.text,
    this.langCode,
    this.title,
  });
+}
+
+class EditorPage extends StatefulWidget {
+  final EditorPageArgs? args;
+
+  const EditorPage({super.key, this.args});
+
+  static const route = AppRoute<EditorPageRet, EditorPageArgs>(
+    page: EditorPage.new,
+    path: '/editor',
+  );

  @override
  State<EditorPage> createState() => _EditorPageState();
@@ -63,7 +83,8 @@ class _EditorPageState extends State<EditorPage> {

    /// Higher priority than [path]
    if (Stores.setting.editorHighlight.fetch()) {
-      _langCode = widget.langCode ?? Highlights.getCode(widget.path);
+      _langCode =
+          widget.args?.langCode ?? Highlights.getCode(widget.args?.path);
    }
    _controller = CodeController(
      language: Highlights.all[_langCode],
@@ -79,14 +100,15 @@ class _EditorPageState extends State<EditorPage> {
  }

  Future<void> _setupCtrl() async {
-    if (widget.path != null) {
-      final code = await Computer.shared.start(
-        (path) async => await File(path).readAsString(),
-        widget.path!,
+    final path = widget.args?.path;
+    final text = widget.args?.text;
+    if (path != null) {
+      final code = await Computer.shared.startNoParam(
+        () => File(path).readAsString(),
      );
      _controller.text = code;
-    } else if (widget.text != null) {
-      _controller.text = widget.text!;
+    } else if (text != null) {
+      _controller.text = text;
    }
  }

@@ -117,7 +139,9 @@ class _EditorPageState extends State<EditorPage> {
    return CustomAppBar(
      centerTitle: true,
      title: TwoLineText(
-        up: widget.title ?? widget.path?.getFileName() ?? l10n.unknown,
+        up: widget.args?.title ??
+            widget.args?.path?.getFileName() ??
+            l10n.unknown,
        down: l10n.editor,
      ),
      actions: [
@@ -144,20 +168,21 @@ class _EditorPageState extends State<EditorPage> {
          onPressed: () async {
            // If path is not null, then it's a file editor
            // save the text and return true to pop the page
-            if (widget.path != null) {
+            final path = widget.args?.path;
+            if (path != null) {
              final (res, _) = await context.showLoadingDialog(
-                fn: () => File(widget.path!).writeAsString(_controller.text),
+                fn: () => File(path).writeAsString(_controller.text),
              );
              if (res == null) {
                context.showSnackBar(libL10n.fail);
                return;
              }
-              context.pop(true);
+              context.pop(const EditorPageRet(editExistedOk: true));
              return;
            }
            // else it's a text editor
            // return the text to the previous page
-            context.pop(_controller.text);
+            context.pop(EditorPageRet(result: _controller.text));
          },
        )
      ],
--- a/lib/view/page/setting/entry.dart
+++ b/lib/view/page/setting/entry.dart
@@ -16,6 +16,7 @@ import 'package:server_box/core/route.dart';
 import 'package:server_box/data/model/app/net_view.dart';
 import 'package:server_box/data/res/build_data.dart';
 import 'package:server_box/view/page/backup.dart';
+import 'package:server_box/view/page/editor.dart';
 import 'package:server_box/view/page/private_key/list.dart';

 const _kIconSize = 23.0;
@@ -1150,6 +1151,7 @@ final class _AppSettingsPageState extends State<AppSettingsPage> {
        _buildCollapseUI(),
        _buildCupertinoRoute(),
        if (isDesktop) _buildHideTitleBar(),
+        _buildEditRawSettings(),
      ],
    );
  }
@@ -1315,20 +1317,30 @@ final class _AppSettingsPageState extends State<AppSettingsPage> {
    );
  }

-  Future<void> _onLongPressSetting() async {
+  Widget _buildEditRawSettings() {
+    return ListTile(
+      title: const Text('(Dev) Edit raw json'),
+      trailing: const Icon(Icons.keyboard_arrow_right),
+      onTap: _editRawSettings,
+    );
+  }
+
+  Future<void> _editRawSettings() async {
    final map = Stores.setting.box.toJson(includeInternal: false);
    final keys = map.keys;

    /// Encode [map] to String with indent `\t`
    final text = jsonIndentEncoder.convert(map);
-    final result = await AppRoutes.editor(
-      text: text,
-      langCode: 'json',
-      title: libL10n.setting,
-    ).go<String>(context);
-    if (result == null) {
-      return;
-    }
+    final ret = await EditorPage.route.go(
+      context,
+      args: EditorPageArgs(
+        text: text,
+        langCode: 'json',
+        title: libL10n.setting,
+      ),
+    );
+    final result = ret?.result;
+    if (result == null) return;
    try {
      final newSettings = json.decode(result) as Map<String, dynamic>;
      Stores.setting.box.putAll(newSettings);
--- a/lib/view/page/storage/local.dart
+++ b/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(),
--- a/lib/view/page/storage/sftp.dart
+++ b/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