Skip to content

Commit

Permalink
GH-2384 when adding mods with the same filename, rotate the files
Browse files Browse the repository at this point in the history
Current will be disabled and renamed to '$name-old'.
Old one, if present, will be removed.
  • Loading branch information
peterix committed Nov 12, 2018
1 parent 47b1f9a commit 5603133
Showing 1 changed file with 21 additions and 2 deletions.
23 changes: 21 additions & 2 deletions api/logic/minecraft/SimpleModList.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 5603133

Please sign in to comment.