From 65a076c24931d7fc866e9a977e984d1c311af87f Mon Sep 17 00:00:00 2001 From: krateng Date: Fri, 7 Jan 2022 04:57:13 +0100 Subject: [PATCH] Replaced old camelCase functions --- maloja/apis/native_v1.py | 8 ++++---- maloja/database/__init__.py | 4 ++-- maloja/web/jinja/artist.jinja | 2 +- maloja/web/jinja/partials/awards_artist.jinja | 2 +- maloja/web/jinja/partials/awards_track.jinja | 2 +- maloja/web/jinja/track.jinja | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/maloja/apis/native_v1.py b/maloja/apis/native_v1.py index 1515993..f0b1d4d 100644 --- a/maloja/apis/native_v1.py +++ b/maloja/apis/native_v1.py @@ -177,16 +177,16 @@ def get_top_tracks_external(**keys): @api.get("artistinfo") -def artistInfo_external(**keys): +def artist_info_external(**keys): k_filter, _, _, _, _ = uri_to_internal(keys,forceArtist=True) ckeys = {**k_filter} - return artistInfo(**ckeys) + return artist_info(**ckeys) @api.get("trackinfo") -def trackInfo_external(artist:Multi[str],**keys): +def track_info_external(artist:Multi[str],**keys): # transform into a multidict so we can use our nomral uri_to_internal function keys = FormsDict(keys) for a in artist: @@ -194,7 +194,7 @@ def trackInfo_external(artist:Multi[str],**keys): k_filter, _, _, _, _ = uri_to_internal(keys,forceTrack=True) ckeys = {**k_filter} - return trackInfo(**ckeys) + return track_info(**ckeys) @api.get("compare") diff --git a/maloja/database/__init__.py b/maloja/database/__init__.py index 5028086..d6da832 100644 --- a/maloja/database/__init__.py +++ b/maloja/database/__init__.py @@ -226,7 +226,7 @@ def get_top_tracks(**keys): return results -def artistInfo(artist): +def artist_info(artist): charts = db_aggregate(by="ARTIST") scrobbles = len(db_query(artists=[artist])) @@ -257,7 +257,7 @@ def artistInfo(artist): -def trackInfo(track): +def track_info(track): charts = db_aggregate(by="TRACK") #scrobbles = len(db_query(artists=artists,title=title)) #chart entry of track always has right scrobble number, no countas rules here #c = [e for e in charts if set(e["track"]["artists"]) == set(artists) and e["track"]["title"] == title][0] diff --git a/maloja/web/jinja/artist.jinja b/maloja/web/jinja/artist.jinja index b59c59a..a1c92ad 100644 --- a/maloja/web/jinja/artist.jinja +++ b/maloja/web/jinja/artist.jinja @@ -9,7 +9,7 @@ {% endblock %} {% set artist = filterkeys.artist %} -{% set info = db.artistInfo(artist) %} +{% set info = db.artist_info(artist) %} {% set credited = info.get('replace') %} {% set included = info.get('associated') %} diff --git a/maloja/web/jinja/partials/awards_artist.jinja b/maloja/web/jinja/partials/awards_artist.jinja index b47eb5e..749bc27 100644 --- a/maloja/web/jinja/partials/awards_artist.jinja +++ b/maloja/web/jinja/partials/awards_artist.jinja @@ -56,7 +56,7 @@ {% for track in db.get_tracks(artist=artist) -%} - {% set info = db.trackInfo(track) %} + {% set info = db.track_info(track) %} {% if info.certification is not none -%} -{% set info = db.trackInfo(track) %} +{% set info = db.track_info(track) %} {% if info.certification is not none %}