feat: pause watcher execution

jdaar · May 8, 2023 · f8417e5 · f8417e5
1 parent 739d1f9
commit f8417e5
Show file tree

Hide file tree

Showing 15 changed files with 294 additions and 38 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -23,8 +23,6 @@ jobs:
           dotnet-version: ${{ matrix.dotnet-version }}
       - name: Install dependencies
         run: dotnet restore
-      - name: Install tool dependencies
-        run: dotnet tool restore
       - name: Build
         run: dotnet build --configuration Release --no-restore
       - name: Test

diff --git a/ConnectionInterface/ConnectionInterface.cs b/ConnectionInterface/ConnectionInterface.cs
@@ -3,18 +3,21 @@
 
 namespace ConnectionInterface
 {
-    public enum t_PipeCommand
+    public enum t_PipeCommand : int
     {
         GET_WATCHER = 0,
         GET_ALL_WATCHER = 1,
         CREATE_WATCHER = 2,
         UPDATE_WATCHER = 3,
         DELETE_WATCHER = 4,
-        GET_SERVICESETTING = 5,
-        GET_ALL_SERVICESETTING = 6,
-        CREATE_SERVICESETTING = 7,
-        UPDATE_SERVICESETTING = 8,
-        DELETE_SERVICESETTING = 9,
+        PAUSE_WATCHER = 5,
+        START_WATCHER = 6,
+        GET_SERVICESETTING = 7,
+        GET_ALL_SERVICESETTING = 8,
+        CREATE_SERVICESETTING = 9,
+        UPDATE_SERVICESETTING = 10,
+        DELETE_SERVICESETTING = 11,
+        GET_WATCHER_STATUS = 12,
     }
     public enum t_ResponseStatus
     {
@@ -39,6 +42,7 @@ public class PipeResponsePayload
     {
         public string? ErrorMessage { get; set; }
         public List<Watcher>? Watchers { get; set; }
+        public bool? WatcherStatus { get; set; }
     }
 
     public class PipeResponse

diff --git a/ConnectionInterface/Watcher.cs b/ConnectionInterface/Watcher.cs
@@ -37,6 +37,14 @@ public class Watcher
         [Column(name: "created_at")]
         public DateTime CreatedAt { get; set; }
 
+        [Required]
+        [Column(name: "executed_at")]
+        public DateTime ExecutedAt { get; set; }
+
+        [Required]
+        [Column(name: "modified_files")]
+        public int ModifiedFiles { get; set; }
+
 
         [Required]
         [StringLength(256)]

diff --git a/fsBuddyClient/Assets/Icons/power.png b/fsBuddyClient/Assets/Icons/power.png
diff --git a/fsBuddyClient/Client.csproj b/fsBuddyClient/Client.csproj
@@ -13,6 +13,7 @@
     <None Remove="Assets\Icons\edit.png" />
     <None Remove="Assets\Icons\logs.png" />
     <None Remove="Assets\Icons\pause.png" />
+    <None Remove="Assets\Icons\power.png" />
     <None Remove="Assets\Icons\shrink.png" />
     <None Remove="Assets\logo_black.jpg" />
     <None Remove="Assets\logo_black.svg" />
@@ -37,6 +38,7 @@
     <Resource Include="Assets\Icons\edit.png" />
     <Resource Include="Assets\Icons\logs.png" />
     <Resource Include="Assets\Icons\pause.png" />
+    <Resource Include="Assets\Icons\power.png" />
     <Resource Include="Assets\Icons\shrink.png" />
     <Resource Include="Assets\logo_black.jpg" />
     <Resource Include="Assets\logo_black.svg" />

diff --git a/fsBuddyClient/View/Components/Navbar.xaml b/fsBuddyClient/View/Components/Navbar.xaml
@@ -187,7 +187,7 @@
                                             </Button.Template>
                                         </Button>
 
-                                        <Button Grid.Column="3" Command="{Binding RefreshCommand}">
+                                        <Button Grid.Column="3" Command="{Binding SwitchConnectionStatusCommand}">
                                             <Button.Template>
                                                 <ControlTemplate TargetType="{x:Type Button}">
                                                     <Border Style="{StaticResource ButtonWrapper}" Grid.Column="3" >
@@ -200,7 +200,7 @@
                                                                 <Image HorizontalAlignment="Center" Grid.Column="0">
                                                                     <Image.Source>
                                                                         <BitmapImage 
-                                                                            UriSource="pack://application:,,,/Assets/Icons/logs.png"
+                                                                            UriSource="pack://application:,,,/Assets/Icons/power.png"
                                                                             DecodePixelHeight="100" DecodePixelWidth="90">
                                                                         </BitmapImage>
                                                                     </Image.Source>

diff --git a/fsBuddyClient/View/Components/WatcherList.xaml b/fsBuddyClient/View/Components/WatcherList.xaml
@@ -194,8 +194,8 @@
                                     <TextBlock Style="{StaticResource CardTitle}" Grid.Row="2" Grid.Column="0"  Text="Modified files"/>
                                     <TextBlock Style="{StaticResource CardTitle}" Grid.Row="4" Grid.Column="0"  Text="Search pattern"/>
 
-                                    <TextBlock Style="{StaticResource CardParagraph}" Grid.Row="0" Grid.Column="2"  Text="Placeholder"/>
-                                    <TextBlock Style="{StaticResource CardParagraph}"  Grid.Row="2" Grid.Column="2"  Text="Placeholder" />
+                                    <TextBlock Style="{StaticResource CardParagraph}" Grid.Row="0" Grid.Column="2"  Text="{Binding ExecutedAt}"/>
+                                    <TextBlock Style="{StaticResource CardParagraph}"  Grid.Row="2" Grid.Column="2"  Text="{Binding ModifiedFiles}" />
                                     <TextBlock Style="{StaticResource CardParagraph}"  Grid.Row="4" Grid.Column="2" Text="{Binding SearchPattern}" />
 
                                     <TextBlock Style="{StaticResource CardTitle}" Grid.Row="0" Grid.Column="4"  Text="Creation date"/>

diff --git a/fsBuddyClient/ViewModel/Presenter.cs b/fsBuddyClient/ViewModel/Presenter.cs
@@ -51,6 +51,11 @@ public int WatcherCount {
 
         public void OnPropertyChanged(string propertyName)
         {
+            if (propertyName == nameof(Watchers))
+            {
+                // Todo
+            }
+
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 

diff --git a/fsBuddyConfiguration/ManagerConfiguration.cs b/fsBuddyConfiguration/ManagerConfiguration.cs
@@ -10,6 +10,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using ConnectionInterface;
+using System.Runtime.CompilerServices;
 
 namespace Configuration
 {
@@ -81,6 +82,20 @@ public async Task UpdateWatcher(int watcherId, Watcher watcherData)
             await _context.SaveChangesAsync(CancellationToken.None);
         }
 
+        public async Task RegisterExecution(int watcherId)
+        {
+            var now = DateTime.UtcNow;
+            var watcher = await _context.Watchers.SingleOrDefaultAsync(watcher => watcher.Id == watcherId);
+            if (watcher == null)
+            {
+                return;
+            }
+            watcher.ExecutedAt = now;
+            watcher.ModifiedFiles = watcher.ModifiedFiles + 1;
+
+            await _context.SaveChangesAsync(CancellationToken.None);
+        }
+
         public async Task<ServiceSetting?> GetServiceSetting(t_Setting type)
         {
             return await _context.SystemSettings.Where(setting => setting.Type == type).FirstOrDefaultAsync();

diff --git a/fsBuddyConfiguration/Migrations/20230508053722_exec-modified-fields.Designer.cs b/fsBuddyConfiguration/Migrations/20230508053722_exec-modified-fields.Designer.cs
diff --git a/fsBuddyConfiguration/Migrations/20230508053722_exec-modified-fields.cs b/fsBuddyConfiguration/Migrations/20230508053722_exec-modified-fields.cs
@@ -0,0 +1,41 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Configuration.Migrations
+{
+    /// <inheritdoc />
+    public partial class execmodifiedfields : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "executed_at",
+                table: "watchers",
+                type: "TEXT",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<int>(
+                name: "modified_files",
+                table: "watchers",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "executed_at",
+                table: "watchers");
+
+            migrationBuilder.DropColumn(
+                name: "modified_files",
+                table: "watchers");
+        }
+    }
+}
diff --git a/fsBuddyConfiguration/Migrations/ConfigurationContextModelSnapshot.cs b/fsBuddyConfiguration/Migrations/ConfigurationContextModelSnapshot.cs
@@ -57,12 +57,20 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("created_at");
 
+                    b.Property<DateTime>("ExecutedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("executed_at");
+
                     b.Property<string>("InputPath")
                         .IsRequired()
                         .HasMaxLength(256)
                         .HasColumnType("TEXT")
                         .HasColumnName("input_path");
 
+                    b.Property<int>("ModifiedFiles")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("modified_files");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(100)

diff --git a/fsBuddyService/FileSystemWatcher.cs b/fsBuddyService/FileSystemWatcher.cs
@@ -17,15 +17,19 @@ class FileSystemWatcherDisposable : IDisposable
         private Watcher _watcher;
 
         private static Dictionary<t_WatcherAction, Action<Watcher, FileSystemEventArgs>> WatcherActions = new();
+
+        private static Func<int, Task>? RegisterExecutionCallback;
         private static bool IsWatcherActionsInitialized { get; set; } = false;
 
         public FileSystemWatcher? fsWatcher;
 
+
         private void PopulateWatcherActions() {
             WatcherActions.Add(
                 t_WatcherAction.MOVE, 
                 delegate (Watcher watcher, FileSystemEventArgs fsEvent)
                 {
+                    RegisterExecutionCallback?.Invoke(watcher.Id);
                     Log.Information("From watcher action {@watcher} and event {@fsEvent}", watcher, fsEvent);
 
                     if (watcher.OutputPath == null)
@@ -88,13 +92,15 @@ private void PopulateWatcherActions() {
             IsWatcherActionsInitialized = true;
         }
 
-        public FileSystemWatcherDisposable(Watcher watcher)
+        public FileSystemWatcherDisposable(Watcher watcher, Func<int, Task> registerExecutionCallback)
         {
             if (!IsWatcherActionsInitialized)
             {
                 PopulateWatcherActions();
             }
 
+            RegisterExecutionCallback = registerExecutionCallback;
+
             _watcher = watcher;
             using (LogContext.PushProperty("WatcherId", _watcher.Id))
             {

diff --git a/fsBuddyService/PipeManager.cs b/fsBuddyService/PipeManager.cs
@@ -165,6 +165,49 @@ await _configurationManager.GetWatcher(pipeRequest.Payload.WatcherId ?? -1)
                             Watchers = watchers
                         }
                     };
+                case t_PipeCommand.PAUSE_WATCHER:
+                    if (pipeRequest?.Payload?.WatcherId == null)
+                    {
+                        return new PipeResponse
+                        {
+                            Status = t_ResponseStatus.FAILURE,
+                            Payload = new PipeResponsePayload {
+                                ErrorMessage = "Watcher id not defined"
+                            }
+                        };
+                    }
+
+                    _watcherManager.StopFsDisposable(pipeRequest.Payload.WatcherId ?? -1);
+
+                    Log.Information("Stopping watcher with id {WatcherId}", pipeRequest.Payload.WatcherId);
+                    return new PipeResponse
+                    {
+                        Status = t_ResponseStatus.SUCCESS,
+                        Payload = new PipeResponsePayload { 
+                        }
+                    };
+                case t_PipeCommand.GET_WATCHER_STATUS:
+                    if (pipeRequest?.Payload?.WatcherId == null)
+                    {
+                        return new PipeResponse
+                        {
+                            Status = t_ResponseStatus.FAILURE,
+                            Payload = new PipeResponsePayload {
+                                ErrorMessage = "Watcher id not defined"
+                            }
+                        };
+                    }
+
+                    var isWatcherRunning = _watcherManager.IsFsDisposableRunning(pipeRequest.Payload.WatcherId ?? -1);
+
+                    Log.Information("Stopping watcher with id {WatcherId}", pipeRequest.Payload.WatcherId);
+                    return new PipeResponse
+                    {
+                        Status = t_ResponseStatus.SUCCESS,
+                        Payload = new PipeResponsePayload { 
+                            WatcherStatus = isWatcherRunning
+                        }
+                    };
                 default:
                     return new PipeResponse
                     {