From 5c9de17b6376ce94b1cdff4f4edbba798e9bfd08 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 23 Nov 2019 22:08:53 -0500
Subject: rewrite of json report parsing added json.h with some utilities

---
 src/loot.h | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'src/loot.h')

diff --git a/src/loot.h b/src/loot.h
index 54fc6fd1..95dbbe50 100644
--- a/src/loot.h
+++ b/src/loot.h
@@ -33,6 +33,14 @@ signals:
   void finished();
 
 private:
+  struct Report;
+  struct Stats;
+  struct Message;
+  struct Plugin;
+  struct Dirty;
+  struct File;
+  class BadReport {};
+
   std::unique_ptr<QThread> m_thread;
   std::atomic<bool> m_cancel;
   std::atomic<bool> m_result;
@@ -50,20 +58,16 @@ private:
   void processMessage(const lootcli::Message& m);
 
   void processOutputFile();
-  bool processMessages(const QJsonArray& messages);
-  bool processMessage(const QJsonObject& message);
-  bool processPlugins(const QJsonArray& plugins);
-  bool processPlugin(const QJsonObject& plugin);
-
-  bool processPluginDirty(const QString& name, const QJsonObject& plugin);
-
-  template <class Format, class... Args>
-  void logJsonError(Format&& f, Args&&... args)
-  {
-    MOBase::log::error(
-      std::string("loot output file '{}': ") + f,
-      m_outPath, std::forward<Args>(args)...);
-  };
+
+  Report createReport(const QJsonDocument& doc) const;
+  Message reportMessage(const QJsonObject& message) const;
+  std::vector<Plugin> reportPlugins(const QJsonArray& plugins) const;
+  Loot::Plugin reportPlugin(const QJsonObject& plugin) const;
+
+  std::vector<Message> reportMessages(const QJsonArray& array) const;
+  std::vector<Loot::File> reportFiles(const QJsonArray& array) const;
+  std::vector<Loot::Dirty> reportDirty(const QJsonArray& array) const;
+  std::vector<QString> reportStringArray(const QJsonArray& array) const;
 };
 
 
-- 
cgit v1.3.1