Skip to content

Commit 2586ac8

Browse files
committed
fix(preprocess): use old approach with changing css
1 parent 8855ff2 commit 2586ac8

File tree

2 files changed

+13
-21
lines changed

2 files changed

+13
-21
lines changed

css-map.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@
280280
"_4JsFsdrKufWvrC44apn": "main-avatar-avatar",
281281
"hdfu3dPuuRgPc8xx": "main-avatar-image",
282282
"Xgnpn7u01MvGEhekIGLT": "main-avatar-image",
283+
"Xz3tlahv16UpqKBW5HdK": "main-avatar-image",
283284
"yzLEMgdzXgAnIZZwMHO1": "main-avatar-piled",
284285
"ENopS3htmKy15q_QCR2j": "main-avatar-piledIcon",
285286
"m95Ymx847hCaxHjmyXKX": "main-avatar-placeholderTransparent",
@@ -332,6 +333,7 @@
332333
"P7j2kCLc27vLybuzy5XB": "main-buddyFeed-usernameAndTimestamp",
333334
"LunqxlFIupJw_Dkx6mNx": "main-card-card",
334335
"_hPU2Qo7dicv7cnikDRl": "main-card-card",
336+
"aAYpzGljXQv1_zfopxaH": "main-card-cardContainer",
335337
"RKstfK7T5nPbsDOYT6sT": "main-card-cardContainer",
336338
"RPV24T758a0OhKtZ": "main-card-cardContainer",
337339
"tsv7E_RBBw6v0XTQlcRo": "main-card-cardLink",
@@ -1938,7 +1940,7 @@
19381940
"KodyK77Gzjb8NqPGpcgw": "playlist-playlist-searchBoxContainer",
19391941
"fi2ogH5_6Zo6KFrv": "playlist-playlist-searchBoxContainer",
19401942
"AxpwP8HQvk3dZq9rdOk4": "playlist-playlist-searchBoxContainerFlexCenter",
1941-
"GUAmMC1m67Aw7HSS ": "playlist-playlist-searchBoxContainerFlexCenter",
1943+
"GUAmMC1m67Aw7HSS": "playlist-playlist-searchBoxContainerFlexCenter",
19421944
"sAPXlA_oxu_8x1Cn0NTC": "playlist-playlist-searchResultListContainer",
19431945
"Io77HTglJbEJrEwo": "playlist-playlist-sectionGrid",
19441946
"NZSm7v3HZHzo7ICrNZK5": "playlist-playlist-sectionGrid",

src/preprocess/preprocess.go

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,6 @@ func Start(version string, spotifyBasePath string, extractedAppsPath string, fla
104104
readLocalCssMap(&cssTranslationMap)
105105
}
106106

107-
cssMapPairs := make([]string, 0, len(cssTranslationMap)*2)
108-
for k, v := range cssTranslationMap {
109-
cssMapPairs = append(cssMapPairs, k, v)
110-
}
111-
cssMapJSReplacer := strings.NewReplacer(cssMapPairs...)
112-
cssMapJSStringRe := regexp.MustCompile(`"[^"]*"|'[^']*'|` + "`[^`]*`" + `|\b[a-zA-Z0-9_]{16,21}\s*:`)
113-
114107
verParts := strings.Split(flags.SpotifyVer, ".")
115108
spotifyMajor, spotifyMinor, spotifyPatch := 0, 0, 0
116109
if len(verParts) > 0 {
@@ -266,19 +259,16 @@ func Start(version string, spotifyBasePath string, extractedAppsPath string, fla
266259
})
267260
}
268261

269-
content = cssMapJSStringRe.ReplaceAllStringFunc(content, func(match string) string {
270-
first := match[0]
271-
if first == '"' || first == '\'' || first == '`' {
272-
inner := match[1 : len(match)-1]
273-
return string(first) + cssMapJSReplacer.Replace(inner) + string(first)
274-
}
275-
colonIdx := strings.LastIndex(match, ":")
276-
key := strings.TrimSpace(match[:colonIdx])
277-
if replaced, ok := cssTranslationMap[key]; ok {
278-
return `"` + replaced + `"` + match[colonIdx:]
279-
}
280-
return match
281-
})
262+
for k, v := range cssTranslationMap {
263+
// Object keys
264+
utils.Replace(&content, `(`+k+`)(\s*:)`, func(submatches ...string) string {
265+
return `"` + v + `"` + submatches[2]
266+
})
267+
// Remaining occurrences (inside string literals etc.)
268+
utils.Replace(&content, k, func(submatches ...string) string {
269+
return v
270+
})
271+
}
282272
content = colorVariableReplaceForJS(content)
283273

284274
return content

0 commit comments

Comments
 (0)