From 3a3be4f71c2a10ccb9e1f348764f7db50fd3c01e Mon Sep 17 00:00:00 2001
From: MrTimscampi <julien.machiels@protonmail.com>
Date: Fri, 3 Apr 2020 23:19:21 +0200
Subject: [PATCH] Add limit setting to songs controller

---
 src/controllers/music/musicalbums.js  |  2 +-
 src/controllers/music/musicartists.js |  2 +-
 src/controllers/music/songs.js        | 18 +++++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/controllers/music/musicalbums.js b/src/controllers/music/musicalbums.js
index d7c090b3e..5c6f513c5 100644
--- a/src/controllers/music/musicalbums.js
+++ b/src/controllers/music/musicalbums.js
@@ -30,7 +30,7 @@ define(["layoutManager", "playbackManager", "loading", "events", "libraryBrowser
                         Fields: "PrimaryImageAspectRatio,SortName,BasicSyncInfo",
                         ImageTypeLimit: 1,
                         EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
-                        StartIndex: 0,
+                        StartIndex: 0
                     },
                     view: libraryBrowser.getSavedView(key) || "Poster"
                 };
diff --git a/src/controllers/music/musicartists.js b/src/controllers/music/musicartists.js
index 3518ae758..6048b9920 100644
--- a/src/controllers/music/musicartists.js
+++ b/src/controllers/music/musicartists.js
@@ -14,7 +14,7 @@ define(["layoutManager", "loading", "events", "libraryBrowser", "imageLoader", "
                     Fields: "PrimaryImageAspectRatio,SortName,BasicSyncInfo",
                     StartIndex: 0,
                     ImageTypeLimit: 1,
-                    EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
+                    EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
                 };
 
                 if (userSettings.libraryPageSize() > 0) {
diff --git a/src/controllers/music/songs.js b/src/controllers/music/songs.js
index 47263be0d..67aa192d5 100644
--- a/src/controllers/music/songs.js
+++ b/src/controllers/music/songs.js
@@ -1,4 +1,4 @@
-define(["events", "libraryBrowser", "imageLoader", "listView", "loading", "emby-itemscontainer"], function (events, libraryBrowser, imageLoader, listView, loading) {
+define(["events", "libraryBrowser", "imageLoader", "listView", "loading", "userSettings", "emby-itemscontainer"], function (events, libraryBrowser, imageLoader, listView, loading, userSettings) {
     "use strict";
 
     return function (view, params, tabContent) {
@@ -7,19 +7,23 @@ define(["events", "libraryBrowser", "imageLoader", "listView", "loading", "emby-
             var pageData = data[key];
 
             if (!pageData) {
-                pageData = data[key] = {
+                pageData = {
                     query: {
                         SortBy: "Album,SortName",
                         SortOrder: "Ascending",
                         IncludeItemTypes: "Audio",
                         Recursive: true,
                         Fields: "AudioInfo,ParentId",
-                        Limit: 100,
                         StartIndex: 0,
                         ImageTypeLimit: 1,
                         EnableImageTypes: "Primary"
                     }
                 };
+
+                if (userSettings.libraryPageSize() > 0) {
+                    pageData.query['Limit'] = userSettings.libraryPageSize();
+                }
+
                 pageData.query.ParentId = params.topParentId;
                 libraryBrowser.loadSavedQueryValues(key, pageData.query);
             }
@@ -49,7 +53,9 @@ define(["events", "libraryBrowser", "imageLoader", "listView", "loading", "emby-
                         return;
                     }
 
-                    query.StartIndex += query.Limit;
+                    if (userSettings.libraryPageSize() > 0) {
+                        query.StartIndex += query.Limit;
+                    }
                     reloadItems(tabContent);
                 }
 
@@ -58,7 +64,9 @@ define(["events", "libraryBrowser", "imageLoader", "listView", "loading", "emby-
                         return;
                     }
 
-                    query.StartIndex -= query.Limit;
+                    if (userSettings.libraryPageSize() > 0) {
+                        query.StartIndex = Math.max(0, query.StartIndex - query.Limit);
+                    }
                     reloadItems(tabContent);
                 }