From 18a95cd3757a9b2f9f468f408da48bbd84a4d031 Mon Sep 17 00:00:00 2001 From: eal Date: Sun, 12 Nov 2017 01:16:46 +0200 Subject: [PATCH] Add common video and audio types. --- lib/pleroma/upload.ex | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index ce6e23bae..3567c6c88 100644 --- a/lib/pleroma/upload.ex +++ b/lib/pleroma/upload.ex @@ -62,12 +62,6 @@ defmodule Pleroma.Upload do end def get_content_type(file) do - # PNG: 89 50 4E 47 0D 0A 1A 0A - # GIF: 47 49 46 38 37 61 - # GIF: 47 49 46 38 39 61 - # JPEG: FF D8 FF DB - # JPEG: FF D8 FF E0 ?? ?? 4A 46 49 46 00 01 - # JPEG: FF D8 FF E1 ?? ?? 45 78 69 66 00 00 match = File.open(file, [:read], fn(f) -> case IO.binread(f, 8) do <<0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a>> -> @@ -76,6 +70,16 @@ defmodule Pleroma.Upload do "image/gif" <<0xff, 0xd8, 0xff, _, _, _, _, _>> -> "image/jpeg" + <<0x1a, 0x45, 0xdf, 0xa3, _, _, _, _>> -> + "video/webm" + <<0x00, 0x00, 0x00, _, 0x66, 0x74, 0x79, 0x70>> -> + "video/mp4" + <<0x49, 0x44, 0x33, _, _, _, _, _>> -> + "audio/mpeg" + <<0x4f, 0x67, 0x67, 0x53, 0x00, 0x02, 0x00, 0x00>> -> + "audio/ogg" + <<0x52, 0x49, 0x46, 0x46, _, _, _, _>> -> + "audio/wav" _ -> "application/octet-stream" end -- 2.45.2