Skip to content

Fix wrong mime type for flac and wav #119

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

Merged
merged 1 commit into from
Dec 30, 2021
Merged

Fix wrong mime type for flac and wav #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions config/initializers/mime_types.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Rails don't have mime type for flac and wav, so register new mime type for them.
Mime::Type.register "audio/flac", :flac, [], %w[flac]
Mime::Type.register "audio/wav", :wav, [], %w[wav]
6 changes: 6 additions & 0 deletions test/controllers/cached_transcoded_stream_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,10 @@ class CachedTranscodedStreamControllerTest < ActionDispatch::IntegrationTest
assert_equal "/private_cache_media/2/ZmFrZV9tZDU=_128.mp3", @response.get_header("X-Accel-Redirect")
end
end

test "should set correct content type header" do
assert_login_access(url: new_cached_transcoded_stream_url(song_id: songs(:flac_sample).id)) do
assert_equal "audio/mpeg", @response.get_header("Content-Type")
end
end
end
62 changes: 62 additions & 0 deletions test/controllers/stream_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,66 @@ class StreamControllerTest < ActionDispatch::IntegrationTest
end
end
end

test "should set correct content type header" do
assert_login_access(url: new_stream_url(song_id: songs(:mp3_sample).id)) do
assert_equal "audio/mpeg", @response.get_header("Content-Type")
end

assert_login_access(url: new_stream_url(song_id: songs(:flac_sample).id)) do
assert_equal "audio/flac", @response.get_header("Content-Type")
end

assert_login_access(url: new_stream_url(song_id: songs(:ogg_sample).id)) do
assert_equal "audio/ogg", @response.get_header("Content-Type")
end

assert_login_access(url: new_stream_url(song_id: songs(:wav_sample).id)) do
assert_equal "audio/wav", @response.get_header("Content-Type")
end

assert_login_access(url: new_stream_url(song_id: songs(:opus_sample).id)) do
assert_equal "audio/ogg", @response.get_header("Content-Type")
end

assert_login_access(url: new_stream_url(song_id: songs(:m4a_sample).id)) do
assert_equal "audio/aac", @response.get_header("Content-Type")
end

assert_login_access(url: new_stream_url(song_id: songs(:oga_sample).id)) do
assert_equal "audio/ogg", @response.get_header("Content-Type")
end
end

test "should set correct content type header when not set nginx send file header" do
Rails.configuration.action_dispatch.stub(:x_sendfile_header, "") do
assert_login_access(url: new_stream_url(song_id: songs(:mp3_sample).id)) do
assert_equal "audio/mpeg", @response.get_header("Content-Type")
end

assert_login_access(url: new_stream_url(song_id: songs(:flac_sample).id)) do
assert_equal "audio/flac", @response.get_header("Content-Type")
end

assert_login_access(url: new_stream_url(song_id: songs(:ogg_sample).id)) do
assert_equal "audio/ogg", @response.get_header("Content-Type")
end

assert_login_access(url: new_stream_url(song_id: songs(:wav_sample).id)) do
assert_equal "audio/wav", @response.get_header("Content-Type")
end

assert_login_access(url: new_stream_url(song_id: songs(:opus_sample).id)) do
assert_equal "audio/ogg", @response.get_header("Content-Type")
end

assert_login_access(url: new_stream_url(song_id: songs(:m4a_sample).id)) do
assert_equal "audio/aac", @response.get_header("Content-Type")
end

assert_login_access(url: new_stream_url(song_id: songs(:oga_sample).id)) do
assert_equal "audio/ogg", @response.get_header("Content-Type")
end
end
end
end
6 changes: 6 additions & 0 deletions test/controllers/transcoded_stream_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,10 @@ class TranscodedStreamControllerTest < ActionDispatch::IntegrationTest

assert_not_equal original_cache_file_mtime, File.mtime(stream.transcode_cache_file_path)
end

test "should set correct content type header" do
assert_login_access(url: new_transcoded_stream_url(song_id: songs(:flac_sample).id)) do
assert_equal "audio/mpeg", @response.get_header("Content-Type")
end
end
end