Merge branch 'ogg-theora-detection' into 'develop'

Add Theora detection to upload.ex See merge request pleroma/pleroma!479
2018-11-27 16:55:56 +00:00 · 2018-11-27 16:55:56 +00:00 · b9bc83097d
parent 5ae6088d37 0d229613df
commit b9bc83097d
1 changed files with 7 additions and 1 deletions
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@ -162,7 +162,13 @@ def get_content_type(file) do
            "audio/mpeg"

          <<0x4F, 0x67, 0x67, 0x53, 0x00, 0x02, 0x00, 0x00>> ->
-            "audio/ogg"
+            case IO.binread(f, 27) do
+              <<_::size(160), 0x80, 0x74, 0x68, 0x65, 0x6F, 0x72, 0x61>> ->
+                "video/ogg"
+
+              _ ->
+                "audio/ogg"
+            end

          <<0x52, 0x49, 0x46, 0x46, _, _, _, _>> ->
            "audio/wav"