gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-05-08 04:39:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move to json so we can get the artist name as well

Browse Source
This commit is contained in:
rembo10
2014-05-05 15:40:01 -07:00
parent 4ca42c9c11
commit d80fc36b29
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/interfaces/default/artist.html
View File

@@ -43,7 +43,7 @@
<img id="artistImage" class="albumArt" alt="" src="artwork/artist/${artist['ArtistID']}"/>
</div>
<h1 id="artistname">
<a href="http://musicbrainz.org/artist/${artist['ArtistID']}">${artist['ArtistName']}</a>
<a href="http://musicbrainz.org/artist/${artist['ArtistID']}" id="artistnamelink">${artist['ArtistName']}</a>
</h1>
<div id="artistBio"></div>
</div>
@@ -236,10 +236,12 @@
function checkArtistStatus() {
$.ajax({
url: "getArtistStatus?ArtistID=${artist['ArtistID']}",
url: "getArtistjson?ArtistID=${artist['ArtistID']}",
dataType: "jsonp",
complete: function(result) {
if (result.responseText == "Loading"){
if (result.Status == "Loading"){
refreshTable();
$('#artistnamelink').text(result.ArtistName);
if (loadingMessage == false){
showMsg("Getting artist information",true);
loadingMessage = true;

12
headphones/webserve.py
View File

@@ -854,11 +854,15 @@ class WebInterface(object):
return json_albums
getAlbumsByArtist_json.exposed=True
def getArtistStatus(self, ArtistID):
def getArtistjson(self, ArtistID, **kwargs):
myDB = db.DBConnection()
artist = myDB.action('SELECT Status FROM artists WHERE ArtistID=?', [ArtistID]).fetchone()
return artist['Status']
getArtistStatus.exposed=True
artist = myDB.action('SELECT * FROM artists WHERE ArtistID=?', [ArtistID]).fetchone()
artist_json = json.dumps({
'ArtistName': artist['ArtistName'],
'Status': artist['Status']
})
return artist_json
getArtistjson.exposed=True
def clearhistory(self, type=None, date_added=None, title=None):
myDB = db.DBConnection()