XML export/import support (NSPropertyListXMLFormat_v1_0)

stefanceriu · stefanceriu · commit 36900fc796d0 · 2013-02-06T00:20:45.000+02:00
diff --git a/README.md b/README.md
@@ -1,29 +1,30 @@
 # SCStringsUtility
 
-SCStringsUtility is a simple OS X Application built for easing the way we deal with localizable strings. It started off as a simple to/from CSV utility but ended up being a little bit more than that.
+SCStringsUtility is an OS X Application built for easing the way we deal with localizable strings. It started off as a simple to/from CSV utility but ended up being a little bit more than that.
 
 ![SCStringsUtility](http://dl.dropbox.com/u/12748201/SCStringsUtility.png)
 
 ## Features
 * Import from Xcode project using genstrings and its .string files (options for a different genstrings routine and positional parameters)
 
-* Console for displaying genstrings warnings
-
-* Save back on top of the original files
+* Export to Localizable.strings/CSV/XML (with comments / key for missing translations)
 
-* Export to CSV/Localizable.strings
+* Import from CSV/XML
 
-* Import from CSV
+* Save back on top of the original files
 
 * Search (filter all or just the keys)
 
 * Editing & undo/redo support
 
+* Console for displaying genstrings warnings
+
 ## How to use it
 Fire up the application and point it to an .xcodeproj
 
 ## ToDo
 - Individual cell selection
+- Better error handling
  
 ## License
 SCStringsUtility is released under the GNU GENERAL PUBLIC LICENSE (see the LICENSE file)
diff --git a/SCStringsUtility.xcodeproj/project.pbxproj b/SCStringsUtility.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
 		1831CBE21628086A004B6DD4 /* SCRootViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1831CBE01628086A004B6DD4 /* SCRootViewController.xib */; };
 		1831CBE4162809E0004B6DD4 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1831CBE3162809E0004B6DD4 /* QuartzCore.framework */; };
 		1843F4501650EB9900CEDBEF /* icon-export.png in Resources */ = {isa = PBXBuildFile; fileRef = 1843F44C1650EB9900CEDBEF /* icon-export.png */; };
-		1843F4511650EB9900CEDBEF /* icon-import.png in Resources */ = {isa = PBXBuildFile; fileRef = 1843F44D1650EB9900CEDBEF /* icon-import.png */; };
 		1843F4521650EB9900CEDBEF /* icon-open.png in Resources */ = {isa = PBXBuildFile; fileRef = 1843F44E1650EB9900CEDBEF /* icon-open.png */; };
 		1843F4531650EB9900CEDBEF /* icon-save.png in Resources */ = {isa = PBXBuildFile; fileRef = 1843F44F1650EB9900CEDBEF /* icon-save.png */; };
 		186758CD1654C83F00BEE1E1 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 186758CC1654C83F00BEE1E1 /* MainMenu.xib */; };
@@ -53,7 +52,6 @@
 		1831CBE01628086A004B6DD4 /* SCRootViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SCRootViewController.xib; sourceTree = "<group>"; };
 		1831CBE3162809E0004B6DD4 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		1843F44C1650EB9900CEDBEF /* icon-export.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-export.png"; sourceTree = "<group>"; };
-		1843F44D1650EB9900CEDBEF /* icon-import.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-import.png"; sourceTree = "<group>"; };
 		1843F44E1650EB9900CEDBEF /* icon-open.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-open.png"; sourceTree = "<group>"; };
 		1843F44F1650EB9900CEDBEF /* icon-save.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-save.png"; sourceTree = "<group>"; };
 		186758CC1654C83F00BEE1E1 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
@@ -109,7 +107,6 @@
 			isa = PBXGroup;
 			children = (
 				1843F44C1650EB9900CEDBEF /* icon-export.png */,
-				1843F44D1650EB9900CEDBEF /* icon-import.png */,
 				1843F44E1650EB9900CEDBEF /* icon-open.png */,
 				1843F44F1650EB9900CEDBEF /* icon-save.png */,
 			);
@@ -272,7 +269,6 @@
 				18D36760162772B600B6BACE /* Credits.rtf in Resources */,
 				1831CBE21628086A004B6DD4 /* SCRootViewController.xib in Resources */,
 				1843F4501650EB9900CEDBEF /* icon-export.png in Resources */,
-				1843F4511650EB9900CEDBEF /* icon-import.png in Resources */,
 				1843F4521650EB9900CEDBEF /* icon-open.png in Resources */,
 				1843F4531650EB9900CEDBEF /* icon-save.png in Resources */,
 				186758CD1654C83F00BEE1E1 /* MainMenu.xib in Resources */,
diff --git a/SCStringsUtility/Others/OrderedDictionary.m b/SCStringsUtility/Others/OrderedDictionary.m
@@ -96,6 +96,7 @@ - (void)setObject:(id)anObject forKey:(id)aKey
 	if (![dictionary objectForKey:aKey])
 	{
 		[array addObject:aKey];
+        array = [[array sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)] mutableCopy];
 	}
 	[dictionary setObject:anObject forKey:aKey];
 }
diff --git a/SCStringsUtility/Resources/icon-import.png b/SCStringsUtility/Resources/icon-import.png
diff --git a/SCStringsUtility/SCRootViewController.m b/SCStringsUtility/SCRootViewController.m
@@ -132,11 +132,9 @@ - (IBAction)onExportClick:(id)sender
             {
                 case SCFileTypeXcodeProject:
                 {
-                    [self.stringsController generateStringFilesAtPath:[[self.exportPanel URL] path] success:^{
-                        
-                    } failure:^(NSError *error) {
-                        NSLog(@"Could not generate string files %@", error);
-                    }];
+                    [self.stringsController generateStringFilesAtPath:[[self.exportPanel URL] path]
+                                                              success:nil
+                                                              failure:nil];
                     
                     break;
                 }
@@ -145,16 +143,24 @@ - (IBAction)onExportClick:(id)sender
                     BOOL includeComments = [self.exportPanelAccessoryView shouldIncludeComments];
                     BOOL useKeyForMissingTranslations = [self.exportPanelAccessoryView shouldUseKeyForMissingTranslations];
                     
-                    [self.stringsController generateCSVAtPath:[[self.exportPanel URL] path] includeComments:includeComments useKeyForEmptyTranslations:useKeyForMissingTranslations success:^{
-                        
-                    } failure:^(NSError *error) {
-                        NSLog(@"Could not generate CSV file %@", error);
-                    }];
+                    [self.stringsController generateCSVAtPath:[[self.exportPanel URL] path]
+                                              includeComments:includeComments
+                                   useKeyForEmptyTranslations:useKeyForMissingTranslations
+                                                      success:nil
+                                                      failure:nil];
                     
                     break;
                 }
                 case SCFileTypeXML:
                 {
+                    BOOL includeComments = [self.exportPanelAccessoryView shouldIncludeComments];
+                    BOOL useKeyForMissingTranslations = [self.exportPanelAccessoryView shouldUseKeyForMissingTranslations];
+                    
+                    [self.stringsController generateXMLFileAtPath:[[self.exportPanel URL] path]
+                                                  includeComments:includeComments
+                                       useKeyForEmptyTranslations:useKeyForMissingTranslations
+                                                          success:nil
+                                                          failure:nil];
                     break;
                 }
                 default:
@@ -203,22 +209,9 @@ - (void)exportAccessoryView:(SCExportAccessoryView*)view didSelectFormatType:(SC
 
 - (IBAction)onSaveClick:(id)sender
 {
-    if(self.stringsController.sourceType == SCFileTypeInvalid) return;
-    
-    if(self.stringsController.sourceType == SCFileTypeXcodeProject) {
-        [self.stringsController generateStringFilesAtPath:nil success:^{
-            
-        } failure:^(NSError *error) {
-            NSLog(@"Could not generate string files %@", error);
-        }];
-    }
-    else {
-        [self.stringsController generateCSVAtPath:nil includeComments:YES useKeyForEmptyTranslations:NO success:^{
-            
-        } failure:^(NSError *error) {
-            NSLog(@"Could not generate CSV file %@", error);
-        }];
-    }
+    [self.stringsController save:nil failure:^(NSError *error) {
+        SCLog(@"Could not save data %@", error);
+    }];
 }
 
 - (IBAction)onOpenClick:(id)sender
@@ -230,7 +223,7 @@ - (IBAction)onOpenClick:(id)sender
     [openPanel setCanCreateDirectories:NO];
     [openPanel setAllowsMultipleSelection:NO];
     
-    [openPanel setAllowedFileTypes:@[@"xcodeproj", @"csv"]];
+    [openPanel setAllowedFileTypes:@[@"xcodeproj", @"csv", @"xml"]];
     
     NSInteger result = [openPanel runModal];
     if(result != NSOKButton) return;
@@ -254,19 +247,21 @@ - (IBAction)onOpenClick:(id)sender
             [self.stringsController importProjectAtPath:[[openPanel URL] path]
                                    positionalParameters:includePositionalParameters
                                       genstringsRoutine:routine success:^{ [self reloadData];}
-                                                failure:^(NSError *error) { NSLog(@"Could not import Xcode project %@", error);}];
+                                                failure:^(NSError *error) { SCLog(@"Could not import Xcode project %@", error);}];
             break;
         }
         case SCFileTypeCSV:
         {
             [self.stringsController importCSVFileAtPath:[[openPanel URL] path]
                                                 success:^{ [self reloadData];}
-                                                failure:^(NSError *error) { NSLog(@"Could not import CSV file %@",error);}];
+                                                failure:^(NSError *error) { SCLog(@"Could not import CSV file %@",error);}];
             break;
         }
         case SCFileTypeXML:
         {
-            
+            [self.stringsController importXMLFileAtPath:[[openPanel URL] path]
+                                                success:^{ [self reloadData]; }
+                                                failure:^(NSError *error) { SCLog(@"Could not import XML file %@",error);}];
         }
         default:
         {
diff --git a/SCStringsUtility/SCStringsController.h b/SCStringsUtility/SCStringsController.h
@@ -21,6 +21,8 @@
 
 - (void)reset;
 
+- (void)save:(void (^)(void))success failure:(void (^)(NSError *error))failure;
+
 - (void)importProjectAtPath:(NSString*)path
        positionalParameters:(BOOL)includePositionalParameters
           genstringsRoutine:(NSString*)genstringsRoutine
@@ -31,6 +33,10 @@
                     success:(void (^)(void))success
                     failure:(void(^)(NSError *error))failure;
 
+- (void)importXMLFileAtPath:(NSString*)path
+                    success:(void (^)(void))success
+                    failure:(void(^)(NSError *error))failure;
+
 - (void)generateCSVAtPath:(NSString *)path
           includeComments:(BOOL)includeComments
 useKeyForEmptyTranslations:(BOOL)useKeyForEmptyTranslations
@@ -41,6 +47,12 @@ useKeyForEmptyTranslations:(BOOL)useKeyForEmptyTranslations
                           success:(void (^)(void))success
                           failure:(void (^)(NSError *error))failure;
 
+- (void)generateXMLFileAtPath:(NSString*)path
+              includeComments:(BOOL)includeComments
+   useKeyForEmptyTranslations:(BOOL)useKeyForEmptyTranslations
+                      success:(void (^)(void))success
+                      failure:(void (^)(NSError *error))failure;
+
 - (void)filterEntriesWithSearchString:(NSString*)searchString onlyKeys:(BOOL)searchOnlyKeys;
 
 @end
diff --git a/SCStringsUtility/SCStringsController.m b/SCStringsUtility/SCStringsController.m

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ - (void)setObject:(id)anObject forKey:(id)aKey`
`96`	`96`	`if (![dictionary objectForKey:aKey])`
`97`	`97`	`{`
`98`	`98`	`[array addObject:aKey];`
	`99`	`+ array = [[array sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)] mutableCopy];`
`99`	`100`	`}`
`100`	`101`	`[dictionary setObject:anObject forKey:aKey];`
`101`	`102`	`}`