mirror of
https://github.com/leozide/leocad.git
synced 2026-10-27 06:20:55 +00:00
Leonardo Zide
9d2ec2197c
Counting the combined registry after unofficial archives load can inflate the installed official-piece count and suppress legitimate update notifications. Capture the count immediately after the official archive is discovered, before unofficial additions or overrides, so overrides still count as official entries. Pass official-library eligibility explicitly into Load from the startup path metadata. Custom paths, directory libraries and fallback loading retain a zero update count, and unload clears it before any subsequent load. Remove the post-load setter and expose the protected count through GetOfficialPieceCount for the update dialog. Validation: warning-free macOS Qt 6.10 Debug build and all 45 offscreen lifecycle checks pass. Count checks cover unofficial additions and overrides, later missing identities, custom archives, directory/failed reloads, fallback and unload reset. Diff whitespace checks are clean.
148 lines
3.7 KiB
C++
148 lines
3.7 KiB
C++
#include "lc_global.h"
|
|
#include "lc_updatedialog.h"
|
|
#include "ui_lc_updatedialog.h"
|
|
#include "lc_application.h"
|
|
#include "lc_library.h"
|
|
#include "lc_profile.h"
|
|
#include "lc_http.h"
|
|
|
|
void lcDoInitialUpdateCheck()
|
|
{
|
|
int UpdateFrequency = lcGetProfileInt(LC_PROFILE_CHECK_UPDATES);
|
|
|
|
if (UpdateFrequency == 0)
|
|
return;
|
|
|
|
QSettings Settings;
|
|
QDateTime CheckTime = Settings.value("Updates/LastCheck", QDateTime()).toDateTime();
|
|
|
|
if (!CheckTime.isNull())
|
|
{
|
|
QDateTime NextCheckTime = CheckTime.addDays(UpdateFrequency == 1 ? 1 : 7);
|
|
|
|
if (NextCheckTime > QDateTime::currentDateTimeUtc())
|
|
return;
|
|
}
|
|
|
|
new lcUpdateDialog(nullptr, true);
|
|
}
|
|
|
|
lcUpdateDialog::lcUpdateDialog(QWidget* Parent, bool InitialUpdate)
|
|
: QDialog(Parent), ui(new Ui::lcUpdateDialog), mInitialUpdate(InitialUpdate)
|
|
{
|
|
ui->setupUi(this);
|
|
|
|
connect(this, &QDialog::finished, this, &lcUpdateDialog::finished);
|
|
|
|
ui->status->setText(tr("Connecting to update server..."));
|
|
|
|
mHttpManager = new lcHttpManager(this);
|
|
connect(mHttpManager, &lcHttpManager::DownloadFinished, this, &lcUpdateDialog::DownloadFinished);
|
|
|
|
mHttpManager->DownloadFile(QLatin1String("https://www.leocad.org/updates.txt"));
|
|
}
|
|
|
|
lcUpdateDialog::~lcUpdateDialog()
|
|
{
|
|
delete ui;
|
|
}
|
|
|
|
void lcUpdateDialog::accept()
|
|
{
|
|
QSettings Settings;
|
|
Settings.setValue("Updates/IgnoreVersion", mVersionData);
|
|
|
|
QDialog::accept();
|
|
}
|
|
|
|
void lcUpdateDialog::finished(int result)
|
|
{
|
|
Q_UNUSED(result);
|
|
|
|
if (mInitialUpdate)
|
|
deleteLater();
|
|
}
|
|
|
|
void lcUpdateDialog::DownloadFinished(lcHttpReply* Reply)
|
|
{
|
|
bool UpdateAvailable = false;
|
|
|
|
if (Reply->error() == QNetworkReply::NoError)
|
|
{
|
|
int MajorVersion, MinorVersion, PatchVersion;
|
|
int Parts;
|
|
|
|
mVersionData = Reply->readAll();
|
|
const char* Update = mVersionData;
|
|
|
|
QSettings Settings;
|
|
QByteArray IgnoreUpdate = Settings.value("Updates/IgnoreVersion", QByteArray()).toByteArray();
|
|
|
|
if (mInitialUpdate && IgnoreUpdate == mVersionData)
|
|
{
|
|
UpdateAvailable = false;
|
|
}
|
|
else if (sscanf(Update, "%d.%d.%d %d", &MajorVersion, &MinorVersion, &PatchVersion, &Parts) == 4)
|
|
{
|
|
QString Status;
|
|
|
|
if (MajorVersion > LC_VERSION_MAJOR)
|
|
UpdateAvailable = true;
|
|
else if (MajorVersion == LC_VERSION_MAJOR)
|
|
{
|
|
if (MinorVersion > LC_VERSION_MINOR)
|
|
UpdateAvailable = true;
|
|
else if (MinorVersion == LC_VERSION_MINOR)
|
|
{
|
|
if (PatchVersion > LC_VERSION_PATCH)
|
|
UpdateAvailable = true;
|
|
}
|
|
}
|
|
|
|
if (UpdateAvailable)
|
|
Status = QString(tr("<p>There's a newer version of LeoCAD available for download (%1.%2.%3).</p>")).arg(QString::number(MajorVersion), QString::number(MinorVersion), QString::number(PatchVersion));
|
|
else
|
|
Status = tr("<p>You are using the latest LeoCAD version.</p>");
|
|
|
|
const int OfficialPieceCount = lcGetPiecesLibrary()->GetOfficialPieceCount();
|
|
|
|
if (OfficialPieceCount)
|
|
{
|
|
if (Parts > OfficialPieceCount)
|
|
{
|
|
Status += tr("<p>There are new parts available.</p>");
|
|
UpdateAvailable = true;
|
|
}
|
|
else
|
|
Status += tr("<p>There are no new parts available at this time.</p>");
|
|
}
|
|
|
|
if (UpdateAvailable)
|
|
{
|
|
Status += tr("<p>Visit <a href=\"https://github.com/leozide/leocad/releases\">https://github.com/leozide/leocad/releases</a> to download.</p>");
|
|
}
|
|
|
|
ui->status->setText(Status);
|
|
}
|
|
else
|
|
ui->status->setText(tr("Error parsing update information."));
|
|
|
|
Settings.setValue("Updates/LastCheck", QDateTime::currentDateTimeUtc());
|
|
}
|
|
else
|
|
ui->status->setText(tr("Error connecting to the update server."));
|
|
|
|
if (mInitialUpdate)
|
|
{
|
|
if (UpdateAvailable)
|
|
show();
|
|
else
|
|
deleteLater();
|
|
}
|
|
|
|
if (UpdateAvailable)
|
|
ui->buttonBox->setStandardButtons(QDialogButtonBox::Close | QDialogButtonBox::Ignore);
|
|
else
|
|
ui->buttonBox->setStandardButtons(QDialogButtonBox::Close);
|
|
}
|