feat: movie also requires suggested dir

server/scheduler.go

@@ -128,18 +128,10 @@ func (s *Server) moveCompletedTask(id int) (err1 error) {
 		stImpl = storageImpl
 
 	}
-	if r.EpisodeID == 0 {
-		//season package download
-		if err := stImpl.Move(filepath.Join(s.db.GetDownloadDir(), torrent.Name()), r.TargetDir); err != nil {
-			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 {
-			return errors.Wrap(err, "move file")
-
-		}
+	//如果种子是路径，则会把路径展开，只移动文件，类似 move dir/* dir2/, 如果种子是文件，则会直接移动文件，类似 move file dir/
+	if err := stImpl.Move(filepath.Join(s.db.GetDownloadDir(), torrent.Name()), r.TargetDir); err != nil {
+		return errors.Wrap(err, "move file")
 	}
 
 	log.Infof("move downloaded files to target dir success, file: %v, target dir: %v", torrent.Name(), r.TargetDir)

server/watchlist.go

@@ -60,7 +60,7 @@ type addWatchlistIn struct {
 	TmdbID                  int    `json:"tmdb_id" binding:"required"`
 	StorageID               int    `json:"storage_id" `
 	Resolution              string `json:"resolution" binding:"required"`
-	Folder                  string `json:"folder"`
+	Folder                  string `json:"folder" binding:"required"`
 	DownloadHistoryEpisodes bool   `json:"download_history_episodes"` //for tv
 }
 
@@ -187,7 +187,7 @@ func (s *Server) AddMovie2Watchlist(c *gin.Context) (interface{}, error) {
 		AirDate:      detail.ReleaseDate,
 		Resolution:   media.Resolution(in.Resolution),
 		StorageID:    in.StorageID,
-		TargetDir:    "./",
+		TargetDir:    in.Folder,
 	}, []int{epid})
 	if err != nil {
 		return nil, errors.Wrap(err, "add to list")