Update following archive callback changes.

2 files changed, 11 insertions, 8 deletions

diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index dad5b436..f4b19c71 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -86,7 +86,7 @@ InstallationManager::InstallationManager()
     throw MyException(getErrorString(m_ArchiveHandler->getLastError()));
   }
   m_ArchiveHandler->setLogCallback([](auto level, auto const& message) {
-    using LogLevel = ArchiveCallbacks::LogLevel;
+    using LogLevel = Archive::LogLevel;
     switch (level) {
     case LogLevel::Debug:
       log::debug("{}", message);
@@ -165,11 +165,17 @@ bool InstallationManager::extractFiles(QString extractPath, QString title, bool
   QString errorMessage;
 
   // The callbacks:
-  ArchiveCallbacks::ProgressCallback progressCallback = [&progress](float p) { progress = static_cast<int>(p * 100.0); };
-  ArchiveCallbacks::FileChangeCallback fileChangeCallback = [&progressFile](std::wstring const& file) {
-    progressFile = QString::fromStdWString(file);
+  auto progressCallback = [&progress](auto progressType, uint64_t current, uint64_t total) { 
+    if (progressType == Archive::ProgressType::EXTRACTION) {
+      progress = static_cast<int>(100 * current / total);
+    }
+  };
+  Archive::FileChangeCallback fileChangeCallback = [&progressFile](auto changeType, std::wstring const& file) {
+    if (changeType == Archive::FileChangeType::EXTRACTION_START) {
+      progressFile = QString::fromStdWString(file);
+    }
   };
-  ArchiveCallbacks::ErrorCallback errorCallback = [&errorMessage, this](std::wstring const& message) {
+  auto errorCallback = [&errorMessage, this](std::wstring const& message) {
     m_ArchiveHandler->cancel();
     errorMessage = QString::fromStdWString(message);
   };
diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp
index dfe11880..1f56fd62 100644
--- a/src/selfupdater.cpp
+++ b/src/selfupdater.cpp
@@ -19,10 +19,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 #include "selfupdater.h"

 

-#include "archive.h"

-#include "callback.h"

 #include "utility.h"

-#include "installationmanager.h"

 #include "iplugingame.h"

 #include "messagedialog.h"

 #include "downloadmanager.h"