From 61e8942a6b98dd9a2d5d384cb0b6d9cc75461975 Mon Sep 17 00:00:00 2001
From: KirCute <951206789@qq.com>
Date: Sat, 6 Dec 2025 16:14:45 +0800
Subject: [PATCH] feat(archive): auto-locate destination to current path

---
 src/components/FolderTree.tsx            | 11 ++++++++--
 src/pages/home/toolbar/CopyMove.tsx      |  8 ++++++--
 src/pages/home/toolbar/Decompress.tsx    | 26 +++++++++++++-----------
 src/pages/home/toolbar/RecursiveMove.tsx |  2 ++
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/components/FolderTree.tsx b/src/components/FolderTree.tsx
index ecb30cbc3..915605e65 100644
--- a/src/components/FolderTree.tsx
+++ b/src/components/FolderTree.tsx
@@ -340,7 +340,7 @@ export type ModalFolderChooseProps = {
   onClose: () => void
   onSubmit?: (text: string) => void
   type?: string
-  defaultValue?: string
+  defaultValue?: string | (() => string)
   loading?: boolean
   footerSlot?: JSXElement
   headerSlot?: (handler: FolderTreeHandler | undefined) => JSXElement
@@ -349,12 +349,19 @@ export type ModalFolderChooseProps = {
 }
 export const ModalFolderChoose = (props: ModalFolderChooseProps) => {
   const t = useT()
-  const [value, setValue] = createSignal(props.defaultValue ?? "/")
+  const [value, setValue] = createSignal("/")
   const [handler, setHandler] = createSignal<FolderTreeHandler>()
   createEffect(() => {
     if (!props.opened) return
     handler()?.setPath(value())
   })
+  if (typeof props.defaultValue === "function") {
+    createEffect(() => {
+      setValue((props.defaultValue as () => string)())
+    })
+  } else if (typeof props.defaultValue === "string") {
+    setValue(props.defaultValue)
+  }
   return (
     <Modal
       size="xl"
diff --git a/src/pages/home/toolbar/CopyMove.tsx b/src/pages/home/toolbar/CopyMove.tsx
index 21d116a28..7276c2ff9 100644
--- a/src/pages/home/toolbar/CopyMove.tsx
+++ b/src/pages/home/toolbar/CopyMove.tsx
@@ -2,11 +2,15 @@ import { Checkbox, createDisclosure, VStack, Button } from "@hope-ui/solid"
 import { createSignal, onCleanup } from "solid-js"
 import { ModalFolderChoose, FolderTreeHandler } from "~/components"
 import { useFetch, usePath, useRouter, useT } from "~/hooks"
-import { selectedObjs } from "~/store"
+import { me, selectedObjs } from "~/store"
 import { bus, fsCopy, fsMove, handleRespWithNotifySuccess } from "~/utils"
 import { CgFolderAdd } from "solid-icons/cg"
+import { UserMethods, UserPermissions } from "~/types"
 
-const CreateFolderButton = (props: { handler?: FolderTreeHandler }) => {
+export const CreateFolderButton = (props: { handler?: FolderTreeHandler }) => {
+  if (!UserMethods.can(me(), UserPermissions.indexOf("write"))) {
+    return null
+  }
   const t = useT()
   return (
     <Button
diff --git a/src/pages/home/toolbar/Decompress.tsx b/src/pages/home/toolbar/Decompress.tsx
index e78012fab..475c82984 100644
--- a/src/pages/home/toolbar/Decompress.tsx
+++ b/src/pages/home/toolbar/Decompress.tsx
@@ -11,6 +11,7 @@ import { bus, fsArchiveDecompress, handleRespWithNotifySuccess } from "~/utils"
 import { batch, createSignal, onCleanup } from "solid-js"
 import { ModalFolderChoose } from "~/components"
 import { selectedObjs } from "~/store"
+import { CreateFolderButton } from "./CopyMove"
 
 export const Decompress = () => {
   const t = useT()
@@ -23,9 +24,14 @@ export const Decompress = () => {
   const [cacheFull, setCacheFull] = createSignal(true)
   const [putIntoNewDir, setPutIntoNewDir] = createSignal(false)
   const [overwrite, setOverwrite] = createSignal(false)
+  const [srcPath, setSrcPath] = createSignal("")
+  const [srcName, setSrcName] = createSignal<string[]>()
   const handler = (name: string) => {
     if (name === "decompress") {
+      const path = pathname()
       batch(() => {
+        setSrcPath(path)
+        setSrcName(selectedObjs().map((o) => o.name))
         setCacheFull(true)
         setInnerPath("/")
         setArchivePass("")
@@ -35,7 +41,11 @@ export const Decompress = () => {
   }
   const extractHandler = (args: string) => {
     const { inner, pass } = JSON.parse(args)
+    const path = pathname()
+    const idx = path.lastIndexOf("/")
     batch(() => {
+      setSrcPath(path.slice(0, idx))
+      setSrcName([path.slice(idx + 1)])
       setCacheFull(false)
       setInnerPath(inner)
       setArchivePass(pass)
@@ -54,21 +64,14 @@ export const Decompress = () => {
     }
     return t("home.toolbar.archive.extract_header", { path: innerPath() })
   }
-  const getPathAndName = () => {
-    let path = pathname()
-    if (innerPath() === "/") {
-      return { path: path, name: selectedObjs().map((o) => o.name) }
-    } else {
-      let idx = path.lastIndexOf("/")
-      return { path: path.slice(0, idx), name: [path.slice(idx + 1)] }
-    }
-  }
   return (
     <ModalFolderChoose
       header={header()}
       opened={isOpen()}
       onClose={onClose}
       loading={loading()}
+      defaultValue={srcPath}
+      headerSlot={(handler) => <CreateFolderButton handler={handler} />}
       footerSlot={
         <VStack w="$full" spacing="$2">
           <Checkbox
@@ -81,11 +84,10 @@ export const Decompress = () => {
         </VStack>
       }
       onSubmit={async (dst) => {
-        const { path, name } = getPathAndName()
         const resp = await ok(
-          path,
+          srcPath(),
           dst,
-          name,
+          srcName(),
           archivePass(),
           innerPath(),
           cacheFull(),
diff --git a/src/pages/home/toolbar/RecursiveMove.tsx b/src/pages/home/toolbar/RecursiveMove.tsx
index f7a03a0ef..5a880e2b8 100644
--- a/src/pages/home/toolbar/RecursiveMove.tsx
+++ b/src/pages/home/toolbar/RecursiveMove.tsx
@@ -15,6 +15,7 @@ import { ModalFolderChoose } from "~/components"
 import { useFetch, usePath, useRouter, useT } from "~/hooks"
 import { bus, fsRecursiveMove, handleRespWithNotifySuccess } from "~/utils"
 import { createSignal, onCleanup } from "solid-js"
+import { CreateFolderButton } from "./CopyMove"
 
 export const RecursiveMove = () => {
   const {
@@ -77,6 +78,7 @@ export const RecursiveMove = () => {
         opened={isOpen()}
         onClose={onClose}
         loading={loading()}
+        headerSlot={(handler) => <CreateFolderButton handler={handler} />}
         footerSlot={
           <HStack mr="auto" flex="0.8" spacing="$1">
             <SimpleSelect