Skip to content

Fix issue that fileSize is nil on iOS #11

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
Jan 24, 2021
Merged

Fix issue that fileSize is nil on iOS #11

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
15 changes: 5 additions & 10 deletions Sources/OLEKit/OLEFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,35 +33,30 @@ public final class OLEFile {
guard FileManager.default.fileExists(atPath: path)
else { throw OLEError.fileDoesNotExist(path) }

let attributes = try FileManager.default.attributesOfItem(atPath: path)
// swiftlint:disable:next force_cast
let fileSize = attributes[FileAttributeKey.size] as! Int

guard let fileHandle = FileHandle(forReadingAtPath: path)
else { throw OLEError.fileNotAvailableForReading(path: path) }

let allData = fileHandle.readDataToEndOfFile()
fileHandle.seek(toFileOffset: UInt64(0))

try self.init(data: allData, fileSize: fileSize, path: path)
try self.init(data: allData, path: path)
}

#if os(iOS) || os(watchOS) || os(tvOS) || os(macOS)

public convenience init(_ fileWrapper: FileWrapper) throws {
let fileName = fileWrapper.filename ?? ""

guard
let data = fileWrapper.regularFileContents,
let fileSize = fileWrapper.fileAttributes[FileAttributeKey.size.rawValue] as? Int
guard let data = fileWrapper.regularFileContents
else { throw OLEError.fileDoesNotExist(fileName) }

try self.init(data: data, fileSize: fileSize, path: fileName)
try self.init(data: data, path: fileName)
}

#endif

private init(data: Data, fileSize: Int, path: String) throws {
private init(data: Data, path: String) throws {
let fileSize = data.count
guard fileSize >= 512
else { throw OLEError.incompleteHeader }

Expand Down