jiazhizhong/polaris
1
0
Fork 0
mirror of https://github.com/simon-ding/polaris.git synced 2026-06-06 01:57:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: moving file after complete

Browse Source
This commit is contained in:
Simon Ding
2024-07-15 10:30:41 +08:00
parent 3104c9fe6a
commit f37a8eeb5f
4 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/scheduler.go
View File

@@ -61,27 +61,28 @@ func (s *Server) moveCompletedTask(id int) error {
}
st := s.db.GetStorage(series.StorageID)
log.Infof("move task files to target dir: %v", r.TargetDir)
var stImpl storage.Storage
if st.Implementation == storage1.ImplementationWebdav {
ws := st.ToWebDavSetting()
storageImpl, err := storage.NewWebdavStorage(ws.Path, ws.User, ws.Password)
storageImpl, err := storage.NewWebdavStorage(ws.URL, ws.User, ws.Password, ws.Path)
if err != nil {
return errors.Wrap(err, "new webdav")
}
if err := storageImpl.Move(filepath.Join(s.db.GetDownloadDir(), torrent.Name()), r.TargetDir); err != nil {
return errors.Wrap(err, "move webdav")
}
stImpl = storageImpl
} else if st.Implementation == storage1.ImplementationLocal {
ls := st.ToLocalSetting()
storageImpl, err := storage.NewLocalStorage(ls.Path)
if err != nil {
return errors.Wrap(err, "new storage")
}
if err := storageImpl.Move(filepath.Join(s.db.GetDownloadDir(), torrent.Name()), r.TargetDir); err != nil {
return errors.Wrap(err, "move webdav")
}
stImpl = storageImpl
}
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)
torrent.Remove()
delete(s.tasks, r.ID)
@@ -102,11 +103,10 @@ func (s *Server) checkAllFiles() {
}
}
func (s *Server) checkFileExists(series *ent.Series) error{
func (s *Server) checkFileExists(series *ent.Series) error {
log.Infof("check files in directory: %s", series.TargetDir)
st := s.db.GetStorage(series.StorageID)
targetDir := filepath.Join(st.GetPath(), series.TargetDir)
var storageImpl storage.Storage
switch st.Implementation {
@@ -120,20 +120,20 @@ func (s *Server) checkFileExists(series *ent.Series) error{
case storage1.ImplementationWebdav:
ws := st.ToWebDavSetting()
storageImpl1, err := storage.NewWebdavStorage(ws.Path, ws.User, ws.Password)
storageImpl1, err := storage.NewWebdavStorage(ws.URL, ws.User, ws.Password, ws.Path)
if err != nil {
return errors.Wrap(err, "new webdav")
}
storageImpl = storageImpl1
}
files, err := storageImpl.ReadDir(targetDir)
}
files, err := storageImpl.ReadDir(series.TargetDir)
if err != nil {
return errors.Wrapf(err, "read dir %s", targetDir)
return errors.Wrapf(err, "read dir %s", series.TargetDir)
}
numRe := regexp.MustCompile("[0-9]+")
epRe := regexp.MustCompile("E[0-9]+")
for _, in := range files {
if !in.IsDir() {//season dir, ignore file
if !in.IsDir() { //season dir, ignore file
continue
}
nums := numRe.FindAllString(in.Name(), -1)
@@ -170,4 +170,4 @@ func (s *Server) checkFileExists(series *ent.Series) error{
type Task struct {
Processing bool
pkg.Torrent
}
}