From 5fe4c5cd22ed414e97e071da5d523501225775aa Mon Sep 17 00:00:00 2001 From: Krateng Date: Sun, 13 Dec 2020 03:38:46 +0100 Subject: [PATCH] Added alternative to loading bar, fixes GH-54 --- maloja/data_files/settings/default.ini | 3 +++ maloja/database.py | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/maloja/data_files/settings/default.ini b/maloja/data_files/settings/default.ini index b929df3..206f460 100644 --- a/maloja/data_files/settings/default.ini +++ b/maloja/data_files/settings/default.ini @@ -88,3 +88,6 @@ NAME = None SKIP_SETUP = no LOGGING = true DEV_MODE = false + +# set this to true if your console output will be processed and should never change existing lines +CLEAN_OUTPUT = false diff --git a/maloja/database.py b/maloja/database.py index 1e2bfa3..c6fa22b 100644 --- a/maloja/database.py +++ b/maloja/database.py @@ -777,7 +777,12 @@ def build_db(): db = tsv.parse_all(datadir("scrobbles"),"int","string","string",comments=False) scrobblenum = len(db) log(f"Found {scrobblenum} scrobbles...") - pbar = ProgressBar(max=scrobblenum,prefix="Loading scrobbles") + + usebar = not settings.get_settings("CLEAN_OUTPUT") + if usebar: pbar = ProgressBar(max=scrobblenum,prefix="Loading scrobbles") + else: + n = 0 + m = max(int(scrobblenum / 25),20) #db = parseAllTSV("scrobbles","int","string","string",escape=False) for sc in db: artists = sc[1].split("␟") @@ -785,9 +790,12 @@ def build_db(): time = sc[0] readScrobble(artists,title,time) - pbar.progress() + if usebar: pbar.progress() + else: + n += 1 + if n % m == 0: log(f"Loaded {n}/{scrobblenum}...") - pbar.done() + if usebar: pbar.done() log("Database loaded, optimizing...") # optimize database