Improve Sources Manager

Author: NovaDev404

Sources/prostore/viewModelsAndHelpers/SourcesViewModel.swift

@@ -168,32 +168,53 @@ class SourcesViewModel: ObservableObject {
         editingSource = nil
         newSourceURL = ""
     }
+
+func validateSource(_ source: Source) {
+    validationStates[source.urlString] = .loading
 
-    func validateSource(_ source: Source) {
-        validationStates[source.urlString] = .loading
-        
-        guard let url = source.url else {
-            validationStates[source.urlString] = .invalid(NSError(domain: "Invalid URL", code: 0, userInfo: nil))
-            return
-        }
-        
-        var request = URLRequest(url: url)
-        request.setValue("AppTestersListView/1.0 (iOS)", forHTTPHeaderField: "User-Agent")
-        request.timeoutInterval = 10
-        
-        URLSession.shared.dataTask(with: request) { [weak self] data, response, error in
-            DispatchQueue.main.async {
-                if let error = error {
-                    self?.validationStates[source.urlString] = .invalid(error)
-                } else if let httpResponse = response as? HTTPURLResponse, !(200...299).contains(httpResponse.statusCode) {
-                    let error = NSError(domain: "HTTP Error", code: httpResponse.statusCode, userInfo: nil)
-                    self?.validationStates[source.urlString] = .invalid(error)
-                } else {
+    guard let url = source.url else {
+        validationStates[source.urlString] = .invalid(NSError(domain: "Invalid URL", code: 0, userInfo: nil))
+        return
+    }
+    
+    var request = URLRequest(url: url)
+    request.setValue("ProStore/1.0 (iOS)", forHTTPHeaderField: "User-Agent")
+    request.timeoutInterval = 10
+    
+    URLSession.shared.dataTask(with: request) { [weak self] data, response, error in
+        DispatchQueue.main.async {
+            if let error = error {
+                self?.validationStates[source.urlString] = .invalid(error)
+                return
+            }
+            
+            if let httpResponse = response as? HTTPURLResponse, !(200...299).contains(httpResponse.statusCode) {
+                let error = NSError(domain: "HTTP Error", code: httpResponse.statusCode, userInfo: nil)
+                self?.validationStates[source.urlString] = .invalid(error)
+                return
+            }
+            
+            guard let data = data else {
+                let error = NSError(domain: "No Data", code: 0, userInfo: nil)
+                self?.validationStates[source.urlString] = .invalid(error)
+                return
+            }
+            
+            do {
+                if let jsonObject = try JSONSerialization.jsonObject(with: data) as? [String: Any],
+                   let appsArray = jsonObject["apps"] as? [Any] {
+                    // Valid JSON and contains an "apps" array
                     self?.validationStates[source.urlString] = .valid
+                } else {
+                    let error = NSError(domain: "Invalid AltStore Source", code: 0, userInfo: [NSLocalizedDescriptionKey: "JSON does not contain an apps array"])
+                    self?.validationStates[source.urlString] = .invalid(error)
                 }
+            } catch {
+                self?.validationStates[source.urlString] = .invalid(error)
             }
-        }.resume()
-    }
+        }
+    }.resume()
+}
 
     func validateAllSources() {
         for source in sources {

Sources/prostore/views/AppsView.swift

@@ -265,7 +265,7 @@ final class RepoViewModel: ObservableObject {
         for url in sourceURLs {
             do {
                 var request = URLRequest(url: url)
-                request.setValue("AppTestersListView/1.0 (iOS)", forHTTPHeaderField: "User-Agent")
+                request.setValue("ProStore/1.0 (iOS)", forHTTPHeaderField: "User-Agent")
                 let (data, response) = try await URLSession.shared.data(for: request)
                 if let http = response as? HTTPURLResponse, !(200...299).contains(http.statusCode) {
                     throw NSError(domain: "RepoFetcher", code: http.statusCode, userInfo: [NSLocalizedDescriptionKey: "HTTP \(http.statusCode)"])

Sources/prostore/views/SourcesManagerView.swift

@@ -108,6 +108,12 @@ struct SourcesManagerView: View {
         .navigationTitle("Sources Manager")
         .navigationBarTitleDisplayMode(.inline)
         .toolbar {
+            ToolbarItem(placement: .navigationBarTrailing) {
+                Button("Load Defaults") {
+                    sourcesViewModel.addDefaultSourcesIfNeeded()
+                }
+            }
+            
             ToolbarItem(placement: .navigationBarTrailing) {
                 EditButton()
             }
@@ -119,12 +125,6 @@ struct SourcesManagerView: View {
                     Image(systemName: "arrow.clockwise")
                 }
             }
-            
-            ToolbarItem(placement: .navigationBarLeading) {
-                Button("Load Defaults") {
-                    sourcesViewModel.addDefaultSourcesIfNeeded()
-                }
-            }
         }
         .onAppear {
             sourcesViewModel.validateAllSources()