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

Cleaning up

Browse Source
This commit is contained in:
Krateng 2019-04-07 15:55:49 +02:00
parent 51c41b5cd8
commit 9b3519d80a
1 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
database.py
View File

@ -32,8 +32,6 @@ SCROBBLES = [] # Format: tuple(track_ref,timestamp,saved)
ARTISTS = [] # Format: artist ARTISTS = [] # Format: artist
TRACKS = [] # Format: namedtuple(artists=frozenset(artist_ref,...),title=title) TRACKS = [] # Format: namedtuple(artists=frozenset(artist_ref,...),title=title)
ARTIST_SET = set()
TRACK_SET = set()
Track = namedtuple("Track",["artists","title"]) Track = namedtuple("Track",["artists","title"])
Scrobble = namedtuple("Scrobble",["track","timestamp","saved"]) Scrobble = namedtuple("Scrobble",["track","timestamp","saved"])
@ -41,9 +39,11 @@ Scrobble = namedtuple("Scrobble",["track","timestamp","saved"])
### OPTIMIZATION ### OPTIMIZATION
SCROBBLESDICT = {} # timestamps to scrobble mapping SCROBBLESDICT = {} # timestamps to scrobble mapping
STAMPS = [] # sorted STAMPS = [] # sorted
#STAMPS_SET = set() # as set for easier check if exists #STAMPS_SET = set() # as set for easier check if exists # we use the scrobbles dict for that now
TRACKS_LOWER = [] TRACKS_LOWER = []
ARTISTS_LOWER = [] ARTISTS_LOWER = []
ARTIST_SET = set()
TRACK_SET = set()
MEDALS = {} #literally only changes once per year, no need to calculate that on the fly MEDALS = {} #literally only changes once per year, no need to calculate that on the fly
MEDALS_TRACKS = {} MEDALS_TRACKS = {}
@ -127,15 +127,13 @@ def getArtistID(name):
obj = name obj = name
objlower = name.lower() objlower = name.lower()
try: if objlower in ARTIST_SET:
return ARTISTS.index(obj)
except:
pass
try:
return ARTISTS_LOWER.index(objlower) return ARTISTS_LOWER.index(objlower)
except:
else:
i = len(ARTISTS) i = len(ARTISTS)
ARTISTS.append(obj) ARTISTS.append(obj)
ARTIST_SET.add(objlower)
ARTISTS_LOWER.append(objlower) ARTISTS_LOWER.append(objlower)
return i return i
@ -146,20 +144,13 @@ def getTrackID(artists,title):
obj = Track(artists=frozenset(artistset),title=title) obj = Track(artists=frozenset(artistset),title=title)
objlower = Track(artists=frozenset(artistset),title=title.lower()) objlower = Track(artists=frozenset(artistset),title=title.lower())
try: if objlower in TRACK_SET:
return TRACKS.index(obj)
except:
pass
try:
# better now
return TRACKS_LOWER.index(objlower) return TRACKS_LOWER.index(objlower)
# not the best performance else:
#return [(t.artists,t.title.lower()) for t in TRACKS].index(objlower)
except:
i = len(TRACKS) i = len(TRACKS)
TRACKS.append(obj) TRACKS.append(obj)
TRACKS_LOWER.append(obj) TRACK_SET.add(objlower)
TRACKS_LOWER.append(objlower)
return i return i
@ -1050,14 +1041,14 @@ def simplestr(input,ignorecapitalization=True):
def getArtistId(nameorid): #def getArtistId(nameorid):
if isinstance(nameorid,int): # if isinstance(nameorid,int):
return nameorid # return nameorid
else: # else:
try: # try:
return ARTISTS.index(nameorid) # return ARTISTS.index(nameorid)
except: # except:
return -1 # return -1
def insert(list_,item,key=lambda x:x): def insert(list_,item,key=lambda x:x):