Add TarExtendedHeader struct

This commit is contained in:
Timofey Solomko committed 2017-10-12 19:33:44 +03:00
1 parent c4258965ec
commit 47a5924109
2 files changed
+123

No files matched your search

+10
View File
@@ -108,6 +108,10 @@
062313651F33B4280070A574 /* test_empty_file.zip in Resources */ = {isa = PBXBuildFile; fileRef = 062313611F33B4280070A574 /* test_empty_file.zip */; };
062313661F33B4280070A574 /* test_win.zip in Resources */ = {isa = PBXBuildFile; fileRef = 062313621F33B4280070A574 /* test_win.zip */; };
062313681F33B4510070A574 /* test_win.7z in Resources */ = {isa = PBXBuildFile; fileRef = 062313671F33B4510070A574 /* test_win.7z */; };
062C1D7C1F8FCA9300917968 /* TarExtendedHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 062C1D7B1F8FCA9300917968 /* TarExtendedHeader.swift */; };
062C1D7D1F8FCA9300917968 /* TarExtendedHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 062C1D7B1F8FCA9300917968 /* TarExtendedHeader.swift */; };
062C1D7E1F8FCA9300917968 /* TarExtendedHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 062C1D7B1F8FCA9300917968 /* TarExtendedHeader.swift */; };
062C1D7F1F8FCA9300917968 /* TarExtendedHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 062C1D7B1F8FCA9300917968 /* TarExtendedHeader.swift */; };
0631CB061F81109E00A2E0AB /* Deflate+Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0631CB051F81109E00A2E0AB /* Deflate+Constants.swift */; };
0631CB071F81109E00A2E0AB /* Deflate+Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0631CB051F81109E00A2E0AB /* Deflate+Constants.swift */; };
0631CB081F81109E00A2E0AB /* Deflate+Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0631CB051F81109E00A2E0AB /* Deflate+Constants.swift */; };
@@ -470,6 +474,7 @@
062313611F33B4280070A574 /* test_empty_file.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = test_empty_file.zip; sourceTree = "<group>"; };
062313621F33B4280070A574 /* test_win.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = test_win.zip; sourceTree = "<group>"; };
062313671F33B4510070A574 /* test_win.7z */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_win.7z; sourceTree = "<group>"; };
062C1D7B1F8FCA9300917968 /* TarExtendedHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TarExtendedHeader.swift; sourceTree = "<group>"; };
0631CB051F81109E00A2E0AB /* Deflate+Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Deflate+Constants.swift"; sourceTree = "<group>"; };
063336B51F06F0B6009EC0A3 /* test_multi_pad.xz */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_multi_pad.xz; sourceTree = "<group>"; };
063336B61F06F0B6009EC0A3 /* test_multi.xz */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_multi.xz; sourceTree = "<group>"; };
@@ -963,6 +968,7 @@
06ADB2D81EBCEFA60053A188 /* TarContainer.swift */,
061C065B1F0E90E600832F0C /* TarEntry.swift */,
0656B8251F8A960700111605 /* TarEntryInfo.swift */,
062C1D7B1F8FCA9300917968 /* TarExtendedHeader.swift */,
061C06561F0E90C800832F0C /* TarError.swift */,
0651FEC11F8E2E9100C49646 /* ContainerEntryType+Tar.swift */,
0656B82A1F8A979A00111605 /* DataWithPointer+Tar.swift */,
@@ -1454,6 +1460,7 @@
06B689591F278815007C9316 /* 7zProperty.swift in Sources */,
061C06271F0E8A0300832F0C /* GzipError.swift in Sources */,
0620F4BF1F8E24AA001C9B7A /* Archive.swift in Sources */,
062C1D7D1F8FCA9300917968 /* TarExtendedHeader.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1539,6 +1546,7 @@
06B6895A1F278815007C9316 /* 7zProperty.swift in Sources */,
061C06281F0E8A0300832F0C /* GzipError.swift in Sources */,
0620F4C01F8E24AA001C9B7A /* Archive.swift in Sources */,
062C1D7E1F8FCA9300917968 /* TarExtendedHeader.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1624,6 +1632,7 @@
06B6895B1F278815007C9316 /* 7zProperty.swift in Sources */,
061C06291F0E8A0300832F0C /* GzipError.swift in Sources */,
0620F4C11F8E24AA001C9B7A /* Archive.swift in Sources */,
062C1D7F1F8FCA9300917968 /* TarExtendedHeader.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1709,6 +1718,7 @@
06B689581F278815007C9316 /* 7zProperty.swift in Sources */,
061C06261F0E8A0300832F0C /* GzipError.swift in Sources */,
0620F4BE1F8E24AA001C9B7A /* Archive.swift in Sources */,
062C1D7C1F8FCA9300917968 /* TarExtendedHeader.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
+113
View File
@@ -0,0 +1,113 @@
// Copyright (c) 2017 Timofey Solomko
// Licensed under MIT License
//
// See LICENSE for license information
import Foundation
struct TarExtendedHeader {
let atime: Date?
let charset: String?
let ctime: Date?
let mtime: Date?
let comment: String?
let gid: Int?
let gname: String?
// let hdrcharset: String? TODO:
let linkpath: String?
let path: String?
let size: Int?
let uid: Int?
let uname: String?
let unknownEntries: [String: String]
init?(_ data: Data) throws {
guard let headerString = String(data: data, encoding: .utf8)
else { return nil }
var atime: Date?
var charset: String?
var ctime: Date?
var mtime: Date?
var comment: String?
var gid: Int?
var gname: String?
// var hdrcharset: String? TODO:
var linkpath: String?
var path: String?
var size: Int?
var uid: Int?
var uname: String?
var unknownEntries = [String: String]()
let headerEntries = headerString.components(separatedBy: "\n")
for headerEntry in headerEntries {
guard !headerEntry.isEmpty
else { continue }
let headerEntrySplit = headerEntry.split(separator: " ", maxSplits: 1,
omittingEmptySubsequences: false)
guard Int(headerEntrySplit[0]) == headerEntry.count + 1
else { throw TarError.wrongPaxHeaderEntry }
let keywordValue = headerEntrySplit[1]
let keywordValueSplit = keywordValue.split(separator: "=", maxSplits: 1,
omittingEmptySubsequences: false)
switch keywordValueSplit[0] {
case "atime":
if let interval = Double(keywordValueSplit[1]) {
atime = Date(timeIntervalSince1970: interval)
}
case "charset":
charset = String(keywordValueSplit[1])
case "ctime":
if let interval = Double(keywordValueSplit[1]) {
ctime = Date(timeIntervalSince1970: interval)
}
case "mtime":
if let interval = Double(keywordValueSplit[1]) {
mtime = Date(timeIntervalSince1970: interval)
}
case "comment":
comment = String(keywordValueSplit[1])
case "gid":
gid = Int(keywordValueSplit[1])
case "gname":
gname = String(keywordValueSplit[1])
case "hdrcharset":
break // TODO:
case "linkpath":
linkpath = String(keywordValueSplit[1])
case "path":
path = String(keywordValueSplit[1])
case "size":
size = Int(keywordValueSplit[1])
case "uid":
uid = Int(keywordValueSplit[1])
case "uname":
uname = String(keywordValueSplit[1])
default:
unknownEntries[String(keywordValueSplit[0])] = String(keywordValueSplit[1])
}
}
self.atime = atime
self.charset = charset
self.ctime = ctime
self.mtime = mtime
self.comment = comment
self.gid = gid
self.gname = gname
// self.hdrcharset = TODO:
self.linkpath = linkpath
self.path = path
self.size = size
self.uid = uid
self.uname = uname
self.unknownEntries = unknownEntries
}
}