mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix array decode if it's nil

Browse Source
This commit is contained in:
panxi 2019-12-02 12:04:32 -05:00
parent 347fd9557d
commit 72758675dc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MVMCore/MVMCore/Models/Model/ModelRegistry.swift
View File

@ -65,13 +65,17 @@ extension KeyedDecodingContainer where Key: CodingKey {
public func decodeArrayIfPresent<C:CodingKey>(codingKey: KeyedDecodingContainer<K>.Key, typeCodingKey: C) throws -> [Model]? { public func decodeArrayIfPresent<C:CodingKey>(codingKey: KeyedDecodingContainer<K>.Key, typeCodingKey: C) throws -> [Model]? {
var unkeyedContainer: UnkeyedDecodingContainer?
var unkeyedContainer = try nestedUnkeyedContainer(forKey: codingKey) do {
unkeyedContainer = try nestedUnkeyedContainer(forKey: codingKey)
} catch {
return nil
}
var otherUnkeyedContainer = try nestedUnkeyedContainer(forKey: codingKey) var otherUnkeyedContainer = try nestedUnkeyedContainer(forKey: codingKey)
var attributes = [Model.Type]() var attributes = [Model.Type]()
while !unkeyedContainer.isAtEnd { while !unkeyedContainer!.isAtEnd {
let meta = try unkeyedContainer.nestedContainer(keyedBy: C.self) let meta = try unkeyedContainer!.nestedContainer(keyedBy: C.self)
guard let type = try meta.decodeIfPresent(String.self, forKey: typeCodingKey) else { guard let type = try meta.decodeIfPresent(String.self, forKey: typeCodingKey) else {
return nil return nil
} }