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

Jump to bottom

Prefer audio/ogg instead of audio/vorbis #65

Merged
merged 2 commits into from
Oct 16, 2021
Merged

Prefer audio/ogg instead of audio/vorbis #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
547badc
Prefer audio/ogg instead of audio/vorbis
gmcgibbon Sep 23, 2021
fe9ca18
Fix decoded matcher comment on ms-access magic extension
gmcgibbon Sep 23, 2021
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
6 changes: 3 additions & 3 deletions lib/marcel/mime_type/definitions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.


Marcel::MimeType.extend "image/vnd.dwg", magic: [[0, "AC10"]]

Expand All @@ -57,8 +57,8 @@
"application/vnd.ms-access",
extensions: %w( mdb mde accdb accde ),
magic: [
[0, "\x00\x01\x00\x00\x53\x74\x61\x6e\x64\x61\x72\x64\x20\x4a\x65\x74\x20\x44\x42"], # \x00\x01\x00\xStandard Jet DB
[0, "\x00\x01\x00\x00\x53\x74\x61\x6e\x64\x61\x72\x64\x20\x41\x43\x45\x20\x44\x42"], # \x00\x01\x00\xStandard ACE DB
[0, "\x00\x01\x00\x00\x53\x74\x61\x6e\x64\x61\x72\x64\x20\x4a\x65\x74\x20\x44\x42"], # "\x00\x01\x00Standard Jet DB"
[0, "\x00\x01\x00\x00\x53\x74\x61\x6e\x64\x61\x72\x64\x20\x41\x43\x45\x20\x44\x42"], # "\x00\x01\x00Standard ACE DB"
],
parents: "application/x-msaccess"
)
Expand Down
Binary file added test/fixtures/magic/audio/ogg.ogg
View file
Open in desktop
Binary file not shown.
Binary file added test/fixtures/name/audio/ogg.ogg
View file
Open in desktop
Binary file not shown.