lib/audio_monster/monster.rb in audio_monster-1.2.1 vs lib/audio_monster/monster.rb in audio_monster-1.2.2
- old
+ new
@@ -274,10 +274,12 @@
alias info_for_mp2 info_for_mpeg
alias info_for_mp3 info_for_mpeg
def content_type(path)
- mime_magic_content_type(path) || file_content_type(path)
+ ct = mime_magic_content_type(path)
+ ct = file_content_type(path) if (ct.nil? || ct.length == 0)
+ ct
end
def mime_magic_content_type(path)
(MimeMagic.by_path(path) || MimeMagic.by_magic(path)).to_s
end