last ...

Providers/Extractors/XFileContentExtractor.cs

@@ -1,15 +1,14 @@
-using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
-using System.Reflection;
+using xAiModels.Models;
 using xCommons.Extensions;
 using xExceptions.Constants;
 using System.Threading.Tasks;
 using System.Collections.Generic;
 using xAiApi.Interfaces.Extractors;
 
-namespace xAiApi.Providers
+namespace xAiApi.Providers.Extractors
 {
     /// <summary>
     /// Composite extractor that delegates to appropriate extractor 
@@ -18,67 +17,50 @@ namespace xAiApi.Providers
     public class XFileContentExtractor : IXFileContentExtractor
     {
         //
-        private readonly IList<IXFileContentExtractor> extractors = [];
+        private readonly IList<IXFileContentExtractorBase> _extractors = [];
 
-        public XFileContentExtractor()
+        public XFileContentExtractor(
+            IEnumerable<IXFileContentExtractorBase> availableExtractors
+        )
         {
             //
-            var path = Path.Combine(AppContext.BaseDirectory);
-            var files = Directory.GetFiles(path, "*.dll");
-            foreach (var dll in files)
-            {
-                //
-                // Retrieve DLL Assembly ...
-                var assembly = Assembly.LoadFrom(dll);
-
-                //
-                // Extract Registerar Types ...
-                var extractorTypes = assembly
-                    .GetExportedTypes()
-                    .Where(t =>
-                        !t.IsAbstract &&
-                        typeof(IXFileContentExtractor).IsAssignableFrom(t));
-                foreach (var extractorType in extractorTypes)
-                {
-                    //
-                    // Ignore XFileContentExtractor ...
-                    if (extractorType.FullName.Contains(nameof(XFileContentExtractor)))
-                    {
-                        continue;
-                    }
-
-                    //
-                    // Create Instance of Service ...
-                    var instance = (IXFileContentExtractor)Activator.CreateInstance(extractorType);
-                    if (!instance.IsNull())
-                    {
-                        //
-                        // Add Registerar Instance to Collection ...
-                        extractors.Add(instance);
-                    }
-                }
-            }
+            _extractors = [.. availableExtractors
+                .Where(e => e.GetType() != typeof(XFileContentExtractor))];
         }
 
         /// <summary>
         /// Check if this extractor supports the specified MIME type ...
         /// </summary>
-        public bool CanExtract(string mimeType)
+        /// <param name="mimeType"></param>
+        /// <param name="extractors"></param>
+        /// <returns></returns>
+        public bool CanExtract(
+            string mimeType,
+            string[] extractors = null
+        )
         {
-            return extractors.Any(e => e.CanExtract(mimeType));
+            //
+            return GetExtractors(extractors)
+                .Any(e => e.CanExtract(mimeType));
         }
 
         /// <summary>
         /// Extract text content from file stream ...
         /// </summary>
+        /// <param name="fileStream"></param>
+        /// <param name="mimeType"></param>
+        /// <param name="extractors"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
         public async Task<string> ExtractAsync(
             Stream fileStream,
             string mimeType,
+            string[] extractors = null,
             CancellationToken cancellationToken = default
         )
         {
             //
-            var extractor = extractors
+            var extractor = GetExtractors(extractors)
                 .FirstOrDefault(e => e.CanExtract(mimeType));
             if (extractor.IsNull())
             {
@@ -99,5 +81,74 @@ namespace xAiApi.Providers
             //
             return result;
         }
+
+        /// <summary>
+        /// Extract content from stream as Rich Result ...
+        /// </summary>
+        /// <param name="fileStream"></param>
+        /// <param name="fileName"></param>
+        /// <param name="mimeType"></param>
+        /// <param name="extractors"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<XFileExtractionResult> ExtractRichAsync(
+            Stream fileStream,
+            string fileName,
+            string mimeType,
+            string[] extractors = null,
+            CancellationToken cancellationToken = default
+        )
+        {
+            //
+            var extractor = GetExtractors(extractors)
+                .FirstOrDefault(e => e.CanExtract(mimeType));
+            if (extractor.IsNull())
+            {
+                //
+                XException.NotAllowed.Throw(
+                    $"Unsupported file type: {mimeType}"
+                );
+            }
+
+            //
+            var result = await extractor
+                .ExtractRichAsync(
+                    mimeType: mimeType,
+                    fileName: fileName,
+                    fileStream: fileStream,
+                    cancellationToken: cancellationToken
+                );
+
+            //
+            return result;
+        }
+
+        /// <summary>
+        /// Extract Provided Extractors ...
+        /// </summary>
+        /// <param name="extractors"></param>
+        /// <returns></returns>
+        private IList<IXFileContentExtractorBase> GetExtractors(string[] extractors = null)
+        {
+            //
+            var result = new List<IXFileContentExtractorBase>();
+
+            //
+            if (extractors.IsNull() || !extractors.HasChild())
+            {
+                //
+                result = [.. _extractors];
+            }
+            else
+            {
+                //
+                result = [.. _extractors
+                    .Where(e => extractors
+                        .Any(ex => e.GetType().FullName.Contains(ex)))];
+            }
+
+            //
+            return result;
+        }
     }
 }