From 98df0fb9fe94b703325f09bf765904a11e8a7d4c Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Wed, 10 Feb 2021 14:31:31 +0800
Subject: ...

---
 .../Timeline/Formatters/ByteDataInputFormatter.cs  | 80 ++++++++++++++++++++++
 BackEnd/Timeline/Formatters/BytesInputFormatter.cs | 79 ---------------------
 2 files changed, 80 insertions(+), 79 deletions(-)
 create mode 100644 BackEnd/Timeline/Formatters/ByteDataInputFormatter.cs
 delete mode 100644 BackEnd/Timeline/Formatters/BytesInputFormatter.cs

(limited to 'BackEnd/Timeline/Formatters')

diff --git a/BackEnd/Timeline/Formatters/ByteDataInputFormatter.cs b/BackEnd/Timeline/Formatters/ByteDataInputFormatter.cs
new file mode 100644
index 00000000..2451ead6
--- /dev/null
+++ b/BackEnd/Timeline/Formatters/ByteDataInputFormatter.cs
@@ -0,0 +1,80 @@
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Threading.Tasks;
+using Timeline.Models;
+
+namespace Timeline.Formatters
+{
+    /// <summary>
+    /// Formatter that reads body as byte data.
+    /// </summary>
+    public class ByteDataInputFormatter : InputFormatter
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public ByteDataInputFormatter()
+        {
+            SupportedMediaTypes.Add(MimeTypes.ImagePng);
+            SupportedMediaTypes.Add(MimeTypes.ImageJpeg);
+            SupportedMediaTypes.Add(MimeTypes.ImageGif);
+            SupportedMediaTypes.Add(MimeTypes.ImageWebp);
+            SupportedMediaTypes.Add(MimeTypes.TextPlain);
+            SupportedMediaTypes.Add(MimeTypes.TextMarkdown);
+        }
+
+        /// <inheritdoc/>
+        public override bool CanRead(InputFormatterContext context)
+        {
+            if (context == null) throw new ArgumentNullException(nameof(context));
+
+            if (context.ModelType == typeof(ByteData))
+                return true;
+
+            return false;
+        }
+
+        /// <inheritdoc/>
+        public override async Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context)
+        {
+            var request = context.HttpContext.Request;
+            var contentLength = request.ContentLength;
+
+            var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<ByteDataInputFormatter>>();
+
+            if (contentLength == null)
+            {
+                logger.LogInformation("Failed to read body as bytes. Content-Length is not set.");
+                return await InputFormatterResult.FailureAsync();
+            }
+
+            if (contentLength == 0)
+            {
+                logger.LogInformation("Failed to read body as bytes. Content-Length is 0.");
+                return await InputFormatterResult.FailureAsync();
+            }
+
+            var bodyStream = request.Body;
+
+            var data = new byte[contentLength.Value];
+            var bytesRead = await bodyStream.ReadAsync(data);
+
+            if (bytesRead != contentLength)
+            {
+                logger.LogInformation("Failed to read body as bytes. Actual length of body is smaller than Content-Length.");
+                return await InputFormatterResult.FailureAsync();
+            }
+
+            var extraByte = new byte[1];
+            if (await bodyStream.ReadAsync(extraByte) != 0)
+            {
+                logger.LogInformation("Failed to read body as bytes. Actual length of body is greater than Content-Length.");
+                return await InputFormatterResult.FailureAsync();
+            }
+
+            return await InputFormatterResult.SuccessAsync(new ByteData(data, request.ContentType));
+        }
+    }
+}
diff --git a/BackEnd/Timeline/Formatters/BytesInputFormatter.cs b/BackEnd/Timeline/Formatters/BytesInputFormatter.cs
deleted file mode 100644
index ac6537c9..00000000
--- a/BackEnd/Timeline/Formatters/BytesInputFormatter.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Formatters;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Net.Http.Headers;
-using System;
-using System.Threading.Tasks;
-using Timeline.Models;
-
-namespace Timeline.Formatters
-{
-    /// <summary>
-    /// Formatter that reads body as bytes.
-    /// </summary>
-    public class BytesInputFormatter : InputFormatter
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        public BytesInputFormatter()
-        {
-            SupportedMediaTypes.Add(new MediaTypeHeaderValue("image/png"));
-            SupportedMediaTypes.Add(new MediaTypeHeaderValue("image/jpeg"));
-            SupportedMediaTypes.Add(new MediaTypeHeaderValue("image/gif"));
-            SupportedMediaTypes.Add(new MediaTypeHeaderValue("image/webp"));
-        }
-
-        /// <inheritdoc/>
-        public override bool CanRead(InputFormatterContext context)
-        {
-            if (context == null) throw new ArgumentNullException(nameof(context));
-
-            if (context.ModelType == typeof(ByteData))
-                return true;
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public override async Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context)
-        {
-            var request = context.HttpContext.Request;
-            var contentLength = request.ContentLength;
-
-            var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<BytesInputFormatter>>();
-
-            if (contentLength == null)
-            {
-                logger.LogInformation("Failed to read body as bytes. Content-Length is not set.");
-                return await InputFormatterResult.FailureAsync();
-            }
-
-            if (contentLength == 0)
-            {
-                logger.LogInformation("Failed to read body as bytes. Content-Length is 0.");
-                return await InputFormatterResult.FailureAsync();
-            }
-
-            var bodyStream = request.Body;
-
-            var data = new byte[contentLength.Value];
-            var bytesRead = await bodyStream.ReadAsync(data);
-
-            if (bytesRead != contentLength)
-            {
-                logger.LogInformation("Failed to read body as bytes. Actual length of body is smaller than Content-Length.");
-                return await InputFormatterResult.FailureAsync();
-            }
-
-            var extraByte = new byte[1];
-            if (await bodyStream.ReadAsync(extraByte) != 0)
-            {
-                logger.LogInformation("Failed to read body as bytes. Actual length of body is greater than Content-Length.");
-                return await InputFormatterResult.FailureAsync();
-            }
-
-            return await InputFormatterResult.SuccessAsync(new ByteData(data, request.ContentType));
-        }
-    }
-}
-- 
cgit v1.2.3