Skip to content

Commit 396674f

Browse files
committed
update trash can error
1 parent 62ef84b commit 396674f

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

Diff for: src/components/function.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -242,17 +242,17 @@ func renameIfDuplicate(destination string) (string, error) {
242242
}
243243
}
244244

245-
func moveFile(source string, destination string) error {
246-
destination, err := renameIfDuplicate(destination)
247-
if err != nil {
248-
outPutLog("Move file function error", err)
249-
}
250-
err = os.Rename(source, destination)
251-
if err != nil {
252-
outPutLog("Move file function error", err)
253-
}
254-
return err
255-
}
245+
// func moveFile(source string, destination string) error {
246+
// destination, err := renameIfDuplicate(destination)
247+
// if err != nil {
248+
// outPutLog("Move file function error", err)
249+
// }
250+
// err = os.Rename(source, destination)
251+
// if err != nil {
252+
// outPutLog("Move file function error", err)
253+
// }
254+
// return err
255+
// }
256256

257257
func pasteFile(src string, dst string) error {
258258
srcFile, err := os.Open(src)

Diff for: src/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ func InitConfigFile() {
110110
if err := createDirectories(
111111
config.MainDir, config.DataDir,
112112
config.CacheDir,
113-
config.DataDir+trashDirectory,
114-
config.DataDir+trashDirectoryFiles,
115-
config.DataDir+trashDirectoryInfo,
113+
basedir.DataHome+trashDirectory,
114+
basedir.DataHome+trashDirectoryFiles,
115+
basedir.DataHome+trashDirectoryInfo,
116116
); err != nil {
117117
log.Fatalln("Error creating directories:", err)
118118
}

0 commit comments

Comments
 (0)