FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug where empty folders would be lost between runs of the app.

Browse Source
This commit is contained in:
Brent Simmons 2019-01-27 21:42:58 -08:00
parent 75199d2546
commit f5d6e7e8fa
1 changed files with 6 additions and 8 deletions

10
Frameworks/Account/Account.swift

@ -762,22 +762,20 @@ private extension Account {
return return
} }
guard item.isFolder, let itemChildren = item.children else {
return
}
// TODO: possibly support sub folders.
guard let folderName = item.titleFromAttributes else { guard let folderName = item.titleFromAttributes else {
// Folder doesn’t have a name, so it won’t be created, and its items will go one level up. // Folder doesn’t have a name, so it won’t be created, and its items will go one level up.
if let itemChildren = item.children {
importOPMLItems(itemChildren, parentFolder: parentFolder) importOPMLItems(itemChildren, parentFolder: parentFolder)
}
return return
} }
if let folder = ensureFolder(with: folderName) { if let folder = ensureFolder(with: folderName) {
if let itemChildren = item.children {
importOPMLItems(itemChildren, parentFolder: folder) importOPMLItems(itemChildren, parentFolder: folder)
} }
} }
}
if !feedsToAdd.isEmpty { if !feedsToAdd.isEmpty {
addFeeds(feedsToAdd, to: parentFolder) addFeeds(feedsToAdd, to: parentFolder)