FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle when a feed in a folder being copied/moved already is subscribed in target account

This commit is contained in:
Maurice Parker 2019-05-30 14:44:13 -05:00
parent 30c21bb125
commit a8f090656d
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -492,14 +492,27 @@ private extension SidebarOutlineDataSource {
case .success(let destinationFolder): case .success(let destinationFolder):
let group = DispatchGroup() let group = DispatchGroup()
for feed in folder.topLevelFeeds { for feed in folder.topLevelFeeds {
group.enter() if let existingFeed = destinationAccount.existingFeed(withURL: feed.url) {
destinationAccount.createFeed(url: feed.url, name: feed.editedName, container: destinationFolder) { result in group.enter()
group.leave() destinationAccount.addFeed(existingFeed, to: destinationFolder) { result in
switch result { group.leave()
case .success: switch result {
break case .success:
case .failure(let error): break
NSApplication.shared.presentError(error) case .failure(let error):
NSApplication.shared.presentError(error)
}
}
} else {
group.enter()
destinationAccount.createFeed(url: feed.url, name: feed.editedName, container: destinationFolder) { result in
group.leave()
switch result {
case .success:
break
case .failure(let error):
NSApplication.shared.presentError(error)
}
} }
} }
} }
@ -508,6 +521,7 @@ private extension SidebarOutlineDataSource {
} }
case .failure(let error): case .failure(let error):
NSApplication.shared.presentError(error) NSApplication.shared.presentError(error)
completion()
} }
} }