Skip to content

refactor: Move source file listing into a FileManager extension #310

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
jbmorley merged 1 commit into from
Jan 22, 2026
Merged

refactor: Move source file listing into a FileManager extension #310

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
42 changes: 11 additions & 31 deletions Sources/InContextCore/Builder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,36 +219,17 @@ public class Builder {

func importContent(session: Session) async throws {

let fileManager = FileManager.default

let task = session.startTask("Scanning files...")

// Note that Linux directory enumeration doesn't support loading the modification times, so we do that later.
let directoryEnumerator = fileManager.enumerator(at: site.contentURL,
includingPropertiesForKeys: [.nameKey, .isDirectoryKey],
options: [.skipsHiddenFiles])!
let sourceFiles = try FileManager.default.listFiles(at: site.contentURL)
task.success()

// TODO: Prune intermediates for deleted files.

let fileURLs = try await withTaskRunner(of: URL.self, concurrent: !serializeImport) { tasks in
while let enumeratorFileURL = directoryEnumerator.nextObject() as? URL {

// Get the file metadata.
let fileURL = enumeratorFileURL.relative(to: site.contentURL) // Ensure consistency between macOS and Linux.
let isDirectory = try fileURL.resourceValues(forKeys: [.isDirectoryKey]).isDirectory!
let contentModificationDate = try FileManager.default.modificationDateOfItem(at: fileURL)

// Ignore directories.
if isDirectory {
continue
}

let task = session.startTask("Importing '\(fileURL.relativePath)'...")
for file in sourceFiles {
let task = session.startTask("Importing '\(file.url.relativePath)'...")

// Get the handler for the file.
guard let handler = try self.site.handler(for: fileURL) else {
task.warning("Ignoring unsupported file '\(fileURL.relativePath)'.")
guard let handler = try self.site.handler(for: file.url) else {
task.warning("Ignoring unsupported file '\(file.url.relativePath)'.")
task.success(.skipped)
continue
}
Expand All @@ -263,29 +244,28 @@ public class Builder {
let handlerFingerprint = try handler.fingerprint()

// Check to see if the file already exists in the store and has a matching modification date.
if let status = try await self.store.status(for: fileURL.relativePath,
if let status = try await self.store.status(for: file.url.relativePath,
contentURL: self.site.contentURL) {

let fileModified = (status.contentModificationDate.millisecondsSinceReferenceDate !=
contentModificationDate.millisecondsSinceReferenceDate)
file.contentModificationDate.millisecondsSinceReferenceDate)
let differentImporterVersion = status.fingerprint != handlerFingerprint

if !fileModified && !differentImporterVersion {
task.debug("File unchanged")
task.success(.skipped)
return fileURL
return file.url
}

// Clean up the existing assets.
try await self.removeIntermediates(for: fileURL.relativePath,
try await self.removeIntermediates(for: file.url.relativePath,
filesURL: self.site.filesURL,
task: task)
}

task.debug("File new or changed; re-importing")

// Import the file.
let file = File(url: fileURL, contentModificationDate: contentModificationDate)
do {
// TODO: Inject the task into the process operation.
let result = try await handler.process(file: file, outputURL: self.site.filesURL)
Expand All @@ -295,10 +275,10 @@ public class Builder {
fingerprint: handlerFingerprint)
try await self.store.save(document: result.document, assets: result.assets, status: status)
task.success()
return fileURL
return file.url
} catch {
task.failure(error)
throw InContextError.importError(fileURL, error)
throw InContextError.importError(file.url, error)
}
}
}
Expand Down
27 changes: 27 additions & 0 deletions Sources/InContextCore/Extensions/FileManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,31 @@ public extension FileManager {
return fileExists && isDirectory.boolValue
}

func listFiles(at rootURL: URL) throws -> [File] {

// Note that Linux directory enumeration doesn't support loading the modification times, so we do that later.
let enumerator = enumerator(at: rootURL,
includingPropertiesForKeys: [.nameKey, .isDirectoryKey],
options: [.skipsHiddenFiles])!

var results: [File] = []
while let url = enumerator.nextObject() as? URL {

// Get the file metadata.
// N.B. The Linux directory enumerator can't generate relative URLs, so we do it manually on both platforms.
let fileURL = url.relative(to: rootURL)
let isDirectory = try url.resourceValues(forKeys: [.isDirectoryKey]).isDirectory!

// Ignore directories.
guard !isDirectory else {
continue
}

results.append(try File(url: fileURL))
}

return results
}


}
12 changes: 6 additions & 6 deletions Sources/InContextCore/File.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@

import Foundation

struct File {
public struct File {

var relativePath: String {
public var relativePath: String {
return url.relativePath
}

let url: URL
let contentModificationDate: Date
public let url: URL
public let contentModificationDate: Date

init(url: URL, contentModificationDate: Date) {
public init(url: URL, contentModificationDate: Date) {
self.url = url
self.contentModificationDate = contentModificationDate
}

init(url: URL) throws {
public init(url: URL) throws {
self.url = url
self.contentModificationDate = try FileManager.default.modificationDateOfItem(at: url)
}
Expand Down