Merge pull request #65 from gmcgibbon/audio/ogg

Prefer audio/ogg instead of audio/vorbis
rails · Oct 16, 2021 · 7f71ab9 · 7f71ab9
2 parents fc69a19 + fe9ca18
commit 7f71ab9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/marcel/mime_type/definitions.rb b/lib/marcel/mime_type/definitions.rb
@@ -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']]]])
 
 Marcel::MimeType.extend "image/vnd.dwg", magic: [[0, "AC10"]]
 
@@ -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"
 )

diff --git a/test/fixtures/magic/audio/ogg.ogg b/test/fixtures/magic/audio/ogg.ogg
diff --git a/test/fixtures/name/audio/ogg.ogg b/test/fixtures/name/audio/ogg.ogg