app: compress form fix

server: move task fix

Author: honmaple

README.org

@@ -18,6 +18,7 @@
 
 ** 功能
    - 支持文件列表查看/复制/移动/删除/重命名/上传/下载
+   - 支持桌面端拖拽上传(仅文件，不支持文件夹)
    - 支持文件多选及操作
    - 支持回收站
    - 支持视频、音频、图片和文本文件的预览

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

@@ -21,6 +21,15 @@ extension CompressLevelExtension on CompressLevel {
     };
     return labels[this] ?? "unknown";
   }
+
+  int value() {
+    final Map<CompressLevel, int> values = {
+      CompressLevel.normal: -1,
+      CompressLevel.best: 9,
+      CompressLevel.fast: 1,
+    };
+    return values[this] ?? -1;
+  }
 }
 
 class BaseForm extends StatefulWidget {
@@ -110,6 +119,7 @@ class _BaseFormState extends State<BaseForm> {
             ),
           ListTile(
             title: Text('文件加密'.tr()),
+            subtitle: Text("文件加密创建后不可更改加密配置".tr()),
             trailing: Switch(
               value: _option["encrypt"] ?? false,
               onChanged: (result) {
@@ -142,6 +152,21 @@ class _BaseFormState extends State<BaseForm> {
               },
             ),
           if (_option["encrypt"] ?? false)
+            CustomFormField(
+              type: CustomFormFieldType.password,
+              label: "文件密码加密".tr(),
+              value: _encryptOption["password_salt"],
+              subtitle: Text("类似二次密码".tr()),
+              onTap: (result) {
+                setState(() {
+                  _encryptOption["password_salt"] = result;
+                  _option["encrypt_option"] = _encryptOption;
+                });
+
+                widget.form.option = jsonEncode(_option);
+              },
+            ),
+          if (_option["encrypt"] ?? false)
             CustomFormField(
               label: "文件后缀".tr(),
               value: _encryptOption["suffix"],
@@ -186,6 +211,7 @@ class _BaseFormState extends State<BaseForm> {
             ),
           ListTile(
             title: Text('文件压缩'.tr()),
+            subtitle: Text("文件压缩创建后不可更改压缩配置".tr()),
             trailing: Switch(
               value: _option["compress"] ?? false,
               onChanged: (result) {
@@ -205,22 +231,16 @@ class _BaseFormState extends State<BaseForm> {
           if (_option["compress"] ?? false)
             CustomFormField(
               label: "压缩水平".tr(),
-              value: _compressOption["level"],
+              value: _compressValue(_compressOption['level']),
               type: CustomFormFieldType.option,
               options: CompressLevel.values.map((v) {
                 return CustomFormFieldOption(label: v.label(), value: v.name);
               }).toList(),
               isRequired: true,
               onTap: (result) {
                 setState(() {
-                  switch (result) {
-                    case "fast":
-                      _compressOption["level"] = 1;
-                    case "best":
-                      _compressOption["level"] = 9;
-                    default:
-                      _compressOption["level"] = -1;
-                  }
+                  _compressOption["level"] =
+                      CompressLevel.values.byName(result).value();
                   _option["compress_option"] = _compressOption;
                 });
 
@@ -231,4 +251,17 @@ class _BaseFormState extends State<BaseForm> {
       ),
     );
   }
+
+  String? _compressValue(int? value) {
+    if (value == null) {
+      return null;
+    }
+    if (value == 1) {
+      return CompressLevel.fast.name;
+    }
+    if (value == 9) {
+      return CompressLevel.best.name;
+    }
+    return CompressLevel.normal.name;
+  }
 }

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

@@ -32,7 +32,7 @@ func (opt *MoveTaskOption) Execute(task runner.Task, fs FS) error {
 	}
 
 	if srcFS == dstFS {
-		return srcFS.Copy(task.Context(), srcPath, dstPath)
+		return srcFS.Move(task.Context(), srcPath, dstPath)
 	}
 	return move(task, srcFS, srcPath, dstFS, dstPath)
 }