Skip to content

Fix restoring files from the trashbin #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
butonic merged 1 commit into from
Feb 28, 2025
Merged

Fix restoring files from the trashbin #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 20 additions & 1 deletion pkg/storage/fs/posix/trashbin/trashbin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,25 @@ type Trashbin struct {
log *zerolog.Logger
}

// trashNode is a helper struct to make trash items available for manipulation in the metadata backend
type trashNode struct {
spaceID string
id string
path string
}

func (tn *trashNode) GetSpaceID() string {
return tn.spaceID
}

func (tn *trashNode) GetID() string {
return tn.id
}

func (tn *trashNode) InternalPath() string {
return tn.path
}

const (
trashHeader = `[Trash Info]`
timeFormat = "2006-01-02T15:04:05"
Expand Down Expand Up @@ -254,7 +273,7 @@ func (tb *Trashbin) RestoreRecycleItem(ctx context.Context, ref *provider.Refere
return fmt.Errorf("trashbin: parent id not found for %s", restorePath)
}

trashNode := node.NewBaseNode(spaceID, id, tb.lu)
trashNode := &trashNode{spaceID: spaceID, id: id, path: trashPath}
err = tb.lu.MetadataBackend().Set(ctx, trashNode, prefixes.ParentidAttr, []byte(parentID))
if err != nil {
return err
Expand Down