From bbc6c5520f5b8112f700340ead8ee9cc8b2d7ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0?=
 <itsmylivex@gmail.com>
Date: Tue, 2 Oct 2018 19:15:21 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20=D1=84?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B2=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20get?=
 =?UTF-8?q?FileList?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fileFinder/MainForm.cs | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/fileFinder/MainForm.cs b/fileFinder/MainForm.cs
index 86c500e..eaaca56 100644
--- a/fileFinder/MainForm.cs
+++ b/fileFinder/MainForm.cs
@@ -65,17 +65,8 @@ namespace fileFinder
         private async Task<TreeNode> buildResultTree(TaskController controller, IProgress<ProgressReportModel> report)
         {
             TreeNode itemsNode = new TreeNode();
-            List<String> foundFiles = new List<String>();
             ProgressReportModel _report = new ProgressReportModel();
-
-            try
-            {
-                foundFiles = Directory.GetFiles(curDirTextBox.Text, queryTextBox.Text, SearchOption.AllDirectories).ToList<String>();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Поиск не удался!");
-            }
+            List<String> foundFiles = getFileList(curDirTextBox.Text, queryTextBox.Text);
 
             int counter = 0;
             foreach (String item in foundFiles)
@@ -83,9 +74,9 @@ namespace fileFinder
                 while (controller.isPaused)
                 {                    
                     Thread.Sleep(100);
-                    if (!mainController.isFormUpdatedAfterPause)
+                    if (!controller.isFormUpdatedAfterPause)
                     {
-                        mainController.isFormUpdatedAfterPause = true;
+                        controller.isFormUpdatedAfterPause = true;
                         _report.progress = counter;
                         _report.currentFileUrl = item;
                         _report.currentTreeNode = (TreeNode) itemsNode.Clone();
@@ -108,6 +99,20 @@ namespace fileFinder
             return itemsNode;
         }
 
+        private List<string> getFileList (string directory, string nameQuery)
+        {
+            List<String> fileList = new List<String>();
+            try
+            {
+                fileList = Directory.GetFiles(directory, nameQuery, SearchOption.AllDirectories).ToList();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Не удалось получить доступ к файлу/папке");
+            }
+            return fileList;
+        }
+
         private string[] getFileContents (string fileUrl)
         {
             try