From 5304d52f9373e0078674af79b656e2e4d010ca90 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 19 Jul 2019 06:53:52 -0400
Subject: removed some useless logging initializing usvfs logging now logs
 strings for log level and crash dump type

---
 src/downloadmanager.cpp |  3 ---
 src/main.cpp            |  2 --
 src/organizercore.cpp   | 27 ++++++++++---------------
 src/usvfsconnector.cpp  | 53 ++++++++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 61 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index d2556faa..1f86f9aa 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -378,9 +378,6 @@ void DownloadManager::refreshList()
       }
     }
 
-    //if (m_ActiveDownloads.size() != downloadsBefore) {
-      log::debug("Downloads after refresh: {}", m_ActiveDownloads.size());
-    //}
     emit update(-1);
 
     //let watcher trigger refreshes again
diff --git a/src/main.cpp b/src/main.cpp
index f53a574e..0adfc110 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -623,8 +623,6 @@ int runApplication(MOApplication &application, SingleInstance &instance,
       QImage image(pluginSplash);
       if (!image.isNull()) {
         image.save(dataPath + "/splash.png");
-      } else {
-        log::debug("no plugin splash");
       }
     }
 
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index b61ebde8..92372d82 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -77,26 +77,21 @@ CrashDumpsType OrganizerCore::m_globalCrashDumpsType = CrashDumpsType::None;
 
 static bool isOnline()
 {
-  QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces();
-
-  bool connected = false;
-  for (auto iter = interfaces.begin(); iter != interfaces.end() && !connected;
-       ++iter) {
-    if ((iter->flags() & QNetworkInterface::IsUp)
-        && (iter->flags() & QNetworkInterface::IsRunning)
-        && !(iter->flags() & QNetworkInterface::IsLoopBack)) {
-      auto addresses = iter->addressEntries();
-      if (addresses.count() == 0) {
-        continue;
+  const auto runningFlags =
+    QNetworkInterface::IsUp | QNetworkInterface::IsRunning;
+
+  for (auto&& i : QNetworkInterface::allInterfaces()) {
+    if (!(i.flags() & QNetworkInterface::IsLoopBack)) {
+      if (i.flags() & runningFlags) {
+        auto addresses = i.addressEntries();
+        if (!addresses.empty()) {
+          return true;
+        }
       }
-      log::debug("interface {} seems to be up (address: {})",
-             iter->humanReadableName(),
-             addresses[0].ip().toString());
-      connected = true;
     }
   }
 
-  return connected;
+  return false;
 }
 
 static bool renameFile(const QString &oldName, const QString &newName,
diff --git a/src/usvfsconnector.cpp b/src/usvfsconnector.cpp
index 5918c8a5..b5e6edb1 100644
--- a/src/usvfsconnector.cpp
+++ b/src/usvfsconnector.cpp
@@ -118,6 +118,48 @@ CrashDumpsType crashDumpsType(int type)
   }
 }
 
+QString toString(LogLevel lv)
+{
+  switch (lv)
+  {
+    case LogLevel::Debug:
+      return "debug";
+
+    case LogLevel::Info:
+      return "info";
+
+    case LogLevel::Warning:
+      return "warning";
+
+    case LogLevel::Error:
+      return "error";
+
+    default:
+      return QString("%1").arg(static_cast<int>(lv));
+  }
+}
+
+QString toString(CrashDumpsType t)
+{
+  switch (t)
+  {
+    case CrashDumpsType::None:
+      return "none";
+
+    case CrashDumpsType::Mini:
+      return "mini";
+
+    case CrashDumpsType::Data:
+      return "data";
+
+    case CrashDumpsType::Full:
+      return "full";
+
+    default:
+      return QString("%1").arg(static_cast<int>(t));
+  }
+}
+
 UsvfsConnector::UsvfsConnector()
 {
   USVFSParameters params;
@@ -129,9 +171,14 @@ UsvfsConnector::UsvfsConnector()
   InitLogging(false);
 
   log::debug(
-    "Initializing VFS <{}, {}, {}, {}>",
-    params.instanceName, static_cast<int>(params.logLevel),
-    static_cast<int>(params.crashDumpsType), params.crashDumpsPath);
+    "initializing usvfs:\n"
+    " . instance: {}\n"
+    " . log: {}\n"
+    " . dump: {} ({})",
+    params.instanceName,
+    toString(params.logLevel),
+    params.crashDumpsPath,
+    toString(params.crashDumpsType));
 
   CreateVFS(&params);
 
-- 
cgit v1.3.1