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

Extracted code for processing one stream, added multiUnarchive function to XZ.

Browse Source
This commit is contained in:
Timofey Solomko
2017-06-30 23:37:49 +03:00
parent 14ccd772af
commit 97c75543c8
1 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/XZArchive.swift
+44 -26
View File
@@ -67,7 +67,6 @@ public class XZArchive: Archive {
public static func unarchive(archive data: Data) throws -> Data {
/// Object with input data which supports convenient work with bit shifts.
var pointerData = DataWithPointer(data: data, bitOrder: .reversed)
var out: [UInt8] = []
// First, we should check footer magic bytes.
// If they are wrong, then file cannot be 'undamaged'.
@@ -94,6 +93,50 @@ public class XZArchive: Archive {
pointerData.index = 0
// streamLoop: while !pointerData.isAtTheEnd {
return try processStream(&pointerData)
// guard !pointerData.isAtTheEnd else { break streamLoop }
//
// // STREAM PADDING
// paddingBytes = 0
// while true {
// let byte = pointerData.alignedByte()
// if byte != 0 {
// if paddingBytes % 4 != 0 {
// throw XZError.wrongPadding
// } else {
// break
// }
// }
// if pointerData.isAtTheEnd {
// if byte != 0 || paddingBytes % 4 != 3 {
// throw XZError.wrongPadding
// } else {
// break streamLoop
// }
// }
// paddingBytes += 1
// }
// pointerData.index -= 1
// }
}
public static func multiUnarchive(archive data: Data) throws -> [Data] {
/// Object with input data which supports convenient work with bit shifts.
var pointerData = DataWithPointer(data: data, bitOrder: .reversed)
var result = [Data]()
while !pointerData.isAtTheEnd {
result.append(try processStream(&pointerData))
}
return result
}
private static func processStream(_ pointerData: inout DataWithPointer) throws -> Data {
var out: [UInt8] = []
// STREAM HEADER
let streamHeader = try processStreamHeader(&pointerData)
@@ -136,31 +179,6 @@ public class XZArchive: Archive {
// STREAM FOOTER
try processFooter(streamHeader, indexSize, &pointerData)
// guard !pointerData.isAtTheEnd else { break streamLoop }
//
// // STREAM PADDING
// paddingBytes = 0
// while true {
// let byte = pointerData.alignedByte()
// if byte != 0 {
// if paddingBytes % 4 != 0 {
// throw XZError.wrongPadding
// } else {
// break
// }
// }
// if pointerData.isAtTheEnd {
// if byte != 0 || paddingBytes % 4 != 3 {
// throw XZError.wrongPadding
// } else {
// break streamLoop
// }
// }
// paddingBytes += 1
// }
// pointerData.index -= 1
// }
return Data(bytes: out)
}