Skip to content

Commit 55c9ac5

Browse files
CkitakishiCkitakishi
committed
Correct SwiftLint warnings
1 parent 3ce54eb commit 55c9ac5

File tree

4 files changed

+19
-25
lines changed

4 files changed

+19
-25
lines changed

‎Sources/ZIPFoundation/Archive+Writing.swift

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,10 @@ extension Archive {
123123
progress?.totalUnitCount = type == .directory ? defaultDirectoryUnitCount : Int64(uncompressedSize)
124124
let endOfCentralDirRecord = self.endOfCentralDirectoryRecord
125125
let zip64EOCD = self.zip64EndOfCentralDirectory
126-
let existingStartOfCD = self.offsetToStartOfCentralDirectory
127-
var startOfCDInt = Int(existingStartOfCD)
128-
fseek(self.archiveFile, startOfCDInt, SEEK_SET)
129-
let sizeOfCD = self.sizeOfCentralDirectory
130-
let existingCentralDirData = try Data.readChunk(of: sizeOfCD, from: self.archiveFile)
131-
fseek(self.archiveFile, startOfCDInt, SEEK_SET)
126+
var startOfCD = self.offsetToStartOfCentralDirectory
127+
fseek(self.archiveFile, startOfCD, SEEK_SET)
128+
let existingCentralDirData = try Data.readChunk(of: self.sizeOfCentralDirectory, from: self.archiveFile)
129+
fseek(self.archiveFile, startOfCD, SEEK_SET)
132130
let localFileHeaderStart = ftell(self.archiveFile)
133131
let modDateTime = modificationDate.fileModificationDateTime
134132
defer { fflush(self.archiveFile) }
@@ -141,15 +139,15 @@ extension Archive {
141139
let (written, checksum) = try self.writeEntry(uncompressedSize: uncompressedSize, type: type,
142140
compressionMethod: compressionMethod, bufferSize: bufferSize,
143141
progress: progress, provider: provider)
144-
startOfCDInt = ftell(self.archiveFile)
142+
startOfCD = ftell(self.archiveFile)
145143
// Local File Header
146144
// Write the local file header a second time. Now with compressedSize (if applicable) and a valid checksum.
147145
fseek(self.archiveFile, localFileHeaderStart, SEEK_SET)
148146
localFileHeader = try self.writeLocalFileHeader(path: path, compressionMethod: compressionMethod,
149147
size: (uncompressedSize, written),
150148
checksum: checksum, modificationDateTime: modDateTime)
151149
// Central Directory
152-
fseek(self.archiveFile, startOfCDInt, SEEK_SET)
150+
fseek(self.archiveFile, startOfCD, SEEK_SET)
153151
_ = try Data.write(chunk: existingCentralDirData, to: self.archiveFile)
154152
let permissions = permissions ?? (type == .directory ? defaultDirectoryPermissions : defaultFilePermissions)
155153
let externalAttributes = FileManager.externalFileAttributesForEntry(of: type, permissions: permissions)
@@ -159,7 +157,7 @@ extension Archive {
159157
// End of Central Directory Record (including Zip64 End of Central Directory Record/Locator)
160158
let startOfEOCDInt = ftell(self.archiveFile)
161159
let eocdStructure = try self.writeEndOfCentralDirectory(centralDirectoryStructure: centralDir,
162-
startOfCentralDirectory: startOfCDInt,
160+
startOfCentralDirectory: startOfCD,
163161
startOfEndOfCentralDirectory: startOfEOCDInt,
164162
operation: .add)
165163
(self.endOfCentralDirectoryRecord, self.zip64EndOfCentralDirectory) = eocdStructure

‎Sources/ZIPFoundation/Archive+Zip64.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import Foundation
1212

1313
/// The minimum version of zip64 format
14-
public let zip64Version = UInt16(45)
15-
let zip64EndOfCentralDirectoryRecordStructSignature = 0x06064b50
16-
let zip64EndOfCentralDirectoryLocatorStructSignature = 0x07064b50
14+
let zip64Version = UInt16(45)
15+
let zip64EOCDRecordStructSignature = 0x06064b50
16+
let zip64EOCDLocatorStructSignature = 0x07064b50
1717

1818
enum ExtraFieldHeaderID: UInt16 {
1919
case zip64ExtendedInformation = 0x0001
@@ -34,9 +34,9 @@ extension Archive {
3434
let record: Zip64EndOfCentralDirectoryRecord
3535
let locator: Zip64EndOfCentralDirectoryLocator
3636
}
37-
37+
3838
struct Zip64EndOfCentralDirectoryRecord: DataSerializable {
39-
let zip64EndOfCentralDirectorySignature = UInt32(zip64EndOfCentralDirectoryRecordStructSignature)
39+
let zip64EOCDRecordSignature = UInt32(zip64EOCDRecordStructSignature)
4040
let sizeOfZip64EndOfCentralDirectoryRecord: UInt
4141
let versionMadeBy: UInt16
4242
let versionNeededToExtract: UInt16
@@ -51,7 +51,7 @@ extension Archive {
5151
}
5252

5353
struct Zip64EndOfCentralDirectoryLocator: DataSerializable {
54-
let zip64EndOfCentralDirectoryLocatorSignature = UInt32(zip64EndOfCentralDirectoryLocatorStructSignature)
54+
let zip64EOCDLocatorSignature = UInt32(zip64EOCDLocatorStructSignature)
5555
let numberOfDiskWithZip64EOCDRecordStart: UInt32
5656
let relativeOffsetOfZip64EOCDRecord: Int
5757
let totalNumberOfDisk: UInt32
@@ -61,7 +61,7 @@ extension Archive {
6161

6262
extension Archive.Zip64EndOfCentralDirectoryRecord {
6363
var data: Data {
64-
var zip64EOCDRecordSignature = self.zip64EndOfCentralDirectorySignature
64+
var zip64EOCDRecordSignature = self.zip64EOCDRecordSignature
6565
var sizeOfZip64EOCDRecord = self.sizeOfZip64EndOfCentralDirectoryRecord
6666
var versionMadeBy = self.versionMadeBy
6767
var versionNeededToExtract = self.versionNeededToExtract
@@ -88,7 +88,7 @@ extension Archive.Zip64EndOfCentralDirectoryRecord {
8888

8989
init?(data: Data, additionalDataProvider provider: (Int) throws -> Data) {
9090
guard data.count == Archive.Zip64EndOfCentralDirectoryRecord.size else { return nil }
91-
guard data.scanValue(start: 0) == zip64EndOfCentralDirectorySignature else { return nil }
91+
guard data.scanValue(start: 0) == zip64EOCDRecordSignature else { return nil }
9292
self.sizeOfZip64EndOfCentralDirectoryRecord = data.scanValue(start: 4)
9393
self.versionMadeBy = data.scanValue(start: 12)
9494
self.versionNeededToExtract = data.scanValue(start: 14)
@@ -122,7 +122,7 @@ extension Archive.Zip64EndOfCentralDirectoryRecord {
122122

123123
extension Archive.Zip64EndOfCentralDirectoryLocator {
124124
var data: Data {
125-
var zip64EOCDLocatorSignature = self.zip64EndOfCentralDirectoryLocatorSignature
125+
var zip64EOCDLocatorSignature = self.zip64EOCDLocatorSignature
126126
var numberOfDiskWithZip64EOCD = self.numberOfDiskWithZip64EOCDRecordStart
127127
var offsetOfZip64EOCDRecord = self.relativeOffsetOfZip64EOCDRecord
128128
var totalNumberOfDisk = self.totalNumberOfDisk
@@ -136,7 +136,7 @@ extension Archive.Zip64EndOfCentralDirectoryLocator {
136136

137137
init?(data: Data, additionalDataProvider provider: (Int) throws -> Data) {
138138
guard data.count == Archive.Zip64EndOfCentralDirectoryLocator.size else { return nil }
139-
guard data.scanValue(start: 0) == zip64EndOfCentralDirectoryLocatorSignature else { return nil }
139+
guard data.scanValue(start: 0) == zip64EOCDLocatorSignature else { return nil }
140140
self.numberOfDiskWithZip64EOCDRecordStart = data.scanValue(start: 4)
141141
self.relativeOffsetOfZip64EOCDRecord = data.scanValue(start: 8)
142142
self.totalNumberOfDisk = data.scanValue(start: 16)

‎Sources/ZIPFoundation/Archive.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,8 @@ public final class Archive: Sequence {
6868
case invalidEntryPath
6969
/// Thrown when an `Entry` can't be stored in the archive with the proposed compression method.
7070
case invalidCompressionMethod
71-
/// Thrown when the uncompressed size exceeds `Int64.max`
72-
case invalidUncompressedSize
7371
/// Thrown when the size of central directory exceeds `Int.max`
7472
case invalidSizeOfCentralDirectory
75-
/// Thrown when the start of the central directory exceeds `Int.max`
76-
case invalidStartOfCentralDirectoryOffset
7773
/// Thrown when an archive does not contain the required End of Central Directory Record.
7874
case missingEndOfCentralDirectoryRecord
7975
/// Thrown when number of entries in central directory exceeds `UInt.max`

‎Tests/ZIPFoundationTests/ZIPFoundationWritingTests+Zip64.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ extension ZIPFoundationTests {
123123
do {
124124
let zip64EOCDSize = 56 + 20
125125
let zip64EOCDData = try readData(zip64EOCDSize)
126-
XCTAssertEqual(zip64EOCDData.scanValue(start: 0), UInt32(zip64EndOfCentralDirectoryRecordStructSignature))
126+
XCTAssertEqual(zip64EOCDData.scanValue(start: 0), UInt32(zip64EOCDRecordStructSignature))
127127
XCTAssertEqual(zip64EOCDData.scanValue(start: 4), UInt(44))
128128
XCTAssertEqual(zip64EOCDData.scanValue(start: 12), UInt16(789))
129129
XCTAssertEqual(zip64EOCDData.scanValue(start: 14), zip64Version)
@@ -133,7 +133,7 @@ extension ZIPFoundationTests {
133133
XCTAssertEqual(zip64EOCDData.scanValue(start: 32), UInt(1))
134134
XCTAssertEqual(zip64EOCDData.scanValue(start: 40), UInt(cdSize))
135135
XCTAssertEqual(zip64EOCDData.scanValue(start: 48), UInt(cdOffset))
136-
XCTAssertEqual(zip64EOCDData.scanValue(start: 56), UInt32(zip64EndOfCentralDirectoryLocatorStructSignature))
136+
XCTAssertEqual(zip64EOCDData.scanValue(start: 56), UInt32(zip64EOCDLocatorStructSignature))
137137
XCTAssertEqual(zip64EOCDData.scanValue(start: 60), UInt32(0))
138138
XCTAssertEqual(zip64EOCDData.scanValue(start: 64), UInt(zip64EOCDOffset))
139139
XCTAssertEqual(zip64EOCDData.scanValue(start: 72), UInt32(1))

0 commit comments

Comments
 (0)