Skip to content

Commit

Permalink
Make use of XAttr included in the Link object, rather than getting it…
Browse files Browse the repository at this point in the history
… with an extra API request.
  • Loading branch information
lawmurray committed Sep 18, 2024
1 parent cd25c03 commit a6d0537
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions file.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,19 @@ func (protonDrive *ProtonDrive) GetActiveRevisionAttrs(ctx context.Context, link
return nil, ErrLinkMustNotBeNil
}

revisionsMetadata, err := protonDrive.GetRevisions(ctx, link, proton.RevisionStateActive)
if err != nil {
return nil, err
}

if len(revisionsMetadata) != 1 {
return nil, ErrCantFindActiveRevision
}
revisionMetadata := link.FileProperties.ActiveRevision
revisionMetadata.XAttr = link.XAttr

nodeKR, err := protonDrive.getLinkKR(ctx, link)
if err != nil {
return nil, err
}

signatureVerificationKR, err := protonDrive.getSignatureVerificationKeyring([]string{link.FileProperties.ActiveRevision.SignatureEmail})
signatureVerificationKR, err := protonDrive.getSignatureVerificationKeyring([]string{revisionMetadata.SignatureEmail})
if err != nil {
return nil, err
}
revisionXAttrCommon, err := revisionsMetadata[0].GetDecXAttrString(signatureVerificationKR, nodeKR)
revisionXAttrCommon, err := revisionMetadata.GetDecXAttrString(signatureVerificationKR, nodeKR)
if err != nil {
return nil, err
}
Expand Down

0 comments on commit a6d0537

Please sign in to comment.