mirror of
https://github.com/MetaCubeX/mihomo.git
synced 2025-12-20 17:10:08 +08:00
chore: clarify function descriptions and variable names
This commit is contained in:
parent
74e64d31e3
commit
f3ebd5c489
@ -310,14 +310,14 @@ func moveDir(src string, dst string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, dirEntry := range dirEntryList {
|
for _, dirEntry := range dirEntryList {
|
||||||
srcDir := filepath.Join(src, dirEntry.Name())
|
srcPath := filepath.Join(src, dirEntry.Name())
|
||||||
dstDir := filepath.Join(dst, dirEntry.Name())
|
dstPath := filepath.Join(dst, dirEntry.Name())
|
||||||
err = os.Rename(srcDir, dstDir)
|
err = os.Rename(srcPath, dstPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Fallback for invalid cross-device link (errno:18).
|
// Fallback for invalid cross-device link (errno:18).
|
||||||
if errors.Is(err, syscall.Errno(18)) {
|
if errors.Is(err, syscall.Errno(18)) {
|
||||||
err = copyDir(srcDir, dstDir)
|
err = copyAll(srcPath, dstPath)
|
||||||
_ = os.RemoveAll(srcDir)
|
_ = os.RemoveAll(srcPath)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -327,9 +327,9 @@ func moveDir(src string, dst string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// copyDir copy the src directory to dst
|
// copyAll copy the src path and any children it contains to dst
|
||||||
// modify from [os.CopyFS]
|
// modify from [os.CopyFS]
|
||||||
func copyDir(src, dst string) error {
|
func copyAll(src, dst string) error {
|
||||||
return filepath.Walk(src, func(path string, info os.FileInfo, err error) error {
|
return filepath.Walk(src, func(path string, info os.FileInfo, err error) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user