feat: add option to control whether to deleted task

This commit is contained in:
Simon Ding
2024-07-30 21:55:54 +08:00
parent 3525d1bb83
commit 769f217506
17 changed files with 402 additions and 102 deletions

View File

@@ -13,6 +13,7 @@ import (
type Storage interface {
Move(src, dest string) error
Copy(src, dest string) error
ReadDir(dir string) ([]fs.FileInfo, error)
ReadFile(string)([]byte, error)
WriteFile(string, []byte) error
@@ -28,7 +29,7 @@ type LocalStorage struct {
dir string
}
func (l *LocalStorage) Move(src, destDir string) error {
func (l *LocalStorage) Copy(src, destDir string) error {
os.MkdirAll(filepath.Join(l.dir, destDir), os.ModePerm)
targetBase := filepath.Join(l.dir, destDir, filepath.Base(src)) //文件的场景,要加上文件名, move filename ./dir/
@@ -80,8 +81,14 @@ func (l *LocalStorage) Move(src, destDir string) error {
if err != nil {
return errors.Wrap(err, "move file error")
}
return os.RemoveAll(src)
return nil
}
func (l *LocalStorage) Move(src, destDir string) error {
if err := l.Copy(src, destDir); err != nil {
return err
}
return os.RemoveAll(src)
}
func (l *LocalStorage) ReadDir(dir string) ([]fs.FileInfo, error) {

View File

@@ -14,8 +14,8 @@ import (
)
type WebdavStorage struct {
fs *gowebdav.Client
dir string
fs *gowebdav.Client
dir string
changeMediaHash bool
}
@@ -25,14 +25,13 @@ func NewWebdavStorage(url, user, password, path string, changeMediaHash bool) (*
return nil, errors.Wrap(err, "connect webdav")
}
return &WebdavStorage{
fs: c,
fs: c,
dir: path,
}, nil
}
func (w *WebdavStorage) Move(local, remoteDir string) error {
remoteBase := filepath.Join(w.dir,remoteDir, filepath.Base(local))
func (w *WebdavStorage) Copy(local, remoteDir string) error {
remoteBase := filepath.Join(w.dir, remoteDir, filepath.Base(local))
info, err := os.Stat(local)
if err != nil {
return errors.Wrap(err, "read source dir")
@@ -80,7 +79,7 @@ func (w *WebdavStorage) Move(local, remoteDir string) error {
r.Header.Set("Content-Type", mtype.String())
r.ContentLength = info.Size()
}
if err := w.fs.WriteStream(remoteName, f, 0666, callback); err != nil {
return errors.Wrap(err, "transmitting data error")
}
@@ -92,6 +91,13 @@ func (w *WebdavStorage) Move(local, remoteDir string) error {
if err != nil {
return errors.Wrap(err, "move file error")
}
return nil
}
func (w *WebdavStorage) Move(local, remoteDir string) error {
if err := w.Copy(local, remoteDir); err != nil {
return err
}
return os.RemoveAll(local)
}
@@ -99,12 +105,10 @@ func (w *WebdavStorage) ReadDir(dir string) ([]fs.FileInfo, error) {
return w.fs.ReadDir(filepath.Join(w.dir, dir))
}
func (w *WebdavStorage) ReadFile(name string) ([]byte, error) {
return w.fs.Read(filepath.Join(w.dir, name))
}
func (w *WebdavStorage) WriteFile(name string, data []byte) error {
func (w *WebdavStorage) WriteFile(name string, data []byte) error {
return w.fs.Write(filepath.Join(w.dir, name), data, os.ModePerm)
}
}