0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: sorting by pack format

Browse Source 
Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow 2022-08-28 22:52:29 -03:00
parent f21ae66265
commit 3ab17a97a8
No known key found for this signature in database
GPG Key ID: 8D0F221F0A59F469
4 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/minecraft/mod/Resource.h
View File

@ -20,6 +20,7 @@ enum class SortType {
DATE,
VERSION,
ENABLED,
PACK_FORMAT
};
enum class EnableAction {

25
launcher/minecraft/mod/ResourcePack.cpp
View File

@ -41,8 +41,31 @@ std::pair<Version, Version> ResourcePack::compatibleVersions() const
// but if we did and we still don't have a valid pack format, that's a bit concerning.
Q_ASSERT(!isResolved());
return {{}, {}};
return { {}, {} };
}
return s_pack_format_versions.constFind(m_pack_format).value();
}
std::pair<int, bool> ResourcePack::compare(const Resource& other, SortType type) const
{
auto const& cast_other = static_cast<ResourcePack const&>(other);
switch (type) {
default: {
auto res = Resource::compare(other, type);
if (res.first != 0)
return res;
}
case SortType::PACK_FORMAT: {
auto this_ver = packFormat();
auto other_ver = cast_other.packFormat();
if (this_ver > other_ver)
return { 1, type == SortType::PACK_FORMAT };
if (this_ver < other_ver)
return { -1, type == SortType::PACK_FORMAT };
}
}
return { 0, false };
}

2
launcher/minecraft/mod/ResourcePack.h
View File

@ -34,6 +34,8 @@ class ResourcePack : public Resource {
/** Thread-safe. */
void setDescription(QString new_description);
[[nodiscard]] auto compare(Resource const& other, SortType type) const -> std::pair<int, bool> override;
protected:
mutable QMutex m_data_lock;

2
launcher/minecraft/mod/ResourcePackFolderModel.cpp
View File

@ -43,7 +43,7 @@
ResourcePackFolderModel::ResourcePackFolderModel(const QString& dir) : ResourceFolderModel(QDir(dir))
{
m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::VERSION, SortType::DATE };
m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::PACK_FORMAT, SortType::DATE };
}
QVariant ResourcePackFolderModel::data(const QModelIndex& index, int role) const