From 8ba1bd5df45d344006ee2a7f1a43f49dc331d7c7 Mon Sep 17 00:00:00 2001 From: Daniel Gyulai Date: Thu, 12 Nov 2020 01:05:34 +0100 Subject: [PATCH] Added (yet untested) image handling. May or may not work. --- CoviDok/Api/Request/ImageGet.cs | 13 ++++++ CoviDok/Api/Request/ImagePost.cs | 14 +++++++ CoviDok/BLL/MinioHandler.cs | 41 ++++++------------- CoviDok/BLL/MinioResult.cs | 14 +++++++ CoviDok/Controllers/ImagesController.cs | 53 +++++++++++++++++++++++++ 5 files changed, 106 insertions(+), 29 deletions(-) create mode 100644 CoviDok/Api/Request/ImageGet.cs create mode 100644 CoviDok/Api/Request/ImagePost.cs create mode 100644 CoviDok/BLL/MinioResult.cs create mode 100644 CoviDok/Controllers/ImagesController.cs diff --git a/CoviDok/Api/Request/ImageGet.cs b/CoviDok/Api/Request/ImageGet.cs new file mode 100644 index 0000000..c09d1d3 --- /dev/null +++ b/CoviDok/Api/Request/ImageGet.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Api.Request +{ + public class ImageGet + { + public string SessionID { get; set; } + public string ImageID { get; set; } + } +} diff --git a/CoviDok/Api/Request/ImagePost.cs b/CoviDok/Api/Request/ImagePost.cs new file mode 100644 index 0000000..6609145 --- /dev/null +++ b/CoviDok/Api/Request/ImagePost.cs @@ -0,0 +1,14 @@ +using Microsoft.AspNetCore.Http; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CoviDok.Api.Request +{ + public class ImagePost + { + public string SessionID { get; set; } + public IFormFile File { get; set; } + } +} diff --git a/CoviDok/BLL/MinioHandler.cs b/CoviDok/BLL/MinioHandler.cs index edc939f..ade76bd 100644 --- a/CoviDok/BLL/MinioHandler.cs +++ b/CoviDok/BLL/MinioHandler.cs @@ -2,6 +2,7 @@ using Minio.Exceptions; using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Threading.Tasks; @@ -11,27 +12,16 @@ namespace CoviDok.BLL { private MinioClient Client = null; - public class MinioResult + public MinioHandler(string Host, string AccessKey, string SecretKey) { - bool Success; - string Data; - - public MinioResult(bool Success, string Data) - { - this.Success = Success; - this.Data = Data; - } + //Client = new MinioClient( + //"192.168.0.160:9000", + //"secretaccesskey", + //"secretsecretkey"); + Client = new MinioClient(Host, AccessKey, SecretKey); } - public MinioHandler() - { - Client = new MinioClient( - "192.168.0.160:9000", - "secretaccesskey", - "secretsecretkey"); - } - - public async Task Upload(string BucketName, string FilePath, string ObjectName) + public async Task UploadImage(string BucketName, Stream FilePath, long size, string ObjectName) { try { @@ -42,7 +32,7 @@ namespace CoviDok.BLL await Client.MakeBucketAsync(BucketName); } // Upload a file to bucket. - await Client.PutObjectAsync(BucketName, ObjectName, FilePath); + await Client.PutObjectAsync(BucketName, ObjectName, FilePath, size); return new MinioResult(true, BucketName + ":" + ObjectName); } catch (MinioException e) @@ -51,17 +41,10 @@ namespace CoviDok.BLL } } - public async Task GetImage(string BucketName, string FilePath, string ObjectName) + public async Task GetImage(string ImageID, Action callback) { - try - { - await Client.GetObjectAsync(BucketName, ObjectName, FilePath); - return new MinioResult(true, FilePath); - } - catch (MinioException e) - { - return new MinioResult(false, e.Message); - } + string[] attrs = ImageID.Split(":"); + await Client.GetObjectAsync(attrs[0], attrs[1], callback); } } } diff --git a/CoviDok/BLL/MinioResult.cs b/CoviDok/BLL/MinioResult.cs new file mode 100644 index 0000000..be9ab81 --- /dev/null +++ b/CoviDok/BLL/MinioResult.cs @@ -0,0 +1,14 @@ +namespace CoviDok.BLL +{ + public class MinioResult + { + public readonly bool Success; + public readonly string Data; + + public MinioResult(bool Success, string Data) + { + this.Success = Success; + this.Data = Data; + } + } +} diff --git a/CoviDok/Controllers/ImagesController.cs b/CoviDok/Controllers/ImagesController.cs new file mode 100644 index 0000000..6147d01 --- /dev/null +++ b/CoviDok/Controllers/ImagesController.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using CoviDok.Api; +using CoviDok.Api.Request; +using CoviDok.BLL; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace CoviDok.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class ImagesController : ControllerBase + { + private MinioHandler MinioHandler = new MinioHandler( + "192.168.0.160:9000", + "secretaccesskey", + "secretsecretkey"); + private readonly string BucketName = "test1"; + + [HttpPost] + public async Task OnPostImage(ImagePost post) + { + GenericResponse response = new GenericResponse(); + if (post.SessionID != "a") + { + response.Status = Status.Error; + response.Body["reason"] = "unauthorized"; + return response; + } + + MinioResult Result = await MinioHandler.UploadImage(BucketName, post.File.OpenReadStream(), post.File.Length, post.File.FileName); + if (!Result.Success) response.Status = Status.Error; + response.Body["reason"] = Result.Data; + + return response; + } + + public async Task OnGetImage(ImageGet imageGet) + { + string[] attrs = imageGet.ImageID.Split(":"); + if (attrs.Length != 2) return BadRequest(); + + FileStreamResult res = null; ; + await MinioHandler.GetImage(imageGet.ImageID, (stream) => { + res = File(stream, attrs[1]); + }); + return res; + } + } +}