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.
This commit is contained in:
Petr Mrázek 2018-11-12 02:39:52 +01:00
parent 47b1f9a860
commit 5603133822

View File

@ -145,11 +145,30 @@ bool SimpleModList::installMod(const QString &filename)
return false; return false;
if (type == Mod::MOD_SINGLEFILE || type == Mod::MOD_ZIPFILE || type == Mod::MOD_LITEMOD) 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)) if(QFile::exists(newpath))
QFile::remove(newpath); {
if (!QFile::copy(fileinfo.filePath(), newpath)) auto olddisabledpath = newpath + "-old.disabled";
if(QFile::exists(olddisabledpath))
{
if(!QFile::remove(olddisabledpath))
{
// FIXME: report error correctly
return false; 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); FS::updateTimestamp(newpath);
m.repath(newpath); m.repath(newpath);
update(); update();