nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 18:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

extracted merge to function. Added action to merge arbitrary files

Browse Source
This commit is contained in:
michael starke
2017-05-18 12:10:49 +02:00
parent 0dd4a2cc1f
commit 10556d6c08
4 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MacPass/MPDocument.h
View File

@@ -150,6 +150,7 @@ FOUNDATION_EXPORT NSString *const MPDocumentGroupKey;
- (void)writeXMLToURL:(NSURL *)url; - (void)writeXMLToURL:(NSURL *)url;
- (void)readXMLfromURL:(NSURL *)url; - (void)readXMLfromURL:(NSURL *)url;
- (void)mergeWithContentsFromURL:(NSURL *)url;
/* Undoable Intiialization of elements */ /* Undoable Intiialization of elements */
- (KPKGroup *)createGroup:(KPKGroup *)parent; - (KPKGroup *)createGroup:(KPKGroup *)parent;

28
MacPass/MPDocument.m
View File

@@ -283,6 +283,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
self.fileChangeDialogOpen = YES; self.fileChangeDialogOpen = YES;
/* Dispatch the alert to the main queue */ /* Dispatch the alert to the main queue */
__weak MPDocument *welf = self;
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
NSAlert *alert = [[NSAlert alloc] init]; NSAlert *alert = [[NSAlert alloc] init];
@@ -292,18 +293,16 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
[alert addButtonWithTitle:NSLocalizedString(@"KEEP_MINE", @"Ignore the changes to an open file!")]; [alert addButtonWithTitle:NSLocalizedString(@"KEEP_MINE", @"Ignore the changes to an open file!")];
[alert addButtonWithTitle:NSLocalizedString(@"LOAD_CHANGES", @"Reopen the file!")]; [alert addButtonWithTitle:NSLocalizedString(@"LOAD_CHANGES", @"Reopen the file!")];
[alert addButtonWithTitle:NSLocalizedString(@"MERGE_CHANGES", @"Merge changes into file!")]; [alert addButtonWithTitle:NSLocalizedString(@"MERGE_CHANGES", @"Merge changes into file!")];
[alert beginSheetModalForWindow:self.windowForSheet completionHandler:^(NSModalResponse returnCode) { [alert beginSheetModalForWindow:welf.windowForSheet completionHandler:^(NSModalResponse returnCode) {
self.fileChangeDialogOpen = NO; welf.fileChangeDialogOpen = NO;
switch(returnCode) { switch(returnCode) {
case NSAlertSecondButtonReturn: case NSAlertSecondButtonReturn:
[self revertToContentsOfURL:self.fileURL ofType:self.fileType error:nil]; [welf revertToContentsOfURL:welf.fileURL ofType:welf.fileType error:nil];
break; break;
case NSAlertThirdButtonReturn: { case NSAlertThirdButtonReturn: {
KPKTree *otherTree = [[KPKTree alloc] initWithContentsOfUrl:self.fileURL key:self.compositeKey error:nil]; [welf mergeWithContentsFromURL:self.fileURL];
[self.tree syncronizeWithTree:otherTree options:KPKSynchronizationSynchronizeOption];
break;
} }
default: default:
break; break;
@@ -327,6 +326,23 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
self.encryptedData = nil; self.encryptedData = nil;
} }
- (void)mergeWithContentsFromURL:(NSURL *)url {
/* TODO read file to check what format to use */
NSError *error;
KPKTree *otherTree = [[KPKTree alloc] initWithContentsOfUrl:url key:self.compositeKey error:&error];
if(!otherTree) {
if(error.code == KPKErrorPasswordAndOrKeyfileWrong) {
[self presentError:error];
}
else {
[self presentError:error];
}
}
else {
[self.tree syncronizeWithTree:otherTree options:KPKSynchronizationSynchronizeOption];
}
}
#pragma mark Lock/Unlock/Decrypt #pragma mark Lock/Unlock/Decrypt
- (void)lockDatabase:(id)sender { - (void)lockDatabase:(id)sender {

1
MacPass/MPDocumentWindowController.h
View File

@@ -43,6 +43,7 @@
- (IBAction)editTrashGroup:(id)sender; - (IBAction)editTrashGroup:(id)sender;
- (IBAction)exportAsXML:(id)sender; - (IBAction)exportAsXML:(id)sender;
- (IBAction)mergeWithOther:(id)sender;
- (IBAction)importFromXML:(id)sender; - (IBAction)importFromXML:(id)sender;
- (IBAction)lock:(id)sender; - (IBAction)lock:(id)sender;

14
MacPass/MPDocumentWindowController.m
View File

@@ -296,6 +296,20 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
}]; }];
} }
- (void)mergeWithOther:(id)sender {
NSOpenPanel *openPanel = [NSOpenPanel openPanel];
MPDocument *document = self.document;
openPanel.allowsMultipleSelection = NO;
openPanel.canChooseDirectories = NO;
openPanel.canChooseFiles = YES;
//openPanel.allowedFileTypes = @[(id)kUTTypeXML];
[openPanel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) {
if(result == NSFileHandlingPanelOKButton) {
[document mergeWithContentsFromURL:openPanel.URL];
}
}];
}
- (void)fixAutotype:(id)sender { - (void)fixAutotype:(id)sender {
if(!self.fixAutotypeWindowController) { if(!self.fixAutotypeWindowController) {
self.fixAutotypeWindowController = [[MPFixAutotypeWindowController alloc] init]; self.fixAutotypeWindowController = [[MPFixAutotypeWindowController alloc] init];