From 8b09f9cfbe26f2d1cf779202fbdd98f2977a1a90 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Wed, 29 Jul 2020 18:12:55 +0300
Subject: [PATCH] added support system-backup

---
 Deploy/configparser.cpp        | 28 ++++++++++++++++++++--------
 Deploy/dependenciesscanner.cpp |  2 +-
 Deploy/deploycore.cpp          |  4 ++--
 Deploy/extracter.cpp           |  2 +-
 Deploy/filemanager.cpp         |  6 +++---
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/Deploy/configparser.cpp b/Deploy/configparser.cpp
index f7f2de8..bafcb09 100644
--- a/Deploy/configparser.cpp
+++ b/Deploy/configparser.cpp
@@ -1182,9 +1182,9 @@ iDistribution *ConfigParser::getDistribution() {
 
 void ConfigParser::initEnvirement() {
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    auto path = env.value("PATH");
 
     if (!DeployCore::isSnap()) {
-        auto path = env.value("PATH");
 
         _config.envirement.addEnv(env.value("LD_LIBRARY_PATH"));
         _config.envirement.addEnv(path);
@@ -1216,15 +1216,27 @@ bool ConfigParser::checkSnapPermisions() {
     if (!DeployCore::isSnap())
         return true;
 
-    if (QuasarAppUtils::Params::isEndable("deploySystem") &&
-            !QFile::exists(DeployCore::snapRootFS() + "/usr/lib")) {
-        QuasarAppUtils::Params::log("You use option deploySystem, but not added permision system-backup for cqtdeployer."
+
+    bool system = QuasarAppUtils::Params::isEndable("deploySystem") ||
+            QuasarAppUtils::Params::isEndable("extraLibs");
+    bool checkPath = QDir(DeployCore::snapRootFS()).entryList(QDir::AllEntries | QDir::NoDotAndDotDot).size();
+
+    if (system && !checkPath) {
+
+        QuasarAppUtils::Params::log("You use a deploySystem or extraLibs options,"
+                                    " but not added permision system-backup for cqtdeployer."
                                     " Please add permision system-backup befor usong cqtdeployer."
-                                    " Add system-backup permision from console: "
-                                    "'snap connect cqtdeployer:system-backup :system-backup'"
-                                    ""
+                                    " Add system-backup permision from console: ",
+                                    QuasarAppUtils::Error);
+
+        QuasarAppUtils::Params::log(
+                                    "'snap connect cqtdeployer:system-backup :system-backup'",
+                                    QuasarAppUtils::Info);
+
+        QuasarAppUtils::Params::log(
                                     "GUI: Open the gnome system setting >> Applications >> CQtDeployer. "
-                                    "in menu rights and permisions enable system-backup.");
+                                    "in menu rights and permisions enable system-backup.",
+                                    QuasarAppUtils::Info);
 
         return false;
     }
diff --git a/Deploy/dependenciesscanner.cpp b/Deploy/dependenciesscanner.cpp
index 86408fa..4f3387b 100644
--- a/Deploy/dependenciesscanner.cpp
+++ b/Deploy/dependenciesscanner.cpp
@@ -99,7 +99,7 @@ bool DependenciesScanner::fillLibInfo(LibInfo &info, const QString &file) const
 
 void DependenciesScanner::recursiveDep(LibInfo &lib, QSet<LibInfo> &res, QSet<QString>& libStack) {
     QuasarAppUtils::Params::log("get recursive dependencies of " + lib.fullPath(),
-                                       QuasarAppUtils::Info);
+                                       QuasarAppUtils::Debug);
 
     if (_scanedLibs.contains(lib.fullPath())) {
         auto scanedLib = _scanedLibs.value(lib.fullPath());
diff --git a/Deploy/deploycore.cpp b/Deploy/deploycore.cpp
index fbc103a..de5142a 100644
--- a/Deploy/deploycore.cpp
+++ b/Deploy/deploycore.cpp
@@ -103,12 +103,12 @@ DeployCore::QtModule DeployCore::getQtModule(const QString& path) {
 void DeployCore::addQtModule(DeployCore::QtModule &module, const QString &path) {
 
     QuasarAppUtils::Params::log("current module " + QString::number(module),
-                                       QuasarAppUtils::Info);
+                                       QuasarAppUtils::Debug);
 
     auto mod = getQtModule(path);
     QuasarAppUtils::Params::log("add new module from path " + path  +
                                        " module value " + QString::number(mod),
-                                       QuasarAppUtils::Info);
+                                       QuasarAppUtils::Debug);
 
 
     module = static_cast<DeployCore::QtModule>(
diff --git a/Deploy/extracter.cpp b/Deploy/extracter.cpp
index 2160236..98daf04 100644
--- a/Deploy/extracter.cpp
+++ b/Deploy/extracter.cpp
@@ -307,7 +307,7 @@ void Extracter::extractLib(const QString &file,
 
     assert(depMap);
     QuasarAppUtils::Params::log("extract lib :" + file,
-                                       QuasarAppUtils::Info);
+                                 QuasarAppUtils::Debug);
 
     auto data = _scaner->scan(file);
 
diff --git a/Deploy/filemanager.cpp b/Deploy/filemanager.cpp
index a2b4f77..95f3025 100644
--- a/Deploy/filemanager.cpp
+++ b/Deploy/filemanager.cpp
@@ -305,7 +305,7 @@ bool FileManager::copyFolder(const QString &from, const QString &to, const QStri
             if (!skipFilter.isEmpty()) {
                 QuasarAppUtils::Params::log(
                             item.absoluteFilePath() + " ignored by filter " + skipFilter,
-                            QuasarAppUtils::VerboseLvl::Info);
+                            QuasarAppUtils::VerboseLvl::Debug);
                 continue;
             }
             auto config = DeployCore::_config;
@@ -319,7 +319,7 @@ bool FileManager::copyFolder(const QString &from, const QString &to, const QStri
                 if (auto rule = config->ignoreList.isIgnore(info)) {
                     QuasarAppUtils::Params::log(
                                 item.absoluteFilePath() + " ignored by rule " + rule->label,
-                                QuasarAppUtils::VerboseLvl::Info);
+                                QuasarAppUtils::VerboseLvl::Debug);
                     continue;
                 }
 
@@ -461,7 +461,7 @@ bool FileManager::copyFiles(const QStringList &source,
         if (!skipFilter.isEmpty()) {
             QuasarAppUtils::Params::log(
                         info.absoluteFilePath() + " ignored by filter " + skipFilter,
-                        QuasarAppUtils::VerboseLvl::Info);
+                        QuasarAppUtils::VerboseLvl::Debug);
             continue;
         }
         auto config = DeployCore::_config;