d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-13 08:17:57 +00:00
Code Issues Projects Releases Wiki Activity

Require torrent category creation to be explicit

Browse Source
This commit is contained in:
Thomas Piccirello 2018-07-23 01:48:35 -04:00
parent ee57b68901
commit d89ef22d85
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/base/bittorrent/torrenthandle.cpp
View File

@ -1214,10 +1214,8 @@ bool TorrentHandle::setCategory(const QString &category)
{ {
if (m_category != category) { if (m_category != category) {
if (!category.isEmpty()) { if (!category.isEmpty()) {
if (!Session::isValidCategoryName(category)) return false; if (!Session::isValidCategoryName(category) || !m_session->categories().contains(category))
if (!m_session->categories().contains(category)) return false;
if (!m_session->addCategory(category))
return false;
} }
QString oldCategory = m_category; QString oldCategory = m_category;

4
src/webui/api/torrentscontroller.cpp
View File

@ -811,6 +811,10 @@ void TorrentsController::setCategoryAction()
const QString category {params()["category"].trimmed()}; const QString category {params()["category"].trimmed()};
applyToTorrents(hashes, [category](BitTorrent::TorrentHandle *torrent) applyToTorrents(hashes, [category](BitTorrent::TorrentHandle *torrent)
{ {
auto *session = BitTorrent::Session::instance();
const QStringList categories = session->categories().keys();
if (!categories.contains(category) && !session->addCategory(category))
throw APIError(APIErrorType::Conflict, tr("Unable to create category"));
if (!torrent->setCategory(category)) if (!torrent->setCategory(category))
throw APIError(APIErrorType::Conflict, tr("Incorrect category name")); throw APIError(APIErrorType::Conflict, tr("Incorrect category name"));
}); });