mirrors
/
streamrip
mirror of https://github.com/nathom/streamrip.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implement source_subdirectories feature (#557)

This commit is contained in:
Nathan Thomas 2024-01-13 21:57:22 -08:00 committed by GitHub
parent 52dc84cd13
commit 2a8bb7cf28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
streamrip/media/album.py
View File

@ -85,10 +85,12 @@ class PendingAlbum(Pending):
return Album(meta, pending_tracks, self.config, album_folder, self.db)
def _album_folder(self, parent: str, meta: AlbumMetadata) -> str:
conf = self.config.session.filepaths
formatter = conf.folder_format
config = self.config.session
if config.downloads.source_subdirectories:
parent = os.path.join(parent, self.client.source.capitalize())
formatter = config.filepaths.folder_format
folder = clean_filename(
meta.format_folder_path(formatter), conf.restrict_characters
meta.format_folder_path(formatter), config.filepaths.restrict_characters
)
return os.path.join(parent, folder)

3
streamrip/media/track.py
View File

@ -200,6 +200,9 @@ class PendingSingle(Pending):
c = self.config.session
parent = c.downloads.folder
formatter = c.filepaths.folder_format
if c.downloads.source_subdirectories:
parent = os.path.join(parent, self.client.source.capitalize())
return os.path.join(parent, meta.format_folder_path(formatter))
async def _download_cover(self, covers: Covers, folder: str) -> str | None: