aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-23 07:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: downloadData and downloadClient methods

Browse source
This commit is contained in:
kervala 2016-05-16 14:49:18 +02:00
parent d04ce81261
commit 4284a1d409
2 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
View file

@ -97,7 +97,7 @@ void COperationDialog::processNextStep()
break;
case CConfigFile::DownloadData:
m_downloader->prepareFile(config->expandVariables(server.dataDownloadUrl), config->getInstallationDirectory() + "/" + config->expandVariables(server.dataDownloadFilename) + ".part");
downloadData();
break;
case CConfigFile::ExtractDownloadedData:
@ -105,7 +105,7 @@ void COperationDialog::processNextStep()
break;
case CConfigFile::DownloadClient:
m_downloader->prepareFile(config->expandVariables(server.clientDownloadUrl), config->getInstallationDirectory() + "/" + config->expandVariables(server.clientDownloadFilename) + ".part");
downloadClient();
break;
case CConfigFile::ExtractDownloadedClient:
@ -248,7 +248,33 @@ void COperationDialog::onProgressFail(const QString &error)
void COperationDialog::onDone()
{
processNextStep();
if (!operationShouldStop()) processNextStep();
}
void COperationDialog::downloadData()
{
CConfigFile *config = CConfigFile::getInstance();
// default server
const CServer &server = config->getServer();
m_currentOperation = QApplication::tr("Download data required for server %1").arg(server.name);
m_currentOperationProgressFormat = QApplication::tr("Downloading %1...");
m_downloader->prepareFile(config->expandVariables(server.dataDownloadUrl), config->getInstallationDirectory() + "/" + config->expandVariables(server.dataDownloadFilename) + ".part");
}
void COperationDialog::downloadClient()
{
CConfigFile *config = CConfigFile::getInstance();
// default server
const CServer &server = config->getServer();
m_currentOperation = QApplication::tr("Download client required for server %1").arg(server.name);
m_currentOperationProgressFormat = QApplication::tr("Downloading %1...");
m_downloader->prepareFile(config->expandVariables(server.clientDownloadUrl), config->getInstallationDirectory() + "/" + config->expandVariables(server.clientDownloadFilename) + ".part");
}
void COperationDialog::copyServerFiles()

2
code/ryzom/tools/client/ryzom_installer/src/operationdialog.h
View file

@ -82,6 +82,8 @@ protected:
void processNextStep();
// operations
void downloadData();
void downloadClient();
void copyServerFiles();
void copyProfileFiles();
void extractBnpClient();