Skip to content

Handle URLs with aliases in ExplodedArchive #441

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 2 commits into from
May 29, 2024
Merged

Handle URLs with aliases in ExplodedArchive #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc6c1fa
Handle URLs with aliases in `ExplodedArchive`
domkm May 28, 2024
29ca395
Merge branch 'develop' into url-aliases
mickael-menu May 29, 2024
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
5 changes: 2 additions & 3 deletions Sources/Shared/Toolkit/Archive/ExplodedArchive.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ final class ExplodedArchive: Archive, Loggable {
}

private init(file: FileURL) {
root = file
root = file.resolvingSymlinks()
}

lazy var entries: [ArchiveEntry] = {
Expand Down Expand Up @@ -52,7 +52,6 @@ final class ExplodedArchive: Archive, Loggable {

private func makeEntry(at url: FileURL) -> ArchiveEntry? {
guard
root.isParent(of: url),
let values = try? url.url.resourceValues(forKeys: [.fileSizeKey, .isDirectoryKey]),
let length = values.fileSize,
values.isDirectory != true
Expand All @@ -68,7 +67,7 @@ final class ExplodedArchive: Archive, Loggable {
}

private func entryURL(fromPath path: String) -> FileURL? {
let url = root.appendingPath(path, isDirectory: false)
let url = root.appendingPath(path, isDirectory: false).resolvingSymlinks()
guard
root.isParent(of: url)
else {
Expand Down
6 changes: 6 additions & 0 deletions Sources/Shared/Toolkit/URL/Absolute URL/FileURL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ public struct FileURL: AbsoluteURL, Hashable {
url.lastPathComponent
}

/// Returns new `FileURL` with symlinks resolved
// FIXME: Async
public func resolvingSymlinks() -> Self {
Self(url: url.resolvingSymlinksInPath())!
}

/// Returns whether the given `url` is `self` or one of its descendants.
public func isParent(of other: FileURL) -> Bool {
path == other.path || other.path.hasPrefix(path.addingSuffix("/"))
Expand Down