Favorites saving:

- Switch to using a UUID for the backup filename to prevent issues of it already existing.
- Fix an obvious logic error whereby the saving would be aborted when we couldn't create the backup file (fixes issue #1357).

1 files changed, 24 insertions, 25 deletions

diff --git a/Source/SPFavoritesController.m b/Source/SPFavoritesController.m
index 2a432326..0a069b3a 100644
--- a/Source/SPFavoritesController.m
+++ b/Source/SPFavoritesController.m
@@ -369,7 +369,7 @@ static SPFavoritesController *sharedFavoritesController = nil;
 	}
 	
 	NSString *favoritesFile = [dataPath stringByAppendingPathComponent:SPFavoritesDataFile];
-	NSString *favoritesBackupFile = [dataPath stringByAppendingPathComponent:[@"~" stringByAppendingString:SPFavoritesDataFile]];
+	NSString *favoritesBackupFile = [dataPath stringByAppendingPathComponent:[NSString stringWithNewUUID]];
 	
 	// If the favorites data file already exists, attempt to move it to keep as a backup
 	if ([fileManager fileExistsAtPath:favoritesFile]) {
@@ -389,36 +389,35 @@ static SPFavoritesController *sharedFavoritesController = nil;
 			return;
 		}
 	}
-	else {
-		NSDictionary *dictionary = [NSDictionary dictionaryWithObject:data forKey:SPFavoritesRootKey];
-		
-		// Convert the current favorites tree to a dictionary representation to create the plist data
-		NSData *plistData = [NSPropertyListSerialization dataFromPropertyList:dictionary
-																	   format:NSPropertyListXMLFormat_v1_0
-															 errorDescription:&errorString];
+	
+	NSDictionary *dictionary = [NSDictionary dictionaryWithObject:data forKey:SPFavoritesRootKey];
+	
+	// Convert the current favorites tree to a dictionary representation to create the plist data
+	NSData *plistData = [NSPropertyListSerialization dataFromPropertyList:dictionary
+																   format:NSPropertyListXMLFormat_v1_0
+														 errorDescription:&errorString];
+	
+	if (plistData) {
+		[plistData writeToFile:favoritesFile options:NSAtomicWrite error:&error];
 		
-		if (plistData) {
-			[plistData writeToFile:favoritesFile options:NSAtomicWrite error:&error];
+		if (error) {
+			NSLog(@"Error writing favorites data. Restoring backup if available: %@", [error localizedDescription]);
 			
-			if (error) {
-				NSLog(@"Error writing favorites data. Restoring backup if available: %@", [error localizedDescription]);
-				
-				// Restore the original data file
-				[fileManager moveItemAtPath:favoritesBackupFile toPath:favoritesFile error:NULL];
-			}
-			else {
-				// Remove the original backup
-				[fileManager removeItemAtPath:favoritesBackupFile error:NULL];
-			}
+			// Restore the original data file
+			[fileManager moveItemAtPath:favoritesBackupFile toPath:favoritesFile error:NULL];
 		}
-		else if (errorString) {
-			NSLog(@"Error converting favorites data to plist format: %@", errorString);
-			
-			[errorString release];
-			
+		else {
+			// Remove the original backup
 			[fileManager removeItemAtPath:favoritesBackupFile error:NULL];
 		}
 	}
+	else if (errorString) {
+		NSLog(@"Error converting favorites data to plist format: %@", errorString);
+		
+		[errorString release];
+		
+		[fileManager removeItemAtPath:favoritesBackupFile error:NULL];
+	}
 	
 	pthread_mutex_unlock(&writeLock);