Genericize t-download, allow for no checksum

oblivioncth · Nov 5, 2023 · c5a1dde · c5a1dde
1 parent 6345fb3
commit c5a1dde
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/app/src/task/t-download.cpp b/app/src/task/t-download.cpp
@@ -89,16 +89,16 @@ void TDownload::setSha256(QString sha256) { mSha256 = sha256; }
 void TDownload::perform()
 {
     // Setup download
-    QFile packFile(mDestinationPath + '/' + mDestinationFilename);
-    QFileInfo packFileInfo(packFile);
+    QFile file(mDestinationPath + '/' + mDestinationFilename);
+    QFileInfo fileInfo(file);
     Qx::DownloadTask download{
         .target = mTargetFile,
-        .dest = packFileInfo.absoluteFilePath()
+        .dest = fileInfo.absoluteFilePath()
     };
     mDownloadManager.appendTask(download);
 
     // Log/label string
-    QString label = LOG_EVENT_DOWNLOADING_DATA_PACK.arg(packFileInfo.fileName());
+    QString label = LOG_EVENT_DOWNLOADING_FILE.arg(fileInfo.fileName());
     emit eventOccurred(NAME, label);
 
     // Start download
@@ -125,18 +125,21 @@ void TDownload::postDownload(Qx::DownloadManagerReport downloadReport)
     emit longTaskFinished();
     if(downloadReport.wasSuccessful())
     {
-        // Confirm checksum is correct
-        QFile packFile(mDestinationPath + '/' + mDestinationFilename);
-        bool checksumMatch;
-        Qx::IoOpReport cr = Qx::fileMatchesChecksum(checksumMatch, packFile, mSha256, QCryptographicHash::Sha256);
-        if(cr.isFailure() || !checksumMatch)
+        // Confirm checksum is correct, if supplied
+        if(!mSha256.isEmpty())
         {
-            TDownloadError err(TDownloadError::ChecksumMismatch, cr.isFailure() ? cr.outcomeInfo() : u""_s);
-            errorStatus = err;
-            emit errorOccurred(NAME, errorStatus);
+            QFile file(mDestinationPath + '/' + mDestinationFilename);
+            bool checksumMatch;
+            Qx::IoOpReport cr = Qx::fileMatchesChecksum(checksumMatch, file, mSha256, QCryptographicHash::Sha256);
+            if(cr.isFailure() || !checksumMatch)
+            {
+                TDownloadError err(TDownloadError::ChecksumMismatch, cr.isFailure() ? cr.outcomeInfo() : u""_s);
+                errorStatus = err;
+                emit errorOccurred(NAME, errorStatus);
+            }
         }
-        else
-            emit eventOccurred(NAME, LOG_EVENT_DOWNLOAD_SUCC);
+
+        emit eventOccurred(NAME, LOG_EVENT_DOWNLOAD_SUCC);
     }
     else
     {

diff --git a/app/src/task/t-download.h b/app/src/task/t-download.h
@@ -24,7 +24,7 @@ class QX_ERROR_TYPE(TDownloadError, "TDownloadError", 1252)
 private:
     static inline const QHash<Type, QString> ERR_STRINGS{
         {NoError, u""_s},
-        {ChecksumMismatch, u"The title's Data Pack checksum does not match its record!"_s},
+        {ChecksumMismatch, u"The file's checksum does not match its record!"_s},
         {Incomeplete, u"The download could not be completed."_s}
     };
 
@@ -59,9 +59,9 @@ class TDownload : public Task
     static inline const QString NAME = u"TDownload"_s;
 
     // Logging
-    static inline const QString LOG_EVENT_DOWNLOADING_DATA_PACK = u"Downloading Data Pack %1"_s;
-    static inline const QString LOG_EVENT_DOWNLOAD_SUCC = u"Data Pack downloaded successfully"_s;
-    static inline const QString LOG_EVENT_DOWNLOAD_AUTH = u"Data Pack download unexpectedly requires authentication (%1)"_s;
+    static inline const QString LOG_EVENT_DOWNLOADING_FILE = u"Downloading file %1"_s;
+    static inline const QString LOG_EVENT_DOWNLOAD_SUCC = u"File downloaded successfully"_s;
+    static inline const QString LOG_EVENT_DOWNLOAD_AUTH = u"File download unexpectedly requires authentication (%1)"_s;
     static inline const QString LOG_EVENT_STOPPING_DOWNLOADS = u"Stopping current download(s)..."_s;
 
 //-Instance Variables------------------------------------------------------------------------------------------------