Skip to content

Remove / prefix for exploded archive HREFs #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2024
Merged

Remove / prefix for exploded archive HREFs #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/Shared/Toolkit/Archive/ExplodedArchive.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ final class ExplodedArchive: Archive, Loggable {
}

return ArchiveEntry(
path: url.path.removingPrefix(root.path).addingPrefix("/"),
path: url.path.removingPrefix(root.path),
length: UInt64(length),
compressedLength: nil
)
Expand Down
28 changes: 14 additions & 14 deletions Tests/SharedTests/Toolkit/Archive/ExplodedArchiveTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ class ExplodedArchiveTests: XCTestCase {

func testGetNonExistingEntry() throws {
let archive = try ExplodedArchive.make(file: fixtures.url(for: "exploded")).get()
XCTAssertNil(archive.entry(at: "/unknown"))
XCTAssertNil(archive.entry(at: "unknown"))
}

func testGetFileEntry() throws {
let archive = try ExplodedArchive.make(file: fixtures.url(for: "exploded")).get()
XCTAssertEqual(
archive.entry(at: "/A folder/wasteland-cover.jpg"),
archive.entry(at: "A folder/wasteland-cover.jpg"),
ArchiveEntry(
path: "/A folder/wasteland-cover.jpg",
path: "A folder/wasteland-cover.jpg",
length: 103_477,
compressedLength: nil
)
Expand All @@ -41,21 +41,21 @@ class ExplodedArchiveTests: XCTestCase {

func testGetDirectoryEntryReturnsNil() throws {
let archive = try ExplodedArchive.make(file: fixtures.url(for: "exploded")).get()
XCTAssertNil(archive.entry(at: "/A folder"))
XCTAssertNil(archive.entry(at: "/A folder/"))
XCTAssertNil(archive.entry(at: "A folder"))
XCTAssertNil(archive.entry(at: "A folder/"))
}

func testGetEntries() throws {
let archive = try ExplodedArchive.make(file: fixtures.url(for: "exploded")).get()
// The entries are sorted by path.
XCTAssertEqual(archive.entries, [
ArchiveEntry(path: "/.hidden", length: 0, compressedLength: nil),
ArchiveEntry(path: "/A folder/Sub.folder%/file-compressed.txt", length: 29609, compressedLength: nil),
ArchiveEntry(path: "/A folder/Sub.folder%/file.txt", length: 20, compressedLength: nil),
ArchiveEntry(path: "/A folder/wasteland-cover.jpg", length: 103_477, compressedLength: nil),
ArchiveEntry(path: "/root.txt", length: 0, compressedLength: nil),
ArchiveEntry(path: "/uncompressed.jpg", length: 279_551, compressedLength: nil),
ArchiveEntry(path: "/uncompressed.txt", length: 30, compressedLength: nil),
ArchiveEntry(path: ".hidden", length: 0, compressedLength: nil),
ArchiveEntry(path: "A folder/Sub.folder%/file-compressed.txt", length: 29609, compressedLength: nil),
ArchiveEntry(path: "A folder/Sub.folder%/file.txt", length: 20, compressedLength: nil),
ArchiveEntry(path: "A folder/wasteland-cover.jpg", length: 103_477, compressedLength: nil),
ArchiveEntry(path: "root.txt", length: 0, compressedLength: nil),
ArchiveEntry(path: "uncompressed.jpg", length: 279_551, compressedLength: nil),
ArchiveEntry(path: "uncompressed.txt", length: 30, compressedLength: nil),
])
}

Expand All @@ -66,7 +66,7 @@ class ExplodedArchiveTests: XCTestCase {

func testReadFullEntry() throws {
let archive = try ExplodedArchive.make(file: fixtures.url(for: "exploded")).get()
let entry = try XCTUnwrap(archive.readEntry(at: "/A folder/Sub.folder%/file.txt"))
let entry = try XCTUnwrap(archive.readEntry(at: "A folder/Sub.folder%/file.txt"))
let data = try entry.read().get()
XCTAssertEqual(
String(data: data, encoding: .utf8),
Expand All @@ -76,7 +76,7 @@ class ExplodedArchiveTests: XCTestCase {

func testReadRange() throws {
let archive = try ExplodedArchive.make(file: fixtures.url(for: "exploded")).get()
let entry = try XCTUnwrap(archive.readEntry(at: "/A folder/Sub.folder%/file.txt"))
let entry = try XCTUnwrap(archive.readEntry(at: "A folder/Sub.folder%/file.txt"))
let data = try entry.read(range: 14 ..< 20).get()
XCTAssertEqual(
String(data: data, encoding: .utf8),
Expand Down