diff --git a/maloja/apis/native_v1.py b/maloja/apis/native_v1.py index c51b8bd..1f5d4b2 100644 --- a/maloja/apis/native_v1.py +++ b/maloja/apis/native_v1.py @@ -205,9 +205,10 @@ def get_scrobbles_external(**keys): result = database.get_scrobbles(**ckeys) - offset = (k_amount.get('page') * k_amount.get('perpage')) if k_amount.get('perpage') is not math.inf else 0 - result = result[offset:] - if k_amount.get('perpage') is not math.inf: result = result[:k_amount.get('perpage')] + # this should now all be served by the inner function + #offset = (k_amount.get('page') * k_amount.get('perpage')) if k_amount.get('perpage') is not math.inf else 0 + #result = result[offset:] + #if k_amount.get('perpage') is not math.inf: result = result[:k_amount.get('perpage')] return { "status":"ok", diff --git a/maloja/database/__init__.py b/maloja/database/__init__.py index 9bb1bd4..b09581d 100644 --- a/maloja/database/__init__.py +++ b/maloja/database/__init__.py @@ -323,7 +323,7 @@ def get_scrobbles(dbconn=None,**keys): (since,to) = keys.get('timerange').timestamps() reverse = keys.get('reverse',True) # comaptibility with old calls - if 'perpage' in keys: + if keys.get('perpage',math.inf) is not math.inf: limit = (keys.get('page',0)+1) * keys.get('perpage',100) behead = keys.get('page',0) * keys.get('perpage',100) else: diff --git a/maloja/web/static/css/maloja.css b/maloja/web/static/css/maloja.css index 7c8a508..07c99d2 100644 --- a/maloja/web/static/css/maloja.css +++ b/maloja/web/static/css/maloja.css @@ -243,7 +243,7 @@ div#footer { #notch { - --notch-size: 80px; + --notch-size: 70px; background-color: var(--base-color-dark); width: var(--notch-size); height: var(--notch-size); @@ -252,15 +252,16 @@ div#footer { z-index: 1; border-radius: 50%; - transform: translate(0%, -30%); + transform: translate(0%, -40%); } #notch img { + --notch-img-size: 80px; position: absolute; - top: calc((var(--notch-size) - 100px) / 2); - left: calc((var(--notch-size) - 100px) / 2); + top: calc((var(--notch-size) - var(--notch-img-size)) / 2); + left: calc((var(--notch-size) - var(--notch-img-size)) / 2); - width: 100px; + width: var(--notch-img-size); height: auto; }