github-mirror/alist
github-mirror/alist
2
0
Fork 0
mirror of https://github.com/AlistGo/alist.git synced 2025-04-24 22:34:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge 79e8b81758a814e7addaf4d291a48817a2ce8039 into 41bdab49aa8acca9e88862c3db55cd7a8a84ba6a

Browse Source
This commit is contained in:
折纸飞机 2025-04-19 14:57:26 +08:00 committed by GitHub
commit e052c73871
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/bootstrap/data/task.go
View File

@ -24,6 +24,7 @@ func InitialTasks() []model.TaskItem {
{Key: "copy", PersistData: "[]"},
{Key: "download", PersistData: "[]"},
{Key: "transfer", PersistData: "[]"},
{Key: "upload", PersistData: "[]"},
}
return initialTaskItems
}

2
internal/bootstrap/task.go
View File

@ -18,7 +18,7 @@ func taskFilterNegative(num int) int64 {
}
func InitTaskManager() {
fs.UploadTaskManager = tache.NewManager[*fs.UploadTask](tache.WithWorks(setting.GetInt(conf.TaskUploadThreadsNum, conf.Conf.Tasks.Upload.Workers)), tache.WithMaxRetry(conf.Conf.Tasks.Upload.MaxRetry)) //upload will not support persist
fs.UploadTaskManager = tache.NewManager[*fs.UploadTask](tache.WithWorks(setting.GetInt(conf.TaskUploadThreadsNum, conf.Conf.Tasks.Upload.Workers)), tache.WithPersistFunction(db.GetTaskDataFunc("upload", conf.Conf.Tasks.Upload.TaskPersistant), db.UpdateTaskDataFunc("upload", conf.Conf.Tasks.Upload.TaskPersistant)), tache.WithMaxRetry(conf.Conf.Tasks.Upload.MaxRetry))
op.RegisterSettingChangingCallback(func() {
fs.UploadTaskManager.SetWorkersNumActive(taskFilterNegative(setting.GetInt(conf.TaskUploadThreadsNum, conf.Conf.Tasks.Upload.Workers)))
})

12
internal/fs/put.go
View File

@ -16,12 +16,14 @@ import (
type UploadTask struct {
task.TaskExtension
storage driver.Driver
dstDirActualPath string
FileName string `json:"file_name"`
DstStorageMp string `json:"dst_storage_mp"`
DstDirActualPath string `json:"dst_dir_actual_path"`
file model.FileStreamer
}
func (t *UploadTask) GetName() string {
return fmt.Sprintf("upload %s to [%s](%s)", t.file.GetName(), t.storage.GetStorage().MountPath, t.dstDirActualPath)
return fmt.Sprintf("upload %s to [%s](%s)", t.FileName, t.DstStorageMp, t.DstDirActualPath)
}
func (t *UploadTask) GetStatus() string {
@ -32,7 +34,7 @@ func (t *UploadTask) Run() error {
t.ClearEndTime()
t.SetStartTime(time.Now())
defer func() { t.SetEndTime(time.Now()) }()
return op.Put(t.Ctx(), t.storage, t.dstDirActualPath, t.file, t.SetProgress, true)
return op.Put(t.Ctx(), t.storage, t.DstDirActualPath, t.file, t.SetProgress, true)
}
var UploadTaskManager *tache.Manager[*UploadTask]
@ -60,7 +62,9 @@ func putAsTask(ctx context.Context, dstDirPath string, file model.FileStreamer)
Creator: taskCreator,
},
storage: storage,
dstDirActualPath: dstDirActualPath,
DstStorageMp: storage.GetStorage().MountPath,
DstDirActualPath: dstDirActualPath,
FileName: file.GetName(),
file: file,
}
t.SetTotalBytes(file.GetSize())