From 00adfa6f3d20d316bd0d6262bd4d62343e097ebc Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 4 Jun 2015 13:52:16 +0300 Subject: [PATCH] improved logging of Updater in os x --- Telegram/SourceFiles/_other/updater_osx.m | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/_other/updater_osx.m b/Telegram/SourceFiles/_other/updater_osx.m index 1d0a1d9a77..6494523061 100644 --- a/Telegram/SourceFiles/_other/updater_osx.m +++ b/Telegram/SourceFiles/_other/updater_osx.m @@ -55,8 +55,14 @@ void writeLog(NSString *msg) { } void delFolder() { - [[NSFileManager defaultManager] removeItemAtPath:[workDir stringByAppendingString:@"tupdates/ready"] error:nil]; // remove old - [[NSFileManager defaultManager] removeItemAtPath:[workDir stringByAppendingString:@"tupdates/temp"] error:nil]; + writeLog([@"Fully clearing old path: " stringByAppendingString:[workDir stringByAppendingString:@"tupdates/ready"]]); + if (![[NSFileManager defaultManager] removeItemAtPath:[workDir stringByAppendingString:@"tupdates/ready"] error:nil]) { + writeLog(@"Failed to clear old path! :( New path was used?.."); + } + writeLog([@"Fully clearing new path: " stringByAppendingString:[workDir stringByAppendingString:@"tupdates/temp"]]); + if (![[NSFileManager defaultManager] removeItemAtPath:[workDir stringByAppendingString:@"tupdates/temp"] error:nil]) { + writeLog(@"Error: failed to clear new path! :("); + } rmdir([[workDir stringByAppendingString:@"tupdates"] fileSystemRepresentation]); } @@ -136,9 +142,12 @@ int main(int argc, const char * argv[]) { NSFileManager *fileManager = [NSFileManager defaultManager]; NSString *readyFilePath = [workDir stringByAppendingString:@"tupdates/temp/ready"]; NSString *srcDir = [workDir stringByAppendingString:@"tupdates/temp/"], *srcEnum = [workDir stringByAppendingString:@"tupdates/temp"]; - if (![fileManager fileExistsAtPath:readyFilePath]) { + if ([fileManager fileExistsAtPath:readyFilePath]) { + writeLog([@"Ready file found! Using new path: " stringByAppendingString: srcEnum]); + } else { srcDir = [workDir stringByAppendingString:@"tupdates/ready/"]; // old srcEnum = [workDir stringByAppendingString:@"tupdates/ready"]; + writeLog([@"Ready file not found! Using old path: " stringByAppendingString: srcEnum]); } writeLog([@"Starting update files iteration, path: " stringByAppendingString: srcEnum]);