Continue surgery. Still broken build.

This commit is contained in:
Brent Simmons
2017-07-03 15:04:31 -07:00
parent d47c60e6de
commit 41d8a7f3de
10 changed files with 239 additions and 88 deletions

View File

@@ -0,0 +1,26 @@
//
// Article+Database.swift
// Database
//
// Created by Brent Simmons on 7/3/17.
// Copyright © 2017 Ranchero Software. All rights reserved.
//
import Foundation
import RSDatabase
import Data
extension Article {
convenience init?(row: FMResultSet) {
}
func databaseDictionary() -> NSDictionary {
var d = NSMutableDictionary()
return d.copy() as! NSDictionary
}
}

View File

@@ -0,0 +1,52 @@
//
// ArticleStatus+Database.swift
// Database
//
// Created by Brent Simmons on 7/3/17.
// Copyright © 2017 Ranchero Software. All rights reserved.
//
import Foundation
import RSDatabase
import Data
extension ArticleStatus {
convenience init?(row: FMResultSet) {
let articleID = row.string(forColumn: DatabaseKey.articleID)
if (articleID == nil) {
return nil
}
let read = row.bool(forColumn: DatabaseKey.read)
let starred = row.bool(forColumn: DatabaseKey.starred)
let userDeleted = row.bool(forColumn: DatabaseKey.userDeleted)
var dateArrived = row.date(forColumn: DatabaseKey.dateArrived)
if (dateArrived == nil) {
dateArrived = NSDate.distantPast
}
let accountInfoPlist = PropertyListTransformer.accountInfoWithRow(row)
self.init(articleID: articleID!, read: read, starred: starred, userDeleted: userDeleted, dateArrived: dateArrived!, accountInfo: accountInfoPlist)
}
func databaseDictionary() -> NSDictionary {
let d = NSMutableDictionary()
d[DatabaseKey.articleID] = articleID
d[DatabaseKey.read] = read
d[DatabaseKey.starred] = starred
d[DatabaseKey.userDeleted] = userDeleted
d[DatabaseKey.dateArrived] = dateArrived
if let accountInfo = accountInfo, let data = PropertyListTransformer.data(withPropertyList: accountInfo) {
d[DatabaseKey.accountInfo] = data
}
return d.copy() as! NSDictionary
}
}

View File

@@ -0,0 +1,18 @@
//
// Folder+Database.swift
// Database
//
// Created by Brent Simmons on 7/3/17.
// Copyright © 2017 Ranchero Software. All rights reserved.
//
import Foundation
import Data
extension Folder {
func flattenedFeedIDs() -> [String] {
return flattenedFeeds().map { $0.feedID }
}
}