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

Merge branch 'develop'

Browse Source
This commit is contained in:
rembo10
2012-06-27 16:48:41 +05:30
parent 6047014f42 de10357a9d
commit 3ec0f51bd4
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,7 +109,7 @@
%>
<tr class="grade${grade}">
<td id="select"><input type="checkbox" name="${album['AlbumID']}" class="checkbox" /></td>
<td id="albumart"><img class="albumArt" title="${album['AlbumID']}" height="64" width="64"></td>
<td id="albumart"><img class="albumArt" id="${album['AlbumID']}" height="64" width="64"></td>
<td id="albumname"><a href="albumPage?AlbumID=${album['AlbumID']}">${album['AlbumTitle']}</a></td>
<td id="reldate">${album['ReleaseDate']}</td>
<td id="type">${album['Type']}</td>
@@ -161,7 +161,7 @@
function getAlbumArt() {
$("table#album_table tr td#albumart").each(function(){
var id = $(this).children('img').attr('title');
var id = $(this).children('img').attr('id');
var image = $(this).children('img');
if ( !image.hasClass('done') ) {
image.addClass('done');

10
data/interfaces/default/index.html
View File

@@ -53,8 +53,8 @@
%>
<tr class="grade${grade}">
<td id="albumart"><div id="artistImg"><img class="albumArt" alt=""/></div></td>
<td id="name"><span title="${artist['ArtistSortName']}"></span><a href="artistPage?ArtistID=${artist['ArtistID']}" title="${artist['ArtistID']}">${artist['ArtistName']}</a></td>
<td id="albumart"><div id="artistImg"><img class="albumArt" alt="" id="${artist['ArtistID']}"/></div></td>
<td id="name"><span title="${artist['ArtistSortName']}"></span><a href="artistPage?ArtistID=${artist['ArtistID']}">${artist['ArtistName']}</a></td>
<td id="status">${artist['Status']}</td>
<td id="album"><span title="${releasedate}"></span><a href="albumPage?AlbumID=${artist['AlbumID']}">${albumdisplay}</a></td>
<td id="have"><span title="${percent}"></span><div class="progress-container"><div style="width:${percent}%"><div class="havetracks">${havetracks}/${totaltracks}</div></div></div></td>
@@ -72,9 +72,9 @@
<script src="js/libs/jquery.dataTables.min.js"></script>
<script>
function getArtistArt() {
$("table#artist_table tr td#name").each(function(){
var id = $(this).children('a').attr('title');
var image = $(this).parent().find("td#albumart img");
$("table#artist_table tr td#albumart #artistImg").each(function(){
var id = $(this).children('img').attr('id');
var image = $(this).children('img');
if ( !image.hasClass('done') ) {
image.addClass('done');
getThumb(image,id,'artist');

6
headphones/cache.py
View File

@@ -489,7 +489,8 @@ def getArtwork(ArtistID=None, AlbumID=None):
if artwork_path.startswith('http://'):
return artwork_path
else:
return "cache" + artwork_path[len(headphones.CACHE_DIR):]
artwork_file = os.path.basename(artwork_path)
return "cache/artwork/" + artwork_file
def getThumb(ArtistID=None, AlbumID=None):
@@ -502,7 +503,8 @@ def getThumb(ArtistID=None, AlbumID=None):
if artwork_path.startswith('http://'):
return artwork_path
else:
return "cache" + artwork_path[len(headphones.CACHE_DIR):]
thumbnail_file = os.path.basename(artwork_path)
return "cache/artwork/" + thumbnail_file
def getInfo(ArtistID=None, AlbumID=None):