Skip to content

Commit

Permalink
refactor: move "delete old update files" logic to Updates (#5535)
Browse files Browse the repository at this point in the history
  • Loading branch information
pajlada authored Aug 8, 2024
1 parent f0802af commit 89857e3
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 17 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
17 changes: 1 addition & 16 deletions src/RunGui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
23 changes: 22 additions & 1 deletion src/singletons/Updates.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <QProcess>
#include <QRegularExpression>
#include <QStringBuilder>
#include <QtConcurrent>
#include <semver/semver.hpp>

namespace {
Expand All @@ -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_)
Expand Down Expand Up @@ -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_;
Expand Down
5 changes: 5 additions & 0 deletions src/singletons/Updates.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ class Updates

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;
Expand Down

0 comments on commit 89857e3

Please sign in to comment.