From e46a637dfcdf8b03851a96ca13d23fd3e03fc1b1 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 14 Jun 2016 19:50:19 +0200 Subject: [PATCH] Changed: Implement downloaded client extraction --- .../ryzom_installer/src/operationdialog.cpp | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index 2b7c9ea98..2a7c80ae1 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -362,7 +362,30 @@ void COperationDialog::downloadClient() m_downloader->prepareFile(config->expandVariables(server.clientDownloadUrl), config->getInstallationDirectory() + "/" + config->expandVariables(server.clientDownloadFilename) + ".part"); } -void COperationDialog::copyServerFiles() +void COperationDialog::extractDownloadedClient() +{ + CConfigFile *config = CConfigFile::getInstance(); + + const CServer &server = config->getServer(m_currentServerId); + + m_currentOperation = QApplication::tr("Extract data files required by server %1").arg(server.name); + m_currentOperationProgressFormat = QApplication::tr("Extracting %1..."); + + CFilesExtractor extractor(this); + extractor.setSourceFile(config->getInstallationDirectory() + "/" + server.clientDownloadFilename); + extractor.setDestinationDirectory(server.getDirectory()); + + if (extractor.exec()) + { + } + else + { + } + + emit done(); +} + +void COperationDialog::copyDataFiles() { CConfigFile *config = CConfigFile::getInstance();