Hendrik Hogertz
7c824b492e
Network layer: - Replace static CookbookApi protocol with instance-based CookbookApiProtocol using async/throws instead of tuple returns - Refactor ApiRequest to use URLComponents for proper URL encoding, replace print statements with OSLog, and return typed NetworkError cases - Add structured NetworkError variants (httpError, connectionError, etc.) - Remove global cookbookApi constant in favor of injected dependency on AppState - Delete unused RecipeEditViewModel, RecipeScraper, and Scraper playground Data & model fixes: - Add custom Decodable for RecipeDetail with safe fallbacks for malformed JSON - Make Category Hashable/Equatable use only `name` so NavigationSplitView selection survives category refreshes with updated recipe_count - Return server-assigned ID from uploadRecipe so new recipes get their ID before the post-upload refresh block executes View updates: - Refresh both old and new category recipe lists after upload when category changes, mapping empty recipeCategory to "*" for uncategorized recipes - Raise deployment target to iOS 18, adopt new SwiftUI API conventions - Clean up alerts, onboarding views, and settings Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
48 lines
1.4 KiB
Swift
48 lines
1.4 KiB
Swift
//
|
|
// CookbookApi.swift
|
|
// Nextcloud Cookbook iOS Client
|
|
//
|
|
// Created by Vincent Meilinger on 13.11.23.
|
|
//
|
|
|
|
import Foundation
|
|
import OSLog
|
|
import UIKit
|
|
|
|
|
|
/// The Cookbook API version.
|
|
enum CookbookApiVersion: String {
|
|
case v1 = "v1"
|
|
}
|
|
|
|
|
|
/// A protocol defining common API endpoints for the Cookbook API.
|
|
protocol CookbookApiProtocol {
|
|
func importRecipe(url: String) async throws -> RecipeDetail
|
|
func getImage(id: Int, size: RecipeImage.RecipeImageSize) async throws -> UIImage?
|
|
func getRecipes() async throws -> [Recipe]
|
|
func createRecipe(_ recipe: RecipeDetail) async throws -> Int
|
|
func getRecipe(id: Int) async throws -> RecipeDetail
|
|
func updateRecipe(_ recipe: RecipeDetail) async throws -> Int
|
|
func deleteRecipe(id: Int) async throws
|
|
func getCategories() async throws -> [Category]
|
|
func getCategory(named: String) async throws -> [Recipe]
|
|
func renameCategory(named: String, to newName: String) async throws
|
|
func getTags() async throws -> [RecipeKeyword]
|
|
func getRecipesTagged(keyword: String) async throws -> [Recipe]
|
|
func searchRecipes(query: String) async throws -> [Recipe]
|
|
}
|
|
|
|
|
|
enum CookbookApiFactory {
|
|
static func makeClient(
|
|
version: CookbookApiVersion = UserSettings.shared.cookbookApiVersion,
|
|
settings: UserSettings = .shared
|
|
) -> CookbookApiProtocol {
|
|
switch version {
|
|
case .v1:
|
|
return CookbookApiClient(settings: settings)
|
|
}
|
|
}
|
|
}
|