dandri/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2026-10-06 18:38:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't consider duplicated torrent as error. Return id of existing one instead

Browse Source
This commit is contained in:
orignal
2026-09-25 08:40:28 -04:00
parent baa0c8533a
commit 3c871cd892
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libi2pd_client/TorrentsTunnel.cpp
+25 -15
View File
@@ -137,16 +137,14 @@ namespace torrents
if (torrent && !torrent->IsValid ())
{
// a torrent whose parsing stopped, an unsafe name among the rest, must
// not be used even in part: it would leave stray files behind
LogPrint (eLogError, "TorrentsTunnel: Invalid torrent file ", torrentFilePath, ". Skipped");
torrent = nullptr;
}
if (torrent)
{
torrent->SetFullPath (m_TorrentsDir/std::filesystem::path (torrent->GetName ()));
InitTorrentFiles (torrent);
InsertTorrent (torrent);
InitTorrentFiles (torrent);
}
}
@@ -333,12 +331,13 @@ namespace torrents
if (m_Torrents.find (torrent->GetInfoHash ()) == m_Torrents.end ())
{
torrent->SetFullPath (m_TorrentsDir/std::filesystem::path (torrent->GetName ()));
boost::asio::post (GetDiskIOService (), [this, torrent]()
{
SaveTorrentFile (torrent);
InitTorrentFiles (torrent);
});
auto id = InsertTorrent (torrent);
auto [id, inserted] = InsertTorrent (torrent);
if (inserted)
boost::asio::post (GetDiskIOService (), [this, torrent]()
{
SaveTorrentFile (torrent);
InitTorrentFiles (torrent);
});
if (!torrent->GetError ())
boost::asio::post (GetService (), [this, torrent] { RequestTorrentTrackers (torrent, eTrackerAnnounceEventNone); });
return { torrent, id };
@@ -396,17 +395,18 @@ namespace torrents
auto torrent = std::make_shared<Torrent> (infoHash);
if (!announce.empty ()) torrent->SetAnnounce (announce);
if (!name.empty ()) torrent->SetName (name);
auto id = InsertTorrent (torrent);
boost::asio::post (GetService (), [this, torrent] { RequestTorrentTrackers (torrent, eTrackerAnnounceEventNone); });
auto [id, inserted] = InsertTorrent (torrent);
if (inserted)
boost::asio::post (GetService (), [this, torrent] { RequestTorrentTrackers (torrent, eTrackerAnnounceEventNone); });
return { torrent, id };
}
}
return { nullptr, 0 };
}
int TorrentsTunnel::InsertTorrent (std::shared_ptr<Torrent> torrent)
std::pair<int, bool> TorrentsTunnel::InsertTorrent (std::shared_ptr<Torrent> torrent)
{
if (!torrent) return 0;
if (!torrent) return { 0, false };
std::lock_guard<std::mutex> l(m_TorrentsMutex);
if (m_Torrents.emplace (torrent->GetInfoHash (), torrent).second)
{
@@ -416,9 +416,19 @@ namespace torrents
m_TorrentsByID.emplace (id, torrent);
if (!torrent->GetAnnounce ().empty ())
torrent->SetAnnounceTrackerID (AddTracker (torrent->GetAnnounce (), false)); // add announce to trackers
return id;
return { id, true };
}
return 0;
else // already exists, find id
{
auto it = std::find_if (m_TorrentsByID.begin (), m_TorrentsByID.end (),
[torrent](const auto& torrentByID)
{
return torrentByID.second.lock () == torrent;
});
if (it != m_TorrentsByID.begin ())
return { it->first, false };
}
return { 0, false };
}
bool TorrentsTunnel::RemoveTorrent (int id, bool deleteFiles)
libi2pd_client/TorrentsTunnel.h
+1 -1
View File
@@ -127,7 +127,7 @@ namespace torrents
void ReadTorrentFile (const std::filesystem::path& torrentFilePath);
void SaveTorrentFile (std::shared_ptr<Torrent> torrent);
void InitTorrentFiles (std::shared_ptr<Torrent> torrent);
int InsertTorrent (std::shared_ptr<Torrent> torrent); // returns id > 0 if success and 0 if failed
std::pair<int, bool> InsertTorrent (std::shared_ptr<Torrent> torrent); // returns id > 0 if success and 0 if failed, true is innserted
void RemoveTorrent (std::shared_ptr<Torrent> torrent, bool deleteFiles);
bool CreateAndReserveFile (const std::filesystem::path& filePath, size_t reserve);
void CompleteTorrent (std::shared_ptr<Torrent> torrent);