Merge pull request #807 from isanae/logging-rework

Logging rework

1 files changed, 12 insertions, 13 deletions

diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index e443a8f2..89d0079f 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -263,7 +263,7 @@ QStringList InstallationManager::extractFiles(const QStringList &filesOrig, bool
           targetFile = wcsrchr(origFile/*data[i]->getFileName()*/, '/');
         }
         if (targetFile == nullptr) {
-          qCritical() << "Failed to find backslash in " << data[i]->getFileName();
+          log::error("Failed to find backslash in {}", data[i]->getFileName());
           continue;
         } else {
           // skip the slash
@@ -398,7 +398,7 @@ bool InstallationManager::isSimpleArchiveTopLayer(const DirectoryTree::Node *nod
   for (DirectoryTree::const_node_iterator iter = node->nodesBegin(); iter != node->nodesEnd(); ++iter) {
     if ((bainStyle && InstallationTester::isTopLevelDirectoryBain((*iter)->getData().name)) ||
         (!bainStyle && InstallationTester::isTopLevelDirectory((*iter)->getData().name))) {
-      qDebug("%s on the top level", (*iter)->getData().name.toUtf8().constData());
+      log::debug("{} on the top level", (*iter)->getData().name.toQString());
       return true;
     }
   }
@@ -424,7 +424,7 @@ DirectoryTree::Node *InstallationManager::getSimpleArchiveBase(DirectoryTree *da
                (currentNode->numNodes() == 1)) {
       currentNode = *currentNode->nodesBegin();
     } else {
-      qDebug("not a simple archive");
+      log::debug("not a simple archive");
       return nullptr;
     }
   }
@@ -527,7 +527,7 @@ bool InstallationManager::testOverwrite(GuessedValue<QString> &modName, bool *me
           settingsFile.write(originalSettings);
           settingsFile.close();
         } else {
-          qCritical("failed to restore original settings: %s", qUtf8Printable(metaFilename));
+          log::error("failed to restore original settings: {}", metaFilename);
         }
         return true;
       } else if (overwriteDialog.action() == QueryOverwriteDialog::ACT_MERGE) {
@@ -576,7 +576,7 @@ bool InstallationManager::doInstall(GuessedValue<QString> &modName, QString game
   QString targetDirectory = QDir(m_ModsDirectory + "/" + modName).canonicalPath();
   QString targetDirectoryNative = QDir::toNativeSeparators(targetDirectory);
 
-  qDebug("installing to \"%s\"", qUtf8Printable(targetDirectoryNative));
+  log::debug("installing to \"{}\"", targetDirectoryNative);
 
   m_InstallationProgress = new QProgressDialog(m_ParentWidget);
   ON_BLOCK_EXIT([this] () {
@@ -693,7 +693,7 @@ void InstallationManager::postInstallCleanup()
         QFile::setPermissions(fileInfo.absoluteFilePath(), QFile::ReadOther | QFile::WriteOther);
       }
       if (!QFile::remove(fileInfo.absoluteFilePath())) {
-        qWarning() << "Unable to delete " << fileInfo.absoluteFilePath();
+        log::warn("Unable to delete {}", fileInfo.absoluteFilePath());
       }
     }
     directoriesToRemove.insert(fileInfo.absolutePath());
@@ -764,7 +764,7 @@ bool InstallationManager::install(const QString &fileName,
     if ((modID == 0) && (guessedModID != -1)) {
       modID = guessedModID;
     } else if (modID != guessedModID) {
-      qDebug("passed mod id: %d, guessed id: %d", modID, guessedModID);
+      log::debug("passed mod id: {}, guessed id: {}", modID, guessedModID);
     }
 
     modName.update(guessedModName, GUESS_GOOD);
@@ -774,7 +774,7 @@ bool InstallationManager::install(const QString &fileName,
   if (fileInfo.dir() == QDir(m_DownloadsDirectory)) {
     m_CurrentFile = fileInfo.fileName();
   }
-  qDebug("using mod name \"%s\" (id %d) -> %s", qUtf8Printable(modName), modID, qUtf8Printable(m_CurrentFile));
+  log::debug("using mod name \"{}\" (id {}) -> {}", QString(modName), modID, m_CurrentFile);
 
   //If there's an archive already open, close it. This happens with the bundle
   //installer when it uncompresses a split archive, then finds it has a real archive
@@ -785,9 +785,9 @@ bool InstallationManager::install(const QString &fileName,
   bool archiveOpen = m_ArchiveHandler->open(fileName,
                                             new MethodCallback<InstallationManager, void, QString *>(this, &InstallationManager::queryPassword));
   if (!archiveOpen) {
-    qDebug("integrated archiver can't open %s: %s (%d)",
-           qUtf8Printable(fileName),
-           qUtf8Printable(getErrorString(m_ArchiveHandler->getLastError())),
+    log::debug("integrated archiver can't open {}: {} ({})",
+           fileName,
+           getErrorString(m_ArchiveHandler->getLastError()),
            m_ArchiveHandler->getLastError());
   }
   ON_BLOCK_EXIT(std::bind(&InstallationManager::postInstallCleanup, this));
@@ -856,8 +856,7 @@ bool InstallationManager::install(const QString &fileName,
         }
       }
     } catch (const IncompatibilityException &e) {
-      qCritical("plugin \"%s\" incompatible: %s",
-                qUtf8Printable(installer->name()), e.what());
+      log::error("plugin \"{}\" incompatible: {}", installer->name(), e.what());
     }
 
     // act upon the installation result. at this point the files have already been