added missing include guards

log free space on drives involved in paths

9 files changed, 78 insertions, 4 deletions

diff --git a/src/env.cpp b/src/env.cpp
index 641eb4a7..4628e3f4 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -4,6 +4,7 @@
 #include "envsecurity.h"
 #include "envshortcut.h"
 #include "envwindows.h"
+#include "settings.h"
 #include <log.h>
 #include <utility.h>
 
@@ -85,7 +86,7 @@ const Metrics& Environment::metrics() const
   return *m_metrics;
 }
 
-void Environment::dump() const
+void Environment::dump(const Settings& s) const
 {
   log::debug("windows: {}", m_windows->toString());
 
@@ -107,6 +108,43 @@ void Environment::dump() const
   for (const auto& d : m_metrics->displays()) {
     log::debug(" . {}", d.toString());
   }
+
+  dumpDisks(s);
+}
+
+void Environment::dumpDisks(const Settings& s) const
+{
+  std::set<QString> rootPaths;
+
+  auto dump = [&](auto&& path) {
+    const QFileInfo fi(path);
+    const QStorageInfo si(fi.absoluteFilePath());
+
+    if (rootPaths.contains(si.rootPath())) {
+      // already seen
+      return;
+    }
+
+    // remember
+    rootPaths.insert(si.rootPath());
+
+    log::debug(
+      "  . {} free={} MB{}",
+      si.rootPath(),
+      (si.bytesFree() / 1000 / 1000),
+      (si.isReadOnly() ? " (readonly)" : ""));
+  };
+
+  log::debug("drives:");
+
+  dump(QStorageInfo::root().rootPath());
+  dump(s.paths().base());
+  dump(s.paths().downloads());
+  dump(s.paths().mods());
+  dump(s.paths().cache());
+  dump(s.paths().profiles());
+  dump(s.paths().overwrite());
+  dump(QCoreApplication::applicationDirPath());
 }
 
 
diff --git a/src/env.h b/src/env.h
index 0e88263b..1f146a08 100644
--- a/src/env.h
+++ b/src/env.h
@@ -1,3 +1,8 @@
+#ifndef ENV_ENV_H
+#define ENV_ENV_H
+
+class Settings;
+
 namespace env
 {
 
@@ -125,13 +130,17 @@ public:
 
   // logs the environment
   //
-  void dump() const;
+  void dump(const Settings& s) const;
 
 private:
   std::vector<Module> m_modules;
   std::unique_ptr<WindowsInfo> m_windows;
   std::vector<SecurityProduct> m_security;
   std::unique_ptr<Metrics> m_metrics;
+
+  // dumps all the disks involved in the settings
+  //
+  void dumpDisks(const Settings& s) const;
 };
 
 
@@ -152,3 +161,5 @@ bool coredump(CoreDumpTypes type);
 bool coredumpOther(CoreDumpTypes type);
 
 } // namespace env
+
+#endif // ENV_ENV_H
diff --git a/src/envmetrics.h b/src/envmetrics.h
index bede36fc..c5d2765a 100644
--- a/src/envmetrics.h
+++ b/src/envmetrics.h
@@ -1,3 +1,6 @@
+#ifndef ENV_METRICS_H
+#define ENV_METRICS_H
+
 #include <QString>
 #include <vector>
 
@@ -70,3 +73,5 @@ private:
 };
 
 } // namespace
+
+#endif // ENV_METRICS_H
diff --git a/src/envmodule.h b/src/envmodule.h
index ea1156bd..3f0f99ab 100644
--- a/src/envmodule.h
+++ b/src/envmodule.h
@@ -1,3 +1,6 @@
+#ifndef ENV_MODULE_H
+#define ENV_MODULE_H
+
 #include <QString>
 #include <QDateTime>
 
@@ -96,3 +99,5 @@ private:
 std::vector<Module> getLoadedModules();
 
 } // namespace env
+
+#endif // ENV_MODULE_H
diff --git a/src/envsecurity.h b/src/envsecurity.h
index 200cb531..bc63c4a2 100644
--- a/src/envsecurity.h
+++ b/src/envsecurity.h
@@ -1,3 +1,6 @@
+#ifndef ENV_SECURITY_H
+#define ENV_SECURITY_H
+
 #include <QUuid>
 #include <QString>
 
@@ -47,3 +50,5 @@ private:
 std::vector<SecurityProduct> getSecurityProducts();
 
 } // namespace env
+
+#endif // ENV_SECURITY_H
diff --git a/src/envshortcut.h b/src/envshortcut.h
index 82eea191..a05528d9 100644
--- a/src/envshortcut.h
+++ b/src/envshortcut.h
@@ -1,3 +1,6 @@
+#ifndef ENV_SHORTCUT_H
+#define ENV_SHORTCUT_H
+
 #include <QString>
 
 class Executable;
@@ -103,3 +106,5 @@ private:
 QString toString(Shortcut::Locations loc);
 
 } // namespace
+
+#endif // ENV_SHORTCUT_H
diff --git a/src/envwindows.h b/src/envwindows.h
index c23f99f4..90655e49 100644
--- a/src/envwindows.h
+++ b/src/envwindows.h
@@ -1,3 +1,6 @@
+#ifndef ENV_WINDOWS_H
+#define ENV_WINDOWS_H
+
 #include <QString>
 #include <optional>
 
@@ -104,3 +107,5 @@ private:
 };
 
 } // namespace
+
+#endif // ENV_WINDOWS_H
diff --git a/src/main.cpp b/src/main.cpp
index b5568fec..04bc423b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -577,8 +577,7 @@ int runApplication(MOApplication &application, SingleInstance &instance,
     OrganizerCore::setGlobalCrashDumpsType(settings.diagnostics().crashDumpsType());
 
     env::Environment env;
-
-    env.dump();
+    env.dump(settings);
     settings.dump();
     sanityChecks(env);
 
diff --git a/src/pch.h b/src/pch.h
index af1a4ade..01a97357 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -255,3 +255,4 @@
 #include <QWhatsThisClickedEvent>
 #include <QWidget>
 #include <QWidgetAction>
+#include <QStorageInfo>