Soundsource filetype detection fix #4602
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Holzhaus
added
sources
minor bug
changelog
If a file is named `foo.wav` but actually contains MP3 data, `SoundSource::getTypeFromFile` should return "mp3", not "wav". This behavior is expected and already tested in `SoundSourceProxyTest.getTypeFromFile`, but due to a bug in our test file creation code, the test operated on a wrong file name and passed although the behavior was broken and the function would just return "wav" in the example above. The reason for this is that QMimeDatabase only looks at the file name when the file suffix is misleading, and thus cannot detect that the file is actually an MP3 file: > The default matching algorithm looks at both the file name and the > file contents, if necessary. The file extension has priority over the > contents, but the contents will be used if the file extension is > unknown, or matches multiple MIME types. > > Source: https://doc.qt.io/qt-5/qmimedatabase.html#mimeTypeForFile This commit fixes `SoundSource::getTypeFromFile` to work as expected by using the file *content* instead of the file name for determining the file type.
Holzhaus
force-pushed
the
soundsource-filetype-detection-fix
branch
from
80b53a6
to
17a4b16
Compare
uklotzde
approved these changes
Jan 6, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Continuation of #4600 for the
mainbranch.Proposed changelog entry