Basic Edit View and components
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// APIInterface.swift
|
||||
// APIController.swift
|
||||
// Nextcloud Cookbook iOS Client
|
||||
//
|
||||
// Created by Vincent Meilinger on 20.09.23.
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
import Foundation
|
||||
|
||||
class APIInterface {
|
||||
class APIController {
|
||||
var userSettings: UserSettings
|
||||
|
||||
var apiPath: String
|
||||
@@ -15,7 +15,7 @@ class APIInterface {
|
||||
let apiVersion = "1"
|
||||
|
||||
init(userSettings: UserSettings) {
|
||||
print("Initializing NetworkController.")
|
||||
print("Initializing APIController.")
|
||||
self.userSettings = userSettings
|
||||
|
||||
self.apiPath = "https://\(userSettings.serverAddress)/index.php/apps/cookbook/api/v\(apiVersion)/"
|
||||
@@ -24,7 +24,11 @@ class APIInterface {
|
||||
let loginData = loginString.data(using: String.Encoding.utf8)!
|
||||
self.authString = loginData.base64EncodedString()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
extension APIController {
|
||||
func imageDataFromServer(recipeId: Int, thumb: Bool) async -> Data? {
|
||||
do {
|
||||
let request = RequestWrapper.imageRequest(path: .IMAGE(recipeId: recipeId, thumb: thumb))
|
||||
@@ -43,9 +47,7 @@ class APIInterface {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
extension APIInterface {
|
||||
|
||||
func sendDataRequest<D: Decodable>(_ request: RequestWrapper) async -> (D?, Error?) {
|
||||
do {
|
||||
let (data, error) = try await NetworkHandler.sendHTTPRequest(
|
||||
@@ -49,7 +49,7 @@ struct NetworkHandler {
|
||||
request.httpBody = body
|
||||
}
|
||||
|
||||
print("Request:\nMethod: \(request.httpMethod)\nHeaders: \(request.allHTTPHeaderFields)\nBody: \(request.httpBody)")
|
||||
print("Request:\nMethod: \(request.httpMethod)\nPath: \(request.url?.absoluteString)\nHeaders: \(request.allHTTPHeaderFields)\nBody: \(request.httpBody)")
|
||||
|
||||
// Wait for and return data and (decoded) response
|
||||
var data: Data? = nil
|
||||
@@ -57,6 +57,7 @@ struct NetworkHandler {
|
||||
do {
|
||||
(data, response) = try await URLSession.shared.data(for: request)
|
||||
print("Response: ", response)
|
||||
print("Data: ", data?.description, data, String(data: data ?? Data(), encoding: .utf8))
|
||||
return (data, nil)
|
||||
} catch {
|
||||
return (nil, decodeURLResponse(response: response as? HTTPURLResponse))
|
||||
|
||||
Reference in New Issue
Block a user