From 33cea26a791e224625aa9bc523e2cf90e39c8a50 Mon Sep 17 00:00:00 2001 From: Krateng Date: Mon, 30 Dec 2019 15:28:48 +0100 Subject: [PATCH] More PYHP conversion --- maloja/__init__.py | 3 +- maloja/web/artist.pyhp | 10 +-- maloja/web/charts_artists.pyhp | 4 +- maloja/web/charts_tracks.pyhp | 47 ++++++++++ maloja/web/partial/charts_artists.pyhp | 4 +- maloja/web/partial/charts_tracks.pyhp | 70 +++++++++++++++ maloja/web/partial/link_track_scrobbles.pyhp | 8 ++ maloja/web/partial/pagination.pyhp | 85 ++++++++++--------- maloja/web/partial/pulse.pyhp | 8 +- scrobblers/maloja-scrobbler.zip | Bin 28203 -> 29156 bytes 10 files changed, 185 insertions(+), 54 deletions(-) create mode 100644 maloja/web/charts_tracks.pyhp create mode 100644 maloja/web/partial/charts_tracks.pyhp create mode 100644 maloja/web/partial/link_track_scrobbles.pyhp diff --git a/maloja/__init__.py b/maloja/__init__.py index 758a375..3f393c1 100644 --- a/maloja/__init__.py +++ b/maloja/__init__.py @@ -25,8 +25,7 @@ resources = [ "web/*", "static/*/*", "data_files/*/*", - "data_files/*/*/*", - "data_files/.doreah" + "data_files/*/*/*" ] commands = { diff --git a/maloja/web/artist.pyhp b/maloja/web/artist.pyhp index 422c0aa..cab590b 100644 --- a/maloja/web/artist.pyhp +++ b/maloja/web/artist.pyhp @@ -112,9 +112,9 @@ - - - + + + @@ -133,9 +133,7 @@ - - - + diff --git a/maloja/web/charts_artists.pyhp b/maloja/web/charts_artists.pyhp index b79355e..4e85d87 100644 --- a/maloja/web/charts_artists.pyhp +++ b/maloja/web/charts_artists.pyhp @@ -36,7 +36,9 @@ - + + + diff --git a/maloja/web/charts_tracks.pyhp b/maloja/web/charts_tracks.pyhp new file mode 100644 index 0000000..84715a8 --- /dev/null +++ b/maloja/web/charts_tracks.pyhp @@ -0,0 +1,47 @@ + + + + + + Maloja - Track Charts + + + + + + + # this is temporary! all modules need to be converted into partials at some point + html_charts, rep = htmlmodules.module_trackcharts(**amountkeys,**limitkeys) + + + + + + + + +
+
+ 		+

Track Charts

View #1 Tracks
+ + by + + +

+ + +
+ + + + + + + + + + + + + diff --git a/maloja/web/partial/charts_artists.pyhp b/maloja/web/partial/charts_artists.pyhp index 7bb9582..5e02895 100644 --- a/maloja/web/partial/charts_artists.pyhp +++ b/maloja/web/partial/charts_artists.pyhp @@ -63,8 +63,8 @@ else: - - + + diff --git a/maloja/web/partial/charts_tracks.pyhp b/maloja/web/partial/charts_tracks.pyhp new file mode 100644 index 0000000..39c3232 --- /dev/null +++ b/maloja/web/partial/charts_tracks.pyhp @@ -0,0 +1,70 @@ + + + if amountkeys.get("max_") is not None: amountkeys["perpage"],amountkeys["page"] = amountkeys["max_"],0 + firstindex = amountkeys["page"] * amountkeys["perpage"] + lastindex = firstindex + amountkeys["perpage"] + + + + + + + + + + try: + trackslast = db.get_charts_tracks(**kwargs_filter,timerange=kwargs_time["timerange"].next(step=-1)) + # create rank association + lastrank = {} + for tl in trackslast: + lastrank[(*tl["track"]["artists"],tl["track"]["title"])] = tl["rank"] + for t in tracks: + try: + t["delta"] = lastrank[(*t["track"]["artists"],t["track"]["title"])] - t["rank"] + except: + t["delta"] = math.inf + except: + pass + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#🆕↗↘➡
+ + + + + diff --git a/maloja/web/partial/link_track_scrobbles.pyhp b/maloja/web/partial/link_track_scrobbles.pyhp new file mode 100644 index 0000000..e990796 --- /dev/null +++ b/maloja/web/partial/link_track_scrobbles.pyhp @@ -0,0 +1,8 @@ + + + + + +
+ + diff --git a/maloja/web/partial/pagination.pyhp b/maloja/web/partial/pagination.pyhp index 2449a98..73d581b 100644 --- a/maloja/web/partial/pagination.pyhp +++ b/maloja/web/partial/pagination.pyhp @@ -1,5 +1,4 @@ - - + @@ -8,52 +7,54 @@
- - - - 1 - - - | - + + + + + 1 + + + | + - - ... | - + + ... | + - - - - - - - « - + + + + + + + « + - - - + + + - - » - - - - - - + + » + + + + + + - - | ... - + + | ... + - - | - - - - - + + | + + + + + +
diff --git a/maloja/web/partial/pulse.pyhp b/maloja/web/partial/pulse.pyhp index 778c645..7396ea4 100644 --- a/maloja/web/partial/pulse.pyhp +++ b/maloja/web/partial/pulse.pyhp @@ -1,5 +1,5 @@ - if amountkeys["max_"] is not None: amountkeys["perpage"],amountkeys["page"] = amountkeys["max_"],0 + if amountkeys.get("max_") is not None: amountkeys["perpage"],amountkeys["page"] = amountkeys["max_"],0 firstindex = amountkeys["page"] * amountkeys["perpage"] lastindex = firstindex + amountkeys["perpage"] @@ -23,3 +23,9 @@ + + + + + + diff --git a/scrobblers/maloja-scrobbler.zip b/scrobblers/maloja-scrobbler.zip index 709e32e514d6e2f81556ed4c62028bc1109c786f..c09068600d44e597f03c985763d577d4a574c4b8 100644 GIT binary patch delta 5598 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