Some code reordering

database.py

@@ -412,7 +412,7 @@ def issues():
 	duplicates = []
 	newartists = []
 	inconsistent = not db_rulestate
-	
+	# if the user manually edits files while the server is running this won't show, but too lazy to check the rulestate here
 	
 	import itertools
 	import difflib

website/maloja.css

@@ -84,8 +84,43 @@ table td.time {
 	color:gray;
 }
 table td.artists,td.artist,td.title {
-	width:350px;
+	width:500px;
+	white-space:nowrap;
+	overflow:hidden;
+	text-overflow:ellipsis;
 }
+
+
+/*
+table td.artists div {
+	overflow:hidden;
+	z-index:1;
+	position:relative;
+}
+
+table tr td.artists div span {
+	//text-overflow:ellipsis;
+	z-index:-2;
+	position:relative;
+	white-space:nowrap;
+	
+}
+table tr:hover td.artists div span {
+	animation: bounce 3s linear infinite alternate;
+}
+@keyframes bounce {
+	0% {
+		
+	}
+	100% {
+		//transform: translateX(-60px);
+		//margin-left:-60px;
+		margin-left:-100%;
+	}
+}
+
+**/
+
 table td.amount {
 	width:50px;
 	text-align:right;

website/scrobbles.py

@@ -9,26 +9,30 @@ def replacedict(keys,dbport):
 	#hand down the since and from arguments
 	extrakeys = urllib.parse.urlencode(keys)
 	
-	if keys.get("artist") is not None:
-		info = getArtistInfo(keys.get("artist"))
-		imgurl = info.get("image")
-	else:
-		imgurl = "" #for now
+	
 		
 	limitstring = ""
-	if keys.get("artist") is not None:
-		#limitstring += "by <a href='/artist?artist=" + urllib.parse.quote(keys.get("artist")) + "'>" + keys.get("artist") + "</a> "	
-		limitstring += "by " + artistLink(keys.get("artist"))
-		if keys.get("associated") is not None:
-			response = urllib.request.urlopen("http://localhost:" + str(dbport) + "/artistinfo?artist=" + urllib.parse.quote(keys["artist"]))
-			db_data = json.loads(response.read())
-			moreartists = db_data["associated"]
-			limitstring += " <span class='extra'>including " + ", ".join(moreartists) + "</span>"
 	
 	response = urllib.request.urlopen("http://localhost:" + str(dbport) + "/scrobbles?" + extrakeys)
 	db_data = json.loads(response.read())
 	scrobbles = db_data["list"]
 	
+	if keys.get("artist") is not None:
+		latestartist = keys.get("artist")
+		limitstring += "by " + artistLink(keys.get("artist"))
+		if keys.get("associated") is not None:
+			response = urllib.request.urlopen("http://localhost:" + str(dbport) + "/artistinfo?artist=" + urllib.parse.quote(keys["artist"]))
+			db_data = json.loads(response.read())
+			moreartists = [artistLink(a) for a in db_data["associated"]]
+			if moreartists != []:
+				limitstring += " <span class='extra'>including " + ", ".join(moreartists) + "</span>"
+		
+	else:
+		latestartist = scrobbles[0]["artists"][0]
+	
+	info = getArtistInfo(latestartist)
+	imgurl = info.get("image")
+
 	html = "<table class='list'>"
 	for s in scrobbles:
 		html += "<tr><td class='time'>"

website/toptracks.py

@@ -5,6 +5,9 @@ import json
 def replacedict(keys,dbport):
 	from utilities import getArtistInfo, artistLink
 	
+	# we don't use the associated key for top tracks so we don't wanna hand it down to functions we're calling
+	keys.pop("associated",None)
+	
 	#hand down the since and from arguments
 	extrakeys = urllib.parse.urlencode(keys,quote_via=urllib.parse.quote,safe="/")
 	
@@ -12,9 +15,11 @@ def replacedict(keys,dbport):
 	db_data = json.loads(response.read())
 	charts = db_data["list"][:50]
 	limitstring = ""
+	
 	if keys.get("artist") is not None:
 		topartist = keys.get("artist")
 		limitstring += "by " + artistLink(keys.get("artist"))
+		
 	else:
 		topartist = charts[0]["track"]["artists"][0] #for now