FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-09 08:39:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes for #2287

Browse Source
This commit is contained in:
Stuart Breckenridge 2020-07-22 21:47:40 +08:00
parent 7639ea2780
commit 1bd0bfce37
No known key found for this signature in database
GPG Key ID: 79BD673276AE83CE
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Multiplatform/Shared/Sidebar/SidebarContextMenu.swift
View File

@ -20,7 +20,7 @@ struct SidebarContextMenu: View {
@ViewBuilder var body: some View { @ViewBuilder var body: some View {
// MARK: Account Context Menu
if sidebarItem.representedType == .account { if sidebarItem.representedType == .account {
Button { Button {
showInspector = true showInspector = true
@ -40,6 +40,7 @@ struct SidebarContextMenu: View {
} }
} }
// MARK: Pseudofeed Context Menu
if sidebarItem.representedType == .pseudoFeed { if sidebarItem.representedType == .pseudoFeed {
Button { Button {
guard let feed = sidebarItem.feed else { guard let feed = sidebarItem.feed else {
@ -54,6 +55,7 @@ struct SidebarContextMenu: View {
} }
} }
// MARK: Webfeed Context Menu
if sidebarItem.representedType == .webFeed { if sidebarItem.representedType == .webFeed {
Button { Button {
showInspector = true showInspector = true
@ -130,6 +132,7 @@ struct SidebarContextMenu: View {
} }
} }
// MARK: Folder Context Menu
if sidebarItem.representedType == .folder { if sidebarItem.representedType == .folder {
Button { Button {
showInspector = true showInspector = true

35
Multiplatform/Shared/Sidebar/SidebarModel.swift
View File

@ -99,9 +99,11 @@ extension SidebarModel {
} }
func deleteItems(item: SidebarItem) { func deleteItems(item: SidebarItem) {
#if os(macOS)
if selectedFeeds.count > 0 { if selectedFeeds.count > 0 {
for feed in selectedFeeds { for feed in selectedFeeds {
if feed is WebFeed { if feed is WebFeed {
print(feed.nameForDisplay)
let account = (feed as! WebFeed).account let account = (feed as! WebFeed).account
account?.removeWebFeed(feed as! WebFeed) account?.removeWebFeed(feed as! WebFeed)
} }
@ -117,23 +119,24 @@ extension SidebarModel {
}) })
} }
} }
} else {
if item.feed is WebFeed {
let account = (item.feed as! WebFeed).account
account?.removeWebFeed(item.feed as! WebFeed)
}
if item.feed is Folder {
let account = (item.feed as! Folder).account
account?.removeFolder(item.feed as! Folder, completion: { (result) in
switch result {
case .success( _):
print("Deleted folder")
case .failure(let err):
print(err.localizedDescription)
}
})
}
} }
#else
if item.feed is WebFeed {
let account = (item.feed as! WebFeed).account
account?.removeWebFeed(item.feed as! WebFeed)
}
if item.feed is Folder {
let account = (item.feed as! Folder).account
account?.removeFolder(item.feed as! Folder, completion: { (result) in
switch result {
case .success( _):
print("Deleted folder")
case .failure(let err):
print(err.localizedDescription)
}
})
}
#endif
} }
} }

4
NetNewsWire.xcodeproj/project.pbxproj
View File

@ -17,8 +17,6 @@
1729529524AA1CAA00D65E66 /* GeneralPreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1729529224AA1CAA00D65E66 /* GeneralPreferencesView.swift */; }; 1729529524AA1CAA00D65E66 /* GeneralPreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1729529224AA1CAA00D65E66 /* GeneralPreferencesView.swift */; };
1729529724AA1CD000D65E66 /* MacPreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1729529624AA1CD000D65E66 /* MacPreferencesView.swift */; }; 1729529724AA1CD000D65E66 /* MacPreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1729529624AA1CD000D65E66 /* MacPreferencesView.swift */; };
1729529B24AA1FD200D65E66 /* MacSearchField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1729529A24AA1FD200D65E66 /* MacSearchField.swift */; }; 1729529B24AA1FD200D65E66 /* MacSearchField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1729529A24AA1FD200D65E66 /* MacSearchField.swift */; };
173A66B024C6C5C800DDA840 /* DeleteCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B99C9C1FAE83C600ECDEDB /* DeleteCommand.swift */; };
173A66D224C6C5C800DDA840 /* DeleteCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B99C9C1FAE83C600ECDEDB /* DeleteCommand.swift */; };
175942AA24AD533200585066 /* RefreshInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCE4226F4DFA0010922C /* RefreshInterval.swift */; }; 175942AA24AD533200585066 /* RefreshInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCE4226F4DFA0010922C /* RefreshInterval.swift */; };
175942AB24AD533200585066 /* RefreshInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCE4226F4DFA0010922C /* RefreshInterval.swift */; }; 175942AB24AD533200585066 /* RefreshInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCE4226F4DFA0010922C /* RefreshInterval.swift */; };
1769E32224BC5925000E1E8E /* AccountsPreferencesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1769E32124BC5925000E1E8E /* AccountsPreferencesModel.swift */; }; 1769E32224BC5925000E1E8E /* AccountsPreferencesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1769E32124BC5925000E1E8E /* AccountsPreferencesModel.swift */; };
@ -5257,7 +5255,6 @@
51E498F724A8085D00B667CB /* SearchTimelineFeedDelegate.swift in Sources */, 51E498F724A8085D00B667CB /* SearchTimelineFeedDelegate.swift in Sources */,
175942AA24AD533200585066 /* RefreshInterval.swift in Sources */, 175942AA24AD533200585066 /* RefreshInterval.swift in Sources */,
51E4993524A867E800B667CB /* AppNotifications.swift in Sources */, 51E4993524A867E800B667CB /* AppNotifications.swift in Sources */,
173A66D224C6C5C800DDA840 /* DeleteCommand.swift in Sources */,
51C0515E24A77DF800194D5E /* MainApp.swift in Sources */, 51C0515E24A77DF800194D5E /* MainApp.swift in Sources */,
51919FF724AB8B7700541E64 /* TimelineView.swift in Sources */, 51919FF724AB8B7700541E64 /* TimelineView.swift in Sources */,
51E4993D24A870F800B667CB /* UserNotificationManager.swift in Sources */, 51E4993D24A870F800B667CB /* UserNotificationManager.swift in Sources */,
@ -5403,7 +5400,6 @@
1799E6CE24C320D600511E91 /* InspectorModel.swift in Sources */, 1799E6CE24C320D600511E91 /* InspectorModel.swift in Sources */,
514E6C0024AD255D00AC6F6E /* PreviewArticles.swift in Sources */, 514E6C0024AD255D00AC6F6E /* PreviewArticles.swift in Sources */,
1729529524AA1CAA00D65E66 /* GeneralPreferencesView.swift in Sources */, 1729529524AA1CAA00D65E66 /* GeneralPreferencesView.swift in Sources */,
173A66B024C6C5C800DDA840 /* DeleteCommand.swift in Sources */,
1769E32724BC5B6C000E1E8E /* AddAccountModel.swift in Sources */, 1769E32724BC5B6C000E1E8E /* AddAccountModel.swift in Sources */,
1729529424AA1CAA00D65E66 /* AdvancedPreferencesView.swift in Sources */, 1729529424AA1CAA00D65E66 /* AdvancedPreferencesView.swift in Sources */,
5177470424B2657F00EB0F74 /* TimelineToolbarModifier.swift in Sources */, 5177470424B2657F00EB0F74 /* TimelineToolbarModifier.swift in Sources */,