mirror of
https://github.com/nathom/streamrip.git
synced 2024-09-18 18:58:46 -04:00
Implement source_subdirectories feature (#557)
This commit is contained in:
parent
52dc84cd13
commit
2a8bb7cf28
2 changed files with 8 additions and 3 deletions
|
@ -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)
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue