forked from qbittorrent/qBittorrent
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix handling of tags containing '&' character
PR qbittorrent#21024. Closes qbittorrent#20773.
- Loading branch information
Showing
4 changed files
with
39 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
* Bittorrent Client using Qt and libtorrent. | ||
* Copyright (C) 2023 Vladimir Golovnev <[email protected]> | ||
* Copyright (C) 2023-2024 Vladimir Golovnev <[email protected]> | ||
* | ||
* This program is free software; you can redistribute it and/or | ||
* modify it under the terms of the GNU General Public License | ||
|
@@ -37,6 +37,7 @@ | |
#include "base/global.h" | ||
#include "autoexpandabledialog.h" | ||
#include "flowlayout.h" | ||
#include "utils.h" | ||
|
||
#include "ui_torrenttagsdialog.h" | ||
|
||
|
@@ -55,7 +56,7 @@ TorrentTagsDialog::TorrentTagsDialog(const TagSet &initialTags, QWidget *parent) | |
auto *tagsLayout = new FlowLayout(m_ui->scrollArea); | ||
for (const QString &tag : asConst(initialTags.united(BitTorrent::Session::instance()->tags()))) | ||
{ | ||
auto *tagWidget = new QCheckBox(tag); | ||
auto *tagWidget = new QCheckBox(Utils::Gui::tagToWidgetText(tag)); | ||
if (initialTags.contains(tag)) | ||
tagWidget->setChecked(true); | ||
tagsLayout->addWidget(tagWidget); | ||
|
@@ -83,7 +84,7 @@ TagSet TorrentTagsDialog::tags() const | |
{ | ||
const auto *tagWidget = static_cast<QCheckBox *>(layout->itemAt(i)->widget()); | ||
if (tagWidget->isChecked()) | ||
tags.insert(tagWidget->text()); | ||
tags.insert(Utils::Gui::widgetTextToTag(tagWidget->text())); | ||
} | ||
|
||
return tags; | ||
|
@@ -113,7 +114,7 @@ void TorrentTagsDialog::addNewTag() | |
{ | ||
auto *layout = m_ui->scrollArea->layout(); | ||
auto *btn = layout->takeAt(layout->count() - 1); | ||
auto *tagWidget = new QCheckBox(tag); | ||
auto *tagWidget = new QCheckBox(Utils::Gui::tagToWidgetText(tag)); | ||
tagWidget->setChecked(true); | ||
layout->addWidget(tagWidget); | ||
layout->addItem(btn); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
/* | ||
* Bittorrent Client using Qt and libtorrent. | ||
* Copyright (C) 2023-2024 Vladimir Golovnev <[email protected]> | ||
* Copyright (C) 2006 Christophe Dumez <[email protected]> | ||
* | ||
* This program is free software; you can redistribute it and/or | ||
|
@@ -1191,7 +1192,7 @@ void TransferListWidget::displayListMenu() | |
|
||
for (const QString &tag : asConst(tags)) | ||
{ | ||
auto *action = new TriStateAction(tag, tagsMenu); | ||
auto *action = new TriStateAction(Utils::Gui::tagToWidgetText(tag), tagsMenu); | ||
action->setCloseOnInteraction(false); | ||
|
||
const Qt::CheckState initialState = tagsInAll.contains(tag) ? Qt::Checked | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
/* | ||
* Bittorrent Client using Qt and libtorrent. | ||
* Copyright (C) 2024 Vladimir Golovnev <[email protected]> | ||
* Copyright (C) 2017 Mike Tzou | ||
* | ||
* This program is free software; you can redistribute it and/or | ||
|
@@ -218,3 +219,29 @@ void Utils::Gui::openFolderSelect(const Path &path) | |
openPath(path.parentPath()); | ||
#endif | ||
} | ||
|
||
QString Utils::Gui::tagToWidgetText(const QString &tag) | ||
{ | ||
return QString(tag).replace(u'&', u"&&"_s); | ||
} | ||
|
||
QString Utils::Gui::widgetTextToTag(const QString &text) | ||
{ | ||
// replace pairs of '&' with single '&' and remove non-paired occurrences of '&' | ||
QString cleanedText; | ||
cleanedText.reserve(text.size()); | ||
bool amp = false; | ||
for (const QChar c : text) | ||
{ | ||
if (c == u'&') | ||
{ | ||
amp = !amp; | ||
if (amp) | ||
continue; | ||
} | ||
|
||
cleanedText.append(c); | ||
} | ||
|
||
return cleanedText; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
/* | ||
* Bittorrent Client using Qt and libtorrent. | ||
* Copyright (C) 2024 Vladimir Golovnev <[email protected]> | ||
* Copyright (C) 2017 Mike Tzou | ||
* | ||
* This program is free software; you can redistribute it and/or | ||
|
@@ -34,6 +35,7 @@ class QIcon; | |
class QPixmap; | ||
class QPoint; | ||
class QSize; | ||
class QString; | ||
class QWidget; | ||
|
||
namespace Utils::Gui | ||
|
@@ -51,4 +53,7 @@ namespace Utils::Gui | |
|
||
void openPath(const Path &path); | ||
void openFolderSelect(const Path &path); | ||
|
||
QString tagToWidgetText(const QString &tag); | ||
QString widgetTextToTag(const QString &text); | ||
} |