From 1c3e4eae903fd54011a79a2e9c2c896ee5f320ac Mon Sep 17 00:00:00 2001
From: Simon Ding <dingchuan91@gmail.com>
Date: Sat, 20 Jul 2024 14:36:48 +0800
Subject: [PATCH] fix: local storage

---
 pkg/storage/local.go |  4 ++--
 server/scheduler.go  | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkg/storage/local.go b/pkg/storage/local.go
index 9ca9af4..0651ce3 100644
--- a/pkg/storage/local.go
+++ b/pkg/storage/local.go
@@ -36,11 +36,11 @@ func (l *LocalStorage) Move(src, dest string) error {
 		if err != nil {
 			return errors.Wrapf(err, "relation between %s and %s", src, path)
 		}
-		destName := filepath.Join(targetDir, rel, info.Name())
+		destName := filepath.Join(targetDir, rel)
 
 		if info.IsDir() {
 
-			if err := os.Mkdir(destName, 0666); err != nil {
+			if err := os.Mkdir(destName, 0655); err != nil {
 				return errors.Wrapf(err, "mkdir %v", destName)
 			}
 
diff --git a/server/scheduler.go b/server/scheduler.go
index 5706866..033f702 100644
--- a/server/scheduler.go
+++ b/server/scheduler.go
@@ -64,7 +64,7 @@ func (s *Server) moveCompletedTask(id int) (err1 error) {
 			seasonNum = -1
 		}
 
-		if err != nil {
+		if err1 != nil {
 			s.db.SetHistoryStatus(r.ID, history.StatusFail)
 			if r.EpisodeID != 0 {
 				s.db.SetEpisodeStatus(r.EpisodeID, episode.StatusMissing)
@@ -100,8 +100,7 @@ func (s *Server) moveCompletedTask(id int) (err1 error) {
 		}
 		storageImpl, err := storage.NewWebdavStorage(ws.URL, ws.User, ws.Password, targetPath)
 		if err != nil {
-			err1 = errors.Wrap(err, "new webdav")
-			return 
+			return errors.Wrap(err, "new webdav")
 		}
 		stImpl = storageImpl
 
@@ -114,8 +113,8 @@ func (s *Server) moveCompletedTask(id int) (err1 error) {
 
 		storageImpl, err := storage.NewLocalStorage(targetPath)
 		if err != nil {
-			err1 = errors.Wrap(err, "new storage")
-			return
+			return errors.Wrap(err, "new storage")
+
 		}
 		stImpl = storageImpl
 
@@ -123,14 +122,14 @@ func (s *Server) moveCompletedTask(id int) (err1 error) {
 	if r.EpisodeID == 0 {
 		//season package download
 		if err := stImpl.Move(filepath.Join(s.db.GetDownloadDir(), torrent.Name()), r.TargetDir); err != nil {
-			err1 = errors.Wrap(err, "move file")
-			return
+			return errors.Wrap(err, "move file")
+
 		}
 
 	} else {
 		if err := stImpl.Move(filepath.Join(s.db.GetDownloadDir(), torrent.Name()), filepath.Join(r.TargetDir, torrent.Name())); err != nil {
-			err1 = errors.Wrap(err, "move file")
-			return
+			return errors.Wrap(err, "move file")
+
 		}
 	}