From 918843b05a399a58c5c6767500bd80404ecc43b2 Mon Sep 17 00:00:00 2001
From: IgorekLoschinin <igor.loschinin2014@yandex.ru>
Date: Thu, 13 May 2021 00:14:46 +0300
Subject: [PATCH] ref #29 Added main method run in worker.

---
 src/CFixer/main.cpp                        |  9 +++++++-
 src/CopyrighFixer/CopyrighFixer/worker.cpp | 27 +++++++++++++++++++---
 src/CopyrighFixer/CopyrighFixer/worker.h   |  7 +-----
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/CFixer/main.cpp b/src/CFixer/main.cpp
index ddb0a0b..fbbc3b9 100644
--- a/src/CFixer/main.cpp
+++ b/src/CFixer/main.cpp
@@ -14,7 +14,9 @@ using namespace CopyrighFixer;
 
 int main(int argc, char *argv[]) {
 
-    Worker worker;
+    Worker worker(new Config,
+                  new ConfigParser,
+                  new Signer);
 
     if (!QuasarAppUtils::Params::parseParams(argc, argv)) {
         worker.printHelp();
@@ -26,5 +28,10 @@ int main(int argc, char *argv[]) {
         return 0;
     }
 
+    bool runProc = worker.run();
+    if (!runProc) {
+        return 0;
+    }
+
     return 0;
 }
diff --git a/src/CopyrighFixer/CopyrighFixer/worker.cpp b/src/CopyrighFixer/CopyrighFixer/worker.cpp
index f8d22a8..aacfd14 100644
--- a/src/CopyrighFixer/CopyrighFixer/worker.cpp
+++ b/src/CopyrighFixer/CopyrighFixer/worker.cpp
@@ -6,18 +6,39 @@
 //#
 
 #include "config.h"
+#include "configparser.h"
 #include "worker.h"
 #include <quasarapp.h>
 
 
-
 namespace CopyrighFixer {
-Worker::Worker() {
 
+Worker::Worker(
+        Config *conf,
+        ConfigParser *confParser,
+        Signer *subscriber) {
+    conf_ = conf ?: new Config;
+    confParser_ = confParser ?: new ConfigParser;
+    subscriber_ = subscriber ?: new Signer;
+}
+
+Worker::~Worker() {
+    delete conf_;
+    delete confParser_;
+    delete subscriber_;
 }
 
 bool Worker::run() {
-    return false;
+
+    if (!confParser_->parseOptions(*conf_)) {
+        return false;
+    }
+
+    if (!subscriber_->checkSign(*conf_)) {
+        return false;
+    }
+
+    return true;
 }
 
 void Worker::printHelp() const {
diff --git a/src/CopyrighFixer/CopyrighFixer/worker.h b/src/CopyrighFixer/CopyrighFixer/worker.h
index 6c97465..9fde65e 100644
--- a/src/CopyrighFixer/CopyrighFixer/worker.h
+++ b/src/CopyrighFixer/CopyrighFixer/worker.h
@@ -25,16 +25,11 @@ public:
     Worker(Config *conf = nullptr,
            ConfigParser *confParser = nullptr,
            Signer *subscriber = nullptr);
-    ~Worker() {
-        delete conf_;
-        delete confParser_;
-        delete subscriber_;
-    };
+    ~Worker();
 
     /**
      * @brief run It is main method for control of all parsing process.
      * @return Returns false if the program terminates with an error.
-
      */
     bool run();