mirrors/streamrip
1
0
Fork 0
mirror of https://github.com/nathom/streamrip.git synced 2025-05-15 15:44:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add id key in FOLDER_FORMAT #150

Browse source
This commit is contained in:
Nathan Thomas 2021-09-06 20:18:50 -07:00
parent acec36801a
commit e49df1e719
4 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rip/config.toml
View file

@ -144,7 +144,7 @@ add_singles_to_folder = false
# "container", and "albumcomposer" # "container", and "albumcomposer"
folder_format = "{albumartist} - {title} ({year}) [{container}] [{bit_depth}B-{sampling_rate}kHz]" folder_format = "{albumartist} - {title} ({year}) [{container}] [{bit_depth}B-{sampling_rate}kHz]"
# Available keys: "tracknumber", "artist", "albumartist", "composer", "title", # Available keys: "tracknumber", "artist", "albumartist", "composer", "title",
# and "albumcomposer" # "id", and "albumcomposer"
track_format = "{tracknumber}. {artist} - {title}" track_format = "{tracknumber}. {artist} - {title}"
# Only allow printable ASCII characters in filenames. # Only allow printable ASCII characters in filenames.
restrict_characters = false restrict_characters = false

1
streamrip/constants.py
View file

@ -136,6 +136,7 @@ ALBUM_KEYS = (
"sampling_rate", "sampling_rate",
"container", "container",
"albumcomposer", "albumcomposer",
"id",
) )
# TODO: rename these to DEFAULT_FOLDER_FORMAT etc # TODO: rename these to DEFAULT_FOLDER_FORMAT etc
FOLDER_FORMAT = "{albumartist} - {title} ({year}) [{container}] [{bit_depth}B-{sampling_rate}kHz]" FOLDER_FORMAT = "{albumartist} - {title} ({year}) [{container}] [{bit_depth}B-{sampling_rate}kHz]"

1
streamrip/media.py
View file

@ -515,7 +515,6 @@ class Track(Media):
a dict with the keys allowed in formatter strings, and their values in a dict with the keys allowed in formatter strings, and their values in
the TrackMetadata object. the TrackMetadata object.
""" """
print(f"{restrict=}")
formatter = self.meta.get_formatter(max_quality=self.quality) formatter = self.meta.get_formatter(max_quality=self.quality)
logger.debug("Track meta formatter %s", formatter) logger.debug("Track meta formatter %s", formatter)
filename = clean_format(self.file_format, formatter, restrict=restrict) filename = clean_format(self.file_format, formatter, restrict=restrict)

3
streamrip/metadata.py
View file

@ -167,6 +167,7 @@ class TrackMetadata:
self.sampling_rate = resp.get("maximum_sampling_rate") self.sampling_rate = resp.get("maximum_sampling_rate")
self.quality = get_quality_id(self.bit_depth, self.sampling_rate) self.quality = get_quality_id(self.bit_depth, self.sampling_rate)
self.booklets = resp.get("goodies") self.booklets = resp.get("goodies")
self.id = resp.get("id")
if self.sampling_rate is not None: if self.sampling_rate is not None:
self.sampling_rate *= 1000 self.sampling_rate *= 1000
@ -188,6 +189,7 @@ class TrackMetadata:
# 80, 160, 320, 640, 1280 # 80, 160, 320, 640, 1280
self.cover_urls = get_cover_urls(resp, self.__source) self.cover_urls = get_cover_urls(resp, self.__source)
self.streamable = resp.get("allowStreaming", False) self.streamable = resp.get("allowStreaming", False)
self.id = resp.get("id")
if q := resp.get( if q := resp.get(
"audioQuality" "audioQuality"
@ -220,6 +222,7 @@ class TrackMetadata:
self.cover_urls = get_cover_urls(resp, self.__source) self.cover_urls = get_cover_urls(resp, self.__source)
self.streamable = True self.streamable = True
self.id = resp.get("id")
elif self.__source == "soundcloud": elif self.__source == "soundcloud":
raise NotImplementedError raise NotImplementedError