From 221565f604a8418a22bbbb5ddc2e033f8fb969fa Mon Sep 17 00:00:00 2001 From: Serg Date: Fri, 1 Jun 2018 13:39:26 +0700 Subject: [PATCH] fix #87: read any text encoding --- MTMR/ItemsParsing.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/MTMR/ItemsParsing.swift b/MTMR/ItemsParsing.swift index 32b55c6..4150c4a 100644 --- a/MTMR/ItemsParsing.swift +++ b/MTMR/ItemsParsing.swift @@ -429,7 +429,7 @@ struct Source: Decodable, SourceProtocol { return base64?.base64Data ?? inline?.data(using: .utf8) ?? filePath?.fileData } var string: String? { - return inline ?? self.data?.utf8string + return inline ?? filePath?.fileString } var image: NSImage? { return data?.image @@ -463,6 +463,12 @@ extension String { var fileData: Data? { return try? Data(contentsOf: URL(fileURLWithPath: self)) } + + var fileString: String? { + var encoding: String.Encoding = .utf8 + return try? String(contentsOfFile: self, usedEncoding: &encoding) + } + } extension Data { var utf8string: String? {