Browse Source

Refactor code

Make the code slightly easier to read.
adaptive-webui-19844
Chocobo1 6 years ago
parent
commit
a68cdc5225
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 15
      src/base/bittorrent/session.cpp
  2. 2
      src/base/bittorrent/torrenthandle.cpp

15
src/base/bittorrent/session.cpp

@ -2122,17 +2122,12 @@ bool Session::addTorrent_impl(CreateTorrentParams params, const MagnetUri &magne @@ -2122,17 +2122,12 @@ bool Session::addTorrent_impl(CreateTorrentParams params, const MagnetUri &magne
}
}
// If empty then Automatic mode, otherwise Manual mode
QString savePath = params.savePath.isEmpty() ? categorySavePath(params.category) : params.savePath;
libt::add_torrent_params p;
InfoHash hash;
std::vector<boost::uint8_t> filePriorities;
const bool fromMagnetUri = magnetUri.isValid();
QString savePath;
if (params.savePath.isEmpty()) // using Automatic mode
savePath = categorySavePath(params.category);
else // using Manual mode
savePath = params.savePath;
bool fromMagnetUri = magnetUri.isValid();
if (fromMagnetUri) {
hash = magnetUri.hash();
@ -2195,9 +2190,7 @@ bool Session::addTorrent_impl(CreateTorrentParams params, const MagnetUri &magne @@ -2195,9 +2190,7 @@ bool Session::addTorrent_impl(CreateTorrentParams params, const MagnetUri &magne
p.flags |= libt::add_torrent_params::flag_use_resume_save_path;
}
else {
foreach (int prio, params.filePriorities)
filePriorities.push_back(prio);
p.file_priorities = filePriorities;
p.file_priorities = {params.filePriorities.begin(), params.filePriorities.end()};
}
// We should not add torrent if it already

2
src/base/bittorrent/torrenthandle.cpp

@ -1991,7 +1991,7 @@ void TorrentHandle::prioritizeFiles(const QVector<int> &priorities) @@ -1991,7 +1991,7 @@ void TorrentHandle::prioritizeFiles(const QVector<int> &priorities)
if (priorities.size() != filesCount()) return;
// Save first/last piece first option state
bool firstLastPieceFirst = hasFirstLastPiecePriority();
const bool firstLastPieceFirst = hasFirstLastPiecePriority();
// Reset 'm_hasSeedStatus' if needed in order to react again to
// 'torrent_finished_alert' and eg show tray notifications

Loading…
Cancel
Save