From 719f3e863a2bdbaeaba37e837e0f6b75de124e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 29 Dec 2017 00:37:14 +0100 Subject: NOISSUE add versioning to component metadata format and use it --- api/logic/minecraft/ComponentList.cpp | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) (limited to 'api/logic/minecraft/ComponentList.cpp') diff --git a/api/logic/minecraft/ComponentList.cpp b/api/logic/minecraft/ComponentList.cpp index dbf6ee08..3fb04255 100644 --- a/api/logic/minecraft/ComponentList.cpp +++ b/api/logic/minecraft/ComponentList.cpp @@ -450,42 +450,30 @@ bool ComponentList::migratePreComponentConfig() intendedVersion = emptyVersion; } auto file = ProfileUtils::parseJsonFile(QFileInfo(jsonFilePath), false); - bool fileChanged = false; - // if uid is missing or incorrect, fix it - if(file->uid != uid) - { - file->uid = uid; - fileChanged = true; - } + // fix uid + file->uid = uid; // if version is missing, add it from the outside. if(file->version.isEmpty()) { file->version = intendedVersion; - fileChanged = true; } // if this is a dependency (LWJGL), mark it also as volatile if(asDependency) { file->m_volatile = true; - fileChanged = true; } // insert requirements if needed if(!req.uid.isEmpty()) { file->requires.insert(req); - fileChanged = true; } // insert conflicts if needed if(!conflict.uid.isEmpty()) { file->conflicts.insert(conflict); - fileChanged = true; - } - if(fileChanged) - { - // FIXME: @QUALITY do not ignore return value - ProfileUtils::saveJsonFile(OneSixVersionFormat::versionFileToJson(file), jsonFilePath); } + // FIXME: @QUALITY do not ignore return value + ProfileUtils::saveJsonFile(OneSixVersionFormat::versionFileToJson(file), jsonFilePath); component = new Component(this, uid, file); component->m_version = intendedVersion; } @@ -538,17 +526,9 @@ bool ComponentList::migratePreComponentConfig() QFile::remove(info.absoluteFilePath()); continue; } - bool fileChanged = false; - if(file->uid != uid) - { - file->uid = uid; - fileChanged = true; - } - if(fileChanged) - { - // FIXME: @QUALITY do not ignore return value - ProfileUtils::saveJsonFile(OneSixVersionFormat::versionFileToJson(file), info.absoluteFilePath()); - } + file->uid = uid; + // FIXME: @QUALITY do not ignore return value + ProfileUtils::saveJsonFile(OneSixVersionFormat::versionFileToJson(file), info.absoluteFilePath()); auto component = new Component(this, file->uid, file); auto version = d->getOldConfigVersion(file->uid); -- cgit v1.2.3