consolidate external text trimming

This commit is contained in:
sentriz
2023-12-10 18:44:59 +00:00
parent e31e37e366
commit a8333b8afa
4 changed files with 21 additions and 33 deletions

View File

@@ -8,10 +8,8 @@ import (
"fmt"
"net/http"
"net/url"
"regexp"
"sort"
"strconv"
"strings"
"time"
"github.com/andybalholm/cascadia"
@@ -60,9 +58,6 @@ func (c *Client) ArtistGetInfo(artistName string) (Artist, error) {
return Artist{}, fmt.Errorf("make request: %w", err)
}
resp.Artist.Bio.Summary = cleanLicenceText(resp.Artist.Bio.Summary)
resp.Artist.Bio.Content = cleanLicenceText(resp.Artist.Bio.Content)
return resp.Artist, nil
}
@@ -83,9 +78,6 @@ func (c *Client) AlbumGetInfo(artistName, albumName string) (Album, error) {
return Album{}, fmt.Errorf("make request: %w", err)
}
resp.Album.Wiki.Summary = cleanLicenceText(resp.Album.Wiki.Summary)
resp.Album.Wiki.Content = cleanLicenceText(resp.Album.Wiki.Content)
return resp.Album, nil
}
@@ -333,15 +325,3 @@ func GetParamSignature(params url.Values, secret string) string {
hash := md5.Sum([]byte(toHash))
return hex.EncodeToString(hash[:])
}
var doublePuncExpr = regexp.MustCompile(`\.\s+\.\s+`)
var licenceExpr = regexp.MustCompile(`(?i)user-contributed text.*`)
func cleanLicenceText(text string) string {
text = licenceExpr.ReplaceAllString(text, "")
text = doublePuncExpr.ReplaceAllString(text, ". ")
text = strings.ReplaceAll(text, " .", ".")
text = strings.Join(strings.Fields(text), " ")
text = strings.TrimSpace(text)
return text
}