Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Extended file extension detection to properly detect M4A files. Fixes tamland/python-tidal#309 #310

Merged
merged 4 commits into from
Dec 18, 2024
Merged

✨ Extended file extension detection to properly detect M4A files. Fixes tamland/python-tidal#309 #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7af0f83
✨ Extended file extension detection to properly detect M4A files. Fix…
exislow Dec 16, 2024
2f4a0dc
✨ Formatting.
exislow Dec 16, 2024
ac84d7c
Revert "Version bump. Updated changelog, poetry."
exislow Dec 16, 2024
e848a5d
🧪 Added file extension test for M4A.
exislow Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions tests/test_media.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,3 +550,14 @@ def validate_stream_manifest(manifest, is_hi_res_lossless: bool = False):
def test_reset_session_quality(session):
# HACK: Make sure to reset audio quality to default value for remaining tests
session.audio_quality = Quality.default


def test_track_extension(session):
track = session.track(65119559)
# Set session as MPD/DASH type (i.e. HI_RES_LOSSLESS Quality).
session.audio_quality = Quality.low_320k
# Attempt to get stream and manifest
stream = track.get_stream()
manifest = stream.get_stream_manifest()
# Assert extension
assert manifest.file_extension == AudioExtensions.M4A
6 changes: 5 additions & 1 deletion tidalapi/media.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,11 @@ def get_file_extension(stream_url: str, stream_codec: Optional[str] = None) -> s
if AudioExtensions.FLAC in stream_url:
# If the file extension within the URL is '*.flac', this is simply a FLAC file.
result: str = AudioExtensions.FLAC
elif AudioExtensions.MP4 in stream_url:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this shouldn't break any tests but perhaps a good idea to check anyways.

Also, it would be a good idea to extend the existing tests to check that M4A extension does indeed return Codec.MP4A...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an example, which returns a "m4a" extension: https://tidal.com/browse/track/65119559

Tests are always a good idea. I can do some testing work, as soon as I have finished my personal issues with my project.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added you a test for M4A file extension. To be honest: Someone could also add a lot more tests, but this takes a lot of time. Tell me, if I can help you with something else. Otherwise I would be happy about a merge and hotfix release.

elif (
AudioExtensions.MP4 in stream_url
or AudioExtensions.M4A in stream_url
or stream_codec == Codec.MP4A
):
# MPEG-4 is simply a container format for different audio / video encoded lines, like FLAC, AAC, M4A etc.
# '*.m4a' is usually used as file extension, if the container contains only audio lines
# See https://en.wikipedia.org/wiki/MP4_file_format
Expand Down
Loading