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

fixup! refactor: replace tr_info with tr_torrent_metainfo (#2397) (#2415)

This commit is contained in:
Charles Kerr 2022-01-17 11:44:53 -06:00 committed by GitHub
parent d8d765c595
commit 19ede2b8cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libtransmission/torrent-metainfo.cc
View File

@ -578,24 +578,33 @@ bool tr_torrent_metainfo::migrateFile(
std::string_view suffix)
{
auto const old_filename = makeFilename(dirname, name, info_hash_string, BasenameFormat::NameAndPartialHash, suffix);
if (!tr_sys_path_exists(old_filename.c_str(), nullptr))
{
return false;
}
auto const old_filename_exists = tr_sys_path_exists(old_filename.c_str(), nullptr);
auto const new_filename = makeFilename(dirname, name, info_hash_string, BasenameFormat::Hash, suffix);
if (!tr_sys_path_rename(old_filename.c_str(), new_filename.c_str(), nullptr))
auto const new_filename_exists = tr_sys_path_exists(new_filename.c_str(), nullptr);
if (old_filename_exists && new_filename_exists)
{
tr_sys_path_remove(old_filename.c_str(), nullptr);
return false;
}
if (new_filename_exists)
{
return false;
}
auto const name_sz = std::string{ name };
tr_logAddNamedError(
name_sz.c_str(),
"Migrated torrent file from \"%s\" to \"%s\"",
old_filename.c_str(),
new_filename.c_str());
return true;
if (old_filename_exists && tr_sys_path_rename(old_filename.c_str(), new_filename.c_str(), nullptr))
{
auto const name_sz = std::string{ name };
tr_logAddNamedError(
name_sz.c_str(),
"Migrated torrent file from \"%s\" to \"%s\"",
old_filename.c_str(),
new_filename.c_str());
return true;
}
return false; // neither file exists
}
std::string const& tr_torrent_metainfo::fileSubpath(tr_file_index_t i) const