From 45c13141f9ac3da07f4d15c1fb90442d3eb855e2 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Mon, 1 Jul 2019 17:59:01 +0200
Subject: [PATCH] Address comments

---
 .../Data/BaseSqliteRepository.cs              | 15 ++++----
 .../Data/SqliteItemRepository.cs              | 38 +++++++++----------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 7938d6b7e0..6e061c1548 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -36,9 +36,9 @@ namespace Emby.Server.Implementations.Data
 
         protected virtual SynchronousMode? Synchronous => null;
 
-        protected SemaphoreSlim WriteLock = new SemaphoreSlim(1, 1);
+        protected SemaphoreSlim WriteLock { get; set; } = new SemaphoreSlim(1, 1);
 
-        protected SQLiteDatabaseConnection WriteConnection;
+        protected SQLiteDatabaseConnection WriteConnection { get; set; }
 
         protected ManagedConnection GetConnection(bool _ = false)
         {
@@ -55,7 +55,7 @@ namespace Emby.Server.Implementations.Data
 
             if (CacheSize.HasValue)
             {
-                WriteConnection.Execute("PRAGMA cache_size=" + (int)CacheSize.Value);
+                WriteConnection.Execute("PRAGMA cache_size=" + CacheSize.Value);
             }
 
             if (!string.IsNullOrWhiteSpace(JournalMode))
@@ -70,7 +70,7 @@ namespace Emby.Server.Implementations.Data
 
             if (PageSize.HasValue)
             {
-                WriteConnection.Execute("PRAGMA page_size=" + (int)PageSize.Value);
+                WriteConnection.Execute("PRAGMA page_size=" + PageSize.Value);
             }
 
             WriteConnection.Execute("PRAGMA temp_store=" + (int)TempStore);
@@ -109,7 +109,7 @@ namespace Emby.Server.Implementations.Data
 
         protected List<string> GetColumnNames(IDatabaseConnection connection, string table)
         {
-            var list = new List<string>();
+            var columnNames = new List<string>();
 
             foreach (var row in connection.Query("PRAGMA table_info(" + table + ")"))
             {
@@ -117,11 +117,11 @@ namespace Emby.Server.Implementations.Data
                 {
                     var name = row[1].ToString();
 
-                    list.Add(name);
+                    columnNames.Add(name);
                 }
             }
 
-            return list;
+            return columnNames;
         }
 
         protected void AddColumn(IDatabaseConnection connection, string table, string columnName, string type, List<string> existingColumnNames)
@@ -142,6 +142,7 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
+        /// <inheritdoc />
         public void Dispose()
         {
             Dispose(true);
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 8a56e16bb7..1cefcec7ca 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -36,13 +36,9 @@ namespace Emby.Server.Implementations.Data
     /// </summary>
     public class SqliteItemRepository : BaseSqliteRepository, IItemRepository
     {
-        private readonly TypeMapper _typeMapper;
+        private const string ChaptersTableName = "Chapters2";
 
-        /// <summary>
-        /// Gets the name of the repository
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name => "SQLite";
+        private readonly TypeMapper _typeMapper;
 
         /// <summary>
         /// Gets the json serializer.
@@ -54,12 +50,9 @@ namespace Emby.Server.Implementations.Data
         /// The _app paths
         /// </summary>
         private readonly IServerConfigurationManager _config;
-        private IServerApplicationHost _appHost;
-
+        private readonly IServerApplicationHost _appHost;
         private readonly ILocalizationManager _localization;
 
-        public IImageProcessor ImageProcessor { get; set; }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
         /// </summary>
@@ -90,10 +83,17 @@ namespace Emby.Server.Implementations.Data
             DbFilePath = Path.Combine(_config.ApplicationPaths.DataPath, "library.db");
         }
 
-        private const string ChaptersTableName = "Chapters2";
+        /// <inheritdoc />
+        public string Name => "SQLite";
 
+        /// <inheritdoc />
+        protected override int? CacheSize => 20000;
+
+        /// <inheritdoc />
         protected override TempStoreMode TempStore => TempStoreMode.Memory;
 
+        public IImageProcessor ImageProcessor { get; set; }
+
         /// <summary>
         /// Opens the connection to the database
         /// </summary>
@@ -1903,7 +1903,7 @@ namespace Emby.Server.Implementations.Data
 
             using (var connection = GetConnection(true))
             {
-                var list = new List<ChapterInfo>();
+                var chapters = new List<ChapterInfo>();
 
                 using (var statement = PrepareStatement(connection, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"))
                 {
@@ -1911,11 +1911,11 @@ namespace Emby.Server.Implementations.Data
 
                     foreach (var row in statement.ExecuteQuery())
                     {
-                        list.Add(GetChapter(row, item));
+                        chapters.Add(GetChapter(row, item));
                     }
                 }
 
-                return list;
+                return chapters;
             }
         }
 
@@ -2606,7 +2606,7 @@ namespace Emby.Server.Implementations.Data
 
             using (var connection = GetConnection(true))
             {
-                var list = new List<BaseItem>();
+                var items = new List<BaseItem>();
 
                 using (var statement = PrepareStatement(connection, commandText))
                 {
@@ -2634,7 +2634,7 @@ namespace Emby.Server.Implementations.Data
                         var item = GetItem(row, query, hasProgramAttributes, hasEpisodeAttributes, hasServiceName, hasStartDate, hasTrailerTypes, hasArtistFields, hasSeriesFields);
                         if (item != null)
                         {
-                            list.Add(item);
+                            items.Add(item);
                         }
                     }
                 }
@@ -2646,7 +2646,7 @@ namespace Emby.Server.Implementations.Data
                     limit -= 4;
                     var newList = new List<BaseItem>();
 
-                    foreach (var item in list)
+                    foreach (var item in items)
                     {
                         AddItem(newList, item);
 
@@ -2656,12 +2656,12 @@ namespace Emby.Server.Implementations.Data
                         }
                     }
 
-                    list = newList;
+                    items = newList;
                 }
 
                 LogQueryTime("GetItemList", commandText, now);
 
-                return list;
+                return items;
             }
         }