lukas/deemix-py
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Done more code rework

Browse Source
This commit is contained in:
RemixDev
2020-08-15 21:34:10 +02:00
parent 7a536caf1c
commit 4cfdc4872d
8 changed files with 1113 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
deemix/utils/misc.py
View File

@ -34,6 +34,31 @@ def changeCase(str, type):
return str
def removeFeatures(title):
clean = title
if "(feat." in clean.lower():
pos = clean.lower().find("(feat.")
tempTrack = clean[:pos]
if ")" in clean:
tempTrack += clean[clean.find(")", pos + 1) + 1:]
clean = tempTrack.strip()
return clean
def andCommaConcat(lst):
tot = len(lst)
result = ""
for i, art in enumerate(lst):
result += art
track['commaArtistsString'] += art
if tot != i + 1:
if tot - 1 == i + 1:
result += " & "
else:
result += ", "
return result
def getIDFromLink(link, type):
if '?' in link:
link = link[:link.find('?')]

64
deemix/utils/pathtemplates.py
View File

@ -94,10 +94,10 @@ def generateFilepath(track, trackAPI, settings):
'savePlaylistAsCompilation']) or
(settings['createArtistFolder'] and '_EXTRA_PLAYLIST' in trackAPI and settings['createStructurePlaylist'])
):
if (int(track['id']) < 0 and not 'mainArtist' in track['album']):
track['album']['mainArtist'] = track['mainArtist']
if (int(track.id) < 0 and not 'mainArtist' in track.album):
track.album['mainArtist'] = track.mainArtist
filepath += antiDot(
settingsRegexArtist(settings['artistNameTemplate'], track['album']['mainArtist'], settings)) + pathSep
settingsRegexArtist(settings['artistNameTemplate'], track.album['mainArtist'], settings)) + pathSep
artistPath = filepath
if (settings['createAlbumFolder'] and
@ -107,7 +107,7 @@ def generateFilepath(track, trackAPI, settings):
'_EXTRA_PLAYLIST' in trackAPI and settings['createStructurePlaylist']))
):
filepath += antiDot(
settingsRegexAlbum(settings['albumNameTemplate'], track['album'], settings,
settingsRegexAlbum(settings['albumNameTemplate'], track.album, settings,
trackAPI['_EXTRA_PLAYLIST'] if'_EXTRA_PLAYLIST' in trackAPI else None)) + pathSep
coverPath = filepath
@ -115,55 +115,55 @@ def generateFilepath(track, trackAPI, settings):
extrasPath = filepath
if (
int(track['album']['discTotal']) > 1 and (
int(track.album['discTotal']) > 1 and (
(settings['createAlbumFolder'] and settings['createCDFolder']) and
(not 'SINGLE_TRACK' in trackAPI or ('SINGLE_TRACK' in trackAPI and settings['createSingleFolder'])) and
(not '_EXTRA_PLAYLIST' in trackAPI or (
'_EXTRA_PLAYLIST' in trackAPI and settings['tags']['savePlaylistAsCompilation']) or (
'_EXTRA_PLAYLIST' in trackAPI and settings['createStructurePlaylist']))
)):
filepath += 'CD' + str(track['discNumber']) + pathSep
filepath += 'CD' + str(track.discNumber) + pathSep
return (filepath, artistPath, coverPath, extrasPath)
def settingsRegex(filename, track, settings, playlist=None):
filename = filename.replace("%title%", fixName(track['title'], settings['illegalCharacterReplacer']))
filename = filename.replace("%artist%", fixName(track['mainArtist']['name'], settings['illegalCharacterReplacer']))
filename = filename.replace("%artists%", fixName(track['commaArtistsString'], settings['illegalCharacterReplacer']))
filename = filename.replace("%allartists%", fixName(track['artistsString'], settings['illegalCharacterReplacer']))
filename = filename.replace("%mainartists%", fixName(track['mainArtistsString'], settings['illegalCharacterReplacer']))
filename = filename.replace("%featartists%", fixName('('+track['featArtistsString']+')', settings['illegalCharacterReplacer']) if 'featArtistsString' in track else "")
filename = filename.replace("%album%", fixName(track['album']['title'], settings['illegalCharacterReplacer']))
filename = filename.replace("%title%", fixName(track.title, settings['illegalCharacterReplacer']))
filename = filename.replace("%artist%", fixName(track.mainArtist['name'], settings['illegalCharacterReplacer']))
filename = filename.replace("%artists%", fixName(track.commaArtistsString, settings['illegalCharacterReplacer']))
filename = filename.replace("%allartists%", fixName(track.artistsString, settings['illegalCharacterReplacer']))
filename = filename.replace("%mainartists%", fixName(track.mainArtistsString, settings['illegalCharacterReplacer']))
filename = filename.replace("%featartists%", fixName('('+track.featArtistsString+')', settings['illegalCharacterReplacer']) if 'featArtistsString' in track else "")
filename = filename.replace("%album%", fixName(track.album['title'], settings['illegalCharacterReplacer']))
filename = filename.replace("%albumartist%",
fixName(track['album']['mainArtist']['name'], settings['illegalCharacterReplacer']))
filename = filename.replace("%tracknumber%", pad(track['trackNumber'], track['album']['trackTotal'] if int(
fixName(track.album['mainArtist']['name'], settings['illegalCharacterReplacer']))
filename = filename.replace("%tracknumber%", pad(track.trackNumber, track.album['trackTotal'] if int(
settings['paddingSize']) == 0 else 10 ** (int(settings['paddingSize']) - 1), settings['padTracks']))
filename = filename.replace("%tracktotal%", str(track['album']['trackTotal']))
filename = filename.replace("%discnumber%", str(track['discNumber']))
filename = filename.replace("%disctotal%", str(track['album']['discTotal']))
if len(track['album']['genre']) > 0:
filename = filename.replace("%tracktotal%", str(track.album['trackTotal']))
filename = filename.replace("%discnumber%", str(track.discNumber))
filename = filename.replace("%disctotal%", str(track.album['discTotal']))
if len(track.album['genre']) > 0:
filename = filename.replace("%genre%",
fixName(track['album']['genre'][0], settings['illegalCharacterReplacer']))
fixName(track.album['genre'][0], settings['illegalCharacterReplacer']))
else:
filename = filename.replace("%genre%", "Unknown")
filename = filename.replace("%year%", str(track['date']['year']))
filename = filename.replace("%date%", track['dateString'])
filename = filename.replace("%bpm%", str(track['bpm']))
filename = filename.replace("%label%", fixName(track['album']['label'], settings['illegalCharacterReplacer']))
filename = filename.replace("%isrc%", track['ISRC'])
filename = filename.replace("%upc%", track['album']['barcode'])
filename = filename.replace("%explicit%", "(Explicit)" if track['explicit'] else "")
filename = filename.replace("%year%", str(track.date['year']))
filename = filename.replace("%date%", track.dateString)
filename = filename.replace("%bpm%", str(track.bpm))
filename = filename.replace("%label%", fixName(track.album['label'], settings['illegalCharacterReplacer']))
filename = filename.replace("%isrc%", track.ISRC)
filename = filename.replace("%upc%", track.album['barcode'])
filename = filename.replace("%explicit%", "(Explicit)" if track.explicit else "")
filename = filename.replace("%track_id%", str(track['id']))
filename = filename.replace("%album_id%", str(track['album']['id']))
filename = filename.replace("%artist_id%", str(track['mainArtist']['id']))
filename = filename.replace("%track_id%", str(track.id))
filename = filename.replace("%album_id%", str(track.album['id']))
filename = filename.replace("%artist_id%", str(track.mainArtist['id']))
if playlist:
filename = filename.replace("%playlist_id%", str(playlist['id']))
filename = filename.replace("%position%", pad(track['position'], playlist['nb_tracks'] if int(
filename = filename.replace("%position%", pad(track.position, playlist['nb_tracks'] if int(
settings['paddingSize']) == 0 else 10 ** (int(settings['paddingSize']) - 1), settings['padTracks']))
else:
filename = filename.replace("%position%", pad(track['trackNumber'], track['album']['trackTotal'] if int(
filename = filename.replace("%position%", pad(track.trackNumber, track.album['trackTotal'] if int(
settings['paddingSize']) == 0 else 10 ** (int(settings['paddingSize']) - 1), settings['padTracks']))
filename = filename.replace('\\', pathSep).replace('/', pathSep)
return antiDot(fixLongName(filename))

132
deemix/utils/taggers.py
View File

@ -13,75 +13,75 @@ def tagID3(stream, track, save):
tag = ID3()
if save['title']:
tag.add(TIT2(text=track['title']))
if save['artist'] and len(track['artists']):
tag.add(TIT2(text=track.title))
if save['artist'] and len(track.artists):
if save['multiArtistSeparator'] != "default":
if save['multiArtistSeparator'] == "nothing":
tag.add(TPE1(text=track['mainArtist']['name']))
tag.add(TPE1(text=track.mainArtist['name']))
else:
tag.add(TPE1(text=track['artistsString']))
tag.add(TXXX(desc="ARTISTS", text=track['artists']))
tag.add(TPE1(text=track.artistsString))
tag.add(TXXX(desc="ARTISTS", text=track.artists))
else:
tag.add(TPE1(text=track['artists']))
tag.add(TPE1(text=track.artists))
if save['album']:
tag.add(TALB(text=track['album']['title']))
tag.add(TALB(text=track.album['title']))
if save['albumArtist'] and len(track['album']['artists']):
if save['singleAlbumArtist'] and track['album']['mainArtist']['save']:
tag.add(TPE2(text=track['album']['mainArtist']['name']))
if save['albumArtist'] and len(track.album['artists']):
if save['singleAlbumArtist'] and track.album['mainArtist']['save']:
tag.add(TPE2(text=track.album['mainArtist']['name']))
else:
tag.add(TPE2(text=track['album']['artists']))
tag.add(TPE2(text=track.album['artists']))
if save['trackNumber']:
tag.add(TRCK(
text=str(track['trackNumber']) + ("/" + str(track['album']['trackTotal']) if save['trackTotal'] else "")))
text=str(track.trackNumber) + ("/" + str(track.album['trackTotal']) if save['trackTotal'] else "")))
if save['discNumber']:
tag.add(
TPOS(text=str(track['discNumber']) + ("/" + str(track['album']['discTotal']) if save['discTotal'] else "")))
TPOS(text=str(track.discNumber) + ("/" + str(track.album['discTotal']) if save['discTotal'] else "")))
if save['genre']:
tag.add(TCON(text=track['album']['genre']))
tag.add(TCON(text=track.album['genre']))
if save['year']:
tag.add(TYER(text=str(track['date']['year'])))
tag.add(TYER(text=str(track.date['year'])))
if save['date']:
tag.add(TDAT(text=str(track['date']['month']) + str(track['date']['day'])))
tag.add(TDAT(text=str(track.date['month']) + str(track.date['day'])))
if save['length']:
tag.add(TLEN(text=str(int(track['duration'])*1000)))
tag.add(TLEN(text=str(int(track.duration)*1000)))
if save['bpm']:
tag.add(TBPM(text=str(track['bpm'])))
tag.add(TBPM(text=str(track.bpm)))
if save['label']:
tag.add(TPUB(text=track['album']['label']))
tag.add(TPUB(text=track.album['label']))
if save['isrc']:
tag.add(TSRC(text=track['ISRC']))
tag.add(TSRC(text=track.ISRC))
if save['barcode']:
tag.add(TXXX(desc="BARCODE", text=track['album']['barcode']))
tag.add(TXXX(desc="BARCODE", text=track.album['barcode']))
if save['explicit']:
tag.add(TXXX(desc="ITUNESADVISORY", text="1" if track['explicit'] else "0"))
tag.add(TXXX(desc="ITUNESADVISORY", text="1" if track.explicit else "0"))
if save['replayGain']:
tag.add(TXXX(desc="REPLAYGAIN_TRACK_GAIN", text=track['replayGain']))
if 'unsync' in track['lyrics'] and save['lyrics']:
tag.add(USLT(text=track['lyrics']['unsync']))
tag.add(TXXX(desc="REPLAYGAIN_TRACK_GAIN", text=track.replayGain))
if 'unsync' in track.lyrics and save['lyrics']:
tag.add(USLT(text=track.lyrics['unsync']))
involved_people = []
for role in track['contributors']:
for role in track.contributors:
if role in ['author', 'engineer', 'mixer', 'producer', 'writer']:
for person in track['contributors'][role]:
for person in track.contributors[role]:
involved_people.append([role, person])
elif role == 'composer' and save['composer']:
tag.add(TCOM(text=track['contributors']['composer']))
tag.add(TCOM(text=track.contributors['composer']))
if len(involved_people) > 0 and save['involvedPeople']:
tag.add(IPLS(people=involved_people))
if save['copyright']:
tag.add(TCOP(text=track['copyright']))
tag.add(TCOP(text=track.copyright))
if save['savePlaylistAsCompilation'] and "playlist" in track:
tag.add(TCMP(text="1"))
if save['cover'] and track['album']['picPath']:
with open(track['album']['picPath'], 'rb') as f:
if save['cover'] and track.album['picPath']:
with open(track.album['picPath'], 'rb') as f:
tag.add(
APIC(3, 'image/jpeg' if track['album']['picPath'].endswith('jpg') else 'image/png', 3, desc='cover', data=f.read()))
APIC(3, 'image/jpeg' if track.album['picPath'].endswith('jpg') else 'image/png', 3, desc='cover', data=f.read()))
tag.save(stream, v1=2 if save['saveID3v1'] else 0, v2_version=3,
v23_sep=None if save['useNullSeparator'] else '/')
@ -94,75 +94,75 @@ def tagFLAC(stream, track, save):
tag.clear_pictures()
if save['title']:
tag["TITLE"] = track['title']
tag["TITLE"] = track.title
if save['artist'] and len(track['artists']):
if save['artist'] and len(track.artists):
if save['multiArtistSeparator'] != "default":
if save['multiArtistSeparator'] == "nothing":
tag["ARTIST"] = track['mainArtist']['name']
tag["ARTIST"] = track.mainArtist['name']
else:
tag["ARTIST"] = track['artistsString']
tag["ARTISTS"] = track['artists']
tag["ARTIST"] = track.artistsString
tag["ARTISTS"] = track.artists
else:
tag["ARTIST"] = track['artists']
tag["ARTIST"] = track.artists
if save['album']:
tag["ALBUM"] = track['album']['title']
tag["ALBUM"] = track.album['title']
if save['albumArtist'] and len(track['album']['artists']):
if save['albumArtist'] and len(track.album['artists']):
if save['singleAlbumArtist']:
tag["ALBUMARTIST"] = track['album']['mainArtist']['name']
tag["ALBUMARTIST"] = track.album['mainArtist']['name']
else:
tag["ALBUMARTIST"] = track['album']['artists']
tag["ALBUMARTIST"] = track.album['artists']
if save['trackNumber']:
tag["TRACKNUMBER"] = str(track['trackNumber'])
tag["TRACKNUMBER"] = str(track.trackNumber)
if save['trackTotal']:
tag["TRACKTOTAL"] = str(track['album']['trackTotal'])
tag["TRACKTOTAL"] = str(track.album['trackTotal'])
if save['discNumber']:
tag["DISCNUMBER"] = str(track['discNumber'])
tag["DISCNUMBER"] = str(track.discNumber)
if save['discTotal']:
tag["DISCTOTAL"] = str(track['album']['discTotal'])
tag["DISCTOTAL"] = str(track.album['discTotal'])
if save['genre']:
tag["GENRE"] = track['album']['genre']
tag["GENRE"] = track.album['genre']
if save['date']:
tag["DATE"] = track['dateString']
tag["DATE"] = track.dateString
elif save['year']:
tag["YEAR"] = str(track['date']['year'])
tag["YEAR"] = str(track.date['year'])
if save['length']:
tag["LENGTH"] = str(track['duration'])
tag["LENGTH"] = str(track.duration)
if save['bpm']:
tag["BPM"] = str(track['bpm'])
tag["BPM"] = str(track.bpm)
if save['label']:
tag["PUBLISHER"] = track['album']['label']
tag["PUBLISHER"] = track.album['label']
if save['isrc']:
tag["ISRC"] = track['ISRC']
tag["ISRC"] = track.ISRC
if save['barcode']:
tag["BARCODE"] = track['album']['barcode']
tag["BARCODE"] = track.album['barcode']
if save['explicit']:
tag["ITUNESADVISORY"] = "1" if track['explicit'] else "0"
tag["ITUNESADVISORY"] = "1" if track.explicit else "0"
if save['replayGain']:
tag["REPLAYGAIN_TRACK_GAIN"] = track['replayGain']
if 'unsync' in track['lyrics'] and save['lyrics']:
tag["LYRICS"] = track['lyrics']['unsync']
tag["REPLAYGAIN_TRACK_GAIN"] = track.replayGain
if 'unsync' in track.lyrics and save['lyrics']:
tag["LYRICS"] = track.lyrics['unsync']
for role in track['contributors']:
for role in track.contributors:
if role in ['author', 'engineer', 'mixer', 'producer', 'writer', 'composer']:
if save['involvedPeople'] and role != 'composer' or role == 'composer' and save['composer']:
tag[role] = track['contributors'][role]
tag[role] = track.contributors[role]
elif role == 'musicpublisher' and save['involvedPeople']:
tag["ORGANIZATION"] = track['contributors']['musicpublisher']
tag["ORGANIZATION"] = track.contributors['musicpublisher']
if save['copyright']:
tag["COPYRIGHT"] = track['copyright']
tag["COPYRIGHT"] = track.copyright
if save['savePlaylistAsCompilation'] and "playlist" in track:
tag["COMPILATION"] = "1"
if save['cover'] and track['album']['picPath']:
if save['cover'] and track.album['picPath']:
image = Picture()
image.type = 3
image.mime = 'image/jpeg' if track['album']['picPath'].endswith('jpg') else 'image/png'
with open(track['album']['picPath'], 'rb') as f:
image.mime = 'image/jpeg' if track.album['picPath'].endswith('jpg') else 'image/png'
with open(track.album['picPath'], 'rb') as f:
image.data = f.read()
tag.add_picture(image)