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.

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

Prefer audio/ogg instead of audio/vorbis #65

Merged
merged 2 commits into from
Oct 16, 2021
Merged

Conversation

gmcgibbon
Copy link
Member

Closes #64

Use audo/ogg instead of audio/vorbis. This is another regression noted in #48.

@gmcgibbon gmcgibbon requested a review from pixeltrix September 23, 2021 17:00
@@ -31,7 +31,7 @@
Marcel::MimeType.extend "application/vnd.apple.keynote", extensions: %w( key ), parents: "application/zip"

Marcel::MimeType.extend "audio/aac", extensions: %w( aac ), parents: "audio/x-aac"

Marcel::MimeType.extend("audio/ogg", extensions: %w( ogg oga ), magic: [[0, 'OggS', [[29, 'vorbis']]]])
Copy link
Member Author

Choose a reason for hiding this comment

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

Since audio/ogg already exists in the tree (audio/vorbis is a subclass of it) I moved the matcher logic in audio/vorbis to the parent. This edits the existing definition instead of creating a new one.

@gmcgibbon gmcgibbon merged commit 7f71ab9 into rails:main Oct 16, 2021
@gmcgibbon gmcgibbon deleted the audio/ogg branch October 16, 2021 01:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ogg vorbis files recognized as audio/vorbis
2 participants