Convert script settings into a LiteDb

Library/App/App.csproj

@@ -37,9 +37,9 @@
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.csproj" />
     <ProjectReference Include="..\Contracts\Contracts.csproj" />
+    <ProjectReference Include="..\Data\Data.csproj" />
     <ProjectReference Include="..\JobManager\JobManager.csproj" />
     <ProjectReference Include="..\Logging\Logging.csproj" />
-    <ProjectReference Include="..\Settings\Data.csproj" />
   </ItemGroup>
 
   <ItemGroup>

Library/App/Forms/MainForm/MainForm.cs

@@ -3,6 +3,7 @@
 using App.Utils;
 using Contracts.Scripts.Base;
 using Data;
+using Data.Service.Interfaces;
 using JobManager.Service;
 using MaterialSkin.Controls;
 
@@ -13,17 +14,19 @@ public partial class MainForm : BaseForm
         private readonly TrayContextMenu _trayContextMenu;
         private readonly IWindowsRegistryService _windowsRegistryService;
 
-        public MainForm(IRunScriptService runScriptService, IWindowsRegistryService windowsRegistryService)
+        public MainForm(IRunScriptService runScriptService, IWindowsRegistryService windowsRegistryService, IScriptsService scriptsService)
         {
             InitializeComponent();
             _windowsRegistryService = windowsRegistryService;
 
-            _trayContextMenu = new TrayContextMenu();
-            ConfigureTrayContextMenu();
+            var scripts = runTabControl.SetScriptsService(scriptsService);
             runTabControl.SetRunScriptService(runScriptService);
             runTabControl.ScriptEdited += RunTabControl_ScriptEdited;
             runTabControl.ScriptAdded += RunTabControl_ScriptAdded;
             runTabControl.ScriptRemoved += RunTabControl_ScriptRemoved;
+
+            _trayContextMenu = new TrayContextMenu();
+            ConfigureTrayContextMenu(scripts);
         }
 
         protected override void WndProc(ref Message m)
@@ -98,12 +101,12 @@ private void ShowForm()
             TopMost = true;
             TopMost = currentTop;
         }
-        private void ConfigureTrayContextMenu()
+        private void ConfigureTrayContextMenu(List<ScriptAbs> scripts)
         {
             _trayContextMenu.CloseClicked += ContextMenu_Close_Click;
             _trayContextMenu.OpenClicked += ContextMenu_Open_Click;
             _trayContextMenu.ScriptStatusClicked += ContextMenu_StatusClick;
-            _trayContextMenu.LoadScriptList(SettingsManager.Scripts);
+            _trayContextMenu.LoadScriptList(scripts);
             this.appNotifyIcon.ContextMenuStrip = _trayContextMenu;
         }
         private void ChangeScriptStatus(ScriptAbs script)

Library/App/Forms/MainForm/Tabs/Run/RunTabControl.cs

@@ -3,7 +3,7 @@
 using Contracts.Key;
 using Contracts.Scripts;
 using Contracts.Scripts.Base;
-using Data;
+using Data.Service.Interfaces;
 using JobManager.Service;
 using MaterialSkin.Controls;
 using Serilog;
@@ -20,32 +20,50 @@ public partial class RunTabControl : UserControl
         private readonly ScriptListAdapter _scriptListAdapter;
         private readonly ListenKeysService _listenKeysService;
         private IRunScriptService? _runScriptService;
+        private IScriptsService? _scriptsService;
+        private List<ScriptAbs> _scripts;
         public RunTabControl()
         {
             InitializeComponent();
 
+            _scripts = new();
+
             _scriptListAdapter = new ScriptListAdapter(pnlScripts);
             _scriptListAdapter.ShowMenu += ShowContextMenuScript;
             _scriptListAdapter.StatusClicked += ChangeScriptStatusClicked;
 
             _listenKeysService = ListenKeysService.GetInstance();
             _listenKeysService.KeyUpClicked += ListenKeysService_KeyUpClicked;
         }
+
+        #region Public methods
         public void SetRunScriptService(IRunScriptService runScriptService)
         {
             _runScriptService = runScriptService;
             _runScriptService.OneOffScriptExecuted += OneOffJobWasExecuted;
         }
+        public List<ScriptAbs> SetScriptsService(IScriptsService scriptsService)
+        {
+            _scriptsService = scriptsService;
+            _scripts = _scriptsService.GetScripts();
+            return _scripts;
+        }
+        public async void RefreshScriptStatusAsync(string scriptId)
+        {
+            var script = _scripts.FirstOrDefault(s => s.Id == scriptId)?.Clone();
+            await ChangeScriptStatusAsync(script);
+        }
+        #endregion
         #region Events
         private async void OnLoad(object sender, EventArgs e)
         {
             if (this.DesignMode) return;
-            _scriptListAdapter.CreateWithList(SettingsManager.Scripts);
-            await CheckIfScriptsNeedToRunOnLoad();
+            _scriptListAdapter.CreateWithList(_scripts);
+            await CheckIfScriptsNeedToRunOnLoadAsync();
         }
         private void OneOffJobWasExecuted(string scriptId)
         {
-            var script = SettingsManager.FindScriptById(scriptId);
+            var script = _scripts.FirstOrDefault(s => s.Id == scriptId)?.Clone();
             if (script != null)
                 ChangeScriptStatusThreadSafe(script);
         }
@@ -74,7 +92,7 @@ private async void ContextMenuItemClicked(object sender, ToolStripItemClickedEve
             }
             else if (e.ClickedItem.Text == "Remove")
             {
-                await ShowRemoveScriptDialogAsync(script);
+                ShowRemoveScriptDialog(script);
             }
         }
         private void ListenKeysService_KeyUpClicked(KeyPressed keyPressed)
@@ -93,18 +111,18 @@ private void ListenKeysService_KeyUpClicked(KeyPressed keyPressed)
         #endregion
 
         #region Private Methods
-        private async Task CheckIfScriptsNeedToRunOnLoad()
+        private async Task CheckIfScriptsNeedToRunOnLoadAsync()
         {
             foreach (var script in GetRunningScriptsByType<ScriptScheduled>())
                 await _runScriptService!.RunScriptAsync(script);
 
             if (IsListenKeyServiceNecessary())
                 _listenKeysService.Run();
         }
-        private static bool IsListenKeyServiceNecessary(string? executingScriptId = null)
+        private bool IsListenKeyServiceNecessary(string? executingScriptId = null)
             => GetRunningScriptsByType<ScriptListenKey>()?.Any(s => s.Id != executingScriptId) ?? false;
-        private static IEnumerable<T> GetRunningScriptsByType<T>() 
-            where T : ScriptAbs => SettingsManager.Scripts.OfType<T>().Where(s => s.ScriptStatus == ScriptStatus.Running);
+        private IEnumerable<T> GetRunningScriptsByType<T>() 
+            where T : ScriptAbs => _scripts.OfType<T>().Where(s => s.ScriptStatus == ScriptStatus.Running);
         private void ChangeScriptStatusThreadSafe(ScriptAbs script)
             => this.Invoke((MethodInvoker) async delegate () { await ChangeScriptStatusAsync(script); });
         private async Task ShowEditScriptFormAsync(ScriptAbs script)
@@ -114,7 +132,7 @@ await ShowScriptForm(script, async (ScriptAbs? editedScript) => {
                     return;
                 Log.Debug("Editing Script {@ScriptName} ({@ScriptType})", editedScript.ScriptName, editedScript.ScriptType);
                 bool rescheduleJob = ScriptAbs.HasScriptTypeChanged(script.ScriptType, editedScript.ScriptType) || ScriptAbs.HasScheduledTimeChanged(script, editedScript);
-                await SettingsManager.EditScriptAsync(editedScript);
+                UpdateScript(editedScript);
                 if (editedScript.ScriptStatus == ScriptStatus.Running && rescheduleJob)
                 {
                     await _runScriptService!.StopScriptAsync(editedScript);
@@ -129,23 +147,24 @@ await ShowScriptForm(script, async (ScriptAbs? editedScript) => {
         }
         private async Task ShowAddScriptForm()
         {
-            await ShowScriptForm(null, async (ScriptAbs? addedScript) => {
+            await ShowScriptForm(null, (ScriptAbs? addedScript) => {
                 if (addedScript == null)
-                    return;
+                    return Task.CompletedTask;
                 Log.Debug("Adding Script {@ScriptName} ({@ScriptType})", addedScript.ScriptName, addedScript.ScriptType);
                 addedScript.Id = Guid.NewGuid().ToString();
-                await SettingsManager.AddScriptAsync(addedScript);
+                AddScript(addedScript);
                 _scriptListAdapter.AddItem(addedScript);
                 ScriptAdded?.Invoke(addedScript);
+                return Task.CompletedTask;
             });
         }
-        private async Task ShowRemoveScriptDialogAsync(ScriptAbs script)
+        private void ShowRemoveScriptDialog(ScriptAbs script)
         {
             var dialog = new MaterialDialog(this.ParentForm, "Remove", "Do you want to remove the script?", "Yes", true, "No");
             if (dialog.ShowDialog(this) == DialogResult.OK)
             {
                 Log.Debug("Removing ScriptId {@ScriptId}", script.Id);
-                await SettingsManager.RemoveScriptAsync(script.Id);
+                DeleteScript(script.Id);
                 _scriptListAdapter.RemoveItem(script.Id);
                 ScriptRemoved?.Invoke(script);
             }
@@ -182,7 +201,7 @@ private async Task ChangeScriptStatusAsync(ScriptAbs? script)
                     await _runScriptService!.StopScriptAsync(script);
             }
 
-            await SettingsManager.EditScriptAsync(script);
+            UpdateScript(script);
 
             _scriptListAdapter.RefreshScriptStatus(script.Id, script.ScriptStatus);
             ScriptEdited?.Invoke(script);
@@ -204,13 +223,26 @@ private static ScriptStatus GetNewScriptStatus(ScriptStatus oldStatus)
             }
             return newStatus;
         }
-        #endregion
-
-        #region Public methods
-        public async void RefreshScriptStatusAsync(string scriptId)
+        private void AddScript(ScriptAbs addedScript)
         {
-            var script = SettingsManager.FindScriptById(scriptId);
-            await ChangeScriptStatusAsync(script);
+            _scriptsService!.AddScript(addedScript);
+            _scripts.Add(addedScript);
+        }
+        private void UpdateScript(ScriptAbs editedScript)
+        {
+            _scriptsService!.UpdateScript(editedScript);
+            int index = _scripts.FindIndex(s => s.Id == editedScript.Id);
+            if (index == -1)
+                return;
+            _scripts[index] = editedScript;
+        }
+        private void DeleteScript(string scriptId)
+        {
+            _scriptsService!.DeleteScript(scriptId);
+            var scriptToDelete = _scripts.FirstOrDefault(s => s.Id == scriptId);
+            if (scriptToDelete == null)
+                return;
+            _scripts.Remove(scriptToDelete);
         }
         #endregion
 

Library/App/Program.cs

@@ -6,6 +6,7 @@
 using App.Utils;
 using Data;
 using Data.Extensions;
+using Data.Service.Interfaces;
 using JobManager.Service;
 using Logging;
 using MaterialSkin;
@@ -66,7 +67,7 @@ private static void InitForm(string[] args)
         private static void InitServices()
         {
             ServiceProvider = ServiceCollection!.BuildServiceProvider();
-            Data.Service.ISettingsService settingsService = ServiceProvider.GetRequiredService<Data.Service.ISettingsService>();
+            ISettingsService settingsService = ServiceProvider.GetRequiredService<ISettingsService>();
             Task.Run(async () => await SettingsManager.InitInstanceAsync(settingsService))
                 .Wait();
             LogManager.InstanceLogger(SettingsManager.Settings);

Library/CommonScripts.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32901.215
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Data", "Settings\Data.csproj", "{D36F28B5-E435-4D65-AC85-B360466D44FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Data", "Data\Data.csproj", "{D36F28B5-E435-4D65-AC85-B360466D44FE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Contracts", "Contracts\Contracts.csproj", "{C2BC20B0-A72C-43DA-8C46-351ADBA4D1A2}"
 EndProject

Library/Settings/Data.csproj → Library/Data/Data.csproj

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="LiteDB" Version="5.0.12" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
   </ItemGroup>
 

Library/Data/DbAccessor.cs

@@ -0,0 +1,87 @@
+using Common;
+using LiteDB;
+
+namespace Data
+{
+    public class DbAccessor : IDisposable
+    {
+        private const string DB_NAME = "CommonScripts.db";
+
+        private LiteDatabase? db;
+        private int _activeConnections = 0;
+
+        private static DbAccessor? _instance;
+        private readonly static object _instanceLockObj = new();
+        private readonly static object _accessorLockObj = new();
+
+        public static DbAccessor GetInstance()
+        {
+            if (_instance != null)
+                return _instance;
+            lock (_instanceLockObj)
+            {
+                if (_instance != null)
+                    return _instance;
+                _instance = new DbAccessor();
+            }
+            return _instance;
+        }
+
+        public void RunAction(Action<LiteDatabase> action)
+        {
+            try
+            {
+                InitDatabase();
+                action(db!);
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+            finally
+            {
+                DecrementConnections();
+            }
+        }
+
+        private void InitDatabase()
+        {
+            Interlocked.Increment(ref _activeConnections);
+            if (db != null)
+                return;
+            lock (_accessorLockObj)
+            {
+                if (db != null)
+                    return;
+                db = new LiteDatabase(GetDatabasePath());
+            }
+        }
+
+        private void DecrementConnections()
+        {
+            Interlocked.Decrement(ref _activeConnections);
+            if (_activeConnections == 0)
+            {
+                db?.Dispose();
+                db = null;
+            }
+        }
+
+        public void Dispose()
+        {
+            db?.Dispose();
+            GC.SuppressFinalize(this);
+        }
+
+        private static string GetDatabasePath()
+        {
+#if DEBUG
+            string path = FileUtils.GetConfigDirectory();
+#else
+            string path = SettingsManager.Settings.Core.InstallationPath;
+#endif
+            return Path.Combine(path, DB_NAME);
+        }
+    }
+}

Library/Settings/Extensions/SettingsManagerExtensions.cs → Library/Data/Extensions/SettingsManagerExtensions.cs

@@ -1,5 +1,7 @@
 using Data.Repository;
+using Data.Repository.Interfaces;
 using Data.Service;
+using Data.Service.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Data.Extensions
@@ -10,7 +12,9 @@ public static IServiceCollection AddSettingServices(this IServiceCollection serv
         {
             return serviceCollection
                 .AddScoped<ISettingsService, SettingsService>()
-                .AddScoped<IFileRepository, FileRepository>();
+                .AddScoped<IScriptsService, ScriptsService>()
+                .AddScoped<ISettingsRepository, SettingsRepository>()
+                .AddScoped<IScriptsRepository, ScriptsRepository>();
         }
     }
 }

Library/Data/Repository/Interfaces/IScriptsRepository.cs

@@ -0,0 +1,12 @@
+using Contracts.Scripts.Base;
+
+namespace Data.Repository.Interfaces
+{
+    public interface IScriptsRepository
+    {
+        List<ScriptAbs> GetScripts();
+        void DeleteScript(string scriptId);
+        void UpdateScript(ScriptAbs script);
+        void AddScript(ScriptAbs script);
+    }
+}

Library/Data/Repository/Interfaces/ISettingsRepository.cs

@@ -0,0 +1,10 @@
+using Contracts.Config;
+
+namespace Data.Repository.Interfaces
+{
+    public interface ISettingsRepository
+    {
+        Task<Settings> ReadSettingsAsync();
+        Task UpdateSettingsAsync(object file);
+    }
+}