aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-26 17:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-08-14 13:36:44 +02:00
parent 5ea8a69890
commit 80275386ec
13 changed files with 374 additions and 229 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
View file

@ -24,122 +24,6 @@
#define new DEBUG_NEW
#endif
const CServer NoServer;
const CProfile NoProfile;
QString CServer::getDirectory() const
{
return CConfigFile::getInstance()->getInstallationDirectory() + "/" + id;
}
QString CServer::getClientFullPath() const
{
if (clientFilename.isEmpty()) return "";
return getDirectory() + "/" + clientFilename;
}
QString CServer::getConfigurationFullPath() const
{
if (configurationFilename.isEmpty()) return "";
return getDirectory() + "/" + configurationFilename;
}
QString CProfile::getDirectory() const
{
return CConfigFile::getInstance()->getProfileDirectory() + "/" + id;
}
QString CProfile::getClientFullPath() const
{
if (!executable.isEmpty()) return executable;
const CServer &s = CConfigFile::getInstance()->getServer(server);
return s.getClientFullPath();
}
QString CProfile::getClientDesktopShortcutFullPath() const
{
#ifdef Q_OS_WIN32
return CConfigFile::getInstance()->getDesktopDirectory() + "/" + name + ".lnk";
#elif defined(Q_OS_MAC)
return "";
#else
return CConfigFile::getInstance()->getDesktopDirectory() + "/" + name + ".desktop";
#endif
}
QString CProfile::getClientMenuShortcutFullPath() const
{
#ifdef Q_OS_WIN32
return CConfigFile::getInstance()->getMenuDirectory() + "/" + name + ".lnk";
#elif defined(Q_OS_MAC)
return "";
#else
return CConfigFile::getInstance()->getMenuDirectory() + "/" + name + ".desktop";
#endif
}
void CProfile::createShortcuts() const
{
const CServer &s = CConfigFile::getInstance()->getServer(server);
QString executable = getClientFullPath();
QString workingDir = s.getDirectory();
QString arguments = QString("--profile %1").arg(id);
// append custom arguments
if (!arguments.isEmpty()) arguments += QString(" %1").arg(arguments);
QString icon;
#ifdef Q_OS_WIN32
// under Windows, icon is included in executable
icon = executable;
#else
// icon is in the same directory as client
icon = s.getDirectory() + "/ryzom_client.png";
#endif
if (desktopShortcut)
{
QString shortcut = getClientDesktopShortcutFullPath();
// create desktop shortcut
createLink(shortcut, name, executable, arguments, icon, workingDir);
}
if (menuShortcut)
{
QString shortcut = getClientMenuShortcutFullPath();
// create menu shortcut
createLink(shortcut, name, executable, arguments, icon, workingDir);
}
}
void CProfile::deleteShortcuts() const
{
// delete desktop shortcut
QString link = getClientDesktopShortcutFullPath();
if (QFile::exists(link)) QFile::remove(link);
// delete menu shortcut
link = getClientMenuShortcutFullPath();
if (QFile::exists(link)) QFile::remove(link);
}
void CProfile::updateShortcuts() const
{
deleteShortcuts();
createShortcuts();
}
CConfigFile *CConfigFile::s_instance = NULL;
CConfigFile::CConfigFile(QObject *parent):QObject(parent), m_version(-1),
@ -165,7 +49,12 @@ CConfigFile::~CConfigFile()
bool CConfigFile::load()
{
// load default values
return load(m_defaultConfigPath) || load(m_configPath);
if (!load(m_defaultConfigPath)) return false;
// ignore return value, since we'll always have valid values
load(m_configPath);
return true;
}
bool CConfigFile::load(const QString &filename)
@ -833,11 +722,28 @@ bool CConfigFile::shouldCreateMenuShortcut() const
return !shortcut.isEmpty() && !NLMISC::CFile::isExists(qToUtf8(shortcut));
}
QString CConfigFile::getInstallerFullPath() const
QString CConfigFile::getInstallerCurrentFilePath() const
{
// installer is always run from TEMP under Windows
return QApplication::applicationFilePath();
}
QString CConfigFile::getInstallerCurrentDirPath() const
{
// installer is always run from TEMP under Windows
return QApplication::applicationDirPath();
}
QString CConfigFile::getInstallerOriginalFilePath() const
{
return getInstallerOriginalDirPath() + "/" + QFileInfo(QApplication::applicationFilePath()).fileName();
}
QString CConfigFile::getInstallerOriginalDirPath() const
{
return m_installationDirectory;
}
QString CConfigFile::getInstallerMenuLinkFullPath() const
{
#ifdef Q_OS_WIN32
@ -1022,8 +928,20 @@ OperationStep CConfigFile::getInstallNextStep() const
}
}
QString installerDst = getInstallationDirectory() + "/" + server.installerFilename;
// if installer not found in installation directory, extract it from BNP
if (!QFile::exists(getInstallationDirectory() + "/" + server.installerFilename))
if (QFile::exists(installerDst))
{
QString installerSrc = getInstallerCurrentFilePath();
// copy it too if destination one if older than new one
uint64 srcDate = QFileInfo(installerSrc).lastModified().toTime_t();
uint64 dstDate = QFileInfo(installerDst).lastModified().toTime_t();
if (srcDate > dstDate) return CopyInstaller;
}
else
{
return CopyInstaller;
}

75
code/ryzom/tools/client/ryzom_installer/src/configfile.h
View file

@ -18,73 +18,8 @@
#define CONFIGFILE_H
#include "operation.h"
class CServer
{
public:
CServer()
{
dataCompressedSize = 0;
dataUncompressedSize = 0;
}
QString id;
QString name;
QString displayUrl;
QString dataDownloadUrl;
QString dataDownloadFilename;
qint64 dataCompressedSize;
qint64 dataUncompressedSize;
QString clientDownloadUrl;
QString clientDownloadFilename;
QString clientFilename;
QString clientFilenameOld;
QString configurationFilename;
QString installerFilename;
QString comments;
// helpers
QString getDirectory() const;
QString getClientFullPath() const;
QString getConfigurationFullPath() const;
};
extern const CServer NoServer;
typedef QVector<CServer> CServers;
class CProfile
{
public:
CProfile()
{
desktopShortcut = false;
menuShortcut = false;
}
QString id;
QString name;
QString server;
QString executable;
QString arguments;
QString comments;
bool desktopShortcut;
bool menuShortcut;
// helpers
QString getDirectory() const;
QString getClientFullPath() const;
QString getClientDesktopShortcutFullPath() const;
QString getClientMenuShortcutFullPath() const;
void createShortcuts() const;
void deleteShortcuts() const;
void updateShortcuts() const;
};
extern const CProfile NoProfile;
typedef QVector<CProfile> CProfiles;
#include "server.h"
#include "profile.h"
/**
* Config file management and other stuff related to location of files/directories.
@ -178,7 +113,11 @@ public:
QString getClientArch() const;
QString getInstallerFullPath() const;
QString getInstallerCurrentFilePath() const;
QString getInstallerCurrentDirPath() const;
QString getInstallerOriginalFilePath() const;
QString getInstallerOriginalDirPath() const;
QString getInstallerMenuLinkFullPath() const;
QStringList getInstallerRequiredFiles() const;

2
code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp
View file

@ -51,7 +51,7 @@ bool CFilesCleaner::exec()
QStringList filter;
filter << "*.string_cache";
if (dir.exists("packed_sheets.bnp"))
if (dir.exists("packedsheets.bnp"))
{
filter << "*.packed_sheets";
filter << "*.packed";

35
code/ryzom/tools/client/ryzom_installer/src/main.cpp
View file

@ -120,6 +120,24 @@ int main(int argc, char *argv[])
return 1;
}
#if defined(Q_OS_WIN) && !defined(_DEBUG)
// under Windows, Ryzom Installer should always be copied in TEMP directory
QString tempPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
// check if launched from TEMP directory
if (step == Done && QApplication::applicationDirPath() != tempPath)
{
// copy installer and required files to TEMP directory
if (copyInstallerFiles(config.getInstallerRequiredFiles(), tempPath))
{
QString tempFile = tempPath + "/" + QFileInfo(QApplication::applicationFilePath()).fileName();
// launch copy in TEMP directory with same arguments
if (QProcess::startDetached(tempFile, QApplication::arguments())) return 0;
}
}
#endif
// use product name from ryzom_installer.ini
if (!config.getProductName().isEmpty()) QApplication::setApplicationName(config.getProductName());
@ -141,23 +159,6 @@ int main(int argc, char *argv[])
if (parser.isSet(uninstallOption))
{
#if defined(Q_OS_WIN) && !defined(_DEBUG)
QString tempPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
// check if launched from TEMP directory
if (QApplication::applicationDirPath() != tempPath)
{
// copy installer and required files to TEMP directory
if (copyInstallerFiles(config.getInstallerRequiredFiles(), tempPath))
{
QString tempFile = tempPath + "/" + QFileInfo(QApplication::applicationFilePath()).fileName();
// launch copy in TEMP directory with same arguments
if (QProcess::startDetached(tempFile, QApplication::arguments())) return 0;
}
}
#endif
SComponents components;
// add all servers by default

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

@ -713,8 +713,7 @@ void COperationDialog::copyInstaller()
QString oldInstallerFullPath = QApplication::applicationFilePath();
QString newInstallerFullPath = config->getInstallationDirectory() + "/" + newInstallerFilename;
if (!QFile::exists(newInstallerFullPath))
{
// always copy new installers
CFilesCopier copier(this);
copier.setIncludeFilter(config->getInstallerRequiredFiles());
copier.addFile(oldInstallerFullPath);
@ -728,9 +727,12 @@ void COperationDialog::copyInstaller()
// rename old filename if different
if (oldInstallerFullPath != newInstallerFullPath)
{
// delete previous installer
QFile::remove(newInstallerFullPath);
// rename new installer with final name
QFile::rename(oldInstallerFullPath, newInstallerFullPath);
}
}
// create menu directory if defined
QString path = config->getMenuDirectory();
@ -796,6 +798,9 @@ void COperationDialog::uninstallOldClient()
// don't ask this question anymore
CConfigFile::getInstance()->setShouldUninstallOldClient(false);
}
// save the choice
CConfigFile::getInstance()->save();
}
}
#endif
@ -920,7 +925,7 @@ bool COperationDialog::createAddRemoveEntry()
settings.setValue("DisplayIcon", nativeFullPath + ",0");
settings.setValue("DisplayName", QApplication::applicationName());
settings.setValue("DisplayVersion", RYZOM_VERSION);
settings.setValue("EstimatedSize", getDirectorySize(config->getInstallationDirectory()));
settings.setValue("EstimatedSize", getDirectorySize(config->getInstallationDirectory(), true));
settings.setValue("InstallDate", QDateTime::currentDateTime().toString("Ymd"));
settings.setValue("InstallLocation", config->getInstallationDirectory());
settings.setValue("MajorVersion", versionTokens[0].toInt());
@ -965,7 +970,7 @@ bool COperationDialog::updateAddRemoveEntry()
QStringList versionTokens = QApplication::applicationVersion().split('.');
settings.setValue("DisplayVersion", QApplication::applicationVersion());
settings.setValue("EstimatedSize", getDirectorySize(config->getInstallationDirectory()));
settings.setValue("EstimatedSize", getDirectorySize(config->getInstallationDirectory(), true));
settings.setValue("MajorVersion", versionTokens[0].toInt());
settings.setValue("MinorVersion", versionTokens[1].toInt());
#endif
@ -1130,7 +1135,7 @@ void COperationDialog::deleteComponentsInstaller()
dir.removeRecursively();
}
path = config->getInstallerFullPath();
path = config->getInstallerOriginalDirPath();
QStringList files = config->getInstallerRequiredFiles();
foreach(const QString &file, files)
@ -1138,7 +1143,7 @@ void COperationDialog::deleteComponentsInstaller()
QString fullPath = path + "/" + file;
// delete file
if (!QFile::remove(fullPath))
if (QFile::exists(fullPath) && !QFile::remove(fullPath))
{
#ifdef Q_OS_WIN32
// under Windows, a running executable is locked, so we need to delete it later

120
code/ryzom/tools/client/ryzom_installer/src/profile.cpp Normal file
View file

@ -0,0 +1,120 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdpch.h"
#include "profile.h"
#include "configfile.h"
#include "utils.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
const CProfile NoProfile;
QString CProfile::getDirectory() const
{
return CConfigFile::getInstance()->getProfileDirectory() + "/" + id;
}
QString CProfile::getClientFullPath() const
{
if (!executable.isEmpty()) return executable;
const CServer &s = CConfigFile::getInstance()->getServer(server);
return s.getClientFullPath();
}
QString CProfile::getClientDesktopShortcutFullPath() const
{
#ifdef Q_OS_WIN32
return CConfigFile::getInstance()->getDesktopDirectory() + "/" + name + ".lnk";
#elif defined(Q_OS_MAC)
return "";
#else
return CConfigFile::getInstance()->getDesktopDirectory() + "/" + name + ".desktop";
#endif
}
QString CProfile::getClientMenuShortcutFullPath() const
{
#ifdef Q_OS_WIN32
return CConfigFile::getInstance()->getMenuDirectory() + "/" + name + ".lnk";
#elif defined(Q_OS_MAC)
return "";
#else
return CConfigFile::getInstance()->getMenuDirectory() + "/" + name + ".desktop";
#endif
}
void CProfile::createShortcuts() const
{
const CServer &s = CConfigFile::getInstance()->getServer(server);
QString executable = getClientFullPath();
QString workingDir = s.getDirectory();
QString arguments = QString("--profile %1").arg(id);
// append custom arguments
if (!arguments.isEmpty()) arguments += QString(" %1").arg(arguments);
QString icon;
#ifdef Q_OS_WIN32
// under Windows, icon is included in executable
icon = executable;
#else
// icon is in the same directory as client
icon = s.getDirectory() + "/ryzom_client.png";
#endif
if (desktopShortcut)
{
QString shortcut = getClientDesktopShortcutFullPath();
// create desktop shortcut
createLink(shortcut, name, executable, arguments, icon, workingDir);
}
if (menuShortcut)
{
QString shortcut = getClientMenuShortcutFullPath();
// create menu shortcut
createLink(shortcut, name, executable, arguments, icon, workingDir);
}
}
void CProfile::deleteShortcuts() const
{
// delete desktop shortcut
QString link = getClientDesktopShortcutFullPath();
if (QFile::exists(link)) QFile::remove(link);
// delete menu shortcut
link = getClientMenuShortcutFullPath();
if (QFile::exists(link)) QFile::remove(link);
}
void CProfile::updateShortcuts() const
{
deleteShortcuts();
createShortcuts();
}

55
code/ryzom/tools/client/ryzom_installer/src/profile.h Normal file
View file

@ -0,0 +1,55 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef PROFILE_H
#define PROFILE_H
#include "operation.h"
class CProfile
{
public:
CProfile()
{
desktopShortcut = false;
menuShortcut = false;
}
QString id;
QString name;
QString server;
QString executable;
QString arguments;
QString comments;
bool desktopShortcut;
bool menuShortcut;
// helpers
QString getDirectory() const;
QString getClientFullPath() const;
QString getClientDesktopShortcutFullPath() const;
QString getClientMenuShortcutFullPath() const;
void createShortcuts() const;
void deleteShortcuts() const;
void updateShortcuts() const;
};
extern const CProfile NoProfile;
typedef QVector<CProfile> CProfiles;
#endif

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

@ -11,6 +11,8 @@
*/
class CProfilesModel : public QAbstractListModel
{
Q_OBJECT
public:
CProfilesModel(QObject *parent);
CProfilesModel(const CProfiles &profiles, QObject *parent);

44
code/ryzom/tools/client/ryzom_installer/src/server.cpp Normal file
View file

@ -0,0 +1,44 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdpch.h"
#include "server.h"
#include "configfile.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
const CServer NoServer;
QString CServer::getDirectory() const
{
return CConfigFile::getInstance()->getInstallationDirectory() + "/" + id;
}
QString CServer::getClientFullPath() const
{
if (clientFilename.isEmpty()) return "";
return getDirectory() + "/" + clientFilename;
}
QString CServer::getConfigurationFullPath() const
{
if (configurationFilename.isEmpty()) return "";
return getDirectory() + "/" + configurationFilename;
}

56
code/ryzom/tools/client/ryzom_installer/src/server.h Normal file
View file

@ -0,0 +1,56 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef SERVER_H
#define SERVER_H
#include "operation.h"
class CServer
{
public:
CServer()
{
dataCompressedSize = 0;
dataUncompressedSize = 0;
}
QString id;
QString name;
QString displayUrl;
QString dataDownloadUrl;
QString dataDownloadFilename;
qint64 dataCompressedSize;
qint64 dataUncompressedSize;
QString clientDownloadUrl;
QString clientDownloadFilename;
QString clientFilename;
QString clientFilenameOld;
QString configurationFilename;
QString installerFilename;
QString comments;
// helpers
QString getDirectory() const;
QString getClientFullPath() const;
QString getConfigurationFullPath() const;
};
extern const CServer NoServer;
typedef QVector<CServer> CServers;
#endif

9
code/ryzom/tools/client/ryzom_installer/src/uninstalldialog.cpp
View file

@ -243,7 +243,7 @@ void CUninstallDialog::updateSizes()
{
const CServer &server = config->getServer(it.key());
qint64 bytes = getDirectorySize(server.getDirectory());
qint64 bytes = getDirectorySize(server.getDirectory(), true);
emit updateSize(it.value(), qBytesToHumanReadable(bytes));
@ -257,13 +257,18 @@ void CUninstallDialog::updateSizes()
{
const CProfile &profile = config->getProfile(it.key());
qint64 bytes = getDirectorySize(profile.getDirectory());
qint64 bytes = getDirectorySize(profile.getDirectory(), true);
emit updateSize(it.value(), qBytesToHumanReadable(bytes));
++it;
}
// downloaded files
qint64 bytes = getDirectorySize(config->getInstallationDirectory(), false);
emit updateSize(m_downloadedFilesIndex, qBytesToHumanReadable(bytes));
emit updateLayout();
}

4
code/ryzom/tools/client/ryzom_installer/src/utils.cpp
View file

@ -34,7 +34,7 @@ QString qBytesToHumanReadable(qint64 bytes)
return QString::fromUtf8(NLMISC::bytesToHumanReadable(bytes).c_str());
}
qint64 getDirectorySize(const QString &directory)
qint64 getDirectorySize(const QString &directory, bool recursize)
{
qint64 size = 0;
@ -52,7 +52,7 @@ qint64 getDirectorySize(const QString &directory)
if (fileInfo.isDir())
{
size += getDirectorySize(fileInfo.absoluteFilePath());
if (recursize) size += getDirectorySize(fileInfo.absoluteFilePath(), true);
}
else
{

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

@ -30,7 +30,7 @@
QString qBytesToHumanReadable(qint64 bytes);
qint64 getDirectorySize(const QString &directory);
qint64 getDirectorySize(const QString &directory, bool recursize);
// Convert a UTF-8 string to QString
QString qFromUtf8(const std::string &str);