From ea0e642a1eedc49e1c6ad9b53a1cfe3057d2a32e Mon Sep 17 00:00:00 2001
From: Cameron Cowen <cameronc94@gmail.com>
Date: Thu, 27 May 2021 00:05:31 +0100
Subject: [PATCH] Reorganised servocervicecollection extensions and added new
 elsa artifacts

---
 .../Extensions/ServiceCollectionExtensions.cs | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/activities/Elsa.Activities.File/Extensions/ServiceCollectionExtensions.cs b/src/activities/Elsa.Activities.File/Extensions/ServiceCollectionExtensions.cs
index d3021846d..b2631b2a8 100644
--- a/src/activities/Elsa.Activities.File/Extensions/ServiceCollectionExtensions.cs
+++ b/src/activities/Elsa.Activities.File/Extensions/ServiceCollectionExtensions.cs
@@ -1,5 +1,6 @@
 using Elsa;
 using Elsa.Activities.File;
+using Elsa.Activities.File.Bookmarks;
 using Elsa.Activities.File.Options;
 using Elsa.Activities.File.Services;
 using Microsoft.Extensions.DependencyInjection;
@@ -16,20 +17,30 @@ namespace Microsoft.Extensions.DependencyInjection
             return services;
         }
 
-        public static ElsaOptionsBuilder AddFileActivities(this ElsaOptionsBuilder builder, Action<FileWatcherOptions> configureOptions = null) => builder
-            .AddActivity<DeleteFile>()
-            .AddActivity<FileExists>()
-            .AddActivity<OutFile>()
-            .AddActivity<ReadFile>()
-            .AddActivity<TempFile>();
+        public static ElsaOptionsBuilder AddFileActivities(this ElsaOptionsBuilder builder, Action<FileWatcherOptions> configureOptions = null) 
+        {
+            if (builder == null)
+                throw new ArgumentNullException(nameof(builder));
+
+            builder.Services.AddFileServices(configureOptions);
+
+            builder.AddActivity<DeleteFile>()
+                .AddActivity<FileExists>()
+                .AddActivity<OutFile>()
+                .AddActivity<ReadFile>()
+                .AddActivity<TempFile>()
+                .AddActivity<WatchDirectory>();
+
+            return builder;
+        }
 
         public static IServiceCollection AddFileServices(this IServiceCollection services, Action<FileWatcherOptions> configureOptions = null)
         {
             if (configureOptions != null)
-            {
-                services.Configure(configureOptions);
-            }
+                services.Configure<FileWatcherOptions>(configureOptions);
+
             services.AddHostedService<FileWatcherService>();
+            services.AddBookmarkProvider<FileSystemChangedBookmarkProvider>();
 
             return services;
         }