Fix for changed download URL.

madsciencecoder · Apr 29, 2018 · 8ca1c89 · 8ca1c89
1 parent f7cdd6f
commit 8ca1c89
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 113 deletions.
diff --git a/Schticker-Book-Rewritten.pro b/Schticker-Book-Rewritten.pro
@@ -38,8 +38,8 @@ SOURCES += main.cpp\
     loginworker.cpp \
     twofactorwindow.cpp \
     patchworker.cpp \
-    hashworker.cpp \
-    filelocationchooser.cpp
+    filelocationchooser.cpp \
+    utilities.cpp
 
 HEADERS  += launcherwindow.h \
     globaldefines.h \
@@ -50,8 +50,8 @@ HEADERS  += launcherwindow.h \
     loginworker.h \
     twofactorwindow.h \
     patchworker.h \
-    hashworker.h \
-    filelocationchooser.h
+    filelocationchooser.h \
+    utilities.h
 
 FORMS    += launcherwindow.ui \
     twofactorwindow.ui \

diff --git a/globaldefines.h b/globaldefines.h
@@ -50,4 +50,4 @@
 #define PATCH_MANIFEST_URL "https://cdn.toontownrewritten.com/content/patchmanifest.txt"
 
 //content distribution URL
-#define CDN_URL "https://cdn.toontownrewritten.com/content/patches/"
+#define CDN_URL "http://s3.amazonaws.com/download.toontownrewritten.com/patches/"
diff --git a/hashworker.cpp b/hashworker.cpp
diff --git a/hashworker.h b/hashworker.h
diff --git a/updateworker.cpp b/updateworker.cpp
@@ -23,6 +23,7 @@
 #include "extractionworker.h"
 #include "downloadworker.h"
 #include "patchworker.h"
+#include "utilities.h"
 
 #include <QJsonObject>
 #include <QJsonArray>
@@ -35,8 +36,6 @@
 
 UpdateWorker::UpdateWorker(QObject *parent) : QObject(parent)
 {
-    hashWorker = new HashWorker(this);
-
     QSettings settings("Shticker-Book-Rewritten", "Shticker-Book-Rewritten");
 
     settings.beginGroup("FilesPath");
@@ -96,7 +95,7 @@ void UpdateWorker::patchManifestReady(QJsonDocument patchManifest)
             if(file.exists())
                 {
                     //generate the SHA1 hash of the file to compare with the patch manifest
-                    fileHash = hashWorker->getHash(localFileName);
+                    fileHash = getHash(localFileName);
                     qDebug() << "Local file's hash is:" << fileHash;
 
                     //Check if the hash matches the patch manifest
@@ -129,7 +128,7 @@ void UpdateWorker::patchManifestReady(QJsonDocument patchManifest)
                                 getNewFile(patchObject["filename"].toString(), patchFileName, extractedFileName, patchObject["compPatchHash"].toString());
 
                                 //verify the downloaded patch is good
-                                if(hashWorker->getHash(extractedFileName) == patchObject["patchHash"].toString())
+                                if(getHash(extractedFileName) == patchObject["patchHash"].toString())
                                 {
                                     qDebug() << "Downloaded patch matches manifest";
                                 }
@@ -144,7 +143,7 @@ void UpdateWorker::patchManifestReady(QJsonDocument patchManifest)
                                 hasBeenPatched = true;
 
                                 //check if the patch updated the file fully
-                                if(hashWorker->getHash(localFileName) == fileObject["hash"].toString())
+                                if(getHash(localFileName) == fileObject["hash"].toString())
                                 {
                                     qDebug() << "File has been patched fully\n";
                                     fileIsOld = false;
@@ -167,7 +166,7 @@ void UpdateWorker::patchManifestReady(QJsonDocument patchManifest)
                             getNewFile(fileObject["dl"].toString(), localBz2FileName, localFileName, fileObject["compHash"].toString());
 
                             //check to make sure it is up to date
-                            fileHash = hashWorker->getHash(localFileName);
+                            fileHash = getHash(localFileName);
                             if(fileHash == fileObject["hash"].toString())
                             {
                                 qDebug() << "Downloaded file's integrity has been verified\n";
@@ -188,7 +187,7 @@ void UpdateWorker::patchManifestReady(QJsonDocument patchManifest)
                     getNewFile(fileObject["dl"].toString(), localBz2FileName, localFileName, fileObject["compHash"].toString());
 
                     //check to make sure it is up to date
-                    fileHash = hashWorker->getHash(localFileName);
+                    fileHash = getHash(localFileName);
                     if(fileHash == fileObject["hash"].toString())
                     {
                         qDebug() << "Downloaded file's integrity has been verified\n";
@@ -269,7 +268,7 @@ void UpdateWorker::getNewFile(QString dlFile, QString localBz2FileName, QString
     startDownload(dlFile);
 
     //make sure download succeeded, logging for debugging purposes but still extracting because TTR has been known to not update hashes
-    QByteArray fileHash = hashWorker->getHash(localBz2FileName);
+    QByteArray fileHash = getHash(localBz2FileName);
 
     if(fileHash == compHash)
     {

diff --git a/updateworker.h b/updateworker.h
@@ -22,7 +22,6 @@
 #define UPDATEWORKER_H
 
 #include "jsonworker.h"
-#include "hashworker.h"
 
 #include <QObject>
 #include <QJsonDocument>
@@ -52,7 +51,6 @@ private slots:
 
 private:
     JsonWorker *jsonWorker;
-    HashWorker *hashWorker;
     QString filePath;
     QString cachePath;
 

diff --git a/utilities.cpp b/utilities.cpp
@@ -0,0 +1,35 @@
+#include "utilities.h"
+
+#include<QString>
+#include<QFile>
+#include<QCryptographicHash>
+#include<QDebug>
+
+QByteArray getHash(QString fileName)
+{
+    QString hashString;
+    QFile file(fileName);
+    QByteArray hashArray;
+    QCryptographicHash *sha1Hash;
+
+    //Attempt to open the file
+    if(!file.open(QFile::ReadOnly))
+    {
+        qDebug() << "Unable to read file:" << fileName << ". Error:" << file.errorString() << "\n";
+    }
+    else
+    {
+        //Load the file's data to process
+        QByteArray fileContents = file.readAll();
+
+        hashArray = sha1Hash->hash(fileContents, QCryptographicHash::Sha1);
+    }
+
+    //clean up the file since we are done with it
+    file.flush();
+    file.close();
+    file.deleteLater();
+
+    //return the checksum in hexidecimal format since that is what the manifest requires
+    return hashArray.toHex();
+}
diff --git a/utilities.h b/utilities.h
@@ -0,0 +1,8 @@
+#ifndef UTILITIES_H
+#define UTILITIES_H
+
+#include <QByteArray>
+
+QByteArray getHash(QString);
+
+#endif // UTILITIES_H