Skip to content

Commit e5ec4c9

Browse files
committed
^ Cached downloads deletion
1 parent e447546 commit e5ec4c9

File tree

3 files changed

+29
-3
lines changed

3 files changed

+29
-3
lines changed

Cork/Localizable.xcstrings

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38969,6 +38969,16 @@
3896938969
}
3897038970
}
3897138971
},
38972+
"maintenance.results.cached-downloads.could-not-determine-reclaimed-space" : {
38973+
"localizations" : {
38974+
"en" : {
38975+
"stringUnit" : {
38976+
"state" : "translated",
38977+
"value" : "Couldn’t determine how much space was freed"
38978+
}
38979+
}
38980+
}
38981+
},
3897238982
"maintenance.results.cached-downloads.summary-%@" : {
3897338983
"localizations" : {
3897438984
"cs" : {

Cork/Views/Maintenance/Sub-Views/Maintenance Finished View.swift

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ struct MaintenanceFinishedView: View
1717
{
1818
struct CachePurgeResults
1919
{
20-
let reclaimedSpace: Int?
2120
let packagesHoldingBackPurge: [String]?
2221
}
2322

@@ -26,13 +25,19 @@ struct MaintenanceFinishedView: View
2625
let numberOfOprhansRemoved: Int?
2726
}
2827

28+
struct CachedDownloadsRemovalResults
29+
{
30+
let reclaimedSpace: Int?
31+
}
32+
2933
struct HealthCheckResults
3034
{
3135
let healthCheckResults: MaintenanceView.HealthCheckStatus
3236
}
3337

3438
let cachePurgeResults: CachePurgeResults?
3539
let orphanRemovalResults: OrphanRemovalResults?
40+
let cachedDownloadsRemovalResults: CachedDownloadsRemovalResults?
3641
let healthCheckResults: HealthCheckResults?
3742
}
3843

@@ -216,7 +221,7 @@ struct MaintenanceFinishedView: View
216221
{
217222
if selectedMaintenanceStepsTracker.shouldDeleteDownloads
218223
{
219-
if let reclaimedSpaceAfterCachePurge = maintenanceResults.cachePurgeResults?.reclaimedSpace
224+
if let reclaimedSpaceAfterCachePurge = maintenanceResults.cachedDownloadsRemovalResults?.reclaimedSpace
220225
{
221226
VStack(alignment: .leading)
222227
{
@@ -230,6 +235,10 @@ struct MaintenanceFinishedView: View
230235
.fixedSize(horizontal: false, vertical: true)
231236
}
232237
}
238+
else
239+
{
240+
Text("maintenance.results.cached-downloads.could-not-determine-reclaimed-space")
241+
}
233242
}
234243
else
235244
{

Cork/Views/Maintenance/Sub-Views/Maintenance Running View.swift

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ struct MaintenanceRunningView: View
2626

2727
@State private var cachePurgeResults: MaintenanceResults.CachePurgeResults?
2828
@State private var orphanRemovalResults: MaintenanceResults.OrphanRemovalResults?
29+
@State private var cachedDownloadsRemovalResults: MaintenanceResults.CachedDownloadsRemovalResults?
2930
@State private var healthCheckResuts: MaintenanceResults.HealthCheckResults?
3031

3132
var body: some View
@@ -75,7 +76,6 @@ struct MaintenanceRunningView: View
7576
let reclaimedSpaceAfterPurge: Int = cacheSizeBeforePurge - cacheSizeAfterPurge
7677

7778
cachePurgeResults = .init(
78-
reclaimedSpace: reclaimedSpaceAfterPurge,
7979
packagesHoldingBackPurge: packagesHoldingBackPurge
8080
)
8181
}
@@ -97,7 +97,13 @@ struct MaintenanceRunningView: View
9797

9898
do throws(CachedDownloadDeletionError)
9999
{
100+
let cachedDownloadsSizeBeforeDeletion: Int = cachedDownloadsTracker.cachedDownloadsSize
101+
100102
try deleteCachedDownloads()
103+
104+
let cachedDownloadsSizeAfterDeletion: Int = cachedDownloadsTracker.cachedDownloadsSize
105+
106+
cachedDownloadsRemovalResults = .init(reclaimedSpace: cachedDownloadsSizeBeforeDeletion - cachedDownloadsSizeAfterDeletion)
101107
}
102108
catch let cacheDeletionError
103109
{
@@ -147,6 +153,7 @@ struct MaintenanceRunningView: View
147153
let maintenanceResults: MaintenanceResults = .init(
148154
cachePurgeResults: cachePurgeResults,
149155
orphanRemovalResults: orphanRemovalResults,
156+
cachedDownloadsRemovalResults: cachedDownloadsRemovalResults,
150157
healthCheckResults: healthCheckResuts
151158
)
152159

0 commit comments

Comments
 (0)