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

Removes print statements and reorgs code

Browse Source
This commit is contained in:
Stuart Breckenridge 2020-07-11 20:22:21 +08:00
parent 1cc5f3cc30
commit 9991b3760e
No known key found for this signature in database
GPG Key ID: 79BD673276AE83CE
5 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Multiplatform/iOS/AppDelegate.swift
View File

@ -179,7 +179,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
@objc func unreadCountDidChange(_ note: Notification) { @objc func unreadCountDidChange(_ note: Notification) {
if note.object is AccountManager { if note.object is AccountManager {
unreadCount = AccountManager.shared.unreadCount unreadCount = AccountManager.shared.unreadCount
WidgetDataEncoder.encodeWidgetData()
} }
} }

0
Multiplatform/Shared/Widget Data/WidgetData.swift → Multiplatform/iOS/Widget Data/WidgetData.swift
View File

4
Multiplatform/Shared/Widget Data/WidgetDataDecoder.swift → Multiplatform/iOS/Widget Data/WidgetDataDecoder.swift
View File

@ -12,16 +12,12 @@ struct WidgetDataDecoder {
static func decodeWidgetData() throws -> WidgetData { static func decodeWidgetData() throws -> WidgetData {
let appGroup = Bundle.main.object(forInfoDictionaryKey: "AppGroup") as! String let appGroup = Bundle.main.object(forInfoDictionaryKey: "AppGroup") as! String
print(appGroup)
let containerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroup) let containerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroup)
let dataURL = containerURL?.appendingPathComponent("widget-data.json") let dataURL = containerURL?.appendingPathComponent("widget-data.json")
print("decoder path: \(dataURL!.path)")
if FileManager.default.fileExists(atPath: dataURL!.path) { if FileManager.default.fileExists(atPath: dataURL!.path) {
let decodedWidgetData = try JSONDecoder().decode(WidgetData.self, from: Data(contentsOf: dataURL!)) let decodedWidgetData = try JSONDecoder().decode(WidgetData.self, from: Data(contentsOf: dataURL!))
return decodedWidgetData return decodedWidgetData
} else { } else {
print("No data at location")
return WidgetData(currentUnreadCount: 0, currentTodayCount: 0, latestArticles: [], lastUpdateTime: Date()) return WidgetData(currentUnreadCount: 0, currentTodayCount: 0, latestArticles: [], lastUpdateTime: Date())
} }
} }

6
Multiplatform/Shared/Widget Data/WidgetDataEncoder.swift → Multiplatform/iOS/Widget Data/WidgetDataEncoder.swift
View File

@ -13,7 +13,7 @@ import os.log
struct WidgetDataEncoder { struct WidgetDataEncoder {
static func encodeWidgetData() { static func encodeWidgetData() {
os_log(.info, "Starting Widget data refresh") os_log(.info, "Starting widget data encoding")
do { do {
let articles = try SmartFeedsController.shared.unreadFeed.fetchArticles().sorted(by: { $0.datePublished! > $1.datePublished! }) let articles = try SmartFeedsController.shared.unreadFeed.fetchArticles().sorted(by: { $0.datePublished! > $1.datePublished! })
var latest = [LatestArticle]() var latest = [LatestArticle]()
@ -34,17 +34,15 @@ struct WidgetDataEncoder {
let encodedData = try JSONEncoder().encode(latestData) let encodedData = try JSONEncoder().encode(latestData)
let appGroup = Bundle.main.object(forInfoDictionaryKey: "AppGroup") as! String let appGroup = Bundle.main.object(forInfoDictionaryKey: "AppGroup") as! String
print(appGroup)
let containerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroup) let containerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroup)
let dataURL = containerURL?.appendingPathComponent("widget-data.json") let dataURL = containerURL?.appendingPathComponent("widget-data.json")
print("Encoder path: \(dataURL!.path)")
if FileManager.default.fileExists(atPath: dataURL!.path) { if FileManager.default.fileExists(atPath: dataURL!.path) {
try FileManager.default.removeItem(at: dataURL!) try FileManager.default.removeItem(at: dataURL!)
} }
try encodedData.write(to: dataURL!) try encodedData.write(to: dataURL!)
WidgetCenter.shared.reloadAllTimelines() WidgetCenter.shared.reloadAllTimelines()
os_log(.info, "Finished data refresh") os_log(.info, "Finished encoding widget data")
} catch { } catch {
os_log(.error, "%@", error.localizedDescription) os_log(.error, "%@", error.localizedDescription)
} }

2
NetNewsWire.xcodeproj/project.pbxproj
View File

@ -2974,6 +2974,7 @@
5177470B24B2FF2C00EB0F74 /* Article */, 5177470B24B2FF2C00EB0F74 /* Article */,
172199EB24AB228E00A31D04 /* Settings */, 172199EB24AB228E00A31D04 /* Settings */,
17EEA7F824B8926700AAD8BF /* Widget */, 17EEA7F824B8926700AAD8BF /* Widget */,
17EEA80824B8998900AAD8BF /* Widget Data */,
); );
path = iOS; path = iOS;
sourceTree = "<group>"; sourceTree = "<group>";
@ -3010,7 +3011,6 @@
51E499FB24A9135A00B667CB /* Sidebar */, 51E499FB24A9135A00B667CB /* Sidebar */,
514E6C0424AD2B0400AC6F6E /* SwiftUI Extensions */, 514E6C0424AD2B0400AC6F6E /* SwiftUI Extensions */,
51919FCB24AB855000541E64 /* Timeline */, 51919FCB24AB855000541E64 /* Timeline */,
17EEA80824B8998900AAD8BF /* Widget Data */,
); );
path = Shared; path = Shared;
sourceTree = "<group>"; sourceTree = "<group>";