pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Delete old "downloading" and "resume" files when Storage is initializing.

Browse source
This commit is contained in:
vng 2012-10-30 16:26:11 +03:00 • committed by Alex Zolotarev
parent 77564c5b7a
commit b90719b6cb
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -38,23 +38,19 @@
[fileManager removeItemAtPath:[documentsDirectoryPath stringByAppendingPathComponent:@"index.stamp"] error:nil];
[fileManager removeItemAtPath:[documentsDirectoryPath stringByAppendingPathComponent:@"index.idx"] error:nil];
// Delete ".downloading" and ".resume" files and disable iCloud backup for downloaded ".mwm" maps
// Disable iCloud backup for downloaded ".mwm" maps.
char const * attrName = "com.apple.MobileBackup";
NSArray * files = [fileManager contentsOfDirectoryAtPath:documentsDirectoryPath error:nil];
for (NSUInteger i = 0; i < [files count]; ++i)
{
NSString * fileName = [files objectAtIndex:i];
if (([fileName rangeOfString:@".downloading"].location != NSNotFound) ||
([fileName rangeOfString:@".resume"].location != NSNotFound))
{
[fileManager removeItemAtPath:[documentsDirectoryPath stringByAppendingPathComponent:fileName] error:nil];
}
else if ([fileName rangeOfString:@".mwm"].location != NSNotFound)
if ([fileName rangeOfString:@DATA_FILE_EXTENSION].location != NSNotFound)
{
// Disable iCloud backup
static char const * attrName = "com.apple.MobileBackup";
u_int8_t attrValue = 1;
int result = setxattr([[documentsDirectoryPath stringByAppendingPathComponent:fileName] UTF8String], attrName, &attrValue, sizeof(attrValue), 0, 0);
if (result == 0)
NSLog(@"Disabled iCloud backup for %@", fileName);
else

12
storage/storage.cpp
View file

@ -64,6 +64,18 @@ namespace storage
Storage::Storage() : m_currentSlotId(0)
{
LoadCountriesFile(false);
Platform & pl = GetPlatform();
string const dir = pl.WritableDir();
// Delete all: .mwm.downloading; .mwm.downloading2; .mwm.resume; .mwm.resume2
string const regexp = "\\" DATA_FILE_EXTENSION "\\.(downloading2?$|resume2?$)";
Platform::FilesList files;
pl.GetFilesByRegExp(dir, regexp, files);
for (size_t j = 0; j < files.size(); ++j)
FileWriter::DeleteFileX(dir + files[j]);
}
////////////////////////////////////////////////////////////////////////////