Refactoring

src/DragonFly.App.Server/Program.cs

@@ -11,6 +11,7 @@
 using DragonFly.MongoDB;
 using DragonFlyABC;
 using DragonFlyTEST;
+using FFMpegCore;
 using ImageWizard;
 using ImageWizard.Caches;
 using Microsoft.AspNetCore.Builder;
@@ -45,6 +46,12 @@
     options.KnownProxies.Clear();
 });
 
+GlobalFFOptions.Configure(x =>
+{
+    x.BinaryFolder = "C:\\Users\\admin\\Downloads";
+    x.TemporaryFilesFolder = "C:\\Users\\admin\\Downloads";
+});
+
 //DragonFly services
 builder.Services.AddDragonFly()
                     .AddImageWizard()
@@ -63,8 +70,6 @@
                     })
                     ;
 
-
-
 var app = builder.Build();
 
 //init DragonFly

src/DragonFly.AspNetCore/Assets/VideoProcessing.cs

@@ -3,9 +3,6 @@
 // MIT License
 
 using FFMpegCore;
-using FFMpegCore.Builders.MetaData;
-using Microsoft.AspNetCore.Components.Forms;
-using SixLabors.ImageSharp;
 
 namespace DragonFly.AspNetCore;
 
@@ -27,12 +24,6 @@ public bool CanUse(string mimeType)
 
     public async Task<bool> OnAssetChangedAsync(IAssetProcessingContext context)
     {
-        GlobalFFOptions.Configure(x =>
-        {
-            x.BinaryFolder = "C:\\Users\\admin\\Downloads";
-            x.TemporaryFilesFolder = "C:\\Users\\admin\\Downloads";
-        });
-
         using Stream stream = await context.OpenAssetStreamAsync();
 
         IMediaAnalysis mediaInfo = FFProbe.Analyse(stream);

src/DragonFly.BlockField.Core/Attributes/BlockFieldAttribute.Generator.cs

@@ -12,7 +12,7 @@ public BlockFieldAttribute()
     {
     }
 
-    public override void AddToSchema(ContentSchema schema, string property)
+    public override void ApplyToSchema(ContentSchema schema, string property)
     {
         schema.AddField(
                                 name: property,

src/DragonFly.Client/Extensions/DragonFlyApiExtensions.cs

@@ -9,7 +9,15 @@ namespace DragonFly;
 
 public static class DragonFlyApiExtensions
 {
-    public static FieldAdded WithFieldView<TFieldView>(this FieldAdded field)
+    //public static IFieldAdded<T> WithFieldView2<T>(this IFieldAdded<T> field, Func<IFieldComponent<T>> component)
+    //    where T : ContentField
+    //{
+    //    ComponentManager.Default.Add(typeof(T), typeof(TFieldView));
+
+    //    return field;
+    //}
+
+    public static IFieldAdded WithFieldView<TFieldView>(this IFieldAdded field)
         where TFieldView : IFieldComponent, new()
     {
         Type fieldType = new TFieldView().FieldType;
@@ -19,7 +27,7 @@ public static FieldAdded WithFieldView<TFieldView>(this FieldAdded field)
         return field;
     }
 
-    public static FieldAdded WithOptionView<TFieldOptionsView>(this FieldAdded field)       
+    public static IFieldAdded WithOptionView<TFieldOptionsView>(this IFieldAdded field)       
         where TFieldOptionsView : IFieldOptionsComponent, new()
     {
         Type optionsType = new TFieldOptionsView().OptionsType;
@@ -29,7 +37,7 @@ public static FieldAdded WithOptionView<TFieldOptionsView>(this FieldAdded field
         return field;
     }
 
-    public static FieldAdded WithQueryView<TFieldQueryView>(this FieldAdded field)
+    public static IFieldAdded WithQueryView<TFieldQueryView>(this IFieldAdded field)
         where TFieldQueryView : IFieldQueryComponent, new()
     {
         Type queryType = new TFieldQueryView().QueryType;

src/DragonFly.Client/Pages/Assets/Metadata/Base/IAssetMetadataComponent.cs

@@ -3,10 +3,11 @@
 // MIT License
 
 using System;
+using Microsoft.AspNetCore.Components;
 
 namespace DragonFly.Client;
 
-public interface IAssetMetadataComponent
+public interface IAssetMetadataComponent : IComponent
 {
     AssetMetadata Metadata { get; }
 

src/DragonFly.Client/Pages/ContentItems/Fields/Base/FieldComponent.cs

@@ -7,7 +7,7 @@
 
 namespace DragonFly.Client;
 
-public abstract class FieldComponent<TField, TFieldOptions> : ComponentBase, IFieldComponent
+public abstract class FieldComponent<TField, TFieldOptions> : ComponentBase, IFieldComponent<TField>
     where TField : ContentField
     where TFieldOptions : FieldOptions
 {

src/DragonFly.Client/Pages/ContentItems/Fields/Base/FieldComponent2.cs

@@ -10,7 +10,7 @@ namespace DragonFly.Client;
 /// <summary>
 /// FieldComponent
 /// </summary>
-public abstract class FieldComponent<TField> : ComponentBase, IFieldComponent
+public abstract class FieldComponent<TField> : ComponentBase, IFieldComponent<TField>
     where TField : ContentField
 {
     [Parameter]

src/DragonFly.Client/Pages/ContentItems/Fields/Base/IFieldComponent.cs

@@ -15,3 +15,9 @@ public interface IFieldComponent : IComponent
 
     FieldOptions Options { get; }
 }
+
+public interface IFieldComponent<TField> : IFieldComponent
+    where TField : ContentField
+{
+    new Type FieldType => typeof(TField);
+}

src/DragonFly.Client/Pages/ContentItems/Query/Base/IFieldQueryComponent.cs

@@ -3,11 +3,11 @@
 // MIT License
 
 using System;
-using DragonFly.Query;
+using Microsoft.AspNetCore.Components;
 
 namespace DragonFly.Client;
 
-public interface IFieldQueryComponent
+public interface IFieldQueryComponent : IComponent
 {
     SchemaField Field { get; }
 

src/DragonFly.Client/Services/ComponentManager.cs

@@ -17,30 +17,26 @@ public sealed class ComponentManager
     /// </summary>
     public static ComponentManager Default { get; } = new ComponentManager();
 
-    private IDictionary<Type, Type> _cacheFieldView;
-
-    private ComponentManager()
-    {
-        _cacheFieldView = new Dictionary<Type, Type>();
-    }
+    private IDictionary<Type, Type> _cacheFieldView = new Dictionary<Type, Type>();
 
     public void Add(Type fieldType, Type componentType)
     {
         _cacheFieldView[fieldType] = componentType;
     }
 
-    public Type GetComponentType(Type type)
+    public Type GetComponentType(Type fieldType)
     {
-        if (_cacheFieldView.TryGetValue(type, out Type componentType))
+        if (_cacheFieldView.TryGetValue(fieldType, out Type componentType))
         {
             return componentType;
         }
 
         return null;
     }
 
-    public Type GetComponentType<T>()
+    public Type GetComponentType<TField>()
+        where TField : ContentField
     {
-        return GetComponentType(typeof(T));
+        return GetComponentType(typeof(TField));
     }
 }

src/DragonFly.Core/Modules/ContentItems/Models/Fields/FieldFactory.cs

@@ -7,65 +7,47 @@ namespace DragonFly;
 /// <summary>
 /// FieldFactory
 /// </summary>
-public sealed class FieldFactory
+public sealed class FieldFactory(
+                                string fieldName,
+                                Type fieldType,
+                                Type? optionsType,
+                                Type? queryType,
+                                Func<ContentField> factoryField,
+                                Func<FieldOptions>? factoryOptions,
+                                Func<FieldQuery>? factoryQuery)
 {
-    public FieldFactory(
-                string fieldName, 
-                Type fieldType, 
-                Type? optionsType, 
-                Type? queryType, 
-                Func<ContentField> factoryField, 
-                Func<FieldOptions>? factoryOptions,
-                Func<FieldQuery>? factoryQuery)
-    {
-        FieldName = fieldName;
-        FieldType = fieldType;
-        OptionsType = optionsType;
-        QueryType = queryType;
-        _createField = factoryField;
-        _createOptions = factoryOptions;
-        _createQuery = factoryQuery;
-    }
-
     /// <summary>
     /// FieldName
     /// </summary>
-    public string FieldName { get; }
+    public string FieldName { get; } = fieldName;
 
     /// <summary>
     /// FieldType
     /// </summary>
-    public Type FieldType { get; }
+    public Type FieldType { get; } = fieldType;
 
     /// <summary>
     /// OptionsType
     /// </summary>
-    public Type? OptionsType { get; }
+    public Type? OptionsType { get; } = optionsType;
 
     /// <summary>
     /// QueryType
     /// </summary>
-    public Type? QueryType { get; }
-
-
-    private Func<ContentField> _createField;
+    public Type? QueryType { get; } = queryType;
 
     /// <summary>
     /// CreateField
     /// </summary>
-    public ContentField CreateField() => _createField();
-
-    private Func<FieldOptions>? _createOptions;
+    public ContentField CreateField() => factoryField();
 
     /// <summary>
     /// CreateOptions
     /// </summary>
-    public FieldOptions? CreateOptions() => _createOptions?.Invoke();
-
-    private Func<FieldQuery>? _createQuery;
+    public FieldOptions? CreateOptions() => factoryOptions?.Invoke();
 
     /// <summary>
     /// CreateQuery
     /// </summary>
-    public FieldQuery? CreateQuery() => _createQuery?.Invoke();
+    public FieldQuery? CreateQuery() => factoryQuery?.Invoke();
 }

src/DragonFly.Core/Modules/ContentItems/Models/Fields/FieldManager/FieldManager.cs

@@ -26,8 +26,8 @@ public sealed class FieldManager
     /// <summary>
     /// Adds <typeparamref name="TField"/> to field manager.
     /// </summary>
-    public FieldAdded<TField> Add<TField>()
-        where TField : ContentField, IContentField
+    public IFieldAdded<TField> Add<TField>()
+        where TField : ContentField, IContentFieldFactory
     {
         FieldFactory factory = TField.Factory;
 

src/DragonFly.Core/Modules/ContentItems/Models/Fields/FieldManager/Results/FieldAdded.cs

@@ -7,20 +7,19 @@ namespace DragonFly;
 /// <summary>
 /// FieldAdded
 /// </summary>
-public abstract class FieldAdded
+/// <typeparam name="T"></typeparam>
+public class FieldAdded<T> : IFieldAdded<T>
+    where T : ContentField
 {
-    /// <summary>
-    /// FieldType
-    /// </summary>
-    public abstract Type FieldType { get; }
+    public Type FieldType => typeof(T);
 }
 
-/// <summary>
-/// FieldAdded
-/// </summary>
-/// <typeparam name="T"></typeparam>
-public class FieldAdded<T> : FieldAdded
-    where T : ContentField
+public interface IFieldAdded
+{
+
+}
+
+public interface IFieldAdded<out T> : IFieldAdded
 {
-    public override Type FieldType => typeof(T);
+
 }

src/DragonFly.Core/Modules/ContentItems/Models/Fields/FieldOptions.cs

@@ -19,5 +19,8 @@ public abstract class FieldOptions
     /// </summary>
     public bool IsSearchable { get; set; }
 
+    /// <summary>
+    /// CreateContentField
+    /// </summary>
     public abstract ContentField CreateContentField();
 }

src/DragonFly.Core/Modules/ContentItems/Models/Fields/IContentFieldFactory.cs

@@ -0,0 +1,10 @@
+// Copyright (c) usercode
+// https://github.com/usercode/DragonFly
+// MIT License
+
+namespace DragonFly;
+
+public interface IContentFieldFactory
+{
+    static abstract FieldFactory Factory { get; }
+}

src/DragonFly.Core/Modules/ContentItems/Models/Fields/SingleValueField.cs

@@ -12,7 +12,6 @@ namespace DragonFly;
 /// </summary>
 public abstract class SingleValueField<T> : ContentField, ISingleValueField
 {
-
     private T? _value;
 
     /// <summary>

src/DragonFly.Core/Modules/ContentModels/Attributes/Fields/AssetFieldAttribute.cs

@@ -12,9 +12,9 @@ public AssetFieldAttribute()
 
     public bool ShowPreview { get; set; }
 
-    public override void AddToSchema(ContentSchema schema, string property)
+    public override void ApplyToSchema(ContentSchema schema, string property)
     {
-        base.AddToSchema(schema, property);
+        base.ApplyToSchema(schema, property);
 
         schema.AddAsset(property, x =>
                                     {

src/DragonFly.Core/Modules/ContentModels/Attributes/Fields/BaseFieldAttribute.cs

@@ -19,7 +19,7 @@ public abstract class BaseFieldAttribute : Attribute
 
     public bool Index { get; set; }
 
-    public virtual void AddToSchema(ContentSchema schema, string property)
+    public virtual void ApplyToSchema(ContentSchema schema, string property)
     {
         if (ListField)
         {

src/DragonFly.Core/Modules/ContentModels/Attributes/Fields/BoolFieldAttribute.cs

@@ -6,9 +6,9 @@ namespace DragonFly.Generator;
 
 public class BoolFieldAttribute : BaseFieldAttribute
 {
-    public override void AddToSchema(ContentSchema schema, string property)
+    public override void ApplyToSchema(ContentSchema schema, string property)
     {
-        base.AddToSchema(schema, property);
+        base.ApplyToSchema(schema, property);
 
         schema.AddBool(property, x => 
                                     {