Cutlery/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2025-07-09 03:04:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Krateng 2020-07-26 13:00:38 +02:00
parent 331374e35c
commit b161da1c1a
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maloja/__pkginfo__.py
View File

@ -5,7 +5,7 @@ author = {
"email":"maloja@krateng.dev", "email":"maloja@krateng.dev",
"github": "krateng" "github": "krateng"
} }
version = 2,5,3 version = 2,6,0
versionstr = ".".join(str(n) for n in version) versionstr = ".".join(str(n) for n in version)
links = { links = {
"pypi":"malojaserver", "pypi":"malojaserver",
@ -31,7 +31,8 @@ resources = [
"data_files/*/*", "data_files/*/*",
"data_files/*/*/*", "data_files/*/*/*",
"proccontrol/*", "proccontrol/*",
"proccontrol/*/*" "proccontrol/*/*",
"thirdparty/*"
] ]
commands = { commands = {

1
maloja/database.py
View File

@ -8,7 +8,6 @@ from .malojatime import register_scrobbletime, time_stamps, ranges
from .urihandler import uri_to_internal, internal_to_uri, compose_querystring from .urihandler import uri_to_internal, internal_to_uri, compose_querystring
from . import compliant_api from . import compliant_api
#from .external import proxy_scrobble
from .thirdparty import proxy_scrobble_all from .thirdparty import proxy_scrobble_all
from .__pkginfo__ import version from .__pkginfo__ import version

12
maloja/utilities.py
View File

@ -15,7 +15,7 @@ from doreah.logging import log
from doreah.regular import yearly, daily from doreah.regular import yearly, daily
#from .external import api_request_track, api_request_artist #from .external import api_request_track, api_request_artist
from .thirdparty import get_image_track_all, get_image_artist_all from . import thirdparty
from .__pkginfo__ import version from .__pkginfo__ import version
from . import globalconf from . import globalconf
from .globalconf import datadir from .globalconf import datadir
@ -292,9 +292,8 @@ def getTrackImage(artists,title,fast=False):
# fast request only retuns cached and local results, generates redirect link for rest # fast request only retuns cached and local results, generates redirect link for rest
if fast: return "/image?title=" + urllib.parse.quote(title) + "&" + "&".join(["artist=" + urllib.parse.quote(a) for a in artists]) if fast: return "/image?title=" + urllib.parse.quote(title) + "&" + "&".join(["artist=" + urllib.parse.quote(a) for a in artists])
# non-fast lookup (esentially only the resolver lookup) # non-fast lookup (essentially only the resolver lookup)
# result = api_request_track((artists,title)) result = thirdparty.get_image_track_all((artists,title))
result = get_image_track_all((artists,title))
# cache results (even negative ones) # cache results (even negative ones)
#cachedTracks[(frozenset(artists),title)] = result #cachedTracks[(frozenset(artists),title)] = result
@ -347,9 +346,8 @@ def getArtistImage(artist,fast=False):
# fast request only retuns cached and local results, generates redirect link for rest # fast request only retuns cached and local results, generates redirect link for rest
if fast: return "/image?artist=" + urllib.parse.quote(artist) if fast: return "/image?artist=" + urllib.parse.quote(artist)
# non-fast lookup (esentially only the resolver lookup) # non-fast lookup (essentially only the resolver lookup)
# result = api_request_artist(artist=artist) result = thirdparty.get_image_artist_all(artist)
result = get_image_artist_all(artist)
# cache results (even negative ones) # cache results (even negative ones)
#cachedArtists[artist] = result #cachedArtists[artist] = result