oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-01 17:38:37 +00:00
Code Wiki Activity

refactor(sanitizer): micro-optimizations of internal/reader/sanitizer/srcset.go

Browse source 
- Pre-allocate a slice
- Inline a local variable
- Remove a superfluous call to `strings.TrimSpace`
- Simplify some conditions via a switch-case construct
This commit is contained in:
Julien Voisin 2024-12-08 00:27:56 +00:00 • committed by GitHub
parent 8cdf76df69
commit 92a49d7e69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/reader/sanitizer/srcset.go
View file

@ -17,12 +17,12 @@ type ImageCandidate struct {
type ImageCandidates []*ImageCandidate type ImageCandidates []*ImageCandidate
func (c ImageCandidates) String() string { func (c ImageCandidates) String() string {
var htmlCandidates []string htmlCandidates := make([]string, 0, len(c))
for _, imageCandidate := range c { for _, imageCandidate := range c {
var htmlCandidate string var htmlCandidate string
if imageCandidate.Descriptor != "" { if imageCandidate.Descriptor != "" {
htmlCandidate = fmt.Sprintf(`%s %s`, imageCandidate.ImageURL, imageCandidate.Descriptor) htmlCandidate = imageCandidate.ImageURL + " " + imageCandidate.Descriptor
} else { } else {
htmlCandidate = imageCandidate.ImageURL htmlCandidate = imageCandidate.ImageURL
} }
@ -36,9 +36,7 @@ func (c ImageCandidates) String() string {
// ParseSrcSetAttribute returns the list of image candidates from the set. // ParseSrcSetAttribute returns the list of image candidates from the set.
// https://html.spec.whatwg.org/#parse-a-srcset-attribute // https://html.spec.whatwg.org/#parse-a-srcset-attribute
func ParseSrcSetAttribute(attributeValue string) (imageCandidates ImageCandidates) { func ParseSrcSetAttribute(attributeValue string) (imageCandidates ImageCandidates) {
unparsedCandidates := strings.Split(attributeValue, ", ") for _, unparsedCandidate := range strings.Split(attributeValue, ", ") {
for _, unparsedCandidate := range unparsedCandidates {
if candidate, err := parseImageCandidate(unparsedCandidate); err == nil { if candidate, err := parseImageCandidate(unparsedCandidate); err == nil {
imageCandidates = append(imageCandidates, candidate) imageCandidates = append(imageCandidates, candidate)
} }
@ -48,22 +46,20 @@ func ParseSrcSetAttribute(attributeValue string) (imageCandidates ImageCandidate
} }
func parseImageCandidate(input string) (*ImageCandidate, error) { func parseImageCandidate(input string) (*ImageCandidate, error) {
input = strings.TrimSpace(input)
parts := strings.Split(strings.TrimSpace(input), " ") parts := strings.Split(strings.TrimSpace(input), " ")
nbParts := len(parts) nbParts := len(parts)
if nbParts > 2 || nbParts == 0 { switch {
return nil, fmt.Errorf(`srcset: invalid number of descriptors`) case nbParts == 1:
} return &ImageCandidate{ImageURL: parts[0]}, nil
case nbParts == 2:
if nbParts == 2 {
if !isValidWidthOrDensityDescriptor(parts[1]) { if !isValidWidthOrDensityDescriptor(parts[1]) {
return nil, fmt.Errorf(`srcset: invalid descriptor`) return nil, fmt.Errorf(`srcset: invalid descriptor`)
} }
return &ImageCandidate{ImageURL: parts[0], Descriptor: parts[1]}, nil return &ImageCandidate{ImageURL: parts[0], Descriptor: parts[1]}, nil
default:
return nil, fmt.Errorf(`srcset: invalid number of descriptors`)
} }
return &ImageCandidate{ImageURL: parts[0]}, nil
} }
func isValidWidthOrDensityDescriptor(value string) bool { func isValidWidthOrDensityDescriptor(value string) bool {