mirror of
https://github.com/rembo10/headphones.git
synced 2026-07-20 16:03:59 +01:00
Updated folder and file values in librarysync.py track matching to keep up with the new variable names in the config (using )
This commit is contained in:
+23
-14
@@ -118,15 +118,19 @@ def libraryScan(dir=None):
|
|||||||
firstchar = '0-9'
|
firstchar = '0-9'
|
||||||
else:
|
else:
|
||||||
firstchar = sortname[0]
|
firstchar = sortname[0]
|
||||||
|
|
||||||
lowerfirst = firstchar.lower()
|
|
||||||
|
|
||||||
albumvalues = { 'artist': artist,
|
albumvalues = { '$Artist': artist,
|
||||||
'album': album,
|
'$Album': album,
|
||||||
'year': year,
|
'$Year': year,
|
||||||
'first': firstchar,
|
'$Type': releasetype,
|
||||||
'lowerfirst': lowerfirst
|
'$First': firstchar,
|
||||||
}
|
'$artist': artist.lower(),
|
||||||
|
'$album': album.lower(),
|
||||||
|
'$year': year,
|
||||||
|
'$type': releasetype.lower(),
|
||||||
|
'$first': firstchar.lower()
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
folder = helpers.replace_all(headphones.FOLDER_FORMAT, albumvalues)
|
folder = helpers.replace_all(headphones.FOLDER_FORMAT, albumvalues)
|
||||||
@@ -140,12 +144,17 @@ def libraryScan(dir=None):
|
|||||||
else:
|
else:
|
||||||
tracknumber = '%02d' % track['TrackNumber']
|
tracknumber = '%02d' % track['TrackNumber']
|
||||||
|
|
||||||
trackvalues = { 'tracknumber': tracknumber,
|
trackvalues = { '$Track': tracknumber,
|
||||||
'title': track['TrackTitle'],
|
'$Title': title,
|
||||||
'artist': release['ArtistName'],
|
'$Artist': release['ArtistName'],
|
||||||
'album': release['AlbumTitle'],
|
'$Album': release['AlbumTitle'],
|
||||||
'year': year
|
'$Year': year,
|
||||||
}
|
'$track': tracknumber,
|
||||||
|
'$title': title.lower(),
|
||||||
|
'$artist': release['ArtistName'].lower(),
|
||||||
|
'$album': release['AlbumTitle'].lower(),
|
||||||
|
'$year': year
|
||||||
|
}
|
||||||
|
|
||||||
new_file_name = helpers.replace_all(headphones.FILE_FORMAT, trackvalues).replace('/','_') + '.*'
|
new_file_name = helpers.replace_all(headphones.FILE_FORMAT, trackvalues).replace('/','_') + '.*'
|
||||||
|
|
||||||
|
|||||||
@@ -508,12 +508,12 @@ def renameFiles(albumpath, downloaded_track_list, release):
|
|||||||
'$Title': title,
|
'$Title': title,
|
||||||
'$Artist': release['ArtistName'],
|
'$Artist': release['ArtistName'],
|
||||||
'$Album': release['AlbumTitle'],
|
'$Album': release['AlbumTitle'],
|
||||||
'$Year': year,
|
'$Year': year,
|
||||||
'$track': tracknumber,
|
'$track': tracknumber,
|
||||||
'$title': title.lower(),
|
'$title': title.lower(),
|
||||||
'$artist': release['ArtistName'].lower(),
|
'$artist': release['ArtistName'].lower(),
|
||||||
'$album': release['AlbumTitle'].lower(),
|
'$album': release['AlbumTitle'].lower(),
|
||||||
'$year': year
|
'$year': year
|
||||||
}
|
}
|
||||||
|
|
||||||
ext = os.path.splitext(downloaded_track)[1]
|
ext = os.path.splitext(downloaded_track)[1]
|
||||||
|
|||||||
Reference in New Issue
Block a user