From d586cee99c4038274d6d53e780b87a3f5c0080dc Mon Sep 17 00:00:00 2001
From: rxtur <rtur.net@gmail.com>
Date: Sat, 25 May 2019 21:38:27 -0500
Subject: [PATCH] Version 2.4

---
 src/Core/Api/AssetsController.cs |  3 ++-
 src/Core/Core.csproj             |  2 +-
 src/Upgrade/Program.cs           | 24 ++++++++++--------------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/Core/Api/AssetsController.cs b/src/Core/Api/AssetsController.cs
index dd6d13337..efe01328b 100644
--- a/src/Core/Api/AssetsController.cs
+++ b/src/Core/Api/AssetsController.cs
@@ -34,7 +34,8 @@ public AssetsController(IDataService data, IStorageService store)
         [HttpGet]
         public async Task<AssetsModel> Get(int page = 1, string filter = "", string search = "")
         {
-            var pager = new Pager(page);
+            var blog = await _data.CustomFields.GetBlogSettings();
+            var pager = new Pager(page, blog.ItemsPerPage);
             IEnumerable<AssetItem> items;
 
             if (string.IsNullOrEmpty(search))
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index 65e0118ee..afd45e4e5 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>2.3.1.8</Version>
+    <Version>2.4.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/Upgrade/Program.cs b/src/Upgrade/Program.cs
index 87fc950ee..c4944e6d0 100644
--- a/src/Upgrade/Program.cs
+++ b/src/Upgrade/Program.cs
@@ -70,7 +70,7 @@ static void ReplaceFile(string file)
             {
                 if (File.Exists(oldFile))
                     File.Delete(oldFile);
-                    
+
                 File.Copy(newFile, oldFile);
                 _items.Add($"Replacing file: {oldFile} with {newFile}");
             }
@@ -100,28 +100,24 @@ static void ReplaceFolder(string folder)
 
         static List<string> GetCoreFiles()
         {
-            var fileName = $"{_upgDir}{_slash}files.txt";
-            var files = new List<string>();
-
-            var lines = File.ReadAllLines(fileName);
-            for (var i = 0; i < lines.Length; i++)
-            {
-                files.Add(lines[i].Trim());
-            }
-            return files;
+            return ReadFile($"{_upgDir}{_slash}files.txt");
         }
 
         static List<string> GetCoreFolders()
         {
-            var fileName = $"{_upgDir}{_slash}folders.txt";
-            var folders = new List<string>();
+            return ReadFile($"{_upgDir}{_slash}folders.txt");
+        }
 
+        static List<string> ReadFile(string fileName)
+        {
+            var items = new List<string>();
             var lines = File.ReadAllLines(fileName);
+
             for (var i = 0; i < lines.Length; i++)
             {
-                folders.Add(lines[i].Trim().Replace("|", _slash));
+                items.Add(lines[i].Trim().Replace("|", _slash));
             }
-            return folders;
+            return items;
         }
     }
 }
\ No newline at end of file