Diamond75/zotify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed issue #29

Browse source
This commit is contained in:
DraftKinner 2025-03-22 12:02:39 -04:00
parent c5032d8ec0
commit 2d04278ed7
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
zotify/collections.py
View file

@ -42,7 +42,10 @@ class Collection:
"{" + meta.name + "}", fix_filename(meta.string) "{" + meta.name + "}", fix_filename(meta.string)
) )
self.path = library.joinpath(output).expanduser().parent if type(self) is Track or type(self) is Episode:
self.path = library
else:
self.path = library.joinpath(output).expanduser().parent
def get_existing(self, ext: str) -> dict[str, str]: def get_existing(self, ext: str) -> dict[str, str]:
existing: dict[str, str] = {} existing: dict[str, str] = {}
@ -50,11 +53,14 @@ class Collection:
if self.path is None: if self.path is None:
self.set_path() self.set_path()
if self.path.exists(): if self.path.exists():
file_path = "*.{}".format(ext) if type(self) is Track or type(self) is Episode:
file_path = "**/*.{}".format(ext)
else:
file_path = "*.{}".format(ext)
scan_path = str(self.path.joinpath(file_path)) scan_path = str(self.path.joinpath(file_path))
# Check contents of path # Check contents of path
for file in iglob(scan_path): for file in iglob(scan_path, recursive=True):
f_path = Path(file) f_path = Path(file)
f = LocalFile(f_path) f = LocalFile(f_path)
try: try:
@ -190,7 +196,11 @@ class Album(Collection):
album = api.get_metadata_4_album(AlbumId.from_base62(b62_id)) album = api.get_metadata_4_album(AlbumId.from_base62(b62_id))
for disc in album.disc: for disc in album.disc:
for track in disc.track: for track in disc.track:
metadata = [MetadataEntry("spotid", bytes_to_base62(track.gid))] metadata = [
MetadataEntry("spotid", bytes_to_base62(track.gid)),
MetadataEntry("album_artist", album.artist[0].name),
MetadataEntry("album", album.name),
]
self.playables.append( self.playables.append(
PlayableData( PlayableData(
PlayableType.TRACK, PlayableType.TRACK,
@ -217,7 +227,11 @@ class Artist(Collection):
) )
for disc in album.disc: for disc in album.disc:
for track in disc.track: for track in disc.track:
metadata = [MetadataEntry("spotid", bytes_to_base62(track.gid))] metadata = [
MetadataEntry("spotid", bytes_to_base62(track.gid)),
MetadataEntry("album_artist", album.artist[0].name),
MetadataEntry("album", album.name),
]
self.playables.append( self.playables.append(
PlayableData( PlayableData(
PlayableType.TRACK, PlayableType.TRACK,
@ -234,7 +248,10 @@ class Show(Collection):
super().__init__(api) super().__init__(api)
show = api.get_metadata_4_show(ShowId.from_base62(b62_id)) show = api.get_metadata_4_show(ShowId.from_base62(b62_id))
for episode in show.episode: for episode in show.episode:
metadata = [MetadataEntry("spotid", bytes_to_base62(episode.gid))] metadata = [
MetadataEntry("spotid", bytes_to_base62(episode.gid)),
MetadataEntry("podcast", show.name),
]
self.playables.append( self.playables.append(
PlayableData( PlayableData(
PlayableType.EPISODE, PlayableType.EPISODE,