flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T419, download component improvements

Browse Source 
* do not download again if already exists
* check if download can be run on current platform
This commit is contained in:
Klaus Basan
2019-03-05 02:26:10 +01:00
committed by Mat Sutcliffe
parent 8bf14d3dd5
commit 8154b67fcc
1 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/blackgui/components/downloadcomponent.cpp
View File

@@ -193,14 +193,31 @@ namespace BlackGui
this->showStartedFileMessage(remoteFile);
m_fileInProgress = remoteFile;
const QString saveAsFile = CFileUtils::appendFilePaths(ui->le_DownloadDir->text(), remoteFile.getName());
QNetworkReply *r = sGui->downloadFromNetwork(download, saveAsFile, { this, &CDownloadComponent::downloadedFile});
const QFileInfo fiSaveAs(saveAsFile);
if (fiSaveAs.exists())
{
const QString msg = QStringLiteral("File '%1' already exists locally.\n\nDo you want to reload the file?").arg(fiSaveAs.absoluteFilePath());
QMessageBox::StandardButton reply = QMessageBox::question(this, "File exists", msg, QMessageBox::Yes | QMessageBox::No);
if (reply != QMessageBox::Yes)
{
const QPointer<CDownloadComponent> myself(this);
QTimer::singleShot(10, this, [ = ]
{
if (!myself || !sGui || sGui->isShuttingDown()) { return; }
this->downloadedFile(CStatusMessage(this).info(u"File was already downloaded"));
});
return true;
}
}
QNetworkReply *reply = sGui->downloadFromNetwork(download, saveAsFile, { this, &CDownloadComponent::downloadedFile});
bool success = false;
if (r)
if (reply)
{
// this->showLoading(10 * 1000);
CLogMessage(this).info(u"Triggered downloading of file from '%1'") << download.getHost();
connect(r, &QNetworkReply::downloadProgress, this, &CDownloadComponent::downloadProgress);
m_reply = r;
connect(reply, &QNetworkReply::downloadProgress, this, &CDownloadComponent::downloadProgress, Qt::QueuedConnection);
m_reply = reply;
success = true;
}
else
@@ -267,9 +284,19 @@ namespace BlackGui
QMessageBox::StandardButton reply = QMessageBox::question(this, "Start?", msg.arg(rf.getName()), QMessageBox::Yes | QMessageBox::No);
if (reply != QMessageBox::Yes) { return; }
const CPlatform p = CArtifact::artifactNameToPlatform(rf.getName());
if (!CPlatform::canRunOnCurrentPlatform(p))
{
// cannot run on this OS, just show the directory where the download resides
// do not close
ui->pb_OpenDownloadDir->click();
return;
}
QStringList arguments;
if (rf.isSwiftInstaller())
{
/** installer now remembers install dir
QDir dir(QCoreApplication::applicationDirPath());
dir.cdUp();
if (dir.exists())
@@ -278,6 +305,7 @@ namespace BlackGui
arguments << "--installdir";
arguments << d;
}
**/
}
const bool started = QProcess::startDetached(executable, arguments, dir.absolutePath());