From 5603133822880d7c00507e2eed26f0b2f5d1a164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 12 Nov 2018 02:39:52 +0100 Subject: GH-2384 when adding mods with the same filename, rotate the files Current will be disabled and renamed to '$name-old'. Old one, if present, will be removed. --- api/logic/minecraft/SimpleModList.cpp | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'api') diff --git a/api/logic/minecraft/SimpleModList.cpp b/api/logic/minecraft/SimpleModList.cpp index e8583a35..adab5ba4 100644 --- a/api/logic/minecraft/SimpleModList.cpp +++ b/api/logic/minecraft/SimpleModList.cpp @@ -145,11 +145,30 @@ bool SimpleModList::installMod(const QString &filename) return false; if (type == Mod::MOD_SINGLEFILE || type == Mod::MOD_ZIPFILE || type == Mod::MOD_LITEMOD) { - QString newpath = FS::PathCombine(m_dir.path(), fileinfo.fileName()); + auto newpath = FS::PathCombine(m_dir.path(), fileinfo.fileName()); + // if it's already there, rename it and disable it. if there was already an old thing, remove it. if(QFile::exists(newpath)) - QFile::remove(newpath); + { + auto olddisabledpath = newpath + "-old.disabled"; + if(QFile::exists(olddisabledpath)) + { + if(!QFile::remove(olddisabledpath)) + { + // FIXME: report error correctly + return false; + } + } + if(!QFile::rename(newpath, olddisabledpath)) + { + // FIXME: report error correctly + return false; + } + } if (!QFile::copy(fileinfo.filePath(), newpath)) + { + // FIXME: report error correctly return false; + } FS::updateTimestamp(newpath); m.repath(newpath); update(); -- cgit v1.2.3