mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-17 13:53:41 +00:00
feat: auto rename on duplicate (#76)
This commit is contained in:
1 parent
048554df4d
commit
0515ce6081
8 files changed
+205
-152
No files matched your search
+42
-24
@@ -2,9 +2,11 @@ package util
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
syspath "path"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func Dir(path string) string {
|
||||
@@ -30,39 +32,55 @@ func SafeRemove(name string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// SafeRemoveAll remove file and parent directories safely
|
||||
func SafeRemoveAll(path string, names []string) error {
|
||||
for _, name := range names {
|
||||
err := SafeRemove(syspath.Join(path, name))
|
||||
if err != nil {
|
||||
return err
|
||||
// CheckDuplicateAndRename rename duplicate file, add suffix (1) (2) ...
|
||||
// if file name is a.txt, rename to a (1).txt
|
||||
// if directory name is a, rename to a (1)
|
||||
// return new name
|
||||
func CheckDuplicateAndRename(path string) (string, error) {
|
||||
dir := syspath.Dir(path)
|
||||
name := syspath.Base(path)
|
||||
|
||||
// if file not exists, return directly
|
||||
_, err := os.Stat(path)
|
||||
if err != nil {
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
return name, nil
|
||||
}
|
||||
if err := safeRemoveParent(path, name); err != nil {
|
||||
return err
|
||||
return "", err
|
||||
}
|
||||
|
||||
index := strings.LastIndex(name, ".")
|
||||
var nameTpl string
|
||||
if index == -1 {
|
||||
nameTpl = name + " (%d)"
|
||||
} else {
|
||||
nameTpl = name[:index] + " (%d)" + name[index:]
|
||||
}
|
||||
for i := 1; ; i++ {
|
||||
newName := fmt.Sprintf(nameTpl, i)
|
||||
newPath := syspath.Join(dir, newName)
|
||||
if _, err := os.Stat(newPath); os.IsNotExist(err) {
|
||||
return newName, nil
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func safeRemoveParent(path string, subPath string) error {
|
||||
currPath := syspath.Dir(subPath)
|
||||
if currPath == "." {
|
||||
return nil
|
||||
// GetSingleDir get the top level single folder name,if not exist, return empty string
|
||||
func GetSingleDir(paths []string) string {
|
||||
if len(paths) == 0 {
|
||||
return ""
|
||||
}
|
||||
// if directory is empty, remove it
|
||||
dir := syspath.Join(path, syspath.Dir(subPath))
|
||||
empty, err := isEmpty(dir)
|
||||
if err != nil {
|
||||
return err
|
||||
split := strings.Split(paths[0], "/")
|
||||
if len(split) == 0 || split[0] == "" {
|
||||
return ""
|
||||
}
|
||||
if empty {
|
||||
err = SafeRemove(dir)
|
||||
if err != nil {
|
||||
return err
|
||||
dir := split[0]
|
||||
for i := 1; i < len(paths); i++ {
|
||||
if !strings.HasPrefix(paths[i], dir) {
|
||||
return ""
|
||||
}
|
||||
return safeRemoveParent(path, currPath)
|
||||
}
|
||||
return nil
|
||||
return dir
|
||||
}
|
||||
|
||||
// check directory is empty
|
||||
|
||||
+89
-92
@@ -2,7 +2,6 @@ package util
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
@@ -106,99 +105,97 @@ func TestSafeRemove(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestSafeRemoveAll(t *testing.T) {
|
||||
testDir := "test_dir"
|
||||
err := os.Mkdir(testDir, 0755)
|
||||
func TestGetSingleDir(t *testing.T) {
|
||||
type args struct {
|
||||
paths []string
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want string
|
||||
}{
|
||||
{
|
||||
name: "empty",
|
||||
args: args{
|
||||
paths: []string{},
|
||||
},
|
||||
want: "",
|
||||
},
|
||||
{
|
||||
name: "blank",
|
||||
args: args{
|
||||
paths: []string{""},
|
||||
},
|
||||
want: "",
|
||||
},
|
||||
{
|
||||
name: "blank multi",
|
||||
args: args{
|
||||
paths: []string{"", "a"},
|
||||
},
|
||||
want: "",
|
||||
},
|
||||
{
|
||||
name: "multi dir not single",
|
||||
args: args{
|
||||
paths: []string{"a", "b"},
|
||||
},
|
||||
want: "",
|
||||
},
|
||||
{
|
||||
name: "single dir",
|
||||
args: args{
|
||||
paths: []string{"a"},
|
||||
},
|
||||
want: "a",
|
||||
},
|
||||
{
|
||||
name: "multi dir single",
|
||||
args: args{
|
||||
paths: []string{"a/b", "a/c"},
|
||||
},
|
||||
want: "a",
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if got := GetSingleDir(tt.args.paths); got != tt.want {
|
||||
t.Errorf("IsSingleDir() = %v, want %v", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestCheckDuplicateAndRename(t *testing.T) {
|
||||
doCheckDuplicateAndRename(t, []string{}, "a.txt", "a.txt")
|
||||
doCheckDuplicateAndRename(t, []string{"a.txt"}, "a.txt", "a (1).txt")
|
||||
doCheckDuplicateAndRename(t, []string{"a.txt", "a (1).txt"}, "a.txt", "a (2).txt")
|
||||
|
||||
doCheckDuplicateAndRename(t, []string{}, "a", "a")
|
||||
doCheckDuplicateAndRename(t, []string{"a"}, "a", "a (1)")
|
||||
doCheckDuplicateAndRename(t, []string{"a", "a (1)"}, "a", "a (2)")
|
||||
}
|
||||
|
||||
func doCheckDuplicateAndRename(t *testing.T, exitsPaths []string, path string, except string) {
|
||||
for _, path := range exitsPaths {
|
||||
if err := os.MkdirAll(path, 0755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
defer func() {
|
||||
for _, path := range exitsPaths {
|
||||
if err := os.RemoveAll(path); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
got, err := CheckDuplicateAndRename(path)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer os.RemoveAll(testDir)
|
||||
|
||||
doSafeRemoveAll(t, testDir, []string{
|
||||
"1.txt",
|
||||
}, []string{})
|
||||
|
||||
doSafeRemoveAll(t, testDir, []string{
|
||||
"1.txt",
|
||||
}, []string{
|
||||
"2.txt",
|
||||
}, "2.txt")
|
||||
|
||||
doSafeRemoveAll(t, testDir, []string{
|
||||
"1.txt",
|
||||
"a/b/c/1.txt",
|
||||
"a/b/1.txt",
|
||||
"a/1.txt",
|
||||
}, []string{})
|
||||
|
||||
doSafeRemoveAll(t, testDir, []string{
|
||||
"1.txt",
|
||||
"a/b/c/1.txt",
|
||||
"a/b/1.txt",
|
||||
"a/1.txt",
|
||||
}, []string{
|
||||
"a/b/2.txt",
|
||||
}, "a/b/2.txt")
|
||||
|
||||
doSafeRemoveAll(t, testDir, []string{
|
||||
"1.txt",
|
||||
"a/b/c/1.txt",
|
||||
"a/b/1.txt",
|
||||
"a/1.txt",
|
||||
}, []string{
|
||||
"a/2.txt",
|
||||
}, "a/2.txt")
|
||||
}
|
||||
|
||||
func doSafeRemoveAll(t *testing.T, path string, downloadNames []string, otherNames []string, exist ...string) {
|
||||
preCreate(t, path, downloadNames)
|
||||
preCreate(t, path, otherNames)
|
||||
|
||||
if err := SafeRemoveAll(path, downloadNames); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if len(exist) == 0 {
|
||||
for _, name := range downloadNames {
|
||||
filePath := filepath.Join(path, name)
|
||||
if isExist(filePath) {
|
||||
t.Fatalf("file %s should not exist", filePath)
|
||||
}
|
||||
subDirPath := filepath.Dir(name)
|
||||
if subDirPath != "." {
|
||||
dirPath := filepath.Join(path, subDirPath)
|
||||
if isExist(dirPath) {
|
||||
t.Fatalf("dir %s should not exist", dirPath)
|
||||
}
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
for _, name := range exist {
|
||||
if !isExist(filepath.Join(path, name)) {
|
||||
t.Fatalf("file %s should exist", name)
|
||||
}
|
||||
if got != except {
|
||||
t.Errorf("CheckDuplicateAndRename() = %v, want %v", got, except)
|
||||
}
|
||||
}
|
||||
|
||||
func preCreate(t *testing.T, path string, names []string) {
|
||||
for _, name := range names {
|
||||
fullPath := filepath.Join(path, name)
|
||||
if err := os.MkdirAll(filepath.Dir(fullPath), 0755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
file, err := os.Create(fullPath)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := file.Close(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func isExist(path string) bool {
|
||||
_, err := os.Stat(path)
|
||||
return err == nil || os.IsExist(err)
|
||||
}
|
||||
Reference in new issue
Block a user