From becbf3d7b000c9cb026f1ce97f8504d1f9e1f627 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Tue, 22 Aug 2017 07:45:09 -0700 Subject: [PATCH] Fix Account-Database init method. --- Frameworks/Data/Article.swift | 2 +- Frameworks/Database/Extensions/Article+Database.swift | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Frameworks/Data/Article.swift b/Frameworks/Data/Article.swift index 17acc578a..73655c0f5 100644 --- a/Frameworks/Data/Article.swift +++ b/Frameworks/Data/Article.swift @@ -12,7 +12,7 @@ public final class Article: Hashable { weak var account: Account? - public let articleID: String + public let articleID: String // Unique database ID public let feedID: String // Likely a URL, but not necessarily public let uniqueID: String // Unique per feed (RSS guid, for example) public var title: String? diff --git a/Frameworks/Database/Extensions/Article+Database.swift b/Frameworks/Database/Extensions/Article+Database.swift index 94056ad2a..4a00b8ae2 100644 --- a/Frameworks/Database/Extensions/Article+Database.swift +++ b/Frameworks/Database/Extensions/Article+Database.swift @@ -32,15 +32,12 @@ extension Article { let bannerImageURL = row.string(forColumn: DatabaseKey.bannerImageURL) let datePublished = row.date(forColumn: DatabaseKey.datePublished) let dateModified = row.date(forColumn: DatabaseKey.dateModified) + let accountInfo: [String: Any]? = nil // TODO + + // authors, tags, and attachments are fetched from related tables, after init. let authors: [Author]? = nil let tags: Set? = nil let attachments: [Attachment]? = nil - let accountInfo: [String: Any]? = nil - -// let authors = PropertyListTransformer.authorsWithRow(row) -// let tags = PropertyListTransformer.tagsWithRow(row) -// let attachments = PropertyListTransformer.attachmentsWithRow(row) -// let accountInfo = accountInfoWithRow(row) self.init(account: account, articleID: articleID, feedID: feedID, uniqueID: uniqueID, title: title, contentHTML: contentHTML, contentText: contentText, url: url, externalURL: externalURL, summary: summary, imageURL: imageURL, bannerImageURL: bannerImageURL, datePublished: datePublished, dateModified: dateModified, authors: authors, tags: tags, attachments: attachments, accountInfo: accountInfo) }