LumeWeb
/
tusd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cli: Update to new DataStore interfaces

This commit is contained in:
Marius 2019-09-10 10:23:39 +02:00
parent d36b0ea3a9
commit e591c9ea69
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/tusd/cli/composer.go
View File

@ -5,7 +5,6 @@ import (
"path/filepath" "path/filepath"
"github.com/tus/tusd/pkg/filestore" "github.com/tus/tusd/pkg/filestore"
"github.com/tus/tusd/pkg/gcsstore"
"github.com/tus/tusd/pkg/handler" "github.com/tus/tusd/pkg/handler"
"github.com/tus/tusd/pkg/memorylocker" "github.com/tus/tusd/pkg/memorylocker"
"github.com/tus/tusd/pkg/s3store" "github.com/tus/tusd/pkg/s3store"
@ -48,7 +47,7 @@ func CreateComposer() {
stderr.Fatalf("No service account file provided for Google Cloud Storage using the GCS_SERVICE_ACCOUNT_FILE environment variable.\n") stderr.Fatalf("No service account file provided for Google Cloud Storage using the GCS_SERVICE_ACCOUNT_FILE environment variable.\n")
} }
service, err := gcsstore.NewGCSService(gcsSAF) /*service, err := gcsstore.NewGCSService(gcsSAF)
if err != nil { if err != nil {
stderr.Fatalf("Unable to create Google Cloud Storage service: %s\n", err) stderr.Fatalf("Unable to create Google Cloud Storage service: %s\n", err)
} }
@ -60,7 +59,7 @@ func CreateComposer() {
store.UseIn(Composer) store.UseIn(Composer)
locker := memorylocker.New() locker := memorylocker.New()
locker.UseIn(Composer) locker.UseIn(Composer)*/
} else { } else {
dir, err := filepath.Abs(Flags.UploadDir) dir, err := filepath.Abs(Flags.UploadDir)
if err != nil { if err != nil {
@ -74,6 +73,7 @@ func CreateComposer() {
store := filestore.New(dir) store := filestore.New(dir)
store.UseIn(Composer) store.UseIn(Composer)
// TODO: Add locker
} }
stdout.Printf("Using %.2fMB as maximum size.\n", float64(Flags.MaxSize)/1024/1024) stdout.Printf("Using %.2fMB as maximum size.\n", float64(Flags.MaxSize)/1024/1024)

6
cmd/tusd/cli/hooks.go
View File

@ -23,16 +23,16 @@ type hookDataStore struct {
handler.DataStore handler.DataStore
} }
func (store hookDataStore) NewUpload(info handler.FileInfo) (id string, err error) { func (store hookDataStore) NewUpload(info handler.FileInfo) (handler.Upload, error) {
if output, err := invokeHookSync(hooks.HookPreCreate, info, true); err != nil { if output, err := invokeHookSync(hooks.HookPreCreate, info, true); err != nil {
if hookErr, ok := err.(hooks.HookError); ok { if hookErr, ok := err.(hooks.HookError); ok {
return "", hooks.NewHookError( return nil, hooks.NewHookError(
fmt.Errorf("pre-create hook failed: %s", err), fmt.Errorf("pre-create hook failed: %s", err),
hookErr.StatusCode(), hookErr.StatusCode(),
hookErr.Body(), hookErr.Body(),
) )
} }
return "", fmt.Errorf("pre-create hook failed: %s\n%s", err, string(output)) return nil, fmt.Errorf("pre-create hook failed: %s\n%s", err, string(output))
} }
return store.DataStore.NewUpload(info) return store.DataStore.NewUpload(info)
} }