mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Changed API url

Browse Source
This commit is contained in:
Krateng 2019-05-12 10:20:47 +02:00
parent 0bf1790a7c
commit 3fce682c00
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -36,14 +36,14 @@ Also neat: You can use your **custom artist or track images**.
If you're missing packages, the console output will tell you so. Install them. If you're missing packages, the console output will tell you so. Install them.
2) (Recommended) Put your server behind a reverse proxy for SSL encryption. Configure that proxy to rewrite /db/ requests to the database port. In nginx this would look as follows: 2) (Recommended) Put your server behind a reverse proxy for SSL encryption. Configure that proxy to rewrite /api/ requests to the API port. In nginx this would look as follows:
location / { location / {
proxy_pass http://yoururl:42010; proxy_pass http://yoururl:42010;
} }
location /db { location /api {
rewrite ^/db(.*)$ $1 break; rewrite ^/api(.*)$ $1 break;
proxy_pass http://yoururl:42011; proxy_pass http://yoururl:42011;
} }

2
scrobblers/chromium-generic/background.js
View File

@ -255,7 +255,7 @@ function scrobble(artist,title,seconds) {
chrome.storage.local.get("serverurl",function(result) { chrome.storage.local.get("serverurl",function(result) {
URL = result["serverurl"] URL = result["serverurl"]
var xhttp = new XMLHttpRequest(); var xhttp = new XMLHttpRequest();
xhttp.open("POST",URL + "/db/newscrobble",true); xhttp.open("POST",URL + "/api/newscrobble",true);
xhttp.send("artist=" + artiststring + "&title=" + titlestring + "&duration=" + seconds + "&key=" + APIKEY) xhttp.send("artist=" + artiststring + "&title=" + titlestring + "&duration=" + seconds + "&key=" + APIKEY)
}); });
}); });

2
scrobblers/chromium-generic/manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Maloja Scrobbler", "name": "Maloja Scrobbler",
"version": "1.0", "version": "1.1",
"description": "Scrobbles tracks from various sites to your Maloja server", "description": "Scrobbles tracks from various sites to your Maloja server",
"manifest_version": 2, "manifest_version": 2,
"permissions": ["activeTab", "permissions": ["activeTab",

2
scrobblers/chromium-generic/settings.js
View File

@ -72,7 +72,7 @@ function updateAPIKey() {
} }
function checkServer() { function checkServer() {
url = document.getElementById("serverurl").value + "/db/test?key=" + document.getElementById("apikey").value url = document.getElementById("serverurl").value + "/api/test?key=" + document.getElementById("apikey").value
var xhttp = new XMLHttpRequest(); var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = createCheckmarks; xhttp.onreadystatechange = createCheckmarks;

4
server.py
View File

@ -71,7 +71,7 @@ def customerror(error):
# this is the fallback option. If you run this service behind a reverse proxy, it is recommended to rewrite /db/ requests to the port of the db server # this is the fallback option. If you run this service behind a reverse proxy, it is recommended to rewrite /db/ requests to the port of the db server
# e.g. location /db { rewrite ^/db(.*)$ $1 break; proxy_pass http://yoururl:12349; } # e.g. location /db { rewrite ^/db(.*)$ $1 break; proxy_pass http://yoururl:12349; }
@webserver.get("/db/<pth:path>") @webserver.get("/api/<pth:path>")
def database_get(pth): def database_get(pth):
keys = FormsDict.decode(request.query) # The Dal★Shabet handler keys = FormsDict.decode(request.query) # The Dal★Shabet handler
keystring = "?" keystring = "?"
@ -88,7 +88,7 @@ def database_get(pth):
response.status = e.code response.status = e.code
return return
@webserver.post("/db/<pth:path>") @webserver.post("/api/<pth:path>")
def database_post(pth): def database_post(pth):
response.set_header("Access-Control-Allow-Origin","*") response.set_header("Access-Control-Allow-Origin","*")
try: try:

2
website/javascript/search.js
View File

@ -6,7 +6,7 @@ function search(searchfield) {
else { else {
xhttp = new XMLHttpRequest(); xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = searchresult xhttp.onreadystatechange = searchresult
xhttp.open("GET","/db/search?max=5&query=" + encodeURIComponent(txt), true); xhttp.open("GET","/api/search?max=5&query=" + encodeURIComponent(txt), true);
xhttp.send(); xhttp.send();
} }
} }