From c38570f7f3459908b3da4fa76b2fcbfa19029518 Mon Sep 17 00:00:00 2001
From: HavenDV <havendv@gmail.com>
Date: Sat, 4 May 2024 01:22:08 +0400
Subject: [PATCH] refactor: Renamed CollectMetadata to
 CollectMetadataIfRequired.

---
 .../Abstractions/src/DataSourceExtensions.cs              | 8 ++++----
 src/DocumentLoaders/Abstractions/src/FileLoader.cs        | 4 ++--
 src/DocumentLoaders/Pdf/src/AsposePdfSource.cs            | 4 ++--
 src/DocumentLoaders/Pdf/src/PdfPigPdfSource.cs            | 4 ++--
 src/DocumentLoaders/WebBase/src/HtmlLoader.cs             | 2 +-
 src/DocumentLoaders/Word/src/WordLoader.cs                | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/DocumentLoaders/Abstractions/src/DataSourceExtensions.cs b/src/DocumentLoaders/Abstractions/src/DataSourceExtensions.cs
index 00cd42bc..7b8defeb 100644
--- a/src/DocumentLoaders/Abstractions/src/DataSourceExtensions.cs
+++ b/src/DocumentLoaders/Abstractions/src/DataSourceExtensions.cs
@@ -28,7 +28,7 @@ public static IReadOnlyDictionary<string, object> ToMetadata(this DataSource dat
     /// <param name="settings"></param>
     /// <param name="dataSource"></param>
     /// <returns></returns>
-    public static IReadOnlyDictionary<string, object>? CollectMetadata(
+    public static IReadOnlyDictionary<string, object>? CollectMetadataIfRequired(
         this DocumentLoaderSettings? settings,
         DataSource dataSource)
     {
@@ -43,11 +43,11 @@ public static IReadOnlyDictionary<string, object> ToMetadata(this DataSource dat
     /// <param name="metadata"></param>
     /// <param name="additionalMetadata"></param>
     /// <returns></returns>
-    public static IReadOnlyDictionary<string, object>? With(
-        this IReadOnlyDictionary<string, object>? metadata,
+    public static IReadOnlyDictionary<string, object> With(
+        this IReadOnlyDictionary<string, object> metadata,
         IReadOnlyDictionary<string, object> additionalMetadata)
     {
-        return metadata?
+        return metadata
             .Concat(additionalMetadata)
             .ToDictionary(pair => pair.Key, pair => pair.Value);
     }
diff --git a/src/DocumentLoaders/Abstractions/src/FileLoader.cs b/src/DocumentLoaders/Abstractions/src/FileLoader.cs
index 7debdbb9..c6247acb 100644
--- a/src/DocumentLoaders/Abstractions/src/FileLoader.cs
+++ b/src/DocumentLoaders/Abstractions/src/FileLoader.cs
@@ -35,8 +35,8 @@ public async Task<IReadOnlyCollection<Document>> LoadAsync(
         //     }
         // }
 
-        var metadata = settings.CollectMetadata(dataSource);
-
+        var metadata = settings.CollectMetadataIfRequired(dataSource);
+        
         return [new Document(content, metadata: metadata)];
     }
 }
\ No newline at end of file
diff --git a/src/DocumentLoaders/Pdf/src/AsposePdfSource.cs b/src/DocumentLoaders/Pdf/src/AsposePdfSource.cs
index 106fd844..d3256e5e 100644
--- a/src/DocumentLoaders/Pdf/src/AsposePdfSource.cs
+++ b/src/DocumentLoaders/Pdf/src/AsposePdfSource.cs
@@ -20,8 +20,8 @@ public async Task<IReadOnlyCollection<Document>> LoadAsync(
         var textAbsorber = new TextAbsorber();
         pdfDocument.Pages.Accept(textAbsorber);
 
-        var metadata = settings.CollectMetadata(dataSource);
-
+        var metadata = settings.CollectMetadataIfRequired(dataSource);
+        
         return [new Document(textAbsorber.Text, metadata: metadata)];
     }
 }
\ No newline at end of file
diff --git a/src/DocumentLoaders/Pdf/src/PdfPigPdfSource.cs b/src/DocumentLoaders/Pdf/src/PdfPigPdfSource.cs
index ce056c15..1b2911d1 100644
--- a/src/DocumentLoaders/Pdf/src/PdfPigPdfSource.cs
+++ b/src/DocumentLoaders/Pdf/src/PdfPigPdfSource.cs
@@ -18,11 +18,11 @@ public async Task<IReadOnlyCollection<Document>> LoadAsync(
         using var stream = await dataSource.GetStreamAsync(cancellationToken).ConfigureAwait(false);
         using var document = PdfDocument.Open(stream, new ParsingOptions());
 
-        var metadata = settings.CollectMetadata(dataSource);
+        var metadata = settings.CollectMetadataIfRequired(dataSource);
 
         return document
             .GetPages()
-            .Select(page => new Document(page.Text, metadata.With(new Dictionary<string, object>
+            .Select(page => new Document(page.Text, metadata?.With(new Dictionary<string, object>
             {
                 { "page", page.Number },
             })))
diff --git a/src/DocumentLoaders/WebBase/src/HtmlLoader.cs b/src/DocumentLoaders/WebBase/src/HtmlLoader.cs
index 32da5184..e9417614 100644
--- a/src/DocumentLoaders/WebBase/src/HtmlLoader.cs
+++ b/src/DocumentLoaders/WebBase/src/HtmlLoader.cs
@@ -33,7 +33,7 @@ public async Task<IReadOnlyCollection<Document>> LoadAsync(
             document.QuerySelector("html") ??
             throw new NotSupportedException("Not supported for pages without <html> tag");
 
-        var metadata = settings.CollectMetadata(dataSource);
+        var metadata = settings.CollectMetadataIfRequired(dataSource);
 
         return [new Document(html.TextContent, metadata: metadata)];
     }
diff --git a/src/DocumentLoaders/Word/src/WordLoader.cs b/src/DocumentLoaders/Word/src/WordLoader.cs
index c069acf9..121d8f2a 100644
--- a/src/DocumentLoaders/Word/src/WordLoader.cs
+++ b/src/DocumentLoaders/Word/src/WordLoader.cs
@@ -35,7 +35,7 @@ public async Task<IReadOnlyCollection<Document>> LoadAsync(
             }
         }
 
-        var metadata = settings.CollectMetadata(dataSource);
+        var metadata = settings.CollectMetadataIfRequired(dataSource);
 
         return documents
             .Select(text => new Document(text, metadata: metadata))