From 14366819288ab5c9755271ceee06325b5011023b Mon Sep 17 00:00:00 2001
From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Fri, 24 Aug 2018 16:30:20 -0400
Subject: [PATCH] fix: export account

This patch:
- use right account id for exported account
- fix path selection

Change-Id: I4df8b8ad8705cf5a27a91eadc3dc32e49f7260fa
Reviewed-by: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
---
 src/AccRingGeneralVC.mm               |  1 +
 src/BackupAccountWC.h                 |  3 +-
 src/BackupAccountWC.mm                | 45 +++++++++++++++++----------
 ui/Base.lproj/BackupAccountWindow.xib |  6 +++-
 4 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/AccRingGeneralVC.mm b/src/AccRingGeneralVC.mm
index fb5bdc20..1486a83e 100644
--- a/src/AccRingGeneralVC.mm
+++ b/src/AccRingGeneralVC.mm
@@ -398,6 +398,7 @@ typedef NS_ENUM(NSInteger, TagViews) {
     BackupAccountWC* passwordWC = [[BackupAccountWC alloc] initWithNibName:@"BackupAccountWindow" bundle: nil accountmodel: self.accountModel];
     passwordWC.delegate = self;
     [passwordWC setAllowFileSelection:NO];
+    passwordWC.selectedAccountID = self.selectedAccountID;
     accountModal = passwordWC;
     [self.view.window beginSheet:passwordWC.window completionHandler:nil];
 }
diff --git a/src/BackupAccountWC.h b/src/BackupAccountWC.h
index b1e1905c..d68b42e0 100644
--- a/src/BackupAccountWC.h
+++ b/src/BackupAccountWC.h
@@ -33,11 +33,12 @@
 
 @end
 
-@interface BackupAccountWC : AbstractLoadingWC <LrcModelsProtocol>
+@interface BackupAccountWC : AbstractLoadingWC <LrcModelsProtocol, NSPathControlDelegate, NSOpenSavePanelDelegate>
 
 /**
  * Allow the NSPathControl of this window to select files or not
  */
 @property (nonatomic) BOOL allowFileSelection;
+@property std::string selectedAccountID;
 
 @end
diff --git a/src/BackupAccountWC.mm b/src/BackupAccountWC.mm
index 803ab948..67293921 100644
--- a/src/BackupAccountWC.mm
+++ b/src/BackupAccountWC.mm
@@ -73,24 +73,17 @@
 
 - (IBAction)completeAction:(id)sender
 {
-    auto accounts = accountModel->getAccountList();
-    if(accounts.empty()) {
-        return;
-    }
-    auto selectedAccountID = accounts.at(0);
-    auto finalURL = [path.URL URLByAppendingPathComponent:[@"Account_" stringByAppendingString: @(selectedAccountID.c_str())]];
+    auto finalURL = [path.URL URLByAppendingPathComponent:[@"Account_" stringByAppendingString: @(std::string(self.selectedAccountID + ".gz").c_str())]];
     [self showLoading];
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        if (self.accountModel->exportToFile(selectedAccountID, finalURL.path.UTF8String)) {
-            if (delegateRespondsTo.didCompleteExport) {
-                [((id<BackupAccountDelegate>)self.delegate) didCompleteExportWithPath:finalURL];
-            }
-            [self close];
-            [self.window.sheetParent endSheet: self.window];
-        } else {
-            [self showError];
+    if (self.accountModel->exportToFile(self.selectedAccountID, finalURL.path.UTF8String)) {
+        if (delegateRespondsTo.didCompleteExport) {
+            [((id<BackupAccountDelegate>)self.delegate) didCompleteExportWithPath:finalURL];
         }
-    });
+        [self close];
+        [self.window.sheetParent endSheet: self.window];
+    } else {
+        [self showError];
+    }
 }
 
 - (void)showLoading
@@ -102,4 +95,24 @@
     [super showLoading];
 }
 
+- (IBAction)pathControlSingleClick:(id)sender {
+    [path setURL:[[path clickedPathComponentCell] URL]];
+}
+
+#pragma mark - NSPathControlDelegate
+
+- (void)pathControl:(NSPathControl *)pathControl willPopUpMenu:(NSMenu *)menu {
+    while ([[menu itemArray] count] >= 4) {
+        [menu removeItemAtIndex:3];
+    }
+}
+- (void)pathControl:(NSPathControl *)pathControl willDisplayOpenPanel:(NSOpenPanel *)openPanel
+{
+    NSLog(@"willDisplayOpenPanel");
+    [openPanel setAllowsMultipleSelection:NO];
+    [openPanel setResolvesAliases:YES];
+    [openPanel setDirectory:NSHomeDirectory()];
+    [openPanel setDelegate:self];
+}
+
 @end
diff --git a/ui/Base.lproj/BackupAccountWindow.xib b/ui/Base.lproj/BackupAccountWindow.xib
index 80109e23..170c04d2 100644
--- a/ui/Base.lproj/BackupAccountWindow.xib
+++ b/ui/Base.lproj/BackupAccountWindow.xib
@@ -87,9 +87,13 @@ DQ
                                 <rect key="frame" x="47" y="74" width="286" height="26"/>
                                 <pathCell key="cell" selectable="YES" editable="YES" alignment="left" pathStyle="popUp" id="S8N-6a-Pll">
                                     <font key="font" metaFont="system"/>
-                                    <url key="url" string="file:///Users/"/>
+                                    <url key="url" string="file:///Downloads"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </pathCell>
+                                <connections>
+                                    <action selector="pathControlSingleClick:" target="-2" id="ATY-Ld-Sok"/>
+                                    <outlet property="delegate" destination="-2" id="m1j-G8-TUK"/>
+                                </connections>
                             </pathControl>
                             <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="CR7-hP-0ow">
                                 <rect key="frame" x="18" y="128" width="344" height="20"/>
-- 
GitLab