Add strings file name selection

This covers a use case where multiple strings tables are used used by
one project

Author: Tim Chilvers

SCStringsUtility/SCRootViewController.m

@@ -243,10 +243,13 @@ - (IBAction)onOpenClick:(id)sender
 
             BOOL includePositionalParameters = [self.openPanelAccessoryView shouldAddPositionalParameters];
             NSString *routine = [self.openPanelAccessoryView genstringsRoutine];
+            NSString *stringsFile = [self.openPanelAccessoryView stringsFileName];
 
             [self.stringsController importProjectAtPath:[[openPanel URL] path]
                                    positionalParameters:includePositionalParameters
-                                      genstringsRoutine:routine success:^{ [self reloadData];}
+                                      genstringsRoutine:routine
+                                        stringsFileName:stringsFile
+                                                success:^{ [self reloadData];}
                                                 failure:^(NSError *error) { SCLog(@"Could not import Xcode project %@", error);}];
             break;
         }

SCStringsUtility/SCStringsController.h

@@ -26,6 +26,7 @@
 - (void)importProjectAtPath:(NSString*)path
        positionalParameters:(BOOL)includePositionalParameters
           genstringsRoutine:(NSString*)genstringsRoutine
+            stringsFileName:(NSString*)stringsFileName
                     success:(void (^)(void))success
                     failure:(void(^)(NSError *error))failure;
 

SCStringsUtility/SCStringsController.m

@@ -187,16 +187,26 @@ - (void)importCSVFileAtPath:(NSString *)path success:(void (^)(void))success fai
 - (void)importProjectAtPath:(NSString *)path
        positionalParameters:(BOOL)includePositionalParameters
           genstringsRoutine:(NSString *)genstringsRoutine
+            stringsFileName:(NSString*)stringsFileName
                     success:(void (^)(void))success
                     failure:(void (^)(NSError *))failure
 {
     self.project = [[XCProject alloc] initWithFilePath:path];
     self.sourceFilePath = nil;
     self.sourceType = SCFileTypeXcodeProject;
 
+    NSString *stringsFileNamesWithoutExtension = nil;
+    
+    if (![stringsFileName length]) {
+        stringsFileName = kKeyStringsFile;
+        stringsFileNamesWithoutExtension = kKeyLocalizable;
+    } else {
+        stringsFileNamesWithoutExtension = [stringsFileName stringByDeletingPathExtension];
+    }
+    
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
         NSArray *files = [self.project.files filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(XCSourceFile *evaluatedObject, NSDictionary *bindings) {
-            return [[evaluatedObject.name lastPathComponent] isEqualToString:kKeyStringsFile];
+            return [[evaluatedObject.name lastPathComponent] isEqualToString:stringsFileName];
         }]];
 
         for(XCSourceFile *file in files)
@@ -206,7 +216,7 @@ - (void)importProjectAtPath:(NSString *)path
 
             XCGroup *parentGroup = [[self.project groupForGroupMemberWithKey:file.key] parentGroup];
 
-            NSString *categoryName = [[parentGroup displayName] stringByAppendingPathComponent:kKeyLocalizable];
+            NSString *categoryName = [[parentGroup displayName] stringByAppendingPathComponent:stringsFileNamesWithoutExtension];
             if(![self.translationFiles objectForKey:categoryName])
                 [self.translationFiles setObject:[NSMutableArray array] forKey:categoryName];
 
@@ -218,7 +228,7 @@ - (void)importProjectAtPath:(NSString *)path
         }
 
         [self executeGenStringsAtPath:[self.project.filePath stringByDeletingLastPathComponent] withRoutine:genstringsRoutine positionalParameters:includePositionalParameters];
-        SCReader *genstringsOutputReader = [[SCReader alloc] initWithPath:[NSTemporaryDirectory() stringByAppendingPathComponent:kKeyStringsFile]];
+        SCReader *genstringsOutputReader = [[SCReader alloc] initWithPath:[NSTemporaryDirectory() stringByAppendingPathComponent:stringsFileName]];
         NSString *comment, *key, *translation;
         while([genstringsOutputReader getNextComment:&comment key:&key translation:&translation]) {
             [self.translationsDictionary setObject:[NSMutableDictionary dictionaryWithObject:comment forKey:kKeyComment] forKey:key];

SCStringsUtility/Views/SCOpenAccessoryView.h

@@ -12,5 +12,6 @@
 
 - (NSString*)genstringsRoutine;
 - (BOOL)shouldAddPositionalParameters;
+- (NSString*)stringsFileName;
 
 @end

SCStringsUtility/Views/SCOpenAccessoryView.m

@@ -10,6 +10,7 @@
 
 @interface SCOpenAccessoryView ()
 @property (nonatomic, weak) IBOutlet NSTextField *genstringsRoutineTextField;
+@property (nonatomic, weak) IBOutlet NSTextField *stringsFileNameTextField;
 @property (nonatomic, weak) IBOutlet NSButton *shouldAddPositionalParametersButton;
 @end
 
@@ -26,4 +27,9 @@ - (BOOL)shouldAddPositionalParameters
     return self.shouldAddPositionalParametersButton.state;
 }
 
+- (NSString*)stringsFileName
+{
+    return self.stringsFileNameTextField.stringValue;
+}
+
 @end