Merge branch 'issues/GH-6' of https://github.com/dotJEM/json-index2 i…

…nto issues/GH-6

src/DotJEM.Json.Index2.Management/Snapshots/IJsonIndexSnapshotManager.cs

@@ -6,6 +6,7 @@
 using DotJEM.Json.Index2.Snapshots;
 using DotJEM.ObservableExtensions.InfoStreams;
 using DotJEM.Web.Scheduler;
+using Lucene.Net.Search;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -41,6 +42,8 @@ public class JsonIndexSnapshotManager : IJsonIndexSnapshotManager
 {
     private readonly IJsonIndex index;
     private readonly ISnapshotStrategy strategy;
+    //TODO: This binds us to a concrete idea (even though this is an interface).
+    //      instead it would be preferred if we could provide an abstraction for what is needed.
     private readonly IWebTaskScheduler scheduler;
     private readonly IInfoStream<JsonIndexSnapshotManager> infoStream = new InfoStream<JsonIndexSnapshotManager>();
 

src/DotJEM.Json.Index2/Storage/IIndexStorageProvider.cs

@@ -1,4 +1,7 @@
-using Lucene.Net.Store;
+using System;
+using System.IO;
+using Lucene.Net.Store;
+using Directory = Lucene.Net.Store.Directory;
 
 namespace DotJEM.Json.Index2.Storage;
 
@@ -32,5 +35,12 @@ public SimpleFsIndexStorageProvider(string path)
 
     public void Delete()
     {
+        //TODO: For now. But maybe there is cases where this actually makes sense to always have.
+        DirectoryInfo dir = new DirectoryInfo(path);
+        foreach (FileInfo file in dir.EnumerateFiles())
+            file.Delete();
+
+        foreach (DirectoryInfo directory in dir.EnumerateDirectories())
+            directory.Delete(true);
     }
 }

src/DotJEM.Json.Index2/Storage/IJsonIndexStorageManager.cs

@@ -42,7 +42,6 @@ public Directory Directory
             {
                 if (directory != null)
                     return directory;
-
                 return directory = provider.Get();
             }
         }
@@ -51,8 +50,8 @@ public Directory Directory
     public JsonIndexStorageManager(IJsonIndex index, IIndexStorageProvider provider)
     {
         this.provider = provider;
-        this.writerManager = new Lazy<IIndexWriterManager>(()=> new IndexWriterManager(index));
-        this.searcherManager = new Lazy<IIndexSearcherManager>(()=>  new IndexSearcherManager(WriterManager, index.Configuration.Serializer));
+        this.writerManager = new(()=> new IndexWriterManager(index));
+        this.searcherManager = new(()=>  new IndexSearcherManager(WriterManager, index.Configuration.Serializer));
     }
 
     public void Unlock()
@@ -82,8 +81,6 @@ public void Delete()
             foreach (string file in directory.ListAll())
                 directory.DeleteFile(file);
             provider.Delete();
-
-
         }
     }
 }