sharpetronics/httpx
1
0
Fork 0
mirror of https://github.com/HoneyryderChuck/httpx.git synced 2025-12-06 00:00:28 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'issue-171' into 'master'

Browse Source 
fix: remove mime-types support for mime type file detection

Closes #171

See merge request honeyryderchuck/httpx!180
This commit is contained in:
HoneyryderChuck 2021-12-24 11:42:39 +00:00
commit 3b882f59d6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/httpx/plugins/multipart/mime_type_detector.rb
View File

@ -8,11 +8,19 @@ module HTTPX
DEFAULT_MIMETYPE = "application/octet-stream"
# inspired by https://github.com/shrinerb/shrine/blob/master/lib/shrine/plugins/determine_mime_type.rb
if defined?(MIME::Types)
if defined?(FileMagic)
def call(file, _)
return nil if file.eof? # FileMagic returns "application/x-empty" for empty files
def call(_file, filename)
mime = MIME::Types.of(filename).first
mime.content_type if mime
FileMagic.open(FileMagic::MAGIC_MIME_TYPE) do |filemagic|
filemagic.buffer(file.read(MAGIC_NUMBER))
end
end
elsif defined?(Marcel)
def call(file, filename)
return nil if file.eof? # marcel returns "application/octet-stream" for empty files
Marcel::MimeType.for(file, name: filename)
end
elsif defined?(MimeMagic)