mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: does not trash added torrent files when asked (#5505)

This commit is contained in:
Charles Kerr 2023-05-08 16:21:54 -05:00
parent 2184095871
commit a7c98b3d5f
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
qt/Session.cc
View File

@ -1040,7 +1040,7 @@ void Session::addTorrent(AddData add_me, tr_variant* args_dict, bool trash_origi
});
q->add(
[this, add_me](RpcResponse const& r)
[this, add_me, trash_original](RpcResponse const& r)
{
bool session_has_torrent = false;
@ -1060,23 +1060,23 @@ void Session::addTorrent(AddData add_me, tr_variant* args_dict, bool trash_origi
}
}
if (session_has_torrent && !add_me.filename.isEmpty())
if (auto const& filename = add_me.filename;
session_has_torrent && !filename.isEmpty() && add_me.type == AddData::FILENAME)
{
QFile(add_me.filename).rename(QStringLiteral("%1.added").arg(add_me.filename));
auto file = QFile{ filename };
if (trash_original)
{
file.setPermissions(QFile::ReadOwner | QFile::WriteOwner);
file.remove();
}
else
{
file.rename(QStringLiteral("%1.added").arg(filename));
}
}
});
if (trash_original && add_me.type == AddData::FILENAME)
{
q->add(
[add_me]()
{
QFile original(add_me.filename);
original.setPermissions(QFile::ReadOwner | QFile::WriteOwner);
original.remove();
});
}
q->run();
}