ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make max cache size functional again

Browse Source
This commit is contained in:
Ali 2022-12-24 22:45:14 +04:00
parent 3d821c8604
commit 880b97eaeb
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
submodules/Postbox/Sources/MediaBox.swift
View File

@ -193,11 +193,10 @@ public final class MediaBox {
postboxLog(string) postboxLog(string)
}), basePath: basePath + "/storage") }), basePath: basePath + "/storage")
self.timeBasedCleanup = TimeBasedCleanup(generalPaths: [ self.timeBasedCleanup = TimeBasedCleanup(storageBox: self.storageBox, generalPaths: [
//self.basePath,
self.basePath + "/cache", self.basePath + "/cache",
self.basePath + "/animation-cache" self.basePath + "/animation-cache"
], shortLivedPaths: [ ], totalSizeBasedPath: self.basePath, shortLivedPaths: [
self.basePath + "/short-cache" self.basePath + "/short-cache"
]) ])

19
submodules/Postbox/Sources/TimeBasedCleanup.swift
View File

@ -173,7 +173,9 @@ private func mapFiles(paths: [String], inodes: inout [InodeInfo], removeSize: UI
private final class TimeBasedCleanupImpl { private final class TimeBasedCleanupImpl {
private let queue: Queue private let queue: Queue
private let storageBox: StorageBox
private let generalPaths: [String] private let generalPaths: [String]
private let totalSizeBasedPath: String
private let shortLivedPaths: [String] private let shortLivedPaths: [String]
private var scheduledTouches: [String] = [] private var scheduledTouches: [String] = []
@ -197,9 +199,11 @@ private final class TimeBasedCleanupImpl {
} }
} }
init(queue: Queue, generalPaths: [String], shortLivedPaths: [String]) { init(queue: Queue, storageBox: StorageBox, generalPaths: [String], totalSizeBasedPath: String, shortLivedPaths: [String]) {
self.queue = queue self.queue = queue
self.storageBox = storageBox
self.generalPaths = generalPaths self.generalPaths = generalPaths
self.totalSizeBasedPath = totalSizeBasedPath
self.shortLivedPaths = shortLivedPaths self.shortLivedPaths = shortLivedPaths
} }
@ -220,6 +224,7 @@ private final class TimeBasedCleanupImpl {
private func resetScan(general: Int32, shortLived: Int32, gigabytesLimit: Int32) { private func resetScan(general: Int32, shortLived: Int32, gigabytesLimit: Int32) {
let generalPaths = self.generalPaths let generalPaths = self.generalPaths
let totalSizeBasedPath = self.totalSizeBasedPath
let shortLivedPaths = self.shortLivedPaths let shortLivedPaths = self.shortLivedPaths
let scanOnce = Signal<Never, NoError> { subscriber in let scanOnce = Signal<Never, NoError> { subscriber in
DispatchQueue.global(qos: .background).async { DispatchQueue.global(qos: .background).async {
@ -255,6 +260,14 @@ private final class TimeBasedCleanupImpl {
removedGeneralCount += scanResult.unlinkedCount removedGeneralCount += scanResult.unlinkedCount
totalLimitSize += scanResult.totalSize totalLimitSize += scanResult.totalSize
} }
do {
let scanResult = scanFiles(at: totalSizeBasedPath, olderThan: 0, inodes: &inodes)
if !paths.contains(totalSizeBasedPath) {
paths.append(totalSizeBasedPath)
}
removedGeneralCount += scanResult.unlinkedCount
totalLimitSize += scanResult.totalSize
}
if totalLimitSize > bytesLimit { if totalLimitSize > bytesLimit {
mapFiles(paths: paths, inodes: &inodes, removeSize: totalLimitSize - bytesLimit) mapFiles(paths: paths, inodes: &inodes, removeSize: totalLimitSize - bytesLimit)
@ -318,10 +331,10 @@ final class TimeBasedCleanup {
private let queue = Queue() private let queue = Queue()
private let impl: QueueLocalObject<TimeBasedCleanupImpl> private let impl: QueueLocalObject<TimeBasedCleanupImpl>
init(generalPaths: [String], shortLivedPaths: [String]) { init(storageBox: StorageBox, generalPaths: [String], totalSizeBasedPath: String, shortLivedPaths: [String]) {
let queue = self.queue let queue = self.queue
self.impl = QueueLocalObject(queue: self.queue, generate: { self.impl = QueueLocalObject(queue: self.queue, generate: {
return TimeBasedCleanupImpl(queue: queue, generalPaths: generalPaths, shortLivedPaths: shortLivedPaths) return TimeBasedCleanupImpl(queue: queue, storageBox: storageBox, generalPaths: generalPaths, totalSizeBasedPath: totalSizeBasedPath, shortLivedPaths: shortLivedPaths)
}) })
} }

7
submodules/TelegramCore/Sources/Account/Account.swift
View File

@ -1191,15 +1191,14 @@ public class Account {
if !supplementary { if !supplementary {
let mediaBox = postbox.mediaBox let mediaBox = postbox.mediaBox
/*self.storageSettingsDisposable = accountManager.sharedData(keys: [SharedDataKeys.cacheStorageSettings]).start(next: { [weak mediaBox] sharedData in let _ = (accountManager.sharedData(keys: [SharedDataKeys.cacheStorageSettings])
|> take(1)).start(next: { [weak mediaBox] sharedData in
guard let mediaBox = mediaBox else { guard let mediaBox = mediaBox else {
return return
} }
let settings: CacheStorageSettings = sharedData.entries[SharedDataKeys.cacheStorageSettings]?.get(CacheStorageSettings.self) ?? CacheStorageSettings.defaultSettings let settings: CacheStorageSettings = sharedData.entries[SharedDataKeys.cacheStorageSettings]?.get(CacheStorageSettings.self) ?? CacheStorageSettings.defaultSettings
mediaBox.setMaxStoreTimes(general: settings.defaultCacheStorageTimeout, shortLived: 60 * 60, gigabytesLimit: settings.defaultCacheStorageLimitGigabytes) mediaBox.setMaxStoreTimes(general: settings.defaultCacheStorageTimeout, shortLived: 60 * 60, gigabytesLimit: settings.defaultCacheStorageLimitGigabytes)
})*/ })
mediaBox.setMaxStoreTimes(general: 1 * 24 * 60 * 60, shortLived: 60 * 60, gigabytesLimit: 100 * 1024 * 1024)
} }
let _ = masterNotificationsKey(masterNotificationKeyValue: self.masterNotificationKey, postbox: self.postbox, ignoreDisabled: false, createIfNotExists: true).start(next: { key in let _ = masterNotificationsKey(masterNotificationKeyValue: self.masterNotificationKey, postbox: self.postbox, ignoreDisabled: false, createIfNotExists: true).start(next: { key in