Moved some stuff and changed some things

deemix/utils/misc.py

@@ -0,0 +1,49 @@
+#!/usr/bin/env python3
+import re
+
+def getIDFromLink(link, type):
+	if '?' in link:
+		link = link[:link.find('?')]
+
+	if link.startswith("http") and 'open.spotify.com/' in link:
+		if type == "spotifyplaylist":
+			return link[link.find("/playlist/") + 10]
+		if type == "spotifytrack":
+			return link[link.find("/track/") + 7]
+		if type == "spotifyalbum":
+			return link[link.find("/album/") + 7]
+	elif link.startswith("spotify:"):
+		if type == "spotifyplaylist":
+			return link[link.find("playlist:") + 9]
+		if type == "spotifytrack":
+			return link[link.find("track:") + 6]
+		if type == "spotifyalbum":
+			return link[link.find("album:") + 6]
+	elif type == "artisttop":
+		return re.search(r"\/artist\/(\d+)\/top_track", link)[1]
+	else:
+		return link[link.rfind("/") + 1:]
+
+
+def getTypeFromLink(link):
+	type = ''
+	if 'spotify' in link:
+		type = 'spotify'
+		if 'playlist' in link:
+			type += 'playlist'
+		elif 'track' in link:
+			type += 'track'
+		elif 'album' in link:
+			type += 'album'
+	elif 'deezer' in link:
+		if '/track' in link:
+			type = 'track'
+		elif '/playlist' in link:
+			type = 'playlist'
+		elif '/album' in link:
+			type = 'album'
+		elif re.search("\/artist\/(\d+)\/top_track", link):
+			type = 'artisttop'
+		elif '/artist' in link:
+			type = 'artist'
+	return type

deemix/utils/taggers.py

@@ -21,9 +21,9 @@ def tagID3(stream, track, save):
 	if save['albumArtist']:
 		tag.add(TPE2(text=track['album']['artist']['name']))
 	if save['trackNumber']:
-		tag.add(TRCK(text=str(track['trackNumber'])))
+		tag.add(TRCK(text=str(track['trackNumber'])+("/"+str(track['album']['trackTotal']) if save['trackTotal'] else "")))
 	if save['discNumber']:
-		tag.add(TPOS(text=str(track['discNumber'])))
+		tag.add(TPOS(text=str(track['discNumber'])+("/"+str(track['album']['discTotal']) if save['discTotal'] else "")))
 	if save['genre']:
 		tag.add(TCON(text=track['album']['genre']))
 	if save['year']: