renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle scenario where moved/copied feed already exists somewhere else in account

Browse Source
This commit is contained in:
Maurice Parker
2019-05-28 16:46:16 -05:00
parent 01d5a95241
commit 83652c40de
1 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift
View File

@@ -283,12 +283,23 @@ private extension SidebarOutlineDataSource {
return
}
destinationAccount.createFeed(url: feed.url, name: feed.editedName, container: destinationContainer) { result in
switch result {
case .success:
break
case .failure(let error):
NSApplication.shared.presentError(error)
if let existingFeed = destinationAccount.existingFeed(withURL: feed.url) {
destinationContainer.addFeed(existingFeed) { result in
switch result {
case .success:
break
case .failure(let error):
NSApplication.shared.presentError(error)
}
}
} else {
destinationAccount.createFeed(url: feed.url, name: feed.editedName, container: destinationContainer) { result in
switch result {
case .success:
break
case .failure(let error):
NSApplication.shared.presentError(error)
}
}
}
}
@@ -301,20 +312,42 @@ private extension SidebarOutlineDataSource {
return
}
destinationAccount.createFeed(url: feed.url, name: feed.editedName, container: destinationContainer) { result in
switch result {
case .success:
sourceAccount.deleteFeed(feed) { result in
switch result {
case .success:
break
case .failure(let error):
NSApplication.shared.presentError(error)
if let existingFeed = destinationAccount.existingFeed(withURL: feed.url) {
destinationContainer.addFeed(existingFeed) { result in
switch result {
case .success:
sourceAccount.deleteFeed(feed) { result in
switch result {
case .success:
break
case .failure(let error):
NSApplication.shared.presentError(error)
}
}
case .failure(let error):
NSApplication.shared.presentError(error)
}
case .failure(let error):
NSApplication.shared.presentError(error)
}
} else {
destinationAccount.createFeed(url: feed.url, name: feed.editedName, container: destinationContainer) { result in
switch result {
case .success:
sourceAccount.deleteFeed(feed) { result in
switch result {
case .success:
break
case .failure(let error):
NSApplication.shared.presentError(error)
}
}
case .failure(let error):
NSApplication.shared.presentError(error)
}
}
}
}