Skip to content

Commit 018b950

Browse files
keankean
committed
Rework JetpackStatsWidget
1 parent ca9ae51 commit 018b950

File tree

11 files changed

+94
-149
lines changed

11 files changed

+94
-149
lines changed

‎WordPress/JetpackStatsWidgets/Cache/HomeWidgetCache.swift ‎Modules/Sources/JetpackStatsWidgetsCore/HomeWidgetCache.swift

+14-19
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,46 @@
11
import Foundation
2-
import JetpackStatsWidgetsCore
32

43
/// Cache manager that stores `HomeWidgetData` values in a plist file, contained in the specified security application group and with the specified file name.
54
/// The corresponding dictionary is always in the form `[Int: T]`, where the `Int` key is the SiteID, and the `T` value is any `HomeWidgetData` instance.
6-
struct HomeWidgetCache<T: HomeWidgetData> {
7-
5+
public struct HomeWidgetCache<T: HomeWidgetData> {
86
let fileName: String
97
let appGroup: String
108

9+
public init(fileName: String, appGroup: String) {
10+
self.fileName = fileName
11+
self.appGroup = appGroup
12+
}
13+
1114
private var fileURL: URL? {
1215
FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroup)?.appendingPathComponent(fileName)
1316
}
1417

15-
func read() throws -> [Int: T]? {
16-
17-
guard let fileURL,
18-
FileManager.default.fileExists(atPath: fileURL.path) else {
19-
return nil
18+
public func read() throws -> [Int: T]? {
19+
guard let fileURL, FileManager.default.fileExists(atPath: fileURL.path) else {
20+
return nil
2021
}
2122

2223
let data = try Data(contentsOf: fileURL)
2324
return try PropertyListDecoder().decode([Int: T].self, from: data)
2425
}
2526

26-
func write(items: [Int: T]) throws {
27-
28-
guard let fileURL else {
29-
return
30-
}
27+
public func write(items: [Int: T]) throws {
28+
guard let fileURL else { return }
3129

3230
let encodedData = try PropertyListEncoder().encode(items)
3331
try encodedData.write(to: fileURL)
3432
}
3533

36-
func setItem(item: T) throws {
34+
public func setItem(item: T) throws {
3735
var cachedItems = try read() ?? [Int: T]()
3836

3937
cachedItems[item.siteID] = item
4038

4139
try write(items: cachedItems)
4240
}
4341

44-
func delete() throws {
45-
46-
guard let fileURL else {
47-
return
48-
}
42+
public func delete() throws {
43+
guard let fileURL else { return }
4944
try FileManager.default.removeItem(at: fileURL)
5045
}
5146
}

‎WordPress/Classes/Stores/HomeWidgetData+Extensions.swift

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
import JetpackStatsWidgetsCore
2+
import BuildSettingsKit
3+
4+
extension HomeWidgetData {
5+
6+
static func read(from cache: HomeWidgetCache<Self>? = nil) -> [Int: Self]? {
7+
let cache = cache ?? makeCache()
8+
do {
9+
return try cache.read()
10+
} catch {
11+
DDLogError("HomeWidgetToday: Failed loading data: \(error.localizedDescription)")
12+
return nil
13+
}
14+
}
15+
16+
static func write(items: [Int: Self], to cache: HomeWidgetCache<Self>? = nil) {
17+
18+
let cache = cache ?? makeCache()
19+
20+
do {
21+
try cache.write(items: items)
22+
} catch {
23+
DDLogError("HomeWidgetToday: Failed writing data: \(error.localizedDescription)")
24+
}
25+
}
26+
27+
static func delete(cache: HomeWidgetCache<Self>? = nil) {
28+
let cache = cache ?? makeCache()
29+
30+
do {
31+
try cache.delete()
32+
} catch {
33+
DDLogError("HomeWidgetToday: Failed deleting data: \(error.localizedDescription)")
34+
}
35+
}
36+
37+
static func setItem(item: Self, to cache: HomeWidgetCache<Self>? = nil) {
38+
let cache = cache ?? makeCache()
39+
40+
do {
41+
try cache.setItem(item: item)
42+
} catch {
43+
DDLogError("HomeWidgetToday: Failed writing data item: \(error.localizedDescription)")
44+
}
45+
}
46+
47+
static func cacheDataExists() -> Bool {
48+
let data = read()
49+
return data != nil && data?.isEmpty == false
50+
}
51+
52+
private static func makeCache() -> HomeWidgetCache<Self> {
53+
HomeWidgetCache<Self>(fileName: Self.filename, appGroup: BuildSettings.appGroupName)
54+
}
55+
}

‎WordPress/Jetpack/WidgetConfiguration.swift

-33
This file was deleted.

‎WordPress/JetpackIntents/SitesDataProvider.swift

+12
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,15 @@ class SitesDataProvider {
7373
}
7474
}
7575
}
76+
77+
private extension HomeWidgetData {
78+
static func read(from cache: HomeWidgetCache<Self>? = nil) -> [Int: Self]? {
79+
80+
let cache = cache ?? HomeWidgetCache<Self>(fileName: Self.filename, appGroup: BuildSettings.appGroupName)
81+
do {
82+
return try cache.read()
83+
} catch {
84+
return nil
85+
}
86+
}
87+
}

‎WordPress/JetpackStatsWidgets/LocalizationConfiguration.swift

-7
This file was deleted.

‎WordPress/JetpackStatsWidgets/LockScreenWidgets/ViewProvider/LockScreenMultiStatWidgetViewProvider.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ struct LockScreenMultiStatWidgetViewProvider<WidgetData: HomeWidgetData>: LockSc
3535
let message: String
3636
switch widgetKind {
3737
case .today:
38-
message = AppConfiguration.Widget.Localization.unconfiguredViewTodayTitle
38+
message = LocalizableStrings.unconfiguredViewJetpackTodayTitle
3939
case .allTime:
40-
message = AppConfiguration.Widget.Localization.unconfiguredViewAllTimeTitle
40+
message = LocalizableStrings.unconfiguredViewJetpackAllTimeTitle
4141
case .thisWeek:
42-
message = AppConfiguration.Widget.Localization.unconfiguredViewThisWeekTitle
42+
message = LocalizableStrings.unconfiguredViewJetpackThisWeekTitle
4343
}
4444
let viewModel = LockScreenUnconfiguredViewModel(message: message)
4545
return LockScreenUnconfiguredView(viewModel: viewModel)

‎WordPress/JetpackStatsWidgets/LockScreenWidgets/ViewProvider/LockScreenSingleStatWidgetViewProvider.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ struct LockScreenSingleStatWidgetViewProvider<WidgetData: HomeWidgetData>: LockS
2727
let message: String
2828
switch widgetKind {
2929
case .today:
30-
message = AppConfiguration.Widget.Localization.unconfiguredViewTodayTitle
30+
message = LocalizableStrings.unconfiguredViewJetpackTodayTitle
3131
case .allTime:
32-
message = AppConfiguration.Widget.Localization.unconfiguredViewAllTimeTitle
32+
message = LocalizableStrings.unconfiguredViewJetpackAllTimeTitle
3333
case .thisWeek:
34-
message = AppConfiguration.Widget.Localization.unconfiguredViewThisWeekTitle
34+
message = LocalizableStrings.unconfiguredViewJetpackThisWeekTitle
3535
}
3636
let viewModel = LockScreenUnconfiguredViewModel(message: message)
3737
return LockScreenUnconfiguredView(viewModel: viewModel)

‎WordPress/JetpackStatsWidgets/Model/HomeWidgetData.swift

+4-32
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import BuildSettingsKit
66
extension HomeWidgetData {
77

88
static func read(from cache: HomeWidgetCache<Self>? = nil) -> [Int: Self]? {
9-
10-
let cache = cache ?? HomeWidgetCache<Self>(fileName: Self.filename,
11-
appGroup: BuildSettings.appGroupName)
9+
let cache = cache ?? makeCache()
1210
do {
1311
return try cache.read()
1412
} catch {
@@ -17,42 +15,16 @@ extension HomeWidgetData {
1715
}
1816
}
1917

20-
static func write(items: [Int: Self], to cache: HomeWidgetCache<Self>? = nil) {
21-
22-
let cache = cache ?? HomeWidgetCache<Self>(fileName: Self.filename,
23-
appGroup: BuildSettings.appGroupName)
24-
25-
do {
26-
try cache.write(items: items)
27-
} catch {
28-
DDLogError("HomeWidgetToday: Failed writing data: \(error.localizedDescription)")
29-
}
30-
}
31-
32-
static func delete(cache: HomeWidgetCache<Self>? = nil) {
33-
let cache = cache ?? HomeWidgetCache<Self>(fileName: Self.filename,
34-
appGroup: BuildSettings.appGroupName)
35-
36-
do {
37-
try cache.delete()
38-
} catch {
39-
DDLogError("HomeWidgetToday: Failed deleting data: \(error.localizedDescription)")
40-
}
41-
}
42-
4318
static func setItem(item: Self, to cache: HomeWidgetCache<Self>? = nil) {
44-
let cache = cache ?? HomeWidgetCache<Self>(fileName: Self.filename,
45-
appGroup: BuildSettings.appGroupName)
46-
19+
let cache = cache ?? makeCache()
4720
do {
4821
try cache.setItem(item: item)
4922
} catch {
5023
DDLogError("HomeWidgetToday: Failed writing data item: \(error.localizedDescription)")
5124
}
5225
}
5326

54-
static func cacheDataExists() -> Bool {
55-
let data = read()
56-
return data != nil && data?.isEmpty == false
27+
private static func makeCache() -> HomeWidgetCache<Self> {
28+
HomeWidgetCache<Self>(fileName: Self.filename, appGroup: BuildSettings.appGroupName)
5729
}
5830
}

‎WordPress/JetpackStatsWidgets/Supporting Files/JetpackStatsWidgets-Bridging-Header.h

-1
This file was deleted.

‎WordPress/JetpackStatsWidgets/Views/UnconfiguredView.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ struct UnconfiguredView: View {
1919
case .loggedOut(let widgetKind):
2020
switch widgetKind {
2121
case .today:
22-
return AppConfiguration.Widget.Localization.unconfiguredViewTodayTitle
22+
return LocalizableStrings.unconfiguredViewJetpackTodayTitle
2323
case .allTime:
24-
return AppConfiguration.Widget.Localization.unconfiguredViewAllTimeTitle
24+
return LocalizableStrings.unconfiguredViewJetpackAllTimeTitle
2525
case .thisWeek:
26-
return AppConfiguration.Widget.Localization.unconfiguredViewThisWeekTitle
26+
return LocalizableStrings.unconfiguredViewJetpackThisWeekTitle
2727
}
2828
case .noSite(let widgetKind):
2929
switch widgetKind {

0 commit comments

Comments
 (0)