From 9991b3760e6e8298f57ae631d94b8a55c9d69663 Mon Sep 17 00:00:00 2001
From: Stuart Breckenridge <stuart.breckenridge@icloud.com>
Date: Sat, 11 Jul 2020 20:22:21 +0800
Subject: [PATCH] Removes print statements and reorgs code
---
Multiplatform/iOS/AppDelegate.swift | 1 -
Multiplatform/{Shared => iOS}/Widget Data/WidgetData.swift | 0
.../{Shared => iOS}/Widget Data/WidgetDataDecoder.swift | 4 ----
.../{Shared => iOS}/Widget Data/WidgetDataEncoder.swift | 6 ++----
NetNewsWire.xcodeproj/project.pbxproj | 2 +-
5 files changed, 3 insertions(+), 10 deletions(-)
rename Multiplatform/{Shared => iOS}/Widget Data/WidgetData.swift (100%)
rename Multiplatform/{Shared => iOS}/Widget Data/WidgetDataDecoder.swift (93%)
rename Multiplatform/{Shared => iOS}/Widget Data/WidgetDataEncoder.swift (91%)
diff --git a/Multiplatform/iOS/AppDelegate.swift b/Multiplatform/iOS/AppDelegate.swift
index 6b0c0a9e1..1d99b850f 100644
--- a/Multiplatform/iOS/AppDelegate.swift
+++ b/Multiplatform/iOS/AppDelegate.swift
@@ -179,7 +179,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
@objc func unreadCountDidChange(_ note: Notification) {
if note.object is AccountManager {
unreadCount = AccountManager.shared.unreadCount
- WidgetDataEncoder.encodeWidgetData()
}
}
diff --git a/Multiplatform/Shared/Widget Data/WidgetData.swift b/Multiplatform/iOS/Widget Data/WidgetData.swift
similarity index 100%
rename from Multiplatform/Shared/Widget Data/WidgetData.swift
rename to Multiplatform/iOS/Widget Data/WidgetData.swift
diff --git a/Multiplatform/Shared/Widget Data/WidgetDataDecoder.swift b/Multiplatform/iOS/Widget Data/WidgetDataDecoder.swift
similarity index 93%
rename from Multiplatform/Shared/Widget Data/WidgetDataDecoder.swift
rename to Multiplatform/iOS/Widget Data/WidgetDataDecoder.swift
index f293b3691..cf53c1ae0 100644
--- a/Multiplatform/Shared/Widget Data/WidgetDataDecoder.swift
+++ b/Multiplatform/iOS/Widget Data/WidgetDataDecoder.swift
@@ -12,16 +12,12 @@ struct WidgetDataDecoder {
static func decodeWidgetData() throws -> WidgetData {
let appGroup = Bundle.main.object(forInfoDictionaryKey: "AppGroup") as! String
- print(appGroup)
let containerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroup)
let dataURL = containerURL?.appendingPathComponent("widget-data.json")
- print("decoder path: \(dataURL!.path)")
-
if FileManager.default.fileExists(atPath: dataURL!.path) {
let decodedWidgetData = try JSONDecoder().decode(WidgetData.self, from: Data(contentsOf: dataURL!))
return decodedWidgetData
} else {
- print("No data at location")
return WidgetData(currentUnreadCount: 0, currentTodayCount: 0, latestArticles: [], lastUpdateTime: Date())
}
}
diff --git a/Multiplatform/Shared/Widget Data/WidgetDataEncoder.swift b/Multiplatform/iOS/Widget Data/WidgetDataEncoder.swift
similarity index 91%
rename from Multiplatform/Shared/Widget Data/WidgetDataEncoder.swift
rename to Multiplatform/iOS/Widget Data/WidgetDataEncoder.swift
index 69d818171..3c6c8b47b 100644
--- a/Multiplatform/Shared/Widget Data/WidgetDataEncoder.swift
+++ b/Multiplatform/iOS/Widget Data/WidgetDataEncoder.swift
@@ -13,7 +13,7 @@ import os.log
struct WidgetDataEncoder {
static func encodeWidgetData() {
- os_log(.info, "Starting Widget data refresh")
+ os_log(.info, "Starting widget data encoding")
do {
let articles = try SmartFeedsController.shared.unreadFeed.fetchArticles().sorted(by: { $0.datePublished! > $1.datePublished! })
var latest = [LatestArticle]()
@@ -34,17 +34,15 @@ struct WidgetDataEncoder {
let encodedData = try JSONEncoder().encode(latestData)
let appGroup = Bundle.main.object(forInfoDictionaryKey: "AppGroup") as! String
- print(appGroup)
let containerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroup)
let dataURL = containerURL?.appendingPathComponent("widget-data.json")
- print("Encoder path: \(dataURL!.path)")
if FileManager.default.fileExists(atPath: dataURL!.path) {
try FileManager.default.removeItem(at: dataURL!)
}
try encodedData.write(to: dataURL!)
WidgetCenter.shared.reloadAllTimelines()
- os_log(.info, "Finished data refresh")
+ os_log(.info, "Finished encoding widget data")
} catch {
os_log(.error, "%@", error.localizedDescription)
}
diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index 4864f99f9..cbc57e8d0 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -2974,6 +2974,7 @@
5177470B24B2FF2C00EB0F74 /* Article */,
172199EB24AB228E00A31D04 /* Settings */,
17EEA7F824B8926700AAD8BF /* Widget */,
+ 17EEA80824B8998900AAD8BF /* Widget Data */,
);
path = iOS;
sourceTree = "<group>";
@@ -3010,7 +3011,6 @@
51E499FB24A9135A00B667CB /* Sidebar */,
514E6C0424AD2B0400AC6F6E /* SwiftUI Extensions */,
51919FCB24AB855000541E64 /* Timeline */,
- 17EEA80824B8998900AAD8BF /* Widget Data */,
);
path = Shared;
sourceTree = "<group>";