From 06dc591b9e71dbae2a5e2197bc515ff2a66edc70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Tue, 3 Jan 2012 23:43:49 +0100 Subject: [PATCH] Extracted homeDirectory method --- Classes/AppDelegate.h | 1 + Classes/AppDelegate.m | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Classes/AppDelegate.h b/Classes/AppDelegate.h index 72ff798..45818f1 100644 --- a/Classes/AppDelegate.h +++ b/Classes/AppDelegate.h @@ -17,6 +17,7 @@ @property (nonatomic, retain) IBOutlet UIWindow *window; @property (nonatomic, retain) IBOutlet UITabBarController *tabBarController; +- (NSString *) homeDirectory; - (NSString *) saveDirectory:(NSString *)subDirectory; @end diff --git a/Classes/AppDelegate.m b/Classes/AppDelegate.m index b1e6e7d..c59e855 100644 --- a/Classes/AppDelegate.m +++ b/Classes/AppDelegate.m @@ -24,15 +24,19 @@ - (void) applicationDidFinishLaunching:(UIApplication *)application [self.window addSubview:self.tabBarController.view]; } +- (NSString *) homeDirectory +{ + NSString *logname = [NSString stringWithCString:getenv("LOGNAME") encoding:NSUTF8StringEncoding]; + struct passwd *pw = getpwnam([logname UTF8String]); + return pw ? [NSString stringWithCString:pw->pw_dir encoding:NSUTF8StringEncoding] : [@"/Users" stringByAppendingPathComponent:logname]; +} + - (NSString *) saveDirectory:(NSString *)subDirectory { NSString *saveDirectory = nil; #if TARGET_IPHONE_SIMULATOR - NSString *logname = [NSString stringWithCString:getenv("LOGNAME") encoding:NSUTF8StringEncoding]; - struct passwd *pw = getpwnam([logname UTF8String]); - NSString *home = pw ? [NSString stringWithCString:pw->pw_dir encoding:NSUTF8StringEncoding] : [@"/Users" stringByAppendingPathComponent:logname]; - saveDirectory = [NSString stringWithFormat:@"%@/Desktop/%@ %@ artwork", home, [UIDevice currentDevice].model, [UIDevice currentDevice].systemVersion]; + saveDirectory = [NSString stringWithFormat:@"%@/Desktop/%@ %@ artwork", [self homeDirectory], [UIDevice currentDevice].model, [UIDevice currentDevice].systemVersion]; #else saveDirectory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject]; #endif