From ed96588155f5d25338678d0cba6a225b29cd2d4f Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Wed, 21 Feb 2018 17:46:24 -0800 Subject: [PATCH] modules/media/download: Replace old stub with new stub involving magic::mime. --- modules/media/download.cc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/modules/media/download.cc b/modules/media/download.cc index 075f7b875..76d80390c 100644 --- a/modules/media/download.cc +++ b/modules/media/download.cc @@ -49,23 +49,20 @@ handle_get(client &client, request.parv[1] }; - const fmt::snstringf path + const std::string data { - 1024, - "/home/jason/.synapse/media_store/local_content/%s/%s/%s", - file.substr(0, 2), - file.substr(2, 2), - file.substr(4, file.size() - 4) + //fs::read(file) }; - const auto data + char mime_type_buf[64]; + const string_view content_type { - fs::read(path) + magic::mime(mime_type_buf, string_view{data}) }; return resource::response { - client, string_view{data}, "image/jpg" + client, string_view{data}, content_type }; }