server: add recycle, add memory fs, improve base option

app: improve grpc_io
server: add test for memory, fix pipe not sync

Author: honmaple

README.org

@@ -19,6 +19,7 @@
 ** 功能
    - 支持文件列表查看/复制/移动/删除/重命名/上传/下载
    - 支持文件多选及操作
+   - 支持回收站
    - 支持视频、音频、图片和文本文件的预览
    - 支持文件加密和压缩(*测试中*)
    - 支持各存储之间的备份和同步(*测试中*)

app/lib/api/file/widgets/file_view.dart

@@ -132,7 +132,7 @@ class _FileViewState extends ConsumerState<FileView> {
                 },
           child: ListTile(
             leading: _buildIcon(row, setting, 0.8),
-            title: Text(row.name),
+            title: _buildName(row),
             subtitle: Wrap(
               spacing: 8,
               children: [
@@ -191,11 +191,7 @@ class _FileViewState extends ConsumerState<FileView> {
                 children: [
                   _buildIcon(row, setting, 1),
                   const SizedBox(height: 8),
-                  Text(
-                    row.name,
-                    maxLines: 2,
-                    overflow: TextOverflow.ellipsis,
-                  ),
+                  _buildName(row, maxLines: 2),
                 ],
               ),
             ),
@@ -211,6 +207,17 @@ class _FileViewState extends ConsumerState<FileView> {
     );
   }
 
+  _buildName(File row, {int? maxLines}) {
+    if (row.type == "RECYCLE") {
+      return Text("回收站".tr());
+    }
+    return Text(
+      row.name,
+      maxLines: maxLines,
+      overflow: TextOverflow.ellipsis,
+    );
+  }
+
   _buildIcon(File row, FileSetting setting, double size) {
     if (setting.icon == FileListIcon.circle) {
       return Container(

app/lib/api/file/widgets/repo/base.dart

@@ -34,6 +34,7 @@ class BaseForm extends StatefulWidget {
 
 class _BaseFormState extends State<BaseForm> {
   late Map<String, dynamic> _option;
+  late Map<String, dynamic> _recycleOption;
   late Map<String, dynamic> _encryptOption;
   late Map<String, dynamic> _compressOption;
 
@@ -42,6 +43,7 @@ class _BaseFormState extends State<BaseForm> {
     super.initState();
 
     _option = widget.form.option == "" ? {} : jsonDecode(widget.form.option);
+    _recycleOption = _option["recycle_option"] ?? {};
     _encryptOption = _option["encrypt_option"] ?? {};
     _compressOption = _option["compress_option"] ?? {};
   }
@@ -73,6 +75,39 @@ class _BaseFormState extends State<BaseForm> {
               widget.form.option = jsonEncode(_option);
             },
           ),
+          ListTile(
+            title: Text('回收站'.tr()),
+            subtitle: Text("是否激活回收站".tr()),
+            trailing: Switch(
+              value: _option["recycle"] ?? false,
+              onChanged: (result) {
+                setState(() {
+                  _option["recycle"] = result;
+                  if (!result) {
+                    _recycleOption = {};
+                    _option.remove("recycle");
+                    _option.remove("recycle_option");
+                  }
+                });
+
+                widget.form.option = jsonEncode(_option);
+              },
+            ),
+          ),
+          if (_option["recycle"] ?? false)
+            CustomFormField(
+              label: "回收站路径".tr(),
+              value: _recycleOption["path"],
+              subtitle: Text("未设置时将在根目录创建.maplerecycle".tr()),
+              onTap: (result) {
+                setState(() {
+                  _recycleOption["path"] = result;
+                  _option["recycle_option"] = _recycleOption;
+                });
+
+                widget.form.option = jsonEncode(_option);
+              },
+            ),
           ListTile(
             title: Text('文件加密'.tr()),
             trailing: Switch(

app/lib/app/grpc_io.dart

@@ -7,82 +7,82 @@ import 'package:ffi/ffi.dart';
 
 import 'package:flutter/services.dart';
 
+import '../common/utils/util.dart';
 import '../generated/ffi/libserver.dart';
 
 class GrpcService {
   static const platform = MethodChannel("honmaple.com/maple_file");
 
+  late String _addr;
+  late grpcapi.ClientChannel _client;
+
+  String get addr {
+    return _addr;
+  }
+
+  grpcapi.ClientChannel get client {
+    return _client;
+  }
+
   Future<void> init() async {
-    if (Platform.isMacOS) {
-      await _initDesktop();
+    if (Util.isDesktop) {
+      _addr = await _initDesktop();
     } else {
-      await _initMobile();
+      _addr = await _initMobile();
     }
+    _client = _createChannel(addr);
   }
 
-  _initMobile() async {
+  Future<String> _initMobile() async {
     final directory = await getApplicationDocumentsDirectory();
     final Map<String, dynamic> args = {
       'path': directory.path,
     };
 
-    await platform.invokeMethod("Start", args).then((addr) {
-      _createChannel(addr);
-    }).catchError((err) {
+    return await platform.invokeMethod("Start", args).catchError((err) {
       print(err);
     });
   }
 
   // https://docs.flutter.dev/platform-integration/macos/c-interop
-  _initDesktop() async {
-    if (Platform.isMacOS) {}
-
-    var libname = "libserver.dylib";
+  Future<String> _initDesktop() async {
+    var libname = "libserver";
+    if (Util.isWindows) {
+      libname += ".dll";
+    } else if (Util.isMacOS) {
+      libname += ".dylib";
+    } else if (Util.isLinux) {
+      libname += ".so";
+    }
 
-    final lib = LibserverBind(ffi.DynamicLibrary.open(libname));
     final directory = await getApplicationDocumentsDirectory();
     final path = directory.path;
-    print(path);
 
     // ffi.Char
+    final lib = LibserverBind(ffi.DynamicLibrary.open(libname));
     final result = lib.Start(path.toNativeUtf8().cast());
     if (result.r1.address == ffi.nullptr.address) {
-      _createChannel(result.r0.cast<Utf8>().toDartString());
-    } else {
-      print(result.r1.cast<Utf8>().toDartString());
+      return Future.value(result.r0.cast<Utf8>().toDartString());
     }
+    return Future.error(result.r1.cast<Utf8>().toDartString());
   }
 
-  late String _addr;
-  late grpcapi.ClientChannel _client;
-
-  String get addr {
-    return _addr;
-  }
-
-  grpcapi.ClientChannel get client {
-    return _client;
-  }
-
-  _createChannel(String addr) {
+  grpcapi.ClientChannel _createChannel(String addr) {
     const options = ChannelOptions(
       credentials: ChannelCredentials.insecure(),
     );
     if (addr.endsWith(".sock")) {
-      _addr = addr;
-      _client = ClientChannel(
+      return ClientChannel(
         InternetAddress(addr, type: InternetAddressType.unix),
         options: options,
       );
-    } else {
-      final addrs = addr.split(":");
-
-      _addr = addr;
-      _client = ClientChannel(
-        addrs[0],
-        port: int.parse(addrs[1]),
-        options: options,
-      );
     }
+
+    final addrs = addr.split(":");
+    return ClientChannel(
+      addrs[0],
+      port: int.parse(addrs[1]),
+      options: options,
+    );
   }
 }

app/lib/common/utils/path.dart

@@ -1,11 +1,11 @@
 import 'dart:io' show Directory, Platform, File;
 
-import 'package:flutter/material.dart';
+import 'package:external_path/external_path.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 import 'package:mime/mime.dart';
 import 'package:path/path.dart' as filepath;
 import 'package:path_provider/path_provider.dart';
-import 'package:external_path/external_path.dart';
 
 class PathUtil {
   static Future<String> getDownloadsPath() async {
@@ -70,7 +70,9 @@ class PathUtil {
     if (type == null || type == "") {
       type = mimeType(name);
     }
-    if (type == "DIR") {
+    if (type == "RECYCLE") {
+      return Icons.recycling;
+    } else if (type == "DIR") {
       return Icons.folder;
     } else if (type.startsWith("text/")) {
       return Icons.note;

app/lib/common/utils/util.dart

@@ -15,7 +15,7 @@ class Util {
     return !kIsWeb && Platform.isAndroid;
   }
 
-  static bool get isMacos {
+  static bool get isMacOS {
     return !kIsWeb && Platform.isMacOS;
   }
 

server/internal/api/file/fs/move.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/honmaple/maple-file/server/pkg/driver"
 	"github.com/honmaple/maple-file/server/pkg/runner"
@@ -32,8 +31,8 @@ func (opt *MoveTaskOption) Execute(task runner.Task, fs FS) error {
 		return err
 	}
 
-	if strings.TrimSuffix(opt.SrcPath, srcPath) == strings.TrimSuffix(opt.DstPath, dstPath) {
-		return srcFS.Move(task.Context(), srcPath, dstPath)
+	if srcFS == dstFS {
+		return srcFS.Copy(task.Context(), srcPath, dstPath)
 	}
 	return move(task, srcFS, srcPath, dstFS, dstPath)
 }

server/internal/api/file/service/file.go

@@ -8,7 +8,6 @@ import (
 	"io"
 	"path/filepath"
 	"strings"
-	"time"
 
 	"github.com/honmaple/maple-file/server/internal/api/file/fs"
 	pb "github.com/honmaple/maple-file/server/internal/proto/api/file"
@@ -183,8 +182,6 @@ func (srv *Service) upload(ctx context.Context, req *pb.FileRequest, reader io.R
 		return nil, err
 	}
 
-	time.Sleep(time.Second)
-
 	info, err := srv.fs.Get(ctx, filepath.Join(req.GetPath(), filename))
 	if err != nil {
 		return nil, err

server/internal/api/file/service/util.go

@@ -58,9 +58,6 @@ func infoToFile(m driver.File) *pb.File {
 		CreatedAt: timestamppb.New(m.ModTime()),
 		UpdatedAt: timestamppb.New(m.ModTime()),
 	}
-	if m.IsDir() {
-		file.Type = "DIR"
-	}
 	return file
 }
 

server/pkg/driver/alist/alist.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/honmaple/maple-file/server/pkg/driver"
 	"github.com/honmaple/maple-file/server/pkg/driver/base"
+	"github.com/honmaple/maple-file/server/pkg/util"
 	httputil "github.com/honmaple/maple-file/server/pkg/util/http"
 	"github.com/tidwall/gjson"
 )
@@ -175,7 +176,7 @@ func (d *Alist) Open(path string) (driver.FileReader, error) {
 }
 
 func (d *Alist) Create(path string) (driver.FileWriter, error) {
-	r, w := io.Pipe()
+	r, w := util.Pipe()
 	go func() {
 		resp, err := d.request(context.Background(), http.MethodPut, "/api/fs/put", httputil.WithBody(r), httputil.WithNeverTimeout(), httputil.WithRequest(func(req *http.Request) {
 			req.Header.Set("File-Path", path)