From 762e230200328dc38efa8abbcda523504f9a29f0 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Fri, 13 Sep 2019 10:48:04 -0500
Subject: [PATCH] Add file coordination for the OPML file

---
 Frameworks/Account/OPMLFile.swift | 54 ++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/Frameworks/Account/OPMLFile.swift b/Frameworks/Account/OPMLFile.swift
index fbf3fa32a..809599c33 100644
--- a/Frameworks/Account/OPMLFile.swift
+++ b/Frameworks/Account/OPMLFile.swift
@@ -22,12 +22,12 @@ final class OPMLFile: NSObject, NSFilePresenter {
 	}
 	
 	private var isLoading = false
-	private let filename: String
+	private let fileURL: URL
 	private let account: Account
 	private let operationQueue: OperationQueue
 	
 	var presentedItemURL: URL? {
-		return URL(fileURLWithPath: filename)
+		return fileURL
 	}
 	
 	var presentedItemOperationQueue: OperationQueue {
@@ -35,7 +35,7 @@ final class OPMLFile: NSObject, NSFilePresenter {
 	}
 	
 	init(filename: String, account: Account) {
-		self.filename = filename
+		self.fileURL = URL(fileURLWithPath: filename)
 		self.account = account
 		operationQueue = OperationQueue()
 		operationQueue.maxConcurrentOperationCount = 1
@@ -83,11 +83,20 @@ private extension OPMLFile {
 
 	func save() {
 		let opmlDocumentString = opmlDocument()
-		do {
-			let url = URL(fileURLWithPath: filename)
-			try opmlDocumentString.write(to: url, atomically: true, encoding: .utf8)
-		} catch let error as NSError {
-			os_log(.error, log: log, "Save to disk failed: %@.", error.localizedDescription)
+		
+		let errorPointer: NSErrorPointer = nil
+		let fileCoordinator = NSFileCoordinator(filePresenter: self)
+		
+		fileCoordinator.coordinate(writingItemAt: fileURL, options: .forReplacing, error: errorPointer, byAccessor: { writeURL in
+			do {
+				try opmlDocumentString.write(to: writeURL, atomically: true, encoding: .utf8)
+			} catch let error as NSError {
+				os_log(.error, log: log, "OPML save to disk failed: %@.", error.localizedDescription)
+			}
+		})
+		
+		if let error = errorPointer?.pointee {
+			os_log(.error, log: log, "OPML save to disk coordination failed: %@.", error.localizedDescription)
 		}
 	}
 	
@@ -102,22 +111,31 @@ private extension OPMLFile {
 	}
 
 	func parsedOPMLItems() -> [RSOPMLItem]? {
+
+		var fileData: Data? = nil
+		let errorPointer: NSErrorPointer = nil
+		let fileCoordinator = NSFileCoordinator(filePresenter: self)
 		
-		let opmlFileURL = URL(fileURLWithPath: filename)
-		var fileData: Data?
-		do {
-			fileData = try Data(contentsOf: opmlFileURL)
-		} catch {
-			// Commented out because it’s not an error on first run.
-			// TODO: make it so we know if it’s first run or not.
-			//NSApplication.shared.presentError(error)
-			return nil
+		fileCoordinator.coordinate(readingItemAt: fileURL, options: [], error: errorPointer, byAccessor: { readURL in
+			do {
+				fileData = try Data(contentsOf: readURL)
+			} catch {
+				// Commented out because it’s not an error on first run.
+				// TODO: make it so we know if it’s first run or not.
+				//NSApplication.shared.presentError(error)
+				os_log(.error, log: log, "OPML read from disk failed: %@.", error.localizedDescription)
+			}
+		})
+		
+		if let error = errorPointer?.pointee {
+			os_log(.error, log: log, "OPML read from disk coordination failed: %@.", error.localizedDescription)
 		}
+
 		guard let opmlData = fileData else {
 			return nil
 		}
 
-		let parserData = ParserData(url: opmlFileURL.absoluteString, data: opmlData)
+		let parserData = ParserData(url: fileURL.absoluteString, data: opmlData)
 		var opmlDocument: RSOPMLDocument?
 
 		do {