Cutlery/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2025-07-09 03:04:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed cache trimming

Browse Source
This commit is contained in:
krateng 2022-02-19 08:02:07 +01:00
parent a367c7c573
commit bde06deb4f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maloja/apis/_base.py
View File

@ -90,11 +90,11 @@ class APIHandler:
def scrobble(self,artiststr,titlestr,time=None,duration=None,album=None): 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)) 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: try:
(artists,title) = cla.fullclean(artiststr,titlestr) database.incoming_scrobble(artists=[artiststr],title=titlestr,time=time,duration=duration,album=album)
database.incoming_scrobble(artists=artists,title=title,time=time)
except: except:
raise ScrobblingException() raise ScrobblingException()

4
maloja/database/dbcache.py
View File

@ -63,8 +63,8 @@ def trim_cache():
log(f"{ramprct}% RAM usage, reducing caches!") log(f"{ramprct}% RAM usage, reducing caches!")
ratio = (malojaconfig["DB_MAX_MEMORY"] / ramprct) ** 3 ratio = (malojaconfig["DB_MAX_MEMORY"] / ramprct) ** 3
targetsize = max(int(len(cache) * ratio),100) targetsize = max(int(len(cache) * ratio),100)
c.set_size(targetsize) cache.set_size(targetsize)
c.set_size(HIGH_NUMBER) cache.set_size(HIGH_NUMBER)
log(f"New RAM usage: {psutil.virtual_memory().percent}%") log(f"New RAM usage: {psutil.virtual_memory().percent}%")

2
maloja/database/sqldb.py
View File

@ -576,7 +576,7 @@ def get_artist(id):
@runhourly @runhourly
def clean_db(): def clean_db():
with engine.begin() as conn: with engine.begin() as conn:
log(f"Database Cleanup...") #log(f"Database Cleanup...")
### Delete tracks that have no scrobbles (delete their trackartist entries first) ### Delete tracks that have no scrobbles (delete their trackartist entries first)
a1 = conn.execute(sql.text(''' a1 = conn.execute(sql.text('''