TDvorak/swingmusic-extended
1
0
Fork 0
mirror of https://github.com/Dvorinka/swingmusic-extended.git synced 2026-06-05 04:53:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: merging albums

Browse Source 
+ remove "original" version from soundtrack albums
This commit is contained in:
mungai-njoroge
2023-10-07 10:35:24 +03:00
parent 263379abf3
commit 5919a26083
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/album.py
+3
View File
@@ -69,6 +69,9 @@ class Album:
if "super_deluxe" in self.versions: if "super_deluxe" in self.versions:
self.versions.remove("deluxe") self.versions.remove("deluxe")
if "original" in self.versions and self.check_is_soundtrack():
self.versions.remove("original")
self.versions = [v.replace("_", " ") for v in self.versions] self.versions = [v.replace("_", " ") for v in self.versions]
else: else:
self.base_title = get_base_title_and_versions( self.base_title = get_base_title_and_versions(
app/models/track.py
+4 -3
View File
@@ -62,7 +62,7 @@ class Track:
featured, new_title = parse_feat_from_title(self.title) featured, new_title = parse_feat_from_title(self.title)
original_lower = "-".join([create_hash(a) for a in artists]) original_lower = "-".join([create_hash(a) for a in artists])
artists.extend( artists.extend(
[a for a in featured if create_hash(a) not in original_lower] a for a in featured if create_hash(a) not in original_lower
) )
self.artist_hashes = "-".join(create_hash(a, decode=True) for a in artists) self.artist_hashes = "-".join(create_hash(a, decode=True) for a in artists)
@@ -127,7 +127,7 @@ class Track:
return return
self.trackhash = create_hash( self.trackhash = create_hash(
", ".join([a.name for a in self.artists]), self.og_album, self.title ", ".join(a.name for a in self.artists), self.og_album, self.title
) )
def recreate_artists_hash(self): def recreate_artists_hash(self):
@@ -140,7 +140,8 @@ class Track:
""" """
Recreates an albumhash of a track to merge all versions of an album. Recreates an albumhash of a track to merge all versions of an album.
""" """
self.albumhash = create_hash(self.album, self.albumartists) albumartists = (a.name for a in self.albumartists)
self.albumhash = create_hash(self.album, *albumartists)
def rename_album(self, new_album: str): def rename_album(self, new_album: str):
""" """