///////////////////////////////////////////////////////////////////////////////
// Simple x264 Launcher
-// Copyright (C) 2004-2013 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2022 LoRd_MuldeR <MuldeR2@GMX.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
///////////////////////////////////////////////////////////////////////////////
#include "win_updater.h"
-#include "uic_win_updater.h"
+#include "UIC_win_updater.h"
+//Internal
#include "global.h"
-#include "thread_updater.h"
-#include "checksum.h"
+#include "model_sysinfo.h"
+//MUtils
+#include <MUtils/UpdateChecker.h>
+#include <MUtils/Hash.h>
+#include <MUtils/GUI.h>
+#include <MUtils/OSSupport.h>
+#include <MUtils/Exception.h>
+
+//Qt
#include <QMovie>
#include <QCloseEvent>
#include <QTimer>
#include <QFileInfo>
#include <QDir>
#include <QMap>
+#include <QElapsedTimer>
///////////////////////////////////////////////////////////////////////////////
+static const char *const DIGEST_KEY = "~Dv/bW3/7t>6?RXVwkaZk-hmS0#O4JS/5YQAO>\\8hvr0B~7[n!X~KMYruemu:MDq";
+
+const UpdaterDialog::binary_t UpdaterDialog::BINARIES[] =
+{
+ { "curl.exe", "02f8831c1c93733daf46a4fb183499bc463aa6555214a193937036a1a279e31a65dacef20b4f3b542de5304608688437421a3b4d82cd6b851a245fb5c4f888d1", 1 },
+ { "curl.crt", "e2942301ec0aa5dc82ea8a193ec0537359891ae3eeddf67643cd9c84ce5c4120c58d70c0416208b614e5383b758975091c2e18006251ea5504583b4bff0fbbc6", 0 },
+ { "vrfy.exe", "91dd35a9d223c42c4c39d8b1ef928c1f0354125a4eefff46a5984082990b3505c272e8d1a4d73b9089ec9c27fb055dab2560a5ebb1d15f323be6615ca0e176d0", 1 },
+ { "wupd.exe", "018a8d0d848407fb0cb530b4540c6f025fd4c280885becd37f83feed8aeb3af6f8e8e0d45066a36549efac7e64706ac1ef09aaa5c75ab8d12c4a70f41518a894", 1 },
+ { NULL, NULL, 0 }
+};
+
#define UPDATE_TEXT(N, TEXT) ui->label_phase##N->setText((TEXT))
#define UPDATE_ICON(N, ICON) ui->icon_phase##N->setPixmap(QIcon(":/buttons/" ICON ".png").pixmap(16, 16))
#define SHOW_ANIMATION(FLAG) do \
{ \
- ui->labelLoadingLeft->setVisible((FLAG)); \
- ui->labelLoadingCenter->setVisible((FLAG)); \
- ui->labelLoadingRight->setVisible((FLAG)); \
- ui->labelBuildNo->setVisible(!(FLAG)); \
+ ui->frameAnimation->setVisible((FLAG)); \
ui->labelInfo->setVisible(!(FLAG)); \
ui->labelUrl->setVisible(!(FLAG)); \
+ ui->labelBuildNo->setVisible(!(FLAG)); \
if((FLAG)) m_animator->start(); else m_animator->stop(); \
} \
while(0)
+static inline QString getBin(const QMap<QString, QSharedPointer<QFile>> &binaries, const QString &nameName)
+{
+ const QSharedPointer<QFile> file = binaries.value(nameName);
+ return file.isNull() ? QString() : file->fileName();
+}
+
+static void qFileDeleter(QFile *const file)
+{
+ if(file)
+ {
+ file->close();
+ delete file;
+ }
+}
///////////////////////////////////////////////////////////////////////////////
// Constructor & Destructor
///////////////////////////////////////////////////////////////////////////////
-UpdaterDialog::UpdaterDialog(QWidget *parent, const QString &binDir)
+UpdaterDialog::UpdaterDialog(QWidget *parent, const SysinfoModel *sysinfo, const char *const updateUrl)
:
QDialog(parent),
ui(new Ui::UpdaterDialog()),
- m_binDir(binDir),
- m_status(UpdateCheckThread::UpdateStatus_NotStartedYet),
+ m_sysinfo(sysinfo),
+ m_updateUrl(updateUrl),
+ m_status(MUtils::UpdateChecker::UpdateStatus_NotStartedYet),
m_thread(NULL),
m_updaterProcess(NULL),
m_success(false),
ui->setupUi(this);
setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
- //Fix size
+ //Scale and fix size
+ MUtils::GUI::scale_widget(this);
setFixedSize(size());
//Enable buttons
connect(ui->labelUrl, SIGNAL(linkActivated(QString)), this, SLOT(openUrl(QString)));
//Init animation
- m_animator = new QMovie(":/images/loading.gif");
- ui->labelLoadingCenter->setMovie(m_animator);
- m_animator->start();
+ m_animator.reset(new QMovie(":/images/loading.gif"));
+ ui->labelLoadingCenter->setMovie(m_animator.data());
//Init buttons
ui->buttonCancel->setEnabled(false);
ui->buttonRetry->hide();
ui->buttonDownload->hide();
+ ui->labelCancel->hide();
- //Hide labels
- ui->labelInfo->hide();
- ui->labelUrl->hide();
- ui->labelBuildNo->hide();
+ //Start animation
+ SHOW_ANIMATION(true);
}
UpdaterDialog::~UpdaterDialog(void)
{
- if(m_thread)
+ if(!m_thread.isNull())
{
- if(!m_thread->wait(1000))
+ if(!m_thread->wait(5000))
{
m_thread->terminate();
m_thread->wait();
}
}
-
- if((!m_keysFile.isEmpty()) && QFile::exists(m_keysFile))
- {
- QFile::setPermissions(m_keysFile, QFile::ReadOwner | QFile::WriteOwner);
- QFile::remove(m_keysFile);
- m_keysFile.clear();
- }
-
- X264_DELETE(m_thread);
- X264_DELETE(m_animator);
-
delete ui;
}
///////////////////////////////////////////////////////////////////////////////
-// Public Functions
-///////////////////////////////////////////////////////////////////////////////
-
-/*None yet*/
-
-///////////////////////////////////////////////////////////////////////////////
// Events
///////////////////////////////////////////////////////////////////////////////
{
if((e->type() == QEvent::ActivationChange) && (m_updaterProcess != NULL))
{
- x264_bring_process_to_front(m_updaterProcess);
+ MUtils::GUI::bring_to_front(m_updaterProcess);
}
return QDialog::event(e);
}
void UpdaterDialog::keyPressEvent(QKeyEvent *event)
{
- if(event->key() == Qt::Key_F11)
+ switch (event->key())
{
- QFile logFile(QString("%1/%2.log").arg(x264_temp_directory(), x264_rand_str()));
- if(logFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
+ case Qt::Key_Escape:
+ if ((!m_thread.isNull()) && m_thread->isRunning())
{
- logFile.write("\xEF\xBB\xBF");
- for(QStringList::ConstIterator iter = m_logFile.constBegin(); iter != m_logFile.constEnd(); iter++)
+ if (m_status >= MUtils::UpdateChecker::UpdateStatus_FetchingUpdates)
{
- logFile.write(iter->toUtf8());
- logFile.write("\r\n");
+ UPDATE_TEXT(2, tr("Cancellation requested..."));
}
- logFile.close();
- QDesktopServices::openUrl(QUrl::fromLocalFile(logFile.fileName()));
+ else
+ {
+ UPDATE_TEXT(1, tr("Cancellation requested..."));
+ }
+ m_thread->cancel();
}
+ break;
+ case Qt::Key_F11:
+ {
+ const QString logFilePath = MUtils::make_temp_file(MUtils::temp_folder(), "txt", true);
+ if (!logFilePath.isEmpty())
+ {
+ qWarning("Write log to: '%s'", MUTILS_UTF8(logFilePath));
+ QFile logFile(logFilePath);
+ if (logFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
+ {
+ logFile.write("\xEF\xBB\xBF");
+ for (QStringList::ConstIterator iter = m_logFile.constBegin(); iter != m_logFile.constEnd(); iter++)
+ {
+ logFile.write(iter->toUtf8());
+ logFile.write("\r\n");
+ }
+ logFile.close();
+ QDesktopServices::openUrl(QUrl::fromLocalFile(logFile.fileName()));
+ }
+ }
+ }
+ break;
+ default:
+ QDialog::keyPressEvent(event);
}
}
void UpdaterDialog::initUpdate(void)
{
//Check binary files
- QString wgetBin, gpgvBin;
- if(!checkBinaries(wgetBin, gpgvBin))
+ if(!checkBinaries())
{
ui->buttonCancel->setEnabled(true);
- QMessageBox::critical(this, tr("File Error"), tr("At least one file required by web-update is missing or corrupted.<br>Please re-install this application and then try again!"));
+ const QString message = QString("%1<br><br><nobr><a href=\"%2\">%3</a></nobr><br>").arg(tr("At least one file required by the web-update tool is missing or corrupted.<br>Please re-install this application and then try again!"), QString::fromLatin1(m_updateUrl), QString::fromLatin1(m_updateUrl).replace("-", "−"));
+ if(QMessageBox::critical(this, tr("File Error"), message, tr("Download Latest Version"), tr("Discard")) == 0)
+ {
+ QDesktopServices::openUrl(QUrl(QString::fromLatin1(m_updateUrl)));
+ }
close();
return;
}
+
+ //Make sure user does have admin access
+ if(!MUtils::OS::user_is_admin())
+ {
+ qWarning("User is not in the \"admin\" group, cannot update!");
+ QString message;
+ message += QString("<nobr>%1</nobr><br>").arg(tr("Sorry, but only users in the \"Administrators\" group can install updates."));
+ message += QString("<nobr>%1</nobr>").arg(tr("Please start application from an administrator account and try again!"));
+ if(QMessageBox::critical(this, this->windowTitle(), message, tr("Discard"), tr("Ignore")) != 1)
+ {
+ ui->buttonCancel->setEnabled(true);
+ close();
+ return;
+ }
+ }
//Create and setup thread
if(!m_thread)
{
- m_thread = new UpdateCheckThread(wgetBin, gpgvBin, m_keysFile, false);
- connect(m_thread, SIGNAL(statusChanged(int)), this, SLOT(threadStatusChanged(int)));
- connect(m_thread, SIGNAL(finished()), this, SLOT(threadFinished()));
- connect(m_thread, SIGNAL(terminated()), this, SLOT(threadFinished()));
- connect(m_thread, SIGNAL(messageLogged(QString)), this, SLOT(threadMessageLogged(QString)));
+ m_thread.reset(new MUtils::UpdateChecker(getBin(m_binaries, "curl.exe"), getBin(m_binaries, "vrfy.exe"), "Simple x264 Launcher", x264_version_build(), false));
+ connect(m_thread.data(), SIGNAL(statusChanged(int)), this, SLOT(threadStatusChanged(int)));
+ connect(m_thread.data(), SIGNAL(finished()), this, SLOT(threadFinished()));
+ connect(m_thread.data(), SIGNAL(terminated()), this, SLOT(threadFinished()));
+ connect(m_thread.data(), SIGNAL(messageLogged(QString)), this, SLOT(threadMessageLogged(QString)));
}
//Begin updater run
//Hide labels
ui->labelInfo->hide();
ui->labelUrl->hide();
+ ui->labelCancel->show();
//Update status
- threadStatusChanged(UpdateCheckThread::UpdateStatus_NotStartedYet);
+ threadStatusChanged(MUtils::UpdateChecker::UpdateStatus_NotStartedYet);
//Start animation
SHOW_ANIMATION(true);
//Clear log
m_logFile.clear();
+ //Init timer
+ m_elapsed.reset(new QElapsedTimer());
+ m_elapsed->start();
+
//Start the updater thread
- QTimer::singleShot(250, m_thread, SLOT(start()));
+ QTimer::singleShot(125, m_thread.data(), SLOT(start()));
}
void UpdaterDialog::threadStatusChanged(int status)
{
+ const int prevStatus = m_status;
switch(m_status = status)
{
- case UpdateCheckThread::UpdateStatus_NotStartedYet:
+ case MUtils::UpdateChecker::UpdateStatus_NotStartedYet:
UPDATE_ICON(1, "clock");
UPDATE_ICON(2, "clock");
UPDATE_ICON(3, "clock");
break;
- case UpdateCheckThread::UpdateStatus_CheckingConnection:
+ case MUtils::UpdateChecker::UpdateStatus_CheckingConnection:
UPDATE_ICON(1, "play");
break;
- case UpdateCheckThread::UpdateStatus_FetchingUpdates:
+ case MUtils::UpdateChecker::UpdateStatus_FetchingUpdates:
UPDATE_ICON(1, "shield_green");
UPDATE_TEXT(1, tr("Internet connection is working."));
UPDATE_ICON(2, "play");
break;
- case UpdateCheckThread::UpdateStatus_ErrorNoConnection:
+ case MUtils::UpdateChecker::UpdateStatus_ErrorNoConnection:
UPDATE_ICON(1, "shield_error");
UPDATE_TEXT(1, tr("Computer is currently offline!"));
UPDATE_ICON(2, "shield_grey");
UPDATE_ICON(3, "shield_grey");
break;
- case UpdateCheckThread::UpdateStatus_ErrorConnectionTestFailed:
+ case MUtils::UpdateChecker::UpdateStatus_ErrorConnectionTestFailed:
UPDATE_ICON(1, "shield_error");
UPDATE_TEXT(1, tr("Internet connectivity test failed!"));
UPDATE_ICON(2, "shield_grey");
UPDATE_ICON(3, "shield_grey");
break;
- case UpdateCheckThread::UpdateStatus_ErrorFetchUpdateInfo:
+ case MUtils::UpdateChecker::UpdateStatus_ErrorFetchUpdateInfo:
UPDATE_ICON(2, "shield_error");
UPDATE_TEXT(2, tr("Failed to download the update information!"));
UPDATE_ICON(3, "shield_grey");
break;
- case UpdateCheckThread::UpdateStatus_CompletedUpdateAvailable:
- case UpdateCheckThread::UpdateStatus_CompletedNoUpdates:
- case UpdateCheckThread::UpdateStatus_CompletedNewVersionOlder:
+ case MUtils::UpdateChecker::UpdateStatus_CompletedUpdateAvailable:
+ case MUtils::UpdateChecker::UpdateStatus_CompletedNoUpdates:
+ case MUtils::UpdateChecker::UpdateStatus_CompletedNewVersionOlder:
UPDATE_ICON(2, "shield_green");
UPDATE_TEXT(2, tr("Update information received successfully."));
UPDATE_ICON(3, "play");
break;
+ case MUtils::UpdateChecker::UpdateStatus_CancelledByUser:
+ if (prevStatus >= MUtils::UpdateChecker::UpdateStatus_FetchingUpdates)
+ {
+ UPDATE_ICON(2, "shield_error");
+ UPDATE_TEXT(2, tr("Operation was cancelled by the user!"));
+ UPDATE_ICON(3, "shield_grey");
+ }
+ else
+ {
+ UPDATE_ICON(1, "shield_error");
+ UPDATE_TEXT(1, tr("Operation was cancelled by the user!"));
+ UPDATE_ICON(2, "shield_grey");
+ UPDATE_ICON(3, "shield_grey");
+ }
+ break;
default:
- throw "Unknown status code!";
+ MUTILS_THROW("Unknown status code!");
}
}
void UpdaterDialog::threadFinished(void)
{
m_success = m_thread->getSuccess();
- QTimer::singleShot((m_success ? 1000 : 0), this, SLOT(updateFinished()));
+ ui->labelCancel->hide();
+ QTimer::singleShot((m_success ? 500 : 0), this, SLOT(updateFinished()));
}
void UpdaterDialog::updateFinished(void)
{
+ //Query the timer, if available
+ if (!m_elapsed.isNull())
+ {
+ const quint64 elapsed = m_elapsed->restart();
+ qDebug("Update check completed after %.2f seconds.", double(elapsed) / 1000.0);
+ }
+
//Restore cursor
QApplication::restoreOverrideCursor();
{
switch(m_status)
{
- case UpdateCheckThread::UpdateStatus_CompletedUpdateAvailable:
+ case MUtils::UpdateChecker::UpdateStatus_CompletedUpdateAvailable:
UPDATE_ICON(3, "shield_exclamation");
UPDATE_TEXT(3, tr("A newer version is available!"));
ui->buttonDownload->show();
break;
- case UpdateCheckThread::UpdateStatus_CompletedNoUpdates:
+ case MUtils::UpdateChecker::UpdateStatus_CompletedNoUpdates:
UPDATE_ICON(3, "shield_green");
UPDATE_TEXT(3, tr("Your version is up-to-date."));
break;
- case UpdateCheckThread::UpdateStatus_CompletedNewVersionOlder:
+ case MUtils::UpdateChecker::UpdateStatus_CompletedNewVersionOlder:
UPDATE_ICON(3, "shield_blue");
UPDATE_TEXT(3, tr("You are using a pre-release version!"));
break;
//Show update info or retry button
switch(m_status)
{
- case UpdateCheckThread::UpdateStatus_CompletedUpdateAvailable:
- case UpdateCheckThread::UpdateStatus_CompletedNoUpdates:
- case UpdateCheckThread::UpdateStatus_CompletedNewVersionOlder:
+ case MUtils::UpdateChecker::UpdateStatus_CompletedUpdateAvailable:
+ case MUtils::UpdateChecker::UpdateStatus_CompletedNoUpdates:
+ case MUtils::UpdateChecker::UpdateStatus_CompletedNewVersionOlder:
SHOW_ANIMATION(false);
- ui->labelBuildNo->setText(tr("Installed build is #%1 | Latest build is #%2").arg(QString::number(x264_version_build()), QString::number(m_thread->getUpdateInfo()->m_buildNo)));
- ui->labelUrl->setText(QString("<a href=\"%1\">%1</a>").arg(m_thread->getUpdateInfo()->m_downloadSite));
+ ui->labelBuildNo->setText(tr("Installed build is #%1 | Latest build is #%2").arg(QString::number(x264_version_build()), QString::number(m_thread->getUpdateInfo()->getBuildNo())));
+ ui->labelUrl->setText(QString("<a href=\"%1\">%1</a>").arg(m_thread->getUpdateInfo()->getDownloadSite()));
break;
- case UpdateCheckThread::UpdateStatus_ErrorNoConnection:
- case UpdateCheckThread::UpdateStatus_ErrorConnectionTestFailed:
- case UpdateCheckThread::UpdateStatus_ErrorFetchUpdateInfo:
+ case MUtils::UpdateChecker::UpdateStatus_ErrorNoConnection:
+ case MUtils::UpdateChecker::UpdateStatus_ErrorConnectionTestFailed:
+ case MUtils::UpdateChecker::UpdateStatus_ErrorFetchUpdateInfo:
+ case MUtils::UpdateChecker::UpdateStatus_CancelledByUser:
m_animator->stop();
ui->buttonRetry->show();
break;
ui->buttonCancel->setEnabled(false);
SHOW_ANIMATION(true);
- const UpdateInfo *updateInfo = m_thread->getUpdateInfo();
+ const MUtils::UpdateCheckerInfo *updateInfo = m_thread->getUpdateInfo();
QProcess process;
QStringList args;
QEventLoop loop;
- x264_init_process(process, x264_temp_directory(), false);
+ MUtils::init_process(process, MUtils::temp_folder(), false);
connect(&process, SIGNAL(error(QProcess::ProcessError)), &loop, SLOT(quit()));
connect(&process, SIGNAL(finished(int,QProcess::ExitStatus)), &loop, SLOT(quit()));
- args << QString("/Location=%1").arg(updateInfo->m_downloadAddress);
- args << QString("/Filename=%1").arg(updateInfo->m_downloadFilename);
- args << QString("/TicketID=%1").arg(updateInfo->m_downloadFilecode);
- args << QString("/ToFolder=%1").arg(QDir::toNativeSeparators(QDir(QApplication::applicationDirPath()).canonicalPath()));
+ args << QString("/Location=%1").arg(updateInfo->getDownloadAddress());
+ args << QString("/Filename=%1").arg(updateInfo->getDownloadFilename());
+ args << QString("/TicketID=%1").arg(updateInfo->getDownloadFilecode());
+ args << QString("/CheckSum=%1").arg(updateInfo->getDownloadChecksum());
+ args << QString("/ToFolder=%1").arg(QDir::toNativeSeparators(QDir(QApplication::applicationDirPath()).canonicalPath()));
args << QString("/ToExFile=%1.exe").arg(QFileInfo(QFileInfo(QApplication::applicationFilePath()).canonicalFilePath()).completeBaseName());
- args << QString("/AppTitle=Simple x264 Launcher (Build #%1)").arg(QString::number(updateInfo->m_buildNo));
+ args << QString("/AppTitle=Simple x264 Launcher (Build #%1)").arg(QString::number(updateInfo->getBuildNo()));
- process.start(m_wupdFile, args);
+ process.start(getBin(m_binaries, "wupd.exe"), args);
if(!process.waitForStarted())
{
QApplication::restoreOverrideCursor();
return;
}
- m_updaterProcess = x264_process_id(process);
+ m_updaterProcess = MUtils::OS::process_id(&process);
loop.exec(QEventLoop::ExcludeUserInputEvents);
if(!process.waitForFinished())
// Private Functions
///////////////////////////////////////////////////////////////////////////////
-bool UpdaterDialog::checkBinaries(QString &wgetBin, QString &gpgvBin)
+bool UpdaterDialog::checkBinaries(void)
{
qDebug("[File Verification]");
-
- static struct
- {
- const char* name;
- const char* hash;
- }
- FILE_INFO[] =
- {
- { "wget.exe", "7b522345239bcb95b5b0f7f50a883ba5957894a1feb769763e38ed789a8a0f63fead0155f54b9ffd0f1cdc5dfd855d207a6e7a8e4fd192589a8838ce646c504e" },
- { "gpgv.exe", "e61d28e4c47b2422ceec7b8fc08f9c70f10a3056e3779a974026eb24fe09551eedc2e7f34fbe5ef8e844fab0dbe68b85c4ca69d63bf85d445f7cae152c17f589" },
- { "gpgv.gpg", "58e0f0e462bbd0b5aa4f638801c1097da7da4b3eb38c8c88ad1db23705c0f11e174b083fa55fe76bd3ba196341c967833a6f3427d6f63ad8565900745535d8fa" },
- { "wupd.exe", "9dd0ae5f386aaf5df9e261a53b81569df51bccf2f9290ed42f04a5b52b4a4e1118f2c9ce3a9b2492fd5ae597600411dfa47bd7c96e2fd7bee205d603324452a2" },
- { NULL, NULL }
- };
-
- QMap<QString, QString> binaries;
-
- m_keysFile.clear();
- m_wupdFile.clear();
- wgetBin.clear();
- gpgvBin.clear();
-
- bool okay = true;
-
- for(size_t i = 0; FILE_INFO[i].name; i++)
- {
- const QString binPath = QString("%1/common/%2").arg(m_binDir, QString::fromLatin1(FILE_INFO[i].name));
- if(okay = okay && checkFileHash(binPath, FILE_INFO[i].hash))
- {
- binaries.insert(FILE_INFO[i].name, binPath);
- }
- }
-
- if(okay)
+ for(size_t i = 0; BINARIES[i].name; i++)
{
- wgetBin = binaries.value("wget.exe");
- gpgvBin = binaries.value("gpgv.exe");
-
- m_wupdFile = binaries.value("wupd.exe");
- m_keysFile = QString("%1/%2.gpg").arg(x264_temp_directory(), x264_rand_str());
-
- if(okay = QFile::copy(binaries.value("gpgv.gpg"), m_keysFile))
+ const QString name = QString::fromLatin1(BINARIES[i].name);
+ if (!m_binaries.contains(name))
{
- QFile::setPermissions(m_keysFile, QFile::ReadOwner);
+ QScopedPointer<QFile> binary(new QFile(QString("%1/toolset/common/%2").arg(m_sysinfo->getAppPath(), name)));
+ if (binary->open(QIODevice::ReadOnly))
+ {
+ if (checkFileHash(binary->fileName(), BINARIES[i].hash))
+ {
+ QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+ m_binaries.insert(name, QSharedPointer<QFile>(binary.take(), qFileDeleter));
+ }
+ else
+ {
+ qWarning("Verification of '%s' has failed!", MUTILS_UTF8(name));
+ binary->close();
+ return false;
+ }
+ }
+ else
+ {
+ qWarning("File '%s' could not be opened!", MUTILS_UTF8(name));
+ return false;
+ }
}
- qDebug("%s\n", okay ? "Completed." : "Failed to copy GPG file!");
}
-
- return okay;
+ qDebug("File check completed.\n");
+ return true;
}
bool UpdaterDialog::checkFileHash(const QString &filePath, const char *expectedHash)
{
- qDebug("Checking file: %s", filePath.toUtf8().constData());
- QBlake2Checksum checksum2;
+ qDebug("Checking file: %s", MUTILS_UTF8(filePath));
+ QScopedPointer<MUtils::Hash::Hash> checksum(MUtils::Hash::create(MUtils::Hash::HASH_BLAKE2_512, DIGEST_KEY));
QFile file(filePath);
if(file.open(QIODevice::ReadOnly))
{
- checksum2.update(file);
- const QByteArray fileHash = checksum2.finalize();
+ checksum->update(file);
+ const QByteArray fileHash = checksum->digest();
if((strlen(expectedHash) != fileHash.size()) || (memcmp(fileHash.constData(), expectedHash, fileHash.size()) != 0))
{
qWarning("\nFile appears to be corrupted:\n%s\n", filePath.toUtf8().constData());
OSDN Git Service
