CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #897 from jamierocks/atl-updating-initial

Browse Source
This commit is contained in:
timoreo
2022-08-11 08:50:05 +02:00
committed by GitHub
parent 5d188c69ed 10f27250ee
commit c375e7b4df
9 changed files with 396 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
View File

@ -60,12 +60,13 @@ namespace ATLauncher {
static Meta::VersionPtr getComponentVersion(const QString& uid, const QString& version);
PackInstallTask::PackInstallTask(UserInteractionSupport *support, QString packName, QString version)
PackInstallTask::PackInstallTask(UserInteractionSupport *support, QString packName, QString version, InstallMode installMode)
{
m_support = support;
m_pack_name = packName;
m_pack_safe_name = packName.replace(QRegularExpression("[^A-Za-z0-9]"), "");
m_version_name = version;
m_install_mode = installMode;
}
bool PackInstallTask::abort()
@ -117,9 +118,30 @@ void PackInstallTask::onDownloadSucceeded()
}
m_version = version;
// Display install message if one exists
if (!m_version.messages.install.isEmpty())
m_support->displayMessage(m_version.messages.install);
// Derived from the installation mode
QString message;
bool resetDirectory;
switch (m_install_mode) {
case InstallMode::Reinstall:
case InstallMode::Update:
message = m_version.messages.update;
resetDirectory = true;
break;
case InstallMode::Install:
message = m_version.messages.install;
resetDirectory = false;
break;
default:
emitFailed(tr("Unsupported installation mode"));
break;
}
// Display message if one exists
if (!message.isEmpty())
m_support->displayMessage(message);
auto ver = getComponentVersion("net.minecraft", m_version.minecraft);
if (!ver) {
@ -128,6 +150,10 @@ void PackInstallTask::onDownloadSucceeded()
}
minecraftVersion = ver;
if (resetDirectory) {
deleteExistingFiles();
}
if(m_version.noConfigs) {
downloadMods();
}
@ -143,6 +169,116 @@ void PackInstallTask::onDownloadFailed(QString reason)
emitFailed(reason);
}
void PackInstallTask::deleteExistingFiles()
{
setStatus(tr("Deleting existing files..."));
// Setup defaults, as per https://wiki.atlauncher.com/pack-admin/xml/delete
VersionDeletes deletes;
deletes.folders.append(VersionDelete{ "root", "mods%s%" });
deletes.folders.append(VersionDelete{ "root", "configs%s%" });
deletes.folders.append(VersionDelete{ "root", "bin%s%" });
// Setup defaults, as per https://wiki.atlauncher.com/pack-admin/xml/keep
VersionKeeps keeps;
keeps.files.append(VersionKeep{ "root", "mods%s%PortalGunSounds.pak" });
keeps.folders.append(VersionKeep{ "root", "mods%s%rei_minimap%s%" });
keeps.folders.append(VersionKeep{ "root", "mods%s%VoxelMods%s%" });
keeps.files.append(VersionKeep{ "root", "config%s%NEI.cfg" });
keeps.files.append(VersionKeep{ "root", "options.txt" });
keeps.files.append(VersionKeep{ "root", "servers.dat" });
// Merge with version deletes and keeps
for (const auto& item : m_version.deletes.files)
deletes.files.append(item);
for (const auto& item : m_version.deletes.folders)
deletes.folders.append(item);
for (const auto& item : m_version.keeps.files)
keeps.files.append(item);
for (const auto& item : m_version.keeps.folders)
keeps.folders.append(item);
auto getPathForBase = [this](const QString& base) {
auto minecraftPath = FS::PathCombine(m_stagingPath, "minecraft");
if (base == "root") {
return minecraftPath;
}
else if (base == "config") {
return FS::PathCombine(minecraftPath, "config");
}
else {
qWarning() << "Unrecognised base path" << base;
return minecraftPath;
}
};
auto convertToSystemPath = [](const QString& path) {
auto t = path;
t.replace("%s%", QDir::separator());
return t;
};
auto shouldKeep = [keeps, getPathForBase, convertToSystemPath](const QString& fullPath) {
for (const auto& item : keeps.files) {
auto basePath = getPathForBase(item.base);
auto targetPath = convertToSystemPath(item.target);
auto path = FS::PathCombine(basePath, targetPath);
if (fullPath == path) {
return true;
}
}
for (const auto& item : keeps.folders) {
auto basePath = getPathForBase(item.base);
auto targetPath = convertToSystemPath(item.target);
auto path = FS::PathCombine(basePath, targetPath);
if (fullPath.startsWith(path)) {
return true;
}
}
return false;
};
// Keep track of files to delete
QSet<QString> filesToDelete;
for (const auto& item : deletes.files) {
auto basePath = getPathForBase(item.base);
auto targetPath = convertToSystemPath(item.target);
auto fullPath = FS::PathCombine(basePath, targetPath);
if (shouldKeep(fullPath))
continue;
filesToDelete.insert(fullPath);
}
for (const auto& item : deletes.folders) {
auto basePath = getPathForBase(item.base);
auto targetPath = convertToSystemPath(item.target);
auto fullPath = FS::PathCombine(basePath, targetPath);
QDirIterator it(fullPath, QDirIterator::Subdirectories);
while (it.hasNext()) {
auto path = it.next();
if (shouldKeep(path))
continue;
filesToDelete.insert(path);
}
}
// Delete the files
for (const auto& item : filesToDelete) {
QFile::remove(item);
}
}
QString PackInstallTask::getDirForModType(ModType type, QString raw)
{
switch (type) {

10
launcher/modplatform/atlauncher/ATLPackInstallTask.h
View File

@ -50,6 +50,12 @@
namespace ATLauncher {
enum class InstallMode {
Install,
Reinstall,
Update,
};
class UserInteractionSupport {
public:
@ -75,7 +81,7 @@ class PackInstallTask : public InstanceTask
Q_OBJECT
public:
explicit PackInstallTask(UserInteractionSupport *support, QString packName, QString version);
explicit PackInstallTask(UserInteractionSupport *support, QString packName, QString version, InstallMode installMode = InstallMode::Install);
virtual ~PackInstallTask(){}
bool canAbort() const override { return true; }
@ -99,6 +105,7 @@ private:
bool createLibrariesComponent(QString instanceRoot, std::shared_ptr<PackProfile> profile);
bool createPackComponent(QString instanceRoot, std::shared_ptr<PackProfile> profile);
void deleteExistingFiles();
void installConfigs();
void extractConfigs();
void downloadMods();
@ -117,6 +124,7 @@ private:
NetJob::Ptr jobPtr;
QByteArray response;
InstallMode m_install_mode;
QString m_pack_name;
QString m_pack_safe_name;
QString m_version_name;

64
launcher/modplatform/atlauncher/ATLPackManifest.cpp
View File

@ -224,6 +224,64 @@ static void loadVersionExtraArguments(ATLauncher::PackVersionExtraArguments& a,
a.depends = Json::ensureString(obj, "depends", "");
}
static void loadVersionKeep(ATLauncher::VersionKeep& k, QJsonObject& obj)
{
k.base = Json::requireString(obj, "base");
k.target = Json::requireString(obj, "target");
}
static void loadVersionKeeps(ATLauncher::VersionKeeps& k, QJsonObject& obj)
{
if (obj.contains("files")) {
auto files = Json::requireArray(obj, "files");
for (const auto keepRaw : files) {
auto keepObj = Json::requireObject(keepRaw);
ATLauncher::VersionKeep keep;
loadVersionKeep(keep, keepObj);
k.files.append(keep);
}
}
if (obj.contains("folders")) {
auto folders = Json::requireArray(obj, "folders");
for (const auto keepRaw : folders) {
auto keepObj = Json::requireObject(keepRaw);
ATLauncher::VersionKeep keep;
loadVersionKeep(keep, keepObj);
k.folders.append(keep);
}
}
}
static void loadVersionDelete(ATLauncher::VersionDelete& d, QJsonObject& obj)
{
d.base = Json::requireString(obj, "base");
d.target = Json::requireString(obj, "target");
}
static void loadVersionDeletes(ATLauncher::VersionDeletes& d, QJsonObject& obj)
{
if (obj.contains("files")) {
auto files = Json::requireArray(obj, "files");
for (const auto deleteRaw : files) {
auto deleteObj = Json::requireObject(deleteRaw);
ATLauncher::VersionDelete versionDelete;
loadVersionDelete(versionDelete, deleteObj);
d.files.append(versionDelete);
}
}
if (obj.contains("folders")) {
auto folders = Json::requireArray(obj, "folders");
for (const auto deleteRaw : folders) {
auto deleteObj = Json::requireObject(deleteRaw);
ATLauncher::VersionDelete versionDelete;
loadVersionDelete(versionDelete, deleteObj);
d.folders.append(versionDelete);
}
}
}
void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
{
v.version = Json::requireString(obj, "version");
@ -284,4 +342,10 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
auto messages = Json::ensureObject(obj, "messages");
loadVersionMessages(v.messages, messages);
auto keeps = Json::ensureObject(obj, "keeps");
loadVersionKeeps(v.keeps, keeps);
auto deletes = Json::ensureObject(obj, "deletes");
loadVersionDeletes(v.deletes, deletes);
}

23
launcher/modplatform/atlauncher/ATLPackManifest.h
View File

@ -150,6 +150,26 @@ struct VersionMessages
QString update;
};
struct VersionKeep {
QString base;
QString target;
};
struct VersionKeeps {
QVector<VersionKeep> files;
QVector<VersionKeep> folders;
};
struct VersionDelete {
QString base;
QString target;
};
struct VersionDeletes {
QVector<VersionDelete> files;
QVector<VersionDelete> folders;
};
struct PackVersionMainClass
{
QString mainClass;
@ -178,6 +198,9 @@ struct PackVersion
QMap<QString, QString> colours;
QMap<QString, QString> warnings;
VersionMessages messages;
VersionKeeps keeps;
VersionDeletes deletes;
};
void loadVersion(PackVersion & v, QJsonObject & obj);