Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(fs/other): add check status
  • Loading branch information
KirCute committed Nov 26, 2025
commit ed68c19eb07f46043f80591b21be260097b50af1
15 changes: 5 additions & 10 deletions drivers/alias/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -234,16 +234,8 @@ func (d *Alias) Other(ctx context.Context, args model.OtherArgs) (interface{}, e
if err != nil {
continue
}
other, ok := storage.(driver.Other)
if !ok {
continue
}
obj, err := op.GetUnwrap(ctx, storage, actualPath)
if err != nil {
continue
}
return other.Other(ctx, model.OtherArgs{
Obj: obj,
return op.Other(ctx, storage, model.FsOtherArgs{
Path: actualPath,
Method: args.Method,
Data: args.Data,
})
Expand Down Expand Up @@ -535,6 +527,9 @@ func (d *Alias) ResolveLinkCacheMode(path string) driver.LinkCacheMode {
if err != nil {
continue
}
if storage.Config().CheckStatus && storage.GetStorage().GetStorage().Status != op.WORK {
continue
}
mode := storage.Config().LinkCacheMode
if mode == -1 {
return storage.(driver.LinkCacheModeResolver).ResolveLinkCacheMode(actualPath)
Expand Down
8 changes: 7 additions & 1 deletion drivers/crypt/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,13 @@ func (d *Crypt) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
}
return nil, err
}
return op.GetStorageDetails(ctx, remoteStorage)
remoteDetails, err := op.GetStorageDetails(ctx, remoteStorage)
if err != nil {
return nil, err
}
return &model.StorageDetails{
DiskUsage: remoteDetails.DiskUsage,
}, nil
}

//func (d *Safe) Other(ctx context.Context, args model.OtherArgs) (interface{}, error) {
Expand Down
5 changes: 3 additions & 2 deletions drivers/crypt/meta.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

type Addition struct {
// Usually one of two
//driver.RootPath
//driver.RootID
// driver.RootPath
// driver.RootID
// define other

FileNameEnc string `json:"filename_encryption" type:"select" required:"true" options:"off,standard,obfuscate" default:"off"`
Expand All @@ -32,6 +32,7 @@ var config = driver.Config{
NoCache: true,
DefaultRoot: "/",
NoLinkURL: true,
CheckStatus: true,
}

func init() {
Expand Down
23 changes: 13 additions & 10 deletions internal/op/fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,20 +227,23 @@ func Link(ctx context.Context, storage driver.Driver, path string, args model.Li
}

// Other api
func Other(ctx context.Context, storage driver.Driver, args model.FsOtherArgs) (interface{}, error) {
func Other(ctx context.Context, storage driver.Driver, args model.FsOtherArgs) (any, error) {
if storage.Config().CheckStatus && storage.GetStorage().Status != WORK {
return nil, errors.WithMessagef(errs.StorageNotInit, "storage status: %s", storage.GetStorage().Status)
}
o, ok := storage.(driver.Other)
if !ok {
return nil, errs.NotImplement
}
obj, err := GetUnwrap(ctx, storage, args.Path)
if err != nil {
return nil, errors.WithMessagef(err, "failed to get obj")
}
if o, ok := storage.(driver.Other); ok {
return o.Other(ctx, model.OtherArgs{
Obj: obj,
Method: args.Method,
Data: args.Data,
})
} else {
return nil, errs.NotImplement
}
return o.Other(ctx, model.OtherArgs{
Obj: obj,
Method: args.Method,
Data: args.Data,
})
}

var mkdirG singleflight.Group[any]
Expand Down