Skip to content

fix(fs): Add skipExisting option to move and copy. #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jyxjjj merged 6 commits into from
Nov 24, 2025
Merged

fix(fs): Add skipExisting option to move and copy. #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57bc1b4
fix(fs): Add skipExisting option to move and copy.
varg1714 Oct 31, 2025
5851366
fix(fs): Add merge option copy.
varg1714 Nov 2, 2025
4cb31af
fix(fs): Code smell.
varg1714 Nov 2, 2025
859bd9a
fix(fs): display the name of the tasks of the merge type.
varg1714 Nov 4, 2025
c7b7d42
fix: align Copy/Move modal actions with new skip options
jenfonro Nov 11, 2025
5e31c51
Merge pull request #1 from jenfonro/pr-252
varg1714 Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions src/components/FolderTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,17 +226,27 @@ export const ModalFolderChoose = (props: ModalFolderChooseProps) => {
autoOpen
/>
</ModalBody>
<ModalFooter display="flex" gap="$2">
<Show when={props.footerSlot}>{props.footerSlot}</Show>
<Button onClick={props.onClose} colorScheme="neutral">
{t("global.cancel")}
</Button>
<Button
loading={props.loading}
onClick={() => props.onSubmit?.(value())}
>
{t("global.ok")}
</Button>
<ModalFooter
display="flex"
w="$full"
gap="$4"
alignItems="flex-end"
justifyContent="flex-end"
>
<Show when={props.footerSlot}>
<Box mr="auto">{props.footerSlot}</Box>
</Show>
<HStack spacing="$2">
<Button onClick={props.onClose} colorScheme="neutral">
{t("global.cancel")}
</Button>
<Button
loading={props.loading}
onClick={() => props.onSubmit?.(value())}
>
{t("global.ok")}
</Button>
</HStack>
</ModalFooter>
</ModalContent>
</Modal>
Expand Down
3 changes: 2 additions & 1 deletion src/lang/en/home.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@
"conflict_policy": {
"cancel_if_exists": "Cancel if file exists",
"overwrite_existing": "Overwrite existing files",
"skip_existing": "Skip existing files"
"skip_existing": "Skip existing files",
"merge": "Only Copy new files and subdirectories"
}
}
87 changes: 68 additions & 19 deletions src/pages/home/toolbar/CopyMove.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Checkbox, createDisclosure } from "@hope-ui/solid"
import { Checkbox, createDisclosure, VStack } from "@hope-ui/solid"
import { createSignal, onCleanup } from "solid-js"
import { ModalFolderChoose } from "~/components"
import { useFetch, usePath, useRouter, useT } from "~/hooks"
Expand All @@ -12,6 +12,8 @@ export const Copy = () => {
const { pathname } = useRouter()
const { refresh } = usePath()
const [overwrite, setOverwrite] = createSignal(false)
const [skipExisting, setSkipExisting] = createSignal(false)
const [merge, setMerge] = createSignal(false)
const handler = (name: string) => {
if (name === "copy") {
onOpen()
Expand All @@ -29,22 +31,51 @@ export const Copy = () => {
onClose={onClose}
loading={loading()}
footerSlot={
<Checkbox
mr="auto"
checked={overwrite()}
onChange={() => {
setOverwrite(!overwrite())
}}
>
{t("home.conflict_policy.overwrite_existing")}
</Checkbox>
<VStack w="$full" spacing="$2">
<Checkbox
mr="auto"
checked={overwrite()}
onChange={() => {
const curOverwrite = !overwrite()
if (curOverwrite) {
setSkipExisting(false)
setMerge(false)
}
setOverwrite(curOverwrite)
}}
>
{t("home.conflict_policy.overwrite_existing")}
</Checkbox>
<Checkbox
mr="auto"
checked={skipExisting()}
onChange={() => {
setSkipExisting(!skipExisting())
}}
disabled={overwrite() || merge()}
>
{t("home.conflict_policy.skip_existing")}
</Checkbox>
<Checkbox
Copy link
Contributor Author

@varg1714 varg1714 Nov 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy相比Move多增加了一个merge的选项，因此这块逻辑分开了，麻烦重新review一下

mr="auto"
checked={merge()}
onChange={() => {
setMerge(!merge())
}}
disabled={overwrite() || skipExisting()}
>
{t("home.conflict_policy.merge")}
</Checkbox>
</VStack>
}
onSubmit={async (dst) => {
const resp = await ok(
pathname(),
dst,
selectedObjs().map((obj) => obj.name),
overwrite(),
skipExisting(),
merge(),
)
handleRespWithNotifySuccess(resp, () => {
refresh()
Expand All @@ -62,6 +93,7 @@ export const Move = () => {
const { pathname } = useRouter()
const { refresh } = usePath()
const [overwrite, setOverwrite] = createSignal(false)
const [skipExisting, setSkipExisting] = createSignal(false)
const handler = (name: string) => {
if (name === "move") {
onOpen()
Expand All @@ -79,22 +111,39 @@ export const Move = () => {
onClose={onClose}
loading={loading()}
footerSlot={
<Checkbox
mr="auto"
checked={overwrite()}
onChange={() => {
setOverwrite(!overwrite())
}}
>
{t("home.conflict_policy.overwrite_existing")}
</Checkbox>
<VStack w="$full" spacing="$2">
<Checkbox
mr="auto"
checked={overwrite()}
onChange={() => {
const curOverwrite = !overwrite()
if (curOverwrite) {
setSkipExisting(false)
}
setOverwrite(curOverwrite)
}}
>
{t("home.conflict_policy.overwrite_existing")}
</Checkbox>
<Checkbox
mr="auto"
checked={skipExisting()}
onChange={() => {
setSkipExisting(!skipExisting())
}}
disabled={overwrite()}
>
{t("home.conflict_policy.skip_existing")}
</Checkbox>
</VStack>
}
onSubmit={async (dst) => {
const resp = await ok(
pathname(),
dst,
selectedObjs().map((obj) => obj.name),
overwrite(),
skipExisting(),
)
handleRespWithNotifySuccess(resp, () => {
refresh()
Expand Down
3 changes: 2 additions & 1 deletion src/pages/manage/tasks/Copy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ const Copy = () => {
type="copy"
canRetry
nameAnalyzer={{
regex: /^copy \[(.*\/([^\/]*))]\((.*\/([^\/]*))\) to \[(.+)]\((.+)\)$/,
regex:
/^(?:copy|merge) \[(.*\/([^\/]*))]\((.*\/([^\/]*))\) to \[(.+)]\((.+)\)$/,
title: (matches) => {
if (matches[4] !== "") return matches[4]
return matches[2] === "" ? "/" : matches[2]
Expand Down
20 changes: 18 additions & 2 deletions src/utils/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,15 @@ export const fsMove = (
dst_dir: string,
names: string[],
overwrite: boolean,
skip_existing: boolean,
): PEmptyResp => {
return r.post("/fs/move", { src_dir, dst_dir, names, overwrite })
return r.post("/fs/move", {
src_dir,
dst_dir,
names,
overwrite,
skip_existing,
})
}

export const fsRecursiveMove = (
Expand All @@ -100,8 +107,17 @@ export const fsCopy = (
dst_dir: string,
names: string[],
overwrite: boolean,
skip_existing: boolean,
merge: boolean,
): PEmptyResp => {
return r.post("/fs/copy", { src_dir, dst_dir, names, overwrite })
return r.post("/fs/copy", {
src_dir,
dst_dir,
names,
overwrite,
skip_existing,
merge,
})
}

export const fsRemove = (dir: string, names: string[]): PEmptyResp => {
Expand Down