dnrops
/
CSV
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Data cell type to _CSVUnkeyedDecoder

This commit is contained in:
Caleb Kleveter 2018-05-08 15:36:04 -05:00
parent a8e61a3591
commit 5f0d4b39b1
No known key found for this signature in database
GPG Key ID: 30A5A6F3A0ED7EDA
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/CSV/Coder/Decoder/_CSVDecoder.swift
View File

@ -58,7 +58,7 @@ final class _CSVDecoder: Decoder {
debugDescription: "Cannot get CSV data as expected format '[String: [String?]]'")
)
}
return _CSVUnkeyedDecoder(columns: csv, path: self.codingPath)
return _CSVUnkeyedDecoder(columns: csv, path: self.codingPath, stringDecoding: self.stringDecoding)
}
func singleValueContainer() throws -> SingleValueDecodingContainer {
@ -75,7 +75,7 @@ final class _CSVDecoder: Decoder {
static func decode<T>(_ type: T.Type, from data: Data, stringDecoding: String.Encoding)throws -> [T] where T: Decodable {
let csv: [String: [Data?]] = try _CSVDecoder.organize(data, stringDecoding: stringDecoding)
let decoder = _CSVDecoder(csv: csv)
let decoder = _CSVDecoder(csv: csv, stringDecoding: stringDecoding)
return try Array<T>(from: decoder)
}

17
Sources/CSV/Coder/Decoder/_CSVUnKeyedDecoder.swift
View File

@ -4,13 +4,16 @@ final class _CSVUnkeyedDecoder: UnkeyedDecodingContainer {
let codingPath: [CodingKey]
let count: Int?
var currentIndex: Int
let columns: [String: [String?]]
let next: () -> [String: String]?
init(columns: [String: [String?]], path: CodingPath = []) {
let stringDecoding: String.Encoding
let columns: [String: [Data?]]
let next: () -> [String: Data]?
init(columns: [String: [Data?]], path: CodingPath = [], stringDecoding: String.Encoding) {
self.codingPath = path
self.count = columns.first?.value.count
self.currentIndex = 0
self.stringDecoding = stringDecoding
self.columns = columns
self.next = columns.makeRows()
}
@ -48,7 +51,7 @@ final class _CSVUnkeyedDecoder: UnkeyedDecodingContainer {
guard let row = next() else {
throw DecodingError.valueNotFound([String: String?].self, DecodingError.Context(codingPath: self.codingPath, debugDescription: "No row exists at the current index"))
}
let decoder = _CSVDecoder(row: row, path: self.codingPath)
let decoder = _CSVDecoder(row: row, path: self.codingPath, stringDecoding: stringDecoding)
return try T(from: decoder)
}
@ -77,12 +80,12 @@ final class _CSVUnkeyedDecoder: UnkeyedDecodingContainer {
}
}
extension Dictionary where Key == String, Value == Array<String?> {
public func makeRows() -> () -> [String: String]? {
extension Dictionary where Key == String, Value == Array<Data?> {
public func makeRows() -> () -> [String: Data]? {
guard let columnCount = self.first?.value.count else { return { return nil } }
var rowIndex = 0
func next() -> [String: String]? {
func next() -> [String: Data]? {
defer { rowIndex += 1 }
guard rowIndex < columnCount else { return nil }
return self.mapValues { $0[rowIndex] }.filter { $0.value != nil }.mapValues { $0! }