Added experimental top artist history

README.md

@@ -39,3 +39,5 @@ I wouldn't recommend it yet. But if you want to test Maloja, it's fairly easy:
 			rewrite ^/db(.*)$ $1 break;
 			proxy_pass http://yoururl:42011;
 		}
+		
+If you would like to import all your previous last.fm scrobbles, use [benfoxall's website](https://benjaminbenben.com/lastfm-to-csv/) ([GitHub page](https://github.com/benfoxall/lastfm-to-csv)). Use the python script lastfmconverter.py with two arguments - the downloaded csv file and your new tsv file - to convert your data. Place the tsv file in logs/ and the server will recognize it on startup.

database.py

@@ -52,6 +52,7 @@ def createScrobble(artists,title,time):
 	obj = (i,time,False)
 	SCROBBLES.append(obj)
 
+
 def readScrobble(artists,title,time):
 	while (time in timestamps):
 		time += 1
@@ -60,6 +61,7 @@ def readScrobble(artists,title,time):
 	obj = (i,time,True)
 	SCROBBLES.append(obj)
 	
+
 def getArtistID(name):
 
 	obj = name
@@ -113,19 +115,81 @@ def get_artists():
 	return {"list":ARTISTS}
 	
 @route("/artistcharts")
-def get_charts():
+def get_charts_artists():
 	since = request.query.get("since")
 	to = request.query.get("to")
 	
 	return {"list":db_aggregate(by="ARTIST",since=since,to=to)}
 	
 @route("/trackcharts")
-def get_charts():
+def get_charts_tracks():
 	since = request.query.get("since")
 	to = request.query.get("to")
 	
 	return {"list":db_aggregate(by="TRACK",since=since,to=to)}
 	
+@route("/top/artists")
+def get_top_artists():
+	date_start = datetime.datetime.utcfromtimestamp(min(timestamps))
+	date_end = datetime.datetime.utcnow()
+	d_end = [date_end.year,date_end.month,date_end.day]
+	
+	step = request.query.get("step")	
+	time = request.query.get("time")	# should not be lower than step
+	if (step == None):
+		step = "month"
+	if (time == None):
+		time = "month-3"
+	
+	[step,stepn] = (step.split("-") + [1])[:2]	# makes the multiplier 1 if not assigned
+	[time,timen] = (time.split("-") + [1])[:2]	
+	
+	if step == "year":
+		d_start = [date_start.year,1,1]
+	elif step == "month":
+		d_start = [date_start.year,date_start.month,1]
+		
+	inc = [i*int(stepn) for i in {"year":[1,0,0],"month":[0,1,0]}[step]]
+	ran = [i*int(timen) for i in {"year":[1,0,0],"month":[0,1,0]}[time]]
+	
+	d_start = addDate(d_start,inc)				# first range should end right after the first active scrobbling week / month / whatever relevant step
+	d_start = addDate(d_start,[-i for i in ran])		# go one range back to begin
+
+	results = []
+	
+	d_current = d_start
+	while True:
+		d_current_end = addDate(d_current,ran)
+		res = db_aggregate(since=d_current,to=d_current_end,by="ARTIST")[0]
+		results.append({"from":d_current,"to":d_current_end,"artist":res["artist"],"scrobbles":res["scrobbles"]})
+		d_current = addDate(d_current,inc)
+		if isPast(d_current_end,d_end):
+			break
+	
+	return {"list":results}
+		
+	
+# only for months and years so far	
+def addDate(date,inc):
+	newdate = [1,1,1]
+	newdate[0] = date[0] + inc[0]
+	newdate[1] = date[1] + inc[1]
+	while (newdate[1] > 12):
+		newdate[1] -= 12
+		newdate[0] += 1
+	while (newdate[1] < 1):
+		newdate[1] += 12
+		newdate[0] -= 1
+	
+	return newdate
+	
+def isPast(date,limit):
+	if not date[0] == limit[0]:
+		return date[0] > limit[0]
+	if not date[1] == limit[1]:
+		return date[1] > limit[1]
+	return (date[2] > limit[2])
+
 @get("/newscrobble")
 def pseudo_post_scrobble():
 	keys = FormsDict.decode(request.query) # The Dal★Shabet handler
@@ -225,6 +289,8 @@ def build_db():
 	
 	
 		
+
+
 # Saves all cached entries to disk			
 def sync():
 	for idx in range(len(SCROBBLES)):
@@ -304,16 +370,24 @@ def db_aggregate(by,since=0,to=9999999999):
 def getTimestamps(f,t):
 	#(f,t) = inp
 	if isinstance(f, str):
-		sdate = [int(x) for x in f.split("/")]
-		date = [1970,1,1,0,0]
-		date[:len(sdate)] = sdate
-		f = int(datetime.datetime(date[0],date[1],date[2],date[3],date[4],tzinfo=datetime.timezone.utc).timestamp())
+		f = [int(x) for x in f.split("/")]
+		
 	if isinstance(t, str):
-		sdate = [int(x) for x in t.split("/")]
+		t = [int(x) for x in t.split("/")]
+		
+	
+	# this step is done if either the input is a list or the first step was done (which creates a list)	
+	if isinstance(f, list):
 		date = [1970,1,1,0,0]
-		date[:len(sdate)] = sdate
+		date[:len(f)] = f
+		f = int(datetime.datetime(date[0],date[1],date[2],date[3],date[4],tzinfo=datetime.timezone.utc).timestamp())
+		
+	if isinstance(t, list):
+		date = [1970,1,1,0,0]
+		date[:len(t)] = t
 		t = int(datetime.datetime(date[0],date[1],date[2],date[3],date[4],tzinfo=datetime.timezone.utc).timestamp())
 		
+		
 	if (f==None):
 		f = 0
 	if (t==None):

server.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from bottle import route, get, post, run, template, static_file, request, response, FormsDict
 from importlib.machinery import SourceFileLoader
 import _thread
@@ -76,9 +78,16 @@ def static_html(name):
 
 	return static_file("website/" + name + ".html",root="")
 
-
+#set graceful shutdown
 signal.signal(signal.SIGINT, graceful_exit)
 
+#rename process, not important
+try:
+	import setproctitle
+	setproctitle.setproctitle("Maloja")
+except:
+	pass
+	
 ## start database server
 _thread.start_new_thread(SourceFileLoader("database","database.py").load_module().runserver,(DATABASE_PORT,))