refactor: change type of percentage to float64

This commit is contained in:
Andy Hsu
2023-10-04 20:59:11 +08:00
parent 7db3975b18
commit ea9a3432ab
27 changed files with 66 additions and 55 deletions

View File

@ -3,6 +3,7 @@ package offline_download
import (
"io"
"os"
"time"
"github.com/alist-org/alist/v3/internal/model"
)
@ -15,7 +16,7 @@ type AddUriArgs struct {
}
type Status struct {
Progress int
Progress float64
NewTID string
Completed bool
Status string
@ -39,9 +40,10 @@ type Tool interface {
type File struct {
io.ReadCloser
Name string
Size int64
Path string
Name string
Size int64
Path string
Modified time.Time
}
func (f *File) GetReadCloser() (io.ReadCloser, error) {

View File

@ -11,6 +11,7 @@ import (
"github.com/alist-org/alist/v3/internal/model"
"github.com/alist-org/alist/v3/internal/op"
"github.com/alist-org/alist/v3/internal/stream"
"github.com/alist-org/alist/v3/pkg/task"
"github.com/alist-org/alist/v3/pkg/utils"
"github.com/pkg/errors"
@ -134,22 +135,24 @@ func (m *Monitor) Complete() error {
if err != nil {
return errors.Wrapf(err, "failed to open file %s", file.Path)
}
stream := &model.FileStream{
s := &stream.FileStream{
Ctx: nil,
Obj: &model.Object{
Name: path.Base(file.Path),
Size: file.Size,
Modified: time.Now(),
Modified: file.Modified,
IsFolder: false,
},
ReadCloser: rc,
Mimetype: mimetype,
Reader: rc,
Mimetype: mimetype,
Closers: utils.NewClosers(rc),
}
relDir, err := filepath.Rel(m.tempDir, filepath.Dir(file.Path))
if err != nil {
log.Errorf("find relation directory error: %v", err)
}
newDistDir := filepath.Join(dstDirActualPath, relDir)
return op.Put(tsk.Ctx, storage, newDistDir, stream, tsk.SetProgress)
return op.Put(tsk.Ctx, storage, newDistDir, s, tsk.SetProgress)
},
}))
}

View File

@ -13,9 +13,10 @@ func GetFiles(dir string) ([]*File, error) {
}
if !info.IsDir() {
files = append(files, &File{
Name: info.Name(),
Size: info.Size(),
Path: path,
Name: info.Name(),
Size: info.Size(),
Path: path,
Modified: info.ModTime(),
})
}
return nil