toxblh/MTMR
1
0
Fork 0
mirror of https://github.com/Toxblh/MTMR.git synced 2026-01-11 01:18:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #90 from ReDetection/support-all-encodings

Browse Source 
Read any text encoding
This commit is contained in:
Anton Palgunov 2018-06-01 09:16:34 +01:00 committed by GitHub
commit ad70c034da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MTMR/ItemsParsing.swift
View File

@ -429,7 +429,7 @@ struct Source: Decodable, SourceProtocol {
return base64?.base64Data ?? inline?.data(using: .utf8) ?? filePath?.fileData return base64?.base64Data ?? inline?.data(using: .utf8) ?? filePath?.fileData
} }
var string: String? { var string: String? {
return inline ?? self.data?.utf8string return inline ?? filePath?.fileString
} }
var image: NSImage? { var image: NSImage? {
return data?.image return data?.image
@ -463,6 +463,12 @@ extension String {
var fileData: Data? { var fileData: Data? {
return try? Data(contentsOf: URL(fileURLWithPath: self)) return try? Data(contentsOf: URL(fileURLWithPath: self))
} }
var fileString: String? {
var encoding: String.Encoding = .utf8
return try? String(contentsOfFile: self, usedEncoding: &encoding)
}
} }
extension Data { extension Data {
var utf8string: String? { var utf8string: String? {