Skip to content

Remove expired items from disk in background thread #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pilot34 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Remove expired items from disk in background thread #54

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5570bde
moved clearing expired items to background
pilot34 Nov 16, 2015
c69a634
spaces to tabs
pilot34 Nov 16, 2015
a8cfb4b
fixed init method
pilot34 Nov 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions EGOCache.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,25 @@ + (instancetype)globalCache {
return instance;
}

- (void)removeOldCachesDirectory {
dispatch_async(_diskQueue, ^{
NSString* cachesDirectory = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES)[0];
NSString* oldCachesDirectory = [[[cachesDirectory stringByAppendingPathComponent:[[NSProcessInfo processInfo] processName]] stringByAppendingPathComponent:@"EGOCache"] copy];

if([[NSFileManager defaultManager] fileExistsAtPath:oldCachesDirectory]) {
[[NSFileManager defaultManager] removeItemAtPath:oldCachesDirectory error:NULL];
}
});
}

- (instancetype)init {
NSString* cachesDirectory = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES)[0];
NSString* oldCachesDirectory = [[[cachesDirectory stringByAppendingPathComponent:[[NSProcessInfo processInfo] processName]] stringByAppendingPathComponent:@"EGOCache"] copy];

if([[NSFileManager defaultManager] fileExistsAtPath:oldCachesDirectory]) {
[[NSFileManager defaultManager] removeItemAtPath:oldCachesDirectory error:NULL];
NSString* egoCacheDirectory = [[[cachesDirectory stringByAppendingPathComponent:[[NSBundle mainBundle] bundleIdentifier]] stringByAppendingPathComponent:@"EGOCache"] copy];
self = [self initWithCacheDirectory:egoCacheDirectory];
if (self) {
[self removeOldCachesDirectory];
}

cachesDirectory = [[[cachesDirectory stringByAppendingPathComponent:[[NSBundle mainBundle] bundleIdentifier]] stringByAppendingPathComponent:@"EGOCache"] copy];
return [self initWithCacheDirectory:cachesDirectory];
return self;
}

- (instancetype)initWithCacheDirectory:(NSString*)cacheDirectory {
Expand All @@ -104,20 +113,25 @@ - (instancetype)initWithCacheDirectory:(NSString*)cacheDirectory {
if(!_cacheInfo) {
_cacheInfo = [[NSMutableDictionary alloc] init];
}

[[NSFileManager defaultManager] createDirectoryAtPath:_directory withIntermediateDirectories:YES attributes:nil error:NULL];

dispatch_async(_diskQueue, ^{
[[NSFileManager defaultManager] createDirectoryAtPath:_directory withIntermediateDirectories:YES attributes:nil error:NULL];
});

NSTimeInterval now = [[NSDate date] timeIntervalSinceReferenceDate];
NSMutableArray* removedKeys = [[NSMutableArray alloc] init];

for(NSString* key in _cacheInfo) {
if([_cacheInfo[key] timeIntervalSinceReferenceDate] <= now) {
[[NSFileManager defaultManager] removeItemAtPath:cachePathForKey(_directory, key) error:NULL];
dispatch_async(_diskQueue, ^{
[[NSFileManager defaultManager] removeItemAtPath:cachePathForKey(_directory, key) error:NULL];
});
[removedKeys addObject:key];
}
}

[_cacheInfo removeObjectsForKeys:removedKeys];

self.frozenCacheInfo = _cacheInfo;
[self setDefaultTimeoutInterval:86400];
}
Expand Down