Merge branch 'develop' into macos-add-to-path

2 files changed, 75 insertions, 1 deletions

diff --git a/launcher/modplatform/helpers/HashUtils.cpp b/launcher/modplatform/helpers/HashUtils.cpp
index a7bbaba5..f1e4759e 100644
--- a/launcher/modplatform/helpers/HashUtils.cpp
+++ b/launcher/modplatform/helpers/HashUtils.cpp
@@ -4,6 +4,7 @@
 #include <QFile>
 
 #include "FileSystem.h"
+#include "StringUtils.h"
 
 #include <MurmurHash2.h>
 
@@ -35,6 +36,18 @@ Hasher::Ptr createFlameHasher(QString file_path)
     return new FlameHasher(file_path);
 }
 
+Hasher::Ptr createBlockedModHasher(QString file_path, ModPlatform::Provider provider)
+{
+    return new BlockedModHasher(file_path, provider);
+}
+
+Hasher::Ptr createBlockedModHasher(QString file_path, ModPlatform::Provider provider, QString type)
+{
+    auto hasher = new BlockedModHasher(file_path, provider);
+    hasher->useHashType(type);
+    return hasher;
+}
+
 void ModrinthHasher::executeTask()
 {
     QFile file(m_path);
@@ -66,7 +79,7 @@ void FlameHasher::executeTask()
     // CF-specific
     auto should_filter_out = [](char c) { return (c == 9 || c == 10 || c == 13 || c == 32); };
 
-    std::ifstream file_stream(m_path.toStdString(), std::ifstream::binary);
+    std::ifstream file_stream(StringUtils::toStdString(m_path), std::ifstream::binary);
     // TODO: This is very heavy work, but apparently QtConcurrent can't use move semantics, so we can't boop this to another thread.
     // How do we make this non-blocking then?
     m_hash = QString::number(MurmurHash2(std::move(file_stream), 4 * MiB, should_filter_out));
@@ -78,4 +91,50 @@ void FlameHasher::executeTask()
     }
 }
 
+
+BlockedModHasher::BlockedModHasher(QString file_path, ModPlatform::Provider provider) 
+    : Hasher(file_path), provider(provider) { 
+    setObjectName(QString("BlockedModHasher: %1").arg(file_path)); 
+    hash_type = ProviderCaps.hashType(provider).first();
+}
+
+void BlockedModHasher::executeTask()
+{
+    QFile file(m_path);
+
+    try {
+        file.open(QFile::ReadOnly);
+    } catch (FS::FileSystemException& e) {
+        qCritical() << QString("Failed to open JAR file in %1").arg(m_path);
+        qCritical() << QString("Reason: ") << e.cause();
+
+        emitFailed("Failed to open file for hashing.");
+        return;
+    }
+
+    m_hash = ProviderCaps.hash(provider, &file, hash_type);
+
+    file.close();
+
+    if (m_hash.isEmpty()) {
+        emitFailed("Empty hash!");
+    } else {
+        emitSucceeded();
+    }
+}
+
+QStringList BlockedModHasher::getHashTypes() {
+    return ProviderCaps.hashType(provider);
+}
+
+bool BlockedModHasher::useHashType(QString type) {
+    auto types = ProviderCaps.hashType(provider);
+    if (types.contains(type)) {
+        hash_type = type;
+        return true;
+    }
+    qDebug() << "Bad hash type " << type << " for provider";
+    return false;
+}
+
 }  // namespace Hashing
diff --git a/launcher/modplatform/helpers/HashUtils.h b/launcher/modplatform/helpers/HashUtils.h
index 38fddf03..fa3244f6 100644
--- a/launcher/modplatform/helpers/HashUtils.h
+++ b/launcher/modplatform/helpers/HashUtils.h
@@ -40,8 +40,23 @@ class ModrinthHasher : public Hasher {
     void executeTask() override;
 };
 
+class BlockedModHasher : public Hasher {
+   public:
+    BlockedModHasher(QString file_path, ModPlatform::Provider provider);
+
+    void executeTask() override;
+
+    QStringList getHashTypes();
+    bool useHashType(QString type);
+   private:
+    ModPlatform::Provider provider;
+    QString hash_type;
+};
+
 Hasher::Ptr createHasher(QString file_path, ModPlatform::Provider provider);
 Hasher::Ptr createFlameHasher(QString file_path);
 Hasher::Ptr createModrinthHasher(QString file_path);
+Hasher::Ptr createBlockedModHasher(QString file_path, ModPlatform::Provider provider);
+Hasher::Ptr createBlockedModHasher(QString file_path, ModPlatform::Provider provider, QString type);
 
 }  // namespace Hashing