From 12b8442e717d3b61ae9e82c5b0e6e4766ad572fd Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Wed, 23 Jan 2019 14:32:47 -0800
Subject: [PATCH] Can pull folder on Windows.

---
 tools/nitpick/src/Nitpick.cpp          |  2 +-
 tools/nitpick/src/TestRunnerMobile.cpp | 21 ++++++++++++++++-----
 tools/nitpick/src/TestRunnerMobile.h   | 11 ++++++++++-
 tools/nitpick/ui/Nitpick.ui            |  3 +++
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/tools/nitpick/src/Nitpick.cpp b/tools/nitpick/src/Nitpick.cpp
index 36de8c4799..4e3a50c7d2 100644
--- a/tools/nitpick/src/Nitpick.cpp
+++ b/tools/nitpick/src/Nitpick.cpp
@@ -93,7 +93,7 @@ void Nitpick::setup() {
     if (_testRunnerMobile) {
         delete _testRunnerMobile;
     }
-    _testRunnerMobile = new TestRunnerMobile(_ui.workingFolderRunOnMobileLabel, _ui.connectDeviceButton, _ui.pullFolderButton, _ui.detectedDeviceLabel);
+    _testRunnerMobile = new TestRunnerMobile(_ui.workingFolderRunOnMobileLabel, _ui.connectDeviceButton, _ui.pullFolderButton, _ui.detectedDeviceLabel, _ui.folderLineEdit);
 }
 
 void Nitpick::startTestsEvaluation(const bool isRunningFromCommandLine,
diff --git a/tools/nitpick/src/TestRunnerMobile.cpp b/tools/nitpick/src/TestRunnerMobile.cpp
index 5c1f907e34..a4e4affe75 100644
--- a/tools/nitpick/src/TestRunnerMobile.cpp
+++ b/tools/nitpick/src/TestRunnerMobile.cpp
@@ -16,13 +16,22 @@
 #include "Nitpick.h"
 extern Nitpick* nitpick;
 
-TestRunnerMobile::TestRunnerMobile(QLabel* workingFolderLabel, QPushButton *conectDeviceButton, QPushButton *pullFolderButton, QLabel* detectedDeviceLabel, QObject* parent)
-    : QObject(parent) 
+TestRunnerMobile::TestRunnerMobile(
+    QLabel* workingFolderLabel,
+    QPushButton *connectDeviceButton,
+    QPushButton *pullFolderButton,
+    QLabel* detectedDeviceLabel,
+    QLineEdit *folderLineEdit,
+    QObject* parent
+) : QObject(parent) 
 {
     _workingFolderLabel = workingFolderLabel;
-    _connectDeviceButton = conectDeviceButton;
+    _connectDeviceButton = connectDeviceButton;
     _pullFolderButton = pullFolderButton;
     _detectedDeviceLabel = detectedDeviceLabel;
+    _folderLineEdit = folderLineEdit;
+
+    folderLineEdit->setText("/sdcard/DCIM/TEST");
 }
 
 TestRunnerMobile::~TestRunnerMobile() {
@@ -82,12 +91,14 @@ void TestRunnerMobile::connectDevice() {
             QMessageBox::critical(0, "Too many devices detected", "Tests will run only if a single device is attached");
 
         } else {
-            _pullFolderButton->setEnabled(true);
             _detectedDeviceLabel->setText(line2.remove(DEVICE));
+            _pullFolderButton->setEnabled(true);
+            _folderLineEdit->setEnabled(true);
         }
     }
 }
 
 void TestRunnerMobile::pullFolder() {
-    QString command = _adbCommand + " devices > " + _workingFolder + "/devices.txt";
+    QString command = _adbCommand + " pull " + _folderLineEdit->text() + " " + _workingFolder + " >" + _workingFolder + "/pullOutput.txt";
+    int result = system(command.toStdString().c_str());
 }
diff --git a/tools/nitpick/src/TestRunnerMobile.h b/tools/nitpick/src/TestRunnerMobile.h
index 84531b5b64..16312a6037 100644
--- a/tools/nitpick/src/TestRunnerMobile.h
+++ b/tools/nitpick/src/TestRunnerMobile.h
@@ -12,6 +12,7 @@
 #define hifi_testRunnerMobile_h
 
 #include <QLabel>
+#include <QLineEdit>
 #include <QObject>
 #include <QPushButton>
 
@@ -20,7 +21,14 @@
 class TestRunnerMobile : public QObject, public TestRunner {
     Q_OBJECT
 public:
-    explicit TestRunnerMobile(QLabel* workingFolderLabel, QPushButton *connectDeviceButton, QPushButton *pullFolderButton, QLabel* detectedDeviceLabel, QObject* parent = 0);
+    explicit TestRunnerMobile(
+        QLabel* workingFolderLabel, 
+        QPushButton *connectDeviceButton, 
+        QPushButton *pullFolderButton, 
+        QLabel* detectedDeviceLabel, 
+        QLineEdit *folderLineEdit,
+        QObject* parent = 0
+    );
     ~TestRunnerMobile();
 
     void setWorkingFolderAndEnableControls();
@@ -32,6 +40,7 @@ private:
     QPushButton* _connectDeviceButton;
     QPushButton* _pullFolderButton;
     QLabel* _detectedDeviceLabel;
+    QLineEdit* _folderLineEdit;
 
 #ifdef Q_OS_WIN
     const QString _adbExe{ "adb.exe" };
diff --git a/tools/nitpick/ui/Nitpick.ui b/tools/nitpick/ui/Nitpick.ui
index 139d4ced56..4a729a11d0 100644
--- a/tools/nitpick/ui/Nitpick.ui
+++ b/tools/nitpick/ui/Nitpick.ui
@@ -623,6 +623,9 @@
       </property>
      </widget>
      <widget class="QLineEdit" name="folderLineEdit">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
       <property name="geometry">
        <rect>
         <x>10</x>