krz/hutch

an ios client for sourcehut

clone: git clone https://gitbay.org/krz/hutch.git

796c39d8ff08829bd695bc4e7497a147640eb79a

verified · cmc

author: Christian Cleberg <hello@cleberg.net> · 2026-03-19T00:32:07Z

cache repository search results and gate remote refreshes

 .../Repositories/RepositoryListViewModel.swift     | 66 ++++++++++++++++++----
 HutchTests/RepositoryListViewModelTests.swift      | 50 ++++++++++++++++
 2 files changed, 105 insertions(+), 11 deletions(-)

diff --git a/Hutch/Views/Repositories/RepositoryListViewModel.swift b/Hutch/Views/Repositories/RepositoryListViewModel.swift
index bba0108..6b63203 100644
--- a/Hutch/Views/Repositories/RepositoryListViewModel.swift
+++ b/Hutch/Views/Repositories/RepositoryListViewModel.swift
@@ -38,10 +38,13 @@ final class RepositoryListViewModel {
     private(set) var hasMore = false
     private(set) var isSearching = false
     private(set) var isCreatingRepository = false
+    private(set) var hasLoadedSearchIndex = false
+    private var searchIndex: [RepositorySummary] = []
     private let client: SRHTClient
 
     private static let gitCacheKey = "git.repositories"
     private static let hgCacheKey = "hg.repositories"
+    private static let minimumRemoteSearchLength = 3
 
     init(client: SRHTClient) {
         self.client = client
@@ -147,22 +150,23 @@ final class RepositoryListViewModel {
 
         do {
             var filteredResults: [RepositorySummary]
-            
+
             if isSearch {
-                // For search queries, fetch all repositories from both services.
-                filteredResults = try await fetchAllRepositories()
-                
-                // Perform client-side filtering
-                let lowercasedQuery = query.lowercased()
-                filteredResults = filteredResults.filter { repo in
-                    repo.name.lowercased().contains(lowercasedQuery) ||
-                    repo.description?.lowercased().contains(lowercasedQuery) ?? false
+                if hasLoadedSearchIndex || repositories.isEmpty == false {
+                    filteredResults = Self.filterRepositories(repositoriesForSearchIndex, matching: query)
+                } else if Self.shouldRefreshSearchIndex(for: query) {
+                    let repositories = try await fetchAllRepositories(useCache: true)
+                    updateSearchIndex(with: repositories)
+                    filteredResults = Self.filterRepositories(repositoriesForSearchIndex, matching: query)
+                } else {
+                    filteredResults = []
                 }
             } else {
                 let repositories = try await fetchAllRepositories(useCache: true)
+                updateSearchIndex(with: repositories)
                 filteredResults = repositories
             }
-            
+
             repositories = filteredResults.sorted(by: repositorySortOrder)
         } catch {
             // Only show error if we have no cached data to fall back on
@@ -240,6 +244,7 @@ final class RepositoryListViewModel {
                 repository = result.createRepository.repositorySummary(service: .hg)
             }
             repositories.insert(repository, at: 0)
+            insertIntoSearchIndex(repository)
             return repository
         } catch {
             self.error = repositoryCreationErrorMessage(for: error)
@@ -371,6 +376,10 @@ final class RepositoryListViewModel {
         let branch: String
     }
 
+    private var repositoriesForSearchIndex: [RepositorySummary] {
+        searchIndex
+    }
+
     private func fetchPage(
         service: SRHTService,
         cursor: String?,
@@ -502,7 +511,9 @@ final class RepositoryListViewModel {
             return []
         }
         if !cachedRepositories.isEmpty {
-            repositories = cachedRepositories.sorted(by: repositorySortOrder)
+            let sortedRepositories = cachedRepositories.sorted(by: repositorySortOrder)
+            repositories = sortedRepositories
+            updateSearchIndex(with: sortedRepositories)
         }
     }
 
@@ -545,4 +556,37 @@ final class RepositoryListViewModel {
         }
         return lhs.updated > rhs.updated
     }
+
+    private func updateSearchIndex(with repositories: [RepositorySummary]) {
+        searchIndex = repositories.sorted(by: repositorySortOrder)
+        hasLoadedSearchIndex = !searchIndex.isEmpty
+    }
+
+    private func insertIntoSearchIndex(_ repository: RepositorySummary) {
+        let updatedRepositories = (repositoriesForSearchIndex + [repository])
+            .uniqued(on: \.id)
+            .sorted(by: repositorySortOrder)
+        updateSearchIndex(with: updatedRepositories)
+    }
+
+    static func shouldRefreshSearchIndex(for query: String) -> Bool {
+        query.trimmingCharacters(in: .whitespacesAndNewlines).count >= Self.minimumRemoteSearchLength
+    }
+
+    static func filterRepositories(_ repositories: [RepositorySummary], matching query: String) -> [RepositorySummary] {
+        let lowercasedQuery = query.lowercased()
+        return repositories.filter { repo in
+            repo.name.lowercased().contains(lowercasedQuery) ||
+            repo.description?.lowercased().contains(lowercasedQuery) ?? false
+        }
+    }
+}
+
+private extension Array {
+    func uniqued<ID: Hashable>(on keyPath: KeyPath<Element, ID>) -> [Element] {
+        var seenIDs: Set<ID> = []
+        return filter { element in
+            seenIDs.insert(element[keyPath: keyPath]).inserted
+        }
+    }
 }
diff --git a/HutchTests/RepositoryListViewModelTests.swift b/HutchTests/RepositoryListViewModelTests.swift
new file mode 100644
index 0000000..d6e76bf
--- /dev/null
+++ b/HutchTests/RepositoryListViewModelTests.swift
@@ -0,0 +1,50 @@
+import Foundation
+import Testing
+@testable import Hutch
+
+struct RepositoryListViewModelTests {
+
+    @Test
+    @MainActor
+    func searchIndexRefreshRequiresMinimumQueryLength() {
+        #expect(RepositoryListViewModel.shouldRefreshSearchIndex(for: "ab") == false)
+        #expect(RepositoryListViewModel.shouldRefreshSearchIndex(for: "abc") == true)
+        #expect(RepositoryListViewModel.shouldRefreshSearchIndex(for: "  abc  ") == true)
+    }
+
+    @Test
+    @MainActor
+    func filterRepositoriesMatchesNameAndDescriptionLocally() {
+        let repositories = [
+            makeRepository(id: 1, service: .git, name: "Hutch", description: "SourceHut client"),
+            makeRepository(id: 2, service: .hg, name: "Mail", description: "patch queue"),
+            makeRepository(id: 3, service: .git, name: "Tree", description: nil)
+        ]
+
+        let nameMatches = RepositoryListViewModel.filterRepositories(repositories, matching: "hut")
+        let descriptionMatches = RepositoryListViewModel.filterRepositories(repositories, matching: "patch")
+
+        #expect(nameMatches.map(\.id) == [1])
+        #expect(descriptionMatches.map(\.id) == [2])
+    }
+
+    @MainActor
+    private func makeRepository(
+        id: Int,
+        service: SRHTService,
+        name: String,
+        description: String?
+    ) -> RepositorySummary {
+        RepositorySummary(
+            id: id,
+            rid: "rid-\(id)",
+            service: service,
+            name: name,
+            description: description,
+            visibility: .public,
+            updated: Date(timeIntervalSince1970: TimeInterval(id)),
+            owner: Entity(canonicalName: "~owner"),
+            head: Reference(name: "main", target: nil)
+        )
+    }
+}