From e33f73dfe521a54bd3f845717712f8c8c33f355c Mon Sep 17 00:00:00 2001
From: RemixDev <RemixDev64@gmail.com>
Date: Sat, 22 Feb 2020 15:57:24 +0100
Subject: [PATCH] Moved some stuff and changed some things

---
 deemix/app/default.json                    |  5 ++---
 deemix/app/downloader.py                   | 11 ++++++-----
 deemix/ui/MainFrame.py                     |  2 +-
 deemix/{app/functions.py => utils/misc.py} |  0
 deemix/utils/taggers.py                    |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename deemix/{app/functions.py => utils/misc.py} (100%)

diff --git a/deemix/app/default.json b/deemix/app/default.json
index d7e7778..93fe44f 100644
--- a/deemix/app/default.json
+++ b/deemix/app/default.json
@@ -10,7 +10,7 @@
 	"createStructurePlaylist": false,
 	"createSingleFolder": false,
 	"saveFullArtists": false,
-	"padTrack": true,
+	"padTracks": true,
 	"paddingSize": "0",
 	"illegalCharacterReplacer": "_",
 	"queueConcurrency": 3,
@@ -26,8 +26,7 @@
 	"coverImageTemplate": "",
 	"artistImageTemplate": "",
 	"multitagSeparator": "default",
-	"dateFormat": "0",
-	"dateFormatYear": "4",
+	"dateFormat": "YMD",
 	"savePlaylistAsCompilation": false,
 	"removeAlbumVersion": false,
 	"moveFeaturedToTitle": false,
diff --git a/deemix/app/downloader.py b/deemix/app/downloader.py
index 01baa12..a14313c 100644
--- a/deemix/app/downloader.py
+++ b/deemix/app/downloader.py
@@ -150,7 +150,7 @@ def getTrackData(trackAPI):
 		}
 		track['album']['trackTotal'] = albumAPI2['NUMBER_TRACK']
 		track['album']['discTotal'] = albumAPI2['NUMBER_DISK']
-		track['album']['recordType'] = trackAPI['TYPE']
+		track['album']['recordType'] = "Album"
 		track['album']['barcode'] = "Unknown"
 		track['album']['label'] = albumAPI2['LABEL_NAME'] if 'LABEL_NAME' in albumAPI2 else "Unknown"
 		if not 'pic' in track['album']:
@@ -174,10 +174,11 @@ def getTrackData(trackAPI):
 	track['artist'] = {}
 	track['artists'] = []
 	for artist in trackAPI2['contributors']:
-		track['artists'].append(artist['name'])
-		if not artist['role'] in track['artist']:
-			track['artist'][artist['role']] = []
-		track['artist'][artist['role']].append(artist['name'])
+		if artist['id'] != 5080:
+			track['artists'].append(artist['name'])
+			if not artist['role'] in track['artist']:
+				track['artist'][artist['role']] = []
+			track['artist'][artist['role']].append(artist['name'])
 
 	if not 'discTotal' in track['album'] or not track['album']['discTotal']:
 		if not albumAPI2:
diff --git a/deemix/ui/MainFrame.py b/deemix/ui/MainFrame.py
index acf2065..9ae971e 100644
--- a/deemix/ui/MainFrame.py
+++ b/deemix/ui/MainFrame.py
@@ -2,7 +2,7 @@
 import wx
 
 from deemix.ui.SettingsDialog import SettingsDialog
-from deemix.app.functions import getIDFromLink, getTypeFromLink
+from deemix.utils.misc import getIDFromLink, getTypeFromLink
 from deemix.app.downloader import download_track, download_album, download_playlist
 from deemix.app.settings import initSettings
 
diff --git a/deemix/app/functions.py b/deemix/utils/misc.py
similarity index 100%
rename from deemix/app/functions.py
rename to deemix/utils/misc.py
diff --git a/deemix/utils/taggers.py b/deemix/utils/taggers.py
index 80add11..e79f6db 100644
--- a/deemix/utils/taggers.py
+++ b/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']: