diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor index 26cd56f9..58990804 100644 --- a/Oqtane.Client/Modules/Admin/Files/Index.razor +++ b/Oqtane.Client/Modules/Admin/Files/Index.razor @@ -42,7 +42,7 @@ @context.Name @context.ModifiedOn @context.Extension.ToUpper() @Localizer["File"] - @(context.Size / 1000) KB + @string.Format("{0:0.00}", ((decimal)context.Size / 1000)) KB @if (_files.Count == 0) diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index ce36dae2..b65d4c9e 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -535,16 +535,19 @@ namespace Oqtane.Controllers file.ImageHeight = 0; file.ImageWidth = 0; - if (Constants.ImageFiles.Split(',').Contains(file.Extension.ToLower())) - { - FileStream stream = new FileStream(filepath, FileMode.Open, FileAccess.Read); - using (var image = Image.FromStream(stream)) + //svg has no image and height, the attributes for svg are held in the XML viewport + if(file.Extension != "svg") + { + if (Constants.ImageFiles.Split(',').Contains(file.Extension.ToLower())) { - file.ImageHeight = image.Height; - file.ImageWidth = image.Width; + FileStream stream = new FileStream(filepath, FileMode.Open, FileAccess.Read); + using (var image = Image.FromStream(stream)) + { + file.ImageHeight = image.Height; + file.ImageWidth = image.Width; + } + stream.Close(); } - - stream.Close(); } return file;