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

Adding tags in the tracks view

Browse Source
This commit is contained in:
emeric
2018-05-17 13:45:22 +02:00
parent 6685795b9c
commit a4788320a6
11 changed files with 184 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/explore/ArtistView.cpp
+4 -18
View File
@@ -34,13 +34,14 @@
#include "LmsApplication.hpp"
#include "Filters.hpp"
#include "ExploreUtils.hpp"
using namespace Database;
namespace {
const std::string artistClusterTypesSetting = "artist_cluster_types";
const std::vector<std::string> defaultArtistClusterTypes =
const std::set<std::string> defaultArtistClusterTypes =
{
"GENRE",
"ALBUMGROUPING",
@@ -48,21 +49,6 @@ const std::vector<std::string> defaultArtistClusterTypes =
"COMMENT:SONGS-DB_OCCASION",
};
std::vector<ClusterType::pointer> getArtistClusterTypes(Wt::Dbo::Session& session)
{
Wt::Dbo::Transaction transaction(session);
std::vector<ClusterType::pointer> res;
for (auto clusterTypeName : splitString(Setting::getString(session, artistClusterTypesSetting), " "))
{
auto clusterType = ClusterType::getByName(session, clusterTypeName);
if (clusterType)
res.push_back(clusterType);
}
return res;
}
} // namespace
namespace UserInterface {
@@ -71,7 +57,7 @@ Artist::Artist(Filters* filters)
: _filters(filters)
{
if (!Setting::exists(LmsApp->getDboSession(), artistClusterTypesSetting))
Setting::setString(LmsApp->getDboSession(), artistClusterTypesSetting, joinStrings(defaultArtistClusterTypes, " "));
setClusterTypesToSetting(artistClusterTypesSetting, defaultArtistClusterTypes);
wApp->internalPathChanged().connect(std::bind([=]
{
@@ -112,7 +98,7 @@ Artist::refresh()
Wt::WContainerWidget* clusterContainers = t->bindNew<Wt::WContainerWidget>("clusters");
{
auto clusterTypes = getArtistClusterTypes(LmsApp->getDboSession());
auto clusterTypes = getClusterTypesFromSetting(artistClusterTypesSetting);
auto clusterGroups = artist->getClusterGroups(clusterTypes, 3);
for (auto clusters : clusterGroups)
src/ui/explore/ArtistsView.cpp
+4 -18
View File
@@ -31,34 +31,20 @@
#include "LmsApplication.hpp"
#include "Filters.hpp"
#include "ExploreUtils.hpp"
using namespace Database;
namespace {
const std::string artistsClusterTypesSetting = "artists_cluster_types";
const std::vector<std::string> defaultArtistsClusterTypes =
const std::set<std::string> defaultArtistsClusterTypes =
{
"ALBUMGROUPING",
"GENRE",
"ALBUMMOOD",
};
std::vector<ClusterType::pointer> getArtistsClusterTypes(Wt::Dbo::Session& session)
{
Wt::Dbo::Transaction transaction(session);
std::vector<ClusterType::pointer> res;
for (auto clusterTypeName : splitString(Setting::getString(session, artistsClusterTypesSetting), " "))
{
auto clusterType = ClusterType::getByName(session, clusterTypeName);
if (clusterType)
res.push_back(clusterType);
}
return res;
}
}
namespace UserInterface {
@@ -68,7 +54,7 @@ Artists::Artists(Filters* filters)
_filters(filters)
{
if (!Setting::exists(LmsApp->getDboSession(), artistsClusterTypesSetting))
Setting::setString(LmsApp->getDboSession(), artistsClusterTypesSetting, joinStrings(defaultArtistsClusterTypes, " "));
setClusterTypesToSetting(artistsClusterTypesSetting, defaultArtistsClusterTypes);
addFunction("tr", &Wt::WTemplate::Functions::tr);
@@ -123,7 +109,7 @@ Artists::addSome()
Wt::WContainerWidget* clusterContainers = entry->bindNew<Wt::WContainerWidget>("clusters");
{
auto clusterTypes = getArtistsClusterTypes(LmsApp->getDboSession());
auto clusterTypes = getClusterTypesFromSetting(artistsClusterTypesSetting);
auto clusterGroups = artist->getClusterGroups(clusterTypes, 1);
for (auto clusters : clusterGroups)
src/ui/explore/ExploreUtils.cpp
+51
View File
@@ -0,0 +1,51 @@
/*
* Copyright (C) 2018 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "ExploreUtils.hpp"
#include "utils/Utils.hpp"
#include "database/Setting.hpp"
#include "LmsApplication.hpp"
namespace UserInterface {
std::vector<Database::ClusterType::pointer> getClusterTypesFromSetting(std::string setting)
{
std::vector<Database::ClusterType::pointer> res;
for (auto clusterTypeName : splitString(Database::Setting::getString(LmsApp->getDboSession(), setting), " "))
{
auto clusterType = Database::ClusterType::getByName(LmsApp->getDboSession(), clusterTypeName);
if (clusterType)
res.push_back(clusterType);
}
return res;
}
void setClusterTypesToSetting(std::string setting, const std::set<std::string>& clusterTypes)
{
std::vector<std::string> vec(clusterTypes.begin(), clusterTypes.end());
Database::Setting::setString(LmsApp->getDboSession(), setting, joinStrings(vec, " "));
}
} // namespace UserInterface
src/ui/explore/ExploreUtils.hpp
+29
View File
@@ -0,0 +1,29 @@
/*
* Copyright (C) 2018 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "database/Track.hpp"
namespace UserInterface {
std::vector<Database::ClusterType::pointer> getClusterTypesFromSetting(std::string setting);
void setClusterTypesToSetting(std::string setting, const std::set<std::string>& clusterTypes);
} // namespace UserInterface
src/ui/explore/ReleaseView.cpp
+4 -17
View File
@@ -35,13 +35,14 @@
#include "LmsApplication.hpp"
#include "Filters.hpp"
#include "ExploreUtils.hpp"
using namespace Database;
namespace {
const std::string releaseClusterTypesSetting = "release_cluster_types";
const std::vector<std::string> defaultReleaseClusterTypes =
const std::set<std::string> defaultReleaseClusterTypes =
{
"GENRE",
"ALBUMGROUPING",
@@ -49,20 +50,6 @@ const std::vector<std::string> defaultReleaseClusterTypes =
"COMMENT:SONGS-DB_OCCASION",
};
std::vector<ClusterType::pointer> getReleaseClusterTypes(Wt::Dbo::Session& session)
{
Wt::Dbo::Transaction transaction(session);
std::vector<ClusterType::pointer> res;
for (auto clusterTypeName : splitString(Setting::getString(session, releaseClusterTypesSetting), " "))
{
auto clusterType = ClusterType::getByName(session, clusterTypeName);
if (clusterType)
res.push_back(clusterType);
}
return res;
}
} // namespace
namespace UserInterface {
@@ -71,7 +58,7 @@ Release::Release(Filters* filters)
: _filters(filters)
{
if (!Setting::exists(LmsApp->getDboSession(), releaseClusterTypesSetting))
Setting::setString(LmsApp->getDboSession(), releaseClusterTypesSetting, joinStrings(defaultReleaseClusterTypes, " "));
setClusterTypesToSetting(releaseClusterTypesSetting, defaultReleaseClusterTypes);
wApp->internalPathChanged().connect(std::bind([=]
{
@@ -143,7 +130,7 @@ Release::refresh()
Wt::WContainerWidget* clusterContainers = t->bindNew<Wt::WContainerWidget>("clusters");
{
auto clusterTypes = getReleaseClusterTypes(LmsApp->getDboSession());
auto clusterTypes = getClusterTypesFromSetting(releaseClusterTypesSetting);
auto clusterGroups = release->getClusterGroups(clusterTypes, 3);
for (auto clusters : clusterGroups)
src/ui/explore/ReleasesView.cpp
+4 -18
View File
@@ -35,33 +35,19 @@
#include "LmsApplication.hpp"
#include "Filters.hpp"
#include "ExploreUtils.hpp"
using namespace Database;
namespace {
const std::string releasesClusterTypesSetting = "releases_cluster_types";
const std::vector<std::string> defaultReleasesClusterTypes =
const std::set<std::string> defaultReleasesClusterTypes =
{
"GENRE",
"ALBUMGROUPING",
};
std::vector<ClusterType::pointer> getReleasesClusterTypes(Wt::Dbo::Session& session)
{
Wt::Dbo::Transaction transaction(session);
std::vector<ClusterType::pointer> res;
for (auto clusterTypeName : splitString(Setting::getString(session, releasesClusterTypesSetting), " "))
{
auto clusterType = ClusterType::getByName(session, clusterTypeName);
if (clusterType)
res.push_back(clusterType);
}
return res;
}
} // namespace
namespace UserInterface {
@@ -71,7 +57,7 @@ Releases::Releases(Filters* filters)
_filters(filters)
{
if (!Setting::exists(LmsApp->getDboSession(), releasesClusterTypesSetting))
Setting::setString(LmsApp->getDboSession(), releasesClusterTypesSetting, joinStrings(defaultReleasesClusterTypes, " "));
setClusterTypesToSetting(releasesClusterTypesSetting, defaultReleasesClusterTypes);
addFunction("tr", &Wt::WTemplate::Functions::tr);
@@ -140,7 +126,7 @@ Releases::addSome()
Wt::WContainerWidget* clusterContainers = entry->bindNew<Wt::WContainerWidget>("clusters");
{
auto clusterTypes = getReleasesClusterTypes(LmsApp->getDboSession());
auto clusterTypes = getClusterTypesFromSetting(releasesClusterTypesSetting);
auto clusterGroups = release->getClusterGroups(clusterTypes, 1);
for (auto clusters : clusterGroups)
src/ui/explore/TracksView.cpp
+39 -2
View File
@@ -27,6 +27,7 @@
#include "database/DbArtist.hpp"
#include "database/Track.hpp"
#include "database/Release.hpp"
#include "database/Setting.hpp"
#include "utils/Logger.hpp"
#include "utils/Utils.hpp"
@@ -35,15 +36,32 @@
#include "LmsApplication.hpp"
#include "Filters.hpp"
namespace UserInterface {
#include "ExploreUtils.hpp"
using namespace Database;
namespace {
const std::string trackClusterTypesSetting = "track_cluster_types";
const std::set<std::string> defaultTrackClusterTypes =
{
"GENRE",
"ALBUMGROUPING",
"ALBUMMOOD",
"COMMENT:SONGS-DB_OCCASION",
};
} // namespace
namespace UserInterface {
Tracks::Tracks(Filters* filters)
: Wt::WTemplate(Wt::WString::tr("Lms.Explore.Tracks.template")),
_filters(filters)
{
if (!Setting::exists(LmsApp->getDboSession(), trackClusterTypesSetting))
setClusterTypesToSetting(trackClusterTypesSetting, defaultTrackClusterTypes);
addFunction("tr", &Wt::WTemplate::Functions::tr);
_search = bindNew<Wt::WLineEdit>("search");
@@ -136,6 +154,25 @@ Tracks::addSome()
// Some images may not be square
cover->setWidth(64);
Wt::WContainerWidget* clusterContainers = entry->bindNew<Wt::WContainerWidget>("clusters");
{
auto clusterTypes = getClusterTypesFromSetting(trackClusterTypesSetting);
auto clusterGroups = release->getClusterGroups(clusterTypes, 1);
for (auto clusters : clusterGroups)
{
for (auto cluster : clusters)
{
auto clusterId = cluster.id();
auto entry = clusterContainers->addWidget(LmsApp->createCluster(cluster));
entry->clicked().connect([=]
{
_filters->add(clusterId);
});
}
}
}
Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.Tracks.play"), Wt::TextFormat::XHTML);
playBtn->clicked().connect(std::bind([=]
{