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

Genius to use external provider

Browse Source
This commit is contained in:
James Barnsley
2018-06-27 20:30:04 +12:00
parent cf12fcb529
commit eeb24f4c54
5 changed files with 48393 additions and 46466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94827
mopidy_iris/static/app.js
View File

File diff suppressed because it is too large Load Diff

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

2
mopidy_iris/static/index.html
View File

@ -77,7 +77,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1530004469";
var build = "1530044847";
var version = "3.21.4";
// Construct the script tag

2
src/js/bootstrap.js vendored
View File

@ -80,7 +80,7 @@ var initialState = {
me: false,
authorization_url: 'https://jamesbarnsley.co.nz/iris/auth_lastfm.php'
},
genius: {,
genius: {
provider_url: 'https://jamesbarnsley.co.nz/iris/provider_genius.php'
},
spotify: {

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

@ -8,7 +8,8 @@ var helpers = require('../../helpers')
*
* @param dispatch obj
* @param getState obj
* @param endpoint params = the url params to send
* @param endpoint = the action
* @param params = string for any URL prarams to pass on
**/
const sendRequest = (dispatch, getState, endpoint) => {
return new Promise((resolve, reject) => {
@ -16,22 +17,11 @@ const sendRequest = (dispatch, getState, endpoint) => {
var loader_key = helpers.generateGuid();
dispatch(uiActions.startLoading(loader_key, 'genius_'+endpoint));
var url = endpoint;
if (!url.startsWith('http')){
url = 'https://api.genius.com/'+url;
}
var config = {
method: 'POST',
cache: false,
timeout: 30000,
headers: {
Authorization: 'Bearer nBNNEFekix8BOsfPyfK7LtX-CaUz7L7ak92qC3GfMAIQi8eWjuwb4P8SUxK1K-iY'
},
data: JSON.stringify({
url: url
}),
url: '//'+getState().mopidy.host+':'+getState().mopidy.port+'/iris/http/proxy_request'
method: 'GET',
url: getState().genius.provider_url+endpoint,
dataType: "json",
timeout: 10000
};
$.ajax(config).then(
@ -71,7 +61,7 @@ export function getTrackLyrics(uri, url){
}
});
sendRequest(dispatch, getState, url)
sendRequest(dispatch, getState, "?action=lyrics&url="+url)
.then(
response => {
var html = $(response);
@ -117,7 +107,7 @@ export function findTrackLyrics(track){
query = query.replace(/\([^)]*\) */g, ''); // anything in circle-braces
query = query.replace(/\([^[]*\] */g, ''); // anything in square-braces
sendRequest(dispatch, getState, 'search?q='+encodeURIComponent(query))
sendRequest(dispatch, getState, '?action=search&query='+encodeURIComponent(query))
.then(
response => {
if (response.response.hits && response.response.hits.length > 0){