wip implement search

Spottie/Backend/HTTPClient.swift

@@ -9,15 +9,24 @@ import Foundation
 import Combine
 
 struct HTTPClient {
+    enum APIError: Error {
+        case unknown
+        case contentTypeError
+    }
+
     struct Response<T> {
-        let value: T?
+        let value: T
         let response: URLResponse
     }
 
     func run<T: Decodable>(_ request: URLRequest, _ decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher<Response<T>, Error> {
         return URLSession.shared
             .dataTaskPublisher(for: request)
             .tryMap { result -> Response<T> in
+                if T.self == Nothing.self {
+                    return Response(value: Nothing() as! T, response: result.response)
+                }
+
                 let response = result.response as! HTTPURLResponse
                 let contentType = response.allHeaderFields["Content-Type"] as? String
 
@@ -27,10 +36,16 @@ struct HTTPClient {
                         return Response(value: value, response: result.response)
                     }
                 }
-
-                return Response(value: nil, response: result.response)
+                
+                throw APIError.contentTypeError
             }
             .receive(on: DispatchQueue.main)
             .eraseToAnyPublisher()
     }
+
+    func runWithoutDecoding(_ request: URLRequest) -> AnyPublisher<Never, URLError> {
+        return URLSession.shared.dataTaskPublisher(for: request)
+            .ignoreOutput()
+            .eraseToAnyPublisher()
+    }
 }

Spottie/Backend/SpotifyAPI.swift

@@ -105,7 +105,7 @@ extension SpotifyAPI {
         return client.run(req).map(\.value).eraseToAnyPublisher()
     }
 
-    static func getPersonalizedRecommendations() -> AnyPublisher<PersonalizedRecommendationsResponse?, Error> {
+    static func getPersonalizedRecommendations() -> AnyPublisher<RecommendationsResponse?, Error> {
         // get the current date
         let date = Date()
         let formatter = ISO8601DateFormatter()
@@ -137,9 +137,9 @@ extension SpotifyAPI {
         return client.run(req, decoder).map(\.value).eraseToAnyPublisher()
     }
 
-    static func search() -> AnyPublisher<SearchResultsResponse, Error> {
+    static func search(_ term: String) -> AnyPublisher<SearchResultsResponse?, Error> {
         let queryItems = [
-            URLQueryItem(name: "q", value: "akmu"),
+            URLQueryItem(name: "q", value: term),
             URLQueryItem(name: "type", value: "album,artist,playlist,track"),
             URLQueryItem(name: "market", value: "from_token")
         ]
@@ -155,6 +155,6 @@ extension SpotifyAPI {
         let decoder = JSONDecoder()
         decoder.keyDecodingStrategy = .convertFromSnakeCase;
 
-        return client.run(req, decoder).map(\.value).eraseToAnyPublisher()
+        return client.run(req, decoder).map(\.value).print().eraseToAnyPublisher()
     }
 }

Spottie/Backend/Types/API/SearchResultsResponse.swift

@@ -9,7 +9,7 @@ import Foundation
 
 struct SearchResultsResponse: Decodable {
     let albums: WebAPIPagingObject<WebAPISimplifiedAlbumObject>
-    let artists: WebAPIPagingObject<WebAPISimplifiedAlbumObject>
+    let artists: WebAPIPagingObject<WebAPISimplifiedArtistObject>
     let tracks: WebAPIPagingObject<WebAPITrackObject>
     let playlists: WebAPIPagingObject<WebAPIPlaylistObject>
 }

Spottie/Backend/Types/WebAPI/WebAPIPagingObject.swift

@@ -13,6 +13,6 @@ struct WebAPIPagingObject<T: Decodable>: Decodable {
     let limit: Int
     let offset: Int
     let total: Int
-    let next: String
-    let previous: String
+    let next: String?
+    let previous: String?
 }

Spottie/Views/ContentView.swift

@@ -13,7 +13,6 @@ enum Screen: Hashable {
 
 struct ContentView<M: PlayerStateProtocol>: View {
     @State var screen: Screen? = .home
-    @State var searchText = ""
 
     var body: some View {
         VStack {
@@ -25,12 +24,6 @@ struct ContentView<M: PlayerStateProtocol>: View {
                 .frame(height: 66)
                 .padding()
         }
-        .toolbar {
-            ToolbarItem {
-                SearchField(search: $searchText)
-                    .frame(minWidth: 100, idealWidth: 200, maxWidth: .infinity)
-            }
-        }
     }
 }
 

Spottie/Views/Home.swift

@@ -10,32 +10,57 @@ import Combine
 
 struct Home: View {
     @ObservedObject var viewModel: ViewModel = ViewModel()
+
+    // search
+    @State private var searchText = ""
+    private var relay = PassthroughSubject<String, Never>()
+    private var debouncedPublisher: AnyPublisher<String, Never>
+
+    init() {
+        self.debouncedPublisher = relay
+            .debounce(for: 0.5, scheduler: DispatchQueue.main)
+            .eraseToAnyPublisher()
+    }
+
     var body: some View {
         GeometryReader { reader in
             ScrollView(.vertical) {
-                LazyVStack(alignment: .leading) {
-                    ForEach(viewModel.recommendationGroups) { group in
-                        if group.id == "shortcuts" {
-                            ShortcutGrid(
-                                items: group.items,
-                                onItemPressed: viewModel.load
-                            )
-                                .padding()
-                        } else if group.items.count > 0 {
-                            let vm = CarouselRow.ViewModel.init(group,
-                                numberOfItemsToShow: numberOfItemsToShowInRow(reader)
-                            )
-
-                            CarouselRow(
-                                viewModel: vm,
-                                onItemPressed: viewModel.load
-                            )
-                                .padding()
+                if searchText.isEmpty {
+                    LazyVStack(alignment: .leading) {
+                        ForEach(viewModel.recommendationGroups) { group in
+                            if group.id == "shortcuts" {
+                                ShortcutGrid(
+                                    items: group.items,
+                                    onItemPressed: viewModel.load
+                                )
+                                    .padding()
+                            } else if group.items.count > 0 {
+                                let vm = CarouselRow.ViewModel.init(group,
+                                    numberOfItemsToShow: numberOfItemsToShowInRow(reader)
+                                )
+
+                                CarouselRow(
+                                    viewModel: vm,
+                                    onItemPressed: viewModel.load
+                                )
+                                    .padding()
+                            }
                         }
                     }
+                } else {
+                    Search(viewModel: Search.ViewModel(searchTermPublisher: debouncedPublisher))
                 }
             }
         }
+        .toolbar {
+            ToolbarItem {
+                SearchField(search: $searchText)
+                    .frame(minWidth: 100, idealWidth: 200, maxWidth: .infinity)
+            }
+        }
+        .onChange(of: searchText) { text in
+            relay.send(text)
+        }
     }
 
     func numberOfItemsToShowInRow(_ reader: GeometryProxy) -> Int {

Spottie/Views/Search.swift

@@ -6,15 +6,43 @@
 //
 
 import SwiftUI
+import Combine
 
 struct Search: View {
+    @StateObject var viewModel: ViewModel
     var body: some View {
-        Text("Hello Search")
+        ScrollView {
+            LazyVStack(alignment: .leading) {
+
+            }
+        }
+    }
+}
+
+extension Search {
+    // The trick to get updates as the NSSearchField is updated
+    // is to create a publisher from onChange of searchText
+    // https://rhonabwy.com/2021/02/07/integrating-swiftui-bindings-and-combine/
+    class ViewModel: ObservableObject {
+        @Published var results: SearchResultsResponse?
+
+        init(searchTermPublisher: AnyPublisher<String, Never>) {
+            searchTermPublisher
+                .debounce(for: 0.5, scheduler: DispatchQueue.main)
+                .map {
+                    SpotifyAPI.search($0)
+                        .replaceError(with: nil)
+                }
+                .switchToLatest()
+                .receive(on: DispatchQueue.main)
+                .assign(to: &$results)
+        }
     }
 }
 
 struct Search_Previews: PreviewProvider {
+    static let vm = Search.ViewModel(searchTermPublisher: Just("Hello").eraseToAnyPublisher())
     static var previews: some View {
-        Search()
+        Search(viewModel: vm)
     }
 }

Spottie/Views/Sidebar.swift

@@ -17,15 +17,7 @@ struct Sidebar: View {
                 tag: Screen.home,
                 selection: $state,
                 label: {
-                    Label("Home", systemImage: "house" )
-                }
-            )
-            NavigationLink(
-                destination: Search(),
-                tag: Screen.search,
-                selection: $state,
-                label: {
-                    Label("Search", systemImage: "magnifyingglass")
+                    Label("Home", systemImage: "house")
                 }
             )
             NavigationLink(
@@ -38,7 +30,6 @@ struct Sidebar: View {
             )
         }
         .listStyle(SidebarListStyle())
-        .navigationTitle("Spottie")
     }
 }