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

Made the refactoring work

Browse Source
This commit is contained in:
RemixDev
2020-08-15 23:03:05 +02:00
parent 4cfdc4872d
commit 34263c150f
14 changed files with 171 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
deemix/utils/misc.py
View File

@ -50,7 +50,6 @@ def andCommaConcat(lst):
result = ""
for i, art in enumerate(lst):
result += art
track['commaArtistsString'] += art
if tot != i + 1:
if tot - 1 == i + 1:
result += " & "

4
deemix/utils/pathtemplates.py
View File

@ -130,10 +130,10 @@ def generateFilepath(track, trackAPI, settings):
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("%artists%", fixName(", ".join(track.artists), 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("%featartists%", fixName('('+track.featArtistsString+')', settings['illegalCharacterReplacer']) if track.featArtistsString else "")
filename = filename.replace("%album%", fixName(track.album['title'], settings['illegalCharacterReplacer']))
filename = filename.replace("%albumartist%",
fixName(track.album['mainArtist']['name'], settings['illegalCharacterReplacer']))

4
deemix/utils/taggers.py
View File

@ -75,7 +75,7 @@ def tagID3(stream, track, save):
if save['copyright']:
tag.add(TCOP(text=track.copyright))
if save['savePlaylistAsCompilation'] and "playlist" in track:
if save['savePlaylistAsCompilation'] and track.playlist:
tag.add(TCMP(text="1"))
if save['cover'] and track.album['picPath']:
@ -155,7 +155,7 @@ def tagFLAC(stream, track, save):
if save['copyright']:
tag["COPYRIGHT"] = track.copyright
if save['savePlaylistAsCompilation'] and "playlist" in track:
if save['savePlaylistAsCompilation'] and track.playlist:
tag["COMPILATION"] = "1"
if save['cover'] and track.album['picPath']: