KCD
Fork

Fork Herkunft: kcd / KCD

R/O
HTTP
SSH
HTTPS

Commit

Commit MetaInfo

Revision	ba53abd2c86f70053cbffd4711c7a64ba4931138 (tree)
Zeit	2018-03-18 10:40:33
Autor	masakih <masakih@user...>
Commiter	masakih

Log Message

saveメソッドを一本化

Ändern Zusammenfassung

modified: KCD.xcodeproj/project.pbxproj (diff)
modified: KCD/BookmarkListViewController.swift (diff)
modified: KCD/BookmarkManager.swift (diff)
modified: KCD/CoreDataManager.swift (diff)
modified: KCD/GuardShelterCommand.swift (diff)
modified: KCD/HistoryTableViewController.swift (diff)
modified: KCD/JSONMapper.swift (diff)
modified: KCD/MapInfoCommand.swift (diff)

Diff

--- a/KCD.xcodeproj/project.pbxproj

+++ b/KCD.xcodeproj/project.pbxproj

		@@ -1153,13 +1153,13 @@
1153	1153	F4BEEEA818D88FF30006F70C /* CoreData */ = {
1154	1154	isa = PBXGroup;
1155	1155	children = (
1156		- F4BDEEB11E73FE2000D689AE /* Entity.swift */,
1157	1156	F4E471281E46ECF1009B5AF4 /* CoreDataCore.swift */,
1158		- F4C4A57E201464E300F8B732 /* CoreDataProviderExtension.swift */,
1159		- F4FF44D71FA21BF200039F21 /* CoreDataManager.swift */,
1160	1157	F44AA2661E814A4400EED8BE /* MOCGenerator.swift */,
	1158	+ F4BDEEB11E73FE2000D689AE /* Entity.swift */,
	1159	+ F4FF44D71FA21BF200039F21 /* CoreDataManager.swift */,
1161	1160	F481D63E1F9105CB007E2CBE /* Entities.swift */,
1162	1161	F4FC3E8D1E4368BB00E41228 /* KCManagedObject.swift */,
	1162	+ F4C4A57E201464E300F8B732 /* CoreDataProviderExtension.swift */,
1163	1163	F4F9F8911C6BA26400D0EE76 /* KCD */,
1164	1164	F4F9F8921C6BA28200D0EE76 /* Local */,
1165	1165	F4F9F8931C6BA29500D0EE76 /* Temporary */,

--- a/KCD/BookmarkListViewController.swift

+++ b/KCD/BookmarkListViewController.swift

		@@ -160,7 +160,7 @@ extension BookmarkListViewController: NSTableViewDelegate, NSTableViewDataSource
160	160	bookmark.order = targetOrder + $0.offset + 1
161	161	}
162	162
163		- store.save(errorHandler: store.presentOnMainThread)
	163	+ store.save()
164	164
165	165	self.bookmarkController.rearrangeObjects()
166	166	self.reorderingBoolmarks()

--- a/KCD/BookmarkManager.swift

+++ b/KCD/BookmarkManager.swift

		@@ -77,7 +77,7 @@ final class BookmarkManager: NSObject, NSMenuDelegate {
77	77	return nil
78	78	}
79	79
80		- editorStore.save(errorHandler: editorStore.presentOnMainThread)
	80	+ editorStore.save()
81	81
82	82	return new
83	83	}

--- a/KCD/CoreDataManager.swift

+++ b/KCD/CoreDataManager.swift

		@@ -30,8 +30,7 @@ protocol CoreDataProvider {
30	30
31	31	var context: NSManagedObjectContext { get }
32	32
33		- func save(errorHandler: (Error) -> Void)
34		- func save() throws
	33	+ func save(errorHandler: @escaping (Error) -> Void)
35	34	}
36	35
37	36	protocol CoreDataAccessor: CoreDataProvider {

		@@ -55,6 +54,21 @@ protocol CoreDataManager: CoreDataAccessor {
55	54	static func oneTimeEditor() -> Self
56	55	}
57	56
	57	+func presentOnMainThread(_ error: Error) {
	58	+
	59	+ if Thread.isMainThread {
	60	+
	61	+ NSApp.presentError(error)
	62	+
	63	+ } else {
	64	+
	65	+ DispatchQueue.main.sync {
	66	+
	67	+ _ = NSApp.presentError(error)
	68	+ }
	69	+ }
	70	+}
	71	+
58	72	// MARK: - Extension
59	73	extension CoreDataProvider {
60	74

		@@ -67,19 +81,7 @@ extension CoreDataProvider {
67	81	}
68	82	}
69	83
70		- func save(errorHandler: (Error) -> Void) {
71		-
72		- do {
73		-
74		- try save()
75		-
76		- } catch {
77		-
78		- errorHandler(error)
79		- }
80		- }
81		-
82		- func save() throws {
	84	+ func save(errorHandler: @escaping (Error) -> Void = presentOnMainThread) {
83	85
84	86	// parentを辿ってsaveしていく
85	87	func propagateSaveAsync(_ context: NSManagedObjectContext) {

		@@ -99,17 +101,16 @@ extension CoreDataProvider {
99	101
100	102	} catch {
101	103
102		- Logger.shared.log("Could not save context as \(error)")
	104	+ errorHandler(error)
103	105	}
104	106	}
105	107	}
106	108
107		- var caughtError: Error?
108	109	context.performAndWait {
109	110
110	111	guard context.commitEditing() else {
111	112
112		- caughtError = CoreDataError.couldNotSave("Unable to commit editing before saveing")
	113	+ errorHandler(CoreDataError.couldNotSave("Unable to commit editing before saveing"))
113	114	return
114	115	}
115	116

		@@ -123,28 +124,7 @@ extension CoreDataProvider {
123	124
124	125	} catch let error as NSError {
125	126
126		- caughtError = CoreDataError.couldNotSave(error.localizedDescription)
127		- return
128		- }
129		- }
130		-
131		- if let error = caughtError {
132		-
133		- throw error
134		- }
135		- }
136		-
137		- func presentOnMainThread(_ error: Error) {
138		-
139		- if Thread.isMainThread {
140		-
141		- NSApp.presentError(error)
142		-
143		- } else {
144		-
145		- DispatchQueue.main.sync {
146		-
147		- _ = NSApp.presentError(error)
	127	+ errorHandler(CoreDataError.couldNotSave(error.localizedDescription))
148	128	}
149	129	}
150	130	}

--- a/KCD/GuardShelterCommand.swift

+++ b/KCD/GuardShelterCommand.swift

		@@ -108,7 +108,7 @@ final class GuardShelterCommand: JSONCommand {
108	108	let store = TemporaryDataStore.oneTimeEditor()
109	109	store.sync {
110	110	store.notEnsuredGuardEscaped().forEach(store.delete)
111		- store.save(errorHandler: store.presentOnMainThread)
	111	+ store.save()
112	112	}
113	113	Thread.sleep(forTimeInterval: 0.1)
114	114	notify()

		@@ -119,7 +119,7 @@ final class GuardShelterCommand: JSONCommand {
119	119	let store = TemporaryDataStore.oneTimeEditor()
120	120	store.sync {
121	121	store.guardEscaped().forEach(store.delete)
122		- store.save(errorHandler: store.presentOnMainThread)
	122	+ store.save()
123	123	}
124	124	Thread.sleep(forTimeInterval: 0.1)
125	125	notify()

		@@ -130,7 +130,7 @@ final class GuardShelterCommand: JSONCommand {
130	130	let store = TemporaryDataStore.oneTimeEditor()
131	131	store.sync {
132	132	store.guardEscaped().forEach { $0.ensured = true }
133		- store.save(errorHandler: store.presentOnMainThread)
	133	+ store.save()
134	134	}
135	135	Thread.sleep(forTimeInterval: 0.1)
136	136	notify()

--- a/KCD/HistoryTableViewController.swift

+++ b/KCD/HistoryTableViewController.swift

		@@ -80,7 +80,7 @@ class HistoryTableViewController: NSViewController {
80	80	history.mark = !history.mark
81	81	}
82	82
83		- store.save(errorHandler: store.presentOnMainThread)
	83	+ store.save()
84	84	}
85	85	}
86	86

--- a/KCD/JSONMapper.swift

+++ b/KCD/JSONMapper.swift

		@@ -171,7 +171,7 @@ extension JSONMapper {
171	171	}
172	172
173	173	finishOperating()
174		- store.save(errorHandler: store.presentOnMainThread)
	174	+ store.save()
175	175	}
176	176
177	177	func commit() {

--- a/KCD/MapInfoCommand.swift

+++ b/KCD/MapInfoCommand.swift

		@@ -20,7 +20,7 @@ final class MapInfoCommand: JSONCommand {
20	20	let store = ServerDataStore.oneTimeEditor()
21	21	store.sync {
22	22	store.airBases().forEach(store.delete)
23		- store.save(errorHandler: store.presentOnMainThread)
	23	+ store.save()
24	24	}
25	25
26	26	AirBaseMapper(apiResponse).commit()

KCD Fork