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

Make progress on fixing adding feeds.

Browse Source
This commit is contained in:
Brent Simmons 2017-10-21 15:04:59 -07:00
parent b74d2e1a3c
commit 4118e4a2d5
3 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Evergreen/MainWindow/AddFeed/AddFeedController.swift
View File

@ -56,19 +56,19 @@ class AddFeedController: AddFeedWindowControllerDelegate, FeedFinderDelegate {
// MARK: AddFeedWindowControllerDelegate // MARK: AddFeedWindowControllerDelegate
func addFeedWindowController(_: AddFeedWindowController, userEnteredURL url: URL, userEnteredTitle title: String?, folder: Folder) { func addFeedWindowController(_: AddFeedWindowController, userEnteredURL url: URL, userEnteredTitle title: String?, container: Container) {
closeAddFeedSheet(NSApplication.ModalResponse.OK) closeAddFeedSheet(NSApplication.ModalResponse.OK)
//
let account = folder.account // let account = folder.account
if account.hasFeed(withURL: url.absoluteString) { // if account.hasFeed(withURL: url.absoluteString) {
showAlreadySubscribedError(url.absoluteString, folder) // showAlreadySubscribedError(url.absoluteString, folder)
return // return
} // }
//
userEnteredURL = url // userEnteredURL = url
userEnteredFolder = folder // userEnteredFolder = folder
userEnteredTitle = title // userEnteredTitle = title
findFeed() findFeed()
} }

24
Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
View File

@ -94,19 +94,19 @@ class AddFeedWindowController : NSWindowController {
@IBAction func addFeed(_ sender: AnyObject) { @IBAction func addFeed(_ sender: AnyObject) {
let urlString = urlTextField.stringValue // let urlString = urlTextField.stringValue
let normalizedURLString = (urlString as NSString).rs_normalizedURL() // let normalizedURLString = (urlString as NSString).rs_normalizedURL()
//
if normalizedURLString.isEmpty { // if normalizedURLString.isEmpty {
cancelSheet() // cancelSheet()
return; // return;
} // }
guard let url = URL(string: normalizedURLString) else { // guard let url = URL(string: normalizedURLString) else {
cancelSheet() // cancelSheet()
return // return
} // }
delegate?.addFeedWindowController(self, userEnteredURL: url, userEnteredTitle: userEnteredTitle, folder: selectedFolder()!) // delegate?.addFeedWindowController(self, userEnteredURL: url, userEnteredTitle: userEnteredTitle, container: selectedContainer()!)
} }
@IBAction func localShowFeedList(_ sender: AnyObject) { @IBAction func localShowFeedList(_ sender: AnyObject) {

5
Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift
View File

@ -10,11 +10,6 @@ import Cocoa
import Data import Data
import Account import Account
//func addFolderWindowController() -> AddFolderWindowController {
//
// return AddFolderWindowController(windowNibName: "AddFolderSheet")
//}
class AddFolderWindowController : NSWindowController { class AddFolderWindowController : NSWindowController {
@IBOutlet var folderNameTextField: NSTextField! @IBOutlet var folderNameTextField: NSTextField!