github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-06 05:01:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move priority parsing into helper function

Browse source
This commit is contained in:
Thomas Piccirello 2025-06-05 21:15:44 -07:00
parent 69bf31f4e9
commit 4c190b0d4f
No known key found for this signature in database
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/webui/api/torrentscontroller.cpp
View file

@ -456,6 +456,17 @@ namespace
return info; return info;
} }
nonstd::expected<BitTorrent::DownloadPriority, QString> parseDownloadPriority(const QString &priorityStr)
{
bool ok = false;
const auto priority = static_cast<BitTorrent::DownloadPriority>(priorityStr.toInt(&ok));
if (!ok)
return nonstd::make_unexpected(TorrentsController::tr("Priority must be an integer"));
if (!isValidDownloadPriority(priority))
return nonstd::make_unexpected(TorrentsController::tr("Priority is not valid"));
return priority;
}
} }
TorrentsController::TorrentsController(IApplication *app, QObject *parent) TorrentsController::TorrentsController(IApplication *app, QObject *parent)
@ -1004,14 +1015,10 @@ void TorrentsController::addAction()
filePriorities.reserve(filePrioritiesParam.size()); filePriorities.reserve(filePrioritiesParam.size());
for (const QString &priorityStr : filePrioritiesParam) for (const QString &priorityStr : filePrioritiesParam)
{ {
bool ok = false; const nonstd::expected<BitTorrent::DownloadPriority, QString> result = parseDownloadPriority(priorityStr);
const auto priority = static_cast<BitTorrent::DownloadPriority>(priorityStr.toInt(&ok)); if (!result)
if (!ok) throw APIError(APIErrorType::BadParams, result.error());
throw APIError(APIErrorType::BadParams, tr("Priority must be an integer")); filePriorities << result.value();
if (!BitTorrent::isValidDownloadPriority(priority))
throw APIError(APIErrorType::BadParams, tr("Priority is not valid"));
filePriorities << priority;
} }
} }
@ -1275,13 +1282,11 @@ void TorrentsController::filePrioAction()
requireParams({u"hash"_s, u"id"_s, u"priority"_s}); requireParams({u"hash"_s, u"id"_s, u"priority"_s});
const auto id = BitTorrent::TorrentID::fromString(params()[u"hash"_s]); const auto id = BitTorrent::TorrentID::fromString(params()[u"hash"_s]);
bool ok = false; const nonstd::expected<BitTorrent::DownloadPriority, QString> result = parseDownloadPriority(params()[u"priority"_s]);
const auto priority = static_cast<BitTorrent::DownloadPriority>(params()[u"priority"_s].toInt(&ok)); if (!result)
if (!ok) throw APIError(APIErrorType::BadParams, result.error());
throw APIError(APIErrorType::BadParams, tr("Priority must be an integer"));
if (!BitTorrent::isValidDownloadPriority(priority)) const BitTorrent::DownloadPriority priority = result.value();
throw APIError(APIErrorType::BadParams, tr("Priority is not valid"));
BitTorrent::Torrent *const torrent = BitTorrent::Session::instance()->getTorrent(id); BitTorrent::Torrent *const torrent = BitTorrent::Session::instance()->getTorrent(id);
if (!torrent) if (!torrent)
@ -1294,6 +1299,7 @@ void TorrentsController::filePrioAction()
bool priorityChanged = false; bool priorityChanged = false;
for (const QString &fileID : params()[u"id"_s].split(u'|')) for (const QString &fileID : params()[u"id"_s].split(u'|'))
{ {
bool ok = false;
const int id = fileID.toInt(&ok); const int id = fileID.toInt(&ok);
if (!ok) if (!ok)
throw APIError(APIErrorType::BadParams, tr("File IDs must be integers")); throw APIError(APIErrorType::BadParams, tr("File IDs must be integers"));