From 2cfc69640d401b27b0c12b450e0f79c4e8d561bf Mon Sep 17 00:00:00 2001
From: jhays <orbosphere@gmail.com>
Date: Thu, 14 Oct 2021 22:28:36 -0500
Subject: [PATCH] cleanup some row math

---
 JellyfinPlayer tvOS/LibraryView.swift    | 7 +++----
 Shared/ViewModels/LibraryViewModel.swift | 7 ++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/JellyfinPlayer tvOS/LibraryView.swift b/JellyfinPlayer tvOS/LibraryView.swift
index ce9ccab0..1e908ec3 100644
--- a/JellyfinPlayer tvOS/LibraryView.swift	
+++ b/JellyfinPlayer tvOS/LibraryView.swift	
@@ -65,10 +65,9 @@ struct LibraryView: View {
             }
             .buttonStyle(PlainNavigationLinkButtonStyle())
             .onAppear {
-                if item == viewModel.items.last && viewModel.hasNextPage {
-                    print("Last item visible, load more items.")
-                    viewModel.requestNextPageAsync()
-                }
+              if item == viewModel.items.last && viewModel.hasNextPage {
+                  viewModel.requestNextPageAsync()
+              }
             }
           }
         }
diff --git a/Shared/ViewModels/LibraryViewModel.swift b/Shared/ViewModels/LibraryViewModel.swift
index 6a6273a7..828d32e3 100644
--- a/Shared/ViewModels/LibraryViewModel.swift
+++ b/Shared/ViewModels/LibraryViewModel.swift
@@ -144,15 +144,16 @@ final class LibraryViewModel: ViewModel {
     let rowCount = items.count / columns
     var calculatedRows = [LibraryRow]()
     for i in (0...rowCount) {
+      
       let firstItemIndex = i * columns
       var lastItemIndex = firstItemIndex + columns
-      if lastItemIndex >= items.count {
-        lastItemIndex = items.count - 1
+      if lastItemIndex > items.count {
+        lastItemIndex = items.count
       }
       calculatedRows.append(
         LibraryRow(
           section: i,
-          items: Array(items[firstItemIndex...lastItemIndex])
+          items: Array(items[firstItemIndex..<lastItemIndex])
         )
       )
     }