Make progress on fixing adding feeds.
This commit is contained in:
parent
b74d2e1a3c
commit
4118e4a2d5
@ -56,19 +56,19 @@ class AddFeedController: AddFeedWindowControllerDelegate, FeedFinderDelegate {
|
||||
|
||||
// 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)
|
||||
|
||||
let account = folder.account
|
||||
if account.hasFeed(withURL: url.absoluteString) {
|
||||
showAlreadySubscribedError(url.absoluteString, folder)
|
||||
return
|
||||
}
|
||||
|
||||
userEnteredURL = url
|
||||
userEnteredFolder = folder
|
||||
userEnteredTitle = title
|
||||
//
|
||||
// let account = folder.account
|
||||
// if account.hasFeed(withURL: url.absoluteString) {
|
||||
// showAlreadySubscribedError(url.absoluteString, folder)
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// userEnteredURL = url
|
||||
// userEnteredFolder = folder
|
||||
// userEnteredTitle = title
|
||||
|
||||
findFeed()
|
||||
}
|
||||
|
@ -94,19 +94,19 @@ class AddFeedWindowController : NSWindowController {
|
||||
|
||||
@IBAction func addFeed(_ sender: AnyObject) {
|
||||
|
||||
let urlString = urlTextField.stringValue
|
||||
let normalizedURLString = (urlString as NSString).rs_normalizedURL()
|
||||
|
||||
if normalizedURLString.isEmpty {
|
||||
cancelSheet()
|
||||
return;
|
||||
}
|
||||
guard let url = URL(string: normalizedURLString) else {
|
||||
cancelSheet()
|
||||
return
|
||||
}
|
||||
// let urlString = urlTextField.stringValue
|
||||
// let normalizedURLString = (urlString as NSString).rs_normalizedURL()
|
||||
//
|
||||
// if normalizedURLString.isEmpty {
|
||||
// cancelSheet()
|
||||
// return;
|
||||
// }
|
||||
// guard let url = URL(string: normalizedURLString) else {
|
||||
// cancelSheet()
|
||||
// return
|
||||
// }
|
||||
|
||||
delegate?.addFeedWindowController(self, userEnteredURL: url, userEnteredTitle: userEnteredTitle, folder: selectedFolder()!)
|
||||
// delegate?.addFeedWindowController(self, userEnteredURL: url, userEnteredTitle: userEnteredTitle, container: selectedContainer()!)
|
||||
}
|
||||
|
||||
@IBAction func localShowFeedList(_ sender: AnyObject) {
|
||||
|
@ -10,11 +10,6 @@ import Cocoa
|
||||
import Data
|
||||
import Account
|
||||
|
||||
//func addFolderWindowController() -> AddFolderWindowController {
|
||||
//
|
||||
// return AddFolderWindowController(windowNibName: "AddFolderSheet")
|
||||
//}
|
||||
|
||||
class AddFolderWindowController : NSWindowController {
|
||||
|
||||
@IBOutlet var folderNameTextField: NSTextField!
|
||||
|
Loading…
x
Reference in New Issue
Block a user