GitHub/SWCompression
1
0
Fork 0
mirror of https://github.com/tsolomko/SWCompression.git synced 2026-06-23 14:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fileName and fileComment in CDEntries and LocalHeaders of ZIP are no longer Optionals.

Browse Source
This commit is contained in:
Timofey Solomko
2017-05-09 21:05:07 +03:00
parent 057e8158b0
commit b99f7101ac
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/ZipContainer.swift
+14 -8
View File
@@ -232,7 +232,7 @@ struct LocalHeader {
private(set) var compSize: UInt64
private(set) var uncompSize: UInt64
let fileName: String?
let fileName: String
init(_ pointerData: inout DataWithPointer) throws {
// Check signature.
@@ -256,8 +256,10 @@ struct LocalHeader {
let fileNameLength = pointerData.intFromAlignedBytes(count: 2)
let extraFieldLength = pointerData.intFromAlignedBytes(count: 2)
self.fileName = String(data: Data(bytes: pointerData.alignedBytes(count: fileNameLength)),
encoding: .utf8)
guard let fileName = String(data: Data(bytes: pointerData.alignedBytes(count: fileNameLength)),
encoding: .utf8)
else { throw ZipError.wrongTextField }
self.fileName = fileName
let extraFieldStart = pointerData.index
while pointerData.index - extraFieldStart < extraFieldLength {
@@ -322,7 +324,7 @@ struct CentralDirectoryEntry {
private(set) var compSize: UInt64
private(set) var uncompSize: UInt64
let fileName: String?
let fileName: String
let fileComment: String?
private(set) var diskNumberStart: UInt32
@@ -363,8 +365,10 @@ struct CentralDirectoryEntry {
self.offset = pointerData.uint64FromAlignedBytes(count: 4)
self.fileName = String(data: Data(bytes: pointerData.alignedBytes(count: fileNameLength)),
encoding: .utf8)
guard let fileName = String(data: Data(bytes: pointerData.alignedBytes(count: fileNameLength)),
encoding: .utf8)
else { throw ZipError.wrongTextField }
self.fileName = fileName
let extraFieldStart = pointerData.index
while pointerData.index - extraFieldStart < extraFieldLength {
@@ -392,8 +396,10 @@ struct CentralDirectoryEntry {
}
}
self.fileComment = String(data: Data(bytes: pointerData.alignedBytes(count: fileCommentLength)),
encoding: .utf8)
guard let fileComment = String(data: Data(bytes: pointerData.alignedBytes(count: fileNameLength)),
encoding: .utf8)
else { throw ZipError.wrongTextField }
self.fileComment = fileComment
// Let's check entry's values for consistency.
guard self.versionNeeded <= 45