Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
36 changes: 4 additions & 32 deletions drivers/strm/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,10 @@ func (d *Strm) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]
}

func (d *Strm) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
root, sub := d.getRootAndPath(file.GetPath())
dsts, ok := d.pathMap[root]
if !ok {
return nil, errs.ObjectNotFound
}
for _, dst := range dsts {
link, err := d.link(ctx, dst, sub)
if err == nil {
return link, nil
}
}
return nil, errs.ObjectNotFound
link := d.getLink(ctx, file.GetPath())
return &model.Link{
MFile: model.NewNopMFile(strings.NewReader(link)),
}, nil
}

func (d *Strm) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
Expand All @@ -150,24 +142,4 @@ func (d *Strm) Put(ctx context.Context, dstDir model.Obj, s model.FileStreamer,
return errors.New("strm Driver cannot put file")
}

func (d *Strm) PutURL(ctx context.Context, dstDir model.Obj, name, url string) error {
return errors.New("strm Driver cannot put file")
}

func (d *Strm) GetArchiveMeta(ctx context.Context, obj model.Obj, args model.ArchiveArgs) (model.ArchiveMeta, error) {
return nil, errs.NotImplement
}

func (d *Strm) ListArchive(ctx context.Context, obj model.Obj, args model.ArchiveInnerArgs) ([]model.Obj, error) {
return nil, errs.NotImplement
}

func (d *Strm) Extract(ctx context.Context, obj model.Obj, args model.ArchiveInnerArgs) (*model.Link, error) {
return nil, errs.NotImplement
}

func (d *Strm) ArchiveDecompress(ctx context.Context, srcObj, dstDir model.Obj, args model.ArchiveDecompressArgs) error {
return errs.NotImplement
}

var _ driver.Driver = (*Strm)(nil)
13 changes: 1 addition & 12 deletions drivers/strm/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func (d *Strm) list(ctx context.Context, dst, sub string, args *fs.ListArgs) ([]
Size: size,
Modified: obj.ModTime(),
IsFolder: obj.IsDir(),
Path: stdpath.Join(sub, obj.GetName()),
Path: stdpath.Join(reqPath, obj.GetName()),
}
thumb, ok := model.GetThumb(obj)
if !ok {
Expand All @@ -126,17 +126,6 @@ func (d *Strm) list(ctx context.Context, dst, sub string, args *fs.ListArgs) ([]
})
}

func (d *Strm) link(ctx context.Context, dst, sub string) (*model.Link, error) {
reqPath := stdpath.Join(dst, sub)
_, err := fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
if err != nil {
return nil, err
}
return &model.Link{
MFile: model.NewNopMFile(strings.NewReader(d.getLink(ctx, reqPath))),
}, nil
}

func (d *Strm) getLink(ctx context.Context, path string) string {
apiUrl := d.SiteUrl
if len(apiUrl) > 0 {
Expand Down
Loading