refactor: move "delete old update files" logic to Updates (#5535)

This commit is contained in:
pajlada 2024-08-08 20:28:08 +02:00 committed by GitHub
parent f0802af055
commit 89857e37de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 17 deletions

View file

@ -59,6 +59,7 @@
- Dev: `FlagsEnum` is now `constexpr`. (#5510)
- Dev: Documented and added tests to RTL handling. (#5473)
- Dev: Refactored 7TV/BTTV definitions out of `TwitchIrcServer` into `Application`. (#5532)
- Dev: Refactored code that's responsible for deleting old update files. (#5535)
- Dev: Refactored a few `#define`s into `const(expr)` and cleaned includes. (#5527)
- Dev: Prepared for Qt 6.8 by addressing some deprecations. (#5529)

View file

@ -241,22 +241,7 @@ void runGui(QApplication &a, const Paths &paths, Settings &settings,
}
#endif
auto thread = std::thread([dir = paths.miscDirectory] {
{
auto path = combinePath(dir, "Update.exe");
if (QFile::exists(path))
{
QFile::remove(path);
}
}
{
auto path = combinePath(dir, "update.zip");
if (QFile::exists(path))
{
QFile::remove(path);
}
}
});
updates.deleteOldFiles();
// Clear the cache 1 minute after start.
QTimer::singleShot(60 * 1000, [cachePath = paths.cacheDirectory(),

View file

@ -17,6 +17,7 @@
#include <QProcess>
#include <QRegularExpression>
#include <QStringBuilder>
#include <QtConcurrent>
#include <semver/semver.hpp>
namespace {
@ -40,9 +41,9 @@ const QString CHATTERINO_OS = u"freebsd"_s;
#else
const QString CHATTERINO_OS = u"unknown"_s;
#endif
;
} // namespace
namespace chatterino {
Updates::Updates(const Paths &paths_)
@ -75,6 +76,26 @@ bool Updates::isDowngradeOf(const QString &online, const QString &current)
return onlineVersion < currentVersion;
}
void Updates::deleteOldFiles()
{
std::ignore = QtConcurrent::run([dir{this->paths.miscDirectory}] {
{
auto path = combinePath(dir, "Update.exe");
if (QFile::exists(path))
{
QFile::remove(path);
}
}
{
auto path = combinePath(dir, "update.zip");
if (QFile::exists(path))
{
QFile::remove(path);
}
}
});
}
const QString &Updates::getCurrentVersion() const
{
return currentVersion_;

View file

@ -31,6 +31,11 @@ public:
static bool isDowngradeOf(const QString &online, const QString &current);
/**
* @brief Delete old files that belong to the update process
*/
void deleteOldFiles();
void checkForUpdates();
const QString &getCurrentVersion() const;
const QString &getOnlineVersion() const;