From 4d06a327e9bdbc2c9a2ec1be83c39f674fbaafb3 Mon Sep 17 00:00:00 2001 From: Krateng Date: Fri, 1 Jan 2021 02:52:05 +0100 Subject: [PATCH] Happy New Year! --- maloja/malojatime.py | 16 +++------------- maloja/utilities/maintenance.py | 16 ++++++---------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/maloja/malojatime.py b/maloja/malojatime.py index 63af16a..bb71464 100644 --- a/maloja/malojatime.py +++ b/maloja/malojatime.py @@ -9,25 +9,15 @@ from doreah.settings import get_settings OFFSET = get_settings("TIMEZONE") TIMEZONE = timezone(timedelta(hours=OFFSET)) +UTC = datetime.timezone.utc -FIRST_SCROBBLE = int(datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc).timestamp()) +FIRST_SCROBBLE = int(datetime.datetime.utcnow().replace(tzinfo=UTC).timestamp()) def register_scrobbletime(timestamp): global FIRST_SCROBBLE if timestamp < FIRST_SCROBBLE: FIRST_SCROBBLE = int(timestamp) -def start_of_scrobbling(): - global FIRST_SCROBBLE - f = datetime.datetime.utcfromtimestamp(FIRST_SCROBBLE) - return [f.year] - -def end_of_scrobbling(): - global FIRST_SCROBBLE - f = datetime.datetime.now() - return [f.year] - - @@ -67,7 +57,7 @@ class MRangeDescriptor: } def uri(self): - return "&".join(k + "=" + self.urikeys[k] for k in self.urikeys) + return "&".join(k + "=" + self.urikeys()[k] for k in self.urikeys()) def unlimited(self): return False diff --git a/maloja/utilities/maintenance.py b/maloja/utilities/maintenance.py index 33b133b..cb96e66 100644 --- a/maloja/utilities/maintenance.py +++ b/maloja/utilities/maintenance.py @@ -1,4 +1,5 @@ from ..__pkginfo__ import version +from ..malojatime import ranges, thisweek, thisyear from doreah.regular import yearly, daily from doreah import settings @@ -51,19 +52,15 @@ def update_medals(): from ..database import MEDALS, MEDALS_TRACKS, STAMPS, get_charts_artists, get_charts_tracks - currentyear = datetime.datetime.utcnow().year - try: - firstyear = datetime.datetime.utcfromtimestamp(STAMPS[0]).year - except: - firstyear = currentyear - MEDALS.clear() MEDALS_TRACKS.clear() - for year in range(firstyear,currentyear): - charts_artists = get_charts_artists(within=[year]) - charts_tracks = get_charts_tracks(within=[year]) + for year in ranges(step="year"): + if year == thisyear(): break + + charts_artists = get_charts_artists(timerange=year) + charts_tracks = get_charts_tracks(timerange=year) collect_rankings(charts_artists,get_artist,MEDALS,iteration=year,count=False) collect_rankings(charts_tracks,get_track,MEDALS_TRACKS,iteration=year,count=False) @@ -73,7 +70,6 @@ def update_medals(): def update_weekly(): from ..database import WEEKLY_TOPTRACKS, WEEKLY_TOPARTISTS, get_charts_artists, get_charts_tracks - from ..malojatime import ranges, thisweek WEEKLY_TOPARTISTS.clear()