mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Improved image requesting and caching

Browse Source
This commit is contained in:
Krateng
2019-03-12 11:39:36 +01:00
parent d46ba0a366
commit f310cf4b20
9 changed files with 84 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/artist.py
View File

@@ -3,13 +3,12 @@ import database
def instructions(keys):
from utilities import getArtistInfo
from utilities import getArtistImage
from htmlgenerators import artistLink, artistLinks, KeySplit
from htmlmodules import module_pulse, module_trackcharts
filterkeys, _, _, _ = KeySplit(keys,forceArtist=True)
info = getArtistInfo(filterkeys["artist"],fast=True)
imgurl = info.get("image")
imgurl = getArtistImage(filterkeys["artist"],fast=True)
pushresources = [{"file":imgurl,"type":"image"}] if imgurl.startswith("/") else []
data = database.artistInfo(filterkeys["artist"])

6
website/pulse.py
View File

@@ -3,7 +3,7 @@ import database
def instructions(keys):
from utilities import getArtistInfo, getTrackInfo
from utilities import getArtistImage, getTrackImage
from htmlgenerators import artistLink, artistLinks, trackLink, scrobblesLink, keysToUrl, KeySplit
from htmlmodules import module_pulse
from malojatime import range_desc, delimit_desc
@@ -35,9 +35,9 @@ def instructions(keys):
# get image
if filterkeys.get("track") is not None:
imgurl = getTrackInfo(filterkeys.get("track")["artists"],filterkeys.get("track")["title"]).get("image")
imgurl = getTrackImage(filterkeys.get("track")["artists"],filterkeys.get("track")["title"])
elif filterkeys.get("artist") is not None:
imgurl = getArtistInfo(keys.get("artist")).get("image")
imgurl = getArtistImage(keys.get("artist"))
else:
imgurl = ""

8
website/scrobbles.py
View File

@@ -3,7 +3,7 @@ import database
def instructions(keys):
from utilities import getArtistInfo, getTrackInfo
from utilities import getArtistImage, getTrackImage
from htmlgenerators import artistLink, artistLinks, trackLink, KeySplit
from htmlmodules import module_scrobblelist
from malojatime import range_desc
@@ -32,11 +32,11 @@ def instructions(keys):
# get image
if filterkeys.get("track") is not None:
imgurl = getTrackInfo(filterkeys.get("track")["artists"],filterkeys.get("track")["title"],fast=True).get("image")
imgurl = getTrackImage(filterkeys.get("track")["artists"],filterkeys.get("track")["title"],fast=True)
elif filterkeys.get("artist") is not None:
imgurl = getArtistInfo(keys.get("artist"),fast=True).get("image")
imgurl = getArtistImage(keys.get("artist"),fast=True)
elif rep is not None:
imgurl = getTrackInfo(rep["artists"],rep["title"],fast=True).get("image")
imgurl = getTrackImage(rep["artists"],rep["title"],fast=True)
else:
imgurl = ""

4
website/topartists.py
View File

@@ -2,7 +2,7 @@ import urllib
def instructions(keys):
from utilities import getArtistInfo
from utilities import getArtistImage
from htmlgenerators import KeySplit
from htmlmodules import module_artistcharts
from malojatime import range_desc
@@ -17,7 +17,7 @@ def instructions(keys):
html_charts, rep = module_artistcharts(**amountkeys,**timekeys)
if rep is not None:
imgurl = getArtistInfo(rep).get("image")
imgurl = getArtistImage(rep)
else:
imgurl = ""

6
website/toptracks.py
View File

@@ -2,7 +2,7 @@ import urllib
def instructions(keys):
from utilities import getArtistInfo, getTrackInfo
from utilities import getArtistImage, getTrackImage
from htmlgenerators import artistLink, KeySplit
from htmlmodules import module_trackcharts
from malojatime import range_desc
@@ -17,10 +17,10 @@ def instructions(keys):
if filterkeys.get("artist") is not None:
imgurl = getArtistInfo(filterkeys.get("artist")).get("image")
imgurl = getArtistImage(filterkeys.get("artist"))
limitstring = "by " + artistLink(filterkeys.get("artist"))
elif rep is not None:
imgurl = getTrackInfo(rep["artists"],rep["title"]).get("image")
imgurl = getTrackImage(rep["artists"],rep["title"])
else:
imgurl = ""

4
website/track.py
View File

@@ -3,7 +3,7 @@ import database
def instructions(keys):
from utilities import getArtistInfo, getTrackInfo
from utilities import getArtistImage, getTrackImage
from htmlgenerators import artistLinks, keysToUrl, KeySplit
from htmlmodules import module_scrobblelist, module_pulse
@@ -11,7 +11,7 @@ def instructions(keys):
filterkeys, _, _, _ = KeySplit(keys,forceTrack=True)
track = filterkeys.get("track")
imgurl = getTrackInfo(track["artists"],track["title"],fast=True).get("image")
imgurl = getTrackImage(track["artists"],track["title"],fast=True)
pushresources = [{"file":imgurl,"type":"image"}] if imgurl.startswith("/") else []
data = database.trackInfo(track["artists"],track["title"])