Skip to content
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.

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

feat: Add String(contentsOf: FilePath ...) #3048

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
56 changes: 56 additions & 0 deletions Sources/NIOFileSystem/String+FileSystem.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
//===----------------------------------------------------------------------===//
//
// This source file is part of the SwiftNIO open source project
//
// Copyright (c) 2024 Apple Inc. and the SwiftNIO project authors
natikgadzhi marked this conversation as resolved.
Show resolved Hide resolved
natikgadzhi marked this conversation as resolved.
Show resolved Hide resolved
// Licensed under Apache License v2.0
//
// See LICENSE.txt for license information
// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
//
// SPDX-License-Identifier: Apache-2.0
//
//===----------------------------------------------------------------------===//

import NIOCore

@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
extension String {
/// Reads the contents of the file at the path into a String.
///
/// - Parameters:
/// - path: The path of the file to read.
/// - maximumSizeAllowed: The maximum size of file which can be read, in bytes, as a ``ByteCount``. If the file is larger than this, an error is thrown.
/// - fileSystem: The ``FileSystemProtocol`` instance to use to read the file.
///
/// - Throws: If the file is larger than `maximumSizeAllowed`, an ``FileSystemError.resourceExhausted`` error will be thrown.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DocC is unhappy with the FileSystemError.resourceExhausted here. I think you need to say that an error with code FileSystemError/Code-swift.struct/resourceExhausted is thrown.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL. Seems to work, pushing up now.

public init(
contentsOf path: FilePath,
maximumSizeAllowed: ByteCount,
fileSystem: some FileSystemProtocol
) async throws {
let byteBuffer = try await fileSystem.withFileHandle(forReadingAt: path) { handle in
try await handle.readToEnd(maximumSizeAllowed: maximumSizeAllowed)
}

self = Self(buffer: byteBuffer)
}

/// Reads the contents of the file at the path using ``FileSystem``.
///
/// - Parameters:
/// - path: The path of the file to read.
/// - maximumSizeAllowed: The maximum size of file which can be read, in bytes, as a ``ByteCount``. If the file is larger than this, an error is thrown.
///
/// - Throws: If the file is larger than `maximumSizeAllowed`, an ``FileSystemError.resourceExhausted`` error will be thrown.
public init(
contentsOf path: FilePath,
maximumSizeAllowed: ByteCount
) async throws {
self = try await Self(
contentsOf: path,
maximumSizeAllowed: maximumSizeAllowed,
fileSystem: .shared
)
}
}
27 changes: 27 additions & 0 deletions Tests/NIOFileSystemIntegrationTests/ConvenienceTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,31 @@ final class ConvenienceTests: XCTestCase {
let bytes = try await ByteBuffer(contentsOf: path, maximumSizeAllowed: .bytes(1024))
XCTAssertEqual(bytes, ByteBuffer(bytes: Array(0..<64)))
}

// MARK: - String + FileSystem

func testStringFromFullFile() async throws {
let path = try await Self.fs.temporaryFilePath()
try await "some text".write(toFileAt: path)

let string = try await String(contentsOf: path, maximumSizeAllowed: .bytes(1024))
XCTAssertEqual(string, "some text")
}

func testStringFromPartOfAFile() async throws {
let path = try await Self.fs.temporaryFilePath()
try await "some text".write(toFileAt: path)

await XCTAssertThrowsFileSystemErrorAsync {
try await String(contentsOf: path, maximumSizeAllowed: .bytes(4))
}
}

// MARK: - Array + FileSystem
func testArrayFromFullFile() async throws {
let path = try await Self.fs.temporaryFilePath()
try await Array("some text".utf8).write(toFileAt: path)
let array = try await Array(contentsOf: path, maximumSizeAllowed: .bytes(1024))
XCTAssertEqual(array, Array("some text".utf8))
}
}
Loading