-
-
Notifications
You must be signed in to change notification settings - Fork 86
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Show search results * Select songs from search results * Added hymnary * Updated toast message and added error handling.
- Loading branch information
Showing
17 changed files
with
297 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| import axios from "axios" | ||
|
|
||
| export type LyricSearchResult = { | ||
| source: string, | ||
| key: string, | ||
| artist: string, | ||
| title: string | ||
| originalQuery?: string | ||
| } | ||
|
|
||
| export class LyricSearch { | ||
|
|
||
|
|
||
|
|
||
| static search = async (artist:string, title: string) => { | ||
| const results = await Promise.all([ | ||
| LyricSearch.searchGenius(artist, title), | ||
| LyricSearch.searchHymnary(title) | ||
| ]) | ||
| return results.flat() | ||
| } | ||
|
|
||
| static get(song:LyricSearchResult) { | ||
| if (song.source === "Genius") return LyricSearch.getGenius(song) | ||
| else if (song.source === "Hymnary") return LyricSearch.getHymnary(song) | ||
| return Promise.resolve("") | ||
| } | ||
|
|
||
|
|
||
| //GENIUS | ||
| private static getGeniusClient = () => { | ||
| const Genius = require("genius-lyrics") | ||
| return new Genius.Client() | ||
| } | ||
|
|
||
| private static searchGenius = async (artist:string, title: string) => { | ||
| try { | ||
| const client = this.getGeniusClient() | ||
| const songs = await client.songs.search(title + artist) | ||
| if (songs.length>3) songs.splice(3, songs.length-3) | ||
| return songs.map((s:any) => LyricSearch.convertGenuisToResult(s, title + artist)); | ||
| } catch (ex) { | ||
| console.log(ex); | ||
| return [] | ||
| } | ||
| } | ||
|
|
||
| //Would greatly prefer to just load via url or id, but the api fails often with these methods (malformed json) | ||
| private static getGenius = async (song:LyricSearchResult) => { | ||
| const client = this.getGeniusClient() | ||
| const songs = await client.songs.search(song.originalQuery || "") | ||
| let result = ""; | ||
| for (let i = 0; i < songs.length; i++) { | ||
| if (songs[i].id.toString() === song.key) { | ||
| result = await songs[i].lyrics() | ||
| break | ||
| } | ||
| } | ||
| return result | ||
| } | ||
|
|
||
| private static convertGenuisToResult = (geniusResult:any, originalQuery:string) => { | ||
| return { | ||
| source: "Genius", | ||
| key: geniusResult.id.toString(), | ||
| artist: geniusResult.artist.name, | ||
| title: geniusResult.title, | ||
| originalQuery: originalQuery | ||
| } as LyricSearchResult | ||
| } | ||
|
|
||
| //HYMNARY | ||
| private static searchHymnary = async (title: string) => { | ||
| try { | ||
| const url = `https://hymnary.org/search?qu=%20tuneTitle%3A${encodeURIComponent(title)}%20media%3Atext%20in%3Atexts&export=csv` | ||
| const response = await axios.get(url) | ||
| const csv = await response.data | ||
| const songs = LyricSearch.CSVToArray(csv, ",") | ||
| if (songs.length>0) songs.splice(0, 1) | ||
| for (let i=songs.length-1; i>=0; i--) if (songs[i].length<7) songs.splice(i, 1) | ||
| if (songs.length>3) songs.splice(3, songs.length-3) | ||
| return songs.map((s:any) => LyricSearch.convertHymnaryToResult(s, title)); | ||
| } catch (ex) { | ||
| console.log(ex); | ||
| return [] | ||
| } | ||
| } | ||
|
|
||
| private static getHymnary = async (song:LyricSearchResult) => { | ||
| const url = `https://hymnary.org/text/${song.key}` | ||
| const response = await axios.get(url) | ||
| const html = await response.data | ||
| const regex = /<div property=\"text\">(.*?)<\/div>/sg | ||
| const match = regex.exec(html) | ||
|
|
||
| let result = "" | ||
| if (match) { | ||
| result = match[0] | ||
| result = result.replaceAll("</p>", "\n\n") | ||
| result = result.replace(/<[^>]*>?/gm, ''); | ||
|
|
||
| const lines = result.split("\n") | ||
| const newLines:any[] = [] | ||
| lines.forEach((line, idx) => { | ||
| if (idx<lines.length-3) | ||
| { | ||
| let contents = line.replace(/^\d+\s+/gm, ''); //remove leading numbers | ||
| newLines.push(contents) | ||
| } | ||
| }); | ||
| result = newLines.join("\n") | ||
| } | ||
|
|
||
| return result | ||
| } | ||
|
|
||
| private static convertHymnaryToResult = (hymnaryResult:any, originalQuery:string) => { | ||
| return { | ||
| source: "Hymnary", | ||
| key: hymnaryResult[4], | ||
| artist: hymnaryResult[6], | ||
| title: hymnaryResult[0], | ||
| originalQuery: originalQuery | ||
| } as LyricSearchResult | ||
| } | ||
|
|
||
| // ref: http://stackoverflow.com/a/1293163/2343 | ||
| // This will parse a delimited string into an array of | ||
| // arrays. The default delimiter is the comma, but this | ||
| // can be overriden in the second argument. | ||
| static CSVToArray( strData:string, strDelimiter:string ){ | ||
| strDelimiter = (strDelimiter || ","); | ||
|
|
||
| var objPattern = new RegExp(( | ||
| "(\\" + strDelimiter + "|\\r?\\n|\\r|^)" + | ||
| "(?:\"([^\"]*(?:\"\"[^\"]*)*)\"|" + | ||
| "([^\"\\" + strDelimiter + "\\r\\n]*))" | ||
| ), "gi"); | ||
|
|
||
| var arrData:any[] = [[]]; | ||
| var arrMatches = null; | ||
| while (arrMatches = objPattern.exec( strData )){ | ||
| var strMatchedDelimiter = arrMatches[ 1 ]; | ||
| if (strMatchedDelimiter.length && strMatchedDelimiter !== strDelimiter) { arrData.push( [] ); } | ||
| var strMatchedValue; | ||
| if (arrMatches[ 2 ]) strMatchedValue = arrMatches[ 2 ].replace(new RegExp( "\"\"", "g" ), "\""); | ||
| else strMatchedValue = arrMatches[ 3 ]; | ||
| arrData[ arrData.length - 1 ].push( strMatchedValue ); | ||
| } | ||
| return( arrData ); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.