Removed Date extension (no longer needed)

Nextcloud Cookbook iOS Client.xcodeproj/project.pbxproj

@@ -31,7 +31,6 @@
 		A703226D2ABAF90D00D7C4ED /* APIController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A703226C2ABAF90D00D7C4ED /* APIController.swift */; };
 		A703226F2ABB1DD700D7C4ED /* ColorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A703226E2ABB1DD700D7C4ED /* ColorExtension.swift */; };
 		A70D7CA12AC73CA800D53DBF /* RecipeEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A70D7CA02AC73CA700D53DBF /* RecipeEditView.swift */; };
-		A70D7CA32AC74B3B00D53DBF /* DateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A70D7CA22AC74B3B00D53DBF /* DateExtension.swift */; };
 		A74D33BE2AF82AAE00D06555 /* SwiftSoup in Frameworks */ = {isa = PBXBuildFile; productRef = A74D33BD2AF82AAE00D06555 /* SwiftSoup */; };
 		A74D33C32AFCD1C300D06555 /* RecipeScraper.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74D33C22AFCD1C300D06555 /* RecipeScraper.swift */; };
 		A76B8A6F2ADFFA8800096CEC /* SupportedLanguage.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76B8A6E2ADFFA8800096CEC /* SupportedLanguage.swift */; };
@@ -87,7 +86,6 @@
 		A703226C2ABAF90D00D7C4ED /* APIController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIController.swift; sourceTree = "<group>"; };
 		A703226E2ABB1DD700D7C4ED /* ColorExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorExtension.swift; sourceTree = "<group>"; };
 		A70D7CA02AC73CA700D53DBF /* RecipeEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecipeEditView.swift; sourceTree = "<group>"; };
-		A70D7CA22AC74B3B00D53DBF /* DateExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateExtension.swift; sourceTree = "<group>"; };
 		A74D33BF2AF82CB500D06555 /* TestScraper.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = TestScraper.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		A74D33C22AFCD1C300D06555 /* RecipeScraper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecipeScraper.swift; sourceTree = "<group>"; };
 		A76B8A6E2ADFFA8800096CEC /* SupportedLanguage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportedLanguage.swift; sourceTree = "<group>"; };
@@ -238,7 +236,6 @@
 			isa = PBXGroup;
 			children = (
 				A70171B82AB399FB00064C43 /* DateFormatterExtension.swift */,
-				A70D7CA22AC74B3B00D53DBF /* DateExtension.swift */,
 				A70322692ABAF49800D7C4ED /* JSONCoderExtension.swift */,
 				A703226E2ABB1DD700D7C4ED /* ColorExtension.swift */,
 			);
@@ -402,7 +399,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				A70D7CA12AC73CA800D53DBF /* RecipeEditView.swift in Sources */,
-				A70D7CA32AC74B3B00D53DBF /* DateExtension.swift in Sources */,
 				A70171B12AB211DF00064C43 /* CustomError.swift in Sources */,
 				A76B8A712AE002AE00096CEC /* Alerts.swift in Sources */,
 				A70171C42AB4A31200064C43 /* DataStore.swift in Sources */,

Nextcloud Cookbook iOS Client/Extensions/DateExtension.swift

@@ -1,40 +0,0 @@
-//
-//  DateExtension.swift
-//  Nextcloud Cookbook iOS Client
-//
-//  Created by Vincent Meilinger on 29.09.23.
-//
-
-import Foundation
-
-extension Date {
-    static var zero: Date {
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat =  "HH:mm"
-        if let date = dateFormatter.date(from:"00:00") {
-            return date
-        } else {
-            return Date()
-        }
-    }
-    
-    static func toPTRepresentation(date: Date) -> String? {
-        // PT0H18M0S
-        let dateComponents = Calendar.current.dateComponents([.hour, .minute], from: date)
-        if let hour = dateComponents.hour, let minute = dateComponents.minute {
-            return "PT\(hour)H\(minute)M0S"
-        }
-        return nil
-    }
-    
-    static func fromPTRepresentation(_ representation: String) -> Date {
-        let (hour, minute) = DateFormatter.stringToComponents(duration: representation)
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat =  "HH:mm"
-        if let date = dateFormatter.date(from:"\(hour):\(minute)") {
-            return date
-        } else {
-            return Date()
-        }
-    }
-}

Nextcloud Cookbook iOS Client/RecipeImport/RecipeScraper.swift

@@ -9,7 +9,7 @@ import Foundation
 import SwiftSoup
 
 class RecipeScraper {
-    func scrape(url: String) throws -> RecipeDetail? {
+    func scrape(url: String) async throws -> RecipeDetail? {
         var contents: String? = nil
         if let url = URL(string: url) {
             do {
@@ -107,7 +107,18 @@ class RecipeScraper {
                 entries.append(text)
             }
             return entries
+        } else if let text = dict[key] as? String {
+            return [text]
         }
         return []
     }
+    
+    private func joinedStringForKey(_ key: String, dict: Dictionary<String, Any>) -> String {
+        if let value = dict[key] as? [String] {
+            return value.joined(separator: ",")
+        } else if let value = dict[key] as? String {
+            return value
+        }
+        return ""
+    }
 }

Nextcloud Cookbook iOS Client/Views/RecipeEditView.swift

@@ -85,12 +85,14 @@ struct RecipeEditView: View {
                         Section {
                             TextField("URL (e.g. example.com/recipe)", text: $importURL)
                                 .onSubmit {
-                                    do {
+                                    Task {
-                                        if let recipe = try RecipeScraper().scrape(url: importURL) {
+                                        do {
-                                            self.recipe = recipe
+                                            if let recipe = try await RecipeScraper().scrape(url: importURL) {
+                                                self.recipe = recipe
+                                            }
+                                        } catch {
+                                            print("Error")
                                         }
-                                    } catch {
-                                        print("Error")
                                     }
                                 }
                         } header: {