mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 02:36:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect sorting by "private" column

Browse source 
PR #21041.
This commit is contained in:
Vladimir Golovnev 2024-07-15 08:42:02 +03:00 committed by Vladimir Golovnev (Glassez)
parent 4d490c84e7
commit 4f0cc8aa11
No known key found for this signature in database
GPG key ID: 52A2C7DEE2DFA6F7
2 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/gui/transferlistsortmodel.cpp
View file

@ -28,7 +28,6 @@
#include "transferlistsortmodel.h"
#include <concepts>
#include <type_traits>
#include <QDateTime>
@ -47,6 +46,16 @@ namespace
return (left < right) ? -1 : 1;
}
int customCompare(const QDateTime &left, const QDateTime &right)
{
const bool isLeftValid = left.isValid();
const bool isRightValid = right.isValid();
if (isLeftValid == isRightValid)
return threeWayCompare(left, right);
return isLeftValid ? -1 : 1;
}
int customCompare(const TagSet &left, const TagSet &right, const Utils::Compare::NaturalCompare<Qt::CaseInsensitive> &compare)
{
for (auto leftIter = left.cbegin(), rightIter = right.cbegin();
@ -61,27 +70,12 @@ namespace
}
template <typename T>
concept Validateable = requires (T t) { {t.isValid()} -> std::same_as<bool>; };
template <Validateable T>
bool isValid(const T &value)
int customCompare(const T left, const T right)
{
return value.isValid();
}
static_assert(std::is_arithmetic_v<T>);
// consider negative values as invalid
template <typename T>
requires std::is_arithmetic_v<T>
bool isValid(const T value)
{
return (value >= 0);
}
template <typename T>
int customCompare(const T &left, const T &right)
{
const bool isLeftValid = isValid(left);
const bool isRightValid = isValid(right);
const bool isLeftValid = (left >= 0);
const bool isRightValid = (right >= 0);
if (isLeftValid && isRightValid)
return threeWayCompare(left, right);
@ -90,6 +84,17 @@ namespace
return isLeftValid ? -1 : 1;
}
int compareAsBool(const QVariant &left, const QVariant &right)
{
const bool leftValid = left.isValid();
const bool rightValid = right.isValid();
if (leftValid && rightValid)
return threeWayCompare(left.toBool(), right.toBool());
if (!leftValid && !rightValid)
return 0;
return leftValid ? -1 : 1;
}
int adjustSubSortColumn(const int column)
{
return ((column >= 0) && (column < TransferListModel::NB_COLUMNS))
@ -215,12 +220,14 @@ int TransferListSortModel::compare(const QModelIndex &left, const QModelIndex &r
case TransferListModel::TR_DLLIMIT:
case TransferListModel::TR_DLSPEED:
case TransferListModel::TR_PRIVATE:
case TransferListModel::TR_QUEUE_POSITION:
case TransferListModel::TR_UPLIMIT:
case TransferListModel::TR_UPSPEED:
return customCompare(leftValue.toInt(), rightValue.toInt());
case TransferListModel::TR_PRIVATE:
return compareAsBool(leftValue, rightValue);
case TransferListModel::TR_PEERS:
case TransferListModel::TR_SEEDS:
{

1
src/webui/api/synccontroller.cpp
View file

@ -222,6 +222,7 @@ namespace
case QMetaType::UInt:
case QMetaType::QDateTime:
case QMetaType::Nullptr:
case QMetaType::UnknownType:
if (prevData[key] != value)
syncData[key] = value;
break;