2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Expand Up @@ -8,7 +8,7 @@ jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: github/issue-labeler@v3.3
- uses: github/issue-labeler@v3.4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/labeler.yml
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Expand Up @@ -15,6 +15,4 @@ package.json
# Logs
install.log

# VSCode
.vscode
pnpm-lock.yaml
pnpm-lock.yaml
3 changes: 3 additions & 0 deletions .vscode/extensions.json
@@ -0,0 +1,3 @@
{
"recommendations": ["timonwong.shellcheck", "biomejs.biome", "golang.go", "ms-vscode.powershell"]
}
12 changes: 12 additions & 0 deletions .vscode/settings.json
@@ -0,0 +1,12 @@
{
"editor.formatOnSave": true,
"[go]": {
"editor.defaultFormatter": "golang.go"
},
"[powershell]": {
"editor.defaultFormatter": "ms-vscode.powershell"
},
"[javascript][typescript][json]": {
"editor.defaultFormatter": "biomejs.biome"
}
}
6 changes: 3 additions & 3 deletions CustomApps/lyrics-plus/index.js
Expand Up @@ -398,7 +398,7 @@ class LyricsContainer extends react.Component {
["hiragana", "normal", "hiragana"],
["katakana", "normal", "katakana"]
]) {
if (language !== "ja") return;
if (language !== "ja") continue;
this.translator.romajifyText(lyricText, params[0], params[1]).then(result => {
Utils.processTranslatedLyrics(result, lyrics, { state: this.state, stateName: params[2] });
showNotification(200);
Expand All @@ -410,7 +410,7 @@ class LyricsContainer extends react.Component {
["hangul", "hangul"],
["romaja", "romaja"]
]) {
if (language !== "ko") return;
if (language !== "ko") continue;
this.translator.convertToRomaja(lyricText, params[1]).then(result => {
Utils.processTranslatedLyrics(result, lyrics, { state: this.state, stateName: params[1] });
showNotification(200);
Expand All @@ -425,7 +425,7 @@ class LyricsContainer extends react.Component {
["t", "hk"],
["t", "tw"]
]) {
if (!language.includes("zh") || (language === "zh-hans" && params[0] === "t") || (language === "zh-hant" && params[0] === "cn")) return;
if (!language.includes("zh") || (language === "zh-hans" && params[0] === "t") || (language === "zh-hant" && params[0] === "cn")) continue;
this.translator.convertChinese(lyricText, params[0], params[1]).then(result => {
Utils.processTranslatedLyrics(result, lyrics, { state: this.state, stateName: params[1] });
showNotification(200);
Expand Down
2 changes: 1 addition & 1 deletion Extensions/popupLyrics.js
Expand Up @@ -404,7 +404,7 @@ function PopupLyrics() {
const words = str.split(/(\p{sc=Han}|\p{sc=Katakana}|\p{sc=Hiragana}|\p{sc=Hang}|\p{gc=Punctuation})|\s+/gu);
let tempWord = "";
for (let word of words) {
if (!word) word = " ";
word ??= " ";
if (word) {
if (tempWord && /(|')$/.test(tempWord) && word !== " ") {
// End of line not allowed
Expand Down
75 changes: 55 additions & 20 deletions css-map.json
Expand Up @@ -193,6 +193,7 @@
"BtbiwMynlB4flsYu_hA2": "main-shelf-showAll",
"onVWL7MW4PW9FyVajBAc": "main-shelf-titleWrapper",
"OMuRYOdpUbGif12_lRJl": "main-shelf-topRow",
"r4Qmv_YM7IHogP2i1tmJ": "main-shelf-browseGridSection",
"kpGMQq1KFz620g_BD_dS": "main-tag-container",
"Upqw01TOXETOmR5Td7Dj": "main-topBar-UpgradeButton",
"pfMoD1MbelMuF1m8QeMc": "main-topBar-forward",
Expand Down Expand Up @@ -283,6 +284,7 @@
"qJOhHoRcFhHJpEQ2CwFT": "main-trackList-trackListHeaderStuck",
"h4HgbO_Uu1JYg5UGANeQ": "main-trackList-trackListRow",
"wTUruPetkKdWAR1dd6w4": "main-trackList-trackListRowGrid",
"wE9dp6W8uInhrlbWPMsR": "main-trackList-chartTrackList",
"atsRVFhRDxRbOyXyFZjS": "main-userWidget-active",
"odcjv30UQnjaTv4sylc0": "main-userWidget-box",
"eAXFT6yvz37fvS1lmt6k": "main-userWidget-chevron",
Expand All @@ -294,6 +296,7 @@
"p1ULRzPc4bD8eQ4T_wyp": "playback-progressbar",
"TywOcKZEqNynWecCiATc": "progress-bar",
"Vis45PPawTyED7Lt2_LI": "progress-bar__slider",
"DuvrswZugGajIFNXObAr": "progress-bar--isDragging",
"NoOAOv6U6vtqj_ybS1Cd": "x-progressBar-progressBarBg",
"es9mguuOfkp6pBe1Bjlw": "x-toggle-indicator",
"Js64TOfWtHksI6TQ6knT": "x-toggle-indicatorWrapper",
Expand Down Expand Up @@ -504,6 +507,7 @@
"Sl7tzXKh5stpn_y5prU5": "artist-artistOverview-artistOverviewContainer",
"q9GR66ZTM4HH42Z_qroQ": "artist-artistOverview-popularTracks",
"jJ1PYBjdJy5plPbVprT1": "artist-artistOverview-artistShelfSpacer",
"_7rRmILTMMuCiW77ERpvL": "artist-artistOverview-artistShelfRelatedVideos",
"uVh80THccLWIzZYwgUaQ": "artist-artistOverview-sideBlock",
"yTBLU_z7yk9Xp_oN48Q2": "artist-artistOverview-popularTracksBlock",
"kgR8s9v7IzY4G17ZtLbw": "artist-artistOverview-about",
Expand All @@ -523,7 +527,7 @@
"PZkwbwJD1afoCmJkGt8w": "playlist-playlist-top",
"yP3JLuwUNDIQHxRFilK3": "playlist-playlist-header",
"NCKSUYdZaTMrobq8ilkc": "playlist-playlist-subtitle",
"QmGi2oa43BTcEZ5MCr9T": "plyalist-playlist-refreshButton",
"QmGi2oa43BTcEZ5MCr9T": "playlist-playlist-refreshButton",
"Ykd_JWqkR9gSLHISDBwP": "playlist-playlist-playlistInlineCurationSection",
"SMJIXlalPk_TESlyt2pC": "playlist-playlist-playlistInlineCurationTitle",
"g9xHCCSXDR8S5NvTbfwL": "playlist-playlist-playlistInlineCurationWrapper",
Expand Down Expand Up @@ -711,6 +715,17 @@
"ratGUXdpLCkyXZNaJryg": "main-useDropTarget-show",
"caTDfb6Oj7a5_8jBLUSo": "main-useDropTarget-track",
"aRyoyQFJkzhoSOnf2ERM": "main-useDropTarget-local",
"NxEINIJHGytq4gF1r2N1": "main-useDropTarget-base",
"O0AN8Ty_Cxd4iLwyKATB": "main-useDropTarget-album",
"wQnUXn1m6Gy4PH8jhslb": "main-useDropTarget-artist",
"XNjgtSbyhshr7YQcVvry": "main-useDropTarget-episode",
"mhuhir0ikRqXAPHU8ZZ1": "main-useDropTarget-folder",
"D8wJ9TPfJzLeLJYxnad2": "main-useDropTarget-playlist",
"oE8LAmRhbeQqsZrQo4lb": "main-useDropTarget-show",
"or84FBarW2zQhXfB9VFb": "main-useDropTarget-track",
"odS2IW9wfNVHhkhc0l_X": "main-useDropTarget-local",
"zWWLnqWslTLHwq3wBgGB": "main-useDropTarget-audiobook",
"pTvxY5yAQklZgb7VZFGS": "main-useDropTarget-pseudoPlaylist",
"X8yW2lJbFCQfV5GjoRwL": "main-contextMenu-tippy",
"mph1R_QkS44EPi4lrhxd": "main-contextMenu-tippyEnter",
"v5IUMJNPJgol0273zQXD": "main-contextMenu-tippyEnterActive",
Expand Down Expand Up @@ -776,6 +791,7 @@
"hfdkySA4kiUldFsPj9lD": "main-nowPlayingView-trackInfo",
"Ai_McRq9wJEYK21w8nX_": "main-nowPlayingView-section",
"EVqc6HChiM9pEqBYAiUE": "main-nowPlayingView-sectionHeader",
"zZdI03asKaUCNlbhjDAv": "main-nowPlayingView-sectionHeaderText",
"gpDSOimnzH4zTJmE7UR5": "main-nowPlayingView-sectionHeaderSpacing",
"N9Xjnxz8vGgWwbEBE5g7": "main-nowPlayingView-lyricsTitle",
"KzMnBC9eFK8cAfcFTg9b": "main-nowPlayingView-lyricsControls",
Expand Down Expand Up @@ -1005,14 +1021,34 @@
"dgc81JRAlkNQTsZae3Bz": "main-contextMenu-searchIconContainer",
"_PqnQJddudWUtaIxOzo7": "main-contextMenu-searchIcon",
"EyDGMdJOp8ktTzmRFcQM": "main-contextMenu-clearButton",
"U3kNTAyv7lhF9nBuwgB6": "main-nowPlayingView-artistBio",
"Tk7SUvI_ULiUuC5gZsIx": "main-nowPlayingView-artistBioButton",
"ldx08BCI74rTPhgD3vbj": "main-nowPlayingView-artistBioContent",
"HISuyqmMLx0amzWHxgN1": "main-nowPlayingView-artistBioHasImage",
"RJvcrFChbhxGRIi8mBXJ": "main-nowPlayingView-artistBioPlaceholderWrapper",
"DjnRJuC2FcNrQ6Q6DerZ": "main-nowPlayingView-artistBioText",
"U3kNTAyv7lhF9nBuwgB6": "main-nowPlayingView-aboutArtist",
"Tk7SUvI_ULiUuC5gZsIx": "main-nowPlayingView-aboutArtistButton",
"ldx08BCI74rTPhgD3vbj": "main-nowPlayingView-aboutArtistContent",
"HISuyqmMLx0amzWHxgN1": "main-nowPlayingView-aboutArtistHasImage",
"RJvcrFChbhxGRIi8mBXJ": "main-nowPlayingView-aboutArtistPlaceholderWrapper",
"DjnRJuC2FcNrQ6Q6DerZ": "main-nowPlayingView-aboutArtistTextContent",
"muTn937T_T9l0xqjlN8A": "main-nowPlayingView-aboutArtistBio",
"vbsB4OQJkFHLU8SbSGzS": "main-nowPlayingView-aboutArtistV2",
"hd6a3g_3QyF8MFL0wWs1": "main-nowPlayingView-aboutArtistV2Button",
"GTmlByXpJj7V6AwVq0Vk": "main-nowPlayingView-aboutArtistV2ImageContainer",
"ouorHKa6NI5cm666H3tp": "main-nowPlayingView-aboutArtistV2Image",
"z9CDQr2gnyXDtcc1uF05": "main-nowPlayingView-aboutArtistV2HasImage",
"yIPdY6L6pcwR4L5Xf0vY": "main-nowPlayingView-aboutArtistV2PlaceholderWrapper",
"jLPxNlznfpZHUtITCFnb": "main-nowPlayingView-aboutArtistV2Avatar",
"vkS_Ks0svKls4w2s2ppT": "main-nowPlayingView-aboutArtistV2Title",
"QkOkUShDYWFx5Cz40Bcn": "main-nowPlayingView-aboutArtistV2TextContent",
"iWpZp7Ab_9h7s_U1SsLN": "main-nowPlayingView-aboutArtistV2Listeners",
"zhQX2DOI2muMo8EKsZ6h": "main-nowPlayingView-aboutArtistV2ListenersCount",
"kVP43jHrJeS7afn8mOgX": "main-nowPlayingView-aboutArtistV2FollowButton",
"COJ84QbXPrd4jkO1HU2N": "main-nowPlayingView-aboutArtistV2Name",
"r9m6lHy7RyIPDzW1Youe": "main-nowPlayingView-aboutArtistV2Bio",
"wpJvLvrrnyP0_C7hLkqg": "main-nowPlayingView-merch",
"qbOrWcMUhSri1nPkZLQA": "main-nowPlayingView-queue",
"l2PpoXJouAgqFCuNT3iB": "main-nowPlayingView-credits",
"bBldZtWu4QtzmrTfHOKm": "main-nowPlayingView-creditsShowAll",
"IgTMXVbZtqtZwu3GZASd": "main-nowPlayingView-artistOnTour",
"uvIvZ4XqfEFs88BAPaI8": "main-nowPlayingView-artistOnTourItem",
"svHFeMC3Ef_TpSdRyvsM": "main-nowPlayingView-artistOnTourShowAll",
"JG5J9NWJkaUO9fiKECMA": "Root__now-playing-bar",
"IAyWaeDamLJLjxuPeVKw": "main-topBar-buddyFeed",
"W0bXxvPV_DhyzwdJWRuU": "main-topBar-buddyFeedActive",
Expand Down Expand Up @@ -1068,7 +1104,6 @@
"_yUo81yeoON6wNqCV_ud": "artist-artistOverview-artistSidesBlock",
"N3mpQyWevHz7lrgLkOBM": "artist-artistAbout-artistSides",
"TxASgfgEtA4JmUkhkNUN": "artist-artistAbout-artistSidesBlock",
"muTn937T_T9l0xqjlN8A": "main-nowPlayingView-artistBioTextContent",
"gWUxbU2cIHAajHxsVLMZ": "main-buddyFeed-section",
"WjW1oRtpaNrY37daDP6Y": "main-buddyFeed-sectionFadeEnter",
"T27BYdtZ9ugE_X_JpP1A": "main-buddyFeed-sectionFadeExit",
Expand Down Expand Up @@ -1147,19 +1182,9 @@
"r53kBgGOdrCYj2Jux0iN": "main-trackList-columnResizing",
"Ty1q4GZz5EJ7Yl2jHs5I": "main-trackInfo-xsmallBadges",
"MIsUJlamzLYuAlvPbmZz": "main-confirmDialog-button",
"NxEINIJHGytq4gF1r2N1": "main-useDropTarget",
"O0AN8Ty_Cxd4iLwyKATB": "main-useDropTarget-albums",
"wQnUXn1m6Gy4PH8jhslb": "main-useDropTarget-artists",
"XNjgtSbyhshr7YQcVvry": "main-useDropTarget-episodes",
"mhuhir0ikRqXAPHU8ZZ1": "main-useDropTarget-folders",
"D8wJ9TPfJzLeLJYxnad2": "main-useDropTarget-playlists",
"oE8LAmRhbeQqsZrQo4lb": "main-useDropTarget-shows",
"or84FBarW2zQhXfB9VFb": "main-useDropTarget-tracks",
"odS2IW9wfNVHhkhc0l_X": "main-useDropTarget-localTracks",
"zWWLnqWslTLHwq3wBgGB": "main-useDropTarget-audiobooks",
"pTvxY5yAQklZgb7VZFGS": "main-useDropTarget-pseudoPlaylists",
"KzOZOlCPgREEBCJH1Ieg": "playlist-playlist-leadingSlot",
"a4FkPOXWBc0nK4yzsJCf": "playlist-playlist-concertsFooter",
"DWkbhLMcDefEZwJ5jXCq": "playlist-playlist-promoRow",
"byOUxNEoiJOtBN6xTY24": "playlist-playlist-promoTitle",
"IWWS0F3oiajJG7nlrjXj": "playlist-playlist-ctaLink",
"pbkk9BuHlY36lmWvEmbg": "playlist-playlist-promoImage",
Expand All @@ -1178,5 +1203,15 @@
"OodUnm1iCEZTUeL6X1gj": "show-show-moreButton",
"kR0M2WSYVUj4cohADSFM": "show-show-episodesHeader",
"jtfSxoRam9rzTtdXIjzc": "show-show-episodesFilter",
"ghfuv80I8uW_ymG_jfx9": "show-show-episodesFilter"
"ghfuv80I8uW_ymG_jfx9": "show-show-episodesFilter",
"XGCdw_LcXQHrxmvpxjwi": "main-seekForwardButton-button",
"MRfNcNMd_djj3KOg_VOB": "main-seekBackButton-button",
"d89qxCxbCRj4y1Woft8j": "main-smartShuffleButton-active",
"tr1hDrJgoPSbMXlXU_sl": "npv-nowPlayingBar-container",
"mbUrqWP55sK6zhspiR72": "npv-nowPlayingBar-controls",
"SVGHXIQcH9HYU7uGITw5": "npv-nowPlayingBar-section",
"N5cWYDvyLrfnyMZuqQHo": "npv-nowPlayingBar-left",
"gIobRDHAxkAvUaF4_OOL": "npv-nowPlayingBar-center",
"FTi9QEhetf4Q4__5sb4S": "npv-nowPlayingBar-right",
"Gw7E7MkWci1ttQhb4EK0": "npv-exitFullScreenButton-button"
}
2 changes: 1 addition & 1 deletion install.ps1
Expand Up @@ -138,7 +138,7 @@ function Install-Spicetify {
Add-SpicetifyToPath
}
end {
Remove-Item -Path $archivePath -Force
Remove-Item -Path $archivePath -Force -ErrorAction 'SilentlyContinue'
Write-Host -Object 'spicetify was successfully installed!' -ForegroundColor 'Green'
}
}
Expand Down