From cc458ecab7035328845ae143b2bf084cd1f62539 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 8 Jul 2019 22:20:57 -0700 Subject: [PATCH] Make code formatting match current style. --- Frameworks/ArticlesDatabase/Constants.swift | 2 +- Frameworks/ArticlesDatabase/DatabaseArticle.swift | 2 +- .../ArticlesDatabase/Extensions/Article+Database.swift | 10 +--------- .../Extensions/ArticleStatus+Database.swift | 3 +-- .../ArticlesDatabase/Extensions/Author+Database.swift | 6 +----- .../Extensions/ParsedArticle+Database.swift | 2 +- Frameworks/ArticlesDatabase/SearchTable.swift | 2 +- 7 files changed, 7 insertions(+), 20 deletions(-) diff --git a/Frameworks/ArticlesDatabase/Constants.swift b/Frameworks/ArticlesDatabase/Constants.swift index 054f96919..e7b13b08e 100644 --- a/Frameworks/ArticlesDatabase/Constants.swift +++ b/Frameworks/ArticlesDatabase/Constants.swift @@ -1,6 +1,6 @@ // // Keys.swift -// Database +// NetNewsWire // // Created by Brent Simmons on 7/3/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Frameworks/ArticlesDatabase/DatabaseArticle.swift b/Frameworks/ArticlesDatabase/DatabaseArticle.swift index 597decbf9..7ac09c90c 100644 --- a/Frameworks/ArticlesDatabase/DatabaseArticle.swift +++ b/Frameworks/ArticlesDatabase/DatabaseArticle.swift @@ -1,6 +1,6 @@ // // DatabaseArticle.swift -// Database +// NetNewsWire // // Created by Brent Simmons on 9/21/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Frameworks/ArticlesDatabase/Extensions/Article+Database.swift b/Frameworks/ArticlesDatabase/Extensions/Article+Database.swift index 5ac4dbb09..36c5332f1 100644 --- a/Frameworks/ArticlesDatabase/Extensions/Article+Database.swift +++ b/Frameworks/ArticlesDatabase/Extensions/Article+Database.swift @@ -1,6 +1,6 @@ // // Article+Database.swift -// Database +// NetNewsWire // // Created by Brent Simmons on 7/3/17. // Copyright © 2017 Ranchero Software. All rights reserved. @@ -14,12 +14,10 @@ import RSParser extension Article { init(databaseArticle: DatabaseArticle, accountID: String, authors: Set?, attachments: Set?) { - self.init(accountID: accountID, articleID: databaseArticle.articleID, feedID: databaseArticle.feedID, uniqueID: databaseArticle.uniqueID, title: databaseArticle.title, contentHTML: databaseArticle.contentHTML, contentText: databaseArticle.contentText, url: databaseArticle.url, externalURL: databaseArticle.externalURL, summary: databaseArticle.summary, imageURL: databaseArticle.imageURL, bannerImageURL: databaseArticle.bannerImageURL, datePublished: databaseArticle.datePublished, dateModified: databaseArticle.dateModified, authors: authors, attachments: attachments, status: databaseArticle.status) } init(parsedItem: ParsedItem, maximumDateAllowed: Date, accountID: String, feedID: String, status: ArticleStatus) { - let authors = Author.authorsWithParsedAuthors(parsedItem.authors) let attachments = Attachment.attachmentsWithParsedAttachments(parsedItem.attachments) @@ -135,7 +133,6 @@ extension Article: DatabaseObject { } public func relatedObjectsWithName(_ name: String) -> [DatabaseObject]? { - switch name { case RelationshipName.authors: return databaseObjectArray(with: authors) @@ -147,7 +144,6 @@ extension Article: DatabaseObject { } private func databaseObjectArray(with objects: Set?) -> [DatabaseObject]? { - guard let objects = objects else { return nil } @@ -158,12 +154,10 @@ extension Article: DatabaseObject { extension Set where Element == Article { func statuses() -> Set { - return Set(map { $0.status }) } func dictionary() -> [String: Article] { - var d = [String: Article]() for article in self { d[article.articleID] = article @@ -172,12 +166,10 @@ extension Set where Element == Article { } func databaseObjects() -> [DatabaseObject] { - return self.map{ $0 as DatabaseObject } } func databaseDictionaries() -> [DatabaseDictionary]? { - return self.compactMap { $0.databaseDictionary() } } } diff --git a/Frameworks/ArticlesDatabase/Extensions/ArticleStatus+Database.swift b/Frameworks/ArticlesDatabase/Extensions/ArticleStatus+Database.swift index fbf6f4e1a..b4d46650e 100644 --- a/Frameworks/ArticlesDatabase/Extensions/ArticleStatus+Database.swift +++ b/Frameworks/ArticlesDatabase/Extensions/ArticleStatus+Database.swift @@ -1,6 +1,6 @@ // // ArticleStatus+Database.swift -// Database +// NetNewsWire // // Created by Brent Simmons on 7/3/17. // Copyright © 2017 Ranchero Software. All rights reserved. @@ -13,7 +13,6 @@ import Articles extension ArticleStatus { convenience init(articleID: String, dateArrived: Date, row: FMResultSet) { - let read = row.bool(forColumn: DatabaseKey.read) let starred = row.bool(forColumn: DatabaseKey.starred) let userDeleted = row.bool(forColumn: DatabaseKey.userDeleted) diff --git a/Frameworks/ArticlesDatabase/Extensions/Author+Database.swift b/Frameworks/ArticlesDatabase/Extensions/Author+Database.swift index 1b2d7fb43..d1d69b715 100644 --- a/Frameworks/ArticlesDatabase/Extensions/Author+Database.swift +++ b/Frameworks/ArticlesDatabase/Extensions/Author+Database.swift @@ -1,6 +1,6 @@ // // Author+Database.swift -// Database +// NetNewsWire // // Created by Brent Simmons on 7/8/17. // Copyright © 2017 Ranchero Software. All rights reserved. @@ -16,7 +16,6 @@ import RSParser extension Author { init?(row: FMResultSet) { - let authorID = row.string(forColumn: DatabaseKey.authorID) let name = row.string(forColumn: DatabaseKey.name) let url = row.string(forColumn: DatabaseKey.url) @@ -27,12 +26,10 @@ extension Author { } init?(parsedAuthor: ParsedAuthor) { - self.init(authorID: nil, name: parsedAuthor.name, url: parsedAuthor.url, avatarURL: parsedAuthor.avatarURL, emailAddress: parsedAuthor.emailAddress) } public static func authorsWithParsedAuthors(_ parsedAuthors: Set?) -> Set? { - guard let parsedAuthors = parsedAuthors else { return nil } @@ -49,7 +46,6 @@ extension Author: DatabaseObject { } public func databaseDictionary() -> DatabaseDictionary? { - var d: DatabaseDictionary = [DatabaseKey.authorID: authorID] if let name = name { d[DatabaseKey.name] = name diff --git a/Frameworks/ArticlesDatabase/Extensions/ParsedArticle+Database.swift b/Frameworks/ArticlesDatabase/Extensions/ParsedArticle+Database.swift index d89f707ab..271876057 100644 --- a/Frameworks/ArticlesDatabase/Extensions/ParsedArticle+Database.swift +++ b/Frameworks/ArticlesDatabase/Extensions/ParsedArticle+Database.swift @@ -1,6 +1,6 @@ // // ParsedArticle+Database.swift -// Database +// NetNewsWire // // Created by Brent Simmons on 9/18/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Frameworks/ArticlesDatabase/SearchTable.swift b/Frameworks/ArticlesDatabase/SearchTable.swift index d05ad21d5..d0c95838a 100644 --- a/Frameworks/ArticlesDatabase/SearchTable.swift +++ b/Frameworks/ArticlesDatabase/SearchTable.swift @@ -1,6 +1,6 @@ // // SearchTable.swift -// ArticlesDatabase +// NetNewsWire // // Created by Brent Simmons on 2/23/19. // Copyright © 2019 Ranchero Software. All rights reserved.