Improves error handling when fetching multiple sources

Fetching sources is no longer all or nothing. Now if a source cannot be fetched, it won’t prevent other sources from being updated.

AltStore/Model/AppPermission.swift

@@ -67,15 +67,25 @@ class AppPermission: NSManagedObject, Decodable, Fetchable
     {
         guard let context = decoder.managedObjectContext else { preconditionFailure("Decoder must have non-nil NSManagedObjectContext.") }
         
-        super.init(entity: AppPermission.entity(), insertInto: nil)
+        super.init(entity: AppPermission.entity(), insertInto: context)
         
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.usageDescription = try container.decode(String.self, forKey: .usageDescription)
-        
-        let rawType = try container.decode(String.self, forKey: .type)
-        self.type = ALTAppPermissionType(rawValue: rawType)
-        
-        context.insert(self)
+        do
+        {
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            self.usageDescription = try container.decode(String.self, forKey: .usageDescription)
+            
+            let rawType = try container.decode(String.self, forKey: .type)
+            self.type = ALTAppPermissionType(rawValue: rawType)
+        }
+        catch
+        {
+            if let context = self.managedObjectContext
+            {
+                context.delete(self)
+            }
+            
+            throw error
+        }
     }
 }
 

AltStore/Model/Source.swift

@@ -88,52 +88,60 @@ class Source: NSManagedObject, Fetchable, Decodable
         guard let context = decoder.managedObjectContext else { preconditionFailure("Decoder must have non-nil NSManagedObjectContext.") }
         guard let sourceURL = decoder.sourceURL else { preconditionFailure("Decoder must have non-nil sourceURL.") }
         
-        super.init(entity: Source.entity(), insertInto: nil)
+        super.init(entity: Source.entity(), insertInto: context)
         
-        self.sourceURL = sourceURL
-        
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.name = try container.decode(String.self, forKey: .name)
-        self.identifier = try container.decode(String.self, forKey: .identifier)
-        
-        let userInfo = try container.decodeIfPresent([String: String].self, forKey: .userInfo)
-        self.userInfo = userInfo?.reduce(into: [:]) { $0[ALTSourceUserInfoKey($1.key)] = $1.value }
-        
-        let apps = try container.decodeIfPresent([StoreApp].self, forKey: .apps) ?? []
-        let appsByID = Dictionary(apps.map { ($0.bundleIdentifier, $0) }, uniquingKeysWith: { (a, b) in return a })
-        
-        for (index, app) in apps.enumerated()
+        do
         {
-            app.sourceIdentifier = self.identifier
-            app.sortIndex = Int32(index)
-        }
-        
-        let newsItems = try container.decodeIfPresent([NewsItem].self, forKey: .news) ?? []
-        for (index, item) in newsItems.enumerated()
-        {
-            item.sourceIdentifier = self.identifier
-            item.sortIndex = Int32(index)
-        }
-        
-        context.insert(self)
-                
-        for newsItem in newsItems
-        {            
-            guard let appID = newsItem.appID else { continue }
+            self.sourceURL = sourceURL
             
-            if let storeApp = appsByID[appID]
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            self.name = try container.decode(String.self, forKey: .name)
+            self.identifier = try container.decode(String.self, forKey: .identifier)
+            
+            let userInfo = try container.decodeIfPresent([String: String].self, forKey: .userInfo)
+            self.userInfo = userInfo?.reduce(into: [:]) { $0[ALTSourceUserInfoKey($1.key)] = $1.value }
+            
+            let apps = try container.decodeIfPresent([StoreApp].self, forKey: .apps) ?? []
+            let appsByID = Dictionary(apps.map { ($0.bundleIdentifier, $0) }, uniquingKeysWith: { (a, b) in return a })
+            
+            for (index, app) in apps.enumerated()
             {
-                newsItem.storeApp = storeApp
+                app.sourceIdentifier = self.identifier
+                app.sortIndex = Int32(index)
             }
-            else
+            self._apps = NSMutableOrderedSet(array: apps)
+            
+            let newsItems = try container.decodeIfPresent([NewsItem].self, forKey: .news) ?? []
+            for (index, item) in newsItems.enumerated()
             {
-                newsItem.storeApp = nil
+                item.sourceIdentifier = self.identifier
+                item.sortIndex = Int32(index)
             }
+                                
+            for newsItem in newsItems
+            {
+                guard let appID = newsItem.appID else { continue }
+                
+                if let storeApp = appsByID[appID]
+                {
+                    newsItem.storeApp = storeApp
+                }
+                else
+                {
+                    newsItem.storeApp = nil
+                }
+            }
+            self._newsItems = NSMutableOrderedSet(array: newsItems)
+        }
+        catch
+        {
+            if let context = self.managedObjectContext
+            {
+                context.delete(self)
+            }
+            
+            throw error
         }
-        
-        // Must assign after we're inserted into context.
-        self._apps = NSMutableOrderedSet(array: apps)
-        self._newsItems = NSMutableOrderedSet(array: newsItems)
     }
 }
 

AltStore/Model/StoreApp.swift

@@ -104,43 +104,52 @@ class StoreApp: NSManagedObject, Decodable, Fetchable
     {
         guard let context = decoder.managedObjectContext else { preconditionFailure("Decoder must have non-nil NSManagedObjectContext.") }
         
-        super.init(entity: StoreApp.entity(), insertInto: nil)
+        // Must initialize with context in order for child context saves to work correctly.
+        super.init(entity: StoreApp.entity(), insertInto: context)
         
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.name = try container.decode(String.self, forKey: .name)
-        self.bundleIdentifier = try container.decode(String.self, forKey: .bundleIdentifier)
-        self.developerName = try container.decode(String.self, forKey: .developerName)
-        self.localizedDescription = try container.decode(String.self, forKey: .localizedDescription)
-        
-        self.subtitle = try container.decodeIfPresent(String.self, forKey: .subtitle)
-        
-        self.version = try container.decode(String.self, forKey: .version)
-        self.versionDate = try container.decode(Date.self, forKey: .versionDate)
-        self.versionDescription = try container.decodeIfPresent(String.self, forKey: .versionDescription)
-        
-        self.iconURL = try container.decode(URL.self, forKey: .iconURL)
-        self.screenshotURLs = try container.decodeIfPresent([URL].self, forKey: .screenshotURLs) ?? []
-        
-        self.downloadURL = try container.decode(URL.self, forKey: .downloadURL)
-        
-        if let tintColorHex = try container.decodeIfPresent(String.self, forKey: .tintColor)
+        do
         {
-            guard let tintColor = UIColor(hexString: tintColorHex) else {
-                throw DecodingError.dataCorruptedError(forKey: .tintColor, in: container, debugDescription: "Hex code is invalid.")
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            self.name = try container.decode(String.self, forKey: .name)
+            self.bundleIdentifier = try container.decode(String.self, forKey: .bundleIdentifier)
+            self.developerName = try container.decode(String.self, forKey: .developerName)
+            self.localizedDescription = try container.decode(String.self, forKey: .localizedDescription)
+            
+            self.subtitle = try container.decodeIfPresent(String.self, forKey: .subtitle)
+            
+            self.version = try container.decode(String.self, forKey: .version)
+            self.versionDate = try container.decode(Date.self, forKey: .versionDate)
+            self.versionDescription = try container.decodeIfPresent(String.self, forKey: .versionDescription)
+            
+            self.iconURL = try container.decode(URL.self, forKey: .iconURL)
+            self.screenshotURLs = try container.decodeIfPresent([URL].self, forKey: .screenshotURLs) ?? []
+            
+            self.downloadURL = try container.decode(URL.self, forKey: .downloadURL)
+            
+            if let tintColorHex = try container.decodeIfPresent(String.self, forKey: .tintColor)
+            {
+                guard let tintColor = UIColor(hexString: tintColorHex) else {
+                    throw DecodingError.dataCorruptedError(forKey: .tintColor, in: container, debugDescription: "Hex code is invalid.")
+                }
+                
+                self.tintColor = tintColor
             }
             
-            self.tintColor = tintColor
+            self.size = try container.decode(Int32.self, forKey: .size)
+            self.isBeta = try container.decodeIfPresent(Bool.self, forKey: .isBeta) ?? false
+            
+            let permissions = try container.decodeIfPresent([AppPermission].self, forKey: .permissions) ?? []
+            self._permissions = NSOrderedSet(array: permissions)
+        }
+        catch
+        {
+            if let context = self.managedObjectContext
+            {
+                context.delete(self)
+            }
+            
+            throw error
         }
-        
-        self.size = try container.decode(Int32.self, forKey: .size)
-        self.isBeta = try container.decodeIfPresent(Bool.self, forKey: .isBeta) ?? false
-        
-        let permissions = try container.decodeIfPresent([AppPermission].self, forKey: .permissions) ?? []
-        
-        context.insert(self)
-        
-        // Must assign after we're inserted into context.
-        self._permissions = NSOrderedSet(array: permissions)
     }
 }