secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Handling remastered track titles (with dashes) in Lyrics

Browse Source
This commit is contained in:
James Barnsley
2019-11-18 14:54:54 +13:00
parent 0206fb7c69
commit 899294baf5
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/js/services/genius/actions.js
View File

@ -156,31 +156,28 @@ export function getTrackLyrics(uri, path) {
.then(
(response, status, xhr) => {
dispatch(uiActions.stopLoading(loader_key));
if (response && response.result) {
const html = $(response.result);
let lyrics = html.find('.lyrics');
if (lyrics.length > 0) {
lyrics = lyrics.first();
lyrics.find('a').replaceWith(() => this.innerHTML);
if (response && response.result) {
const html = $(response.result);
let lyrics = html.find('.lyrics');
if (lyrics.length > 0) {
lyrics = lyrics.first();
lyrics.find('a').replaceWith(function () {
return this.innerHTML;
});
let lyrics_html = lyrics.html();
lyrics_html = lyrics_html.replace(/(\[)/g, '<span class="mid_grey-text">[');
lyrics_html = lyrics_html.replace(/(\])/g, ']</span>');
let lyrics_html = lyrics.html();
lyrics_html = lyrics_html.replace(/(\[)/g, '<span class="mid_grey-text">[');
lyrics_html = lyrics_html.replace(/(\])/g, ']</span>');
dispatch(coreActions.trackLoaded({
dispatch(coreActions.trackLoaded({
uri,
lyrics: lyrics_html,
lyrics_path: path,
}));
}
}
} else {
dispatch(coreActions.handleException(
'Could not get track lyrics',
response.error,
));
dispatch(coreActions.handleException(
'Could not get track lyrics',
response.error,
));
}
},
(xhr, status, error) => {
@ -202,6 +199,7 @@ export function findTrackLyrics(track) {
query = query.toLowerCase();
query = query.replace(/\([^)]*\) */g, ''); // anything in circle-braces
query = query.replace(/\([^[]*\] */g, ''); // anything in square-braces
query = query.replace(/(?= - ).*$/g, ''); // remove anything after and including " - "
sendRequest(dispatch, getState, 'search', 'GET', `q=${encodeURIComponent(query)}`)
.then(