tomo/xdg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

ParseMultiple just takes a separator rune

Browse Source
This commit is contained in:
Sasha Koshka
2024-04-28 23:02:21 -04:00
parent 19b442598d
commit c465ff6d1e
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
icon-theme/icon-theme.go
View File

@@ -186,9 +186,9 @@ func parseThemeIndex (reader io.Reader) (theme Theme, parents []string, err erro
// Inherits (optional)
if entry, ok := iconThemeGroup["Inherits"]; ok {
parents, err = keyValue.ParseMultipleComma (
parents, err = keyValue.ParseMultiple (
keyValue.ParseString,
entry.Value)
entry.Value, ',')
if !ok { return Theme { }, nil, err }
}
@@ -220,7 +220,7 @@ func parseThemeIndex (reader io.Reader) (theme Theme, parents []string, err erro
}
func parseDirectories (listEntry keyValue.Entry, file keyValue.File) ([]Directory, error) {
names, err := keyValue.ParseMultipleComma(keyValue.ParseString, listEntry.Value)
names, err := keyValue.ParseMultiple(keyValue.ParseString, listEntry.Value, ',')
if err != nil { return nil, err }
directories := make([]Directory, len(names))
for index, name := range names {
@@ -523,7 +523,7 @@ func parseIconData (path string) (Icon, error) {
// EmbeddedTextRectangle (optional)
if entry, ok := iconDataGroup["EmbeddedTextRectangle"]; ok {
embeddedTextRectangle, err := keyValue.ParseMultipleComma(keyValue.ParseInteger, entry.Value)
embeddedTextRectangle, err := keyValue.ParseMultiple(keyValue.ParseInteger, entry.Value, ',')
if len(embeddedTextRectangle) == 4 {
icon.EmbeddedTextRectangle = image.Rect (
embeddedTextRectangle[0],