dnrops
/
tuist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error handling

This commit is contained in:
Andrea Cipriani 2019-12-07 18:23:44 +01:00
parent c850e8d1e2
commit 8d22ef1dc2
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Sources/TuistKit/ContentHashing/ContentHashingError.swift
View File

@ -5,8 +5,8 @@ import TuistSupport
enum ContentHashingError: FatalError, Equatable {
case fileNotFound(AbsolutePath)
case checksumFileFailed(AbsolutePath)
case checksumStringFailed(String)
case fileHashingFailed(AbsolutePath)
case stringHashingFailed(String)
var type: ErrorType {
.abort
@ -15,11 +15,11 @@ enum ContentHashingError: FatalError, Equatable {
var description: String {
switch self {
case let .fileNotFound(path):
return "Couldn't find file at path \(path.pathString)."
case let .checksumFileFailed(path):
return "Couldn't calculate checksum for file at path \(path.pathString)."
case let .checksumStringFailed(string):
return "Couldn't calculate checksum for string \(string)."
return "Couldn't find file at path \(path.pathString) while hashing the target for caching."
case let .fileHashingFailed(path):
return "Couldn't calculate hash of file at path \(path.pathString) for caching."
case let .stringHashingFailed(string):
return "Couldn't calculate hash of string \(string) for caching."
}
}
@ -27,8 +27,10 @@ enum ContentHashingError: FatalError, Equatable {
switch (lhs, rhs) {
case let (.fileNotFound(lhsPath), .fileNotFound(rhsPath)):
return lhsPath == rhsPath
case let (.checksumFileFailed(lhsPath), .checksumFileFailed(rhsPath)):
case let (.fileHashingFailed(lhsPath), .fileHashingFailed(rhsPath)):
return lhsPath == rhsPath
case let (.stringHashingFailed(lhsPath), .stringHashingFailed(rhsPath)):
return lhsPath == rhsPath
default:
return false
}

4
Sources/TuistKit/ContentHashing/GraphContentHasher.swift
View File

@ -29,7 +29,7 @@ public final class GraphContentHasher: GraphContentHashing {
private func hashSources(of targetNode: TargetNode) throws -> String {
let hashes = try targetNode.target.sources.map(md5)
guard let joinedHash = hashes.joined().checksum(algorithm: .md5) else {
throw ContentHashingError.checksumStringFailed(hashes.joined())
throw ContentHashingError.stringHashingFailed(hashes.joined())
}
return joinedHash
}
@ -39,7 +39,7 @@ public final class GraphContentHasher: GraphContentHashing {
throw ContentHashingError.fileNotFound(source.path)
}
guard let checksum = sourceData.checksum(algorithm: .md5) else {
throw ContentHashingError.checksumFileFailed(source.path)
throw ContentHashingError.fileHashingFailed(source.path)
}
return checksum
}