From 3592781e94bf85e881f1ae4c0ab2ccd65565fbf9 Mon Sep 17 00:00:00 2001
From: Jamie Rees <tidusjar@gmail.com>
Date: Wed, 6 Mar 2019 10:13:11 +0000
Subject: [PATCH] Added a lock on the database commit level to see if I can
 improve locked db's

---
 src/Ombi.Store/Ombi.Store.csproj            |  1 +
 src/Ombi.Store/Repository/BaseRepository.cs | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/Ombi.Store/Ombi.Store.csproj b/src/Ombi.Store/Ombi.Store.csproj
index 31c69c8d8..8dfcc1c28 100644
--- a/src/Ombi.Store/Ombi.Store.csproj
+++ b/src/Ombi.Store/Ombi.Store.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Nito.AsyncEx" Version="5.0.0-pre-05" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="1.1.9" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Ombi.Store/Repository/BaseRepository.cs b/src/Ombi.Store/Repository/BaseRepository.cs
index efd277f43..21dd2dac5 100644
--- a/src/Ombi.Store/Repository/BaseRepository.cs
+++ b/src/Ombi.Store/Repository/BaseRepository.cs
@@ -5,6 +5,7 @@ using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
+using Nito.AsyncEx;
 using Ombi.Store.Context;
 using Ombi.Store.Entities;
 
@@ -19,6 +20,7 @@ namespace Ombi.Store.Repository
         }
         public DbSet<T> _db { get; }
         private readonly U _ctx;
+        private readonly AsyncLock _mutex = new AsyncLock();
 
         public async Task<T> Find(object key)
         {
@@ -40,32 +42,32 @@ namespace Ombi.Store.Repository
             _db.AddRange(content);
             if (save)
             {
-                await SaveChangesAsync();
+                await InternalSaveChanges();
             }
         }
 
         public async Task<T> Add(T content)
         {
             await _db.AddAsync(content);
-            await SaveChangesAsync();
+            await InternalSaveChanges();
             return content;
         }
 
         public async Task Delete(T request)
         {
             _db.Remove(request);
-            await SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public async Task DeleteRange(IEnumerable<T> req)
         {
             _db.RemoveRange(req);
-            await SaveChangesAsync();
+            await InternalSaveChanges();
         }
 
         public async Task<int> SaveChangesAsync()
         {
-            return await _ctx.SaveChangesAsync();
+            return await InternalSaveChanges();
         }
 
         public IIncludableQueryable<TEntity, TProperty> Include<TEntity, TProperty>(
@@ -79,6 +81,14 @@ namespace Ombi.Store.Repository
         {
             await _ctx.Database.ExecuteSqlCommandAsync(sql);
         }
+
+        private async Task<int> InternalSaveChanges()
+        {
+            using (await _mutex.LockAsync())
+            {
+                return await _ctx.SaveChangesAsync();
+            }
+        }
         
 
         private bool _disposed;