mirror of
https://github.com/krau/SaveAny-Bot.git
synced 2026-06-26 01:31:29 +08:00
feat: add stream upload support and related configurations
This commit is contained in:
@@ -9,6 +9,7 @@ import (
|
||||
"net/url"
|
||||
"os"
|
||||
"path"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/krau/SaveAny-Bot/config"
|
||||
@@ -150,3 +151,88 @@ func (a *Alist) Save(ctx context.Context, filePath, storagePath string) error {
|
||||
func (a *Alist) JoinStoragePath(task types.Task) string {
|
||||
return path.Join(a.config.BasePath, task.StoragePath)
|
||||
}
|
||||
|
||||
type uploadStream struct {
|
||||
ctx context.Context
|
||||
client *http.Client
|
||||
token string
|
||||
storagePath string
|
||||
baseURL string
|
||||
pr *io.PipeReader
|
||||
pw *io.PipeWriter
|
||||
errChan chan error
|
||||
once sync.Once
|
||||
}
|
||||
|
||||
func (us *uploadStream) Write(p []byte) (int, error) {
|
||||
return us.pw.Write(p)
|
||||
}
|
||||
|
||||
func (us *uploadStream) Close() error {
|
||||
var uploadErr error
|
||||
us.once.Do(func() {
|
||||
if err := us.pw.Close(); err != nil {
|
||||
uploadErr = fmt.Errorf("failed to close pipe writer: %w", err)
|
||||
return
|
||||
}
|
||||
|
||||
if err := <-us.errChan; err != nil {
|
||||
uploadErr = err
|
||||
}
|
||||
})
|
||||
return uploadErr
|
||||
}
|
||||
|
||||
func (a *Alist) NewUploadStream(ctx context.Context, storagePath string) (io.WriteCloser, error) {
|
||||
if a.token == "" {
|
||||
if err := a.getToken(); err != nil {
|
||||
return nil, fmt.Errorf("not logged in to Alist: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
pr, pw := io.Pipe()
|
||||
|
||||
// 创建上传流对象
|
||||
us := &uploadStream{
|
||||
ctx: ctx,
|
||||
client: a.client,
|
||||
token: a.token,
|
||||
storagePath: storagePath,
|
||||
baseURL: a.baseURL,
|
||||
pr: pr,
|
||||
pw: pw,
|
||||
errChan: make(chan error, 1),
|
||||
}
|
||||
|
||||
go func() {
|
||||
defer close(us.errChan)
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPut, a.baseURL+"/api/fs/put", pr)
|
||||
if err != nil {
|
||||
us.errChan <- fmt.Errorf("failed to create request: %w", err)
|
||||
return
|
||||
}
|
||||
|
||||
req.Header.Set("Authorization", a.token)
|
||||
req.Header.Set("File-Path", url.PathEscape(storagePath))
|
||||
req.Header.Set("As-Task", "true")
|
||||
req.Header.Set("Content-Type", "application/octet-stream")
|
||||
|
||||
resp, err := a.client.Do(req)
|
||||
if err != nil {
|
||||
us.errChan <- fmt.Errorf("failed to send request: %w", err)
|
||||
return
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
body, _ := io.ReadAll(resp.Body)
|
||||
us.errChan <- fmt.Errorf("failed to upload file, status code: %d, response: %s", resp.StatusCode, string(body))
|
||||
return
|
||||
}
|
||||
|
||||
us.errChan <- nil
|
||||
}()
|
||||
|
||||
return us, nil
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package local
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
@@ -55,3 +56,18 @@ func (l *Local) Save(ctx context.Context, filePath, storagePath string) error {
|
||||
func (l *Local) JoinStoragePath(task types.Task) string {
|
||||
return filepath.Join(l.config.BasePath, task.StoragePath)
|
||||
}
|
||||
|
||||
func (l *Local) NewUploadStream(ctx context.Context, path string) (io.WriteCloser, error) {
|
||||
absPath, err := filepath.Abs(path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := fileutil.CreateDir(filepath.Dir(absPath)); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
file, err := os.Create(absPath)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return file, nil
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package storage
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
|
||||
"github.com/krau/SaveAny-Bot/config"
|
||||
"github.com/krau/SaveAny-Bot/logger"
|
||||
@@ -20,6 +21,11 @@ type Storage interface {
|
||||
Save(cttx context.Context, localFilePath, storagePath string) error
|
||||
}
|
||||
|
||||
type StreamStorage interface {
|
||||
Storage
|
||||
NewUploadStream(ctx context.Context, path string) (io.WriteCloser, error)
|
||||
}
|
||||
|
||||
var Storages = make(map[string]Storage)
|
||||
|
||||
var UserStorages = make(map[int64][]Storage)
|
||||
|
||||
50
storage/webdav/stream.go
Normal file
50
storage/webdav/stream.go
Normal file
@@ -0,0 +1,50 @@
|
||||
package webdav
|
||||
|
||||
// TODO: gowebdav's WriteStream impl cause high memory usage, need to implement our own WriteStream
|
||||
// type WebdavWriter struct {
|
||||
// pipeWriter *io.PipeWriter
|
||||
// done chan error
|
||||
// path string
|
||||
// }
|
||||
|
||||
// func (w *WebdavWriter) Write(p []byte) (n int, err error) {
|
||||
// return w.pipeWriter.Write(p)
|
||||
// }
|
||||
|
||||
// func (w *WebdavWriter) Close() error {
|
||||
// if err := w.pipeWriter.Close(); err != nil {
|
||||
// return err
|
||||
// }
|
||||
// if err := <-w.done; err != nil {
|
||||
// return fmt.Errorf("upload failed: %w", err)
|
||||
// }
|
||||
|
||||
// return nil
|
||||
// }
|
||||
|
||||
// func (w *Webdav) NewUploadStream(ctx context.Context, storagePath string) (io.WriteCloser, error) {
|
||||
// if err := w.client.MkdirAll(path.Dir(storagePath), os.ModePerm); err != nil {
|
||||
// logger.L.Errorf("Failed to create directory %s: %v", path.Dir(storagePath), err)
|
||||
// return nil, ErrFailedToCreateDirectory
|
||||
// }
|
||||
// pipeReader, pipeWriter := io.Pipe()
|
||||
// done := make(chan error, 1)
|
||||
// go func() {
|
||||
// defer func() {
|
||||
// if err := recover(); err != nil {
|
||||
// done <- fmt.Errorf("panic during upload: %v", err)
|
||||
// }
|
||||
// }()
|
||||
|
||||
// err := w.client.WriteStream(storagePath, pipeReader, os.ModePerm)
|
||||
|
||||
// pipeReader.Close()
|
||||
// done <- err
|
||||
// }()
|
||||
|
||||
// return &WebdavWriter{
|
||||
// pipeWriter: pipeWriter,
|
||||
// done: done,
|
||||
// path: storagePath,
|
||||
// }, nil
|
||||
// }
|
||||
Reference in New Issue
Block a user