Merge pull request #12207 from FranciscoPombal/fix-webapi

WebAPI: fix matching uncategorized torrents
This commit is contained in:
Mike Tzou 2020-03-22 21:23:56 +08:00 committed by GitHub
commit ab30cfcdb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

View file

@ -201,7 +201,9 @@ bool RequestParser::parseRequestLine(const QString &line)
const QByteArray nameComponent = midView(param, 0, eqCharPos);
const QByteArray valueComponent = midView(param, (eqCharPos + 1));
const QString paramName = QString::fromUtf8(QByteArray::fromPercentEncoding(nameComponent).replace('+', ' '));
const QByteArray paramValue = QByteArray::fromPercentEncoding(valueComponent).replace('+', ' ');
const QByteArray paramValue = valueComponent.isNull()
? ""
: QByteArray::fromPercentEncoding(valueComponent).replace('+', ' ');
m_request.query[paramName] = paramValue;
}

View file

@ -544,7 +544,7 @@ void TorrentsController::addAction()
const TriStateBool addPaused = parseTriStateBool(params()["paused"]);
const TriStateBool rootFolder = parseTriStateBool(params()["root_folder"]);
const QString savepath = params()["savepath"].trimmed();
const QString category = params()["category"].trimmed();
const QString category = params()["category"];
const QString cookie = params()["cookie"];
const QString torrentName = params()["rename"].trimmed();
const int upLimit = params()["upLimit"].toInt();
@ -1025,7 +1025,7 @@ void TorrentsController::setCategoryAction()
requireParams({"hashes", "category"});
const QStringList hashes {params()["hashes"].split('|')};
const QString category {params()["category"].trimmed()};
const QString category {params()["category"]};
applyToTorrents(hashes, [category](BitTorrent::TorrentHandle *const torrent)
{
@ -1038,7 +1038,7 @@ void TorrentsController::createCategoryAction()
{
requireParams({"category"});
const QString category {params()["category"].trimmed()};
const QString category {params()["category"]};
const QString savePath {params()["savePath"]};
if (category.isEmpty())
@ -1055,7 +1055,7 @@ void TorrentsController::editCategoryAction()
{
requireParams({"category", "savePath"});
const QString category {params()["category"].trimmed()};
const QString category {params()["category"]};
const QString savePath {params()["savePath"]};
if (category.isEmpty())