diff --git a/src/Yavsc/Avatars-Dev/Paul.png b/src/Yavsc/Avatars-Dev/Paul.png
index aec46ec7..9b71ef8e 100644
Binary files a/src/Yavsc/Avatars-Dev/Paul.png and b/src/Yavsc/Avatars-Dev/Paul.png differ
diff --git a/src/Yavsc/Avatars-Dev/Paul.s.png b/src/Yavsc/Avatars-Dev/Paul.s.png
index e50b9632..d03ad946 100644
Binary files a/src/Yavsc/Avatars-Dev/Paul.s.png and b/src/Yavsc/Avatars-Dev/Paul.s.png differ
diff --git a/src/Yavsc/Avatars-Dev/Paul.xs.png b/src/Yavsc/Avatars-Dev/Paul.xs.png
index 083cdc3f..2ca20445 100644
Binary files a/src/Yavsc/Avatars-Dev/Paul.xs.png and b/src/Yavsc/Avatars-Dev/Paul.xs.png differ
diff --git a/src/Yavsc/Helpers/FileSystemHelpers.cs b/src/Yavsc/Helpers/FileSystemHelpers.cs
index 8d6f7385..06117345 100644
--- a/src/Yavsc/Helpers/FileSystemHelpers.cs
+++ b/src/Yavsc/Helpers/FileSystemHelpers.cs
@@ -1,6 +1,5 @@
-using System.Drawing;
-using System.Drawing.Imaging;
+
using System.Security.Claims;
using Microsoft.AspNetCore.Html;
using Microsoft.Extensions.FileProviders;
@@ -9,6 +8,8 @@ using Yavsc.Models;
using Yavsc.Models.FileSystem;
using Yavsc.Models.Streaming;
using Yavsc.ViewModels;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Processing;
namespace Yavsc.Helpers
{
@@ -28,43 +29,12 @@ namespace Yavsc.Helpers
using (var org = formFile.OpenReadStream())
{
- Image i = Image.FromStream(org);
- using (Bitmap source = new Bitmap(i))
- {
- source.Save(destFileName, ImageFormat.Png);
- }
+ using Image image = Image.Load(org);
+ image.Save(destFileName);
}
return item;
}
- ///
- /// Create avatars
- ///
- ///
- ///
- private static void CreateAvatars(this ApplicationUser user, Bitmap source)
- {
- var dir = Config.SiteSetup.Avatars;
- var name = user.UserName + ".png";
- var smallname = user.UserName + ".s.png";
- var xsmallname = user.UserName + ".xs.png";
- using (Bitmap newBMP = new Bitmap(source, 128, 128))
- {
- newBMP.Save(Path.Combine(
- dir, name), ImageFormat.Png);
- }
- using (Bitmap newBMP = new Bitmap(source, 64, 64))
- {
- newBMP.Save(Path.Combine(
- dir, smallname), ImageFormat.Png);
- }
- using (Bitmap newBMP = new Bitmap(source, 32, 32))
- {
- newBMP.Save(Path.Combine(
- dir, xsmallname), ImageFormat.Png);
- }
- }
-
public static string GetAvatarUri(this ApplicationUser user)
{
return $"/{Config.SiteSetup.Avatars}/{user.UserName}.png";
@@ -257,42 +227,15 @@ namespace Yavsc.Helpers
{
FileName = user.UserName + ".png"
};
-
- var destFileName = Path.Combine(Config.SiteSetup.Avatars, item.FileName);
-
- var fi = new FileInfo(destFileName);
- if (fi.Exists) item.Overriden = true;
- Rectangle cropRect = new Rectangle();
-
using (var org = formFile.OpenReadStream())
{
- Image i = Image.FromStream(org);
- using (Bitmap source = new Bitmap(i))
- {
- if (i.Width != i.Height)
- {
- if (i.Width > i.Height)
- {
- cropRect.X = (i.Width - i.Height) / 2;
- cropRect.Y = 0;
- cropRect.Width = i.Height;
- cropRect.Height = i.Height;
- }
- else
- {
- cropRect.X = 0;
- cropRect.Y = (i.Height - i.Width) / 2;
- cropRect.Width = i.Width;
- cropRect.Height = i.Width;
- }
- using (var cropped = source.Clone(cropRect, source.PixelFormat))
- {
- CreateAvatars(user,cropped);
- }
- }
-
- }
-
+ using Image image = Image.Load(org);
+ image.Mutate(x=>x.Resize(128,128));
+ image.Save(Path.Combine(Config.SiteSetup.Avatars,item.FileName));
+ image.Mutate(x=>x.Resize(64,64));
+ image.Save(Path.Combine(Config.SiteSetup.Avatars,user.UserName + ".s.png"));
+ image.Mutate(x=>x.Resize(32,32));
+ image.Save(Path.Combine(Config.SiteSetup.Avatars,user.UserName + ".xs.png"));
}
item.DestDir = Config.AvatarsOptions.RequestPath.ToUriComponent();
user.Avatar = $"{item.DestDir}/{item.FileName}";
diff --git a/src/Yavsc/Views/Manage/Index.cshtml b/src/Yavsc/Views/Manage/Index.cshtml
index 64a173b1..7f23863a 100755
--- a/src/Yavsc/Views/Manage/Index.cshtml
+++ b/src/Yavsc/Views/Manage/Index.cshtml
@@ -69,10 +69,6 @@
@Model.Logins.Count [Manage]
- Full name:
- @Model.FullName [@Model.FullName==null?"Set":"Modify"]
-
Address:
@Model.PostalAddress
[
+
+
}
@section scripts{
-