owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: can now filter by codec

Browse Source
This commit is contained in:
emeric
2025-12-07 23:46:47 +01:00
parent 6d27f18f19
commit 40b4096ab0
2 changed files with 90 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lms/ui/explore/Filters.cpp
+86 -49
View File
@@ -26,6 +26,9 @@
#include <Wt/WPushButton.h> #include <Wt/WPushButton.h>
#include <Wt/WTemplate.h> #include <Wt/WTemplate.h>
#include "core/Utils.hpp"
#include "core/media/Codec.hpp"
#include "database/Session.hpp" #include "database/Session.hpp"
#include "database/objects/Cluster.hpp" #include "database/objects/Cluster.hpp"
#include "database/objects/LabelId.hpp" #include "database/objects/LabelId.hpp"
@@ -55,7 +58,11 @@ namespace lms::ui
{ {
}; };
using TypeVariant = std::variant<db::ClusterTypeId, MediaLibraryTag, LabelTag, ReleaseTypeTag>; struct CodecTag
{
};
using TypeVariant = std::variant<db::ClusterTypeId, MediaLibraryTag, LabelTag, ReleaseTypeTag, CodecTag>;
using TypeModel = ValueStringModel<TypeVariant>; using TypeModel = ValueStringModel<TypeVariant>;
std::unique_ptr<TypeModel> createTypeModel() std::unique_ptr<TypeModel> createTypeModel()
@@ -72,11 +79,12 @@ namespace lms::ui
typeModel->add(Wt::WString::tr("Lms.Explore.media-library"), MediaLibraryTag{}); typeModel->add(Wt::WString::tr("Lms.Explore.media-library"), MediaLibraryTag{});
typeModel->add(Wt::WString::tr("Lms.Explore.label"), LabelTag{}); typeModel->add(Wt::WString::tr("Lms.Explore.label"), LabelTag{});
typeModel->add(Wt::WString::tr("Lms.Explore.release-type"), ReleaseTypeTag{}); typeModel->add(Wt::WString::tr("Lms.Explore.release-type"), ReleaseTypeTag{});
typeModel->add(Wt::WString::tr("Lms.Explore.codec"), CodecTag{});
return typeModel; return typeModel;
} }
using ValueVariant = std::variant<db::ClusterId, db::MediaLibraryId, db::LabelId, db::ReleaseTypeId>; using ValueVariant = std::variant<db::ClusterId, db::MediaLibraryId, db::LabelId, db::ReleaseTypeId, core::media::Codec>;
using ValueModel = ValueStringModel<ValueVariant>; using ValueModel = ValueStringModel<ValueVariant>;
std::unique_ptr<ValueModel> createValueModel(TypeVariant type) std::unique_ptr<ValueModel> createValueModel(TypeVariant type)
@@ -87,35 +95,37 @@ namespace lms::ui
auto transaction{ session.createReadTransaction() }; auto transaction{ session.createReadTransaction() };
if (std::holds_alternative<MediaLibraryTag>(type)) std::visit(core::utils::overloads{
{ [&](const MediaLibraryTag&) {
db::MediaLibrary::find(session, [&](const db::MediaLibrary::pointer& library) { db::MediaLibrary::find(session, [&](const db::MediaLibrary::pointer& library) {
valueModel->add(Wt::WString::fromUTF8(std::string{ library->getName() }), library->getId()); valueModel->add(Wt::WString::fromUTF8(std::string{ library->getName() }), library->getId());
}); });
} },
else if (std::holds_alternative<LabelTag>(type)) [&](const LabelTag&) {
{ db::Label::find(session, db::LabelSortMethod::Name, [&](const db::Label::pointer& label) {
db::Label::find(session, db::LabelSortMethod::Name, [&](const db::Label::pointer& label) { valueModel->add(Wt::WString::fromUTF8(std::string{ label->getName() }), label->getId());
valueModel->add(Wt::WString::fromUTF8(std::string{ label->getName() }), label->getId()); });
}); },
} [&](const ReleaseTypeTag&) {
else if (std::holds_alternative<ReleaseTypeTag>(type)) db::ReleaseType::find(session, db::ReleaseTypeSortMethod::Name, [&](const db::ReleaseType::pointer& releaseType) {
{ valueModel->add(Wt::WString::fromUTF8(std::string{ releaseType->getName() }), releaseType->getId());
db::ReleaseType::find(session, db::ReleaseTypeSortMethod::Name, [&](const db::ReleaseType::pointer& releaseType) { });
valueModel->add(Wt::WString::fromUTF8(std::string{ releaseType->getName() }), releaseType->getId()); },
}); [&](const CodecTag&) {
} core::media::visitCodecs([&](const core::media::CodecDesc& desc) {
else if (const db::ClusterTypeId * clusterTypeId{ std::get_if<db::ClusterTypeId>(&type) }) valueModel->add(Wt::WString::fromUTF8(desc.longName.c_str()), desc.type);
{ });
db::Cluster::FindParameters params; },
params.setClusterType(*clusterTypeId); [&](db::ClusterTypeId clusterTypeId) {
params.setSortMethod(db::ClusterSortMethod::Name); db::Cluster::FindParameters params;
params.setClusterType(clusterTypeId);
db::Cluster::find(session, params, [&](const db::Cluster::pointer& cluster) { params.setSortMethod(db::ClusterSortMethod::Name);
valueModel->add(Wt::WString::fromUTF8(std::string{ cluster->getName() }), cluster->getId());
});
}
db::Cluster::find(session, params, [&](const db::Cluster::pointer& cluster) {
valueModel->add(Wt::WString::fromUTF8(std::string{ cluster->getName() }), cluster->getId());
});
} },
type);
return valueModel; return valueModel;
} }
} // namespace } // namespace
@@ -138,25 +148,28 @@ namespace lms::ui
const auto valueModel{ std::static_pointer_cast<ValueModel>(valueCombo->model()) }; const auto valueModel{ std::static_pointer_cast<ValueModel>(valueCombo->model()) };
const ValueVariant value{ valueModel->getValue(valueCombo->currentIndex()) }; const ValueVariant value{ valueModel->getValue(valueCombo->currentIndex()) };
if (const db::MediaLibraryId * mediaLibraryId{ std::get_if<db::MediaLibraryId>(&value) }) std::visit(core::utils::overloads{
{ [&](db::MediaLibraryId mediaLibraryId) {
set(*mediaLibraryId); set(mediaLibraryId);
state::writeValue<db::MediaLibraryId::ValueType>("filters_media_library_id", mediaLibraryId->getValue()); state::writeValue<db::MediaLibraryId::ValueType>("filters_media_library_id", mediaLibraryId.getValue());
} },
else if (const db::LabelId * labelId{ std::get_if<db::LabelId>(&value) }) [&](db::LabelId labelId) {
{ set(labelId);
set(*labelId); state::writeValue<db::LabelId::ValueType>("filters_label_id", labelId.getValue());
state::writeValue<db::LabelId::ValueType>("filters_label_id", labelId->getValue()); },
} [&](db::ReleaseTypeId releaseTypeId) {
else if (const db::ReleaseTypeId * releaseTypeId{ std::get_if<db::ReleaseTypeId>(&value) }) set(releaseTypeId);
{ state::writeValue<db::ReleaseTypeId::ValueType>("filters_release_type_id", releaseTypeId.getValue());
set(*releaseTypeId); },
state::writeValue<db::ReleaseTypeId::ValueType>("filters_release_type_id", releaseTypeId->getValue()); [&](db::ClusterId clusterId) {
} add(clusterId);
else if (const db::ClusterId * clusterId{ std::get_if<db::ClusterId>(&value) }) },
{ [&](core::media::Codec codec) {
add(*clusterId); set(codec);
} state::writeValue<core::media::Codec>("filters_codec", codec);
},
},
value);
// TODO // TODO
LmsApp->getModalManager().dispose(dialogPtr); LmsApp->getModalManager().dispose(dialogPtr);
@@ -197,6 +210,8 @@ namespace lms::ui
set(db::LabelId{ *labelId }); set(db::LabelId{ *labelId });
if (const std::optional<db::ReleaseTypeId::ValueType> releaseTypeId{ state::readValue<db::ReleaseTypeId::ValueType>("filters_release_type_id") }) if (const std::optional<db::ReleaseTypeId::ValueType> releaseTypeId{ state::readValue<db::ReleaseTypeId::ValueType>("filters_release_type_id") })
set(db::ReleaseTypeId{ *releaseTypeId }); set(db::ReleaseTypeId{ *releaseTypeId });
if (const std::optional<core::media::Codec> codec{ state::readValue<core::media::Codec>("filters_codec") })
set(*codec);
} }
void Filters::add(db::ClusterId clusterId) void Filters::add(db::ClusterId clusterId)
@@ -324,6 +339,28 @@ namespace lms::ui
emitFilterAddedNotification(); emitFilterAddedNotification();
} }
void Filters::set(core::media::Codec codec)
{
if (_codecFilter)
{
_filters->removeWidget(_codecFilter);
_codecFilter = nullptr;
_dbFilters.codec.reset();
}
_dbFilters.codec = codec;
_codecFilter = _filters->addWidget(utils::createFilter(Wt::WString::fromUTF8(core::media::getCodecDesc(codec).longName.c_str()), Wt::WString::tr("Lms.Explore.codec"), "bg-success", true));
_codecFilter->clicked().connect(_codecFilter, [this] {
_filters->removeWidget(_codecFilter);
_dbFilters.codec.reset();
_codecFilter = nullptr;
_sigUpdated.emit();
state::writeValue<db::LabelId::ValueType>("filters_codec", std::nullopt);
});
emitFilterAddedNotification();
}
void Filters::emitFilterAddedNotification() void Filters::emitFilterAddedNotification()
{ {
LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Explore.filter-added"), std::chrono::seconds{ 2 }); LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Explore.filter-added"), std::chrono::seconds{ 2 });
src/lms/ui/explore/Filters.hpp
+4
View File
@@ -23,6 +23,8 @@
#include <Wt/WSignal.h> #include <Wt/WSignal.h>
#include <Wt/WTemplate.h> #include <Wt/WTemplate.h>
#include "core/media/Codec.hpp"
#include "database/objects/Filters.hpp" #include "database/objects/Filters.hpp"
namespace lms::ui namespace lms::ui
@@ -43,12 +45,14 @@ namespace lms::ui
void set(db::LabelId labelId); void set(db::LabelId labelId);
void set(db::MediaLibraryId mediaLibraryId); void set(db::MediaLibraryId mediaLibraryId);
void set(db::ReleaseTypeId releaseTypeId); void set(db::ReleaseTypeId releaseTypeId);
void set(core::media::Codec codec);
void emitFilterAddedNotification(); void emitFilterAddedNotification();
Wt::WContainerWidget* _filters{}; Wt::WContainerWidget* _filters{};
Wt::WInteractWidget* _mediaLibraryFilter{}; Wt::WInteractWidget* _mediaLibraryFilter{};
Wt::WInteractWidget* _labelFilter{}; Wt::WInteractWidget* _labelFilter{};
Wt::WInteractWidget* _releaseTypeFilter{}; Wt::WInteractWidget* _releaseTypeFilter{};
Wt::WInteractWidget* _codecFilter{};
Wt::Signal<> _sigUpdated; Wt::Signal<> _sigUpdated;