From b52f85e3a3df69001b824b4252d49d64bca8c797 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Mon, 26 Apr 2021 01:48:41 +0300 Subject: [PATCH 1/9] ref #29 Implement method than will parse all input arguments. --- src/CFixer/main.cpp | 40 +++++++--------------- src/CopyrighFixer/CopyrighFixer/worker.cpp | 34 ++++++++++++++++-- src/CopyrighFixer/CopyrighFixer/worker.h | 24 +++++++++++-- 3 files changed, 65 insertions(+), 33 deletions(-) diff --git a/src/CFixer/main.cpp b/src/CFixer/main.cpp index 568888b..bd3b37f 100644 --- a/src/CFixer/main.cpp +++ b/src/CFixer/main.cpp @@ -7,45 +7,29 @@ #include #include +#include "CopyrighFixer/worker.h" -void helpCall(); +using namespace CopyrighFixer; int main(int argc, char *argv[]) { + Worker *worker = new Worker(new Config, + new ConfigParser, + new Signer); + if (!QuasarAppUtils::Params::parseParams(argc, argv)) { - helpCall(); + worker->printHelp(); return 1; } if (QuasarAppUtils::Params::isEndable("h") || QuasarAppUtils::Params::isEndable("help")) { - helpCall(); + worker->printHelp(); return 0; } + worker->run(); + + + delete worker; return 0; } - -/** - * @brief helpCall - a helper call that display infotmation - * about the arguments and how to use them - */ -void helpCall(){ - - QuasarAppUtils::Help::Charters help = { - { - "Part 0 General", { - {"h or help", "These arguments represent a helper call that describes the functionality of each method"}, - {"-sourceDir path/to/source/dir", "This arrgument sets path to the source directory. By default it is sourceDir = PWD"}, - {"-sign path/to/sign/file", "This argument sets path to the sign patern. This is a required argument"}, - {"-currentOwner ownerName", "This argument sets name of the current owner of the code."}, - } - } - }; - - help += QuasarAppUtils::Params::getparamsHelp(); - - QuasarAppUtils::Params::showHelp(help); - - exit(0); - -} diff --git a/src/CopyrighFixer/CopyrighFixer/worker.cpp b/src/CopyrighFixer/CopyrighFixer/worker.cpp index a34d696..c5b2ea1 100644 --- a/src/CopyrighFixer/CopyrighFixer/worker.cpp +++ b/src/CopyrighFixer/CopyrighFixer/worker.cpp @@ -10,14 +10,42 @@ #include - namespace CopyrighFixer { -Worker::Worker() { +Worker::Worker( + Config *conf, + ConfigParser *confParser, + Signer *subscriber) { + this->conf_ = conf ?: new Config; + this->confParser_ = confParser ?: new ConfigParser; + this->subscriber_ = subscriber ?: new Signer; } -bool Worker::run() { +bool Worker::run() const { + + Config currentConfig = this->confParser_->parseOptions(*this->conf_); +// this->subscriber_->checkSign() + return 1; } +void Worker::printHelp() const { + QuasarAppUtils::Help::Charters help = { + { + "Part 0 General", { + {"h or help", "These arguments represent a helper call that describes the functionality of each method"}, + {"-sourceDir path/to/source/dir", "This arrgument sets path to the source directory. By default it is sourceDir = PWD"}, + {"-sign path/to/sign/file", "This argument sets path to the sign patern. This is a required argument"}, + {"-currentOwner ownerName", "This argument sets name of the current owner of the code."}, + } + } + }; + + help += QuasarAppUtils::Params::getparamsHelp(); + + QuasarAppUtils::Params::showHelp(help); + + exit(0); +} + }; diff --git a/src/CopyrighFixer/CopyrighFixer/worker.h b/src/CopyrighFixer/CopyrighFixer/worker.h index 3dde9c5..b077020 100644 --- a/src/CopyrighFixer/CopyrighFixer/worker.h +++ b/src/CopyrighFixer/CopyrighFixer/worker.h @@ -9,6 +9,9 @@ #define WORKER_H #include "CopyrighFixer_global.h" +#include "config.h" +#include "signer.h" +#include "configparser.h" namespace CopyrighFixer { @@ -17,15 +20,32 @@ namespace CopyrighFixer { * @brief The Worker class will be control all work process. */ class CopyrighFixer_EXPORT Worker { + public: - Worker(); + Worker(Config *conf = nullptr, + ConfigParser *confParser = nullptr, + Signer *subscriber = nullptr); + ~Worker() { + delete conf_; + delete confParser_; + delete subscriber_; + }; /** * @brief run It is main method for control of all parsing process. * @return */ - bool run(); + bool run() const; + /** + * @brief printHelp Display infotmation about the arguments and how to use them. + */ + void printHelp() const; + +protected: + Config *conf_; + ConfigParser *confParser_; + Signer *subscriber_; }; From 918843b05a399a58c5c6767500bd80404ecc43b2 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Thu, 13 May 2021 00:14:46 +0300 Subject: [PATCH 2/9] 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 - 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(); From 42b98a6b92493770fcf6719224298944b7dabe16 Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Thu, 13 May 2021 14:16:37 +0300 Subject: [PATCH 3/9] Update src/CFixer/main.cpp Co-authored-by: Andrei Yankovich --- src/CFixer/main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/CFixer/main.cpp b/src/CFixer/main.cpp index fbbc3b9..cfce35c 100644 --- a/src/CFixer/main.cpp +++ b/src/CFixer/main.cpp @@ -14,9 +14,7 @@ using namespace CopyrighFixer; int main(int argc, char *argv[]) { - Worker worker(new Config, - new ConfigParser, - new Signer); + Worker worker; if (!QuasarAppUtils::Params::parseParams(argc, argv)) { worker.printHelp(); From 9ed2b31bda8a812bf72a9bff7c1d83b583f5cda9 Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Thu, 13 May 2021 14:17:59 +0300 Subject: [PATCH 4/9] Update src/CFixer/main.cpp Co-authored-by: Andrei Yankovich --- src/CFixer/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CFixer/main.cpp b/src/CFixer/main.cpp index cfce35c..bcde79d 100644 --- a/src/CFixer/main.cpp +++ b/src/CFixer/main.cpp @@ -28,7 +28,7 @@ int main(int argc, char *argv[]) { bool runProc = worker.run(); if (!runProc) { - return 0; + return 1; } return 0; From d20768dc8c97a9ac677e67112f6bc754fb211d32 Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Thu, 13 May 2021 14:19:48 +0300 Subject: [PATCH 5/9] Update src/CopyrighFixer/CopyrighFixer/worker.cpp Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/worker.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/worker.cpp b/src/CopyrighFixer/CopyrighFixer/worker.cpp index aacfd14..37711c2 100644 --- a/src/CopyrighFixer/CopyrighFixer/worker.cpp +++ b/src/CopyrighFixer/CopyrighFixer/worker.cpp @@ -13,13 +13,10 @@ namespace CopyrighFixer { -Worker::Worker( - Config *conf, - ConfigParser *confParser, - Signer *subscriber) { - conf_ = conf ?: new Config; - confParser_ = confParser ?: new ConfigParser; - subscriber_ = subscriber ?: new Signer; +Worker::Worker() { + conf_ = new Config; + confParser_ = new ConfigParser; + subscriber_ = new Signer; } Worker::~Worker() { From ae57f20eb7d4505173171da1501f2a04b0b0ec0b Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Thu, 13 May 2021 15:21:43 +0300 Subject: [PATCH 6/9] Update src/CopyrighFixer/CopyrighFixer/worker.h Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/worker.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/worker.h b/src/CopyrighFixer/CopyrighFixer/worker.h index 9fde65e..bb1eb9f 100644 --- a/src/CopyrighFixer/CopyrighFixer/worker.h +++ b/src/CopyrighFixer/CopyrighFixer/worker.h @@ -9,9 +9,10 @@ #define WORKER_H #include "CopyrighFixer_global.h" -#include "config.h" -#include "signer.h" -#include "configparser.h" + +class ConfigParser; +class Signer; +class Config; namespace CopyrighFixer { From 61e9a307781cf6c7552fa38712c8cbada144d53e Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Thu, 13 May 2021 15:22:05 +0300 Subject: [PATCH 7/9] Update src/CopyrighFixer/CopyrighFixer/worker.h Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/worker.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/worker.h b/src/CopyrighFixer/CopyrighFixer/worker.h index bb1eb9f..56f6b24 100644 --- a/src/CopyrighFixer/CopyrighFixer/worker.h +++ b/src/CopyrighFixer/CopyrighFixer/worker.h @@ -23,9 +23,7 @@ namespace CopyrighFixer { class CopyrighFixer_EXPORT Worker { public: - Worker(Config *conf = nullptr, - ConfigParser *confParser = nullptr, - Signer *subscriber = nullptr); + Worker(); ~Worker(); /** From 53a30a2dd2d165442eb3895ed038d290df0d7ba4 Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Thu, 13 May 2021 15:22:26 +0300 Subject: [PATCH 8/9] Update src/CopyrighFixer/CopyrighFixer/worker.h Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/worker.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/worker.h b/src/CopyrighFixer/CopyrighFixer/worker.h index 56f6b24..8ba7666 100644 --- a/src/CopyrighFixer/CopyrighFixer/worker.h +++ b/src/CopyrighFixer/CopyrighFixer/worker.h @@ -38,9 +38,9 @@ public: void printHelp() const; protected: - Config *conf_; - ConfigParser *confParser_; - Signer *subscriber_; + Config *conf_ = nullptr; + ConfigParser *confParser_ = nullptr; + Signer *subscriber_ = nullptr; }; From 58b10320991b49012cdf7e498889d14f1ca415de Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Thu, 13 May 2021 21:11:41 +0300 Subject: [PATCH 9/9] ref #29 Fixing inialization conctructor main class worker. --- src/CopyrighFixer/CopyrighFixer/worker.cpp | 17 +++++++++-------- src/CopyrighFixer/CopyrighFixer/worker.h | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/worker.cpp b/src/CopyrighFixer/CopyrighFixer/worker.cpp index 37711c2..38d352c 100644 --- a/src/CopyrighFixer/CopyrighFixer/worker.cpp +++ b/src/CopyrighFixer/CopyrighFixer/worker.cpp @@ -7,6 +7,7 @@ #include "config.h" #include "configparser.h" +#include "signer.h" #include "worker.h" #include @@ -14,24 +15,24 @@ namespace CopyrighFixer { Worker::Worker() { - conf_ = new Config; - confParser_ = new ConfigParser; - subscriber_ = new Signer; + _conf = new Config; + _confParser = new ConfigParser; + _subscriber = new Signer; } Worker::~Worker() { - delete conf_; - delete confParser_; - delete subscriber_; + delete _conf; + delete _confParser; + delete _subscriber; } bool Worker::run() { - if (!confParser_->parseOptions(*conf_)) { + if (!_confParser->parseOptions(*_conf)) { return false; } - if (!subscriber_->checkSign(*conf_)) { + if (!_subscriber->checkSign(*_conf)) { return false; } diff --git a/src/CopyrighFixer/CopyrighFixer/worker.h b/src/CopyrighFixer/CopyrighFixer/worker.h index 8ba7666..7bfddfe 100644 --- a/src/CopyrighFixer/CopyrighFixer/worker.h +++ b/src/CopyrighFixer/CopyrighFixer/worker.h @@ -38,9 +38,9 @@ public: void printHelp() const; protected: - Config *conf_ = nullptr; - ConfigParser *confParser_ = nullptr; - Signer *subscriber_ = nullptr; + Config *_conf = nullptr; + ConfigParser *_confParser = nullptr; + Signer *_subscriber = nullptr; };