refactor: use QIODevice instead of a whole QByteArray for hash calc.

This allows Qt to do its thing and optimize the data gathering from the
JAR.

Signed-off-by: flow <flowlnlnln@gmail.com>

2 files changed, 18 insertions, 22 deletions

diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index 3c4b7887..34fd9f30 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -19,6 +19,8 @@
 #include "modplatform/ModIndex.h"
 
 #include <QCryptographicHash>
+#include <QDebug>
+#include <QIODevice>
 
 namespace ModPlatform {
 
@@ -53,34 +55,26 @@ auto ProviderCapabilities::hashType(Provider p) -> QStringList
     }
     return {};
 }
-auto ProviderCapabilities::hash(Provider p, QByteArray& data, QString type) -> QByteArray
+
+auto ProviderCapabilities::hash(Provider p, QIODevice* device, QString type) -> QString
 {
+    QCryptographicHash::Algorithm algo = QCryptographicHash::Sha1;
     switch (p) {
         case Provider::MODRINTH: {
-            // NOTE: Data is the result of reading the entire JAR file!
-
-            // If 'type' was specified, we use that
-            if (!type.isEmpty() && hashType(p).contains(type)) {
-                if (type == "sha512")
-                    return QCryptographicHash::hash(data, QCryptographicHash::Sha512);
-                else if (type == "sha1")
-                    return QCryptographicHash::hash(data, QCryptographicHash::Sha1);
-            }
-
-            return QCryptographicHash::hash(data, QCryptographicHash::Sha512);
+            algo = (type == "sha1") ? QCryptographicHash::Sha1 : QCryptographicHash::Sha512;
+            break;
         }
         case Provider::FLAME:
-            // If 'type' was specified, we use that
-            if (!type.isEmpty() && hashType(p).contains(type)) {
-                if(type == "sha1")
-                    return QCryptographicHash::hash(data, QCryptographicHash::Sha1);
-                else if (type == "md5")
-                    return QCryptographicHash::hash(data, QCryptographicHash::Md5);
-            }
-            
+            algo = (type == "sha1") ? QCryptographicHash::Sha1 : QCryptographicHash::Md5;
             break;
     }
-    return {};
+
+    QCryptographicHash hash(algo);
+    if(!hash.addData(device))
+        qCritical() << "Failed to read JAR to create hash!";
+
+    Q_ASSERT(hash.result().length() == hash.hashLength(algo));
+    return { hash.result().toHex() };
 }
 
 }  // namespace ModPlatform
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index dc297d03..89fe1c5c 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -24,6 +24,8 @@
 #include <QVariant>
 #include <QVector>
 
+class QIODevice;
+
 namespace ModPlatform {
 
 enum class Provider {
@@ -36,7 +38,7 @@ class ProviderCapabilities {
     auto name(Provider) -> const char*;
     auto readableName(Provider) -> QString;
     auto hashType(Provider) -> QStringList;
-    auto hash(Provider, QByteArray&, QString type = "") -> QByteArray;
+    auto hash(Provider, QIODevice*, QString type = "") -> QString;
 };
 
 struct ModpackAuthor {