From bde06deb4fb561e03a5c387e79bc74468faed6d7 Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Sat, 19 Feb 2022 08:02:07 +0100
Subject: [PATCH] Fixed cache trimming
---
maloja/apis/_base.py | 8 ++++----
maloja/database/dbcache.py | 4 ++--
maloja/database/sqldb.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/maloja/apis/_base.py b/maloja/apis/_base.py
index f2cd153..58503b4 100644
--- a/maloja/apis/_base.py
+++ b/maloja/apis/_base.py
@@ -90,11 +90,11 @@ class APIHandler:
def scrobble(self,artiststr,titlestr,time=None,duration=None,album=None):
- logmsg = "Incoming scrobble (API: {api}): ARTISTS: {artiststr}, TRACK: {titlestr}"
+ logmsg = "API receiving scrobble: (API: {api}): ARTISTS: {artiststr}, TRACK: {titlestr}"
log(logmsg.format(api=self.__apiname__,artiststr=artiststr,titlestr=titlestr))
- if time is None: time = int(datetime.datetime.now(tz=datetime.timezone.utc).timestamp())
+
+ # fixing etc is handled by the main scrobble function
try:
- (artists,title) = cla.fullclean(artiststr,titlestr)
- database.incoming_scrobble(artists=artists,title=title,time=time)
+ database.incoming_scrobble(artists=[artiststr],title=titlestr,time=time,duration=duration,album=album)
except:
raise ScrobblingException()
diff --git a/maloja/database/dbcache.py b/maloja/database/dbcache.py
index a94c622..2841538 100644
--- a/maloja/database/dbcache.py
+++ b/maloja/database/dbcache.py
@@ -63,8 +63,8 @@ def trim_cache():
log(f"{ramprct}% RAM usage, reducing caches!")
ratio = (malojaconfig["DB_MAX_MEMORY"] / ramprct) ** 3
targetsize = max(int(len(cache) * ratio),100)
- c.set_size(targetsize)
- c.set_size(HIGH_NUMBER)
+ cache.set_size(targetsize)
+ cache.set_size(HIGH_NUMBER)
log(f"New RAM usage: {psutil.virtual_memory().percent}%")
diff --git a/maloja/database/sqldb.py b/maloja/database/sqldb.py
index 38133f4..c18fb08 100644
--- a/maloja/database/sqldb.py
+++ b/maloja/database/sqldb.py
@@ -576,7 +576,7 @@ def get_artist(id):
@runhourly
def clean_db():
with engine.begin() as conn:
- log(f"Database Cleanup...")
+ #log(f"Database Cleanup...")
### Delete tracks that have no scrobbles (delete their trackartist entries first)
a1 = conn.execute(sql.text('''