From 759e88db3e5316916834e8ba7737e46d321facaf Mon Sep 17 00:00:00 2001 From: krateng Date: Sun, 21 May 2023 02:40:15 +0200 Subject: [PATCH] Just to be sure --- .../config/rules/predefined/krateng_kpopgirlgroups.tsv | 3 +++ maloja/database/dbcache.py | 2 +- maloja/database/sqldb.py | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/maloja/data_files/config/rules/predefined/krateng_kpopgirlgroups.tsv b/maloja/data_files/config/rules/predefined/krateng_kpopgirlgroups.tsv index a0c10b4..e608c5a 100644 --- a/maloja/data_files/config/rules/predefined/krateng_kpopgirlgroups.tsv +++ b/maloja/data_files/config/rules/predefined/krateng_kpopgirlgroups.tsv @@ -208,6 +208,9 @@ countas Wonyoung IVE countas Yujin IVE countas Gaeul IVE +# Pristin +countas Pristin V Pristin + # Popular Remixes artistintitle Areia Remix Areia artistintitle Areia Kpop Areia diff --git a/maloja/database/dbcache.py b/maloja/database/dbcache.py index 42695dc..254d248 100644 --- a/maloja/database/dbcache.py +++ b/maloja/database/dbcache.py @@ -87,7 +87,7 @@ if malojaconfig['USE_GLOBAL_CACHE']: cleared, kept = 0, 0 for k in cache.keys(): # VERY BIG TODO: differentiate between None as in 'unlimited timerange' and None as in 'time doesnt matter here'! - if scrobbletime is None or (k[3] is None or scrobbletime >= k[3]) and (k[4] is None or scrobbletime <= k[4]): + if scrobbletime is None or ((k[3] is None or scrobbletime >= k[3]) and (k[4] is None or scrobbletime <= k[4])): cleared += 1 del cache[k] else: diff --git a/maloja/database/sqldb.py b/maloja/database/sqldb.py index 5be84e6..4f908dc 100644 --- a/maloja/database/sqldb.py +++ b/maloja/database/sqldb.py @@ -436,13 +436,13 @@ def get_track_id(trackdict,create_new=True,update_album=False,dbconn=None): if not create_new: return None - print("Creating new track") + #print("Creating new track") op = DB['tracks'].insert().values( **track_dict_to_db(trackdict,dbconn=dbconn) ) result = dbconn.execute(op) track_id = result.inserted_primary_key[0] - print(track_id) + #print(track_id) for artist_id in artist_ids: op = DB['trackartists'].insert().values(