From 96ca7cfecd1f276443c5197d711cbcaf06871aa5 Mon Sep 17 00:00:00 2001 From: Remy Date: Fri, 27 May 2011 19:00:18 -0700 Subject: [PATCH] fixed an issue with the index not displaying if an artist is added with no official releases --- webServer.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/webServer.py b/webServer.py index 20954c0b..aa3e79b7 100644 --- a/webServer.py +++ b/webServer.py @@ -39,12 +39,16 @@ class Headphones: c.execute('''SELECT AlbumTitle, ReleaseDate, DateAdded, AlbumID from albums WHERE ArtistName="%s" order by ReleaseDate DESC''' % results[i][0]) latestalbum = c.fetchall() today = datetime.date.today() - if latestalbum[0][1] > datetime.date.isoformat(today): - newalbumName = '%s' % (latestalbum[0][3], latestalbum[0][0]) - releaseDate = '(%s)' % latestalbum[0][1] - else: - newalbumName = 'None' - releaseDate = "" + if len(latestalbum) > 0: + if latestalbum[0][1] > datetime.date.isoformat(today): + newalbumName = '%s' % (latestalbum[0][3], latestalbum[0][0]) + releaseDate = '(%s)' % latestalbum[0][1] + else: + newalbumName = 'None' + releaseDate = "" + if len(latestalbum) == 0: + newalbumName = 'None' + releaseDate = "" if results[i][2] == 'Paused': newStatus = '''%s(resume)''' % (results[i][2], results[i][1]) else: @@ -70,6 +74,8 @@ class Headphones: page.append(templates._nav) conn=sqlite3.connect(database) c=conn.cursor() + c.execute('''SELECT ArtistName from artists WHERE ArtistID="%s"''' % ArtistID) + artistname = c.fetchall() c.execute('''SELECT AlbumTitle, ReleaseDate, AlbumID, Status, ArtistName, AlbumASIN from albums WHERE ArtistID="%s" order by ReleaseDate DESC''' % ArtistID) results = c.fetchall() c.close() @@ -82,7 +88,7 @@ class Headphones: Release Date Status - ''' % (results[0][4])) + ''' % (artistname[0])) while i < len(results): if results[i][3] == 'Skipped': newStatus = '''%s [want]''' % (results[i][3], results[i][2], ArtistID) @@ -388,6 +394,6 @@ class Headphones: configUpdate.exposed = True def shutdown(self): - sys.exit() + sys.exit(0) shutdown.exposed = True