Merge branch 'newgen' of https://github.com/ceee/zero into newgen

zero/Media/ImageSharp/Processors/BlurWebProcessor.cs

@@ -0,0 +1,48 @@
+using Microsoft.Extensions.Logging;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Web;
+using SixLabors.ImageSharp.Web.Commands;
+using SixLabors.ImageSharp.Web.Processors;
+using System.Globalization;
+
+namespace zero.Media.ImageSharp.Processors;
+
+public class BlurWebProcessor : IImageWebProcessor
+{
+  // <summary>
+  /// The command constant for the gaussian blur sigma.
+  /// </summary>
+  public const string Blur = "blur";
+
+  /// <summary>
+  /// The reusable collection of commands.
+  /// </summary>
+  private static readonly IEnumerable<string> BlurCommands = new[] { Blur };
+
+  /// <inheritdoc/>
+  public IEnumerable<string> Commands { get; } = BlurCommands;
+
+  /// <inheritdoc/>
+  public FormattedImage Process(
+      FormattedImage image,
+      ILogger logger,
+      CommandCollection commands,
+      CommandParser parser,
+      CultureInfo culture)
+  {
+    if (commands.Contains(Blur))
+    {
+      float sigma = parser.ParseValue<float>(commands.GetValueOrDefault(Blur), culture);
+
+      if (sigma != 0)
+      {
+        image.Image.Mutate(x => x.GaussianBlur(sigma));
+      }
+    }
+
+    return image;
+  }
+
+  /// <inheritdoc/>
+  public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => true;
+}

zero/Media/Indexes/Media_ByChildren.cs

@@ -1,38 +0,0 @@
-// using Raven.Client.Documents.Indexes;
-//
-// namespace zero.Media;
-//
-// public class Media_ByChildren : ZeroMultiMapIndex<Media_ByChildren.Result>
-// {
-//   public class Result : ZeroIdEntity, ISupportsDbConventions
-//   {
-//     public string ParentId { get; set; }
-//
-//     public int ChildrenCount { get; set; }
-//
-//     public string[] ChildrenIds { get; set; }
-//   }
-//
-//
-//   protected override void Create()
-//   {
-//     AddMap<Media>(items => items.Select(item => new Result()
-//     {
-//       Id = item.Id,
-//       ParentId = item.ParentId,
-//       ChildrenCount = 1,
-//       ChildrenIds = new string[] { }
-//     }));
-//
-//     Reduce = results => results.GroupBy(x => new { x.ParentId }).Select(group => new Result()
-//     {
-//       Id = null,
-//       ParentId = group.Key.ParentId,
-//       ChildrenCount = group.Sum(x => x.ChildrenCount),
-//       ChildrenIds = group.Select(x => x.Id).ToArray()
-//     });
-//
-//     StoreAllFields(FieldStorage.Yes);
-//     Index(x => x.ParentId, FieldIndexing.Exact);
-//   }
-// }

zero/Media/Indexes/Media_ByHierarchy.cs

@@ -1,45 +0,0 @@
-// using Raven.Client.Documents.Indexes;
-//
-// namespace zero.Media;
-//
-// public class Media_ByHierarchy : ZeroIndex<Media, Media_ByHierarchy.Result>
-// {
-//   public class Result : ZeroIdEntity, ISupportsDbConventions
-//   {
-//     public string Name { get; set; }
-//
-//     public List<PathResult> Path { get; set; } = new List<PathResult>();
-//
-//     public string[] PathIds { get; set; } = Array.Empty<string>();
-//   }
-//
-//
-//   public class PathResult
-//   {
-//     public string Id { get; set; }
-//
-//     public string Name { get; set; }
-//   }
-//
-//
-//   protected override void Create()
-//   {
-//     Map = items => items
-//       .Select(item => new
-//       {
-//         Item = item,
-//         Path = Recurse(item, x => LoadDocument<Media>(x.ParentId)).Where(x => x != null && x.Id != null && x.Id != item.Id).Reverse()
-//       })
-//       .Select(item => new Result
-//       {
-//         Id = item.Item.Id,
-//         Name = item.Item.Name,
-//         Path = item.Path.Select(current => new PathResult() { Id = current.Id, Name = current.Name }).ToList(),
-//         PathIds = item.Path.Select(current => current.Id).ToArray()
-//       });
-//
-//     StoreAllFields(FieldStorage.Yes);
-//     Index("PathIds", FieldIndexing.Exact);
-//     //Index(x => x.ChannelId, FieldIndexing.Exact);
-//   }
-// }

zero/Media/MediaCreator.cs

@@ -1,6 +1,9 @@
 using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.Formats.Webp;
 using SixLabors.ImageSharp.Metadata;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
@@ -61,6 +64,7 @@ public class MediaCreator : IMediaCreator
 
     if (isImage)
     {
+      // load image to create thumbnails
       using Image<Rgba32> image = await Image.LoadAsync<Rgba32>(fileInfo.AbsolutePath, cancellationToken);
       model.Metadata = GetImageMetadata(image.Metadata, image.Size);
 
@@ -68,17 +72,22 @@ public class MediaCreator : IMediaCreator
 
       if (Options.Thumbnails != null)
       {
-        foreach ((string key, ResizeOptions opts) in Options.Thumbnails)
+        foreach ((string key, ThumbnailOptions opts) in Options.Thumbnails)
         {
           Image<Rgba32> imageFrame = image.Frames.Count > 1 ? image.Frames.CloneFrame(0) : image.Clone();
-          imageFrame.Mutate(x => x.Resize(opts));
+          IImageEncoder encoder = opts.Encoder ?? new WebpEncoder();
+
+          if (opts.Mutate != null)
+          {
+            imageFrame.Mutate(opts.Mutate);
+          }
 
           using MemoryStream stream = new();
-          await imageFrame.SaveAsync(stream, new PngEncoder(), cancellationToken);
+          await imageFrame.SaveAsync(stream, encoder, cancellationToken);
 
           stream.Position = 0;
 
-          string thumbFilename = normalizedFilename.TrimEnd(extension) + "." + Safenames.File(key) + ".png";
+          string thumbFilename = normalizedFilename.TrimEnd(extension) + "." + Safenames.File(key) + opts.Extension.Or(".webp");
           string path = directory + '/' + thumbFilename;
 
           await FileSystem.CreateFile(path, stream, cancellationToken: cancellationToken);

zero/Media/MediaOptions.cs

@@ -1,11 +1,13 @@
-using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Web.Caching;
 
 namespace zero.Media;
 
 public class MediaOptions
 {
-  public string FolderPath { get; set; }
+  public string FolderPath { get; set; } = string.Empty;
 
   public string PublicPathPrefix { get; set; } = string.Empty;
 
@@ -13,7 +15,7 @@ public class MediaOptions
 
   public List<string> AllowedImageFileExtensions { get; set; }
 
-  public Dictionary<string, ResizeOptions> Thumbnails { get; set; }
+  public Dictionary<string, ThumbnailOptions> Thumbnails { get; set; }
 
   public ImageSharpOptions ImageSharp { get; set; } = new();
 }
@@ -40,4 +42,14 @@ public class ImagingSharpRemoteCacheOptions
   public string MediaFolder { get; set; } = "/media/_remote/";
 
   public string KeyMapFile { get; set; } = "/Config/remotekeys.json";
+}
+
+
+public class ThumbnailOptions
+{
+  public string Extension { get; set; }
+
+  public IImageEncoder Encoder { get; set; }
+
+  public Action<IImageProcessingContext> Mutate { get; set; }
 }

zero/Media/ZeroMediaModule.cs

@@ -22,7 +22,13 @@ internal class ZeroMediaModule : ZeroModule
       .AddProvider<PhysicalFileProvider>()
       .AddProcessor<RotateWebProcessor>()
       .AddProcessor<StripMetadataWebProcessor>()
-      .Configure<PhysicalFileSystemCacheOptions>(configuration.GetSection("Zero:Media:ImageSharp:Cache"));
+      .AddProcessor<BlurWebProcessor>();
+
+    services.AddOptions<PhysicalFileSystemCacheOptions>().Configure(opts =>
+    {
+      opts.CacheRootPath = "~/";
+      opts.CacheFolder = "cache";
+    }).Bind(configuration.GetSection("Zero:Media:ImageSharp:Cache"));
     
     //configuration.AddJsonFile(Path.Combine(Directory.GetCurrentDirectory(), "Config/imaging.json"), true, true);
     //configuration.AddJsonFile(Path.Combine(Directory.GetCurrentDirectory(), $"Config/imaging.{builder.Environment.EnvironmentName}.json"), true);