From dda0f3831512f7db881519cbe65fbbe090dc4f8d Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 9 Apr 2016 16:23:20 +0200 Subject: [PATCH 001/195] [UI] Changed internal template names used by settings views --- approot/templates.xml | 12 ++++++------ src/ui/settings/SettingsAccountFormView.cpp | 2 +- src/ui/settings/SettingsAudioFormView.cpp | 2 +- src/ui/settings/SettingsDatabaseFormView.cpp | 2 +- src/ui/settings/SettingsFirstConnectionFormView.cpp | 2 +- src/ui/settings/SettingsMediaDirectoryFormView.cpp | 2 +- src/ui/settings/SettingsUserFormView.cpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/approot/templates.xml b/approot/templates.xml index 5be05553..82790cf2 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -14,7 +14,7 @@ - + ${title}
@@ -69,7 +69,7 @@ - + ${title}
@@ -169,7 +169,7 @@ - + ${title}
@@ -225,7 +225,7 @@
- + ${title}
@@ -262,7 +262,7 @@
- + ${title}
@@ -296,7 +296,7 @@
- + ${title}
diff --git a/src/ui/settings/SettingsAccountFormView.cpp b/src/ui/settings/SettingsAccountFormView.cpp index 4747bc37..c7f265e8 100644 --- a/src/ui/settings/SettingsAccountFormView.cpp +++ b/src/ui/settings/SettingsAccountFormView.cpp @@ -192,7 +192,7 @@ AccountFormView::AccountFormView(std::string userId, Wt::WContainerWidget *paren _model = new AccountFormModel(userId, this); - setTemplateText(tr("userAccountForm-template")); + setTemplateText(tr("settings-account")); addFunction("id", &WTemplate::Functions::id); addFunction("block", &WTemplate::Functions::id); diff --git a/src/ui/settings/SettingsAudioFormView.cpp b/src/ui/settings/SettingsAudioFormView.cpp index 93475c48..e86e171d 100644 --- a/src/ui/settings/SettingsAudioFormView.cpp +++ b/src/ui/settings/SettingsAudioFormView.cpp @@ -175,7 +175,7 @@ AudioFormView::AudioFormView(Wt::WContainerWidget *parent) _model = new AudioFormModel(this); - setTemplateText(tr("audioForm-template")); + setTemplateText(tr("settings-audio")); addFunction("id", &WTemplate::Functions::id); addFunction("block", &WTemplate::Functions::id); diff --git a/src/ui/settings/SettingsDatabaseFormView.cpp b/src/ui/settings/SettingsDatabaseFormView.cpp index d0c8cb16..f9ad0ccf 100644 --- a/src/ui/settings/SettingsDatabaseFormView.cpp +++ b/src/ui/settings/SettingsDatabaseFormView.cpp @@ -297,7 +297,7 @@ DatabaseFormView::DatabaseFormView(Wt::WContainerWidget *parent) { _model = new DatabaseFormModel(this); - setTemplateText(tr("databaseForm-template")); + setTemplateText(tr("settings-database")); addFunction("id", &WTemplate::Functions::id); addFunction("block", &WTemplate::Functions::id); diff --git a/src/ui/settings/SettingsFirstConnectionFormView.cpp b/src/ui/settings/SettingsFirstConnectionFormView.cpp index fff6a398..7f0628a0 100644 --- a/src/ui/settings/SettingsFirstConnectionFormView.cpp +++ b/src/ui/settings/SettingsFirstConnectionFormView.cpp @@ -152,7 +152,7 @@ FirstConnectionFormView::FirstConnectionFormView(Wt::WContainerWidget *parent) _model = new FirstConnectionFormModel(this); - setTemplateText(tr("firstConnectionForm-template")); + setTemplateText(tr("settings-first-connection")); addFunction("id", &WTemplate::Functions::id); addFunction("block", &WTemplate::Functions::id); diff --git a/src/ui/settings/SettingsMediaDirectoryFormView.cpp b/src/ui/settings/SettingsMediaDirectoryFormView.cpp index 650f75f3..8d9c485a 100644 --- a/src/ui/settings/SettingsMediaDirectoryFormView.cpp +++ b/src/ui/settings/SettingsMediaDirectoryFormView.cpp @@ -109,7 +109,7 @@ MediaDirectoryFormView::MediaDirectoryFormView(Wt::WContainerWidget *parent) _model = new MediaDirectoryFormModel(this); - setTemplateText(tr("mediaDirectoryForm-template")); + setTemplateText(tr("settings-new-media-directory")); addFunction("id", &WTemplate::Functions::id); addFunction("block", &WTemplate::Functions::id); diff --git a/src/ui/settings/SettingsUserFormView.cpp b/src/ui/settings/SettingsUserFormView.cpp index f0d94cc5..f3c45b69 100644 --- a/src/ui/settings/SettingsUserFormView.cpp +++ b/src/ui/settings/SettingsUserFormView.cpp @@ -300,7 +300,7 @@ UserFormView::UserFormView(std::string userId, Wt::WContainerWidget *parent) _model = new UserFormModel(userId, this); - setTemplateText(tr("userForm-template")); + setTemplateText(tr("settings-new-user")); addFunction("id", &WTemplate::Functions::id); addFunction("block", &WTemplate::Functions::id); From 0dace5cbdfd2aa5236f047d66d69d6e551e7c494 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 14 Apr 2016 12:53:29 +0200 Subject: [PATCH 002/195] [DB] Importing KNNL library --- src/Makefile.am | 2 +- .../knnl/basic_activation_function.hpp | 89 ++++ src/third-party/knnl/basic_neuron.hpp | 174 +++++++ .../knnl/basic_neuron_fun_spec.hpp | 169 +++++++ .../knnl/basic_weak_distance_function.hpp | 114 +++++ src/third-party/knnl/data_parser.hpp | 157 ++++++ src/third-party/knnl/debugger.hpp | 114 +++++ .../knnl/euclidean_distance_function.hpp | 157 ++++++ src/third-party/knnl/functors.hpp | 366 ++++++++++++++ .../knnl/generalized_training_weight.hpp | 454 ++++++++++++++++++ src/third-party/knnl/kohonen_network.hpp | 146 ++++++ src/third-party/knnl/max_type.hpp | 134 ++++++ src/third-party/knnl/neural_net_headers.hpp | 80 +++ src/third-party/knnl/numeric_iterator.hpp | 162 +++++++ src/third-party/knnl/operators.hpp | 440 +++++++++++++++++ src/third-party/knnl/print_network.hpp | 156 ++++++ src/third-party/knnl/randomize_policy.hpp | 108 +++++ src/third-party/knnl/ranges.hpp | 156 ++++++ .../knnl/rectangular_container.hpp | 146 ++++++ src/third-party/knnl/std_headers.hpp | 68 +++ src/third-party/knnl/training_functional.hpp | 357 ++++++++++++++ src/third-party/knnl/value_type.hpp | 98 ++++ .../weighted_euclidean_distance_function.hpp | 231 +++++++++ .../knnl/wta_training_algorithm.hpp | 278 +++++++++++ src/third-party/knnl/wtm_topology.hpp | 288 +++++++++++ .../knnl/wtm_training_algorithm.hpp | 293 +++++++++++ 26 files changed, 4936 insertions(+), 1 deletion(-) create mode 100755 src/third-party/knnl/basic_activation_function.hpp create mode 100755 src/third-party/knnl/basic_neuron.hpp create mode 100755 src/third-party/knnl/basic_neuron_fun_spec.hpp create mode 100755 src/third-party/knnl/basic_weak_distance_function.hpp create mode 100755 src/third-party/knnl/data_parser.hpp create mode 100755 src/third-party/knnl/debugger.hpp create mode 100755 src/third-party/knnl/euclidean_distance_function.hpp create mode 100755 src/third-party/knnl/functors.hpp create mode 100755 src/third-party/knnl/generalized_training_weight.hpp create mode 100755 src/third-party/knnl/kohonen_network.hpp create mode 100755 src/third-party/knnl/max_type.hpp create mode 100755 src/third-party/knnl/neural_net_headers.hpp create mode 100755 src/third-party/knnl/numeric_iterator.hpp create mode 100755 src/third-party/knnl/operators.hpp create mode 100755 src/third-party/knnl/print_network.hpp create mode 100755 src/third-party/knnl/randomize_policy.hpp create mode 100755 src/third-party/knnl/ranges.hpp create mode 100755 src/third-party/knnl/rectangular_container.hpp create mode 100755 src/third-party/knnl/std_headers.hpp create mode 100755 src/third-party/knnl/training_functional.hpp create mode 100755 src/third-party/knnl/value_type.hpp create mode 100755 src/third-party/knnl/weighted_euclidean_distance_function.hpp create mode 100755 src/third-party/knnl/wta_training_algorithm.hpp create mode 100755 src/third-party/knnl/wtm_topology.hpp create mode 100755 src/third-party/knnl/wtm_training_algorithm.hpp diff --git a/src/Makefile.am b/src/Makefile.am index 5b9e6480..18a8bcbc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -67,5 +67,5 @@ lms_SOURCES += \ $(srcdir)/ui/video/VideoParametersDialog.cpp endif -lms_CXXFLAGS=-std=c++11 -Wall -I$(top_srcdir)/third-party -I$(srcdir)/ui $(MAGICKXX_CFLAGS) +lms_CXXFLAGS=-std=c++11 -Wall -I$(srcdir)/third-party -I$(srcdir)/ui $(MAGICKXX_CFLAGS) lms_LDADD=$(MAGICKXX_LIBS) diff --git a/src/third-party/knnl/basic_activation_function.hpp b/src/third-party/knnl/basic_activation_function.hpp new file mode 100755 index 00000000..43629846 --- /dev/null +++ b/src/third-party/knnl/basic_activation_function.hpp @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Tue 11 Apr 2006 17:47:44 CEST + * Last modified: Mon 22 May 2006 13:28:47 CEST + */ + +#ifndef BASIC_ACTIVATION_FUNCTION_HPP_INCLUDED +#define BASIC_ACTIVATION_FUNCTION_HPP_INCLUDED + +/** + * \file basic_activation_function.hpp + * \brief File contains template class Basic_activation_function. + * \ingroup neural_net + */ + +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + + /** + * Basic_activation_function template class. + * \param Parameters_type is type of parameters. + * \param Value_type is a type of values. + * \param Result_type is a type of results. + */ + template + < + typename Parameters_type, + typename Value_type, + typename Result_type + > + class Basic_activation_function + { + public: + /** Result type. */ + typedef Result_type result_type; + + /** Value type. */ + typedef Value_type value_type; + + /** Parameters type. */ + typedef Parameters_type parameters_type; + }; + /*\@}*/ + +} // namespace neural_net + +#endif // BASIC_ACTIVATION_FUNCTION_HPP_INCLUDED diff --git a/src/third-party/knnl/basic_neuron.hpp b/src/third-party/knnl/basic_neuron.hpp new file mode 100755 index 00000000..8f303ecc --- /dev/null +++ b/src/third-party/knnl/basic_neuron.hpp @@ -0,0 +1,174 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Tue 11 Apr 2006 15:01:26 CEST + * Last modified: Sun 26 Nov 2006 09:28:46 CET + */ + +#ifndef BASIC_NEURON_HPP_INCLUDED +#define BASIC_NEURON_HPP_INCLUDED + +/** + * \file basic_neuron.hpp + * \brief File contains template class Basic_neuron. + * \ingroup neural_net + */ + +/** + * \defgroup neural_net Neural network + */ + +/** + * \namespace neural_net + * \brief Neural network namespace + * \ingroup neural_net + */ + +/** + * \addtogroup neural_net + */ +/*\@{*/ +namespace neural_net +{ + /** + * \class Basic_neuron + * \brief Basic_neuron template class. + * \param Activation_function_type + * is a functor type of activation function. + * \param Binary_operation_type + * is a type of binary operation used in neuron values. + * \param Weigths_type is type of weights. + */ + template + < + typename Activation_function_type, + typename Binary_operation_type + > + class Basic_neuron + { + public: + + /** Weights type. */ + typedef typename Binary_operation_type::value_type weights_type; + + /** Activation function type. */ + typedef Activation_function_type activation_function_type; + + /** Binary operation type. */ + typedef Binary_operation_type binary_operation_type; + typedef typename Binary_operation_type::value_type value_type; + typedef typename Activation_function_type::result_type result_type; + + /** Activation function functor. */ + Activation_function_type activation_function; + + /** Weak and generalized distance function. */ + Binary_operation_type binary_operation; + + /** Weights. */ + weights_type weights; + + /** + * Constructor. + * \param weights_ are weights of the neuron. + * \param activation_function_ is an activation + * function of the neuron. + * \param binary_operation_ is an operation calculated + * on weights and data, before + * activation function. + */ + Basic_neuron + ( + weights_type const & weights_, + Activation_function_type const & activation_function_, + Binary_operation_type const & binary_operation_ + ) + : activation_function ( activation_function_ ), + binary_operation ( binary_operation_ ), + weights ( weights_ ) + {} + + /** + * Calculation function. + * \param x input value for the neuron. + * \return output from neuron. + * \f[ + * y = f ( g ( w,x ) ) + * \f] + * where: f is activation function, g is binary operation, + * w is weight and x is input value. + */ + typename Activation_function_type::result_type + operator() ( value_type const & x ) const + { + // calculate output of the neuron as activation fuction + // working on results from binary operation on weights and value + // composition of activation and distance function + return activation_function ( binary_operation ( weights, x ) ); + } + + /** Copy constructor. */ + template + < + typename Activation_function_type_2, + typename Binary_operation_type_2 + > + Basic_neuron + ( + Basic_neuron + < + Activation_function_type_2, + Binary_operation_type_2 + > + const & neuron_ + ) + { + activation_function = neuron_.activation_function; + binary_operation = neuron_.binary_operation; + weights = neuron_.weights; + } + + protected: + Basic_neuron(); + }; +} // namespace neural_net +/*\@}*/ + +#endif // BASIC_NEURON_HPP_INCLUDED diff --git a/src/third-party/knnl/basic_neuron_fun_spec.hpp b/src/third-party/knnl/basic_neuron_fun_spec.hpp new file mode 100755 index 00000000..e60883db --- /dev/null +++ b/src/third-party/knnl/basic_neuron_fun_spec.hpp @@ -0,0 +1,169 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Tue 11 Apr 2006 15:01:26 CEST + * Last modified: Wed 08 Aug 2007 18:27:41 CEST + */ + +#ifndef BASIC_NEURON_FUN_SPEC_HPP_INCLUDED +#define BASIC_NEURON_FUN_SPEC_HPP_INCLUDED + +#include +#include "basic_neuron.hpp" + +/** + * \file basic_neuron_fun_spec.hpp + * \brief File contains specialization of template class Basic_neuron. + * using boost::function. + * \ingroup neural_net + */ + +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + + /** + * Basic_neuron template class specialization for the functions instead + * of functors. + * \param Activation_function_type is a function of activation. + * \param Binary_operation_type is a type of binary operation e.g. distance function. + */ + template + < + typename Activation_function_type, + typename Binary_operation_type + > + class Basic_neuron + < + Activation_function_type ( typename Binary_operation_type::result_type ), + Binary_operation_type ( Value_type, Value_type ) + > + { + public: + + /** Weights type. */ + typedef typename Binary_operation_type::value_type weights_type; + + /** Activation function type. */ + typedef Activation_function_type activation_function_type; + + /** Binary operation type. */ + typedef Binary_operation_type binary_operation_type; + typedef typename Binary_operation_type::value_type value_type; + + /** Activation function. */ + ::boost::function < + Activation_function_type ( typename Binary_operation_type::result_type ) + > activation_function; + + /** Weak and generalized distance function. */ + ::boost::function < + Binary_operation_type ( value_type, value_type ) + > binary_operation; + + /** Weights. */ + weights_type weights; + + /** + * Constructor. + * \param weights_ are weights of the neuron. + * \param activation_function_ is an activation + * function of the neuron. + * \param binary_operation_ is an operation calculated + * on weights and data, before + * activation function. + */ + Basic_neuron ( + weights_type const & weights_, + + ::boost::function < + Activation_function_type ( typename Binary_operation_type::result_type ) + > + const & activation_function_, + + ::boost::function < + Binary_operation_type ( value_type, value_type ) + > + const & binary_operation_ + ) + : activation_function ( activation_function_ ), + binary_operation ( binary_operation_ ), + weights ( weights_ ) + {} + + /** + * Calculation function. + * \param x input value for the neuron. + * \return output from neuron. + * \f[ + * y = f ( g ( w,x ) ) + * \f] + * where: f is activation function, g is binary operation, + * w is weight and x is input value. + */ + typename Activation_function_type::result_type + operator() ( value_type const & x ) const + { + // calculate output of the neuron as activation fuction + // working on results from binary operation on weights and value + // composition of activation and distance function + return activation_function ( binary_operation ( weights, x ) ); + } + + /** Copy constructor. */ + template < + typename Activation_function_type_2, + typename Binary_operation_type_2 + > Basic_neuron ( + const Basic_neuron < + Activation_function_type_2 ( typename Binary_operation_type_2::result_type ), + Binary_operation_type_2 ( value_type, value_type ) + > & neuron_ + ) + {} + }; + /*\@}*/ + +} // namespace neural_net + +#endif // BASIC_NEURON_FUN_SPEC_HPP_INCLUDED diff --git a/src/third-party/knnl/basic_weak_distance_function.hpp b/src/third-party/knnl/basic_weak_distance_function.hpp new file mode 100755 index 00000000..dac949c2 --- /dev/null +++ b/src/third-party/knnl/basic_weak_distance_function.hpp @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Thu 13 Apr 2006 08:30:20 CEST + * Last modified: Sun 26 Nov 2006 08:32:48 CET + */ + +#ifndef BASIC_WEAK_DISTANCE_FUNCTION_HPP_INCLUDED +#define BASIC_WEAK_DISTANCE_FUNCTION_HPP_INCLUDED + +/** + * \defgroup distance Generalized distance + */ + +/** + * \file basic_weak_distance_function.hpp + * \brief File contains template class Basic_weak_distance_function. + * \ingroup distance + */ + +/** + * \namespace distance + * \brief namespace contains functors for distance calculation in the data. + * \ingroup distance + */ +namespace distance +{ + /** + * \addtogroup distance + */ + /*\@{*/ + + /** + * Basic_weak_distance_function template class. + * \param Value_type is a type of values. + * \param Parameters_type ia a type of parameters. + */ + template + < + typename Value_type, + typename Result_type + > + class Basic_weak_distance_function + { + public: + + typedef Value_type value_type; + typedef Result_type result_type; + + /** + * Constructor. + */ + Basic_weak_distance_function() + {} + + /** Copy constructor. */ + template + < + typename Value_type_2, + typename Result_type_2 + > + Basic_weak_distance_function + ( + Basic_weak_distance_function + < + Value_type_2, + Result_type_2 + > + const & weak_distance_function_ + ) + {} + }; + /*\@}*/ + +} // namespace distance + +#endif // BASIC_WEAK_DISTANCE_FUNCTION_HPP_INCLUDED diff --git a/src/third-party/knnl/data_parser.hpp b/src/third-party/knnl/data_parser.hpp new file mode 100755 index 00000000..e2867de2 --- /dev/null +++ b/src/third-party/knnl/data_parser.hpp @@ -0,0 +1,157 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Sat 29 Apr 2006 19:10:50 CEST + * Last modified: Wed 08 Aug 2007 17:15:45 CEST + */ + +#ifndef DATA_PARSER_HPP_INCLUDED +#define DATA_PARSER_HPP_INCLUDED + +#include +#include +#include +#include +#include + +/** + * \defgroup data_parser Data parser + */ + +/** + * \file data_parser.hpp + * \brief File contains template class Data_parser. + * \ingroup data_parser + */ + +/** + * \addtogroup data_parser + */ +/*\@{*/ + +/** + * \namespace data_parser + * \brief Data parser namespace includes functionality to parsing and storing data into containers. + * \ingroup data_parser + */ +namespace data_parser +{ + /** + * Class for parsing data stream. + * \param Data_container is a container type. + */ + template < typename Data_container > + class Data_parser + { + public: + /** Constructor. */ + Data_parser() + {} + + /** + * Function that parse stream and store data in container. + * \param is is a reference to the stream. + * \param data_container is a reference to the container. + * \return modified container. + * \throw ::std::runtime_error when after parsing size of data_container is still zero. + */ + Data_container & operator() ( ::std::istream & is, Data_container & data_container ) const + { + ::std::string tmp_string; + ::boost::int32_t counter = 0; + + typename Data_container::value_type tmp_sub_container; + + // get line of data from stream + while ( ::std::getline ( is, tmp_string ) ) + { + // count data + ++counter; + + // parse data and push data back into the container + data_container.push_back ( parse_string ( tmp_sub_container, tmp_string ) ); + + // reset temporal container + tmp_sub_container.clear(); + } + + // if data container is empty after all procedure throw exception + if ( data_container.size() == 0 ) + { + throw ::std::runtime_error ( "Data file corupted." ); + } + + // return data container of containers + return data_container; + } + + private: + /** + * This function is for parsing string. + * \param container is a reference to the data conatiner. + * \param str is a reference to the string. + * \return container of the values stored in one string. + */ + typename Data_container::value_type parse_string + ( + typename Data_container::value_type & container, + ::std::string & str + ) const + { + ::std::stringstream tmp_sstr ( str ); + + typedef typename Data_container::value_type::value_type internal_type; + + // parse data as sequence of fixed type data and store them into the container. + ::std::copy + ( + ::std::istream_iterator < internal_type > ( tmp_sstr ), + ::std::istream_iterator < internal_type >(), + ::std::back_inserter ( container ) + ); + + return container; + } + + }; +} // namespace data_parser +/*\@}*/ + +#endif // DATA_PARSER_HPP_INCLUDED diff --git a/src/third-party/knnl/debugger.hpp b/src/third-party/knnl/debugger.hpp new file mode 100755 index 00000000..ec50fb23 --- /dev/null +++ b/src/third-party/knnl/debugger.hpp @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2005, Seweryn Habdank-Wojewodzki + * + * All rights reserved. + * + * Permission to copy, use, modify, sell and distribute this software + * is granted provided this copyright notice appears in all copies. + * This software is provided "as is" without express or implied + * warranty, and with no claim as to its suitability for any purpose. + * This software has generative abilities, but does not claim any rights + * nor guarantees with regard to the generated code. + */ + +/* + * e-mail: habdank{AT}gmail{dot}com + * + * File created: Sat 05 Nov 2005 14:20:28 CET + * Last modified: Wed 08 Aug 2007 17:16:20 CEST + */ + +/** + * \defgroup trivial_debugger Trivial Debugger + */ + +/** + * \file debugger.hpp + * \ingroup trivial_debugger + * \brief Defines macro for Trivial Debugger. + * When compiler send to program one of flags: TDEBUG, ETDEBUG or FTDEBUG debugger functionality is set. + */ + +/** + * \def D + * \brief Macro D will send to proper stream value of the variable. + * Stream depends on set flag. Information which is send looks like: + * + * __FILE__ [__LINE__] : variable name = variable value + * + * \param name is name of debugged variable. + * \par Usage: + * + * In the main file e.g. main.cpp in global scope should be placed: + * + * #ifdef FTDEBUG + * ::std::auto_ptr < ::std::ofstream > DEBUGGER_STREAM; + * #endif //FTDEGUG + * + * And at the very beginnig of the main function should be placed: + * + * #ifdef FTDEBUG + * DEBUGGER_STREAM = + * ::std::auto_ptr < ::std::ofstream > + * ( new ::std::ofstream ( "_debugger.out" ) ); + * #endif //FTDEBUG + * + * if we suppose to use file to make logs. + * + * And in the application we have to include this header and just use macro: + * + * Available for all cases including compilation + * without any flag: + * + * D ( my_variable_name ); or D ( "I am here." ); + * + * If are sure that debugger will work by default any of flag TDEBUG, ETDEBUG and FTDEBUG is set: + * + * D ( ) << "Send other information to the stream." << ::std::endl; + * + * Or just work on if we are sure about existence of the log file FTDEBUG is set: + * + * *DEBUGGER_STREAM << any_function_that_returns_reference_to_ostream ( ) << ::std::endl; + * + * \par Remark: + * Remember to put semicolon at the end! + * + * \par Flags: + * + * - TDEBUG - Trivial Debugger sends debugging information to the stdout. + * + * - ETDEBUG - Trivial Debugger sends debugging information to the stderr. + * + * - FTDEBUG - Trivial Debugger sends debugging information to the file + * (generally declared and defined in main() function of the program). + */ + +#ifndef DEBUGGER_HPP_INCLUDED +#define DEBUGGER_HPP_INCLUDED + +#ifdef FTDEBUG + + #include + #include + + #define D(name) *DEBUGGER_STREAM << __FILE__ << " [" << __LINE__ << "] : " << #name << " = " << (name) << ::std::endl + extern ::std::auto_ptr < ::std::ofstream > DEBUGGER_STREAM; + +#elif defined(TDEBUG) + + #include + #define D(name) ::std::cout << __FILE__ << " [" << __LINE__ << "] : " << #name << " = " << (name) << ::std::endl + +#elif defined(ETDEBUG) + + #include + #define D(name) ::std::cerr << __FILE__ << " [" << __LINE__ << "] : " << #name << " = " << (name) << ::std::endl + +#else + + #define D(name) {} + +#endif // ..TDEBUG + +#endif // DEBUGGER_HPP_INCLUDED + diff --git a/src/third-party/knnl/euclidean_distance_function.hpp b/src/third-party/knnl/euclidean_distance_function.hpp new file mode 100755 index 00000000..2eddf8c8 --- /dev/null +++ b/src/third-party/knnl/euclidean_distance_function.hpp @@ -0,0 +1,157 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Fri 14 Apr 2006 22:42:31 CEST + * Last modified: Wed 08 Aug 2007 18:21:06 CEST + */ + +#ifndef EUCLIDEAN_DISTANCE_FUNCTION_HPP_INCLUDED +#define EUCLIDEAN_DISTANCE_FUNCTION_HPP_INCLUDED + +#include + +#include "operators.hpp" +#include "basic_weak_distance_function.hpp" +#include "value_type.hpp" + +/** + * \file euclidean_distance_function.hpp + * \brief File contains template class Euclidean_distance_function. + * \ingroup distance + */ + +namespace distance +{ + /** + * \addtogroup distance + */ + /*\@{*/ + + /** + * Euclidean_distance_function template class. + * \param Value_type is a type of values. + * \f[ + * d (x,y) = \sum\limits_{i=0}^{N} cdot (x_i-y_i)^2 + * \f] + */ + template + < + typename Value_type + > + class Euclidean_distance_function + : public Basic_weak_distance_function + < + Value_type, + Value_type + > + { + public: + /** + * Constructor. + */ + Euclidean_distance_function() + {} + + /** + * Calculation function. + * \param x first input value for the function. + * \param y second input value for the function. + * \return square of the Euclidean distance function. + * \f[ + * d (x,y) = \sum\limits_{i=0}^{N} cdot (x_i-y_i)^2 + * \f] + */ + typename Value_type::value_type operator() + ( + Value_type const & x, + Value_type const & y + ) const + { + return + ( + euclidean_distance_square + ( + x.begin(), + x.end(), + y.begin(), + static_cast < typename Value_type::value_type const & > ( 0 ) + ) + ); + } + + private: + typedef typename Value_type::value_type inner_type; + + /** + * Function calculates Euclidean distance between two containers. + * \param begin_1 is a begin iterator for the first container. + * \param end_1 is an end iterator for the first container. + * \param begin_2 is an begin iterator for the second container. + * \param init is an initial value. + * \result sqare of Euclidean distance. + */ + inner_type euclidean_distance_square + ( + typename Value_type::const_iterator begin_1, + typename Value_type::const_iterator end_1, + typename Value_type::const_iterator begin_2, + inner_type const & init + ) const + { + return ::std::inner_product + ( + begin_1, end_1, begin_2, + static_cast < inner_type > ( init ), + ::std::plus < inner_type >(), + ::operators::compose_f_gxy_gxy + ( + ::std::multiplies < inner_type >(), + ::std::minus < inner_type >() + ) + ); + } + + }; + /*\@}*/ + +} // namespace distance + +#endif // EUCLIDEAN_DISTANCE_FUNCTION_HPP_INCLUDED + diff --git a/src/third-party/knnl/functors.hpp b/src/third-party/knnl/functors.hpp new file mode 100755 index 00000000..7fa79fc5 --- /dev/null +++ b/src/third-party/knnl/functors.hpp @@ -0,0 +1,366 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Wed 10 May 2006 11:16:03 CEST + * Last modified: Wed 08 Aug 2007 18:21:33 CEST + */ + +#ifndef FUNCTORS_HPP_INCLUDED +#define FUNCTORS_HPP_INCLUDED + +#include + +#include "basic_activation_function.hpp" +#include "operators.hpp" +#include "training_functional.hpp" +/** + * \file functors.hpp + * \brief File contains template class Basic_function and some other classes derived form that one. + * \ingroup neural_net + */ + +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + + /** + * \class Basic_function + * \brief Basic class for defining functions. + * \param Value_type is a type of values. + */ + template < typename Value_type > + struct Basic_function + { + typedef Value_type value_type; + }; + + /** + * \class Gauss_function + * \brief Functor that compute Gauss hat function. + * \param Value_type is a type of values. + * \param Scalar_type is a type of scaling factor which multiplies values. + * \param Exponent_type is a type of exponential factor. + * \f[ + * y = e ^{-\frac{1}{2}\left (\frac{v}{\sigma}\right)^p} + * \f] + */ + template + < + typename Value_type, + typename Scalar_type, + typename Exponent_type + > + class Gauss_function + : public Basic_function < Value_type >, + public Basic_activation_function + < + typename ::operators::Max_type < Scalar_type, Exponent_type >::type, + Value_type, + typename ::operators::Max_type + < + typename ::operators::Max_type + < + typename ::operators::Max_type < Scalar_type, Exponent_type >::type, + Value_type + >::type, + double + >::type + > + { + public: + + typedef Scalar_type scalar_type; + typedef Exponent_type exponent_type; + typedef Value_type value_type; + + typedef typename ::operators::Max_type + < + typename ::operators::Max_type + < + typename ::operators::Max_type < Scalar_type, Exponent_type >::type, + Value_type + >::type, + double + >::type result_type; + + /** Sigma coafficient in the function. */ + Scalar_type sigma; + + /** Exponential factor. */ + Exponent_type exponent; + + /** + * Constructor. + * \param sigma_ is sigma coefficient in Gauss hat function. + * \param exp_ is exponential factor in Gauss hat function. + */ + Gauss_function ( Scalar_type const & sigma_, Exponent_type const & exp_ ) + : sigma ( sigma_ ), exponent ( exp_ ) + {} + + /** + * Result of the functor. + * \param value is a value. + * \return calcutaled result. + * \f[ + * y = e ^{-\frac{1}{2}\left (\frac{v}{\sigma}\right)^p} + * \f] + * where: v is value. + */ + result_type operator() ( Value_type const & value ) const + { + ::operators::power < result_type, Exponent_type > power_v; + + // calculate result + return + ( + ::std::exp + ( + - ::operators::inverse ( static_cast < Scalar_type > ( 2 ) ) + * (power_v) + ( + ::operators::inverse ( sigma ) * value, + exponent + ) + ) + ); + } + + /** Copy constructor. */ + template + < + typename Value_type_2, + typename Scalar_type_2, + typename Exponent_type_2 + > + Gauss_function + ( + Gauss_function + < + Value_type_2, + Scalar_type_2, + Exponent_type_2 + > + const & gauss_function + ) + : sigma ( gauss_function.sigma ), exponent ( gauss_function.exponent ) + {} + }; + + /** + * \class Cauchy_function + * \brief Functor that computes Cauchy hat function. + * \param Value_type is a type of value. + * \param Scalar_type is a type of scalar which will multiplies values. + * \param Power_type is a type of exponential factor. + * \f[ + * y=\frac{1}{1 + (\frac{x}{\sigma})^p} + * \f] + */ + template + < + typename Value_type, + typename Scalar_type, + typename Exponent_type + > + class Cauchy_function + : public Basic_function < Value_type >, + public Basic_activation_function + < + typename ::operators::Max_type < Scalar_type, Exponent_type >::type, + Value_type, + typename ::operators::Max_type + < + typename ::operators::Max_type < Scalar_type, Exponent_type >::type, + Value_type + >::type + > + { + public: + + typedef Scalar_type scalar_type; + typedef Exponent_type exponent_type; + typedef Value_type value_type; + + typedef typename ::operators::Max_type + < + typename ::operators::Max_type < Scalar_type, Exponent_type >::type, + Value_type + >::type result_type; + + /** Sigma scaling coefficient. */ + Scalar_type sigma; + + /** Exponential factor. */ + Exponent_type exponent; + + /** + * Constuctor. + * \param sigma_ is scailing coefficient. + * \param exp_ is exponential factor. + */ + Cauchy_function ( Scalar_type const & sigma_, Exponent_type const & exp_ ) + : sigma ( sigma_ ), exponent ( exp_ ) + {} + + /** + * Function calculates values of the Cauchy hat function. + * \param value is a value. + * \return value of the function. + * \f[ + * y=\frac{1}{1 + (\frac{x}{\sigma})^p} + * \f] + * where: x is value. + */ + result_type operator() ( Value_type const & value ) const + { + ::operators::power < result_type, Exponent_type > power_v; + + // calculate result + return + ( + ::operators::inverse + ( + (power_v) + ( + ::operators::inverse ( sigma ) * value, + exponent + ) + 1 + ) + ); + } + + /**constructor. */ + template + < + typename Value_type_2, + typename Scalar_type_2, + typename Exponent_type_2 + > + Cauchy_function + ( + Cauchy_function + < + Value_type_2, + Scalar_type_2, + Exponent_type_2 + > + const & cauchy_function + ) + : sigma ( cauchy_function.sigma ), exponent ( cauchy_function.exponent ) + {} + }; + + /** + * \class Constant_function + * \brief Functor that computes constant function. + * \param Value_type is a type of value. + * \param Scalar_type is a type of constant value. + * \f[ + * y=c + * \f] + */ + template + < + typename Value_type, + typename Scalar_type + > + class Constant_function + : public Basic_function < Value_type > + { + public: + + typedef Scalar_type scalar_type; + typedef Scalar_type result_type; + + /** Sigma constant value, but not const. */ + Scalar_type sigma; + + /** + * Constuctor. + * \param sigma_ is constant value. + */ + Constant_function ( const Scalar_type & sigma_ ) + : sigma ( sigma_ ) + {} + + /** Copy constructor. */ + template + < + typename Value_type_2, + typename Scalar_type_2 + > + Constant_function + ( + Constant_function + < + Value_type_2, + Scalar_type_2 + > + const & constant_function + ) + : sigma ( constant_function.sigma ) + {} + + /** + * Constant function. + * \param value is a value. + * \return constant value. + * \f[ + * y=c + * \f] + * where: x is value. + */ + result_type operator() ( Value_type const & //value + ) const + { + // result + return ( sigma ); + } + }; + /*\@}*/ + +} // namespace neural_net + +#endif // FUNCTORS_HPP_INCLUDED + diff --git a/src/third-party/knnl/generalized_training_weight.hpp b/src/third-party/knnl/generalized_training_weight.hpp new file mode 100755 index 00000000..ab3341af --- /dev/null +++ b/src/third-party/knnl/generalized_training_weight.hpp @@ -0,0 +1,454 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Sun 07 May 2006 13:51:04 CEST + * Last modified: Wed 08 Aug 2007 18:21:59 CEST + */ + +#ifndef GENERALIZED_TRAINING_WEIGHT_HPP_INCLUDED +#define GENERALIZED_TRAINING_WEIGHT_HPP_INCLUDED + +#include "operators.hpp" +#include "training_functional.hpp" + +/** + * \file generalized_training_weight.hpp + * \brief File contains template class Basic_generalized_training_weight and some other classes derived form that one. + * \ingroup neural_net + */ + +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + + /** + * \class Basic_generalized_training_weight + * \brief Template class for the generalized training functions. + * \param Value_type is a type of values. + * \param Iteration_type is a type of interation counter. + * \param Network_function_type is a type of function that will return proper value + * based on network topology. + * \param Space_funtion_type is a type of function that will return proper value + * based on space topology. + * \param Network_topology is a type of function that computes distances between + * neurons based on network topology. + * \param Space_topology is a type of function that computes distance between + * value and weight in proper topology. + * \param Index_type is a type of index in the neural network container. + */ + template + < + typename Value_type, + typename Iteration_type, + typename Network_function_type, + typename Space_function_type, + typename Network_topology, + typename Space_topology, + typename Index_type + > + struct Basic_generalized_training_weight + { + typedef Network_function_type network_function_type; + typedef Space_function_type space_function_type; + typedef Value_type value_type; + typedef Iteration_type iteration_type; + typedef Index_type index_type; + typedef Network_topology network_topology; + typedef Space_topology space_topology; + }; + + /** + * \class Classic_training_weight + * \brief Template class for the generalize training functions that calculates + * generalized weight classical way. + * \param Value_type is a type of values. + * \param Iteration_type is a type of interation counter. + * \param Network_function_type is a type of function that will return proper value + * based on network topology. + * \param Space_funtion_type is a type of function that will return proper value + * based on space topology. + * \param Network_topology is a type of function that computes distances between + * neurons based on network topology. + * \param Space_topology is a type of function that computes distance between + * value and weight in proper topology. + * \param Index_type is a type of index in the neural network container. + * \f[ + * y=n_f (n_t (c_1,c_2,v_1,v_2)) \cdot s_f (s_t (x,w)) + * \f] + */ + template + < + typename Value_type, + typename Iteration_type, + typename Network_function_type, + typename Space_function_type, + typename Network_topology, + typename Space_topology, + typename Index_type + > + class Classic_training_weight + : public Basic_generalized_training_weight + < + Value_type, + Iteration_type, + Network_function_type, + Space_function_type, + Network_topology, + Space_topology, + Index_type + > + { + public: + + /** Functor computes weight based on the result from network topology. */ + Network_function_type network_function; + + /** Functor computes weight based on the result from space topology. */ + Space_function_type space_function; + + /** Functor computes generalized distance in network. */ + Network_topology network_topology; + + /** Functor computes generalized distance in data space. */ + Space_topology space_topology; + + /** + * Function computes generalized weight for training proces. + * This weight is not the same as weights in neural network. + * \param weight is a weight from neural network. + * \param value is a input value (value that trains network). + * \param iteration is a number of training steps could be + * number of training data sample. + * \param c_1 is a row number (position) in the network of the central neuron. + * \param c_2 is a column number (position) in the network of the central neuron. + * \param v_1 is a row number (position) in the network of the trained neuron. + * \param v_2 is a column number (position) in the network of the trained neuron. + * \f[ + * y=n_f (n_t (c_1,c_2,v_1,v_2)) \cdot s_f (s_t (x,w)) + * \f] + * where x is value and w is neuron weight. + */ + typename Space_function_type::value_type operator() + ( + Value_type const & weight, + Value_type const & value, + Iteration_type const & //iteration + , + Index_type const & c_1, + Index_type const & c_2, + Index_type const & v_1, + Index_type const & v_2 + ) + { + // calculate result + return + ( + (network_function) ( (network_topology) ( c_1, c_2, v_1, v_2 ) ) + * (space_function) ( (space_topology) ( value, weight ) ) + ); + } + + /** + * Constructor. + * \param n_f is a network functor. + * \param s_f is a data space functor. + * \param n_t is a network topology functor. + * \param s_t is a space topology functor. + */ + Classic_training_weight + ( + Network_function_type const & n_f, + Space_function_type const & s_f, + Network_topology const & n_t, + Space_topology const & s_t + ) + : Basic_generalized_training_weight + < + Value_type, + Iteration_type, + Network_function_type, + Space_function_type, + Network_topology, + Space_topology, + Index_type + >(), + network_function ( n_f ), + space_function ( s_f ), + network_topology ( n_t ), + space_topology ( s_t ) + {} + + /** Copy constructor */ + template + < + typename Value_type_2, + typename Iteration_type_2, + typename Network_function_type_2, + typename Space_function_type_2, + typename Network_topology_2, + typename Space_topology_2, + typename Index_type_2 + > + Classic_training_weight + ( + const Classic_training_weight + < + Value_type_2, + Iteration_type_2, + Network_function_type_2, + Space_function_type_2, + Network_topology_2, + Space_topology_2, + Index_type_2 + > + & classic_training_weight + ) + : Basic_generalized_training_weight + < + Value_type_2, + Iteration_type_2, + Network_function_type_2, + Space_function_type_2, + Network_topology_2, + Space_topology_2, + Index_type_2 + >(), + network_function ( classic_training_weight.network_function ), + space_function ( classic_training_weight.space_function ), + network_topology ( classic_training_weight.network_topology ), + space_topology ( classic_training_weight.space_topology ) + {} + + }; + + /** + * \class Experimental_training_weight + * \brief Template class for the generalize training functions that calculates + * generalizeg weight in experimental way. + * \param Value_type is a type of values. + * \param Iteration_type is a type of interation counter. + * \param Network_function_type is a type of function that will return proper value + * based on network topology. + * \param Space_funtion_type is a type of function that will return proper value + * based on space topology. + * \param Network_topology is a type of function that computes distances between + * neurons based on network topology. + * \param Space_topology is a type of function that computes distance between + * value and weight in proper topology. + * \param Index_type is a type of index in the neural network container. + * \param Parameters_type is a type of the parameters for experimenntal training. + * \param n_power is a power q_N + * \param s_power is a power q_S + * \f[ + * y= ( p_1 \cdot n_f (n_t (c_1,c_2,v_1,v_2)) - p_0 )^q_N \cdot s_f (s_t (x,w))^q_S + * \f] + */ + template + < + typename Value_type, + typename Iteration_type, + typename Network_function_type, + typename Space_function_type, + typename Network_topology, + typename Space_topology, + typename Index_type, + typename Parameter_type, + ::boost::int32_t n_power = 1, + ::boost::int32_t s_power = 1 + > + class Experimental_training_weight + : public Basic_generalized_training_weight + < + Value_type, + Iteration_type, + Network_function_type, + Space_function_type, + Network_topology, + Space_topology, + Index_type + > + { + public: + + //::boost::int32_t const s_power; + //::boost::int32_t const n_power; + + /** Scaling parameter. */ + Parameter_type parameter_1; + + /** Shifting parameter. */ + Parameter_type parameter_0; + + + /** Functor computes weight based on the result from network topology. */ + Network_function_type network_function; + + /** Functor computes weight based on the result from space topology. */ + Space_function_type space_function; + + /** Functor computes generalized distance in network. */ + Network_topology network_topology; + + /** Functor computes generalized distance in data space. */ + Space_topology space_topology; + + /** + * Constructor. + * \param n_f is a network functor. + * \param s_f is a data space functor. + * \param n_t is a network topology functor. + * \param s_t is a space topology functor. + * \param parameter_0_ is a scailing parameter. + * \param parameter_1_ is a shifting parameter. + */ + Experimental_training_weight + ( + Network_function_type const & n_f, + Space_function_type const & s_f, + Network_topology const & n_t, + Space_topology const & s_t, + Parameter_type const & parameter_0_, + Parameter_type const & parameter_1_//, +// ::boost::int32_t const s_power_ = 1, +// ::boost::int32_t const n_power_ = 1 + ) + : //s_power ( s_power_ ), + //n_power ( n_power_ ), + parameter_1 ( parameter_1_), + parameter_0 ( parameter_0_), + network_function ( n_f ), + space_function ( s_f ), + network_topology ( n_t ), + space_topology ( s_t ) + {} + + /** Copy constructor. */ + template + < + typename Value_type_2, + typename Iteration_type_2, + typename Network_function_type_2, + typename Space_function_type_2, + typename Network_topology_2, + typename Space_topology_2, + typename Index_type_2, + typename Parameter_type_2 + > + Experimental_training_weight + ( + const Experimental_training_weight + < + Value_type_2, + Iteration_type_2, + Network_function_type_2, + Space_function_type_2, + Network_topology_2, + Space_topology_2, + Index_type_2, + Parameter_type_2 + > + & experimental_training_weight + ) + : Basic_generalized_training_weight + < + Value_type_2, + Iteration_type_2, + Network_function_type_2, + Space_function_type_2, + Network_topology_2, + Space_topology_2, + Index_type_2 + >(), + parameter_1 ( experimental_training_weight.parameter_1_), + parameter_0 ( experimental_training_weight.parameter_0_), + network_function ( experimental_training_weight.n_f ), + space_function ( experimental_training_weight.s_f ), + network_topology ( experimental_training_weight.n_t ), + space_topology ( experimental_training_weight.s_t ) + {} + + /** + * Function computes generalized weight for training proces. + * This weight is not the same as weights in neural network. + * \param weight is a weight from neural network. + * \param value is a input value (value that trains network). + * \param iteration is a number of training steps could be + * number of training data sample. + * \param c_1 is a row number (position) in the network of the central neuron. + * \param c_2 is a column number (position) in the network of the central neuron. + * \param v_1 is a row number (position) in the network of the trained neuron. + * \param v_2 is a column number (position) in the network of the trained neuron. + * \f[ + * y= ( p_1 \cdot n_f (n_t (c_1,c_2,v_1,v_2)) - p_0 ) \cdot s_f (s_t (x,w)) + * \f] + * where x is value, w is neuron weight, \f$p_1\f$ is scaling parameter, \f$p_0\f$ is shifting parameter. + */ + typename Space_function_type::value_type operator() + ( + Value_type & weight, + Value_type const & value, + Iteration_type const & //iteration + , + Index_type const & c_1, + Index_type const & c_2, + Index_type const & v_1, + Index_type const & v_2 + ) const + { + //::operators::power < typename Space_function_type::value_type, ::boost::int32_t > power_v; + // calculate result + return + ( + // power_v( parameter_1 * (network_function) ( (network_topology) ( c_1, c_2, v_1, v_2 ) ) - parameter_0, n_power ) + // * power_v( (space_function) ( (space_topology) ( value, weight ) ), s_power ) + ::operators::static_power( parameter_1 * (network_function) ( (network_topology) ( c_1, c_2, v_1, v_2 ) ) - parameter_0 ) + * ::operators::static_power( (space_function) ( (space_topology) ( value, weight ) ) ) + ); + } + }; + /*\@}*/ + +} // namespace neural_net + +#endif // GENERALIZED_TRAINING_WEIGHT_HPP_INCLUDED + diff --git a/src/third-party/knnl/kohonen_network.hpp b/src/third-party/knnl/kohonen_network.hpp new file mode 100755 index 00000000..ec2f3b9a --- /dev/null +++ b/src/third-party/knnl/kohonen_network.hpp @@ -0,0 +1,146 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Tue 18 Apr 2006 19:25:15 CEST + * Last modified: Wed 08 Aug 2007 17:23:33 CEST + */ + +#ifndef KOHONEN_NETWORK_HPP_INCLUDED +#define KOHONEN_NETWORK_HPP_INCLUDED + +#include "ranges.hpp" + +#include +#include +#include + +/** + * \file kohonen_network.hpp + * \brief File contains template functions for preparing + * Kohonen neural networks. + * \ingroup neural_net + */ + +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + + /** + * Function generates randomly distributed weights for neural network. + * Distribution is uniform and weights are generated based on + * multidimensional ranges of training data. + * \param no_rows is a number of rows that will be created in neural network. + * \param no_columns is a number of columns that will be created in neural network. + * \param activation_function is activation function that will be set. + * \param binary_operation is a function tat will be set under activation function. + * \param data is a reference to data container. + * \param kohonen_network is a reference to the network. + * \param randomize_policy is a policy class for setting up random number generator. + * \todo TODO: When Rectangular_container will be changed then this class should be repaired too. + */ + template + < + typename Data_container_type, + typename Kohonen_network_type, + typename Randomize_policy + > + void generate_kohonen_network + ( + typename Kohonen_network_type::row_type::size_type const & no_rows, + typename Kohonen_network_type::column_type::size_type const & no_columns, + typename Kohonen_network_type::value_type::activation_function_type const & activation_function, + typename Kohonen_network_type::value_type::binary_operation_type const & binary_operation, + Data_container_type & data, + Kohonen_network_type & kohonen_network, + Randomize_policy const & randomize_policy + ) + { + randomize_policy(); + + typedef typename Kohonen_network_type::value_type Neuron_type; + typedef typename Kohonen_network_type::row_type::size_type row_size_t; + typedef typename Kohonen_network_type::column_type::size_type col_size_t; + typedef typename Neuron_type::weights_type weights_t; + typedef typename weights_t::size_type w_size_t; + + ::std::vector < Neuron_type > tmp_neuron_vector; + tmp_neuron_vector.reserve ( no_columns ); + + const w_size_t K = data.begin()->size(); + weights_t weights ( K ); + + Ranges < Data_container_type > data_ranges ( *data.begin() ); + data_ranges ( data ); + + for ( row_size_t i = 0; i < no_rows; ++i ) + { + for ( col_size_t j = 0; j < no_columns; ++j ) + { + for ( w_size_t k = 0; k < K; ++k ) + { + weights[k] = ( + static_cast < typename Data_container_type::value_type::value_type > + ( ( data_ranges.get_max().at ( k ) + - data_ranges.get_min().at ( k ) ) + * ( rand() / ( 1.0 + RAND_MAX ) ) + + data_ranges.get_min().at ( k ) ) ); + } + + Neuron_type local_neuron + ( + weights, + activation_function, + binary_operation + ); + tmp_neuron_vector.push_back ( local_neuron ); + } + kohonen_network.objects.push_back ( tmp_neuron_vector ); + tmp_neuron_vector.clear(); + } + } + /*\@}*/ + +} // namespace neural_net + +#endif // KOHONEN_NETWORK_HPP_INCLUDED + diff --git a/src/third-party/knnl/max_type.hpp b/src/third-party/knnl/max_type.hpp new file mode 100755 index 00000000..a7c3ffc1 --- /dev/null +++ b/src/third-party/knnl/max_type.hpp @@ -0,0 +1,134 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Tue 23 May 2006 23:53:14 CEST + * Last modified: Wed 08 Aug 2007 17:25:27 CEST + */ + +#ifndef MAX_TYPE_HPP_INCLUDED +#define MAX_TYPE_HPP_INCLUDED + +#include +#include + +/** + * \file max_type.hpp + * \brief File contains template Max_type class. + * \ingroup operators + */ + +/** \addtogroup operators */ +/*\@{*/ +namespace operators +{ + template < typename S, typename T > + struct Max_type_private + {}; + + template < typename T > + struct Max_type_private < T, T > + { + typedef T type; + }; + + // just some examples to set up results for Max_type + // if anyone would like to add his/her types they just have to use + // macro MAX_TYPE_3( argument_1_type, argument_2_type, result_type ) + #define MAX_TYPE_3(T1,T2,T3) template <>\ + struct Max_type_private < T1, T2 >\ + { typedef T3 type; }; + + MAX_TYPE_3(::boost::int32_t,double,double) + MAX_TYPE_3(short,::boost::int32_t,::boost::int32_t) + MAX_TYPE_3(int,long,long) + MAX_TYPE_3(short,double,double) + MAX_TYPE_3(unsigned char,double,double) + MAX_TYPE_3(unsigned int,double,double) + MAX_TYPE_3(unsigned long,double,double) + MAX_TYPE_3(unsigned short,double,double) + // and example where we can explicitly use three different types + // MAX_TYPE(::std::complex < int >, double, ::std::complex < double >) + + // macro below assumes that bigger type is the first one + // macro MAX_TYPE_2( argument_1_type, argument_2_type ) + // simulate that result_type = argument_1_type + #define MAX_TYPE_2(T1,T2) template <>\ + struct Max_type_private < T1, T2 >\ + { typedef T1 type; }; + + MAX_TYPE_2(double,::boost::int32_t) + MAX_TYPE_2(long,int) + MAX_TYPE_2(long,short) + MAX_TYPE_2(double,short) + MAX_TYPE_2(double,unsigned char) + MAX_TYPE_2(double,unsigned int) + MAX_TYPE_2(double,unsigned long) + MAX_TYPE_2(double,unsigned short) + + /** + * \class Max_type + * \brief Template that estimates maximal of the mathematical types. + * \param T_1 first type. + * \param T_2 second type. + * \return type e.g. typeid (typename Max_type ::type) == typeid (double), + * typeid (typename Max_type <::std::complex<::boost::int32_t>,double>::type) == typeid (::std::complex). + */ + template + < + typename T_1, + typename T_2 + > + class Max_type + { + private: + typedef typename ::boost::remove_all_extents < T_1 >::type T_1_t; + typedef typename ::boost::remove_all_extents < T_2 >::type T_2_t; + + public: + typedef typename Max_type_private < T_1_t, T_2_t >::type type; + }; + + //#undef MAX_TYPE_2 + //#undef MAX_TYPE_3 + +} // namespace operators +/*\@}*/ +#endif // MAX_TYPE_HPP_INCLUDED + diff --git a/src/third-party/knnl/neural_net_headers.hpp b/src/third-party/knnl/neural_net_headers.hpp new file mode 100755 index 00000000..5993c42a --- /dev/null +++ b/src/third-party/knnl/neural_net_headers.hpp @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Fri 12 May 2006 14:39:01 CEST + * Last modified: Sat 16 Dec 2006 16:06:28 CET + */ + +#ifndef NEURAL_NET_HEADERS_HPP_INCLUDED +#define NEURAL_NET_HEADERS_HPP_INCLUDED + +/** \mainpage Kohonen Neural Network Library + * + * \section intro_sec Introduction + * + * KNNL is header based library for developing Kohonen Neural Networks. + * + */ + + +/** + * \file neural_net_headers.hpp + * \brief All headers for kohonen neural network. + * \ingroup neural_net + */ + +#include "basic_neuron.hpp" +#include "euclidean_distance_function.hpp" +#include "functors.hpp" +#include "generalized_training_weight.hpp" +#include "kohonen_network.hpp" +#include "print_network.hpp" +#include "randomize_policy.hpp" +#include "ranges.hpp" +#include "rectangular_container.hpp" +#include "training_functional.hpp" +#include "weighted_euclidean_distance_function.hpp" +#include "wta_training_algorithm.hpp" +#include "wtm_topology.hpp" +#include "wtm_training_algorithm.hpp" + + +#endif // NEURAL_NET_HEADERS_HPP_INCLUDED + diff --git a/src/third-party/knnl/numeric_iterator.hpp b/src/third-party/knnl/numeric_iterator.hpp new file mode 100755 index 00000000..cb787c35 --- /dev/null +++ b/src/third-party/knnl/numeric_iterator.hpp @@ -0,0 +1,162 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Sun 18 Jun 2006 13:22:04 CEST + * Last modified: Sun 26 Nov 2006 08:54:24 CET + */ + +#ifndef NUMERIC_ITERATOR_HPP_INCLUDED +#define NUMERIC_ITERATOR_HPP_INCLUDED + +#include + +/** + * \file numeric_iterator.hpp + * \brief File contains template classes for preparing numeric iterators. + * \ingroup neural_net + */ + +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + + /** + * \class Numeric_iterator + * \brief Class that defines bahavior of the numeric iterator. + * \param Value_type is a type of value. + */ + template < typename Value_type > + struct Numeric_iterator + { + typedef Value_type value_type; + value_type state; + + /** + * Constructor. + * \param state_ is a state in the beginning of the work of iterator + */ + Numeric_iterator ( Value_type state_ ) + : state ( state_ ) + {} + }; + + /** + * \class Linear_numeric_iterator + * \brief Class that defines bahavior of the linear numeric iterator. + * It begins with given value and iterate using given step. + * \param Value_type is a type of value. + */ + template < typename Value_type > + class Linear_numeric_iterator + : public Numeric_iterator < Value_type > + { + public: + /** + * Constructor. + * \param state_ is a begin value. + * \param step_ is a step value. + */ + Linear_numeric_iterator ( + Value_type state_ = static_cast < Value_type > ( 0 ), + Value_type step_ = static_cast < Value_type > ( 1 ) + ) + : Numeric_iterator < Value_type > ( state_ ), step ( step_ ) + {} + + /** + * Reset state. + * \param state_ is a new state. + */ + void reset ( Value_type const & state_ = static_cast < Value_type > ( 0 ) ) + { + Numeric_iterator < Value_type >::state = state_; + return; + } + + /** + * Method returns state. + */ + inline Value_type operator() ( void ) const + { + return ( Numeric_iterator < Value_type >::state ); + } + + /** + * Preincrementation. + */ + inline Linear_numeric_iterator < Value_type > & + operator++() + { + Numeric_iterator < Value_type >::state += step; + return *this; + } + + /** + * Postincrementation. + */ + inline Linear_numeric_iterator < Value_type > + operator++ ( int ) + { + typedef Numeric_iterator < Value_type > Value_numeric_iterator; + Value_type tmp ( Value_numeric_iterator::state ); + Numeric_iterator < Value_type >::state += step; + return tmp; + } + + ///\todo TODO: try to prepare conversion on Value_type + /*inline const Value_type operator Value_type ( void ) const + { + return Numeric_iterator::state; + }*/ + + protected: + Value_type step; + }; + + typedef Linear_numeric_iterator < ::boost::int32_t > linear_numeric_iterator; + /*\@}*/ + +} // namespace neural_net + +#endif // NUMERIC_ITERATOR_HPP_INCLUDED + diff --git a/src/third-party/knnl/operators.hpp b/src/third-party/knnl/operators.hpp new file mode 100755 index 00000000..bbf198ff --- /dev/null +++ b/src/third-party/knnl/operators.hpp @@ -0,0 +1,440 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Tue 11 Apr 2006 17:47:44 CEST + * Last modified: Wed 08 Aug 2007 18:29:02 CEST + */ + +#ifndef OPERATORS_HPP_INCLUDED +#define OPERATORS_HPP_INCLUDED + +#include +#include +#include + +#include + +#include "max_type.hpp" + +/** + * \defgroup operators Operators + */ + +/** + * \file operators.hpp + * \brief File contains template operators. + * \ingroup operators + */ + +/** + * \namespace operators + * \brief Operators. + * \ingroup operators + */ + +/** \addtogroup operators */ +/*\@{*/ +namespace operators +{ + /** + * Absolute function. + * \param value is value. + * \return absolute value. + */ + template < typename T > + inline T abs ( T const & value ) + { + return ( value > 0 ? value : -value ); + } + + /** + * \class compose_f_gxy_gxy_t + * \brief Adaptator class compose_f_gxy_gxy_t. + * \param OP1 is a type of first operator f. + * \param OP2 is a type of second operator g. + * \f[ + * y=f (g (x,y),g (x,y)) + * \f] + */ + template < typename OP1, typename OP2 > + class compose_f_gxy_gxy_t + : public ::std::binary_function + < + typename OP2::first_argument_type, + typename OP2::second_argument_type, + typename OP1::result_type + > + { + public: + /** + * Constructor. + * \param o1 is a reference to the f operator. + * \param o2 is a reference to the g operator. + */ + compose_f_gxy_gxy_t + ( + OP1 const & o1, + OP2 const & o2 + ) + : op1 ( o1 ), op2 ( o2 ) + {} + + /** + * Function calculate results. + * \param x is first argument. + * \param y is second argument. + * \f[ + * y=f (g (x,y),g (x,y)) + * \f] + * where: f is OP1 type, g is OP2 type + */ + typename OP1::result_type + operator() + ( + typename OP2::first_argument_type const & x, + typename OP2::second_argument_type const & y + ) const + { + return op1 ( op2 ( x, y ),op2 ( x, y ) ); + } + + private: + /** First operator f. */ + OP1 op1; // calculate: op1 (op2 (x,y),op2 (x,y)) + + /** Secong operator g. */ + OP2 op2; + }; + + /** + * Useful function for creating adaptator compose_f_gxy_gxy. + * \param o1 is first operator. + * \param o2 is send operator. + * \return composition of the operators. + */ + template < class OP1, class OP2 > + inline compose_f_gxy_gxy_t < OP1, OP2 > + compose_f_gxy_gxy + ( + OP1 const & o1, + OP2 const & o2 + ) + { + return compose_f_gxy_gxy_t < OP1, OP2 > ( o1, o2 ); + } + + /** + * Overloading operator+ for containers. + * \param lhs is a reference to container x. + * \param rhs is a reference to container y. + * \return container. + * \f[ + * v_i = x_i + y_i + * \f] + * where: x is lhs and y is rhs. + */ + template + < + typename T, + template < typename > class Alloc_type, + template < typename, typename > class CONT + > + CONT < T, Alloc_type > + operator+ + ( + CONT < T, Alloc_type > const & lhs, + CONT < T, Alloc_type > const & rhs + ) + { + CONT < T, Alloc_type > result ( lhs ); + + ::std::transform + ( + result.begin(), + result.end(), + rhs.begin(), + result.begin(), + ::std::plus < typename CONT < T, Alloc_type >::value_type >() + ); + + return result; + } + + /** + * Overloading operator- for containers. + * \param lhs is a reference to container x. + * \param rhs is a reference to container y. + * \return container. + * \f[ + * v_i = x_i - y_i + * \f] + * where: x is lhs and y is rhs. + */ + template + < + typename T, + template < typename > class Alloc_type, + template < typename, typename > class CONT + > + CONT < T, Alloc_type > + operator- + ( + CONT < T, Alloc_type > const & lhs, + CONT < T, Alloc_type > const & rhs + ) + { + CONT < T , Alloc_type > result ( lhs ); + + ::std::transform + ( + result.begin(), + result.end(), + rhs.begin(), + result.begin(), + ::std::minus < typename CONT < T , Alloc_type >::value_type >() + ); + + return result; + } + + /** + * Overloading operator* for container as product of the scalar value and container. + * \param a is a reference to container x. + * \param rhs is a reference to container y. + * \return container. + * \f[ + * v_i = a * y_i + * \f] + * where: a is scaling coefficient and y is rhs. + */ + template + < + typename K, + typename T, + template < typename > class Alloc_type, + template < typename, typename > class CONT + > + CONT < T, Alloc_type > + operator* + ( + K const & a, + CONT < T, Alloc_type > const & rhs + ) + { + CONT < T , Alloc_type > result ( rhs ); + + ::std::transform + ( + result.begin(), + result.end(), + result.begin(), + ::std::bind2nd + ( + ::std::multiplies < typename CONT < T , Alloc_type >::value_type >(), + a + ) + ); + + return result; + } + + /** + * Template function calculates inverse of the value. + * It could be overloaded/specialized for matrix + * and other complicated types. + * \param x is a value to be inversed. + */ + template < typename Value_type > + inline typename Max_type < double, Value_type >::type + inverse ( Value_type const & x ) + { + typedef typename Max_type < double, Value_type >::type internal_type; + + return + ( + static_cast < internal_type > ( 1 ) + / static_cast < internal_type > ( x ) + ); + } + + /** + * \class power + * \brief Helper class for calculating power. + * \param T is value type. + * \param E is exponent type. + */ + template + < + typename T, + typename E, + bool ISINTEGRAL = ::boost::is_integral::value + > + class power; + + /** + * Specialization for the integral exponents. + * \param T is value type. + * \param E is exponent type. + * \f[ + * y=v^e + * \f] + */ + template < typename T, typename E > + class power < T, E, true > + { + public: + typedef typename Max_type < T, E >::type result_type; + + result_type operator() ( T const & value_, E const & exp_ ) const + { + if ( exp_ == 0 ) + { + return static_cast < result_type > ( 1 ); + } + + if ( exp_ < 0 ) + { + return power_int ( value_, -exp_ ); + } + else + { + return power_int ( value_, exp_ ); + } + } + + private: + /** + * Fast power algorithm. + * \param value_ value. + * \param exp_ exponent factor. + * \return value of power + * \f[ + * z=x^y + * \f] + * where: x is value_, y is exp_. + */ + result_type power_int ( T const & value_, E const & exp_ ) const + { + T z = value_; + result_type y; + E m = exp_; + + while ( ! ( m & 1 ) ) + { + m = m / 2; + z = z * z; + } + y = z; + + while ( m > 1 ) + { + m = m / 2; + z = z * z; + if ( m & 1 ) + { + y = y * z; + } + } + return y; + } + }; + + /** + * Specialization for the real exponents. + * \param T is value type. + * \param E is exponent type. + * \f[ + * y=v^e + * \f] + */ + template < typename T, typename E > + class power < T, E, false > + { + public: + typedef typename Max_type < T, E >::type result_type; + + /** + * Fast power algorithm. + * \param value_ value. + * \param exp_ exponent factor. + * \return value of power + * \f[ + * z=x^y + * \f] + * where: x is value_, y is exp_. + */ + result_type operator() ( T const & value_, E const & exp_ ) const + { + return ::std::pow ( static_cast < result_type > ( value_ ), exp_ ); + } + }; + + template < typename T, ::boost::int32_t N > + struct static_power_t; + + template < typename T > + struct static_power_t + { + T operator()(T const) + { + return static_cast(1); + } + }; + + template < typename T, ::boost::int32_t N > + struct static_power_t + { + T operator()( T const x ) + { + //static_power_t sp; + return x * static_power_t()(x); + } + }; + + template < typename T, ::boost::int32_t N > + T static_power ( T const x ) + { + return static_power_t()(x); + } + +} // namespace operators +/*\@}*/ +#endif // OPERATORS_HPP_INCLUDED + diff --git a/src/third-party/knnl/print_network.hpp b/src/third-party/knnl/print_network.hpp new file mode 100755 index 00000000..fb027251 --- /dev/null +++ b/src/third-party/knnl/print_network.hpp @@ -0,0 +1,156 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Fri 21 Apr 2006 19:30:09 CEST + * Last modified: Wed 08 Aug 2007 17:26:34 CEST + */ + +#ifndef PRINT_NETWORK_HPP_INCLUDED +#define PRINT_NETWORK_HPP_INCLUDED + +#include +#include +#include + +/** + * \file print_network.hpp + * \brief File contains template function to print network. + * \ingroup neural_net + */ + +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + + /** + * Function prints weight of the neural network. + * \param os is output stream. + * \param network is a reference to network. + * \return modified stream. + */ + template < typename T > + ::std::ostream & print_network_weights + ( ::std::ostream & os, T const & network, char const * sep = "\t" ) + { + const typename T::row_size_t M = network.objects.size(); + const typename T::col_size_t N = network.objects[0].size(); + + for ( typename T::row_size_t i = 0; i < M; ++i ) + { + for ( typename T::col_size_t j = 0; j < N; ++j ) + { + ::std::copy + ( + network.objects[i][j].weights.begin(), + network.objects[i][j].weights.end(), + ::std::ostream_iterator + < + typename T::value_type::weights_type::value_type + > ( os, sep ) + ); + os << ::std::endl; + } + } + return os; + } + + /** + * Function puts container of any values to the stream. + * \param os is a output stream. + * \param value is a value. + * \return modified stream. + */ + template < typename T > + inline ::std::ostream & container_to_ostream ( ::std::ostream & os, T const & container ) + { + typedef typename T::value_type Value; + ::std::copy ( container.begin(), container.end(), ::std::ostream_iterator < Value > ( os, " " ) ); + return os; + } + + /** + * Function prints structure and results of the neural network. + * \param os is output stream. + * \param network is a reference to network. + * \param value is a value that network will calculate results. + * \return modified stream. + */ + template < typename T, typename U > + ::std::ostream & print_network ( ::std::ostream & os, T const & network, U const & value ) + { + const typename T::row_size_t M = network.objects.size(); + const typename T::col_size_t N = network.objects[0].size(); + + for ( typename T::row_size_t i = 0; i < M; ++i ) + { + for ( typename T::col_size_t j = 0; j < N; ++j ) + { + os << "weights[" << i <<"][" << j << "] = "; + ::std::copy + ( + network.objects[i][j].weights.begin(), + network.objects[i][j].weights.end(), + ::std::ostream_iterator + < + typename T::value_type::weights_type::value_type + > ( os, "\t" ) + ); + os << " ( "; + + container_to_ostream ( os, value ); + + os << " ) == "; + //os << network.objects[i][j] ( value ); + //os << " == "; + os << network.objects [ i ][ j ]( value ); + os << ::std::endl; + } + os << ::std::endl; + } + return os; + } + /*\@}*/ +}// namespace neural_net + +#endif // PRINT_NETWORK_HPP_INCLUDED + diff --git a/src/third-party/knnl/randomize_policy.hpp b/src/third-party/knnl/randomize_policy.hpp new file mode 100755 index 00000000..80f473a5 --- /dev/null +++ b/src/third-party/knnl/randomize_policy.hpp @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Mon 22 May 2006 20:03:59 CEST + * Last modified: Wed 08 Aug 2007 17:27:14 CEST + */ + +#ifndef RANDOMIZE_POLICY_HPP_INCLUDED +#define RANDOMIZE_POLICY_HPP_INCLUDED + +#include +#include + +/** + * \file randomize_policy.hpp + * \brief File contains policy classes to set randomize functionality + * in to network generation process. + * \ingroup neural_net + */ + +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + class Randomize_policy + { + typedef Randomize_policy this_type; + }; + + /** + * \class External_randomize + * \brief This class force not to use srand() in generation proces, + * therefore srand function is initialized externally. + */ + struct External_randomize + : public Randomize_policy + { + typedef External_randomize this_type; + + /** Do nothing :-). */ + void operator() ( void ) const + { + return; + } + }; + + /** + * \class Internal_randomize + * \brief This class force to use srand() in generation proces, + * therefore srand function is NOT initialized. + */ + struct Internal_randomize + : public Randomize_policy + { + typedef Internal_randomize this_type; + + /** Initialize random number generator using srand(). */ + void operator() ( void ) const + { + ::std::srand (static_cast (::std::time (NULL))); + return; + } + }; + /*\@}*/ + +} // namespace neural_net + +#endif // RANDOMIZE_POLICY_HPP_INCLUDED + diff --git a/src/third-party/knnl/ranges.hpp b/src/third-party/knnl/ranges.hpp new file mode 100755 index 00000000..ce084f4c --- /dev/null +++ b/src/third-party/knnl/ranges.hpp @@ -0,0 +1,156 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Mon 24 Apr 2006 12:11:38 CEST + * Last modified: Wed 08 Aug 2007 17:27:38 CEST + */ + +#ifndef RANGES_HPP_INCLUDED +#define RANGES_HPP_INCLUDED + +#include +#include + +/** + * \file ranges.hpp + * \brief File contains template class Ranges. + * \ingroup neural_net + */ + +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + + /** + * \class Ranges + * \brief Class creates and claculates ranges of data. + * \param Container_type is a type of container. + */ + template < typename Container_type > + class Ranges + { + public: + /** + * Constructor. + * \param value_ is a value that will be set at he begining. + */ + explicit Ranges ( typename Container_type::value_type const & value_ ) + :ranges ( value_, value_ ) + {} + + /** Copy constructor. */ + template < typename Container_type_2 > + Ranges ( Ranges < Container_type_2 > const & ranges_ ) + : ranges ( ranges_.ranges ) + {} + + /** + * Function that is going through the all container. + * \param value is a reference to the container. + */ + void operator() ( Container_type const & value ) + { + typename Container_type::const_iterator pos; + + typename Container_type::value_type::const_iterator pos_range; + typename Container_type::value_type::iterator pos_min_range; + typename Container_type::value_type::iterator pos_max_range; + + // go through the all data in container and ... + for ( pos = value.begin(); pos != value.end(); ++pos ) + { + // look for the highest and lowest values to set ranges. + // iterate through position of the container and ranges type to compare + // proper values and set ranges. + for + ( + pos_min_range = ranges.first.begin(), + pos_max_range = ranges.second.begin(), + pos_range = pos->begin(); + pos_min_range != ranges.first.end(); + ++pos_min_range, ++pos_max_range, ++pos_range + ) + { + *pos_min_range = ::std::min ( *pos_min_range, *pos_range ); + *pos_max_range = ::std::max ( *pos_max_range, *pos_range ); + } + } + } + + /** + * Function returns supremum value of the data in the container. + * This value could not exests in container, because is created from + * all maximums of data e.g. { (1,2), (2,1) } -> (2,2) + */ + typename Container_type::value_type const & get_max() const + { + return ranges.second; + } + + /** + * Function returns infimum of the data in the container. + * This value could not exests in container, because is created from + * all minimums of data e.g. { (1,2), (2,1) } -> (1,1) + */ + typename Container_type::value_type const & get_min() const + { + return ranges.first; + } + + protected: + Ranges(); + + private: + ::std::pair + < + typename Container_type::value_type, + typename Container_type::value_type + > ranges; + + }; + /*\@}*/ + +} // namespace neural_net + +#endif // RANGES_HPP_INCLUDED + diff --git a/src/third-party/knnl/rectangular_container.hpp b/src/third-party/knnl/rectangular_container.hpp new file mode 100755 index 00000000..9edbd366 --- /dev/null +++ b/src/third-party/knnl/rectangular_container.hpp @@ -0,0 +1,146 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Fri 14 Apr 2006 22:37:57 CEST + * Last modified: Wed 08 Aug 2007 18:29:17 CEST + */ + +#ifndef RECTANGULAR_CONTAINER_HPP_INCLUDED +#define RECTANGULAR_CONTAINER_HPP_INCLUDED + +#include + +/** + * \file rectangular_container.hpp + * \brief File contains class Rectangular_container + * \ingroup neural_net + */ + +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + + /** + * Rectangular_grid_container template class. + * \param Object_type is type of stored objects. + * \todo TODO: Rectangular_container class should be rewritten + * using new version of ::boost::matrix. + */ + template + < + typename Object_type + > + class Rectangular_container + { + public: + + typedef Object_type value_type; + typedef typename ::std::vector < Object_type > column_type; + typedef typename ::std::vector < column_type > row_type; + + typedef typename row_type::iterator row_iterator; + typedef typename column_type::iterator column_iterator; + + typedef typename row_type::size_type row_size_t; + typedef typename column_type::size_type col_size_t; + + /** + * Stores size of container. + */ + typedef ::std::pair < row_size_t, col_size_t > Matrix_index; + + /** Objects. */ + row_type objects; + + /** + * Get object. + * \param i is the row number. + * \param j is the column number. + * \return const reference to the (i,j)-th object. + */ + Object_type const & operator() ( row_size_t i, col_size_t j ) + { + return objects[i][j]; + } + + /** + * Constructor. + */ + Rectangular_container() + {} + + /** Copy constructor. */ + template < typename Object_type_2 > + Rectangular_container + ( + Rectangular_container < Object_type_2 > const & rectangular_container + ) + : objects ( rectangular_container.objects ) + {} + + inline col_size_t get_no_columns() const + { + return objects.begin()->size(); + } + + inline row_size_t get_no_rows() const + { + return objects.size(); + } + + inline Matrix_index get_size() const + { + Matrix_index idx; + idx.first = objects.size(); + idx.second = objects.begin()->size(); + + return idx; + } + + }; + /*\@}*/ + +} // namespace neural_net + +#endif // RECTANGULAR_CONTAINER_HPP_INCLUDED + diff --git a/src/third-party/knnl/std_headers.hpp b/src/third-party/knnl/std_headers.hpp new file mode 100755 index 00000000..3c4f82b5 --- /dev/null +++ b/src/third-party/knnl/std_headers.hpp @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Fri 12 May 2006 14:39:01 CEST + * Last modified: Sun 18 Jun 2006 09:44:28 CEST + */ + +#ifndef STD_HEADERS_HPP_INCLUDED +#define STD_HEADERS_HPP_INCLUDED + +/** + * \file std_headers.hpp + * \brief Contains all important standard headers. + * \ingroup neural_net + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif // STD_HEADERS_HPP_INCLUDED + diff --git a/src/third-party/knnl/training_functional.hpp b/src/third-party/knnl/training_functional.hpp new file mode 100755 index 00000000..1bbca798 --- /dev/null +++ b/src/third-party/knnl/training_functional.hpp @@ -0,0 +1,357 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Wed 26 Apr 2006 14:55:28 CEST + * Last modified: Wed 08 Aug 2007 18:25:18 CEST + */ + +#ifndef TRAINING_FUNCTIONAL_HPP_INCLUDED +#define TRAINING_FUNCTIONAL_HPP_INCLUDED + +/** + * \file training_functional.hpp + * \brief File contains template classes that support + * training proces of the network. + * \ingroup neural_net + */ + +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + + /** + * \class Basic_training_functional + * \brief Basic trainng functional. + */ + class Basic_training_functional + {}; + + /** + * \class Basic_wta_training_functional + * \brief Class that is basic for Winner Takes All (WTA) algorithms. + * \param Value_type is a type of values. + * \param Parameters_type is a type of parameters of training functional. + */ + template + < + typename Value_type, + typename Parametres_type + > + class Basic_wta_training_functional + : public Basic_training_functional + { + public: + typedef Value_type value_type; + typedef Parametres_type parameters_type; + }; + + /** + * \class Basic_wtm_training_functional + * \brief Class that is basic for Winner Takes Most (WTM) algorithms. + * \param Value_type is a type of values. + * \param Parameters_type is a type of parameters of training functional. + * \param Iteration_type is a type of step counter value. + * \param Index_type is a type of index used in network. + * \param Topology_type is a type of topology that should be used + * for measuring distance in network. + */ + template + < + typename Value_type, + typename Parameters_type, + typename Iteration_type, + typename Index_type, + typename Topology_type + > + class Basic_wtm_training_functional + : public Basic_wta_training_functional + < Value_type, Parameters_type > + { + public: + typedef Iteration_type iteration_type; + typedef Index_type index_type; + typedef Topology_type topology_type; + }; + + /** + * \class Wta_proportional_training_functional + * \brief Class that certain kind of WTA algorithm. + * \param Value_type is a type of values. + * \param Parameters_type is a type of parameters of training functional. + * \param Iteration_type is a type of step counter value. + * Algorithm in the time of training for single data set could change + * weight in training function. + * \f[ + * w_{i,j} (t+1)=w_{i,j} (t) + ( p_0 + p_1 * s ) * ( x (t) - w_{i,j} (t) ) + * \f] + */ + template + < + typename Value_type, + typename Parameters_type, + typename Iteration_type + > + class Wta_proportional_training_functional + : public Basic_wta_training_functional + < + Value_type, + Parameters_type + > + { + public: + + typedef Iteration_type iteration_type; + + /** Shifting parameter for linear function */ + Parameters_type parameter_0; + + /** Scaling parameter for linear function */ + Parameters_type parameter_1; + + /** + * Constructor. + * \param parameter_0_ is a shifting parameter for linear function + * used for training. + * \param parameter_1_ is a scaling parameter for linear function + * used for training. + */ + Wta_proportional_training_functional + ( + Parameters_type const & parameter_0_, + Parameters_type const & parameter_1_ + ) + : parameter_0 ( parameter_0_ ), parameter_1 ( parameter_1_ ) + {} + + /** Copy constructor. */ + template + < + typename Value_type_2, + typename Parameters_type_2, + typename Iteration_type_2 + > + Wta_proportional_training_functional + ( + Wta_proportional_training_functional + < + Value_type_2, + Parameters_type_2, + Iteration_type_2 + > + const & training_functional_ + ) + : Basic_wta_training_functional < Value_type, Parameters_type >(), + parameter_0 ( training_functional_.parameter_0 ), + parameter_1 ( training_functional_.parameter_1 ) + {} + + /** + * Training function. + * \param weight is weight of the neuron. + * \param value is value that trains winner neuron. + * \param s is step number. + * \return modified weight. + * \f[ + * w_{i,j} (t+1)=w_{i,j} (t) + ( p_0 + p_1 * s ) * ( x (t) - w_{i,j} (t) ) + * \f] + * where: x is value, w is weight and s is step number. + */ + Value_type & operator() + ( + Value_type & weight, + Value_type const & value, + iteration_type const & s + ) const + { + using namespace ::operators; + return + ( + weight + = weight + + ( parameter_0 + parameter_1 * s ) + * ( value - weight ) + ); + } + }; + + /** + * \class Wtm_classical_training_functional + * \brief Class that is basic for Winner Takes Most (WTM) algorithms. + * \param Value_type is a type of values. + * \param Parameters_type is a type of parameters of training functional. + * \param Iteration_type is a type of step counter value. + * \param Index_type is a type of index used in network. + * \param Generalized_training_weight_type is a type of functor that will + * be used for set up training weight. + */ + template + < + typename Value_type, + typename Parameters_type, + typename Iteration_type, + typename Index_type, + typename Generalized_training_weight_type + > + class Wtm_classical_training_functional + : public Basic_wtm_training_functional + < + Value_type, + Parameters_type, + Iteration_type, + Index_type, + Generalized_training_weight_type + > + { + public: + + /** Final scaling of the function. */ + Parameters_type parameter; + + /** Functor calculates training weight. */ + Generalized_training_weight_type generalized_training_weight; + + /** + * Constructor. + * \param generalized_weight is a reference to the functor. + * \param parameter_ is a reference to scaling parameter. + */ + Wtm_classical_training_functional + ( + Generalized_training_weight_type const & generalized_weight, + Parameters_type const & parameter_ + ) + : Basic_wtm_training_functional + < + Value_type, + Parameters_type, + Iteration_type, + Index_type, + Generalized_training_weight_type + >(), + parameter ( parameter_ ), + generalized_training_weight ( generalized_weight ) + {} + + /** Copy constructor. */ + template + < + typename Value_type_2, + typename Parameters_type_2, + typename Iteration_type_2, + typename Index_type_2, + typename Generalized_training_weight_type_2 + > + Wtm_classical_training_functional + ( + const Wtm_classical_training_functional + < + Value_type_2, + Parameters_type_2, + Iteration_type_2, + Index_type_2, + Generalized_training_weight_type_2 + > + & training_functional_ + ) + : Basic_wtm_training_functional + < + Value_type, + Parameters_type, + Iteration_type, + Index_type, + Generalized_training_weight_type + >(), + parameter ( training_functional_.parameter ), + generalized_training_weight ( training_functional_.generalized_training_weight ) + {} + + /** + * Function calculates new value of the neuron weight. + * \param weight is a reference to the trained neuron weight. + * \param value is a reference to the value that trains neuron. + * \param s is step number. + * \param center_i is a first index of the central neuron (row number). + * \param center_j is a second index of the central neuron (column number). + * \param i_ is a first index of a trained neuron (row number). + * \param j_ is a second index of a trained neuron (column number). + * \return modified neuron weight. + * \f[ + * w_{i,j} (t+1) = w_{i,j} (t) + G ( w_{i,j} (t), x (t), s, c_i, c_j, i, j ) * ( x (t) - w_{i,j} (t) ) + * \f] + */ + Value_type & operator() + ( + Value_type & weight, + Value_type const & value, + Iteration_type const & s, + Index_type const & center_i, + Index_type const & center_j, + Index_type const & i_, + Index_type const & j_ + ) + { + using namespace ::operators; + + return + ( + weight + = weight + + parameter + * (generalized_training_weight) + ( + weight, + value, + s, + center_i, center_j, + i_, j_ + ) + * ( value - weight ) + ); + } + }; + /*\@}*/ + +} // namespace neural_net + +#endif // TRAINING_FUNCTIONAL_HPP_INCLUDED + diff --git a/src/third-party/knnl/value_type.hpp b/src/third-party/knnl/value_type.hpp new file mode 100755 index 00000000..d9949c6d --- /dev/null +++ b/src/third-party/knnl/value_type.hpp @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT megapolis DOT pl + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Thu 08 Jun 2006 18:12:00 CEST + * Last modified: Thu 08 Jun 2006 18:18:00 CEST + */ + +#ifndef VALUE_TYPE_HPP_INCLUDED +#define VALUE_TYPE_HPP_INCLUDED + +#include + +/** + * \file value_type.hpp + * \brief File contains template to recognize type of value. + * \ingroup operators + */ + +namespace operators +{ + /** + * \addtogroup operators + */ + /*\@{*/ + + template < typename T > + struct Value_type + { + typedef typename T::value_type type; + }; + + template <> + struct Value_type < double > + { + typedef double type; + }; + + template <> + struct Value_type < unsigned int > + { + typedef double type; + }; + + template <> + struct Value_type < ::boost::int32_t > + { + typedef double type; + }; + + template <> + struct Value_type < unsigned long > + { + typedef double type; + }; + + /*\@}*/ + +} // namespace operators + +#endif // VALUE_TYPE_HPP_INCLUDED + diff --git a/src/third-party/knnl/weighted_euclidean_distance_function.hpp b/src/third-party/knnl/weighted_euclidean_distance_function.hpp new file mode 100755 index 00000000..791d8d2d --- /dev/null +++ b/src/third-party/knnl/weighted_euclidean_distance_function.hpp @@ -0,0 +1,231 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Mon 17 Apr 2006 23:54:20 CEST + * Last modified: Sun 26 Nov 2006 09:33:07 CET + */ + +#ifndef WEIGHTED_EUCLIDEAN_DISTANCE_FUNCTION_HPP_INCLUDED +#define WEIGHTED_EUCLIDEAN_DISTANCE_FUNCTION_HPP_INCLUDED + +#include "operators.hpp" +#include "basic_weak_distance_function.hpp" +#include + +#include "value_type.hpp" + +/** + * \file weighted_euclidean_distance_function.hpp + * \brief File contains template class Weighted_euclidean_distance_function. + * \ingroup distance + */ + +namespace distance +{ + /** + * \addtogroup distance + */ + /*\@{*/ + + /** + * Weighted_euclidean_distance_function template class. + * \param Value_type is a type of values. + * \param Parameters_type is a type of parameters (weights) used in weighted Euclidean distance. + * \f[ + * d (x,y,w) = \sum\limits_{i=0}^{N} w_i\cdot (x_i-y_i)^2 + * \f] + */ + template + < + typename Parameters_type, + typename Value_type + > + class Weighted_euclidean_distance_function + : public Basic_weak_distance_function + < + Value_type, + Value_type + > + { + private: + typedef typename Value_type::value_type inner_type; + + /** Parameters. */ + Parameters_type const * parameters; + + /** Parameters size. */ + ::boost::int32_t parameters_size; + + public: + typedef Parameters_type parameters_type; + + /** + * Constructor. + */ + explicit Weighted_euclidean_distance_function ( Parameters_type const * weights ) + : parameters ( weights ) + { + assert ( parameters != static_cast < Parameters_type * > ( 0 ) ); + parameters_size = parameters->size(); + } + + /** + * Calculation function. + * \param x input value for the function. + * \param y input value for the function. + * \return square of the weighted Euclidean distance function. + * \f[ + * d (x,y,w) = \sum\limits_{i=0}^{N} w_i\cdot (x_i-y_i)^2 + * \f] + * where: w are parameters given in constructor. + */ + inner_type operator() + ( + Value_type const & x, + Value_type const & y + ) const + { + return + ( + weighted_euclidean_distance_square + ( + x.begin(), + x.end(), + y.begin(), + parameters->begin(), + static_cast < inner_type const & > (0) + ) + ); + } + + /** Copy constructor */ + template + < + typename Parameters_type_2, + typename Value_type_2 + > + Weighted_euclidean_distance_function + ( + Weighted_euclidean_distance_function + < + Parameters_type_2, + Value_type_2 + > + const & weighted_euclidean_distance + ) + : parameters ( weighted_euclidean_distance.parameters ) + {} + + /** Operator= */ + template + < + typename Parameters_type_2, + typename Value_type_2 + > + Weighted_euclidean_distance_function + < + Parameters_type, + Value_type + > & + operator= + ( + Weighted_euclidean_distance_function + < + Parameters_type_2, + Value_type_2 + > + const & weighted_euclidean_distance + ) + { + // Handle self-assignment: + if ( this == &weighted_euclidean_distance ) + { + return *this; + } + + parameters = weighted_euclidean_distance.parameters; + parameters_size = weighted_euclidean_distance.parameters_size; + + return *this; + } + + private: + /** + * Function calculates weighted Euclidean distance between two containers. + * \param begin_1 is a begin iterator for the first container. + * \param end_1 is an end iterator for the first container. + * \param begin_2 is a begin iterator for the second container. + * \param begin_3 is a bagin iterator for the parameters. + * \param init is an initial value. + * \result sqare of weighted Euclidean distance. + * \f[ + * d (x,y,w) = d_0 + \sum\limits_{i=0}^{N} w_i\cdot (x_i-y_i)^2 + * \f] + * where: x is given by range of Input_iterator_1, + * y is given through Input_iterator_2, + * w is given through Input_iterator_3, + * \f$d_0\f$ is initial value (init). + */ + inner_type weighted_euclidean_distance_square + ( + typename Value_type::const_iterator begin_1, + typename Value_type::const_iterator end_1, + typename Value_type::const_iterator begin_2, + typename Parameters_type::const_iterator begin_3, + inner_type const & init + ) const + { + inner_type tmp_val; + inner_type result = init; + + for ( ; begin_1 != end_1 ; ++begin_1, ++begin_2, ++begin_3 ) + { + tmp_val = *begin_1 - *begin_2; + result = result + *begin_3 * ( tmp_val * tmp_val ); + } + return result; + } + }; + /*\@}*/ + +} // namespace distance + +#endif // WEIGHTED_EUCLIDEAN_DISTANCE_FUNCTION_HPP_INCLUDED + diff --git a/src/third-party/knnl/wta_training_algorithm.hpp b/src/third-party/knnl/wta_training_algorithm.hpp new file mode 100755 index 00000000..ffe964ab --- /dev/null +++ b/src/third-party/knnl/wta_training_algorithm.hpp @@ -0,0 +1,278 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Fri 21 Apr 2006 17:33:34 CEST + * Last modified: Wed 08 Aug 2007 18:29:31 CEST + */ + +#ifndef WTA_TRAINING_ALGORITM_HPP_INCLUDED +#define WTA_TRAINING_ALGORITM_HPP_INCLUDED + +#include +#include +#include +#include + +#include + +#include "training_functional.hpp" +#include "numeric_iterator.hpp" + +/** + * \file wta_training_algorithm.hpp + * \brief File contains template class Wta_training_algoritm. + * \ingroup neural_net + */ + +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + + /** + * \class Wta_training_algorithm + * \brief Class contains functionality for training + * kohonen network using WTA method. + * \param Network_type is a network type. + * \param Value_type is a type os single data + * in mathematical meanning, so it could be ::std::vector, too. + * \param Data_iterator_type is is iterator for container + * with training data. + * \param Training_functional_type is a type of functional. + * \param Numeric_iterator_type is a type of numeric iterator. + */ + template + < + typename Network_type, + typename Value_type, + typename Data_iterator_type, + typename Training_functional_type, + typename Numeric_iterator_type + = Linear_numeric_iterator < + typename Training_functional_type::iteration_type + > + > + class Wta_training_algorithm + { + public: + + typedef typename Training_functional_type::iteration_type iteration_type; + typedef Numeric_iterator_type numeric_iterator_type; + typedef Network_type network_type; + typedef Value_type value_type; + typedef Data_iterator_type data_iterator_type; + typedef Training_functional_type training_functional_type; + + /** Training functional. */ + Training_functional_type training_functional; + + /** + * Constructor. + * \param training_functional_ is a training functor. + * \param numeric_iterator_ is a numeric iterator. + */ + Wta_training_algorithm + ( + Training_functional_type const & training_functional_, + Numeric_iterator_type numeric_iterator_ = linear_numeric_iterator() + ) + : training_functional ( training_functional_ ), + numeric_iterator ( numeric_iterator_ ) + { + network = static_cast < Network_type * > ( 0 ); + } + + /** + * Copy constructor. + * It makes flat copy of neural network, so it copies only pointer not structure. + */ + template + < + typename Network_type_2, + typename Value_type_2, + typename Data_iterator_type_2, + typename Training_functional_type_2, + typename Numeric_iterator_type_2 + > + Wta_training_algorithm + ( + Wta_training_algorithm + < + Network_type_2, + Value_type_2, + Data_iterator_type_2, + Training_functional_type_2, + Numeric_iterator_type_2 + > + const & wta_training_alg_ + ) + : training_functional ( wta_training_alg_.training_functional ), + numeric_iterator ( wta_training_alg_.numeric_iterator ), + iteration ( wta_training_alg_.iteration ) + { + network = wta_training_alg_.network; + } + + /** + * Function that starts training proces. + * \param network_ is a pointer to the existing kohonen neural network. + * \param data_begin is a begin iterator, it could be revers. + * \param data_end is end iterator. + * \return error code. + */ + ::boost::int32_t operator() + ( + Data_iterator_type data_begin, + Data_iterator_type data_end, + Network_type * network_ + ) + { + network = network_; + + // check if pointer is not null + assert ( network != static_cast < Network_type * > ( 0 ) ); + + // for each data train neural network + ::std::for_each + ( + data_begin, data_end, + ::boost::bind + ( + & Wta_training_algorithm + < + Network_type, + Value_type, + Data_iterator_type, + Training_functional_type, + Numeric_iterator_type + >::train, + this, + _1 + ) + ); + + return 0; + } + + protected: + /** Pointer to the network. */ + Network_type * network; + + iteration_type iteration; + + Numeric_iterator_type numeric_iterator; + + /** + * Function trains neural network using single value. + * \param value is a value. + * As is set in WTA algoritm method is looking for the best neuron, + * and train it to have better results with actual data in the future. + */ + void train ( Value_type const & value ) + { + typename Network_type::row_size_t index_1 = 0; + typename Network_type::col_size_t index_2 = 0; + + typename Network_type::value_type::result_type tmp_result; + + // reset max_result + typename Network_type::value_type::result_type max_result + = ::std::numeric_limits + < + typename Network_type::value_type::result_type + >::min(); + + typename Network_type::row_iterator r_iter; + typename Network_type::column_iterator c_iter; + + // set ranges for iteration procedure + typename Network_type::row_size_t r_counter = 0; + typename Network_type::col_size_t c_counter = 0; + + for ( r_iter = network->objects.begin(); + r_iter != network->objects.end(); + ++r_iter + ) + { + for ( c_iter = r_iter->begin(); + c_iter != r_iter->end(); + ++c_iter + ) + { + tmp_result = ( *c_iter ) ( value ); + if ( tmp_result > max_result ) + { + index_1 = r_counter; + index_2 = c_counter; + max_result = tmp_result; + } + ++c_counter; + } + ++r_counter; + c_counter = 0; + } + + r_iter = network->objects.begin(); + ::std::advance ( r_iter, index_1 ); + + c_iter = r_iter->begin(); + ::std::advance ( c_iter, index_2 ); + + // train the winning neuron + (training_functional) + ( + c_iter->weights, + value, + this->iteration + ); + + // increase iteration + ++numeric_iterator; + iteration = numeric_iterator(); + } + }; + /*\@}*/ + +} // namespace neural_net + +#endif // WTA_TRAINING_ALGORITM_HPP_INCLUDED + diff --git a/src/third-party/knnl/wtm_topology.hpp b/src/third-party/knnl/wtm_topology.hpp new file mode 100755 index 00000000..3fad0512 --- /dev/null +++ b/src/third-party/knnl/wtm_topology.hpp @@ -0,0 +1,288 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Wed 03 May 2006 13:18:41 CEST + * Last modified: Wed 08 Aug 2007 18:22:48 CEST + */ + +#ifndef WTM_TOPOLOGY_HPP_INCLUDED +#define WTM_TOPOLOGY_HPP_INCLUDED + +#include + +#include "operators.hpp" + +/** + * \file wtm_topology.hpp + * \brief File contains template classes for setting up topology in the network. + * \ingroup neural_net + */ +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + + /** + * \class Basic_topology + * \brief Basic class for topologies. + * \param Result_type type of result of the topology as a functor + * that calculates didtance between two points + * in particular case two neurons. + * \param Index_type is a type is index that is used in neural network. + */ + template + < + typename Result_type, + typename Index_type + > + class Basic_topology + { + public: + typedef Result_type result_type; + typedef Index_type value_type; + }; + + /** + * \class City_topology + * \brief Topology for neural network that calculates distance between two neurons. + * \param Index_type is a type of index. + * \f[ + * d (n,m) = |n_1-m_1| + |n_2-m_2| + * \f] + */ + template < typename Index_type > + class City_topology + : public Basic_topology < Index_type, Index_type > + { + public: + + /** + * Function claculates distance. + * \param index_1_1 is first index of first neuron. + * \param index_1_2 is second index of first neuron. + * \param index_2_1 is first index of second neuron. + * \param index_2_2 is second index of second neuron. + * \f[ + * d (n,m) = |n_1-m_1| + |n_2-m_2| + * \f] + * where: n is first neuron, m is second neuron. + */ + inline Index_type operator() + ( + Index_type const & index_1_1, + Index_type const & index_1_2, + Index_type const & index_2_1, + Index_type const & index_2_2 + ) const + { + return + ( + ::operators::abs ( index_1_1 - index_2_1 ) + + ::operators::abs ( index_1_2 - index_2_2 ) + ); + } + }; + + /** + * \class Max_topology + * \brief Topology for neural network that calculates distance between two neurons. + * \param Index_type is a type of index. + * \f[ + * d (n,m) = \max ( |n_1-m_1|, |n_2-m_2| ) + * \f] + */ + template < typename Index_type > + class Max_topology + : public Basic_topology < Index_type, Index_type > + { + public: + + /** + * Function claculates distance. + * \param index_1_1 is first index of first neuron. + * \param index_1_2 is second index of first neuron. + * \param index_2_1 is first index of second neuron. + * \param index_2_2 is second index of second neuron. + * \f[ + * d (n,m) = \max ( |n_1-m_1|, |n_2-m_2| ) + * \f] + * where: n is first neuron, m is second neuron. + */ + inline Index_type operator() + ( + Index_type const & index_1_1, + Index_type const & index_1_2, + Index_type const & index_2_1, + Index_type const & index_2_2 + ) const + { + return + ( + ::std::max + ( + ::operators::abs ( index_1_1 - index_2_1 ), + ::operators::abs ( index_1_2 - index_2_2 ) + ) + ); + } + }; + + /** + * \class Hexagonal_topology + * \brief Topology for neural network that calculates distance between two neurons. + * \param Index_type is a type of index. + * \f{eqnarray*} + * h_1 (x) & = & \frac{ x_1 + 1 }{2} + x_2\\ + * h_2 (x) & = & \frac{h_{off}}{2} + x_2 - x_1 / 2;\\ + * t_1 & = & \max ( h_1 (n), h_1 (m) ) - \min ( h_1 (n), h_1 (m) )\\ + * t_2 & = & \max ( h_2 (n), h_2 (m) ) - \min ( h_2 (n), h_2 (m) )\\ + * d (n,m) & = & \left\{ + * \begin{array}{ll} + * \max (|t_1|,|t_2|) & if \; sign \; of \; t_1 \; and \; t_2 \; is \; the \; same\\ + * |t_1|+|t_2| & otherwise + * \end{array} \right. + * \f} + */ + template < typename Index_type > + class Hexagonal_topology + : public Basic_topology < Index_type, Index_type > + { + public: + /** + * Constructor. + * \param hex_offset_ is an offset of the hexagonal topology. + * This value have to be not less than number of rows in neuron + * container counted from 0. + */ + inline explicit Hexagonal_topology ( Index_type const & hex_offset_ ) + : hex_offset ( hex_offset_ ) + {} + + /** Copy constructor. */ + template < typename Index_type_2 > + inline Hexagonal_topology ( Hexagonal_topology < Index_type_2 > const & hex_topology ) + : Basic_topology < Index_type_2, Index_type_2 >(), + hex_offset ( hex_topology.hex_offset ) + {} + + /** + * Function calculates distance. + * \param index_1_1 is first index of first neuron. + * \param index_1_2 is second index of first neuron. + * \param index_2_1 is first index of second neuron. + * \param index_2_2 is second index of second neuron. + * \f{eqnarray*} + * h_1 (x) & = & \frac{ x_1 + 1 }{2} + x_2\\ + * h_2 (x) & = & \frac{h_{off}}{2} + x_2 - x_1 / 2;\\ + * t_1 & = & \max ( h_1 (n), h_1 (m) ) - \min ( h_1 (n), h_1 (m) )\\ + * t_2 & = & \max ( h_2 (n), h_2 (m) ) - \min ( h_2 (n), h_2 (m) )\\ + * d (n,m) & = & \left\{ + * \begin{array}{ll} + * \max (|t_1|,|t_2|) & if \; sign \; of \; t_1 \; and \; t_2 \; is \; the \; same\\ + * |t_1|+|t_2| & otherwise + * \end{array} \right. + * \f} + * where: n is firs neuron, m is second. + */ + Index_type operator() + ( + Index_type const & index_1_1, + Index_type const & index_1_2, + Index_type const & index_2_1, + Index_type const & index_2_2 + ) const + { + Index_type hex_index_1_1; + Index_type hex_index_1_2; + Index_type hex_index_2_1; + Index_type hex_index_2_2; + + Index_type tmp_hex_index_1; + Index_type tmp_hex_index_2; + + // recalculate indexes to the better indexes used in hexagonal space + hex_index_1_1 = ( index_1_1 + 1 ) / 2 + index_1_2; + hex_index_1_2 = ( hex_offset / 2 + index_1_2 ) - index_1_1 / 2; + + hex_index_2_1 = ( index_2_1 + 1 ) / 2 + index_2_2; + hex_index_2_2 = ( hex_offset / 2 + index_2_2 ) - index_2_1 / 2; + + // calculate difference between points in hexagonal space + tmp_hex_index_1 = ::std::max ( hex_index_1_1, hex_index_2_1 ) + - ::std::min ( hex_index_1_1, hex_index_2_1 ); + tmp_hex_index_2 = ::std::max ( hex_index_1_2, hex_index_2_2 ) + - ::std::min ( hex_index_1_2, hex_index_2_2 ); + + // here we have special algebra to calculate distance, + // bacause of special basis in this space: + // ( 1, 1 ); ( -1, -1 ) have distance 1 the same as + // ( -1, 0 ); ( 0, -1 ); ( 1, 0 ); ( 0, 1 ). + if ( tmp_hex_index_1 == 0 && tmp_hex_index_2 == 0 ) + { + return static_cast < Index_type > ( 0 ); + } + + // check if values have the same direction if yes it means that we have to use + // reasoning based on assumption that ( -1, -1 ) and ( 1, 1 ) have distance 1. + if ( ( ( hex_index_1_1 > hex_index_2_1 ) && ( hex_index_1_2 > hex_index_2_2 ) ) + || ( ( hex_index_1_1 < hex_index_2_1 ) && ( hex_index_1_2 < hex_index_2_2 ) ) + ) + { + return ::std::max ( tmp_hex_index_1, tmp_hex_index_2 ); + } + else + { + return ::operators::abs ( tmp_hex_index_1 ) + ::operators::abs ( tmp_hex_index_2 ); + } + + return static_cast < Index_type > ( 0 ); + } + + protected: + Index_type hex_offset; + }; + /*\@}*/ + +} // namespace neural_net + +#endif // WTM_TOPOLOGY_HPP_INCLUDED + diff --git a/src/third-party/knnl/wtm_training_algorithm.hpp b/src/third-party/knnl/wtm_training_algorithm.hpp new file mode 100755 index 00000000..f98428e9 --- /dev/null +++ b/src/third-party/knnl/wtm_training_algorithm.hpp @@ -0,0 +1,293 @@ +/* + * Copyright (c) 2006, Seweryn Habdank-Wojewodzki + * Copyright (c) 2006, Janusz Rybarski + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS + * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * e-mail: habdank AT gmail DOT com + * e-mail: janusz.rybarski AT gmail DOT com + * + * File created: Tue 02 May 2006 11:39:22 CEST + * Last modified: Wed 08 Aug 2007 18:29:44 CEST + */ + +#ifndef WTM_TRAINING_ALGORITM_HPP_INCLUDED +#define WTM_TRAINING_ALGORITM_HPP_INCLUDED + +#include +#include +#include + +#include + +#include "training_functional.hpp" +#include "numeric_iterator.hpp" + +/** + * \file wtm_training_algorithm.hpp + * \brief File contains template class Wtm_training_algoritm. + * \ingroup neural_net + */ + +namespace neural_net +{ + /** + * \addtogroup neural_net + */ + /*\@{*/ + + /** + * \class Wtm_training_algorithm + * \brief Class contains functionality for training + * kohonen network using WTM method. + * \param Network_type is a network type. + * \param Value_type is a type os single data + * in mathematical meanning, so it could be ::std::vector, too. + * \param Data_iterator_type is is iterator for container + * with training data. + * \param Training_functional_type is a type of functional. + * \param Index_type is a type of index of neurons used in network. + */ + template + < + typename Network_type, + typename Value_type, + typename Data_iterator_type, + typename Training_functional_type, + typename Index_type, + typename Numeric_iterator_type + = Linear_numeric_iterator < + typename Training_functional_type::iteration_type + > + > + class Wtm_training_algorithm + { + public: + + typedef typename Training_functional_type::iteration_type iteration_type; + typedef Network_type network_type; + typedef Value_type value_type; + typedef Data_iterator_type data_iterator_type; + typedef Training_functional_type training_functional_type; + typedef Index_type index_type; + typedef Numeric_iterator_type numeric_iterator_type; + + /** Training functional. */ + Training_functional_type training_functional; + + /** + * Constructor. + * \param training_functional_ is a training functor. + * \param numeric_iterator_ is a numeric iterator. + */ + Wtm_training_algorithm + ( + Training_functional_type const & training_functional_, + Numeric_iterator_type numeric_iterator_ = linear_numeric_iterator() + ) + : training_functional ( training_functional_ ), + numeric_iterator ( numeric_iterator_ ) + { + network = static_cast < Network_type* > ( 0 ); + } + + /** + * Copy constructor. + * It makes flat copy of neural network, so it copies only pointer not structure. + */ + template + < + typename Network_type_2, + typename Value_type_2, + typename Data_iterator_type_2, + typename Training_functional_type_2, + typename Index_type_2, + typename Numeric_iterator_type_2 + > + inline Wtm_training_algorithm + ( + Wtm_training_algorithm + < + Network_type_2, + Value_type_2, + Data_iterator_type_2, + Training_functional_type_2, + Index_type_2, + Numeric_iterator_type_2 + > + const & wtm_training_alg_ + ) + : training_functional ( wtm_training_alg_.training_functional ), + numeric_iterator ( wtm_training_alg_.numeric_iterator ), + iteration ( wtm_training_alg_.iteration ) + { + network = wtm_training_alg_.network; + } + + /** + * Function that starts training proces. + * \param network_ is a pointer to the existing kohonen neural network. + * \param data_begin is a begin iterator, it could be revers. + * \param data_end is end iterator. + * \return error code. + */ + ::boost::int32_t operator() + ( + Data_iterator_type data_begin, + Data_iterator_type data_end, + Network_type * network_ + ) + { + network = network_; + + assert ( network != static_cast < Network_type * > ( 0 ) ); + + // for each data train network + ::std::for_each + ( + data_begin, data_end, + ::boost::bind + ( + & Wtm_training_algorithm + < + Network_type, + Value_type, + Data_iterator_type, + Training_functional_type, + Index_type, + Numeric_iterator_type + >::train, + this, + _1 + ) + ); + + return 0; + } + + protected: + /** Pointer to the network. */ + Network_type * network; + + iteration_type iteration; + + Numeric_iterator_type numeric_iterator; + + /** + * Function trains neural network using single value. + * \param value is a value. + * As is set in WTM algoritm method is looking for the best neuron, + * and train it to have better results with actual data in the future. + */ + void train ( Value_type const & value ) + { + Index_type index_1 = Index_type(); + Index_type index_2 = Index_type(); + + typename Network_type::value_type::result_type tmp_result; + + // reset max_result + typename Network_type::value_type::result_type max_result + = ::std::numeric_limits < + typename Network_type::value_type::result_type + >::min(); + + typename Network_type::row_iterator r_iter; + typename Network_type::column_iterator c_iter; + + // set ranges for iteration procedure + ::boost::int32_t r_counter = 0;//network->objects.size(); + ::boost::int32_t c_counter = 0;//network->objects[0].size(); + + for ( r_iter = network->objects.begin(); + r_iter != network->objects.end(); + ++r_iter + ) + { + for ( c_iter = r_iter->begin(); + c_iter != r_iter->end(); + ++c_iter + ) + { + tmp_result = ( *c_iter ) ( value ); + if ( tmp_result > max_result ) + { + index_1 = r_counter; + index_2 = c_counter; + max_result = tmp_result; + } + ++c_counter; + } + ++r_counter; + c_counter = 0; + } + + r_counter = 0; + c_counter = 0; + + // train all neurons in network with respect to the + // training functional + for ( r_iter = network->objects.begin(); + r_iter != network->objects.end(); + ++r_iter + ) + { + for ( c_iter = r_iter->begin(); + c_iter != r_iter->end(); + ++c_iter + ) + { + (training_functional) + ( + c_iter->weights, + value, + iteration, + index_1, index_2, r_counter, c_counter + ); + ++c_counter; + } + ++r_counter; + c_counter = 0; + } + + // increase iteration + ++numeric_iterator; + iteration = numeric_iterator(); + } + }; + /*\@}*/ +} // namespace neural_net + +#endif // WTM_TRAINING_ALGORITM_HPP_INCLUDED + From 7723d461a54bbd61d861fb748c7c73f92d6e19f6 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 15 Apr 2016 23:43:59 +0200 Subject: [PATCH 003/195] [DB] Some code refactoring --- TODO | 3 + src/Makefile.am | 6 +- src/database/DatabaseHandler.cpp | 2 + .../DatabaseUpdater.cpp | 139 ++++++++++-------- .../DatabaseUpdater.hpp | 47 ++++-- src/database/Track.hpp | 11 +- src/database/Types.hpp | 1 + src/main/main.cpp | 34 ++--- src/service/DatabaseUpdateService.cpp | 52 ------- src/service/DatabaseUpdateService.hpp | 55 ------- src/service/Service.hpp | 51 ------- src/service/ServiceManager.cpp | 84 ----------- src/service/ServiceManager.hpp | 77 ---------- src/ui/settings/Settings.cpp | 49 +++--- src/ui/settings/Settings.hpp | 5 - src/{database-updater => utils}/Checksum.cpp | 0 src/{database-updater => utils}/Checksum.hpp | 2 +- 17 files changed, 164 insertions(+), 454 deletions(-) rename src/{database-updater => database}/DatabaseUpdater.cpp (86%) rename src/{database-updater => database}/DatabaseUpdater.hpp (87%) delete mode 100644 src/service/DatabaseUpdateService.cpp delete mode 100644 src/service/DatabaseUpdateService.hpp delete mode 100644 src/service/Service.hpp delete mode 100644 src/service/ServiceManager.cpp delete mode 100644 src/service/ServiceManager.hpp rename src/{database-updater => utils}/Checksum.cpp (100%) rename src/{database-updater => utils}/Checksum.hpp (97%) diff --git a/TODO b/TODO index 55ea8b4e..1a37b681 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,9 @@ [Book] - Make the feature? +[Build] +- Makefile per directory. Use the include flags only where needed? + [Cover] - Handle preferred cover file names ("front.xxx", "cover.xxx", ...) - Implement a cache and a grabber from some web service (mandatory for artists?) diff --git a/src/Makefile.am b/src/Makefile.am index 18a8bcbc..22f5e246 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,6 +7,7 @@ lms_SOURCES = \ $(srcdir)/cover/CoverArtGrabber.cpp \ $(srcdir)/database/Artist.cpp \ $(srcdir)/database/DatabaseHandler.cpp \ + $(srcdir)/database/DatabaseUpdater.cpp \ $(srcdir)/database/MediaDirectory.cpp \ $(srcdir)/database/Playlist.cpp \ $(srcdir)/database/Release.cpp \ @@ -15,13 +16,9 @@ lms_SOURCES = \ $(srcdir)/database/Track.cpp \ $(srcdir)/database/User.cpp \ $(srcdir)/database/Video.cpp \ - $(srcdir)/database-updater/DatabaseUpdater.cpp \ - $(srcdir)/database-updater/Checksum.cpp \ $(srcdir)/image/Image.cpp \ $(srcdir)/logger/Logger.cpp \ $(srcdir)/metadata/AvFormat.cpp \ - $(srcdir)/service/ServiceManager.cpp \ - $(srcdir)/service/DatabaseUpdateService.cpp \ $(srcdir)/ui/LmsApplication.cpp \ $(srcdir)/ui/auth/LmsAuth.cpp \ $(srcdir)/ui/audio/AudioPlayer.cpp \ @@ -57,6 +54,7 @@ lms_SOURCES = \ $(srcdir)/ui/settings/SettingsMediaDirectoryFormView.cpp \ $(srcdir)/ui/settings/SettingsUserFormView.cpp \ $(srcdir)/ui/settings/SettingsUsers.cpp \ + $(srcdir)/utils/Checksum.cpp \ $(srcdir)/utils/Utils.cpp if VIDEO diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index b44588ea..1a6307dd 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -83,6 +83,8 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) _session.mapClass("artist"); _session.mapClass("genre"); _session.mapClass("track"); + _session.mapClass("classification"); + _session.mapClass("classification_data"); _session.mapClass("playlist"); _session.mapClass("playlist_entry"); _session.mapClass("release"); diff --git a/src/database-updater/DatabaseUpdater.cpp b/src/database/DatabaseUpdater.cpp similarity index 86% rename from src/database-updater/DatabaseUpdater.cpp rename to src/database/DatabaseUpdater.cpp index 872f8478..d1420d89 100644 --- a/src/database-updater/DatabaseUpdater.cpp +++ b/src/database/DatabaseUpdater.cpp @@ -17,19 +17,19 @@ * along with LMS. If not, see . */ +#include #include #include #include #include "logger/Logger.hpp" -#include "utils/Utils.hpp" - -#include "database/Types.hpp" - -#include "Checksum.hpp" -#include "DatabaseUpdater.hpp" #include "cover/CoverArtGrabber.hpp" +#include "utils/Utils.hpp" +#include "utils/Checksum.hpp" + +#include "Types.hpp" +#include "DatabaseUpdater.hpp" namespace { @@ -115,23 +115,40 @@ isPathInParentPath(const boost::filesystem::path& path, const boost::filesystem: } // namespace -namespace DatabaseUpdater { +namespace Database { -using namespace Database; +Updater& Updater::instance(void) +{ + static Updater updater; + return updater; +} - -Updater::Updater(Wt::Dbo::SqlConnectionPool &connectionPool, MetaData::Parser& parser) +Updater::Updater() : _running(false), -_scheduleTimer(_ioService), -_db(connectionPool), -_metadataParser(parser) +_scheduleTimer(_ioService) { _ioService.setThreadCount(1); } +void +Updater::setConnectionPool(Wt::Dbo::SqlConnectionPool& connectionPool) +{ + _db = new Database::Handler(connectionPool); +} + +void +Updater::restart(void) +{ + stop(); + start(); +} + void Updater::start(void) { + if (_db == nullptr) + throw std::logic_error("uninitialized db!"); + _running = true; // post some jobs in the io_service @@ -154,9 +171,9 @@ Updater::stop(void) void Updater::processNextJob(void) { - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(_db->getSession()); - MediaDirectorySettings::pointer settings = MediaDirectorySettings::get(_db.getSession()); + MediaDirectorySettings::pointer settings = MediaDirectorySettings::get(_db->getSession()); if (settings->getManualScanRequested()) { LMS_LOG(DBUPDATER, INFO) << "Manual scan requested!"; @@ -229,9 +246,9 @@ Updater::process(boost::system::error_code err) std::vector rootDirectories; { - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(_db->getSession()); - for (MediaDirectory::pointer directory : MediaDirectory::getAll(_db.getSession())) + for (MediaDirectory::pointer directory : MediaDirectory::getAll(_db->getSession())) rootDirectories.push_back( RootDirectory( directory->getType(), directory->getPath() )); } @@ -253,9 +270,9 @@ Updater::process(boost::system::error_code err) // Update database stats boost::posix_time::ptime now = boost::posix_time::second_clock::local_time(); { - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(_db->getSession()); - Database::MediaDirectorySettings::pointer settings = Database::MediaDirectorySettings::get(_db.getSession()); + Database::MediaDirectorySettings::pointer settings = Database::MediaDirectorySettings::get(_db->getSession()); if (stats.nbChanges() > 0) settings.modify()->setLastUpdate(now); @@ -279,10 +296,10 @@ Updater::process(boost::system::error_code err) void Updater::updateFileExtensions() { - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(_db->getSession()); - _audioFileExtensions = MediaDirectorySettings::get(_db.getSession())->getAudioFileExtensions(); - _videoFileExtensions = MediaDirectorySettings::get(_db.getSession())->getVideoFileExtensions(); + _audioFileExtensions = MediaDirectorySettings::get(_db->getSession())->getAudioFileExtensions(); + _videoFileExtensions = MediaDirectorySettings::get(_db->getSession())->getVideoFileExtensions(); } Artist::pointer @@ -293,9 +310,9 @@ Updater::getArtist( const boost::filesystem::path& file, const std::string& name // First try to get by MBID if (!mbid.empty()) { - artist = Artist::getByMBID( _db.getSession(), mbid ); + artist = Artist::getByMBID( _db->getSession(), mbid ); if (!artist) - artist = Artist::create( _db.getSession(), name, mbid); + artist = Artist::create( _db->getSession(), name, mbid); return artist; } @@ -303,7 +320,7 @@ Updater::getArtist( const boost::filesystem::path& file, const std::string& name // Fall back on artist name (collisions may occur) if (!name.empty()) { - for (Artist::pointer sameNamedArtist : Artist::getByName( _db.getSession(), name )) + for (Artist::pointer sameNamedArtist : Artist::getByName( _db->getSession(), name )) { if (sameNamedArtist->getMBID().empty()) { @@ -314,12 +331,12 @@ Updater::getArtist( const boost::filesystem::path& file, const std::string& name // No Artist found with the same name and without MBID -> creating if (!artist) - artist = Artist::create( _db.getSession(), name); + artist = Artist::create( _db->getSession(), name); return artist; } - return Artist::getNone( _db.getSession() ); + return Artist::getNone( _db->getSession() ); } Release::pointer @@ -330,9 +347,9 @@ Updater::getRelease( const boost::filesystem::path& file, const std::string& nam // First try to get by MBID if (!mbid.empty()) { - release = Release::getByMBID( _db.getSession(), mbid ); + release = Release::getByMBID( _db->getSession(), mbid ); if (!release) - release = Release::create( _db.getSession(), name, mbid); + release = Release::create( _db->getSession(), name, mbid); return release; } @@ -340,7 +357,7 @@ Updater::getRelease( const boost::filesystem::path& file, const std::string& nam // Fall back on release name (collisions may occur) if (!name.empty()) { - for (Release::pointer sameNamedRelease : Release::getByName( _db.getSession(), name )) + for (Release::pointer sameNamedRelease : Release::getByName( _db->getSession(), name )) { if (sameNamedRelease->getMBID().empty()) { @@ -351,12 +368,12 @@ Updater::getRelease( const boost::filesystem::path& file, const std::string& nam // No release found with the same name and without MBID -> creating if (!release) - release = Release::create( _db.getSession(), name); + release = Release::create( _db->getSession(), name); return release; } - return Release::getNone( _db.getSession() ); + return Release::getNone( _db->getSession() ); } std::vector @@ -366,15 +383,15 @@ Updater::getGenres( const std::list& names) for (const std::string& name : names) { - Genre::pointer genre ( Genre::getByName(_db.getSession(), name) ); + Genre::pointer genre ( Genre::getByName(_db->getSession(), name) ); if (!genre) - genre = Genre::create(_db.getSession(), name); + genre = Genre::create(_db->getSession(), name); genres.push_back( genre ); } if (genres.empty()) - genres.push_back( Genre::getNone( _db.getSession() )); + genres.push_back( Genre::getNone( _db->getSession() )); return genres; } @@ -386,9 +403,9 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) // Skip file if last write is the same { - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(_db->getSession()); - Wt::Dbo::ptr track = Track::getByPath(_db.getSession(), file); + Wt::Dbo::ptr track = Track::getByPath(_db->getSession(), file); if (track && track->getLastWriteTime() == lastWriteTime) { @@ -412,9 +429,9 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) std::vector checksum ; computeCrc(file, checksum); - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(_db->getSession()); - Wt::Dbo::ptr track = Track::getByPath(_db.getSession(), file); + Wt::Dbo::ptr track = Track::getByPath(_db->getSession(), file); // We estimate this is a audio file if: // - we found a least one audio stream @@ -510,7 +527,7 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) if (!track) { // Create a new song - track = Track::create(_db.getSession(), file); + track = Track::create(_db->getSession(), file); LMS_LOG(DBUPDATER, INFO) << "Adding '" << file << "'"; stats.nbAdded++; } @@ -675,8 +692,8 @@ Updater::checkAudioFiles( Stats& stats ) { LMS_LOG(DBUPDATER, INFO) << "Checking audio files..."; - std::vector trackPaths = Track::getAllPaths(_db.getSession());; - std::vector rootDirs = getRootDirectoriesByType(_db.getSession(), Database::MediaDirectory::Audio); + std::vector trackPaths = Track::getAllPaths(_db->getSession());; + std::vector rootDirs = getRootDirectoriesByType(_db->getSession(), Database::MediaDirectory::Audio); LMS_LOG(DBUPDATER, DEBUG) << "Checking tracks..."; for (auto& trackPath : trackPaths) @@ -686,9 +703,9 @@ Updater::checkAudioFiles( Stats& stats ) if (!checkFile(trackPath, rootDirs, _audioFileExtensions)) { - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(_db->getSession()); - Track::pointer track = Track::getByPath(_db.getSession(), trackPath); + Track::pointer track = Track::getByPath(_db->getSession(), trackPath); if (track) { track.remove(); @@ -699,10 +716,10 @@ Updater::checkAudioFiles( Stats& stats ) LMS_LOG(DBUPDATER, DEBUG) << "Checking Genres..."; { - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(_db->getSession()); // Now process orphan Genre (no track) - auto genres = Genre::getAll(_db.getSession()); + auto genres = Genre::getAll(_db->getSession()); for (auto genre : genres) { if (genre->getTracks().size() == 0) @@ -715,9 +732,9 @@ Updater::checkAudioFiles( Stats& stats ) LMS_LOG(DBUPDATER, DEBUG) << "Checking artists..."; { - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(_db->getSession()); - auto artists = Artist::getAllOrphans(_db.getSession()); + auto artists = Artist::getAllOrphans(_db->getSession()); for (auto artist : artists) { LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan artist '" << artist->getName() << "'"; @@ -727,9 +744,9 @@ Updater::checkAudioFiles( Stats& stats ) LMS_LOG(DBUPDATER, DEBUG) << "Checking releases..."; { - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(_db->getSession()); - auto releases = Release::getAllOrphans(_db.getSession()); + auto releases = Release::getAllOrphans(_db->getSession()); for (auto release : releases) { LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan release '" << release->getName() << "'"; @@ -745,15 +762,15 @@ Updater::checkDuplicatedAudioFiles(Stats& stats) { LMS_LOG(DBUPDATER, INFO) << "Checking duplicated audio files"; - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(_db->getSession()); - std::vector tracks = Database::Track::getMBIDDuplicates(_db.getSession()); + std::vector tracks = Database::Track::getMBIDDuplicates(_db->getSession()); for (Track::pointer track : tracks) { LMS_LOG(DBUPDATER, INFO) << "Found duplicated MBID [" << track->getMBID() << "], file: " << track->getPath() << " - " << track->getArtist()->getName() << " - " << track->getName(); } - tracks = Database::Track::getChecksumDuplicates(_db.getSession()); + tracks = Database::Track::getChecksumDuplicates(_db->getSession()); for (Track::pointer track : tracks) { LMS_LOG(DBUPDATER, INFO) << "Found duplicated checksum [" << bufferToString(track->getChecksum()) << "], file: " << track->getPath() << " - " << track->getArtist()->getName() << " - " << track->getName(); @@ -766,8 +783,8 @@ Updater::checkDuplicatedAudioFiles(Stats& stats) void Updater::checkVideoFiles( Stats& stats ) { - std::vector rootDirs = getRootDirectoriesByType(_db.getSession(), Database::MediaDirectory::Video); - std::vector videoPaths = Video::getAllPaths(_db.getSession()); + std::vector rootDirs = getRootDirectoriesByType(_db->getSession(), Database::MediaDirectory::Video); + std::vector videoPaths = Video::getAllPaths(_db->getSession()); LMS_LOG(DBUPDATER, DEBUG) << "Checking videos..."; for (auto& videoPath : videoPaths) @@ -777,9 +794,9 @@ Updater::checkVideoFiles( Stats& stats ) if (!checkFile(videoPath, rootDirs, _videoFileExtensions)) { - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(_db->getSession()); - Video::pointer video = Video::getByPath(_db.getSession(), videoPath); + Video::pointer video = Video::getByPath(_db->getSession(), videoPath); if (video) { video.remove(); @@ -797,10 +814,10 @@ Updater::processVideoFile( const boost::filesystem::path& file, Stats& stats) // Check last update time boost::posix_time::ptime lastWriteTime (boost::posix_time::from_time_t( boost::filesystem::last_write_time( file ) ) ); - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(_db->getSession()); // Skip file if last write is the same - Wt::Dbo::ptr
+
+ +
+ ${tags-highlevel-acousticbrainz} +
+
+ ${tags-highlevel-acousticbrainz-info} +
+
+ +
+ +
+ ${tags-similarity-acousticbrainz} +
+
+ ${tags-similarity-acousticbrainz-info} +
+
+
${apply-button} ${discard-button} ${immediate-scan-button} diff --git a/conf/lms.conf b/conf/lms.conf index bc42e092..b482a6f1 100644 --- a/conf/lms.conf +++ b/conf/lms.conf @@ -4,10 +4,11 @@ # Must have write privileges in order to create and modify the file db-path = "/storage/emeric/lms/lms.dev.db"; -# Listen port of the web server -listen-port = 5082; +# Cache directory for downloaded contents +cache-dir-path = "/var/lms/cache"; -# Listen address of the web server +# Listen port/addr of the web server +listen-port = 5082; listen-addr = "0.0.0.0"; # If enabled, these files have to exist and have correct permissions @@ -23,16 +24,3 @@ approot = "/usr/share/lms/approot"; # Path to the wt_config.xml file wt-config = "/etc/wt/wt_config.xml"; -# -- Settings to be moved in the web interface -- - -features-dir-path = "/var/lms/features/"; - -# Create tags from genres in metadata -# tag-genres = true; - -# Create tags from the high level data on AcousticBrainz -tag-highlevel-acousticbrainz = true; - -# Create similarity tags from the low level data on AcousticBrainz -tag-similarity-acousticbrainz = true; - diff --git a/src/database/DatabaseClassifier.cpp b/src/database/DatabaseClassifier.cpp index 45b8cb98..5aff1b00 100644 --- a/src/database/DatabaseClassifier.cpp +++ b/src/database/DatabaseClassifier.cpp @@ -42,7 +42,7 @@ Classifier::processTrackUpdate(bool added, Track::id_type trackId, std::string m if (mbid.empty()) { // TODO compute from file - LMS_LOG(CLASSIFICATION, INFO) << "File '" << path << "' has no MBID: skipping feature extraction"; + LMS_LOG(DBUPDATER, INFO) << "File '" << path << "' has no MBID: skipping feature extraction"; return; } @@ -332,7 +332,7 @@ static std::vector features = { "lowlevel.spectral_centroid.mean", 1, 1.0 }, // { "lowlevel.spectral_centroid.median", 1, 1.0 }, // { "lowlevel.spectral_centroid.min", 1, 1.0 }, -// { "lowlevel.spectral_centroid.var", 1, 1.0 }, + { "lowlevel.spectral_centroid.var", 1, 1.0 }, // { "lowlevel.spectral_complexity.dmean", 1, 1.0 }, // { "lowlevel.spectral_complexity.dmean2", 1, 1.0 }, // { "lowlevel.spectral_complexity.dvar", 1, 1.0 }, @@ -341,7 +341,7 @@ static std::vector features = { "lowlevel.spectral_complexity.mean", 1, 1.0 }, // { "lowlevel.spectral_complexity.median", 1, 1.0 }, // { "lowlevel.spectral_complexity.min", 1, 1.0 }, -// { "lowlevel.spectral_complexity.var", 1, 1.0 }, + { "lowlevel.spectral_complexity.var", 1, 1.0 }, // { "lowlevel.spectral_decrease.dmean", 1, 1.0 }, // { "lowlevel.spectral_decrease.dmean2", 1, 1.0 }, // { "lowlevel.spectral_decrease.dvar", 1, 1.0 }, @@ -350,7 +350,7 @@ static std::vector features = { "lowlevel.spectral_decrease.mean", 1, 1.0 }, // { "lowlevel.spectral_decrease.median", 1, 1.0 }, // { "lowlevel.spectral_decrease.min", 1, 1.0 }, -// { "lowlevel.spectral_decrease.var", 1, 1.0 }, + { "lowlevel.spectral_decrease.var", 1, 1.0 }, // { "lowlevel.spectral_energy.dmean", 1, 1.0 }, // { "lowlevel.spectral_energy.dmean2", 1, 1.0 }, // { "lowlevel.spectral_energy.dvar", 1, 1.0 }, @@ -359,7 +359,7 @@ static std::vector features = { "lowlevel.spectral_energy.mean", 1, 1.0 }, // { "lowlevel.spectral_energy.median", 1, 1.0 }, // { "lowlevel.spectral_energy.min", 1, 1.0 }, -// { "lowlevel.spectral_energy.var", 1, 1.0 }, + { "lowlevel.spectral_energy.var", 1, 1.0 }, // { "lowlevel.spectral_energyband_low.dmean", 1, 1.0 }, // { "lowlevel.spectral_energyband_low.dmean2", 1, 1.0 }, // { "lowlevel.spectral_energyband_low.dvar", 1, 1.0 }, @@ -368,7 +368,7 @@ static std::vector features = { "lowlevel.spectral_energyband_low.mean", 1, 1.0 }, // { "lowlevel.spectral_energyband_low.median", 1, 1.0 }, // { "lowlevel.spectral_energyband_low.min", 1, 1.0 }, -// { "lowlevel.spectral_energyband_low.var", 1, 1.0 }, + { "lowlevel.spectral_energyband_low.var", 1, 1.0 }, // { "lowlevel.spectral_energyband_middle_high.dmean", 1, 1.0 }, // { "lowlevel.spectral_energyband_middle_high.dmean2", 1, 1.0 }, // { "lowlevel.spectral_energyband_middle_high.dvar", 1, 1.0 }, @@ -377,7 +377,7 @@ static std::vector features = { "lowlevel.spectral_energyband_middle_high.mean", 1, 1.0 }, // { "lowlevel.spectral_energyband_middle_high.median", 1, 1.0 }, // { "lowlevel.spectral_energyband_middle_high.min", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_high.var", 1, 1.0 }, + { "lowlevel.spectral_energyband_middle_high.var", 1, 1.0 }, // { "lowlevel.spectral_energyband_middle_low.dmean", 1, 1.0 }, // { "lowlevel.spectral_energyband_middle_low.dmean2", 1, 1.0 }, // { "lowlevel.spectral_energyband_middle_low.dvar", 1, 1.0 }, @@ -386,7 +386,7 @@ static std::vector features = { "lowlevel.spectral_energyband_middle_low.mean", 1, 1.0 }, // { "lowlevel.spectral_energyband_middle_low.median", 1, 1.0 }, // { "lowlevel.spectral_energyband_middle_low.min", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_low.var", 1, 1.0 }, + { "lowlevel.spectral_energyband_middle_low.var", 1, 1.0 }, // { "lowlevel.spectral_entropy.dmean", 1, 1.0 }, // { "lowlevel.spectral_entropy.dmean2", 1, 1.0 }, // { "lowlevel.spectral_entropy.dvar", 1, 1.0 }, @@ -395,7 +395,7 @@ static std::vector features = { "lowlevel.spectral_entropy.mean", 1, 1.0 }, // { "lowlevel.spectral_entropy.median", 1, 1.0 }, // { "lowlevel.spectral_entropy.min", 1, 1.0 }, -// { "lowlevel.spectral_entropy.var", 1, 1.0 }, + { "lowlevel.spectral_entropy.var", 1, 1.0 }, // { "lowlevel.spectral_flux.dmean", 1, 1.0 }, // { "lowlevel.spectral_flux.dmean2", 1, 1.0 }, // { "lowlevel.spectral_flux.dvar", 1, 1.0 }, @@ -422,7 +422,7 @@ static std::vector features = { "lowlevel.spectral_rms.mean", 1, 1.0 }, // { "lowlevel.spectral_rms.median", 1, 1.0 }, // { "lowlevel.spectral_rms.min", 1, 1.0 }, -// { "lowlevel.spectral_rms.var", 1, 1.0 }, + { "lowlevel.spectral_rms.var", 1, 1.0 }, // { "lowlevel.spectral_rolloff.dmean", 1, 1.0 }, // { "lowlevel.spectral_rolloff.dmean2", 1, 1.0 }, // { "lowlevel.spectral_rolloff.dvar", 1, 1.0 }, @@ -449,7 +449,7 @@ static std::vector features = { "lowlevel.spectral_spread.mean", 1, 1.0 }, // { "lowlevel.spectral_spread.median", 1, 1.0 }, // { "lowlevel.spectral_spread.min", 1, 1.0 }, -// { "lowlevel.spectral_spread.var", 1, 1.0 }, + { "lowlevel.spectral_spread.var", 1, 1.0 }, // { "lowlevel.spectral_strongpeak.dmean", 1, 1.0 }, // { "lowlevel.spectral_strongpeak.dmean2", 1, 1.0 }, // { "lowlevel.spectral_strongpeak.dvar", 1, 1.0 }, @@ -458,7 +458,7 @@ static std::vector features = { "lowlevel.spectral_strongpeak.mean", 1, 1.0 }, // { "lowlevel.spectral_strongpeak.median", 1, 1.0 }, // { "lowlevel.spectral_strongpeak.min", 1, 1.0 }, -// { "lowlevel.spectral_strongpeak.var", 1, 1.0 }, + { "lowlevel.spectral_strongpeak.var", 1, 1.0 }, // { "lowlevel.zerocrossingrate.dmean", 1, 1.0 }, // { "lowlevel.zerocrossingrate.dmean2", 1, 1.0 }, // { "lowlevel.zerocrossingrate.dvar", 1, 1.0 }, @@ -467,7 +467,7 @@ static std::vector features = { "lowlevel.zerocrossingrate.mean", 1, 1.0 }, // { "lowlevel.zerocrossingrate.median", 1, 1.0 }, // { "lowlevel.zerocrossingrate.min", 1, 1.0 }, -// { "lowlevel.zerocrossingrate.var", 1, 1.0 }, + { "lowlevel.zerocrossingrate.var", 1, 1.0 }, // { "rhythm.beats_count", 1, 1.0 }, // { "rhythm.beats_loudness.dmean", 1, 1.0 }, // { "rhythm.beats_loudness.dmean2", 1, 1.0 }, @@ -477,7 +477,7 @@ static std::vector features = { "rhythm.beats_loudness.mean", 1, 1.0 }, // { "rhythm.beats_loudness.median", 1, 1.0 }, // { "rhythm.beats_loudness.min", 1, 1.0 }, -// { "rhythm.beats_loudness.var", 1, 1.0 }, + { "rhythm.beats_loudness.var", 1, 1.0 }, // { "rhythm.bpm", 1, 1.0 }, // { "rhythm.bpm_histogram_first_peak_bpm.dmean", 1, 1.0 }, // { "rhythm.bpm_histogram_first_peak_bpm.dmean2", 1, 1.0 }, @@ -664,12 +664,7 @@ Classifier::processDatabaseUpdate(Updater::Stats stats) LMS_LOG(DBUPDATER, DEBUG) << "Getting track ids"; - std::vector trackIdsAll; - { - Wt::Dbo::Transaction transaction(_db.getSession()); - - trackIdsAll = Database::Track::getAllIds(_db.getSession()); - } + std::vector trackIdsAll = Database::Track::getAllIds(_db.getSession()); ::std::random_shuffle ( trackIdsAll.begin(), trackIdsAll.end() ); diff --git a/src/database/DatabaseFeatureExtractor.cpp b/src/database/DatabaseFeatureExtractor.cpp index 35574170..c4239b39 100644 --- a/src/database/DatabaseFeatureExtractor.cpp +++ b/src/database/DatabaseFeatureExtractor.cpp @@ -17,12 +17,12 @@ * along with LMS. If not, see . */ -#include "config/Config.hpp" #include "logger/Logger.hpp" #include "feature/FeatureExtractor.hpp" #include "feature/FeatureStore.hpp" +#include "Setting.hpp" #include "DatabaseFeatureExtractor.hpp" namespace Database { @@ -37,8 +37,8 @@ static std::string getMBID(Track::id_type trackId) void FeatureExtractor::processDatabaseUpdate(Updater::Stats stats) { - bool fetchHighLevel = Config::instance().getBool("tag-highlevel-acousticbrainz", false); - bool fetchLowLevel = Config::instance().getBool("tag-similarity-acousticbrainz", false); + bool fetchHighLevel = Setting::getBool(UpdaterDboSession(), "tags_highlevel_acousticbrainz"); + bool fetchLowLevel = Setting::getBool(UpdaterDboSession(), "tags_similarity_acousticbrainz"); if (!fetchHighLevel && !fetchLowLevel) { diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index e6caf88f..270e4fe1 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -28,6 +28,8 @@ #include #include +#include "Setting.hpp" + #include "logger/Logger.hpp" #include "DatabaseHandler.hpp" @@ -79,7 +81,6 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) { _session.setConnectionPool(connectionPool); - _session.mapClass("artist"); _session.mapClass("cluster"); _session.mapClass("track"); @@ -99,11 +100,6 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) Wt::Dbo::Transaction transaction(_session); _session.createTables(); - _session.execute("CREATE INDEX artist_name_idx ON artist(name)"); - _session.execute("CREATE INDEX release_name_idx ON release(name)"); - _session.execute("CREATE INDEX track_artist_idx ON track(artist_id)"); - _session.execute("CREATE INDEX track_release_idx ON track(release_id)"); - _session.execute("CREATE INDEX cluster_type_idx ON cluster(type)"); } catch(std::exception& e) { LMS_LOG(DB, ERROR) << "Cannot create tables: " << e.what(); @@ -112,7 +108,26 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) { Wt::Dbo::Transaction transaction(_session); + // Indexes _session.execute("PRAGMA journal_mode=WAL"); + _session.execute("CREATE INDEX IF NOT EXISTS artist_name_idx ON artist(name)"); + _session.execute("CREATE INDEX IF NOT EXISTS release_name_idx ON release(name)"); + _session.execute("CREATE INDEX IF NOT EXISTS track_artist_idx ON track(artist_id)"); + _session.execute("CREATE INDEX IF NOT EXISTS track_release_idx ON track(release_id)"); + _session.execute("CREATE INDEX IF NOT EXISTS cluster_type_idx ON cluster(type)"); + + // Default values + if (!Setting::exists(_session, "audio_file_extensions")) + Setting::setString(_session, "audio_file_extensions", ".mp3 .ogg .oga .aac .m4a .flac .wav .wma .aif .aiff .ape .mpc .shn" ); + + if (!Setting::exists(_session, "video_file_extensions")) + Setting::setString(_session, "video_file_extensions", ".flv .avi .mpg .mpeg .mp4 .m4v .mkv .mov .wmv .ogv .divx .m2ts"); + + if (!Setting::exists(_session, "tags_highlevel_acousticbrainz")) + Setting::setBool(_session, "tags_highlevel_acousticbrainz", true); + + if (!Setting::exists(_session, "tags_similarity_acousticbrainz")) + Setting::setBool(_session, "tags_similarity_acousticbrain", false); } _users = new UserDatabase(_session); diff --git a/src/database/DatabaseUpdater.cpp b/src/database/DatabaseUpdater.cpp index 35b62a4e..7a1fa6b7 100644 --- a/src/database/DatabaseUpdater.cpp +++ b/src/database/DatabaseUpdater.cpp @@ -28,6 +28,7 @@ #include "utils/Utils.hpp" #include "utils/Path.hpp" +#include "Setting.hpp" #include "Types.hpp" #include "DatabaseUpdater.hpp" @@ -70,7 +71,6 @@ getNextFirstOfMonth(const boost::gregorian::date& current) bool isFileSupported(const boost::filesystem::path& file, const std::vector extensions) { - boost::filesystem::path fileExtension = file.extension(); for (auto& extension : extensions) @@ -87,9 +87,9 @@ getRootDirectoriesByType(Wt::Dbo::Session& session, Database::MediaDirectory::Ty { Wt::Dbo::Transaction transaction(session); - std::vector res; std::vector rootDirs = Database::MediaDirectory::getByType(session, type); + std::vector res; for (auto rootDir : rootDirs) res.push_back(rootDir->getPath()); @@ -170,48 +170,43 @@ Updater::stop(void) void Updater::processNextJob(void) { - Wt::Dbo::Transaction transaction(_db->getSession()); - - MediaDirectorySettings::pointer settings = MediaDirectorySettings::get(_db->getSession()); - - if (settings->getManualScanRequested()) { + if (Setting::getBool(_db->getSession(), "manual_scan_requested", false)) + { LMS_LOG(DBUPDATER, INFO) << "Manual scan requested!"; scheduleScan( boost::posix_time::seconds(0) ); } else { boost::posix_time::ptime now = boost::posix_time::second_clock::local_time(); - boost::posix_time::time_duration startTime = settings->getUpdateStartTime(); + boost::posix_time::time_duration startTime = Setting::getDuration(_db->getSession(), "update_start_time"); boost::gregorian::date nextScanDate; - switch( settings->getUpdatePeriod() ) + std::string updatePeriod = Setting::getString(_db->getSession(), "update_period", "never"); + if (updatePeriod == "daily") { - case Database::MediaDirectorySettings::Never: - // Nothing to do - break; - case Database::MediaDirectorySettings::Daily: - if (now.time_of_day() < startTime) - nextScanDate = now.date(); - else - nextScanDate = getNextDay(now.date()); - break; - case Database::MediaDirectorySettings::Weekly: - if (now.time_of_day() < startTime && now.date().day_of_week() == 1) - nextScanDate = now.date(); - else - nextScanDate = getNextMonday(now.date()); - break; - case Database::MediaDirectorySettings::Monthly: - if (now.time_of_day() < startTime && now.date().day() == 1) - nextScanDate = now.date(); - else - nextScanDate = getNextFirstOfMonth(now.date()); - break; + if (now.time_of_day() < startTime) + nextScanDate = now.date(); + else + nextScanDate = getNextDay(now.date()); + } + else if (updatePeriod == "weekly") + { + if (now.time_of_day() < startTime && now.date().day_of_week() == 1) + nextScanDate = now.date(); + else + nextScanDate = getNextMonday(now.date()); + } + else if (updatePeriod == "monthly") + { + if (now.time_of_day() < startTime && now.date().day() == 1) + nextScanDate = now.date(); + else + nextScanDate = getNextFirstOfMonth(now.date()); } if (!nextScanDate.is_special()) - scheduleScan( boost::posix_time::ptime (nextScanDate, settings->getUpdateStartTime() ) ); + scheduleScan( boost::posix_time::ptime (nextScanDate, startTime) ); } } @@ -274,27 +269,17 @@ Updater::process(boost::system::error_code err) // Update database stats boost::posix_time::ptime now = boost::posix_time::second_clock::local_time(); - { - Wt::Dbo::Transaction transaction(_db->getSession()); - - Database::MediaDirectorySettings::pointer settings = Database::MediaDirectorySettings::get(_db->getSession()); - - if (stats.nbChanges() > 0) - settings.modify()->setLastUpdate(now); - - // Save the last scan only if it has been completed - if (_running) - settings.modify()->setLastScan(now); - - // If the manual scan was required we can now set it to done - // Update only if the scan is complete! - if (settings->getManualScanRequested() && _running) - settings.modify()->setManualScanRequested(false); - - } + if (stats.nbChanges() > 0) + Setting::setTime(_db->getSession(), "last_update", now); + // Save the last scan only if it has been completed if (_running) + { + Setting::setTime(_db->getSession(), "last_scan", now); + Setting::setBool(_db->getSession(), "manual_scan_requested", false); + processNextJob(); + } } void @@ -302,8 +287,13 @@ Updater::updateFileExtensions() { Wt::Dbo::Transaction transaction(_db->getSession()); - _audioFileExtensions = MediaDirectorySettings::get(_db->getSession())->getAudioFileExtensions(); - _videoFileExtensions = MediaDirectorySettings::get(_db->getSession())->getVideoFileExtensions(); + _audioFileExtensions.clear(); + for (auto extension : splitString(Setting::getString(_db->getSession(), "audio_file_extensions"), " ")) + _audioFileExtensions.push_back( extension ); + + _videoFileExtensions.clear(); + for (auto extension : splitString(Setting::getString(_db->getSession(), "video_file_extensions"), " ")) + _videoFileExtensions.push_back( extension ); } Artist::pointer diff --git a/src/database/MediaDirectory.cpp b/src/database/MediaDirectory.cpp index 3bbf1ab2..cd2a0cc2 100644 --- a/src/database/MediaDirectory.cpp +++ b/src/database/MediaDirectory.cpp @@ -17,89 +17,18 @@ * along with LMS. If not, see . */ +#include "utils/Utils.hpp" + #include "Types.hpp" -static std::string pathsToString(const std::vector& paths) -{ - std::ostringstream oss; - - bool first = true; - for (auto& path : paths) - { - if (!first) - oss << " "; - - oss << path.string(); - first = false; - } - - return oss.str(); -} - -static std::vector stringToPaths(const std::string value) -{ - std::vector res; - std::istringstream iss(value); - - std::copy(std::istream_iterator(iss), std::istream_iterator(), std::back_inserter(res)); - - return std::vector(res.begin(), res.end()); -} - namespace Database { -MediaDirectorySettings::MediaDirectorySettings() -: _manualScanRequested(false), -_updatePeriod(Never), -_audioFileExtensions(".mp3 .ogg .oga .aac .m4a .flac .wav .wma .aif .aiff .ape .mpc .shn"), -_videoFileExtensions(".flv .avi .mpg .mpeg .mp4 .m4v .mkv .mov .wmv .ogv .divx .m2ts") -{ -} - MediaDirectory::MediaDirectory(boost::filesystem::path p, Type type) : _type(type), - _path(p.string()) + _path(stringTrimEnd(p.string(), "/\\")) { } -MediaDirectorySettings::pointer -MediaDirectorySettings::get(Wt::Dbo::Session& session) -{ - MediaDirectorySettings::pointer res; - - res = session.find().where("id = ?").bind(1); - // TODO bind necessary? - if (!res) - res = session.add( new MediaDirectorySettings()); - - return res; -} - -std::vector -MediaDirectorySettings::getAudioFileExtensions(void) const -{ - return stringToPaths(_audioFileExtensions); -} - -std::vector -MediaDirectorySettings::getVideoFileExtensions(void) const -{ - return stringToPaths(_videoFileExtensions); -} - -void -MediaDirectorySettings::setAudioFileExtensions(std::vector extensions) -{ - _audioFileExtensions = pathsToString(extensions); -} - -void -MediaDirectorySettings::setVideoFileExtensions(std::vector extensions) -{ - _videoFileExtensions = pathsToString(extensions); -} - - MediaDirectory::pointer MediaDirectory::create(Wt::Dbo::Session& session, boost::filesystem::path p, Type type) { @@ -135,5 +64,10 @@ MediaDirectory::get(Wt::Dbo::Session& session, boost::filesystem::path p, Type t return session.find().where("path = ?").where("type = ?").bind( p.string()).bind(type); } +boost::filesystem::path +MediaDirectory::getPath(void) const +{ + return boost::filesystem::path(stringTrimEnd(_path, "/\\")); +} } // namespace Database diff --git a/src/database/MediaDirectory.hpp b/src/database/MediaDirectory.hpp index f4085be5..c77b6b0c 100644 --- a/src/database/MediaDirectory.hpp +++ b/src/database/MediaDirectory.hpp @@ -26,73 +26,8 @@ #include #include - namespace Database { -class MediaDirectory; - -class MediaDirectorySettings -{ - public: - - enum UpdatePeriod { - Never, - Daily, - Weekly, - Monthly - }; - - typedef Wt::Dbo::ptr pointer; - - MediaDirectorySettings(); - - // accessors - static pointer get(Wt::Dbo::Session& session); - - // write accessors - void setManualScanRequested(bool value) { _manualScanRequested = value;} - void setUpdatePeriod(UpdatePeriod period) { _updatePeriod = period;} - void setUpdateStartTime(boost::posix_time::time_duration dur) { _updateStartTime = dur;} - void setLastUpdate(boost::posix_time::ptime time) { _lastUpdate = time; } - void setLastScan(boost::posix_time::ptime time) { _lastScan = time; } - void setAudioFileExtensions(std::vector extensions); - void setVideoFileExtensions(std::vector extensions); - - // Read accessors - bool getManualScanRequested(void) const { return _manualScanRequested; } - UpdatePeriod getUpdatePeriod(void) const { return _updatePeriod; } - boost::posix_time::time_duration getUpdateStartTime(void) const { return _updateStartTime; } - boost::posix_time::ptime getLastUpdated(void) const { return _lastUpdate; } - boost::posix_time::ptime getLastScan(void) const { return _lastScan; } - std::vector getAudioFileExtensions(void) const; - std::vector getVideoFileExtensions(void) const; - - template - void persist(Action& a) - { - Wt::Dbo::field(a, _manualScanRequested, "manual_scan_requested"); - Wt::Dbo::field(a, _updatePeriod, "update_period"); - Wt::Dbo::field(a, _updateStartTime, "update_start_time"); - Wt::Dbo::field(a, _audioFileExtensions, "audio_file_extensions"); - Wt::Dbo::field(a, _videoFileExtensions, "video_file_extensions"); - Wt::Dbo::field(a, _lastUpdate, "last_update"); - Wt::Dbo::field(a, _lastScan, "last_scan"); - Wt::Dbo::hasMany(a, _mediaDirectories, Wt::Dbo::ManyToOne, "media_directory_settings"); - } - - private: - - bool _manualScanRequested; // Immadiate scan has been requested by user - UpdatePeriod _updatePeriod; // How long between updates - boost::posix_time::time_duration _updateStartTime; // Time of day to begin the update - std::string _audioFileExtensions; // Extension of the audio files to be scanned - std::string _videoFileExtensions; // Extension of the video files to be scanned - boost::posix_time::ptime _lastUpdate; // last time the database has changed - boost::posix_time::ptime _lastScan; // last time the database has been scanned - Wt::Dbo::collection< Wt::Dbo::ptr > _mediaDirectories; // list of media directories -}; - - class MediaDirectory { public: @@ -116,14 +51,13 @@ class MediaDirectory static void eraseAll(Wt::Dbo::Session& session); Type getType(void) const { return _type; } - boost::filesystem::path getPath(void) const { return boost::filesystem::path(_path); } + boost::filesystem::path getPath(void) const; template void persist(Action& a) { Wt::Dbo::field(a, _type, "type"); Wt::Dbo::field(a, _path, "path"); - Wt::Dbo::belongsTo(a, _settings, "media_directory_settings", Wt::Dbo::OnDeleteCascade); } private: @@ -131,8 +65,6 @@ class MediaDirectory Type _type; std::string _path; - MediaDirectorySettings::pointer _settings; // back pointer - }; } // namespace Database diff --git a/src/database/Setting.cpp b/src/database/Setting.cpp new file mode 100644 index 00000000..c5dc5200 --- /dev/null +++ b/src/database/Setting.cpp @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2016 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 . + */ + +#include "Setting.hpp" + +namespace Database { + +bool +Setting::exists(Wt::Dbo::Session& session, std::string setting) +{ + Wt::Dbo::Transaction transaction(session); + return (getByName(session, setting) != Setting::pointer()); +} + +std::string +Setting::getString(Wt::Dbo::Session& session, std::string setting, std::string defaultValue) +{ + Wt::Dbo::Transaction transaction(session); + + pointer res = getByName(session, setting); + if (!res) + return defaultValue; + + return res->_value; +} + +bool +Setting::getBool(Wt::Dbo::Session& session, std::string setting, bool defaultValue) +{ + Wt::Dbo::Transaction transaction(session); + + pointer res = getByName(session, setting); + if (!res) + return defaultValue; + + return (res->_value == "true"); +} + +boost::posix_time::time_duration +Setting::getDuration(Wt::Dbo::Session& session, std::string setting, boost::posix_time::time_duration defaultValue) +{ + Wt::Dbo::Transaction transaction(session); + + pointer res = getByName(session, setting); + if (!res) + return defaultValue; + + return boost::posix_time::duration_from_string(res->_value); +} + +boost::posix_time::ptime +Setting::getTime(Wt::Dbo::Session& session, std::string setting, boost::posix_time::ptime defaultValue) +{ + Wt::Dbo::Transaction transaction(session); + + pointer res = getByName(session, setting); + if (!res) + return defaultValue; + + return boost::posix_time::time_from_string(res->_value); +} + +int +Setting::getInt(Wt::Dbo::Session& session, std::string setting, int defaultValue) +{ + Wt::Dbo::Transaction transaction(session); + + pointer res = getByName(session, setting); + if (!res) + return defaultValue; + + return std::stoi(res->_value); +} + + + +Setting::pointer +Setting::create(Wt::Dbo::Session& session, std::string name) +{ + return session.add(new Setting(name)); +} + +Setting::pointer +Setting::getByName(Wt::Dbo::Session& session, std::string name) +{ + return session.find().where("name = ?").bind(name); +} + +Setting::pointer +Setting::getOrCreateByName(Wt::Dbo::Session& session, std::string name) +{ + pointer res = getByName(session, name); + if (!res) + res = create(session, name); + + return res; +} + +void +Setting::setString(Wt::Dbo::Session& session, std::string setting, std::string value) +{ + Wt::Dbo::Transaction transaction(session); + getOrCreateByName(session, setting).modify()->_value = value; +} + +void +Setting::setBool(Wt::Dbo::Session& session, std::string setting, bool value) +{ + Wt::Dbo::Transaction transaction(session); + getOrCreateByName(session, setting).modify()->_value = (value ? "true" : "false"); +} + +void +Setting::setDuration(Wt::Dbo::Session& session, std::string setting, boost::posix_time::time_duration value) +{ + Wt::Dbo::Transaction transaction(session); + getOrCreateByName(session, setting).modify()->_value = boost::posix_time::to_simple_string(value); +} + +void +Setting::setTime(Wt::Dbo::Session& session, std::string setting, boost::posix_time::ptime value) +{ + Wt::Dbo::Transaction transaction(session); + getOrCreateByName(session, setting).modify()->_value = boost::posix_time::to_simple_string(value); +} + +void +Setting::setInt(Wt::Dbo::Session& session, std::string setting, int value) +{ + Wt::Dbo::Transaction transaction(session); + getOrCreateByName(session, setting).modify()->_value = std::to_string(value); +} + + +} // namespace Database + diff --git a/src/database/Setting.hpp b/src/database/Setting.hpp new file mode 100644 index 00000000..394fc7bc --- /dev/null +++ b/src/database/Setting.hpp @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2016 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 . + */ + +#pragma once + +#include + +#include + +namespace Database { + +// class meant to store general settings +class Setting +{ + public: + Setting() {} + + // check if a setting exists or not + static bool exists(Wt::Dbo::Session& session, std::string setting); + + // Getters + // Nested transactions + static std::string getString(Wt::Dbo::Session& session, std::string setting, std::string defaultValue = ""); + static bool getBool(Wt::Dbo::Session& session, std::string setting, bool defaultValue = false); + static boost::posix_time::time_duration getDuration(Wt::Dbo::Session& session, std::string setting, boost::posix_time::time_duration defaultDuration = boost::posix_time::seconds(0) ); + static boost::posix_time::ptime getTime(Wt::Dbo::Session& session, std::string setting, boost::posix_time::ptime defaultTime = boost::posix_time::ptime()); + static int getInt(Wt::Dbo::Session& session, std::string setting, int defaultValue = 0); + + // Setters + // Nested transactions + static void setString(Wt::Dbo::Session& session, std::string setting, std::string value); + static void setBool(Wt::Dbo::Session& session, std::string setting, bool value); + static void setDuration(Wt::Dbo::Session& session, std::string setting, boost::posix_time::time_duration value); + static void setTime(Wt::Dbo::Session& session, std::string setting, boost::posix_time::ptime time); + static void setInt(Wt::Dbo::Session& session, std::string setting, int value); + + template + void persist(Action& a) + { + Wt::Dbo::field(a, _name, "name"); + Wt::Dbo::field(a, _value, "value"); + } + + private: + Setting(std::string name) : _name(name) {} + + typedef Wt::Dbo::ptr pointer; + + static pointer getByName(Wt::Dbo::Session& session, std::string name); + static pointer create(Wt::Dbo::Session& session, std::string name); + static pointer getOrCreateByName(Wt::Dbo::Session& session, std::string name); + + std::string _name; + std::string _value; +}; + + +} // namespace Database + diff --git a/src/database/cluster/DatabaseHighLevelCluster.cpp b/src/database/cluster/DatabaseHighLevelCluster.cpp new file mode 100644 index 00000000..c517da3d --- /dev/null +++ b/src/database/cluster/DatabaseHighLevelCluster.cpp @@ -0,0 +1,226 @@ +/* + * Copyright (C) 2016 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 . + */ + +#include "DatabaseHighLevelCluster.hpp" + +#include "config/Config.hpp" +#include "logger/Logger.hpp" +#include "feature/FeatureStore.hpp" + +namespace Database { + +static Cluster::pointer getCluster(std::string type, std::string value) +{ + Cluster::pointer cluster = ( Cluster::get(UpdaterDboSession(), type, value) ); + if (!cluster) + cluster = Cluster::create(UpdaterDboSession(), type, value); + + return cluster; +} + +static std::list getClustersFromFeature(Feature::Type& feature) +{ + struct HighLevelNodeDesc + { + std::string node; + std::map valueMapping; + }; + + static const std::vector nodes = + { + { + "highlevel.danceability", + { + {"not_danceable", "Not danceable"}, + {"danceable", "Danceable"}, + }, + }, + { + "highlevel.gender", + { + {"male", "Male"}, + {"female", "Female"}, + }, + }, + { + "highlevel.mood_acoustic", + { + {"not_acoustic", "Not acoustic"}, + {"acoustic", "Acoustic"}, + }, + }, + { + "highlevel.mood_happy", + { + {"not_happy", "Not happy"}, + {"happy", "Happy"}, + }, + }, + { + "highlevel.mood_aggressive", + { + {"not_aggressive", "Not aggressive"}, + {"aggressive", "Aggressive"}, + }, + }, + { + "highlevel.mood_electronic", + { + {"not_electronic", "Not electronic"}, + {"electronic", "Electronic"}, + }, + }, + { + "highlevel.mood_party", + { + {"not_party", "Not party"}, + {"party", "Party"}, + }, + }, + { + "highlevel.mood_relaxed", + { + {"not_relaxed", "Not relaxed"}, + {"relaxed", "Relaxed"}, + }, + }, + { + "highlevel.mood_sad", + { + {"not_sad", "Not sad"}, + {"sad", "Sad"}, + }, + }, + { + "highlevel.timbre", + { + {"bright", "Bright"}, + {"dark", "Dark"}, + }, + }, + { + "highlevel.tonal_atonal", + { + {"atonal", "Atonal"}, + {"tonal", "Tonal"}, + }, + }, + { + "highlevel.voice_instrumental", + { + {"instrumental", "Instrumental"}, + {"voice", "Voice"}, + }, + }, + }; + + + // Extract info and build clusters + std::list newClusterNames; + + for (auto node : nodes) + { + auto value = feature.get_child_optional(node.node + ".value"); + auto probability = feature.get_child_optional(node.node + ".probability"); + + if (!probability || !value) + { + LMS_LOG(DBUPDATER, DEBUG) << "Missing " << node.node; + continue; + } + + if (std::stod(probability->data()) < 0.90) + { + LMS_LOG(DBUPDATER, DEBUG) << "Probability too low for " << node.node << "(" << std::stod(probability->data()) << ")"; + continue; + } + + if (node.valueMapping[value->data()] == "") + { + LMS_LOG(DBUPDATER, DEBUG) << "Unknown value '" << value->data() << "'"; + continue; + } + + newClusterNames.push_back(node.valueMapping[value->data()]); + } + + return newClusterNames; +} + +void +HighLevelCluster::processDatabaseUpdate(Updater::Stats stats) +{ + bool createTags = Config::instance().getBool("tag-highlevel-acousticbrainz", false); + + + LMS_LOG(DBUPDATER, INFO) << "Creating high level based clusters..."; + + std::vector trackIds = Track::getAllIds(UpdaterDboSession()); + + LMS_LOG(DBUPDATER, DEBUG) << "Got " << trackIds.size() << " tracks"; + for (auto trackId : trackIds) + { + if (UpdaterQuitRequested()) + return; + + LMS_LOG(DBUPDATER, DEBUG) << "Processing track " << trackId; + + // Get current cluster names + std::list newClusterNames; + if (createTags) + { + Feature::Type feature; + if (!Feature::Store::instance().get(UpdaterDboSession(), trackId, "high_level", feature)) + continue; + + newClusterNames = getClustersFromFeature(feature); + } + + Wt::Dbo::Transaction transaction(UpdaterDboSession()); + + auto track = Track::getById(UpdaterDboSession(), trackId); + + auto clusters = track->getClusters(); + for (auto cluster : clusters) + { + // Check if removed + if (cluster->getType() != "high_level") + continue; + + auto it = std::find(newClusterNames.begin(), newClusterNames.end(), cluster->getName()); + if (it == newClusterNames.end()) + cluster.remove(); + else + newClusterNames.erase(it); + + } + + // Add previsouly missing clusters + for (auto newName : newClusterNames) + { + auto cluster = getCluster("high_level", newName); + cluster.modify()->addTrack(track); + } + } + + LMS_LOG(DBUPDATER, INFO) << "High level based clusters processed"; +} + + +} // namespace Database diff --git a/src/database/cluster/DatabaseHighLevelCluster.hpp b/src/database/cluster/DatabaseHighLevelCluster.hpp new file mode 100644 index 00000000..25f91d86 --- /dev/null +++ b/src/database/cluster/DatabaseHighLevelCluster.hpp @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2016 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 . + */ + +#pragma once + +#include "database/DatabaseUpdater.hpp" + +namespace Database { + +class HighLevelCluster +{ + public: + void processDatabaseUpdate(Updater::Stats stats); + +}; + +} // namespace Database diff --git a/src/database/cluster/DatabaseSimilarityCluster.hpp b/src/database/cluster/DatabaseSimilarityCluster.hpp new file mode 100644 index 00000000..e69de29b diff --git a/src/database/tagger/GenreTagger.cpp b/src/database/tagger/GenreTagger.cpp new file mode 100644 index 00000000..ec40da6d --- /dev/null +++ b/src/database/tagger/GenreTagger.cpp @@ -0,0 +1,40 @@ + +/* + * Copyright (C) 2016 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 . + */ + +#include "GenreTagger.hpp" + +namespace Database { + +void +GenreTagger::processTrackUpdate(bool added, Track::id_type trackId, std::string mbid, boost::filesystem::path p) +{ + + +} + +void +GenreTagger::processDatabaseUpdate(Updater::Stats stats) +{ + + // TODO: if disabled, delete all the genre tags + // TODO: if enabled, reconstruct all the genre tags from tracks +} + +} // namespace Database diff --git a/src/database/tagger/GenreTagger.hpp b/src/database/tagger/GenreTagger.hpp new file mode 100644 index 00000000..16118c48 --- /dev/null +++ b/src/database/tagger/GenreTagger.hpp @@ -0,0 +1,37 @@ + +/* + * Copyright (C) 2016 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 . + */ + +#pragma once + +#include "database/DatabaseUpdater.hpp" + +namespace Database { + +class GenreTagger +{ + public: + void processTrackUpdate(bool added, Track::id_type trackId, std::string mbid, boost::filesystem::path p); + void processDatabaseUpdate(Updater::Stats stats); + + private: + +}; + +} // namespace Database diff --git a/src/feature/FeatureStore.cpp b/src/feature/FeatureStore.cpp index e5fff4dc..f58c51ab 100644 --- a/src/feature/FeatureStore.cpp +++ b/src/feature/FeatureStore.cpp @@ -21,6 +21,7 @@ #include "logger/Logger.hpp" #include "config/Config.hpp" +#include "utils/Path.hpp" #include "FeatureStore.hpp" @@ -40,12 +41,20 @@ Store::instance(void) void Store::reload(void) { - _storePath = Config::instance().getString("features-dir-path", ""); + boost::filesystem::path cacheDir = _storePath = Config::instance().getString("cache-dir-path", ""); - if (!boost::filesystem::is_directory(_storePath)) + if (!ensureDirectory(cacheDir)) { - LMS_LOG(DBUPDATER, ERROR) << "Feature directory '" << _storePath << "' not valid!"; - throw std::runtime_error("Invalid feature directory '" + _storePath.string()); + LMS_LOG(DBUPDATER, ERROR) << "Cache directory '" << cacheDir << "' not valid"; + throw std::runtime_error("Cache directory '" + cacheDir.string() + "' not valid!"); + } + + _storePath = cacheDir / "features"; + + if (!ensureDirectory(_storePath)) + { + LMS_LOG(DBUPDATER, ERROR) << "Features directory '" << _storePath << "' not valid"; + throw std::runtime_error("Features directory '" + _storePath.string() + "' not valid"); } } diff --git a/src/main/main.cpp b/src/main/main.cpp index 67671166..f22afc8f 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -26,10 +26,12 @@ #include "av/AvTranscoder.hpp" #include "logger/Logger.hpp" #include "image/Image.hpp" +#include "feature/FeatureExtractor.hpp" #include "database/DatabaseUpdater.hpp" -#include "database/DatabaseClassifier.hpp" -#include "feature/FeatureExtractor.hpp" +#include "database/DatabaseFeatureExtractor.hpp" +#include "database/cluster/DatabaseHighLevelCluster.hpp" + #include "ui/LmsApplication.hpp" @@ -44,16 +46,16 @@ static std::vector getWtArgs(std::string path) if (Config::instance().getBool("tls-enable", false)) { - args.push_back("--https-port=" + std::to_string( Config::instance().getULong("listen-port"))); - args.push_back("--https-address=" + Config::instance().getString("listen-addr")); + args.push_back("--https-port=" + std::to_string( Config::instance().getULong("listen-port", 5081))); + args.push_back("--https-address=" + Config::instance().getString("listen-addr", "0.0.0.0")); args.push_back("--ssl-certificate=" + Config::instance().getString("tls-cert")); args.push_back("--ssl-private-key=" + Config::instance().getString("tls-key")); args.push_back("--ssl-tmp-dh=" + Config::instance().getString("tls-dh")); } else { - args.push_back("--http-port=" + std::to_string( Config::instance().getULong("listen-port"))); - args.push_back("--http-address=" + Config::instance().getString("listen-addr")); + args.push_back("--http-port=" + std::to_string( Config::instance().getULong("listen-port", 5081))); + args.push_back("--http-address=" + Config::instance().getString("listen-addr", "0.0.0.0")); } return args; @@ -104,13 +106,12 @@ int main(int argc, char* argv[]) Database::Updater& dbUpdater = Database::Updater::instance(); dbUpdater.setConnectionPool(*connectionPool); - Database::Classifier dbClassifier(*connectionPool); + Database::FeatureExtractor dbFeatureExtractor; + Database::HighLevelCluster dbHighLevelCluster; - // Connect the classifier to the update events - dbUpdater.trackChanged().connect(std::bind(&Database::Classifier::processTrackUpdate, &dbClassifier, - std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4)); - dbUpdater.scanComplete().connect(std::bind(&Database::Classifier::processDatabaseUpdate, &dbClassifier, - std::placeholders::_1)); + // Connect to the update events + dbUpdater.scanComplete().connect(std::bind(&Database::HighLevelCluster::processDatabaseUpdate, &dbHighLevelCluster, std::placeholders::_1)); + dbUpdater.scanComplete().connect(std::bind(&Database::FeatureExtractor::processDatabaseUpdate, &dbFeatureExtractor, std::placeholders::_1)); // bind entry point server.addEntryPoint(Wt::Application, boost::bind(UserInterface::LmsApplication::create, diff --git a/src/ui/settings/Settings.cpp b/src/ui/settings/Settings.cpp index 3c68c6fc..308664c8 100644 --- a/src/ui/settings/Settings.cpp +++ b/src/ui/settings/Settings.cpp @@ -31,6 +31,7 @@ #include "logger/Logger.hpp" #include "database/DatabaseUpdater.hpp" +#include "database/Setting.hpp" #include "LmsApplication.hpp" @@ -39,6 +40,8 @@ namespace UserInterface { namespace Settings { +using namespace Database; + Settings::Settings(Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent) { @@ -65,7 +68,7 @@ Settings::Settings(Wt::WContainerWidget* parent) { Wt::Dbo::Transaction transaction(DboSession()); - userId = Database::User::getId(CurrentUser()); + userId = User::getId(CurrentUser()); userIsAdmin = CurrentUser()->isAdmin(); } @@ -77,24 +80,19 @@ Settings::Settings(Wt::WContainerWidget* parent) { LMS_LOG(UI, INFO) << "Media directories have changed: requesting imediate scan"; - // On directory add or delete, request an immediate scan - // - { - Wt::Dbo::Transaction transaction(DboSession()); - Database::MediaDirectorySettings::get(DboSession()).modify()->setManualScanRequested(true); - } - { - std::lock_guard lock(Database::Updater::instance().getMutex()); - Database::Updater::instance().restart(); - } + // On directory change, request an immediate scan + std::lock_guard lock(Updater::instance().getMutex()); + + Setting::setBool(DboSession(), "manual_scan_requested", true); + Updater::instance().restart(); })); menu->addItem("Media Folders", mediaDirectories)->setPathComponent("mediadirectories"); DatabaseFormView* databaseFormView = new DatabaseFormView(); databaseFormView->changed().connect(std::bind([=] { - std::lock_guard lock(Database::Updater::instance().getMutex()); - Database::Updater::instance().restart(); + std::lock_guard lock(Updater::instance().getMutex()); + Updater::instance().restart(); })); menu->addItem("Database", databaseFormView)->setPathComponent("database"); diff --git a/src/ui/settings/SettingsDatabaseFormView.cpp b/src/ui/settings/SettingsDatabaseFormView.cpp index f9ad0ccf..1c93f1d8 100644 --- a/src/ui/settings/SettingsDatabaseFormView.cpp +++ b/src/ui/settings/SettingsDatabaseFormView.cpp @@ -29,7 +29,7 @@ #include #include "logger/Logger.hpp" -#include "database/MediaDirectory.hpp" +#include "database/Setting.hpp" #include "common/DirectoryValidator.hpp" #include "LmsApplication.hpp" @@ -49,6 +49,8 @@ class DatabaseFormModel : public Wt::WFormModel static const Field UpdateStartTimeField; static const Field AudioFileExtensionsField; static const Field VideoFileExtensionsField; + static const Field TagsHighLevelAcousticBrainz; + static const Field TagsSimilarityAcousticBrainz; DatabaseFormModel(Wt::WObject *parent = 0) : Wt::WFormModel(parent) @@ -59,6 +61,8 @@ class DatabaseFormModel : public Wt::WFormModel addField(UpdateStartTimeField); addField(AudioFileExtensionsField); addField(VideoFileExtensionsField); + addField(TagsHighLevelAcousticBrainz); + addField(TagsSimilarityAcousticBrainz); setValidator(UpdatePeriodField, createUpdatePeriodValidator()); setValidator(UpdateStartTimeField, createStartTimeValidator()); @@ -74,117 +78,70 @@ class DatabaseFormModel : public Wt::WFormModel void loadData() { - Wt::Dbo::Transaction transaction(DboSession()); - - // Get refresh settings - MediaDirectorySettings::pointer settings = MediaDirectorySettings::get(DboSession()); - - int periodRow = getUpdatePeriodModelRow( settings->getUpdatePeriod() ); + int periodRow = getUpdatePeriodModelRow( Setting::getString(DboSession(), "update_period")); if (periodRow != -1) - setValue(UpdatePeriodField, updatePeriod(periodRow)); + setValue(UpdatePeriodField, updatePeriodDisplay(periodRow)); - int startTimeRow = getUpdateStartTimeModelRow( settings->getUpdateStartTime() ); + int startTimeRow = getUpdateStartTimeModelRow( Setting::getDuration(DboSession(), "update_start_time") ); if (startTimeRow != -1) setValue(UpdateStartTimeField, updateStartTime( startTimeRow ) ); - std::vector audioFileExtensions = settings->getAudioFileExtensions(); - { - std::ostringstream oss; - for (auto& fileExtension : audioFileExtensions) - oss << fileExtension.string() << " "; + setValue(AudioFileExtensionsField, Setting::getString(DboSession(), "audio_file_extensions")); + setValue(VideoFileExtensionsField, Setting::getString(DboSession(), "video_file_extensions")); - setValue(AudioFileExtensionsField, oss.str()); - } - - std::vector videoFileExtensions = settings->getVideoFileExtensions(); - { - std::ostringstream oss; - for (auto& fileExtension : videoFileExtensions) - oss << fileExtension.string() << " "; - - setValue(VideoFileExtensionsField, oss.str()); - } + setValue(TagsHighLevelAcousticBrainz, Setting::getBool(DboSession(), "tags_highlevel_acousticbrainz")); + setValue(TagsSimilarityAcousticBrainz, Setting::getBool(DboSession(), "tags_similarity_acousticbrainz")); } void saveData() { - Wt::Dbo::Transaction transaction(DboSession()); - - MediaDirectorySettings::pointer settings = MediaDirectorySettings::get(DboSession()); - int periodRow = getUpdatePeriodModelRow( boost::any_cast(value(UpdatePeriodField))); assert(periodRow != -1); - settings.modify()->setUpdatePeriod( updatePeriodDuration( periodRow ) ); + Setting::setString(DboSession(), "update_period", updatePeriodSetting( periodRow ) ); int startTimeRow = getUpdateStartTimeModelRow( boost::any_cast(value(UpdateStartTimeField))); assert(startTimeRow != -1); - settings.modify()->setUpdateStartTime( updateStartTimeDuration( startTimeRow ) ); + Setting::setDuration(DboSession(), "update_start_time", updateStartTimeDuration( startTimeRow ) ); - { - std::vector res; - std::istringstream iss(boost::any_cast(value(AudioFileExtensionsField)).toUTF8()); + Setting::setString(DboSession(), "audio_file_extensions", boost::any_cast(value(AudioFileExtensionsField)).toUTF8()); + Setting::setString(DboSession(), "video_file_extensions", boost::any_cast(value(VideoFileExtensionsField)).toUTF8()); - std::copy(std::istream_iterator(iss), std::istream_iterator(), std::back_inserter(res)); - - settings.modify()->setAudioFileExtensions( std::vector(res.begin(), res.end()) ); - } - - { - std::vector res; - std::istringstream iss(boost::any_cast(value(VideoFileExtensionsField)).toUTF8()); - - std::copy(std::istream_iterator(iss), std::istream_iterator(), std::back_inserter(res)); - - settings.modify()->setVideoFileExtensions( std::vector(res.begin(), res.end()) ); - } + Setting::setBool(DboSession(), "tags_highlevel_acousticbrainz", boost::any_cast(value(TagsHighLevelAcousticBrainz))); + Setting::setBool(DboSession(), "tags_similarity_acousticbrainz", boost::any_cast(value(TagsSimilarityAcousticBrainz))); } - bool setImmediateScan(Wt::WString& error) + void setImmediateScan() { - try - { - Wt::Dbo::Transaction transaction( DboSession()); - - MediaDirectorySettings::pointer settings = MediaDirectorySettings::get(DboSession() ); - - settings.modify()->setManualScanRequested( true ); - } - catch(Wt::Dbo::Exception& exception) - { - LMS_LOG(UI, ERROR) << "Dbo exception: " << exception.what(); - return false; - } - - return true; + Setting::setBool(DboSession(), "manual_scan_requested", true); } int getUpdatePeriodModelRow(Wt::WString value) { for (int i = 0; i < _updatePeriodModel->rowCount(); ++i) { - if (updatePeriod(i) == value) + if (updatePeriodDisplay(i) == value) return i; } return -1; } - int getUpdatePeriodModelRow(MediaDirectorySettings::UpdatePeriod duration) + int getUpdatePeriodModelRow(std::string value) { for (int i = 0; i < _updatePeriodModel->rowCount(); ++i) { - if (updatePeriodDuration(i) == duration) + if (updatePeriodSetting(i) == value) return i; } return -1; } - MediaDirectorySettings::UpdatePeriod updatePeriodDuration(int row) { - return boost::any_cast + std::string updatePeriodSetting(int row) { + return boost::any_cast (_updatePeriodModel->data(_updatePeriodModel->index(row, 0), Wt::UserRole)); } - Wt::WString updatePeriod(int row) { + Wt::WString updatePeriodDisplay(int row) { return boost::any_cast (_updatePeriodModel->data(_updatePeriodModel->index(row, 0), Wt::DisplayRole)); } @@ -230,16 +187,16 @@ class DatabaseFormModel : public Wt::WFormModel _updatePeriodModel = new Wt::WStringListModel(this); _updatePeriodModel->addString("Never"); - _updatePeriodModel->setData(0, 0, MediaDirectorySettings::Never, Wt::UserRole); + _updatePeriodModel->setData(0, 0, std::string("never"), Wt::UserRole); _updatePeriodModel->addString("Daily"); - _updatePeriodModel->setData(1, 0, MediaDirectorySettings::Daily, Wt::UserRole); + _updatePeriodModel->setData(1, 0, std::string("daily"), Wt::UserRole); _updatePeriodModel->addString("Weekly"); - _updatePeriodModel->setData(2, 0, MediaDirectorySettings::Weekly, Wt::UserRole); + _updatePeriodModel->setData(2, 0, std::string("weekly"), Wt::UserRole); _updatePeriodModel->addString("Monthly"); - _updatePeriodModel->setData(3, 0, MediaDirectorySettings::Monthly, Wt::UserRole); + _updatePeriodModel->setData(3, 0, std::string("monthly"), Wt::UserRole); _updateStartTimeModel = new Wt::WStringListModel(this); @@ -290,6 +247,8 @@ const Wt::WFormModel::Field DatabaseFormModel::UpdatePeriodField = "update-peri const Wt::WFormModel::Field DatabaseFormModel::UpdateStartTimeField = "update-start-time"; const Wt::WFormModel::Field DatabaseFormModel::AudioFileExtensionsField = "audio-file-extensions"; const Wt::WFormModel::Field DatabaseFormModel::VideoFileExtensionsField = "video-file-extensions"; +const Wt::WFormModel::Field DatabaseFormModel::TagsHighLevelAcousticBrainz = "tags-highlevel-acousticbrainz"; +const Wt::WFormModel::Field DatabaseFormModel::TagsSimilarityAcousticBrainz = "tags-similarity-acousticbrainz"; DatabaseFormView::DatabaseFormView(Wt::WContainerWidget *parent) @@ -328,6 +287,12 @@ DatabaseFormView::DatabaseFormView(Wt::WContainerWidget *parent) setFormWidget(DatabaseFormModel::VideoFileExtensionsField, videoFileExtensionsEdit); videoFileExtensionsEdit->changed().connect(_applyInfo, &Wt::WWidget::hide); + // Tags from AB high level + setFormWidget(DatabaseFormModel::TagsHighLevelAcousticBrainz, new Wt::WCheckBox()); + + // Tags from AB similarity + setFormWidget(DatabaseFormModel::TagsSimilarityAcousticBrainz, new Wt::WCheckBox()); + // Title & Buttons bindString("title", "Database settings"); @@ -353,21 +318,14 @@ DatabaseFormView::DatabaseFormView(Wt::WContainerWidget *parent) void DatabaseFormView::processImmediateScan() { - Wt::WString error; + + _model->setImmediateScan(); + + _applyInfo->setText( Wt::WString::fromUTF8("Media folder scan has been started!" ) ); + _applyInfo->setStyleClass("alert alert-warning"); _applyInfo->show(); - if (_model->setImmediateScan(error)) - { - _applyInfo->setText( Wt::WString::fromUTF8("Media folder scan has been started!" ) ); - _applyInfo->setStyleClass("alert alert-warning"); - - _sigChanged.emit(); - } - else - { - _applyInfo->setText( error ); - _applyInfo->setStyleClass("alert alert-danger"); - } + _sigChanged.emit(); } void diff --git a/src/utils/Path.cpp b/src/utils/Path.cpp index 9921bd65..b7685416 100644 --- a/src/utils/Path.cpp +++ b/src/utils/Path.cpp @@ -87,3 +87,12 @@ void computeCrc(const boost::filesystem::path& p, std::vector& cr crc.push_back(data[i]); } } + +bool ensureDirectory(boost::filesystem::path dir) +{ + if (boost::filesystem::exists(dir)) + return boost::filesystem::is_directory(dir); + else + return boost::filesystem::create_directory(dir); +} + diff --git a/src/utils/Path.hpp b/src/utils/Path.hpp index 96e4726e..8ebcf95a 100644 --- a/src/utils/Path.hpp +++ b/src/utils/Path.hpp @@ -27,3 +27,8 @@ boost::filesystem::path searchExecPath(std::string filename); void computeCrc(const boost::filesystem::path& p, std::vector& checksum); + +// Make sure the given path is a directory +// Create it if needed +bool ensureDirectory(boost::filesystem::path dir); + diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp index 3f968730..8b71586a 100644 --- a/src/utils/Utils.cpp +++ b/src/utils/Utils.cpp @@ -112,6 +112,14 @@ stringTrim(const std::string& str, const std::string& whitespace) return str.substr(strBegin, strRange); } +std::string +stringTrimEnd(const std::string& str, const std::string& whitespace) +{ + return str.substr(0, str.find_last_not_of(whitespace)+1); +} + + + std::string stringToUTF8(const std::string& str) { diff --git a/src/utils/Utils.hpp b/src/utils/Utils.hpp index e8c71ea6..a7e89054 100644 --- a/src/utils/Utils.hpp +++ b/src/utils/Utils.hpp @@ -39,7 +39,10 @@ std::vector splitString(std::string string, std::string separators); std::string -stringTrim(const std::string& str, const std::string& whitespace = " \t"); +stringTrim(const std::string& str, const std::string& whitespaces = " \t"); + +std::string +stringTrimEnd(const std::string& str, const std::string& whitespaces = " \t"); std::string stringToUTF8(const std::string& str); From 445f4596549885d8495054137dd8ba75a255edef Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 28 May 2016 23:07:28 +0200 Subject: [PATCH 018/195] [DB] Acousticbrainz tagging now use new setting system --- src/database/DatabaseUpdater.cpp | 2 +- src/database/cluster/DatabaseHighLevelCluster.cpp | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/database/DatabaseUpdater.cpp b/src/database/DatabaseUpdater.cpp index 7a1fa6b7..0ba96f85 100644 --- a/src/database/DatabaseUpdater.cpp +++ b/src/database/DatabaseUpdater.cpp @@ -124,7 +124,7 @@ Updater& Updater::instance(void) } Updater::Updater() - : _running(false), + : _running(true), _scheduleTimer(_ioService) { _ioService.setThreadCount(1); diff --git a/src/database/cluster/DatabaseHighLevelCluster.cpp b/src/database/cluster/DatabaseHighLevelCluster.cpp index c517da3d..81ce53f9 100644 --- a/src/database/cluster/DatabaseHighLevelCluster.cpp +++ b/src/database/cluster/DatabaseHighLevelCluster.cpp @@ -17,12 +17,13 @@ * along with LMS. If not, see . */ -#include "DatabaseHighLevelCluster.hpp" - -#include "config/Config.hpp" #include "logger/Logger.hpp" + +#include "database/Setting.hpp" #include "feature/FeatureStore.hpp" +#include "DatabaseHighLevelCluster.hpp" + namespace Database { static Cluster::pointer getCluster(std::string type, std::string value) @@ -166,8 +167,7 @@ static std::list getClustersFromFeature(Feature::Type& feature) void HighLevelCluster::processDatabaseUpdate(Updater::Stats stats) { - bool createTags = Config::instance().getBool("tag-highlevel-acousticbrainz", false); - + bool createTags = Setting::getBool(UpdaterDboSession(), "tags_highlevel_acousticbrainz", false); LMS_LOG(DBUPDATER, INFO) << "Creating high level based clusters..."; @@ -179,8 +179,6 @@ HighLevelCluster::processDatabaseUpdate(Updater::Stats stats) if (UpdaterQuitRequested()) return; - LMS_LOG(DBUPDATER, DEBUG) << "Processing track " << trackId; - // Get current cluster names std::list newClusterNames; if (createTags) From fd9fdb8e87d39192944fa5478b4685fc9fbbc8c8 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 30 May 2016 13:57:18 +0200 Subject: [PATCH 019/195] [UI] Added option to parametrize the min probability for creating high level tags --- approot/templates.xml | 23 +++++++++++--- src/database/DatabaseHandler.cpp | 3 ++ .../cluster/DatabaseHighLevelCluster.cpp | 5 ++-- src/main/main.cpp | 2 ++ src/ui/settings/SettingsDatabaseFormView.cpp | 30 +++++++++++++++++-- 5 files changed, 55 insertions(+), 8 deletions(-) diff --git a/approot/templates.xml b/approot/templates.xml index 80afcd58..007c9824 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -297,7 +297,7 @@ - ${title} + ${scan-title}
- +
+ ${tags-title} +
${tags-highlevel-acousticbrainz} @@ -359,9 +361,22 @@
+
+ +
+ ${tags-highlevel-acousticbrainz-min-probability} +
+
+ ${tags-highlevel-acousticbrainz-min-probability-info} +
+
+ +
${tags-similarity-acousticbrainz} diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index 270e4fe1..f9c46053 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -126,6 +126,9 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) if (!Setting::exists(_session, "tags_highlevel_acousticbrainz")) Setting::setBool(_session, "tags_highlevel_acousticbrainz", true); + if (!Setting::exists(_session, "tags_highlevel_acousticbrainz_min_probability")) + Setting::setInt(_session, "tags_highlevel_acousticbrainz_min_probability", 90); + if (!Setting::exists(_session, "tags_similarity_acousticbrainz")) Setting::setBool(_session, "tags_similarity_acousticbrain", false); } diff --git a/src/database/cluster/DatabaseHighLevelCluster.cpp b/src/database/cluster/DatabaseHighLevelCluster.cpp index 81ce53f9..84af0d28 100644 --- a/src/database/cluster/DatabaseHighLevelCluster.cpp +++ b/src/database/cluster/DatabaseHighLevelCluster.cpp @@ -35,7 +35,7 @@ static Cluster::pointer getCluster(std::string type, std::string value) return cluster; } -static std::list getClustersFromFeature(Feature::Type& feature) +static std::list getClustersFromFeature(Feature::Type& feature, double minProb) { struct HighLevelNodeDesc { @@ -168,6 +168,7 @@ void HighLevelCluster::processDatabaseUpdate(Updater::Stats stats) { bool createTags = Setting::getBool(UpdaterDboSession(), "tags_highlevel_acousticbrainz", false); + double minProb = Setting::getInt(UpdaterDboSession(), "tags_highlevel_acousticbrainz_min_probability", false) / 100.; LMS_LOG(DBUPDATER, INFO) << "Creating high level based clusters..."; @@ -187,7 +188,7 @@ HighLevelCluster::processDatabaseUpdate(Updater::Stats stats) if (!Feature::Store::instance().get(UpdaterDboSession(), trackId, "high_level", feature)) continue; - newClusterNames = getClustersFromFeature(feature); + newClusterNames = getClustersFromFeature(feature, minProb); } Wt::Dbo::Transaction transaction(UpdaterDboSession()); diff --git a/src/main/main.cpp b/src/main/main.cpp index f22afc8f..1c8eecc5 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -113,6 +113,8 @@ int main(int argc, char* argv[]) dbUpdater.scanComplete().connect(std::bind(&Database::HighLevelCluster::processDatabaseUpdate, &dbHighLevelCluster, std::placeholders::_1)); dbUpdater.scanComplete().connect(std::bind(&Database::FeatureExtractor::processDatabaseUpdate, &dbFeatureExtractor, std::placeholders::_1)); +// dbHighLevelCluster.processDatabaseUpdate(Database::Updater::Stats()); + // bind entry point server.addEntryPoint(Wt::Application, boost::bind(UserInterface::LmsApplication::create, _1, boost::ref(*connectionPool))); diff --git a/src/ui/settings/SettingsDatabaseFormView.cpp b/src/ui/settings/SettingsDatabaseFormView.cpp index 1c93f1d8..ffc15630 100644 --- a/src/ui/settings/SettingsDatabaseFormView.cpp +++ b/src/ui/settings/SettingsDatabaseFormView.cpp @@ -23,7 +23,9 @@ #include #include #include +#include #include +#include #include #include @@ -50,6 +52,7 @@ class DatabaseFormModel : public Wt::WFormModel static const Field AudioFileExtensionsField; static const Field VideoFileExtensionsField; static const Field TagsHighLevelAcousticBrainz; + static const Field TagsHighLevelAcousticBrainzMinProbability; static const Field TagsSimilarityAcousticBrainz; DatabaseFormModel(Wt::WObject *parent = 0) @@ -62,12 +65,14 @@ class DatabaseFormModel : public Wt::WFormModel addField(AudioFileExtensionsField); addField(VideoFileExtensionsField); addField(TagsHighLevelAcousticBrainz); + addField(TagsHighLevelAcousticBrainzMinProbability); addField(TagsSimilarityAcousticBrainz); setValidator(UpdatePeriodField, createUpdatePeriodValidator()); setValidator(UpdateStartTimeField, createStartTimeValidator()); setValidator(AudioFileExtensionsField, createFileExtensionValidator()); setValidator(VideoFileExtensionsField, createFileExtensionValidator()); + setValidator(TagsHighLevelAcousticBrainzMinProbability, createMinProbabilityValidator()); // populate the model with initial data loadData(); @@ -90,6 +95,7 @@ class DatabaseFormModel : public Wt::WFormModel setValue(VideoFileExtensionsField, Setting::getString(DboSession(), "video_file_extensions")); setValue(TagsHighLevelAcousticBrainz, Setting::getBool(DboSession(), "tags_highlevel_acousticbrainz")); + setValue(TagsHighLevelAcousticBrainzMinProbability, Setting::getInt(DboSession(), "tags_highlevel_acousticbrainz_min_probability")); setValue(TagsSimilarityAcousticBrainz, Setting::getBool(DboSession(), "tags_similarity_acousticbrainz")); } @@ -107,6 +113,7 @@ class DatabaseFormModel : public Wt::WFormModel Setting::setString(DboSession(), "video_file_extensions", boost::any_cast(value(VideoFileExtensionsField)).toUTF8()); Setting::setBool(DboSession(), "tags_highlevel_acousticbrainz", boost::any_cast(value(TagsHighLevelAcousticBrainz))); + Setting::setInt(DboSession(), "tags_highlevel_acousticbrainz_min_probability", std::stoi(boost::any_cast(value(TagsHighLevelAcousticBrainzMinProbability)).toUTF8())); Setting::setBool(DboSession(), "tags_similarity_acousticbrainz", boost::any_cast(value(TagsSimilarityAcousticBrainz))); } @@ -238,6 +245,13 @@ class DatabaseFormModel : public Wt::WFormModel return v; } + Wt::WValidator *createMinProbabilityValidator() + { + Wt::WIntValidator *v = new Wt::WIntValidator(50, 100); + v->setMandatory(true); + return v; + } + Wt::WStringListModel* _updatePeriodModel; Wt::WStringListModel* _updateStartTimeModel; @@ -248,6 +262,7 @@ const Wt::WFormModel::Field DatabaseFormModel::UpdateStartTimeField = "update-s const Wt::WFormModel::Field DatabaseFormModel::AudioFileExtensionsField = "audio-file-extensions"; const Wt::WFormModel::Field DatabaseFormModel::VideoFileExtensionsField = "video-file-extensions"; const Wt::WFormModel::Field DatabaseFormModel::TagsHighLevelAcousticBrainz = "tags-highlevel-acousticbrainz"; +const Wt::WFormModel::Field DatabaseFormModel::TagsHighLevelAcousticBrainzMinProbability = "tags-highlevel-acousticbrainz-min-probability"; const Wt::WFormModel::Field DatabaseFormModel::TagsSimilarityAcousticBrainz = "tags-similarity-acousticbrainz"; @@ -288,13 +303,24 @@ DatabaseFormView::DatabaseFormView(Wt::WContainerWidget *parent) videoFileExtensionsEdit->changed().connect(_applyInfo, &Wt::WWidget::hide); // Tags from AB high level - setFormWidget(DatabaseFormModel::TagsHighLevelAcousticBrainz, new Wt::WCheckBox()); + Wt::WCheckBox* highLevel = new Wt::WCheckBox(); + setFormWidget(DatabaseFormModel::TagsHighLevelAcousticBrainz, highLevel); + + setFormWidget(DatabaseFormModel::TagsHighLevelAcousticBrainzMinProbability, new Wt::WSpinBox()); + + highLevel->changed().connect(std::bind([=] { + _model->setReadOnly(DatabaseFormModel::TagsHighLevelAcousticBrainzMinProbability, + !(highLevel->checkState() == Wt::Checked)); + updateModel(_model); + updateViewField(_model, DatabaseFormModel::TagsHighLevelAcousticBrainzMinProbability); + })); // Tags from AB similarity setFormWidget(DatabaseFormModel::TagsSimilarityAcousticBrainz, new Wt::WCheckBox()); // Title & Buttons - bindString("title", "Database settings"); + bindString("scan-title", "Scan settings"); + bindString("tags-title", "Tag settings"); Wt::WPushButton *saveButton = new Wt::WPushButton("Apply"); bindWidget("apply-button", saveButton); From 147c0d752610f8c4ce0e1ee6f548becfce2ba622 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 30 May 2016 14:04:02 +0200 Subject: [PATCH 020/195] [DOC] updated TODO --- TODO | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index 1a37b681..f2173cb6 100644 --- a/TODO +++ b/TODO @@ -7,18 +7,18 @@ [Cover] - Handle preferred cover file names ("front.xxx", "cover.xxx", ...) -- Implement a cache and a grabber from some web service (mandatory for artists?) +- Implement a cache and a grabber from some web service (mandatory for artists?) coverartarchive.org [Database] +- Make filters using tags (support AND) + optim - Optim, use SQL query to get the "genre" orphans - Use Inotify like system to watch modified/added files? - handle access rights problems (instead of aborting) - add a global play counter for tracks. This will help people to spot most popular files -- rework the exception process in av/metadata/updater in case of bad files - Use the WServer::post method to notify the end of the database scan? (with results?) [Metadata] -- OGG metadata -> properly handle metadata nested in the audio stream +- WMA covers: add support [Playlist] - Make public playlists so that users can see what other people are listening to @@ -59,6 +59,7 @@ - TrackView: Reselect the current selected item when displaying the updated search results - Add keyboard shortcuts - playqueue: try to get a single div to display the cover / artist / track name in order to improve style + - Add a hint for the user to get the nature of tag (created from genre ? created from audio features?) [mobile] - Reorganize the views to ease internal paths - Covers not always the same height @@ -67,7 +68,6 @@ - Implement a play queue - Implement a decent player - Make the release/artist clickable when displayed to the user - [Video] - implement a decent mediaplayer - remove codec choice from parameters From f2b635d2633015721305320cfb245f468f3a4b18 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 4 Jun 2016 18:17:30 +0200 Subject: [PATCH 021/195] [DB] Source reorg --- src/Makefile.am | 6 +- src/database/DatabaseClassifier.cpp | 878 ------------------ src/database/DatabaseClassifier.hpp | 55 -- .../cluster/DatabaseSimilarityCluster.hpp | 0 src/database/tagger/GenreTagger.cpp | 40 - src/database/tagger/GenreTagger.hpp | 37 - .../DatabaseFeatureExtractor.cpp | 4 +- .../DatabaseFeatureExtractor.hpp | 6 +- .../DatabaseHighLevelCluster.cpp | 2 +- .../DatabaseHighLevelCluster.hpp | 6 +- .../{ => updater}/DatabaseUpdater.cpp | 5 +- .../{ => updater}/DatabaseUpdater.hpp | 23 +- src/main/main.cpp | 17 +- src/ui/settings/Settings.cpp | 2 +- 14 files changed, 44 insertions(+), 1037 deletions(-) delete mode 100644 src/database/DatabaseClassifier.cpp delete mode 100644 src/database/DatabaseClassifier.hpp delete mode 100644 src/database/cluster/DatabaseSimilarityCluster.hpp delete mode 100644 src/database/tagger/GenreTagger.cpp delete mode 100644 src/database/tagger/GenreTagger.hpp rename src/database/{ => updater}/DatabaseFeatureExtractor.cpp (96%) rename src/database/{ => updater}/DatabaseFeatureExtractor.hpp (86%) rename src/database/{cluster => updater}/DatabaseHighLevelCluster.cpp (98%) rename src/database/{cluster => updater}/DatabaseHighLevelCluster.hpp (86%) rename src/database/{ => updater}/DatabaseUpdater.cpp (99%) rename src/database/{ => updater}/DatabaseUpdater.hpp (90%) diff --git a/src/Makefile.am b/src/Makefile.am index 2e541383..568fb488 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,9 +7,7 @@ lms_SOURCES = \ $(srcdir)/config/Config.cpp \ $(srcdir)/cover/CoverArtGrabber.cpp \ $(srcdir)/database/Artist.cpp \ - $(srcdir)/database/DatabaseFeatureExtractor.cpp \ $(srcdir)/database/DatabaseHandler.cpp \ - $(srcdir)/database/DatabaseUpdater.cpp \ $(srcdir)/database/MediaDirectory.cpp \ $(srcdir)/database/Playlist.cpp \ $(srcdir)/database/Release.cpp \ @@ -19,7 +17,9 @@ lms_SOURCES = \ $(srcdir)/database/Track.cpp \ $(srcdir)/database/User.cpp \ $(srcdir)/database/Video.cpp \ - $(srcdir)/database/cluster/DatabaseHighLevelCluster.cpp \ + $(srcdir)/database/updater/DatabaseUpdater.cpp \ + $(srcdir)/database/updater/DatabaseFeatureExtractor.cpp \ + $(srcdir)/database/updater/DatabaseHighLevelCluster.cpp \ $(srcdir)/feature/FeatureExtractor.cpp \ $(srcdir)/feature/FeatureStore.cpp \ $(srcdir)/image/Image.cpp \ diff --git a/src/database/DatabaseClassifier.cpp b/src/database/DatabaseClassifier.cpp deleted file mode 100644 index 5aff1b00..00000000 --- a/src/database/DatabaseClassifier.cpp +++ /dev/null @@ -1,878 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ - -//#define BOOST_SPIRIT_THREADSAFE -#include - -#include "logger/Logger.hpp" -#include "feature/FeatureExtractor.hpp" - -#include "knnl/neural_net_headers.hpp" - -#include "DatabaseClassifier.hpp" - -namespace Database { - -Classifier::Classifier(Wt::Dbo::SqlConnectionPool& connectionPool) -: _db(connectionPool) -{} - -void -Classifier::processTrackUpdate(bool added, Track::id_type trackId, std::string mbid, boost::filesystem::path path) -{ - if (!added) - return; - - if (mbid.empty()) - { - // TODO compute from file - LMS_LOG(DBUPDATER, INFO) << "File '" << path << "' has no MBID: skipping feature extraction"; - return; - } - - boost::property_tree::ptree pt; - if (::Feature::Extractor::getLowLevel(pt, mbid)) - { - std::ostringstream oss; - boost::property_tree::write_json(oss, pt); - - { - Wt::Dbo::Transaction transaction(_db.getSession()); - - Track::pointer track = Database::Track::getById(_db.getSession(), trackId); - Feature::create( _db.getSession(), track, "low_level", oss.str()); - } - } - - pt.clear(); - if (::Feature::Extractor::getHighLevel(pt, mbid)) - { - std::ostringstream oss; - boost::property_tree::write_json(oss, pt); - - { - Wt::Dbo::Transaction transaction(_db.getSession()); - - Track::pointer track = Database::Track::getById(_db.getSession(), trackId); - Feature::create( _db.getSession(), track, "high_level", oss.str()); - } - } -} - -typedef std::vector entry_t; -typedef std::vector Entries; - -static bool entryAddData(entry_t& entry, const boost::property_tree::ptree& pt, std::size_t nbDimensions) -{ - if (pt.empty() && nbDimensions == 1) - { - double value = std::stod(pt.data()); - entry.push_back(value); - - return true; - } - - if (pt.size() == nbDimensions) - { - for (auto it : pt) - { - double value = std::stod(it.second.data()); - entry.push_back(value); - } - - return true; - } - - LMS_LOG(DBUPDATER, DEBUG) << "Bad entry"; - - return false; -} - -struct FeatureDesc -{ - std::string lowLevelName; - std::size_t nbDimensions; - double coeff; -}; - -static std::vector features = -{ -// { "lowlevel.average_loudness", 1, 1.0 }, -// { "lowlevel.barkbands.dmean", 27, 1.0 }, -// { "lowlevel.barkbands.dmean2", 27, 1.0 }, -// { "lowlevel.barkbands.dvar", 27, 1.0 }, -// { "lowlevel.barkbands.dvar2", 27, 1.0 }, -// { "lowlevel.barkbands.max", 27, 1.0 }, -// { "lowlevel.barkbands.mean", 27, 1.0 }, -// { "lowlevel.barkbands.median", 27, 1.0 }, -// { "lowlevel.barkbands.min", 27, 1.0 }, -// { "lowlevel.barkbands.var", 27, 1.0 }, -// { "lowlevel.barkbands_crest.dmean", 1, 1.0 }, -// { "lowlevel.barkbands_crest.dmean2", 1, 1.0 }, -// { "lowlevel.barkbands_crest.dvar", 1, 1.0 }, -// { "lowlevel.barkbands_crest.dvar2", 1, 1.0 }, -// { "lowlevel.barkbands_crest.max", 1, 1.0 }, -// { "lowlevel.barkbands_crest.mean", 1, 1.0 }, -// { "lowlevel.barkbands_crest.median", 1, 1.0 }, -// { "lowlevel.barkbands_crest.min", 1, 1.0 }, -// { "lowlevel.barkbands_crest.var", 1, 1.0 }, -// { "lowlevel.barkbands_flatness_db.dmean", 1, 1.0 }, -// { "lowlevel.barkbands_flatness_db.dmean2", 1, 1.0 }, -// { "lowlevel.barkbands_flatness_db.dvar", 1, 1.0 }, -// { "lowlevel.barkbands_flatness_db.dvar2", 1, 1.0 }, -// { "lowlevel.barkbands_flatness_db.max", 1, 1.0 }, -// { "lowlevel.barkbands_flatness_db.mean", 1, 1.0 }, -// { "lowlevel.barkbands_flatness_db.median", 1, 1.0 }, -// { "lowlevel.barkbands_flatness_db.min", 1, 1.0 }, -// { "lowlevel.barkbands_flatness_db.var", 1, 1.0 }, -// { "lowlevel.barkbands_kurtosis.dmean", 1, 1.0 }, -// { "lowlevel.barkbands_kurtosis.dmean2", 1, 1.0 }, -// { "lowlevel.barkbands_kurtosis.dvar", 1, 1.0 }, -// { "lowlevel.barkbands_kurtosis.dvar2", 1, 1.0 }, -// { "lowlevel.barkbands_kurtosis.max", 1, 1.0 }, -// { "lowlevel.barkbands_kurtosis.mean", 1, 1.0 }, -// { "lowlevel.barkbands_kurtosis.median", 1, 1.0 }, -// { "lowlevel.barkbands_kurtosis.min", 1, 1.0 }, -// { "lowlevel.barkbands_kurtosis.var", 1, 1.0 }, -// { "lowlevel.barkbands_skewness.dmean", 1, 1.0 }, -// { "lowlevel.barkbands_skewness.dmean2", 1, 1.0 }, -// { "lowlevel.barkbands_skewness.dvar", 1, 1.0 }, -// { "lowlevel.barkbands_skewness.dvar2", 1, 1.0 }, -// { "lowlevel.barkbands_skewness.max", 1, 1.0 }, -// { "lowlevel.barkbands_skewness.mean", 1, 1.0 }, -// { "lowlevel.barkbands_skewness.median", 1, 1.0 }, -// { "lowlevel.barkbands_skewness.min", 1, 1.0 }, -// { "lowlevel.barkbands_skewness.var", 1, 1.0 }, -// { "lowlevel.barkbands_spread.dmean", 1, 1.0 }, -// { "lowlevel.barkbands_spread.dmean2", 1, 1.0 }, -// { "lowlevel.barkbands_spread.dvar", 1, 1.0 }, -// { "lowlevel.barkbands_spread.dvar2", 1, 1.0 }, -// { "lowlevel.barkbands_spread.max", 1, 1.0 }, -// { "lowlevel.barkbands_spread.mean", 1, 1.0 }, -// { "lowlevel.barkbands_spread.median", 1, 1.0 }, -// { "lowlevel.barkbands_spread.min", 1, 1.0 }, -// { "lowlevel.barkbands_spread.var", 1, 1.0 }, -// { "lowlevel.dissonance.dmean", 1, 1.0 }, -// { "lowlevel.dissonance.dmean2", 1, 1.0 }, -// { "lowlevel.dissonance.dvar", 1, 1.0 }, -// { "lowlevel.dissonance.dvar2", 1, 1.0 }, -// { "lowlevel.dissonance.max", 1, 1.0 }, -// { "lowlevel.dissonance.mean", 1, 1.0 }, -// { "lowlevel.dissonance.median", 1, 1.0 }, -// { "lowlevel.dissonance.min", 1, 1.0 }, -// { "lowlevel.dissonance.var", 1, 1.0 }, -// { "lowlevel.dynamic_complexity", 1, 1.0 }, -// { "lowlevel.erbbands.dmean", 40, 1.0 }, -// { "lowlevel.erbbands.dmean2", 40, 1.0 }, -// { "lowlevel.erbbands.dvar", 40, 1.0 }, -// { "lowlevel.erbbands.dvar2", 40, 1.0 }, -// { "lowlevel.erbbands.max", 40, 1.0 }, -// { "lowlevel.erbbands.mean", 40, 1.0 }, -// { "lowlevel.erbbands.median", 40, 1.0 }, -// { "lowlevel.erbbands.min", 40, 1.0 }, -// { "lowlevel.erbbands.var", 40, 1.0 }, -// { "lowlevel.erbbands_crest.dmean", 1, 1.0 }, -// { "lowlevel.erbbands_crest.dmean2", 1, 1.0 }, -// { "lowlevel.erbbands_crest.dvar", 1, 1.0 }, -// { "lowlevel.erbbands_crest.dvar2", 1, 1.0 }, -// { "lowlevel.erbbands_crest.max", 1, 1.0 }, -// { "lowlevel.erbbands_crest.mean", 1, 1.0 }, -// { "lowlevel.erbbands_crest.median", 1, 1.0 }, -// { "lowlevel.erbbands_crest.min", 1, 1.0 }, -// { "lowlevel.erbbands_crest.var", 1, 1.0 }, -// { "lowlevel.erbbands_flatness_db.dmean", 1, 1.0 }, -// { "lowlevel.erbbands_flatness_db.dmean2", 1, 1.0 }, -// { "lowlevel.erbbands_flatness_db.dvar", 1, 1.0 }, -// { "lowlevel.erbbands_flatness_db.dvar2", 1, 1.0 }, -// { "lowlevel.erbbands_flatness_db.max", 1, 1.0 }, -// { "lowlevel.erbbands_flatness_db.mean", 1, 1.0 }, -// { "lowlevel.erbbands_flatness_db.median", 1, 1.0 }, -// { "lowlevel.erbbands_flatness_db.min", 1, 1.0 }, -// { "lowlevel.erbbands_flatness_db.var", 1, 1.0 }, -// { "lowlevel.erbbands_kurtosis.dmean", 1, 1.0 }, -// { "lowlevel.erbbands_kurtosis.dmean2", 1, 1.0 }, -// { "lowlevel.erbbands_kurtosis.dvar", 1, 1.0 }, -// { "lowlevel.erbbands_kurtosis.dvar2", 1, 1.0 }, -// { "lowlevel.erbbands_kurtosis.max", 1, 1.0 }, -// { "lowlevel.erbbands_kurtosis.mean", 1, 1.0 }, -// { "lowlevel.erbbands_kurtosis.median", 1, 1.0 }, -// { "lowlevel.erbbands_kurtosis.min", 1, 1.0 }, -// { "lowlevel.erbbands_kurtosis.var", 1, 1.0 }, -// { "lowlevel.erbbands_skewness.dmean", 1, 1.0 }, -// { "lowlevel.erbbands_skewness.dmean2", 1, 1.0 }, -// { "lowlevel.erbbands_skewness.dvar", 1, 1.0 }, -// { "lowlevel.erbbands_skewness.dvar2", 1, 1.0 }, -// { "lowlevel.erbbands_skewness.max", 1, 1.0 }, -// { "lowlevel.erbbands_skewness.mean", 1, 1.0 }, -// { "lowlevel.erbbands_skewness.median", 1, 1.0 }, -// { "lowlevel.erbbands_skewness.min", 1, 1.0 }, -// { "lowlevel.erbbands_skewness.var", 1, 1.0 }, -// { "lowlevel.erbbands_spread.dmean", 1, 1.0 }, -// { "lowlevel.erbbands_spread.dmean2", 1, 1.0 }, -// { "lowlevel.erbbands_spread.dvar", 1, 1.0 }, -// { "lowlevel.erbbands_spread.dvar2", 1, 1.0 }, -// { "lowlevel.erbbands_spread.max", 1, 1.0 }, -// { "lowlevel.erbbands_spread.mean", 1, 1.0 }, -// { "lowlevel.erbbands_spread.median", 1, 1.0 }, -// { "lowlevel.erbbands_spread.min", 1, 1.0 }, -// { "lowlevel.erbbands_spread.var", 1, 1.0 }, -// { "lowlevel.gfcc.mean", 13, 1.0 }, -// { "lowlevel.hfc.dmean", 1, 1.0 }, -// { "lowlevel.hfc.dmean2", 1, 1.0 }, -// { "lowlevel.hfc.dvar", 1, 1.0 }, -// { "lowlevel.hfc.dvar2", 1, 1.0 }, -// { "lowlevel.hfc.max", 1, 1.0 }, -// { "lowlevel.hfc.mean", 1, 1.0 }, -// { "lowlevel.hfc.median", 1, 1.0 }, -// { "lowlevel.hfc.min", 1, 1.0 }, -// { "lowlevel.hfc.var", 1, 1.0 }, -// { "lowlevel.melbands.dmean", 40, 1.0 }, -// { "lowlevel.melbands.dmean2", 40, 1.0 }, -// { "lowlevel.melbands.dvar", 40, 1.0 }, -// { "lowlevel.melbands.dvar2", 40, 1.0 }, -// { "lowlevel.melbands.max", 40, 1.0 }, -// { "lowlevel.melbands.mean", 40, 1.0 }, -// { "lowlevel.melbands.median", 40, 1.0 }, -// { "lowlevel.melbands.min", 40, 1.0 }, -// { "lowlevel.melbands.var", 40, 1.0 }, -// { "lowlevel.melbands_crest.dmean", 1, 1.0 }, -// { "lowlevel.melbands_crest.dmean2", 1, 1.0 }, -// { "lowlevel.melbands_crest.dvar", 1, 1.0 }, -// { "lowlevel.melbands_crest.dvar2", 1, 1.0 }, -// { "lowlevel.melbands_crest.max", 1, 1.0 }, -// { "lowlevel.melbands_crest.mean", 1, 1.0 }, -// { "lowlevel.melbands_crest.median", 1, 1.0 }, -// { "lowlevel.melbands_crest.min", 1, 1.0 }, -// { "lowlevel.melbands_crest.var", 1, 1.0 }, -// { "lowlevel.melbands_flatness_db.dmean", 1, 1.0 }, -// { "lowlevel.melbands_flatness_db.dmean2", 1, 1.0 }, -// { "lowlevel.melbands_flatness_db.dvar", 1, 1.0 }, -// { "lowlevel.melbands_flatness_db.dvar2", 1, 1.0 }, -// { "lowlevel.melbands_flatness_db.max", 1, 1.0 }, -// { "lowlevel.melbands_flatness_db.mean", 1, 1.0 }, -// { "lowlevel.melbands_flatness_db.median", 1, 1.0 }, -// { "lowlevel.melbands_flatness_db.min", 1, 1.0 }, -// { "lowlevel.melbands_flatness_db.var", 1, 1.0 }, -// { "lowlevel.melbands_kurtosis.dmean", 1, 1.0 }, -// { "lowlevel.melbands_kurtosis.dmean2", 1, 1.0 }, -// { "lowlevel.melbands_kurtosis.dvar", 1, 1.0 }, -// { "lowlevel.melbands_kurtosis.dvar2", 1, 1.0 }, -// { "lowlevel.melbands_kurtosis.max", 1, 1.0 }, -// { "lowlevel.melbands_kurtosis.mean", 1, 1.0 }, -// { "lowlevel.melbands_kurtosis.median", 1, 1.0 }, -// { "lowlevel.melbands_kurtosis.min", 1, 1.0 }, -// { "lowlevel.melbands_kurtosis.var", 1, 1.0 }, -// { "lowlevel.melbands_spread.dmean", 1, 1.0 }, -// { "lowlevel.melbands_spread.dmean2", 1, 1.0 }, -// { "lowlevel.melbands_spread.dvar", 1, 1.0 }, -// { "lowlevel.melbands_spread.dvar2", 1, 1.0 }, -// { "lowlevel.melbands_spread.max", 1, 1.0 }, -// { "lowlevel.melbands_spread.mean", 1, 1.0 }, -// { "lowlevel.melbands_spread.median", 1, 1.0 }, -// { "lowlevel.melbands_spread.min", 1, 1.0 }, -// { "lowlevel.melbands_spread.var", 1, 1.0 }, -// { "lowlevel.mfcc.mean", 13, 1.0 }, -// { "lowlevel.pitch_salience.dmean", 1, 1.0 }, -// { "lowlevel.pitch_salience.dmean2", 1, 1.0 }, -// { "lowlevel.pitch_salience.dvar", 1, 1.0 }, -// { "lowlevel.pitch_salience.dvar2", 1, 1.0 }, -// { "lowlevel.pitch_salience.max", 1, 1.0 }, -// { "lowlevel.pitch_salience.mean", 1, 1.0 }, -// { "lowlevel.pitch_salience.median", 1, 1.0 }, -// { "lowlevel.pitch_salience.min", 1, 1.0 }, -// { "lowlevel.pitch_salience.var", 1, 1.0 }, -// { "lowlevel.silence_rate_20dB.dmean", 1, 1.0 }, -// { "lowlevel.silence_rate_20dB.dmean2", 1, 1.0 }, -// { "lowlevel.silence_rate_20dB.dvar", 1, 1.0 }, -// { "lowlevel.silence_rate_20dB.dvar2", 1, 1.0 }, -// { "lowlevel.silence_rate_20dB.max", 1, 1.0 }, -// { "lowlevel.silence_rate_20dB.mean", 1, 1.0 }, -// { "lowlevel.silence_rate_20dB.median", 1, 1.0 }, -// { "lowlevel.silence_rate_20dB.min", 1, 1.0 }, -// { "lowlevel.silence_rate_20dB.var", 1, 1.0 }, -// { "lowlevel.silence_rate_30dB.dmean", 1, 1.0 }, -// { "lowlevel.silence_rate_30dB.dmean2", 1, 1.0 }, -// { "lowlevel.silence_rate_30dB.dvar", 1, 1.0 }, -// { "lowlevel.silence_rate_30dB.dvar2", 1, 1.0 }, -// { "lowlevel.silence_rate_30dB.max", 1, 1.0 }, -// { "lowlevel.silence_rate_30dB.mean", 1, 1.0 }, -// { "lowlevel.silence_rate_30dB.median", 1, 1.0 }, -// { "lowlevel.silence_rate_30dB.min", 1, 1.0 }, -// { "lowlevel.silence_rate_30dB.var", 1, 1.0 }, -// { "lowlevel.silence_rate_60dB.dmean", 1, 1.0 }, -// { "lowlevel.silence_rate_60dB.dmean2", 1, 1.0 }, -// { "lowlevel.silence_rate_60dB.dvar", 1, 1.0 }, -// { "lowlevel.silence_rate_60dB.dvar2", 1, 1.0 }, -// { "lowlevel.silence_rate_60dB.max", 1, 1.0 }, -// { "lowlevel.silence_rate_60dB.mean", 1, 1.0 }, -// { "lowlevel.silence_rate_60dB.median", 1, 1.0 }, -// { "lowlevel.silence_rate_60dB.min", 1, 1.0 }, -// { "lowlevel.silence_rate_60dB.var", 1, 1.0 }, -// { "lowlevel.spectral_centroid.dmean", 1, 1.0 }, -// { "lowlevel.spectral_centroid.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_centroid.dvar", 1, 1.0 }, -// { "lowlevel.spectral_centroid.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_centroid.max", 1, 1.0 }, - { "lowlevel.spectral_centroid.mean", 1, 1.0 }, -// { "lowlevel.spectral_centroid.median", 1, 1.0 }, -// { "lowlevel.spectral_centroid.min", 1, 1.0 }, - { "lowlevel.spectral_centroid.var", 1, 1.0 }, -// { "lowlevel.spectral_complexity.dmean", 1, 1.0 }, -// { "lowlevel.spectral_complexity.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_complexity.dvar", 1, 1.0 }, -// { "lowlevel.spectral_complexity.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_complexity.max", 1, 1.0 }, - { "lowlevel.spectral_complexity.mean", 1, 1.0 }, -// { "lowlevel.spectral_complexity.median", 1, 1.0 }, -// { "lowlevel.spectral_complexity.min", 1, 1.0 }, - { "lowlevel.spectral_complexity.var", 1, 1.0 }, -// { "lowlevel.spectral_decrease.dmean", 1, 1.0 }, -// { "lowlevel.spectral_decrease.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_decrease.dvar", 1, 1.0 }, -// { "lowlevel.spectral_decrease.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_decrease.max", 1, 1.0 }, - { "lowlevel.spectral_decrease.mean", 1, 1.0 }, -// { "lowlevel.spectral_decrease.median", 1, 1.0 }, -// { "lowlevel.spectral_decrease.min", 1, 1.0 }, - { "lowlevel.spectral_decrease.var", 1, 1.0 }, -// { "lowlevel.spectral_energy.dmean", 1, 1.0 }, -// { "lowlevel.spectral_energy.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_energy.dvar", 1, 1.0 }, -// { "lowlevel.spectral_energy.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_energy.max", 1, 1.0 }, - { "lowlevel.spectral_energy.mean", 1, 1.0 }, -// { "lowlevel.spectral_energy.median", 1, 1.0 }, -// { "lowlevel.spectral_energy.min", 1, 1.0 }, - { "lowlevel.spectral_energy.var", 1, 1.0 }, -// { "lowlevel.spectral_energyband_low.dmean", 1, 1.0 }, -// { "lowlevel.spectral_energyband_low.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_energyband_low.dvar", 1, 1.0 }, -// { "lowlevel.spectral_energyband_low.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_energyband_low.max", 1, 1.0 }, - { "lowlevel.spectral_energyband_low.mean", 1, 1.0 }, -// { "lowlevel.spectral_energyband_low.median", 1, 1.0 }, -// { "lowlevel.spectral_energyband_low.min", 1, 1.0 }, - { "lowlevel.spectral_energyband_low.var", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_high.dmean", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_high.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_high.dvar", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_high.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_high.max", 1, 1.0 }, - { "lowlevel.spectral_energyband_middle_high.mean", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_high.median", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_high.min", 1, 1.0 }, - { "lowlevel.spectral_energyband_middle_high.var", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_low.dmean", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_low.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_low.dvar", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_low.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_low.max", 1, 1.0 }, - { "lowlevel.spectral_energyband_middle_low.mean", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_low.median", 1, 1.0 }, -// { "lowlevel.spectral_energyband_middle_low.min", 1, 1.0 }, - { "lowlevel.spectral_energyband_middle_low.var", 1, 1.0 }, -// { "lowlevel.spectral_entropy.dmean", 1, 1.0 }, -// { "lowlevel.spectral_entropy.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_entropy.dvar", 1, 1.0 }, -// { "lowlevel.spectral_entropy.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_entropy.max", 1, 1.0 }, - { "lowlevel.spectral_entropy.mean", 1, 1.0 }, -// { "lowlevel.spectral_entropy.median", 1, 1.0 }, -// { "lowlevel.spectral_entropy.min", 1, 1.0 }, - { "lowlevel.spectral_entropy.var", 1, 1.0 }, -// { "lowlevel.spectral_flux.dmean", 1, 1.0 }, -// { "lowlevel.spectral_flux.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_flux.dvar", 1, 1.0 }, -// { "lowlevel.spectral_flux.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_flux.max", 1, 1.0 }, -// { "lowlevel.spectral_flux.mean", 1, 1.0 }, -// { "lowlevel.spectral_flux.median", 1, 1.0 }, -// { "lowlevel.spectral_flux.min", 1, 1.0 }, -// { "lowlevel.spectral_flux.var", 1, 1.0 }, -// { "lowlevel.spectral_kurtosis.dmean", 1, 1.0 }, -// { "lowlevel.spectral_kurtosis.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_kurtosis.dvar", 1, 1.0 }, -// { "lowlevel.spectral_kurtosis.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_kurtosis.max", 1, 1.0 }, -// { "lowlevel.spectral_kurtosis.mean", 1, 1.0 }, -// { "lowlevel.spectral_kurtosis.median", 1, 1.0 }, -// { "lowlevel.spectral_kurtosis.min", 1, 1.0 }, -// { "lowlevel.spectral_kurtosis.var", 1, 1.0 }, -// { "lowlevel.spectral_rms.dmean", 1, 1.0 }, -// { "lowlevel.spectral_rms.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_rms.dvar", 1, 1.0 }, -// { "lowlevel.spectral_rms.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_rms.max", 1, 1.0 }, - { "lowlevel.spectral_rms.mean", 1, 1.0 }, -// { "lowlevel.spectral_rms.median", 1, 1.0 }, -// { "lowlevel.spectral_rms.min", 1, 1.0 }, - { "lowlevel.spectral_rms.var", 1, 1.0 }, -// { "lowlevel.spectral_rolloff.dmean", 1, 1.0 }, -// { "lowlevel.spectral_rolloff.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_rolloff.dvar", 1, 1.0 }, -// { "lowlevel.spectral_rolloff.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_rolloff.max", 1, 1.0 }, -// { "lowlevel.spectral_rolloff.mean", 1, 1.0 }, -// { "lowlevel.spectral_rolloff.median", 1, 1.0 }, -// { "lowlevel.spectral_rolloff.min", 1, 1.0 }, -// { "lowlevel.spectral_rolloff.var", 1, 1.0 }, -// { "lowlevel.spectral_skewness.dmean", 1, 1.0 }, -// { "lowlevel.spectral_skewness.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_skewness.dvar", 1, 1.0 }, -// { "lowlevel.spectral_skewness.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_skewness.max", 1, 1.0 }, -// { "lowlevel.spectral_skewness.mean", 1, 1.0 }, -// { "lowlevel.spectral_skewness.median", 1, 1.0 }, -// { "lowlevel.spectral_skewness.min", 1, 1.0 }, -// { "lowlevel.spectral_skewness.var", 1, 1.0 }, -// { "lowlevel.spectral_spread.dmean", 1, 1.0 }, -// { "lowlevel.spectral_spread.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_spread.dvar", 1, 1.0 }, -// { "lowlevel.spectral_spread.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_spread.max", 1, 1.0 }, - { "lowlevel.spectral_spread.mean", 1, 1.0 }, -// { "lowlevel.spectral_spread.median", 1, 1.0 }, -// { "lowlevel.spectral_spread.min", 1, 1.0 }, - { "lowlevel.spectral_spread.var", 1, 1.0 }, -// { "lowlevel.spectral_strongpeak.dmean", 1, 1.0 }, -// { "lowlevel.spectral_strongpeak.dmean2", 1, 1.0 }, -// { "lowlevel.spectral_strongpeak.dvar", 1, 1.0 }, -// { "lowlevel.spectral_strongpeak.dvar2", 1, 1.0 }, -// { "lowlevel.spectral_strongpeak.max", 1, 1.0 }, - { "lowlevel.spectral_strongpeak.mean", 1, 1.0 }, -// { "lowlevel.spectral_strongpeak.median", 1, 1.0 }, -// { "lowlevel.spectral_strongpeak.min", 1, 1.0 }, - { "lowlevel.spectral_strongpeak.var", 1, 1.0 }, -// { "lowlevel.zerocrossingrate.dmean", 1, 1.0 }, -// { "lowlevel.zerocrossingrate.dmean2", 1, 1.0 }, -// { "lowlevel.zerocrossingrate.dvar", 1, 1.0 }, -// { "lowlevel.zerocrossingrate.dvar2", 1, 1.0 }, -// { "lowlevel.zerocrossingrate.max", 1, 1.0 }, - { "lowlevel.zerocrossingrate.mean", 1, 1.0 }, -// { "lowlevel.zerocrossingrate.median", 1, 1.0 }, -// { "lowlevel.zerocrossingrate.min", 1, 1.0 }, - { "lowlevel.zerocrossingrate.var", 1, 1.0 }, -// { "rhythm.beats_count", 1, 1.0 }, -// { "rhythm.beats_loudness.dmean", 1, 1.0 }, -// { "rhythm.beats_loudness.dmean2", 1, 1.0 }, -// { "rhythm.beats_loudness.dvar", 1, 1.0 }, -// { "rhythm.beats_loudness.dvar2", 1, 1.0 }, -// { "rhythm.beats_loudness.max", 1, 1.0 }, - { "rhythm.beats_loudness.mean", 1, 1.0 }, -// { "rhythm.beats_loudness.median", 1, 1.0 }, -// { "rhythm.beats_loudness.min", 1, 1.0 }, - { "rhythm.beats_loudness.var", 1, 1.0 }, -// { "rhythm.bpm", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_bpm.dmean", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_bpm.dmean2", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_bpm.dvar", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_bpm.dvar2", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_bpm.max", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_bpm.mean", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_bpm.median", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_bpm.min", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_bpm.var", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_spread.dmean", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_spread.dmean2", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_spread.dvar", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_spread.dvar2", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_spread.max", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_spread.mean", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_spread.median", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_spread.min", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_spread.var", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_weight.dmean", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_weight.dmean2", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_weight.dvar", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_weight.dvar2", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_weight.max", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_weight.mean", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_weight.median", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_weight.min", 1, 1.0 }, -// { "rhythm.bpm_histogram_first_peak_weight.var", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_bpm.dmean", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_bpm.dmean2", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_bpm.dvar", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_bpm.dvar2", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_bpm.max", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_bpm.mean", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_bpm.median", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_bpm.min", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_bpm.var", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_spread.dmean", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_spread.dmean2", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_spread.dvar", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_spread.dvar2", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_spread.max", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_spread.mean", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_spread.median", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_spread.min", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_spread.var", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_weight.dmean", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_weight.dmean2", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_weight.dvar", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_weight.dvar2", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_weight.max", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_weight.mean", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_weight.median", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_weight.min", 1, 1.0 }, -// { "rhythm.bpm_histogram_second_peak_weight.var", 1, 1.0 }, -// { "rhythm.danceability", 1, 1.0}, -// { "rhythm.onset_rate", 1, 1.0}, -// -// { "tonal.chords_changes_rate", 1, 1.0 }, -// { "tonal.chords_histogram", 24, 1.0 }, -// { "tonal.chords_number_rate", 1, 1.0 }, -// { "tonal.hpcp_entropy.dmean", 1, 1.0 }, -// { "tonal.hpcp_entropy.dmean2", 1, 1.0 }, -// { "tonal.hpcp_entropy.dvar", 1, 1.0 }, -// { "tonal.hpcp_entropy.dvar2", 1, 1.0 }, -// { "tonal.hpcp_entropy.max", 1, 1.0 }, -// { "tonal.hpcp_entropy.mean", 1, 1.0 }, -// { "tonal.hpcp_entropy.median", 1, 1.0 }, -// { "tonal.hpcp_entropy.min", 1, 1.0 }, -// { "tonal.hpcp_entropy.var", 1, 1.0 }, -// { "tonal.tuning_frequency", 1, 1.0 }, -}; - -static bool entryConstructFromJSON(entry_t& entry, const std::string& jsonData) -{ - std::istringstream iss(jsonData); - boost::property_tree::ptree pt; - boost::property_tree::json_parser::read_json(iss, pt); - - for (auto& elem : features) - { - auto child = pt.get_child_optional(elem.lowLevelName); - - if (!child) - { - LMS_LOG(DBUPDATER, DEBUG) << "Cannot get '" << elem.lowLevelName << "'"; - return false; - } - - if (!entryAddData(entry, *child, elem.nbDimensions)) - return false; - } - - return true; -} - -static entry_t computeWeightCoeffs(const Entries& entries) -{ - std::vector expandedFeatures; - std::vector userCoeffs; - - for (auto& feature : features) - { - for (std::size_t i = 0; i < feature.nbDimensions; ++i) - { - expandedFeatures.push_back( { feature.lowLevelName + std::to_string(i), 1, feature.coeff / (double)feature.nbDimensions} ); - } - } - - entry_t coeffs; - - ::neural_net::Ranges ranges (*entries.begin()); - ranges( entries ); - - entry_t::const_iterator pos_max = ranges.get_max().begin(); - entry_t::const_iterator pos_min = ranges.get_min().begin(); - for (std::size_t i = 0; pos_max != ranges.get_max().end(); ++pos_max, ++pos_min, ++i) - { - coeffs.push_back( expandedFeatures.at(i).coeff * - ::operators::inverse ( - ( *pos_max - *pos_min ) * ( *pos_max - *pos_min ) - ) ); // weight for i-th axis - std::cout << "Feature = " << expandedFeatures.at(i).lowLevelName << std::endl; - std::cout << "min = " << *pos_min << ", max = " << *pos_max << std::endl; - std::cout << "Coeff = " << coeffs.back() << std::endl; - } - return coeffs; -} - template - using Matrix = std::array, ROW>; - -void -Classifier::processDatabaseUpdate(Updater::Stats stats) -{ - LMS_LOG(DBUPDATER, DEBUG) << "Database complete Called!"; - -// typedef ::neural_net::Cauchy_function < entry_t::value_type, entry_t::value_type, ::boost::int32_t> CauchyFunction; - - typedef ::neural_net::Gauss_function < entry_t::value_type, entry_t::value_type, ::boost::int32_t > GaussFunction; - -// typedef ::distance::Euclidean_distance_function < entry_t > EuclideanDistFunction; - typedef ::distance::Weighted_euclidean_distance_function < entry_t, entry_t > WeightedEuclideanDistFunction; - - typedef ::neural_net::Basic_neuron < GaussFunction, WeightedEuclideanDistFunction > KohonenNeuron; - typedef ::neural_net::Rectangular_container < KohonenNeuron > KohonenNetwork; - -// typedef ::neural_net::Hexagonal_topology < ::boost::int32_t > HexagonalTopology; - typedef ::neural_net::Max_topology < ::boost::int32_t > MaxTopology; - - typedef GaussFunction GaussFunctionSpace; - typedef ::neural_net::Gauss_function < ::boost::int32_t, entry_t::value_type, ::boost::int32_t > GaussFunctionNet; -// typedef ::neural_net::Constant_function < entry_t::value_type, entry_t::value_type > ConstFuncSpace; - - typedef ::neural_net::Classic_training_weight - < - entry_t, - ::boost::int32_t, - GaussFunctionNet, - GaussFunctionSpace, - MaxTopology, - WeightedEuclideanDistFunction, - ::boost::int32_t - > ClassicWeight; - - typedef ::neural_net::Wtm_classical_training_functional - < - entry_t, - double, - ::boost::int32_t, - ::boost::int32_t, - ClassicWeight - > WtmTrainingFunc; - - typedef ::neural_net::Wtm_training_algorithm - < - KohonenNetwork, - entry_t, - Entries::iterator, - WtmTrainingFunc, - ::boost::int32_t - > WtmTrainingAlg; - - Entries entries; - - LMS_LOG(DBUPDATER, DEBUG) << "Getting track ids"; - - std::vector trackIdsAll = Database::Track::getAllIds(_db.getSession()); - - ::std::random_shuffle ( trackIdsAll.begin(), trackIdsAll.end() ); - - LMS_LOG(DBUPDATER, DEBUG) << "Getting JSON data"; - std::vector trackIds; - for (Track::id_type trackId : trackIdsAll) - { - std::string jsonData; - - { - Wt::Dbo::Transaction transaction(_db.getSession()); - - std::vector features = Feature::getByTrack(_db.getSession(), trackId, "low_level"); - - if (features.empty()) - { - LMS_LOG(DBUPDATER, DEBUG) << "No JSON data for track " << trackId;; - continue; - } - - jsonData = features.front()->getValue(); - } - - entry_t entry; - if (entryConstructFromJSON(entry, jsonData)) - { - trackIds.push_back(trackId); - entries.push_back(entry); - } - else - { - LMS_LOG(DBUPDATER, ERROR) << "Skipping track " << trackId; - continue; - } - -// if (entries.size() > 100) -// break; - } - std::cout << "Feature vector dimension = " << entries.front().size() << std::endl; - - if (entries.empty()) - return; - - // TODO compute rows / columns from the DBB - const std::size_t nbRows = 32; - const std::size_t nbColumns = 32; - - // CauchyFunction cauchyFunc(2.0, 1); - GaussFunction gaussFunc(2.0, 1 ); - - LMS_LOG(DBUPDATER, DEBUG) << "Computing coeffs"; - entry_t coeffs = computeWeightCoeffs(entries); - LMS_LOG(DBUPDATER, DEBUG) << "Initializing distfunc"; - WeightedEuclideanDistFunction weightedEuclideanDistFunc (&coeffs); - - // prepare randomization policy - ::neural_net::Internal_randomize internalRandomize; - - KohonenNetwork network; - - // generate networks initialized by data - LMS_LOG(DBUPDATER, DEBUG) << "Generating network..."; - ::neural_net::generate_kohonen_network(nbRows, nbColumns, gaussFunc, weightedEuclideanDistFunc, entries, network, internalRandomize); - - ::std::cout << "Network weights:" << ::std::endl; - ::neural_net::print_network_weights ( ::std::cout, network ); - ::std::cout << ::std::endl; - - GaussFunctionNet gaussFuncNetwork(10, 1); - GaussFunctionSpace gaussFuncSpace(10, 1); - MaxTopology maxTopology; -// EuclideanDistFunction euclideanDistFunc; - - ClassicWeight classicWeight(gaussFuncNetwork, gaussFuncSpace, maxTopology, weightedEuclideanDistFunc); - WtmTrainingFunc trainingFunc(classicWeight, 0.3); - - WtmTrainingAlg wtmTrainAlg( trainingFunc ); - - LMS_LOG(DBUPDATER, DEBUG) << "Training..."; - // tricky training - std::size_t nbPass = 20; - for (std::size_t i = 0; i < nbPass; ++i ) - { - LMS_LOG(DBUPDATER, DEBUG) << "Training pass " << i << " / " << nbPass; - // train network using data - auto entries_copy = entries; - ::std::random_shuffle ( entries_copy.begin(), entries_copy.end() ); - - wtmTrainAlg(entries_copy.begin(), entries_copy.end(), &network); - - // decrease sigma parameter in network will make training proces more sharpen with each epoch, - // but it have to be done slowly :-) - wtmTrainAlg.training_functional.generalized_training_weight.network_function.sigma *= 2.0/3.0; -// wtmTrainAlg.training_functional.generalized_training_weight.network_function.sigma *= 9.0/10.0; - - // shuffle data -// ::std::random_shuffle ( entries.begin(), entries.end() ); - } - LMS_LOG(DBUPDATER, DEBUG) << "Training DONE..."; - - ::std::cout << "Network weights:" << ::std::endl; - ::neural_net::print_network_weights ( ::std::cout, network ); - ::std::cout << ::std::endl; - - struct ClusterEntry - { - Track::id_type trackId; - entry_t entry; - double distance; - }; - - Matrix, nbRows, nbColumns> trackClusters; - - for (std::size_t id = 0; id < entries.size(); ++id) - { - std::cout << "Entry " << id << " : " << std::endl; - // Display input vector - for (auto& value : entries[id]) - { - std::cout << value << " "; - } - std::cout << std::endl; - - auto entry = entries[id]; - std::pair coordinates = {0,0}; - double maxValue = 0.0; - - for (std::size_t i = 0; i < network.objects.size(); ++i) - { - for (std::size_t j = 0; j < network.objects[0].size(); ++j) - { - double value = network.objects[i][j]( entry); - if (value > maxValue) - { - coordinates = {i, j}; - maxValue = value; - } - } - } - -/* ::std::cout << "Network for entry " << id << std::endl; - ::neural_net::print_network ( ::std::cout, network, entry ); - ::std::cout << ::std::endl; - - std::cout << "Max is in {" << coordinates.first << ", " << coordinates.second << "}" << std::endl; - */ - trackClusters[coordinates.first][coordinates.second].push_back({trackIds[id], entry, maxValue}); - } - - // Create clusters - LMS_LOG(DBUPDATER, DEBUG) << "Erasing old clusters"; - { - Wt::Dbo::Transaction transaction(_db.getSession()); - Cluster::removeByType(_db.getSession(), "similarity"); - } - - LMS_LOG(DBUPDATER, DEBUG) << "Creating new cluster..."; - for (std::size_t i = 0; i < nbRows; i++) - { - for (std::size_t j = 0; j < nbColumns; j++) - { - LMS_LOG(DBUPDATER, DEBUG) << "Creating cluster " << i << " " << j; - - Wt::Dbo::Transaction transaction(_db.getSession()); - - Cluster::pointer cluster = Cluster::create(_db.getSession(), "similarity", "cluster_" + std::to_string(i) + "_" + std::to_string(j)); - - for (auto track : trackClusters[i][j]) - { - Track::pointer t = Database::Track::getById(_db.getSession(), track.trackId); - cluster.modify()->addTrack(t); - } - } - } - - - for (std::size_t i = 0; i < nbRows; i++) - { - for (std::size_t j = 0; j < nbColumns; j++) - { - - - std::cout << "Cluster [" << i << "," << j << "] - "; - - // Display the neuron for this cluster - for (auto& value : network.objects[i][j].weights) - std::cout << value << " "; - std::cout << std::endl; - - for (auto track : trackClusters[i][j]) - { - Wt::Dbo::Transaction transaction(_db.getSession()); - - std::cout << "- " << track.distance; - - Track::pointer t = Database::Track::getById(_db.getSession(), track.trackId); - std::cout << " - " << track.trackId << " - " << t->getArtist()->getName() << " - " << t->getName() << " - (" ; - - // Display input vector - for (auto& value : track.entry) - std::cout << value << " "; - std::cout << ")" << std::endl; - } - } - } - - -} - -} // namespace Database - diff --git a/src/database/DatabaseClassifier.hpp b/src/database/DatabaseClassifier.hpp deleted file mode 100644 index c8e382b8..00000000 --- a/src/database/DatabaseClassifier.hpp +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ - -#pragma once - -#include - -#include "DatabaseHandler.hpp" -#include "DatabaseUpdater.hpp" - -namespace Database { - -class ClusterClassifier -{ - public: - ClusterClassifier(); - - - private: - -}; - - -class Classifier -{ - public: - Classifier(Wt::Dbo::SqlConnectionPool& connectionPool); - - void processTrackUpdate(bool added, Track::id_type trackId, std::string mbid, boost::filesystem::path p); - void processDatabaseUpdate(Updater::Stats stats); - - private: - - Database::Handler _db; -}; - - -} // namespace Database - diff --git a/src/database/cluster/DatabaseSimilarityCluster.hpp b/src/database/cluster/DatabaseSimilarityCluster.hpp deleted file mode 100644 index e69de29b..00000000 diff --git a/src/database/tagger/GenreTagger.cpp b/src/database/tagger/GenreTagger.cpp deleted file mode 100644 index ec40da6d..00000000 --- a/src/database/tagger/GenreTagger.cpp +++ /dev/null @@ -1,40 +0,0 @@ - -/* - * Copyright (C) 2016 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 . - */ - -#include "GenreTagger.hpp" - -namespace Database { - -void -GenreTagger::processTrackUpdate(bool added, Track::id_type trackId, std::string mbid, boost::filesystem::path p) -{ - - -} - -void -GenreTagger::processDatabaseUpdate(Updater::Stats stats) -{ - - // TODO: if disabled, delete all the genre tags - // TODO: if enabled, reconstruct all the genre tags from tracks -} - -} // namespace Database diff --git a/src/database/tagger/GenreTagger.hpp b/src/database/tagger/GenreTagger.hpp deleted file mode 100644 index 16118c48..00000000 --- a/src/database/tagger/GenreTagger.hpp +++ /dev/null @@ -1,37 +0,0 @@ - -/* - * Copyright (C) 2016 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 . - */ - -#pragma once - -#include "database/DatabaseUpdater.hpp" - -namespace Database { - -class GenreTagger -{ - public: - void processTrackUpdate(bool added, Track::id_type trackId, std::string mbid, boost::filesystem::path p); - void processDatabaseUpdate(Updater::Stats stats); - - private: - -}; - -} // namespace Database diff --git a/src/database/DatabaseFeatureExtractor.cpp b/src/database/updater/DatabaseFeatureExtractor.cpp similarity index 96% rename from src/database/DatabaseFeatureExtractor.cpp rename to src/database/updater/DatabaseFeatureExtractor.cpp index c4239b39..8b44ecce 100644 --- a/src/database/DatabaseFeatureExtractor.cpp +++ b/src/database/updater/DatabaseFeatureExtractor.cpp @@ -21,8 +21,8 @@ #include "feature/FeatureExtractor.hpp" #include "feature/FeatureStore.hpp" +#include "database/Setting.hpp" -#include "Setting.hpp" #include "DatabaseFeatureExtractor.hpp" namespace Database { @@ -35,7 +35,7 @@ static std::string getMBID(Track::id_type trackId) } void -FeatureExtractor::processDatabaseUpdate(Updater::Stats stats) +FeatureExtractor::handleFilesUpdated(void) { bool fetchHighLevel = Setting::getBool(UpdaterDboSession(), "tags_highlevel_acousticbrainz"); bool fetchLowLevel = Setting::getBool(UpdaterDboSession(), "tags_similarity_acousticbrainz"); diff --git a/src/database/DatabaseFeatureExtractor.hpp b/src/database/updater/DatabaseFeatureExtractor.hpp similarity index 86% rename from src/database/DatabaseFeatureExtractor.hpp rename to src/database/updater/DatabaseFeatureExtractor.hpp index 2a7c268c..c0ff092a 100644 --- a/src/database/DatabaseFeatureExtractor.hpp +++ b/src/database/updater/DatabaseFeatureExtractor.hpp @@ -19,14 +19,14 @@ #pragma once -#include "database/DatabaseUpdater.hpp" +#include "DatabaseUpdater.hpp" namespace Database { -class FeatureExtractor +class FeatureExtractor : public UpdaterEventHandler { public: - void processDatabaseUpdate(Updater::Stats stats); + void handleFilesUpdated(void); }; diff --git a/src/database/cluster/DatabaseHighLevelCluster.cpp b/src/database/updater/DatabaseHighLevelCluster.cpp similarity index 98% rename from src/database/cluster/DatabaseHighLevelCluster.cpp rename to src/database/updater/DatabaseHighLevelCluster.cpp index 84af0d28..412e354f 100644 --- a/src/database/cluster/DatabaseHighLevelCluster.cpp +++ b/src/database/updater/DatabaseHighLevelCluster.cpp @@ -165,7 +165,7 @@ static std::list getClustersFromFeature(Feature::Type& feature, dou } void -HighLevelCluster::processDatabaseUpdate(Updater::Stats stats) +HighLevelCluster::handleFilesUpdated(void) { bool createTags = Setting::getBool(UpdaterDboSession(), "tags_highlevel_acousticbrainz", false); double minProb = Setting::getInt(UpdaterDboSession(), "tags_highlevel_acousticbrainz_min_probability", false) / 100.; diff --git a/src/database/cluster/DatabaseHighLevelCluster.hpp b/src/database/updater/DatabaseHighLevelCluster.hpp similarity index 86% rename from src/database/cluster/DatabaseHighLevelCluster.hpp rename to src/database/updater/DatabaseHighLevelCluster.hpp index 25f91d86..20adb3a8 100644 --- a/src/database/cluster/DatabaseHighLevelCluster.hpp +++ b/src/database/updater/DatabaseHighLevelCluster.hpp @@ -19,14 +19,14 @@ #pragma once -#include "database/DatabaseUpdater.hpp" +#include "DatabaseUpdater.hpp" namespace Database { -class HighLevelCluster +class HighLevelCluster : public UpdaterEventHandler { public: - void processDatabaseUpdate(Updater::Stats stats); + void handleFilesUpdated(void); }; diff --git a/src/database/DatabaseUpdater.cpp b/src/database/updater/DatabaseUpdater.cpp similarity index 99% rename from src/database/DatabaseUpdater.cpp rename to src/database/updater/DatabaseUpdater.cpp index 0ba96f85..7e5afb44 100644 --- a/src/database/DatabaseUpdater.cpp +++ b/src/database/updater/DatabaseUpdater.cpp @@ -28,8 +28,9 @@ #include "utils/Utils.hpp" #include "utils/Path.hpp" -#include "Setting.hpp" -#include "Types.hpp" +#include "database/Setting.hpp" +#include "database/Types.hpp" + #include "DatabaseUpdater.hpp" namespace { diff --git a/src/database/DatabaseUpdater.hpp b/src/database/updater/DatabaseUpdater.hpp similarity index 90% rename from src/database/DatabaseUpdater.hpp rename to src/database/updater/DatabaseUpdater.hpp index 3d032c4e..5683b50c 100644 --- a/src/database/DatabaseUpdater.hpp +++ b/src/database/updater/DatabaseUpdater.hpp @@ -20,6 +20,7 @@ #pragma once #include +#include #include @@ -32,6 +33,9 @@ namespace Database { + +class UpdaterEventHandler; + class Updater { public: @@ -60,7 +64,7 @@ class Updater std::size_t nbChanges() const { return nbAdded + nbRemoved + nbModified;} }; - // Emitted when the whole database has been scanned + // Emitted when the whole database has been scanned (and all the event handlers have been called) Wt::Signal& scanComplete() { return _sigScanComplete; } // Emitted when a track changed @@ -76,6 +80,9 @@ class Updater Database::Handler& getDb(void) { return *_db; } bool quitRequested(void) const { return !_running;} + + void registerEventHandler(std::shared_ptr handler) { _eventHandlers.push_back(handler); } + private: Updater(); @@ -136,6 +143,8 @@ class Updater MetaData::TagLibParser _metadataParser; + std::list > _eventHandlers; + }; // class Updater // Helper to get the updater session data @@ -149,5 +158,17 @@ static inline bool UpdaterQuitRequested() return Updater::instance().quitRequested(); } + +class UpdaterEventHandler +{ + public: + + // called when all the files have been scanned by the updater + virtual void handleFilesUpdated(void) = 0; + + private: + +}; + } // Database diff --git a/src/main/main.cpp b/src/main/main.cpp index 1c8eecc5..5e9f4082 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -28,9 +28,9 @@ #include "image/Image.hpp" #include "feature/FeatureExtractor.hpp" -#include "database/DatabaseUpdater.hpp" -#include "database/DatabaseFeatureExtractor.hpp" -#include "database/cluster/DatabaseHighLevelCluster.hpp" +#include "database/updater/DatabaseUpdater.hpp" +#include "database/updater/DatabaseFeatureExtractor.hpp" +#include "database/updater/DatabaseHighLevelCluster.hpp" #include "ui/LmsApplication.hpp" @@ -106,14 +106,9 @@ int main(int argc, char* argv[]) Database::Updater& dbUpdater = Database::Updater::instance(); dbUpdater.setConnectionPool(*connectionPool); - Database::FeatureExtractor dbFeatureExtractor; - Database::HighLevelCluster dbHighLevelCluster; - - // Connect to the update events - dbUpdater.scanComplete().connect(std::bind(&Database::HighLevelCluster::processDatabaseUpdate, &dbHighLevelCluster, std::placeholders::_1)); - dbUpdater.scanComplete().connect(std::bind(&Database::FeatureExtractor::processDatabaseUpdate, &dbFeatureExtractor, std::placeholders::_1)); - -// dbHighLevelCluster.processDatabaseUpdate(Database::Updater::Stats()); + // Instanciate the updater's event handler. Order is important + dbUpdater.registerEventHandler(std::make_shared()); + dbUpdater.registerEventHandler(std::make_shared()); // bind entry point server.addEntryPoint(Wt::Application, boost::bind(UserInterface::LmsApplication::create, diff --git a/src/ui/settings/Settings.cpp b/src/ui/settings/Settings.cpp index 308664c8..78d3838b 100644 --- a/src/ui/settings/Settings.cpp +++ b/src/ui/settings/Settings.cpp @@ -30,8 +30,8 @@ #include "SettingsUsers.hpp" #include "logger/Logger.hpp" -#include "database/DatabaseUpdater.hpp" #include "database/Setting.hpp" +#include "database/updater/DatabaseUpdater.hpp" #include "LmsApplication.hpp" From 7c475ee2d32c3295dbbc80ec1ce393a5b82a1aee Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 5 Jun 2016 13:44:43 +0200 Subject: [PATCH 022/195] [DB] Faster scan thanks to index on file path + stats improvements + bugfix --- src/database/DatabaseHandler.cpp | 1 + .../updater/DatabaseHighLevelCluster.cpp | 9 +++------ src/database/updater/DatabaseUpdater.cpp | 16 ++++++++-------- src/database/updater/DatabaseUpdater.hpp | 14 +++++++------- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index f9c46053..c8d160ed 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -110,6 +110,7 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) // Indexes _session.execute("PRAGMA journal_mode=WAL"); + _session.execute("CREATE INDEX IF NOT EXISTS track_path_idx ON track(file_path)"); _session.execute("CREATE INDEX IF NOT EXISTS artist_name_idx ON artist(name)"); _session.execute("CREATE INDEX IF NOT EXISTS release_name_idx ON release(name)"); _session.execute("CREATE INDEX IF NOT EXISTS track_artist_idx ON track(artist_id)"); diff --git a/src/database/updater/DatabaseHighLevelCluster.cpp b/src/database/updater/DatabaseHighLevelCluster.cpp index 412e354f..608963b1 100644 --- a/src/database/updater/DatabaseHighLevelCluster.cpp +++ b/src/database/updater/DatabaseHighLevelCluster.cpp @@ -142,19 +142,16 @@ static std::list getClustersFromFeature(Feature::Type& feature, dou if (!probability || !value) { - LMS_LOG(DBUPDATER, DEBUG) << "Missing " << node.node; + LMS_LOG(DBUPDATER, ERROR) << "Missing " << node.node; continue; } - if (std::stod(probability->data()) < 0.90) - { - LMS_LOG(DBUPDATER, DEBUG) << "Probability too low for " << node.node << "(" << std::stod(probability->data()) << ")"; + if (std::stod(probability->data()) < minProb) continue; - } if (node.valueMapping[value->data()] == "") { - LMS_LOG(DBUPDATER, DEBUG) << "Unknown value '" << value->data() << "'"; + LMS_LOG(DBUPDATER, ERROR) << "Unknown value '" << value->data() << "'"; continue; } diff --git a/src/database/updater/DatabaseUpdater.cpp b/src/database/updater/DatabaseUpdater.cpp index 7e5afb44..36bc51e5 100644 --- a/src/database/updater/DatabaseUpdater.cpp +++ b/src/database/updater/DatabaseUpdater.cpp @@ -263,10 +263,11 @@ Updater::process(boost::system::error_code err) checkDuplicatedAudioFiles(stats); LMS_LOG(DBUPDATER, INFO) << "Processed all files, now calling listeners..."; - scanComplete().emit(stats); + for (auto eventHandler : _eventHandlers) + eventHandler->handleFilesUpdated(); } - LMS_LOG(DBUPDATER, INFO) << "Scan complete. Scanned = " << stats.nbScanned << ", Skipped = " << stats.nbSkipped << ", Changes = " << stats.nbChanges() << " (added = " << stats.nbAdded << ", nbRemoved = " << stats.nbRemoved << ", nbModified = " << stats.nbModified << "), Scan errors = " << stats.nbScanErrors << ", Not imported = " << stats.nbNotImported; + LMS_LOG(DBUPDATER, INFO) << "Scan " << (_running ? "complete" : "aborted") << ". Changes = " << stats.nbChanges() << " (added = " << stats.nbAdded << ", removed = " << stats.nbRemoved << ", updated = " << stats.nbUpdated << "), Not changed = " << stats.nbNoChange << ", Scanned = " << stats.nbScanned << " (errors = " << stats.nbScanErrors << ", not imported = " << stats.nbNotImported << ")"; // Update database stats boost::posix_time::ptime now = boost::posix_time::second_clock::local_time(); @@ -280,6 +281,8 @@ Updater::process(boost::system::error_code err) Setting::setBool(_db->getSession(), "manual_scan_requested", false); processNextJob(); + + scanComplete().emit(stats); } } @@ -404,12 +407,9 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) if (track && track->getLastWriteTime() == lastWriteTime) { - stats.nbSkipped++; - transaction.rollback(); + stats.nbNoChange++; return; } - - transaction.rollback(); } MetaData::Items items; @@ -535,7 +535,7 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) for (auto cluster : track->getClusters()) cluster.remove(); - stats.nbModified++; + stats.nbUpdated++; } assert(track); @@ -868,7 +868,7 @@ Updater::processVideoFile( const boost::filesystem::path& file, Stats& stats) else { LMS_LOG(DBUPDATER, DEBUG) << "Updating '" << file << "'"; - stats.nbModified++; + stats.nbUpdated++; } assert(video); diff --git a/src/database/updater/DatabaseUpdater.hpp b/src/database/updater/DatabaseUpdater.hpp index 5683b50c..f9945b70 100644 --- a/src/database/updater/DatabaseUpdater.hpp +++ b/src/database/updater/DatabaseUpdater.hpp @@ -53,15 +53,15 @@ class Updater struct Stats { - std::size_t nbSkipped = 0; // no change since last scan - std::size_t nbScanned = 0; + std::size_t nbNoChange = 0; // no change since last scan + std::size_t nbScanned = 0; // total scanned filed std::size_t nbScanErrors = 0; // cannot scan file - std::size_t nbNotImported = 0; // Not imported (criteria not filled) - std::size_t nbAdded = 0; - std::size_t nbRemoved = 0; - std::size_t nbModified = 0; + std::size_t nbNotImported = 0; // Scanned, but not imported (criteria not filled) + std::size_t nbAdded = 0; // Added in DB + std::size_t nbRemoved = 0; // removed from DB + std::size_t nbUpdated = 0; // updated file in DB - std::size_t nbChanges() const { return nbAdded + nbRemoved + nbModified;} + std::size_t nbChanges() const { return nbAdded + nbRemoved + nbUpdated;} }; // Emitted when the whole database has been scanned (and all the event handlers have been called) From 85a61e46eef978864402f9ebcf8f2bd42324677a Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 5 Jun 2016 14:27:34 +0200 Subject: [PATCH 023/195] [DOC] Updated README --- README.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 13774a2c..dd3cf954 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,21 @@ # LMS - Lightweight Media Server LMS is a self-hosted media streaming software, released under the GPLv3 license. -It allows you to access your music and your videos using an https web interface. +It allows you to access your music and your videos using an http(s) web interface. ## Features - Winamp-like interface, suited for large media collections - Audio/Video transcode for maximum interoperability and low bandwith requirements - User management - - Multi genre - - MusicBrainzID support + - Playlist support + - MusicBrainzID support to handle duplicated artist and release names + +Tags are automatically created to facilitate music searching, using: + - Multi genre information from metadata + - High-level information from AcousticBrainz Please note LMS is still under development and will gain more features in the future: - - Radio function (using AcousticBrainz) + - Radio function - Interface suited for mobile devices - Video support - Subsonic and/or Ampache API @@ -58,7 +62,7 @@ By default, LMS will read its configuration in the file '/etc/lms.conf' ## Running ```sh -$ /usr/bin/lms [/path/to/config/file] +$ /usr/bin/lms [config_file] ``` LMS needs write access to the directory used for the database. It is highly recommended to run LMS as a non root user. From f825afa37a0ce8fa94636c74d9365802b3f9c64b Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 23 Aug 2016 13:33:01 +0200 Subject: [PATCH 024/195] Moved util functions into utils --- src/Makefile.am | 4 ++-- src/av/AvInfo.cpp | 2 +- src/av/AvTranscoder.cpp | 3 +-- src/cover/CoverArtGrabber.cpp | 3 ++- src/database/Artist.cpp | 2 +- src/database/DatabaseHandler.cpp | 2 +- src/database/SearchFilter.cpp | 2 +- src/database/Track.cpp | 2 +- src/database/updater/DatabaseFeatureExtractor.cpp | 5 +++-- src/database/updater/DatabaseHighLevelCluster.cpp | 4 ++-- src/database/updater/DatabaseUpdater.cpp | 8 +++++--- src/feature/FeatureExtractor.cpp | 2 +- src/feature/FeatureStore.cpp | 4 ++-- src/image/Image.cpp | 3 ++- src/main/main.cpp | 4 ++-- src/metadata/AvFormat.cpp | 9 +++++---- src/metadata/TagLibParser.cpp | 2 +- src/ui/LmsApplication.cpp | 2 +- src/ui/audio/AudioPlayer.cpp | 4 ++-- src/ui/audio/desktop/DesktopAudio.cpp | 3 ++- src/ui/audio/desktop/PlayQueue.cpp | 2 +- src/ui/audio/desktop/TableFilter.cpp | 3 ++- src/ui/audio/desktop/TrackView.cpp | 2 +- src/ui/audio/mobile/ArtistSearchView.cpp | 3 ++- src/ui/audio/mobile/MobileAudio.cpp | 7 ++++--- src/ui/audio/mobile/MobilePlayQueue.cpp | 2 +- src/ui/audio/mobile/PreviewSearchView.cpp | 3 ++- src/ui/audio/mobile/ReleaseSearch.cpp | 3 ++- src/ui/audio/mobile/ReleaseView.cpp | 3 ++- src/ui/audio/mobile/TrackSearch.cpp | 3 ++- src/ui/audio/mobile/TrackSearchView.cpp | 3 ++- src/ui/resource/AvConvTranscodeStreamResource.cpp | 2 +- src/ui/resource/ImageResource.cpp | 3 ++- src/ui/resource/TranscodeResource.cpp | 3 ++- src/ui/settings/Settings.cpp | 3 ++- src/ui/settings/SettingsAccountFormView.cpp | 2 +- src/ui/settings/SettingsAudioFormView.cpp | 2 +- src/ui/settings/SettingsDatabaseFormView.cpp | 3 ++- src/ui/settings/SettingsFirstConnectionFormView.cpp | 2 +- src/ui/settings/SettingsMediaDirectoryFormView.cpp | 3 ++- src/ui/settings/SettingsUserFormView.cpp | 2 +- src/ui/settings/SettingsUsers.cpp | 2 +- src/{config => utils}/Config.cpp | 6 ++++++ src/{config => utils}/Config.hpp | 1 + src/{logger => utils}/Logger.cpp | 0 src/{logger => utils}/Logger.hpp | 0 src/utils/Path.cpp | 2 +- 47 files changed, 83 insertions(+), 57 deletions(-) rename src/{config => utils}/Config.cpp (96%) rename src/{config => utils}/Config.hpp (99%) rename src/{logger => utils}/Logger.cpp (100%) rename src/{logger => utils}/Logger.hpp (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 568fb488..6de2fd19 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,6 @@ lms_SOURCES = \ $(srcdir)/main/main.cpp \ $(srcdir)/av/AvInfo.cpp \ $(srcdir)/av/AvTranscoder.cpp \ - $(srcdir)/config/Config.cpp \ $(srcdir)/cover/CoverArtGrabber.cpp \ $(srcdir)/database/Artist.cpp \ $(srcdir)/database/DatabaseHandler.cpp \ @@ -23,7 +22,6 @@ lms_SOURCES = \ $(srcdir)/feature/FeatureExtractor.cpp \ $(srcdir)/feature/FeatureStore.cpp \ $(srcdir)/image/Image.cpp \ - $(srcdir)/logger/Logger.cpp \ $(srcdir)/metadata/AvFormat.cpp \ $(srcdir)/metadata/TagLibParser.cpp \ $(srcdir)/ui/LmsApplication.cpp \ @@ -61,6 +59,8 @@ lms_SOURCES = \ $(srcdir)/ui/settings/SettingsMediaDirectoryFormView.cpp \ $(srcdir)/ui/settings/SettingsUserFormView.cpp \ $(srcdir)/ui/settings/SettingsUsers.cpp \ + $(srcdir)/utils/Config.cpp \ + $(srcdir)/utils/Logger.cpp \ $(srcdir)/utils/Path.cpp \ $(srcdir)/utils/Utils.cpp diff --git a/src/av/AvInfo.cpp b/src/av/AvInfo.cpp index ba320c0e..90aa10d4 100644 --- a/src/av/AvInfo.cpp +++ b/src/av/AvInfo.cpp @@ -19,7 +19,7 @@ #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "AvInfo.hpp" diff --git a/src/av/AvTranscoder.cpp b/src/av/AvTranscoder.cpp index c970d334..3a82fcf8 100644 --- a/src/av/AvTranscoder.cpp +++ b/src/av/AvTranscoder.cpp @@ -20,8 +20,7 @@ #include #include "utils/Path.hpp" - -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "AvTranscoder.hpp" diff --git a/src/cover/CoverArtGrabber.cpp b/src/cover/CoverArtGrabber.cpp index 5eed27fb..a43f3626 100644 --- a/src/cover/CoverArtGrabber.cpp +++ b/src/cover/CoverArtGrabber.cpp @@ -17,9 +17,10 @@ * along with LMS. If not, see . */ -#include "logger/Logger.hpp" #include "av/AvInfo.hpp" +#include "utils/Logger.hpp" + #include "CoverArtGrabber.hpp" namespace { diff --git a/src/database/Artist.cpp b/src/database/Artist.cpp index b141986d..67f4f340 100644 --- a/src/database/Artist.cpp +++ b/src/database/Artist.cpp @@ -20,7 +20,7 @@ #include "Types.hpp" #include "SqlQuery.hpp" -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" namespace Database { diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index c8d160ed..c159d378 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -30,7 +30,7 @@ #include "Setting.hpp" -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "DatabaseHandler.hpp" diff --git a/src/database/SearchFilter.cpp b/src/database/SearchFilter.cpp index eafd86d5..194296e4 100644 --- a/src/database/SearchFilter.cpp +++ b/src/database/SearchFilter.cpp @@ -17,7 +17,7 @@ * along with LMS. If not, see . */ -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "SearchFilter.hpp" diff --git a/src/database/Track.cpp b/src/database/Track.cpp index a423abbf..cfb3f8ea 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -21,7 +21,7 @@ #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "SqlQuery.hpp" diff --git a/src/database/updater/DatabaseFeatureExtractor.cpp b/src/database/updater/DatabaseFeatureExtractor.cpp index 8b44ecce..1052c6cc 100644 --- a/src/database/updater/DatabaseFeatureExtractor.cpp +++ b/src/database/updater/DatabaseFeatureExtractor.cpp @@ -17,11 +17,12 @@ * along with LMS. If not, see . */ -#include "logger/Logger.hpp" +#include "database/Setting.hpp" #include "feature/FeatureExtractor.hpp" #include "feature/FeatureStore.hpp" -#include "database/Setting.hpp" + +#include "utils/Logger.hpp" #include "DatabaseFeatureExtractor.hpp" diff --git a/src/database/updater/DatabaseHighLevelCluster.cpp b/src/database/updater/DatabaseHighLevelCluster.cpp index 608963b1..995e106b 100644 --- a/src/database/updater/DatabaseHighLevelCluster.cpp +++ b/src/database/updater/DatabaseHighLevelCluster.cpp @@ -17,11 +17,11 @@ * along with LMS. If not, see . */ -#include "logger/Logger.hpp" - #include "database/Setting.hpp" #include "feature/FeatureStore.hpp" +#include "utils/Logger.hpp" + #include "DatabaseHighLevelCluster.hpp" namespace Database { diff --git a/src/database/updater/DatabaseUpdater.cpp b/src/database/updater/DatabaseUpdater.cpp index 36bc51e5..cf7920fa 100644 --- a/src/database/updater/DatabaseUpdater.cpp +++ b/src/database/updater/DatabaseUpdater.cpp @@ -23,14 +23,16 @@ #include #include -#include "logger/Logger.hpp" #include "cover/CoverArtGrabber.hpp" -#include "utils/Utils.hpp" -#include "utils/Path.hpp" #include "database/Setting.hpp" #include "database/Types.hpp" +#include "utils/Logger.hpp" +#include "utils/Path.hpp" +#include "utils/Utils.hpp" + + #include "DatabaseUpdater.hpp" namespace { diff --git a/src/feature/FeatureExtractor.cpp b/src/feature/FeatureExtractor.cpp index 914757af..7f9560cb 100644 --- a/src/feature/FeatureExtractor.cpp +++ b/src/feature/FeatureExtractor.cpp @@ -25,7 +25,7 @@ #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "utils/Path.hpp" #include "FeatureExtractor.hpp" diff --git a/src/feature/FeatureStore.cpp b/src/feature/FeatureStore.cpp index f58c51ab..3856bcf8 100644 --- a/src/feature/FeatureStore.cpp +++ b/src/feature/FeatureStore.cpp @@ -19,8 +19,8 @@ #include -#include "logger/Logger.hpp" -#include "config/Config.hpp" +#include "utils/Config.hpp" +#include "utils/Logger.hpp" #include "utils/Path.hpp" #include "FeatureStore.hpp" diff --git a/src/image/Image.cpp b/src/image/Image.cpp index d121d860..4ba865f2 100644 --- a/src/image/Image.cpp +++ b/src/image/Image.cpp @@ -16,7 +16,8 @@ * You should have received a copy of the GNU General Public License * along with LMS. If not, see . */ -#include "logger/Logger.hpp" + +#include "utils/Logger.hpp" #include "Image.hpp" diff --git a/src/main/main.cpp b/src/main/main.cpp index 5e9f4082..0282a8e1 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -21,10 +21,10 @@ #include -#include "config/Config.hpp" +#include "utils/Config.hpp" #include "av/AvInfo.hpp" #include "av/AvTranscoder.hpp" -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "image/Image.hpp" #include "feature/FeatureExtractor.hpp" diff --git a/src/metadata/AvFormat.cpp b/src/metadata/AvFormat.cpp index 81a95b26..da5fc3bb 100644 --- a/src/metadata/AvFormat.cpp +++ b/src/metadata/AvFormat.cpp @@ -17,14 +17,15 @@ * along with LMS. If not, see . */ -#include "AvFormat.hpp" - -#include "logger/Logger.hpp" -#include "utils/Utils.hpp" #include #include "av/AvInfo.hpp" +#include "utils/Logger.hpp" +#include "utils/Utils.hpp" + +#include "AvFormat.hpp" + namespace MetaData { diff --git a/src/metadata/TagLibParser.cpp b/src/metadata/TagLibParser.cpp index 28f455e6..7afa6140 100644 --- a/src/metadata/TagLibParser.cpp +++ b/src/metadata/TagLibParser.cpp @@ -23,7 +23,7 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "utils/Utils.hpp" #include "TagLibParser.hpp" diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index faa87640..d68c2f02 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -28,7 +28,7 @@ #include #include "config/config.h" -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "utils/Utils.hpp" #include "settings/Settings.hpp" diff --git a/src/ui/audio/AudioPlayer.cpp b/src/ui/audio/AudioPlayer.cpp index a1bd6f6e..bb487af9 100644 --- a/src/ui/audio/AudioPlayer.cpp +++ b/src/ui/audio/AudioPlayer.cpp @@ -17,7 +17,6 @@ * along with LMS. If not, see . */ - #include #include #include @@ -25,7 +24,8 @@ #include #include "common/InputRange.hpp" -#include "logger/Logger.hpp" + +#include "utils/Logger.hpp" #include "utils/Utils.hpp" #include "LmsApplication.hpp" diff --git a/src/ui/audio/desktop/DesktopAudio.cpp b/src/ui/audio/desktop/DesktopAudio.cpp index 08c857a2..3241c623 100644 --- a/src/ui/audio/desktop/DesktopAudio.cpp +++ b/src/ui/audio/desktop/DesktopAudio.cpp @@ -31,7 +31,8 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" + #include "LmsApplication.hpp" #include "TableFilter.hpp" diff --git a/src/ui/audio/desktop/PlayQueue.cpp b/src/ui/audio/desktop/PlayQueue.cpp index 1d4c9c51..8eea4231 100644 --- a/src/ui/audio/desktop/PlayQueue.cpp +++ b/src/ui/audio/desktop/PlayQueue.cpp @@ -27,7 +27,7 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "LmsApplication.hpp" #include "PlayQueue.hpp" diff --git a/src/ui/audio/desktop/TableFilter.cpp b/src/ui/audio/desktop/TableFilter.cpp index 3ef75edd..bedb27ab 100644 --- a/src/ui/audio/desktop/TableFilter.cpp +++ b/src/ui/audio/desktop/TableFilter.cpp @@ -20,7 +20,8 @@ #include #include "database/Types.hpp" -#include "logger/Logger.hpp" + +#include "utils/Logger.hpp" #include "LmsApplication.hpp" #include "TableFilter.hpp" diff --git a/src/ui/audio/desktop/TrackView.cpp b/src/ui/audio/desktop/TrackView.cpp index 3c3e9cc6..8695d858 100644 --- a/src/ui/audio/desktop/TrackView.cpp +++ b/src/ui/audio/desktop/TrackView.cpp @@ -22,7 +22,7 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "utils/Utils.hpp" #include "LmsApplication.hpp" diff --git a/src/ui/audio/mobile/ArtistSearchView.cpp b/src/ui/audio/mobile/ArtistSearchView.cpp index 1fda1e0d..d05f00dd 100644 --- a/src/ui/audio/mobile/ArtistSearchView.cpp +++ b/src/ui/audio/mobile/ArtistSearchView.cpp @@ -20,7 +20,8 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" + #include "SearchUtils.hpp" #include "ArtistSearch.hpp" diff --git a/src/ui/audio/mobile/MobileAudio.cpp b/src/ui/audio/mobile/MobileAudio.cpp index f1078acb..ab08aa30 100644 --- a/src/ui/audio/mobile/MobileAudio.cpp +++ b/src/ui/audio/mobile/MobileAudio.cpp @@ -23,10 +23,8 @@ #include #include -#include "logger/Logger.hpp" -#include "utils/Utils.hpp" - #include "audio/AudioPlayer.hpp" + #include "LmsApplication.hpp" #include "PreviewSearchView.hpp" @@ -39,6 +37,9 @@ #include "MobilePlayQueue.hpp" +#include "utils/Logger.hpp" +#include "utils/Utils.hpp" + #include "MobileAudio.hpp" diff --git a/src/ui/audio/mobile/MobilePlayQueue.cpp b/src/ui/audio/mobile/MobilePlayQueue.cpp index e74ddb9a..c14d0ff7 100644 --- a/src/ui/audio/mobile/MobilePlayQueue.cpp +++ b/src/ui/audio/mobile/MobilePlayQueue.cpp @@ -22,7 +22,7 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "LmsApplication.hpp" diff --git a/src/ui/audio/mobile/PreviewSearchView.cpp b/src/ui/audio/mobile/PreviewSearchView.cpp index 38cb7a33..8a602e24 100644 --- a/src/ui/audio/mobile/PreviewSearchView.cpp +++ b/src/ui/audio/mobile/PreviewSearchView.cpp @@ -20,7 +20,8 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" + #include "SearchUtils.hpp" #include "ArtistSearch.hpp" diff --git a/src/ui/audio/mobile/ReleaseSearch.cpp b/src/ui/audio/mobile/ReleaseSearch.cpp index 07b34f2a..c45c83cc 100644 --- a/src/ui/audio/mobile/ReleaseSearch.cpp +++ b/src/ui/audio/mobile/ReleaseSearch.cpp @@ -22,7 +22,8 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" + #include "LmsApplication.hpp" #include "ReleaseSearch.hpp" diff --git a/src/ui/audio/mobile/ReleaseView.cpp b/src/ui/audio/mobile/ReleaseView.cpp index 27a6350c..93c1e5fc 100644 --- a/src/ui/audio/mobile/ReleaseView.cpp +++ b/src/ui/audio/mobile/ReleaseView.cpp @@ -22,8 +22,9 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "utils/Utils.hpp" + #include "LmsApplication.hpp" #include "ReleaseView.hpp" diff --git a/src/ui/audio/mobile/TrackSearch.cpp b/src/ui/audio/mobile/TrackSearch.cpp index 79a2db33..db5d4427 100644 --- a/src/ui/audio/mobile/TrackSearch.cpp +++ b/src/ui/audio/mobile/TrackSearch.cpp @@ -22,8 +22,9 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "utils/Utils.hpp" + #include "LmsApplication.hpp" #include "TrackSearch.hpp" diff --git a/src/ui/audio/mobile/TrackSearchView.cpp b/src/ui/audio/mobile/TrackSearchView.cpp index c7138452..bff89ee0 100644 --- a/src/ui/audio/mobile/TrackSearchView.cpp +++ b/src/ui/audio/mobile/TrackSearchView.cpp @@ -20,7 +20,8 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" + #include "SearchUtils.hpp" #include "TrackSearch.hpp" diff --git a/src/ui/resource/AvConvTranscodeStreamResource.cpp b/src/ui/resource/AvConvTranscodeStreamResource.cpp index b4e0b4f4..528d9cba 100644 --- a/src/ui/resource/AvConvTranscodeStreamResource.cpp +++ b/src/ui/resource/AvConvTranscodeStreamResource.cpp @@ -21,7 +21,7 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "AvConvTranscodeStreamResource.hpp" diff --git a/src/ui/resource/ImageResource.cpp b/src/ui/resource/ImageResource.cpp index e192dd0d..9b56846a 100644 --- a/src/ui/resource/ImageResource.cpp +++ b/src/ui/resource/ImageResource.cpp @@ -20,8 +20,9 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "utils/Utils.hpp" + #include "LmsApplication.hpp" #include "cover/CoverArtGrabber.hpp" diff --git a/src/ui/resource/TranscodeResource.cpp b/src/ui/resource/TranscodeResource.cpp index 8acef15c..f12c6fad 100644 --- a/src/ui/resource/TranscodeResource.cpp +++ b/src/ui/resource/TranscodeResource.cpp @@ -19,7 +19,8 @@ #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" + #include "LmsApplication.hpp" #include "TranscodeResource.hpp" diff --git a/src/ui/settings/Settings.cpp b/src/ui/settings/Settings.cpp index 78d3838b..52e75376 100644 --- a/src/ui/settings/Settings.cpp +++ b/src/ui/settings/Settings.cpp @@ -29,7 +29,8 @@ #include "SettingsMediaDirectories.hpp" #include "SettingsUsers.hpp" -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" + #include "database/Setting.hpp" #include "database/updater/DatabaseUpdater.hpp" diff --git a/src/ui/settings/SettingsAccountFormView.cpp b/src/ui/settings/SettingsAccountFormView.cpp index c7f265e8..bbffbd2a 100644 --- a/src/ui/settings/SettingsAccountFormView.cpp +++ b/src/ui/settings/SettingsAccountFormView.cpp @@ -26,7 +26,7 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "common/Validators.hpp" #include "LmsApplication.hpp" diff --git a/src/ui/settings/SettingsAudioFormView.cpp b/src/ui/settings/SettingsAudioFormView.cpp index e86e171d..91c49015 100644 --- a/src/ui/settings/SettingsAudioFormView.cpp +++ b/src/ui/settings/SettingsAudioFormView.cpp @@ -24,7 +24,7 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "common/Validators.hpp" #include "LmsApplication.hpp" diff --git a/src/ui/settings/SettingsDatabaseFormView.cpp b/src/ui/settings/SettingsDatabaseFormView.cpp index ffc15630..1379d0d1 100644 --- a/src/ui/settings/SettingsDatabaseFormView.cpp +++ b/src/ui/settings/SettingsDatabaseFormView.cpp @@ -30,7 +30,8 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" + #include "database/Setting.hpp" #include "common/DirectoryValidator.hpp" diff --git a/src/ui/settings/SettingsFirstConnectionFormView.cpp b/src/ui/settings/SettingsFirstConnectionFormView.cpp index 7f0628a0..c6873079 100644 --- a/src/ui/settings/SettingsFirstConnectionFormView.cpp +++ b/src/ui/settings/SettingsFirstConnectionFormView.cpp @@ -24,7 +24,7 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "common/Validators.hpp" #include "LmsApplication.hpp" diff --git a/src/ui/settings/SettingsMediaDirectoryFormView.cpp b/src/ui/settings/SettingsMediaDirectoryFormView.cpp index 8d9c485a..a9e4a2f9 100644 --- a/src/ui/settings/SettingsMediaDirectoryFormView.cpp +++ b/src/ui/settings/SettingsMediaDirectoryFormView.cpp @@ -25,7 +25,8 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" + #include "database/MediaDirectory.hpp" #include "common/DirectoryValidator.hpp" diff --git a/src/ui/settings/SettingsUserFormView.cpp b/src/ui/settings/SettingsUserFormView.cpp index f3c45b69..fc3224dd 100644 --- a/src/ui/settings/SettingsUserFormView.cpp +++ b/src/ui/settings/SettingsUserFormView.cpp @@ -27,7 +27,7 @@ #include #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "common/Validators.hpp" #include "LmsApplication.hpp" diff --git a/src/ui/settings/SettingsUsers.cpp b/src/ui/settings/SettingsUsers.cpp index 00eff561..314a2a59 100644 --- a/src/ui/settings/SettingsUsers.cpp +++ b/src/ui/settings/SettingsUsers.cpp @@ -25,7 +25,7 @@ #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "SettingsUserFormView.hpp" #include "LmsApplication.hpp" diff --git a/src/config/Config.cpp b/src/utils/Config.cpp similarity index 96% rename from src/config/Config.cpp rename to src/utils/Config.cpp index 61c2fda2..9ff3a95e 100644 --- a/src/config/Config.cpp +++ b/src/utils/Config.cpp @@ -30,6 +30,12 @@ Config::Config() { } +Config::~Config() +{ + if (_config) + delete _config; +} + Config& Config::instance() { diff --git a/src/config/Config.hpp b/src/utils/Config.hpp similarity index 99% rename from src/config/Config.hpp rename to src/utils/Config.hpp index afa0863d..bd52e732 100644 --- a/src/config/Config.hpp +++ b/src/utils/Config.hpp @@ -43,6 +43,7 @@ class Config private: Config(); + ~Config(); libconfig::Config *_config; }; diff --git a/src/logger/Logger.cpp b/src/utils/Logger.cpp similarity index 100% rename from src/logger/Logger.cpp rename to src/utils/Logger.cpp diff --git a/src/logger/Logger.hpp b/src/utils/Logger.hpp similarity index 100% rename from src/logger/Logger.hpp rename to src/utils/Logger.hpp diff --git a/src/utils/Path.cpp b/src/utils/Path.cpp index b7685416..dfc49ba4 100644 --- a/src/utils/Path.cpp +++ b/src/utils/Path.cpp @@ -23,7 +23,7 @@ #include // for boost::crc_32_type #include -#include "logger/Logger.hpp" +#include "utils/Logger.hpp" #include "Path.hpp" From 3af320e42be1a542cd360aaa16fff833300a5cca Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 24 Aug 2016 16:54:05 +0200 Subject: [PATCH 025/195] [CONF] Made a single configuration file --- README.md | 42 ++++++++-------------------------- conf/lms.conf | 12 ++++------ src/feature/FeatureStore.cpp | 40 +++++--------------------------- src/feature/FeatureStore.hpp | 3 --- src/main/main.cpp | 44 +++++++++++++++++++++++++++--------- src/utils/Config.cpp | 13 +++++++++++ src/utils/Config.hpp | 1 + 7 files changed, 66 insertions(+), 89 deletions(-) diff --git a/README.md b/README.md index dd3cf954..d60a242d 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,8 @@ $ apt-get install g++ autoconf automake libboost-dev libboost-locale-dev libboos ## Build ```sh +$ git clone https://github.com/epoupon/lms.git lms +$ cd lms $ autoreconf -vfi $ mkdir build $ cd build @@ -52,51 +54,25 @@ $ make install This command requires root privileges ## Configuration -LMS uses a config file for low level settings: -- database file path, default is /var/lms/lms.db -- TLS settings, default is none -- listen address/port, default is 0.0.0.0 port 5081 +LMS uses a configuration file, installed in '/etc/lms.conf' +It is recommended to edit this file and change the relevant settings (working directory, listen port, etc.) Other settings are set using the web interface. -By default, LMS will read its configuration in the file '/etc/lms.conf' + +It is highly recommended to run LMS as a non root user. Therefore make sure the user has write permissions on the working directory. ## Running ```sh -$ /usr/bin/lms [config_file] +$ lms [config_file] ``` -LMS needs write access to the directory used for the database. -It is highly recommended to run LMS as a non root user. +Logs are output in the working directory, in the file 'lms.log' To connect to LMS, just open your favorite browser and go to http://localhost:5081 -## Mobile - -Add the following code in your /etc/wt/wt_config.xml file: -``` - - true - -``` - -## Setting up SSL materials (optional) -Here is just a self signed certificate example, you could do use a CA if you want. - -Generate a dh file: -```sh -$ openssl dhparam -out dh2048.pem 2048 -``` -Generate a self signed certificate: -```sh -$ openssl req -x509 -out cert.pem -keyout privkey.pem -newkey rsa:4096 -``` -Depending on your SSL parameters, you may be asked for the PEM passphrase to unlock the private key. - -To connect to LMS, just open your favorite browser and go to https://localhost:5081 - ## Credits - Wt (http://www.webtoolkit.eu/) - bootstrap3 (http://getbootstrap.com/) -- libav project (https://www.libav.org/) +- ffmpeg project (https://ffmpeg.org/) - Magick++ (http://www.imagemagick.org/Magick++/) - MetaBrainz (https://metabrainz.org/) diff --git a/conf/lms.conf b/conf/lms.conf index b482a6f1..e457c84a 100644 --- a/conf/lms.conf +++ b/conf/lms.conf @@ -1,15 +1,13 @@ # LMS Sample configuration file -# Path to the DB file. -# Must have write privileges in order to create and modify the file -db-path = "/storage/emeric/lms/lms.dev.db"; - -# Cache directory for downloaded contents -cache-dir-path = "/var/lms/cache"; +# Path to the working directory +# Must have write privileges in order to create and modify this directory +working-dir = "/var/lms/"; # Listen port/addr of the web server listen-port = 5082; listen-addr = "0.0.0.0"; +behind-reverse-proxy = false; # If enabled, these files have to exist and have correct permissions tls-enable = false; @@ -21,6 +19,4 @@ tls-dh = "/var/lms/dh2048.pem"; docroot = "/usr/share/lms/docroot/;/resources,/css,/images,/favicon.ico"; approot = "/usr/share/lms/approot"; -# Path to the wt_config.xml file -wt-config = "/etc/wt/wt_config.xml"; diff --git a/src/feature/FeatureStore.cpp b/src/feature/FeatureStore.cpp index 3856bcf8..4322ac7e 100644 --- a/src/feature/FeatureStore.cpp +++ b/src/feature/FeatureStore.cpp @@ -38,37 +38,15 @@ Store::instance(void) return instance; } -void -Store::reload(void) +static boost::filesystem::path +getPath(std::string mbid, std::string type) { - boost::filesystem::path cacheDir = _storePath = Config::instance().getString("cache-dir-path", ""); - - if (!ensureDirectory(cacheDir)) - { - LMS_LOG(DBUPDATER, ERROR) << "Cache directory '" << cacheDir << "' not valid"; - throw std::runtime_error("Cache directory '" + cacheDir.string() + "' not valid!"); - } - - _storePath = cacheDir / "features"; - - if (!ensureDirectory(_storePath)) - { - LMS_LOG(DBUPDATER, ERROR) << "Features directory '" << _storePath << "' not valid"; - throw std::runtime_error("Features directory '" + _storePath.string() + "' not valid"); - } -} - -boost::filesystem::path getPath(boost::filesystem::path root, std::string mbid, std::string type) -{ - return root / (mbid + "_" + type); + return Config::instance().getPath("working-dir") / "features" / (mbid + "_" + type); } bool Store::exists(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type) { - if (_storePath.empty()) - reload(); - Wt::Dbo::Transaction transaction(session); auto track = Database::Track::getById(session, trackId); @@ -79,16 +57,13 @@ Store::exists(Wt::Dbo::Session& session, Database::Track::id_type trackId, std:: if (mbid.empty()) return false; - boost::filesystem::path path = getPath(_storePath, mbid, type); + boost::filesystem::path path = getPath(mbid, type); return boost::filesystem::exists(path); } bool Store::get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, Type& feature) { - if (_storePath.empty()) - reload(); - Wt::Dbo::Transaction transaction(session); auto track = Database::Track::getById(session, trackId); @@ -99,7 +74,7 @@ Store::get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::str if (mbid.empty()) return false; - boost::filesystem::path path = getPath(_storePath, mbid, type); + boost::filesystem::path path = getPath(mbid, type); if (!boost::filesystem::exists(path)) return false; @@ -121,9 +96,6 @@ Store::get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::str bool Store::set(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, const Type& feature) { - if (_storePath.empty()) - reload(); - Wt::Dbo::Transaction transaction(session); auto track = Database::Track::getById(session, trackId); @@ -134,7 +106,7 @@ Store::set(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::str if (mbid.empty()) return false; - boost::filesystem::path path = getPath(_storePath, mbid, type); + boost::filesystem::path path = getPath(mbid, type); try { diff --git a/src/feature/FeatureStore.hpp b/src/feature/FeatureStore.hpp index 7716d9d7..e1f70bea 100644 --- a/src/feature/FeatureStore.hpp +++ b/src/feature/FeatureStore.hpp @@ -39,11 +39,8 @@ class Store bool set(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, const Type& feature); - void reload(); private: Store(); - - boost::filesystem::path _storePath; }; } // namespace CoverArt diff --git a/src/main/main.cpp b/src/main/main.cpp index 0282a8e1..7cfafa8a 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -18,6 +18,7 @@ */ #include +#include #include @@ -34,13 +35,15 @@ #include "ui/LmsApplication.hpp" - -static std::vector getWtArgs(std::string path) +std::vector generateWtConfig(std::string execPath) { std::vector args; - args.push_back(path); - args.push_back("-c" + Config::instance().getString("wt-config")); + boost::filesystem::path wtConfigPath = Config::instance().getPath("working-dir") / "wt_config.xml"; + boost::filesystem::path wtLogFilePath = Config::instance().getPath("working-dir") / "lms.log"; + + args.push_back(execPath); + args.push_back("--config=" + wtConfigPath.string()); args.push_back("--docroot=" + Config::instance().getString("docroot")); args.push_back("--approot=" + Config::instance().getString("approot")); @@ -58,9 +61,21 @@ static std::vector getWtArgs(std::string path) args.push_back("--http-address=" + Config::instance().getString("listen-addr", "0.0.0.0")); } + // Generate the wt_config.xml file + boost::property_tree::ptree pt; + + pt.put("server.application-settings..location", "*"); + pt.put("server.application-settings.log-file", wtLogFilePath.string()); + pt.put("server.application-settings.behind-reverse-proxy", Config::instance().getBool("behind-reverse-proxy", false)); + pt.put("server.application-settings.progressive-bootstrap", true); + + std::ofstream oss(wtConfigPath.string().c_str(), std::ios::out); + boost::property_tree::xml_parser::write_xml(oss, pt); + return args; } + int main(int argc, char* argv[]) { boost::filesystem::path configFilePath = "/etc/lms.conf"; @@ -77,18 +92,25 @@ int main(int argc, char* argv[]) // Make pstream work with ffmpeg close(STDIN_FILENO); - Config::instance().setFile(configFilePath); - std::vector wtArgs = getWtArgs(argv[0]); + // Make sure the working directory exists + // TODO check with boost::system::error_code ec; + boost::filesystem::create_directories(Config::instance().getPath("working-dir")); + boost::filesystem::create_directories(Config::instance().getPath("working-dir") / "features"); - // Construct argc/argv for Wt - const char* wtArgv[wtArgs.size()]; - for (std::size_t i = 0; i < wtArgs.size(); ++i) - wtArgv[i] = wtArgs[i].c_str(); + // Construct WT configuration and get the argc/argv back + std::vector wtServerArgs = generateWtConfig(argv[0]); + + const char* wtArgv[wtServerArgs.size()]; + for (std::size_t i = 0; i < wtServerArgs.size(); ++i) + { + std::cout << "ARG = " << wtServerArgs[i] << std::endl; + wtArgv[i] = wtServerArgs[i].c_str(); + } Wt::WServer server(argv[0]); - server.setServerConfiguration (wtArgs.size(), const_cast(wtArgv)); + server.setServerConfiguration (wtServerArgs.size(), const_cast(wtArgv)); Wt::WServer::instance()->logger().configure("*"); // log everything, TODO configure this diff --git a/src/utils/Config.cpp b/src/utils/Config.cpp index 9ff3a95e..abc20d89 100644 --- a/src/utils/Config.cpp +++ b/src/utils/Config.cpp @@ -66,6 +66,19 @@ Config::getString(std::string setting, std::string def) } } +boost::filesystem::path +Config::getPath(std::string setting, boost::filesystem::path path) +{ + try { + const char* res = _config->lookup(setting); + return boost::filesystem::path(std::string(res)); + } + catch (std::exception &e) + { + return path; + } +} + unsigned long Config::getULong(std::string setting, unsigned long def) { diff --git a/src/utils/Config.hpp b/src/utils/Config.hpp index bd52e732..799e772a 100644 --- a/src/utils/Config.hpp +++ b/src/utils/Config.hpp @@ -36,6 +36,7 @@ class Config // Default values are returned in case of setting not found std::string getString(std::string setting, std::string def = ""); + boost::filesystem::path getPath(std::string setting, boost::filesystem::path def = boost::filesystem::path()); unsigned long getULong(std::string setting, unsigned long def = 0); long getLong(std::string setting, long def = 0); bool getBool(std::string setting, bool def = false); From 50cd4ed131a6e283e9d8f26bb72122bcfbe03932 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 24 Sep 2016 16:40:17 +0200 Subject: [PATCH 026/195] Minor cleanup --- src/database/updater/DatabaseHighLevelCluster.cpp | 4 ++-- src/feature/FeatureExtractor.cpp | 3 ++- src/feature/FeatureExtractor.hpp | 2 -- src/feature/FeatureStore.cpp | 4 ++-- src/feature/FeatureStore.hpp | 6 +++--- src/main/main.cpp | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/database/updater/DatabaseHighLevelCluster.cpp b/src/database/updater/DatabaseHighLevelCluster.cpp index 995e106b..60d54918 100644 --- a/src/database/updater/DatabaseHighLevelCluster.cpp +++ b/src/database/updater/DatabaseHighLevelCluster.cpp @@ -35,7 +35,7 @@ static Cluster::pointer getCluster(std::string type, std::string value) return cluster; } -static std::list getClustersFromFeature(Feature::Type& feature, double minProb) +static std::list getClustersFromFeature(boost::property_tree::ptree& feature, double minProb) { struct HighLevelNodeDesc { @@ -181,7 +181,7 @@ HighLevelCluster::handleFilesUpdated(void) std::list newClusterNames; if (createTags) { - Feature::Type feature; + boost::property_tree::ptree feature; if (!Feature::Store::instance().get(UpdaterDboSession(), trackId, "high_level", feature)) continue; diff --git a/src/feature/FeatureExtractor.cpp b/src/feature/FeatureExtractor.cpp index 7f9560cb..48a0a888 100644 --- a/src/feature/FeatureExtractor.cpp +++ b/src/feature/FeatureExtractor.cpp @@ -112,7 +112,8 @@ Extractor::getLowLevel(boost::property_tree::ptree& pt, std::string mbid) return false; } - res.erase("metadata"); + // Keep metadata to ease debugging +// res.erase("metadata"); pt = res; diff --git a/src/feature/FeatureExtractor.hpp b/src/feature/FeatureExtractor.hpp index 7696c968..ed7169c2 100644 --- a/src/feature/FeatureExtractor.hpp +++ b/src/feature/FeatureExtractor.hpp @@ -25,8 +25,6 @@ namespace Feature { -typedef boost::property_tree::ptree Type; - class Extractor { public: diff --git a/src/feature/FeatureStore.cpp b/src/feature/FeatureStore.cpp index 4322ac7e..2f52eff8 100644 --- a/src/feature/FeatureStore.cpp +++ b/src/feature/FeatureStore.cpp @@ -62,7 +62,7 @@ Store::exists(Wt::Dbo::Session& session, Database::Track::id_type trackId, std:: } bool -Store::get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, Type& feature) +Store::get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, boost::property_tree::ptree& feature) { Wt::Dbo::Transaction transaction(session); @@ -94,7 +94,7 @@ Store::get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::str bool -Store::set(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, const Type& feature) +Store::set(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, const boost::property_tree::ptree& feature) { Wt::Dbo::Transaction transaction(session); diff --git a/src/feature/FeatureStore.hpp b/src/feature/FeatureStore.hpp index e1f70bea..a02e1400 100644 --- a/src/feature/FeatureStore.hpp +++ b/src/feature/FeatureStore.hpp @@ -20,9 +20,9 @@ #pragma once #include +#include #include "database/Types.hpp" -#include "FeatureExtractor.hpp" namespace Feature { @@ -35,9 +35,9 @@ class Store static Store& instance(); bool exists(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type); - bool get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, Type& feature); + bool get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, boost::property_tree::ptree& feature); - bool set(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, const Type& feature); + bool set(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, const boost::property_tree::ptree& feature); private: Store(); diff --git a/src/main/main.cpp b/src/main/main.cpp index 7cfafa8a..29830222 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -23,9 +23,9 @@ #include #include "utils/Config.hpp" +#include "utils/Logger.hpp" #include "av/AvInfo.hpp" #include "av/AvTranscoder.hpp" -#include "utils/Logger.hpp" #include "image/Image.hpp" #include "feature/FeatureExtractor.hpp" From a9c835a190a969a35fba705438064388c0055c9d Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 24 Sep 2016 16:44:56 +0200 Subject: [PATCH 027/195] Corrected db path --- src/main/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/main.cpp b/src/main/main.cpp index 29830222..bcd80006 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -123,7 +123,7 @@ int main(int argc, char* argv[]) // Initializing a connection pool to the database that will be shared along services std::unique_ptr - connectionPool( Database::Handler::createConnectionPool(Config::instance().getString("db-path"))); + connectionPool( Database::Handler::createConnectionPool(Config::instance().getPath("working-dir") / "lms.db")); Database::Updater& dbUpdater = Database::Updater::instance(); dbUpdater.setConnectionPool(*connectionPool); From 0a70552f8d348f29556667c3a091390358fe1809 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 11 Nov 2016 14:42:13 +0100 Subject: [PATCH 028/195] [UI] Fixed build using older versions of Wt --- src/ui/audio/desktop/DesktopAudio.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/ui/audio/desktop/DesktopAudio.cpp b/src/ui/audio/desktop/DesktopAudio.cpp index 3241c623..63e73c53 100644 --- a/src/ui/audio/desktop/DesktopAudio.cpp +++ b/src/ui/audio/desktop/DesktopAudio.cpp @@ -150,16 +150,34 @@ _playQueue(nullptr) playlistBtn->setMenu(popupMain); } +#if WT_VERSION >= 0X03030400 Wt::WPushButton *upBtn = new Wt::WPushButton("", Wt::XHTMLText); +#else + Wt::WPushButton *upBtn = new Wt::WPushButton("UP"); +#endif upBtn->setStyleClass("btn-sm"); playlistControls->addWidget(upBtn); + +#if WT_VERSION >= 0X03030400 Wt::WPushButton *downBtn = new Wt::WPushButton("", Wt::XHTMLText); +#else + Wt::WPushButton *downBtn = new Wt::WPushButton("DOWN"); +#endif downBtn->setStyleClass("btn-sm"); playlistControls->addWidget(downBtn); +#if WT_VERSION >= 0X03030400 Wt::WPushButton *delBtn = new Wt::WPushButton("", Wt::XHTMLText); +#else + Wt::WPushButton *delBtn = new Wt::WPushButton("DEL"); +#endif + delBtn->setStyleClass("btn-sm btn-warning"); playlistControls->addWidget(delBtn); +#if WT_VERSION >= 0X03030400 Wt::WPushButton *clearBtn = new Wt::WPushButton("", Wt::XHTMLText); +#else + Wt::WPushButton *clearBtn = new Wt::WPushButton("CLR"); +#endif clearBtn->setStyleClass("btn-sm btn-danger"); playlistControls->addWidget(clearBtn); From d8f8c77c07eeb5c35352aaac36d142b380200955 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 12 Nov 2016 12:23:23 +0100 Subject: [PATCH 029/195] [UI] Fixed build using older versions of Wt. Playback is unfortunately still broken --- src/ui/audio/desktop/TableFilter.cpp | 7 +++++++ src/ui/audio/desktop/TrackView.cpp | 3 +++ src/ui/common/InputRange.cpp | 27 +++++++++++++++++---------- src/ui/common/InputRange.hpp | 16 +++++++++++++++- 4 files changed, 42 insertions(+), 11 deletions(-) diff --git a/src/ui/audio/desktop/TableFilter.cpp b/src/ui/audio/desktop/TableFilter.cpp index bedb27ab..6af45e97 100644 --- a/src/ui/audio/desktop/TableFilter.cpp +++ b/src/ui/audio/desktop/TableFilter.cpp @@ -17,6 +17,7 @@ * along with LMS. If not, see . */ +#include #include #include "database/Types.hpp" @@ -86,7 +87,9 @@ TableFilterCluster::layoutSizeChanged (int width, int height) void TableFilterCluster::refresh(SearchFilter& filter) { +#if WT_VERSION >= 0X03030500 this->clearSelection(); +#endif Cluster::updateUIQueryModel(DboSession(), _queryModel, filter); } @@ -165,7 +168,9 @@ TableFilterArtist::layoutSizeChanged (int width, int height) void TableFilterArtist::refresh(SearchFilter& filter) { +#if WT_VERSION >= 0X03030500 this->clearSelection(); +#endif Artist::updateUIQueryModel(DboSession(), _queryModel, filter); } @@ -249,7 +254,9 @@ TableFilterRelease::layoutSizeChanged (int width, int height) void TableFilterRelease::refresh(SearchFilter& filter) { +#if WT_VERSION >= 0X03030500 this->clearSelection(); +#endif Release::updateUIQueryModel(DboSession(), _queryModel, filter); } diff --git a/src/ui/audio/desktop/TrackView.cpp b/src/ui/audio/desktop/TrackView.cpp index 8695d858..aaec7939 100644 --- a/src/ui/audio/desktop/TrackView.cpp +++ b/src/ui/audio/desktop/TrackView.cpp @@ -19,6 +19,7 @@ #include +#include #include #include @@ -160,7 +161,9 @@ TrackView::emitStats(const SearchFilter& filter) void TrackView::refresh(SearchFilter& filter) { +#if WT_VERSION >= 0X03030500 this->clearSelection(); +#endif Track::updateUIQueryModel(DboSession(), _queryModel, filter); emitStats(filter); diff --git a/src/ui/common/InputRange.cpp b/src/ui/common/InputRange.cpp index 3ff0da7b..cb1ce054 100644 --- a/src/ui/common/InputRange.cpp +++ b/src/ui/common/InputRange.cpp @@ -21,29 +21,36 @@ #if WT_VERSION < 0X03030500 #include +#include #endif #include "InputRange.hpp" +#if WT_VERSION >= 0X03030500 InputRange::InputRange(Wt::WContainerWidget *parent) : Wt::WWebWidget(parent) { - //TODO woraround for older Wt versions -#if WT_VERSION >= 0X03030500 setHtmlTagName("input"); setAttributeValue("type", "range"); -#else - Wt::WTemplate *t = new Wt::WTemplate("", parent); -#endif } - std::string InputRange::jsRef(void) const { -#if WT_VERSION >= 0X03030500 return Wt::WWebWidget::jsRef(); -#else - return this->jsRef() + ".getElementsByTagName(\"input\")[0]"; -#endif } + +#else +InputRange::InputRange(Wt::WContainerWidget *parent) +: Wt::WContainerWidget(parent) +{ + addWidget(new Wt::WTemplate("")); +} + +std::string +InputRange::jsRef(void) const +{ + return Wt::WWebWidget::jsRef() + ".getElementsByTagName(\"input\")[0]"; +} +#endif + diff --git a/src/ui/common/InputRange.hpp b/src/ui/common/InputRange.hpp index 7f03abb4..9ccb8fa8 100644 --- a/src/ui/common/InputRange.hpp +++ b/src/ui/common/InputRange.hpp @@ -22,11 +22,12 @@ #include #include +#include +#if WT_VERSION >= 0X03030500 class InputRange : public Wt::WWebWidget { public: InputRange(Wt::WContainerWidget *parent = 0); - Wt::DomElementType domElementType() const { return Wt::DomElement_INPUT; @@ -35,3 +36,16 @@ class InputRange : public Wt::WWebWidget std::string jsRef() const; }; +#else + +class InputRange : public Wt::WContainerWidget +{ + public: + InputRange(Wt::WContainerWidget *parent = 0); + + std::string jsRef() const; +}; + +#endif + + From 6591006fcc70b303c9261078d5e52b2454a80725 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 28 Jan 2018 14:15:50 +0100 Subject: [PATCH 030/195] New UI: first step --- Makefile.am | 8 +- README.md | 12 +- approot/artist.xml | 25 + approot/artists.xml | 25 + approot/messages.xml | 13 + approot/release.xml | 25 + approot/releases.xml | 31 + approot/templates.xml | 26 +- approot/tracks.xml | 33 + docroot/css/lms.css | 32 - src/Makefile.am | 37 +- src/cover/CoverArtGrabber.cpp | 6 +- src/database/DatabaseHandler.cpp | 2 +- src/database/DatabaseHandler.hpp | 1 + src/database/DbArtist.cpp | 202 ++++++ src/database/DbArtist.hpp | 98 +++ src/database/Release.cpp | 146 ++-- src/database/Release.hpp | 38 +- src/database/SearchFilter.cpp | 91 +-- src/database/SearchFilter.hpp | 62 +- src/database/Track.cpp | 133 ++-- src/database/Track.hpp | 48 +- src/database/Types.hpp | 2 +- src/ui/ArtistView.cpp | 122 ++++ .../TrackSearchView.hpp => ArtistView.hpp} | 14 +- src/ui/ArtistsView.cpp | 92 +++ .../MobileAudio.hpp => ArtistsView.hpp} | 20 +- src/ui/Explore.cpp | 98 +++ .../ArtistSearchView.hpp => Explore.hpp} | 10 +- src/ui/{audio/Audio.hpp => Filters.cpp} | 28 +- .../mobile/ArtistView.hpp => Filters.hpp} | 21 +- ...MobilePlayQueueEvents.hpp => HomeView.cpp} | 24 +- .../ReleaseSearchView.hpp => HomeView.hpp} | 12 +- src/ui/LmsApplication.cpp | 203 +++--- src/ui/LmsApplication.hpp | 4 + src/ui/ReleaseView.cpp | 151 +++++ .../Settings.hpp => ReleaseView.hpp} | 12 +- src/ui/ReleasesView.cpp | 103 +++ src/ui/ReleasesView.hpp | 38 ++ src/ui/TracksView.cpp | 109 +++ .../PreviewSearchView.hpp => TracksView.hpp} | 13 +- src/ui/audio/AudioPlayer.cpp | 357 ---------- src/ui/audio/AudioPlayer.hpp | 76 --- src/ui/audio/desktop/DesktopAudio.cpp | 556 --------------- src/ui/audio/desktop/DesktopAudio.hpp | 81 --- src/ui/audio/desktop/Filter.hpp | 57 -- src/ui/audio/desktop/FilterChain.cpp | 75 --- src/ui/audio/desktop/FilterChain.hpp | 59 -- src/ui/audio/desktop/KeywordSearchFilter.cpp | 64 -- src/ui/audio/desktop/KeywordSearchFilter.hpp | 54 -- src/ui/audio/desktop/PlayQueue.cpp | 634 ------------------ src/ui/audio/desktop/PlayQueue.hpp | 92 --- src/ui/audio/desktop/TableFilter.cpp | 282 -------- src/ui/audio/desktop/TableFilter.hpp | 112 ---- src/ui/audio/desktop/TrackView.cpp | 234 ------- src/ui/audio/desktop/TrackView.hpp | 80 --- src/ui/audio/mobile/ArtistSearch.cpp | 104 --- src/ui/audio/mobile/ArtistSearch.hpp | 59 -- src/ui/audio/mobile/ArtistSearchView.cpp | 61 -- src/ui/audio/mobile/ArtistView.cpp | 66 -- src/ui/audio/mobile/MobileAudio.cpp | 158 ----- src/ui/audio/mobile/MobilePlayQueue.cpp | 206 ------ src/ui/audio/mobile/MobilePlayQueue.hpp | 75 --- src/ui/audio/mobile/PreviewSearchView.cpp | 88 --- src/ui/audio/mobile/ReleaseSearch.cpp | 135 ---- src/ui/audio/mobile/ReleaseSearch.hpp | 58 -- src/ui/audio/mobile/ReleaseSearchView.cpp | 58 -- src/ui/audio/mobile/ReleaseView.cpp | 214 ------ src/ui/audio/mobile/ReleaseView.hpp | 66 -- src/ui/audio/mobile/SearchUtils.hpp | 32 - src/ui/audio/mobile/TrackSearch.cpp | 123 ---- src/ui/audio/mobile/TrackSearch.hpp | 59 -- src/ui/audio/mobile/TrackSearchView.cpp | 61 -- src/ui/settings/Settings.cpp | 110 --- src/ui/settings/SettingsAccountFormView.cpp | 285 -------- src/ui/settings/SettingsAccountFormView.hpp | 49 -- src/ui/settings/SettingsAudioFormView.cpp | 258 ------- src/ui/settings/SettingsAudioFormView.hpp | 49 -- src/ui/settings/SettingsDatabaseFormView.cpp | 400 ----------- src/ui/settings/SettingsDatabaseFormView.hpp | 58 -- .../SettingsFirstConnectionFormView.cpp | 229 ------- .../SettingsFirstConnectionFormView.hpp | 52 -- src/ui/settings/SettingsMediaDirectories.cpp | 172 ----- src/ui/settings/SettingsMediaDirectories.hpp | 59 -- .../SettingsMediaDirectoryFormView.cpp | 185 ----- .../SettingsMediaDirectoryFormView.hpp | 54 -- src/ui/settings/SettingsUserFormView.cpp | 411 ------------ src/ui/settings/SettingsUserFormView.hpp | 55 -- src/ui/settings/SettingsUsers.cpp | 202 ------ src/ui/settings/SettingsUsers.hpp | 52 -- src/ui/video/VideoDatabaseWidget.cpp | 143 ---- src/ui/video/VideoDatabaseWidget.hpp | 52 -- src/ui/video/VideoMediaPlayerWidget.cpp | 200 ------ src/ui/video/VideoMediaPlayerWidget.hpp | 85 --- src/ui/video/VideoParametersDialog.cpp | 143 ---- src/ui/video/VideoParametersDialog.hpp | 64 -- src/ui/video/VideoWidget.cpp | 91 --- src/ui/video/VideoWidget.hpp | 53 -- 98 files changed, 1602 insertions(+), 8515 deletions(-) create mode 100644 approot/artist.xml create mode 100644 approot/artists.xml create mode 100644 approot/messages.xml create mode 100644 approot/release.xml create mode 100644 approot/releases.xml create mode 100644 approot/tracks.xml create mode 100644 src/database/DbArtist.cpp create mode 100644 src/database/DbArtist.hpp create mode 100644 src/ui/ArtistView.cpp rename src/ui/{audio/mobile/TrackSearchView.hpp => ArtistView.hpp} (77%) create mode 100644 src/ui/ArtistsView.cpp rename src/ui/{audio/mobile/MobileAudio.hpp => ArtistsView.hpp} (71%) create mode 100644 src/ui/Explore.cpp rename src/ui/{audio/mobile/ArtistSearchView.hpp => Explore.hpp} (80%) rename src/ui/{audio/Audio.hpp => Filters.cpp} (57%) rename src/ui/{audio/mobile/ArtistView.hpp => Filters.hpp} (68%) rename src/ui/{audio/mobile/MobilePlayQueueEvents.hpp => HomeView.cpp} (71%) rename src/ui/{audio/mobile/ReleaseSearchView.hpp => HomeView.hpp} (80%) create mode 100644 src/ui/ReleaseView.cpp rename src/ui/{settings/Settings.hpp => ReleaseView.hpp} (81%) create mode 100644 src/ui/ReleasesView.cpp create mode 100644 src/ui/ReleasesView.hpp create mode 100644 src/ui/TracksView.cpp rename src/ui/{audio/mobile/PreviewSearchView.hpp => TracksView.hpp} (74%) delete mode 100644 src/ui/audio/AudioPlayer.cpp delete mode 100644 src/ui/audio/AudioPlayer.hpp delete mode 100644 src/ui/audio/desktop/DesktopAudio.cpp delete mode 100644 src/ui/audio/desktop/DesktopAudio.hpp delete mode 100644 src/ui/audio/desktop/Filter.hpp delete mode 100644 src/ui/audio/desktop/FilterChain.cpp delete mode 100644 src/ui/audio/desktop/FilterChain.hpp delete mode 100644 src/ui/audio/desktop/KeywordSearchFilter.cpp delete mode 100644 src/ui/audio/desktop/KeywordSearchFilter.hpp delete mode 100644 src/ui/audio/desktop/PlayQueue.cpp delete mode 100644 src/ui/audio/desktop/PlayQueue.hpp delete mode 100644 src/ui/audio/desktop/TableFilter.cpp delete mode 100644 src/ui/audio/desktop/TableFilter.hpp delete mode 100644 src/ui/audio/desktop/TrackView.cpp delete mode 100644 src/ui/audio/desktop/TrackView.hpp delete mode 100644 src/ui/audio/mobile/ArtistSearch.cpp delete mode 100644 src/ui/audio/mobile/ArtistSearch.hpp delete mode 100644 src/ui/audio/mobile/ArtistSearchView.cpp delete mode 100644 src/ui/audio/mobile/ArtistView.cpp delete mode 100644 src/ui/audio/mobile/MobileAudio.cpp delete mode 100644 src/ui/audio/mobile/MobilePlayQueue.cpp delete mode 100644 src/ui/audio/mobile/MobilePlayQueue.hpp delete mode 100644 src/ui/audio/mobile/PreviewSearchView.cpp delete mode 100644 src/ui/audio/mobile/ReleaseSearch.cpp delete mode 100644 src/ui/audio/mobile/ReleaseSearch.hpp delete mode 100644 src/ui/audio/mobile/ReleaseSearchView.cpp delete mode 100644 src/ui/audio/mobile/ReleaseView.cpp delete mode 100644 src/ui/audio/mobile/ReleaseView.hpp delete mode 100644 src/ui/audio/mobile/SearchUtils.hpp delete mode 100644 src/ui/audio/mobile/TrackSearch.cpp delete mode 100644 src/ui/audio/mobile/TrackSearch.hpp delete mode 100644 src/ui/audio/mobile/TrackSearchView.cpp delete mode 100644 src/ui/settings/Settings.cpp delete mode 100644 src/ui/settings/SettingsAccountFormView.cpp delete mode 100644 src/ui/settings/SettingsAccountFormView.hpp delete mode 100644 src/ui/settings/SettingsAudioFormView.cpp delete mode 100644 src/ui/settings/SettingsAudioFormView.hpp delete mode 100644 src/ui/settings/SettingsDatabaseFormView.cpp delete mode 100644 src/ui/settings/SettingsDatabaseFormView.hpp delete mode 100644 src/ui/settings/SettingsFirstConnectionFormView.cpp delete mode 100644 src/ui/settings/SettingsFirstConnectionFormView.hpp delete mode 100644 src/ui/settings/SettingsMediaDirectories.cpp delete mode 100644 src/ui/settings/SettingsMediaDirectories.hpp delete mode 100644 src/ui/settings/SettingsMediaDirectoryFormView.cpp delete mode 100644 src/ui/settings/SettingsMediaDirectoryFormView.hpp delete mode 100644 src/ui/settings/SettingsUserFormView.cpp delete mode 100644 src/ui/settings/SettingsUserFormView.hpp delete mode 100644 src/ui/settings/SettingsUsers.cpp delete mode 100644 src/ui/settings/SettingsUsers.hpp delete mode 100644 src/ui/video/VideoDatabaseWidget.cpp delete mode 100644 src/ui/video/VideoDatabaseWidget.hpp delete mode 100644 src/ui/video/VideoMediaPlayerWidget.cpp delete mode 100644 src/ui/video/VideoMediaPlayerWidget.hpp delete mode 100644 src/ui/video/VideoParametersDialog.cpp delete mode 100644 src/ui/video/VideoParametersDialog.hpp delete mode 100644 src/ui/video/VideoWidget.cpp delete mode 100644 src/ui/video/VideoWidget.hpp diff --git a/Makefile.am b/Makefile.am index a82a941d..ae035de4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,13 @@ lms_images_DATA = \ docroot/images/unknown-artist.jpg lms_approot_DATA = \ - approot/templates.xml + approot/artists.xml \ + approot/artist.xml \ + approot/messages.xml \ + approot/releases.xml \ + approot/release.xml \ + approot/templates.xml \ + approot/tracks.xml sysconf_DATA = \ $(top_srcdir)/conf/lms.conf diff --git a/README.md b/README.md index d60a242d..8f985bb4 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,7 @@ LMS is a self-hosted media streaming software, released under the GPLv3 license. It allows you to access your music and your videos using an http(s) web interface. ## Features - - Winamp-like interface, suited for large media collections - - Audio/Video transcode for maximum interoperability and low bandwith requirements + - Audio transcode for maximum interoperability and low bandwith requirements - User management - Playlist support - MusicBrainzID support to handle duplicated artist and release names @@ -14,20 +13,13 @@ Tags are automatically created to facilitate music searching, using: - Multi genre information from metadata - High-level information from AcousticBrainz -Please note LMS is still under development and will gain more features in the future: - - Radio function - - Interface suited for mobile devices - - Video support - - Subsonic and/or Ampache API - LMS is written entirely in C++. Therefore, it is suitable to run on embedded devices, where space and memory are limited. -Please note some media files may require significant CPU usage to be transcoded. ## Dependencies ### Debian ```sh -$ apt-get install g++ autoconf automake libboost-dev libboost-locale-dev libboost-iostreams-dev libavcodec-dev libwtdbosqlite-dev libwthttp-dev libwtdbo-dev libwt-dev libmagick++-dev libavcodec-dev libavformat-dev libav-tools libpstreams-dev libcurl-dev libcurlpp-dev libconfig++-dev +$ apt-get install g++ autoconf automake libboost-dev libboost-locale-dev libboost-iostreams-dev libavcodec-dev libwtdbosqlite-dev libwthttp-dev libwtdbo-dev libwt-dev libmagick++-dev libavcodec-dev libavformat-dev libav-tools libpstreams-dev libcurl-dev libcurlpp-dev libconfig++-dev ffmpeg ``` ## Build diff --git a/approot/artist.xml b/approot/artist.xml new file mode 100644 index 00000000..a877c111 --- /dev/null +++ b/approot/artist.xml @@ -0,0 +1,25 @@ + + + + + +
+

${name}

+
+ ${releases class="list-group"} + + + +
+
+ ${cover class="media-object"} +
+
+

${name}

+
+ ${}${tr:msg-various-artists}${} +

${}${year}${}${} (${orig-year})${}

+
+ + + diff --git a/approot/artists.xml b/approot/artists.xml new file mode 100644 index 00000000..92696a37 --- /dev/null +++ b/approot/artists.xml @@ -0,0 +1,25 @@ + + + + + +
+

${tr:msg-artists}

+
+
+
+ + ${search} +
+
+ ${artists class="list-group"} + + + +
+ ${nb-release} + ${name} +
+ + + diff --git a/approot/messages.xml b/approot/messages.xml new file mode 100644 index 00000000..196a7296 --- /dev/null +++ b/approot/messages.xml @@ -0,0 +1,13 @@ + + + + +Various artists +Artists +Albums +Tracks +Playlist +Add filter +Search... + + diff --git a/approot/release.xml b/approot/release.xml new file mode 100644 index 00000000..e92c6289 --- /dev/null +++ b/approot/release.xml @@ -0,0 +1,25 @@ + + + + + + + ${cover} +
+

${name}

+

${artist-name}

+

${}${year}${}${} (${orig-year})${}

+ ${play-btn}${add-btn} +
+ ${tracks} + + + + ${}${disc-number}-${}${}${track-number}. ${} + ${}${artist-name} - ${} + ${name} + ${play-btn}${add-btn} + + + + diff --git a/approot/releases.xml b/approot/releases.xml new file mode 100644 index 00000000..a7cca098 --- /dev/null +++ b/approot/releases.xml @@ -0,0 +1,31 @@ + + + + + + +
+

${tr:msg-releases}

+
+
+
+ + ${search} +
+
+ ${releases class="list-group"} + + + +
+
+ ${cover class="media-object"} +
+
+

${release-name}

+ ${artist-name} +
+
+ + + diff --git a/approot/templates.xml b/approot/templates.xml index 007c9824..9894b02e 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -2,15 +2,23 @@ - -
- ${collapse-button} -
- ${expand-button} - ${title-link} - ${search} -
- ${contents} + + ${navbar-top class="main-nav"} + ${contents class="container"} + + + + ${tr:msg-home-welcome} + + + + ${filters} + ${contents} + + + +
+ ${add-filter}${filters}
diff --git a/approot/tracks.xml b/approot/tracks.xml new file mode 100644 index 00000000..047796e8 --- /dev/null +++ b/approot/tracks.xml @@ -0,0 +1,33 @@ + + + + + + +
+

${tr:msg-tracks}

+
+
+
+ + ${search} +
+
+ ${tracks class="list-group"} + + + +
+
+ ${cover class="media-object"} +
+
+

${name}

+
+ ${}${release-name}${} + ${}${artist-name}${} + ${play-btn}${add-btn} +
+ + + diff --git a/docroot/css/lms.css b/docroot/css/lms.css index 814622af..9c47a5dc 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -1,14 +1,5 @@ .main-nav { margin-bottom: 0px; - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4); -} - -.Wt-hrh2 { - background-color: white; -} - -.Wt-vrh2 { - background-color: white; } .playqueue { @@ -198,26 +189,3 @@ box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.5) } -.release_truncated-name { - white-space: nowrap; - overflow: hidden; - overflow-x: hidden; - overflow-y: hidden; - text-overflow: ellipsis; -} - -.release_img-responsive { - display: block; - max-width: 100%; - height: auto; -} - -.release-search-cover { - width: 512px; - min-width: 512px; - height: 512px; - min-height: 512px; - display: flex; - justify-content: space-between; - align-items: center; -} diff --git a/src/Makefile.am b/src/Makefile.am index 6de2fd19..02bd8c3b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ lms_SOURCES = \ $(srcdir)/av/AvInfo.cpp \ $(srcdir)/av/AvTranscoder.cpp \ $(srcdir)/cover/CoverArtGrabber.cpp \ - $(srcdir)/database/Artist.cpp \ + $(srcdir)/database/DbArtist.cpp \ $(srcdir)/database/DatabaseHandler.cpp \ $(srcdir)/database/MediaDirectory.cpp \ $(srcdir)/database/Playlist.cpp \ @@ -24,41 +24,22 @@ lms_SOURCES = \ $(srcdir)/image/Image.cpp \ $(srcdir)/metadata/AvFormat.cpp \ $(srcdir)/metadata/TagLibParser.cpp \ + $(srcdir)/ui/ArtistView.cpp \ + $(srcdir)/ui/ArtistsView.cpp \ + $(srcdir)/ui/Explore.cpp \ + $(srcdir)/ui/Filters.cpp \ + $(srcdir)/ui/HomeView.cpp \ $(srcdir)/ui/LmsApplication.cpp \ + $(srcdir)/ui/ReleasesView.cpp \ + $(srcdir)/ui/ReleaseView.cpp \ + $(srcdir)/ui/TracksView.cpp \ $(srcdir)/ui/auth/LmsAuth.cpp \ - $(srcdir)/ui/audio/AudioPlayer.cpp \ - $(srcdir)/ui/audio/desktop/DesktopAudio.cpp \ - $(srcdir)/ui/audio/desktop/FilterChain.cpp \ - $(srcdir)/ui/audio/desktop/KeywordSearchFilter.cpp \ - $(srcdir)/ui/audio/desktop/PlayQueue.cpp \ - $(srcdir)/ui/audio/desktop/TableFilter.cpp \ - $(srcdir)/ui/audio/desktop/TrackView.cpp \ - $(srcdir)/ui/audio/mobile/ArtistSearch.cpp \ - $(srcdir)/ui/audio/mobile/ArtistSearchView.cpp \ - $(srcdir)/ui/audio/mobile/ArtistView.cpp \ - $(srcdir)/ui/audio/mobile/MobileAudio.cpp \ - $(srcdir)/ui/audio/mobile/MobilePlayQueue.cpp \ - $(srcdir)/ui/audio/mobile/PreviewSearchView.cpp \ - $(srcdir)/ui/audio/mobile/ReleaseSearch.cpp \ - $(srcdir)/ui/audio/mobile/ReleaseSearchView.cpp \ - $(srcdir)/ui/audio/mobile/ReleaseView.cpp \ - $(srcdir)/ui/audio/mobile/TrackSearch.cpp \ - $(srcdir)/ui/audio/mobile/TrackSearchView.cpp \ $(srcdir)/ui/common/DirectoryValidator.cpp \ $(srcdir)/ui/common/InputRange.cpp \ $(srcdir)/ui/common/LineEdit.cpp \ $(srcdir)/ui/resource/AvConvTranscodeStreamResource.cpp \ $(srcdir)/ui/resource/ImageResource.cpp \ $(srcdir)/ui/resource/TranscodeResource.cpp \ - $(srcdir)/ui/settings/Settings.cpp \ - $(srcdir)/ui/settings/SettingsAccountFormView.cpp \ - $(srcdir)/ui/settings/SettingsAudioFormView.cpp \ - $(srcdir)/ui/settings/SettingsDatabaseFormView.cpp \ - $(srcdir)/ui/settings/SettingsFirstConnectionFormView.cpp \ - $(srcdir)/ui/settings/SettingsMediaDirectories.cpp \ - $(srcdir)/ui/settings/SettingsMediaDirectoryFormView.cpp \ - $(srcdir)/ui/settings/SettingsUserFormView.cpp \ - $(srcdir)/ui/settings/SettingsUsers.cpp \ $(srcdir)/utils/Config.cpp \ $(srcdir)/utils/Logger.cpp \ $(srcdir)/utils/Path.cpp \ diff --git a/src/cover/CoverArtGrabber.cpp b/src/cover/CoverArtGrabber.cpp index a43f3626..a73a502c 100644 --- a/src/cover/CoverArtGrabber.cpp +++ b/src/cover/CoverArtGrabber.cpp @@ -178,11 +178,7 @@ Grabber::getFromRelease(Wt::Dbo::Session& session, Database::Release::id_type re if (!release || release->isNone()) return std::vector(); - // Get the first track of the release - std::vector tracks = Track::getByFilter(session, - SearchFilter::ById(SearchFilter::Field::Release, releaseId), - -1, 1 /* limit result size */); - + std::vector tracks = release->getTracks(); if (tracks.empty()) return std::vector(); diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index c159d378..1aedb3b8 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -187,7 +187,7 @@ Handler::createConnectionPool(boost::filesystem::path p) connection->executeSql("pragma journal_mode=WAL"); - // connection->setProperty("show-queries", "true"); + connection->setProperty("show-queries", "true"); return new Wt::Dbo::FixedSqlConnectionPool(connection, 1); } diff --git a/src/database/DatabaseHandler.hpp b/src/database/DatabaseHandler.hpp index 38978325..6b07984e 100644 --- a/src/database/DatabaseHandler.hpp +++ b/src/database/DatabaseHandler.hpp @@ -33,6 +33,7 @@ namespace Database { +typedef Wt::Dbo::dbo_default_traits::IdType id_type; typedef Wt::Auth::Dbo::UserDatabase UserDatabase; // Session living class handling the database and the login diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp new file mode 100644 index 00000000..7dc341f6 --- /dev/null +++ b/src/database/DbArtist.cpp @@ -0,0 +1,202 @@ +/* + * Copyright (C) 2015 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 . + */ + +#include "Types.hpp" +#include "SqlQuery.hpp" + +#include "utils/Logger.hpp" + +namespace Database +{ + +Artist::Artist(const std::string& name, const std::string& MBID) +: _name(std::string(name, 0 , _maxNameLength)), +_MBID(MBID) +{ + +} + +std::vector +Artist::getByName(Wt::Dbo::Session& session, const std::string& name) +{ + Wt::Dbo::collection res = session.find().where("name = ?").bind( std::string(name, 0, _maxNameLength) ); + return std::vector(res.begin(), res.end()); +} + +Artist::pointer +Artist::getByMBID(Wt::Dbo::Session& session, const std::string& mbid) +{ + return session.find().where("mbid = ?").bind(mbid); +} + +Artist::pointer +Artist::getById(Wt::Dbo::Session& session, Artist::id_type id) +{ + return session.find().where("id = ?").bind(id); +} + +Artist::pointer +Artist::create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID) +{ + return session.add(new Artist(name, MBID)); +} + +Artist::pointer +Artist::getNone(Wt::Dbo::Session& session) +{ + std::vector res = getByName(session, ""); + if (res.empty()) + return create(session, ""); + + return res.front(); +} + +bool +Artist::isNone() const +{ + return _name == ""; +} + +std::vector +Artist::getAll(Wt::Dbo::Session& session, int offset, int size) +{ + Wt::Dbo::collection res = session.find().orderBy("LOWER(name)").offset(offset).limit(size); + return std::vector(res.begin(), res.end()); +} + +std::vector +Artist::getAllOrphans(Wt::Dbo::Session& session) +{ + Wt::Dbo::collection res = session.query< Wt::Dbo::ptr >("SELECT DISTINCT a FROM artist a LEFT OUTER JOIN Track t ON a.id = t.artist_id WHERE t.id IS NULL"); + + return std::vector(res.begin(), res.end()); +} + +static +Wt::Dbo::Query +getQuery(Wt::Dbo::Session& session, + const std::vector& clusterIds, + const std::vector& keywords) +{ + WhereClause where; + + std::ostringstream oss; + oss << "SELECT DISTINCT a FROM artist a"; + + for (auto keyword : keywords) + where.And(WhereClause("a.name LIKE ?")).bind("%%" + keyword + "%%"); + + if (!clusterIds.empty()) + { + oss << " INNER JOIN track t ON t.artist_id = a.id INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id"; + + WhereClause clusterClause; + + for (auto id : clusterIds) + clusterClause.Or(WhereClause("c.id = ?")).bind(std::to_string(id)); + + where.And(clusterClause); + } + oss << " " << where.get(); + + if (!clusterIds.empty()) + oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size(); + + oss << " ORDER BY a.name"; + + Wt::Dbo::Query query = session.query( oss.str() ); + + for (const std::string& bindArg : where.getBindArgs()) + { + query.bind(bindArg); + } + + return query; +} + +std::vector +Artist::getByFilter(Wt::Dbo::Session& session, + const std::vector& clusters, + const std::vector keywords, + int offset, int size, bool& moreResults) +{ + Wt::Dbo::collection collection = getQuery(session, clusters, keywords).limit(size).offset(offset); + + auto res = std::vector(collection.begin(), collection.end()); + + if (size != -1 && res.size() == static_cast(size) + 1) + { + moreResults = true; + res.pop_back(); + } + else + moreResults = false; + + return res; +} + +std::vector > +Artist::getReleases(const std::vector& clusterIds) const +{ + assert(self()); + assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(session()); + + WhereClause where; + + std::ostringstream oss; + oss << "SELECT DISTINCT r FROM release r INNER JOIN artist a ON t.artist_id = a.id INNER JOIN track t ON t.release_id = r.id"; + + if (!clusterIds.empty()) + { + oss << " INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id"; + + WhereClause clusterClause; + + for (auto id : clusterIds) + clusterClause.Or(WhereClause("c.id = ?")).bind(std::to_string(id)); + + where.And(clusterClause); + } + + where.And(WhereClause("a.id = ?")).bind(std::to_string(id())); + + oss << " " << where.get(); + + if (!clusterIds.empty()) + oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size(); + + // TODO order + oss << " ORDER BY t.date,r.name"; + + Wt::Dbo::Query query = session()->query( oss.str() ); + + for (const std::string& bindArg : where.getBindArgs()) + { + query.bind(bindArg); + } + + Wt::Dbo::collection< Wt::Dbo::ptr > res = query; + + return std::vector< Wt::Dbo::ptr > (res.begin(), res.end()); +} + + + +} // namespace Database diff --git a/src/database/DbArtist.hpp b/src/database/DbArtist.hpp new file mode 100644 index 00000000..7b45bcb6 --- /dev/null +++ b/src/database/DbArtist.hpp @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2015 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 . + */ + +#ifndef _DB_ARTIST_HPP_ +#define _DB_ARTIST_HPP_ + +#include +#include + +#include +#include + +#include "SearchFilter.hpp" + +namespace Database +{ + +class Track; +class Cluster; +class Release; + +class Artist : public Wt::Dbo::Dbo +{ + public: + + typedef Wt::Dbo::ptr pointer; + typedef Wt::Dbo::dbo_traits::IdType id_type; + + Artist() {} + Artist(const std::string& name, const std::string& MBID = ""); + + // Accessors + static pointer getByMBID(Wt::Dbo::Session& session, const std::string& MBID); + static pointer getById(Wt::Dbo::Session& session, id_type id); + static pointer getNone(Wt::Dbo::Session& session); // Special entry + static std::vector getByName(Wt::Dbo::Session& session, const std::string& name); + static std::vector getByFilter(Wt::Dbo::Session& session, + const std::vector& clusters, // at least one track that belongs to these clusters + const std::vector keywords, // name must match all of these keywords + int offset, + int size, + bool& moreExpected); + + static std::vector getAll(Wt::Dbo::Session& session, int offset = -1, int size = -1); + static std::vector getAllOrphans(Wt::Dbo::Session& session); // No track related + + // Accessors + std::string getName(void) const { return _name; } + std::string getMBID(void) const { return _MBID; } + + // Get the releases that have at least one track for this artist + belongs to optonal cluster filters + std::vector> getReleases(const std::vector& clusterIds = std::vector()) const; + + void setMBID(std::string mbid) { _MBID = mbid; } + + // Create + static pointer create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID = ""); + + bool isNone(void) const; + + template + void persist(Action& a) + { + Wt::Dbo::field(a, _name, "name"); + Wt::Dbo::field(a, _MBID, "mbid"); + + Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToOne, "artist"); + } + + private: + + static const std::size_t _maxNameLength = 128; + + std::string _name; + std::string _MBID; // Musicbrainz Identifier + + Wt::Dbo::collection> _tracks; // Tracks of this artist +}; + +} // namespace Database + +#endif diff --git a/src/database/Release.cpp b/src/database/Release.cpp index d82cbcef..ca9e1fb5 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -82,68 +82,61 @@ Release::getAll(Wt::Dbo::Session& session, int offset, int size) std::vector Release::getAllOrphans(Wt::Dbo::Session& session) { - Wt::Dbo::collection res = session.query< Wt::Dbo::ptr >("select r from release r LEFT OUTER JOIN Track t ON r.id = t.release_id WHERE t.id IS NULL"); + Wt::Dbo::collection res = session.query>("select r from release r LEFT OUTER JOIN Track t ON r.id = t.release_id WHERE t.id IS NULL"); return std::vector(res.begin(), res.end()); } +static Wt::Dbo::Query -Release::getQuery(Wt::Dbo::Session& session, SearchFilter filter) +getQuery(Wt::Dbo::Session& session, + const std::vector& clusterIds, + const std::vector keywords) { - SqlQuery sqlQuery = generatePartialQuery(filter); + WhereClause where; - Wt::Dbo::Query query - = session.query("SELECT r FROM release r INNER JOIN artist a ON a.id = t.artist_id INNER JOIN track t ON t.release_id = r.id INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id " + sqlQuery.where().get()).groupBy("r.id").orderBy("r.name"); + std::ostringstream oss; + oss << "SELECT DISTINCT r FROM release r"; - for (const std::string& bindArg : sqlQuery.where().getBindArgs()) - query.bind(bindArg); + for (auto keyword : keywords) + where.And(WhereClause("r.name LIKE ?")).bind("%%" + keyword + "%%"); - return query; -} - -Wt::Dbo::Query -Release::getUIQuery(Wt::Dbo::Session& session, SearchFilter filter) -{ - SqlQuery sqlQuery = generatePartialQuery(filter); - - // TODO DATE of RELEASE - Wt::Dbo::Query query - = session.query("SELECT r.id, r.name, t.date, COUNT(DISTINCT t.id) FROM release r INNER JOIN track t ON t.release_id = r.id INNER JOIN artist a ON a.id = t.artist_id INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id " + sqlQuery.where().get()).groupBy("r.id").orderBy("r.name"); - - for (const std::string& bindArg : sqlQuery.where().getBindArgs()) - query.bind(bindArg); - - return query; -} - -void -Release::updateUIQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel& model, SearchFilter filter, const std::vector& columnNames) -{ - Wt::Dbo::Query query = getUIQuery(session, filter); - - model.setQuery(query, columnNames.empty() ? true : false); - - // TODO do something better - if (columnNames.size() == 3) + if (!clusterIds.empty()) { - model.addColumn( "r.name", columnNames[0]); - model.addColumn( "t.date", columnNames[1]); - model.addColumn( "COUNT(DISTINCT t.id)", columnNames[2]); + oss << " INNER JOIN track t ON t.release_id = r.id INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id"; + + WhereClause clusterClause; + + for (auto id : clusterIds) + clusterClause.And(WhereClause("c.id = ?")).bind(std::to_string(id)); + + where.And(clusterClause); } + + oss << " " << where.get(); + + if (!clusterIds.empty()) + oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size(); + + oss << " ORDER BY r.name"; + + Wt::Dbo::Query query = session.query( oss.str() ); + + for (const std::string& bindArg : where.getBindArgs()) + query.bind(bindArg); + + return query; } std::vector -Release::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size) +Release::getByFilter(Wt::Dbo::Session& session, + const std::vector& clusterIds, + const std::vector keywords, + int offset, int size, bool& moreResults) { - Wt::Dbo::collection res = getQuery(session, filter).limit(size).offset(offset); + Wt::Dbo::collection collection = getQuery(session, clusterIds, keywords).limit(size).offset(offset); - return std::vector(res.begin(), res.end()); -} - -std::vector -Release::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size, bool& moreResults) -{ - auto res = getByFilter(session, filter, offset, size + 1); + auto res = std::vector(collection.begin(), collection.end()); if (size != -1 && res.size() == static_cast(size) + 1) { @@ -156,28 +149,63 @@ Release::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, return res; } -int +boost::optional Release::getReleaseYear(bool original) const { assert(session()); - // TODO something better - auto tracks = Track::getByFilter(*session(), SearchFilter::ById(SearchFilter::Field::Release, this->id()), -1, 1); + Wt::Dbo::collection times = session()->query( + std::string("SELECT ") + (original ? "t.original_date" : "t.date") + " FROM track t INNER JOIN release r ON r.id = t.release_id") + .where("r.id = ?") + .groupBy("t.date") + .bind(this->id()); - if (tracks.empty()) - return 0; + /* various dates, no date */ + if (times.empty() || times.size() > 1) + return boost::none; - boost::gregorian::date date; - - if (original) - date = tracks.front()->getOriginalDate().date(); - else - date = tracks.front()->getDate().date(); + boost::gregorian::date date = times.front().date(); if (date.is_special()) - return 0; + return boost::none; - return date.year(); + return boost::make_optional(date.year()); } +std::vector> +Release::getArtists() const +{ + assert(self()); + assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(session()); + + Wt::Dbo::collection> res = session()->query>( + "SELECT DISTINCT a FROM artist a INNER JOIN release r ON t.artist_id = a.id INNER JOIN track t ON t.release_id = r.id") + .where("r.id = ?") + .bind(id()); + + return std::vector>(res.begin(), res.end()); +} + +bool +Release::hasVariousArtists() const +{ + // TODO optimize + return getArtists().size() > 1; +} + +std::vector> +Release::getTracks() const +{ + assert(self()); + assert(session()); + + Wt::Dbo::collection> res = session()->query>( + "SELECT t FROM track t INNER JOIN release r ON t.release_id = r.id") + .where("r.id = ?") + .orderBy("t.disc_number,t.track_number") + .bind(id()); + + return std::vector>(res.begin(), res.end()); +} } // namespace Database diff --git a/src/database/Release.hpp b/src/database/Release.hpp index f92b6c0c..fc6fedcb 100644 --- a/src/database/Release.hpp +++ b/src/database/Release.hpp @@ -17,11 +17,11 @@ * along with LMS. If not, see . */ -#ifndef _DB_RELEASE_HPP_ -#define _DB_RELEASE_HPP_ +#pragma once + +#include #include -#include #include "SearchFilter.hpp" @@ -30,6 +30,7 @@ namespace Database class Track; class Release; +class Artist; class Release : public Wt::Dbo::Dbo { @@ -46,30 +47,34 @@ class Release : public Wt::Dbo::Dbo static std::vector getByName(Wt::Dbo::Session& session, const std::string& name); static pointer getById(Wt::Dbo::Session& session, id_type id); static pointer getNone(Wt::Dbo::Session& session); // Special entry - static std::vector getAllOrphans(Wt::Dbo::Session& session); + static std::vector getAllOrphans(Wt::Dbo::Session& session); // no track related static std::vector getAll(Wt::Dbo::Session& session, int offset, int size); - static std::vector getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1); - static std::vector getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size, bool& moreExpected); + + static std::vector getByFilter(Wt::Dbo::Session& session, + const std::vector& clusters, // at least one track that belongs to these clusters + const std::vector keywords, // name must match all of these keywords + int offset, + int size, + bool& moreExpected); + + std::vector> getTracks() const; // Create static pointer create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID = ""); // Utility functions - int getReleaseYear(bool originalDate = false) const; // 0 if unknown or various + boost::optional getReleaseYear(bool originalDate = false) const; // 0 if unknown or various - // MVC models for the user interface - // ID, Release name, year, track counts - typedef boost::tuple UIQueryResult; - static Wt::Dbo::Query getUIQuery(Wt::Dbo::Session& session, SearchFilter filter); - static void updateUIQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel< UIQueryResult >& model, SearchFilter filter, const std::vector& columnNames = std::vector()); - - - // Accessosrs + // Accessors std::string getName() const { return _name; } std::string getMBID() const { return _MBID; } bool isNone(void) const; boost::posix_time::time_duration getDuration(void) const; + // Get the artists of this release + std::vector > getArtists() const; + bool hasVariousArtists() const; + void setMBID(std::string mbid) { _MBID = mbid; } template @@ -82,8 +87,6 @@ class Release : public Wt::Dbo::Dbo } private: - static Wt::Dbo::Query getQuery(Wt::Dbo::Session& session, SearchFilter filter); - static const std::size_t _maxNameLength = 128; std::string _name; @@ -94,5 +97,4 @@ class Release : public Wt::Dbo::Dbo } // namespace Database -#endif diff --git a/src/database/SearchFilter.cpp b/src/database/SearchFilter.cpp index 194296e4..5fb23e94 100644 --- a/src/database/SearchFilter.cpp +++ b/src/database/SearchFilter.cpp @@ -24,98 +24,15 @@ namespace Database { -static std::ostream& operator<<(std::ostream& ost, const std::vector< Wt::Dbo::dbo_default_traits::IdType>& ids) +void +SearchFilter::operator+=(const SearchFilter& filter) { - const char *sep = ""; - - for (auto id : ids) - { - ost << sep << std::to_string(id); - sep = ","; - } - - return ost; } -SqlQuery generatePartialQuery(SearchFilter& filter) +SqlQuery +SearchFilter::generatePartialQuery() { SqlQuery sqlQuery; - - // Process name like parameters - for (auto nameLikeMatches : filter.nameLikeMatch) - { - WhereClause likeWhereClause; - - for (auto nameLikeMatch : nameLikeMatches) - { - switch (nameLikeMatch.first) - { - case SearchFilter::Field::Artist: - for (const std::string& name : nameLikeMatch.second) - likeWhereClause.Or( WhereClause("a.name LIKE ?") ).bind("%%" + name + "%%"); - break; - - case SearchFilter::Field::Release: - for (const std::string& name : nameLikeMatch.second) - likeWhereClause.Or( WhereClause("r.name LIKE ?") ).bind("%%" + name + "%%"); - break; - - case SearchFilter::Field::Cluster: - for (const std::string& name : nameLikeMatch.second) - likeWhereClause.Or( WhereClause("c.name LIKE ?") ).bind("%%" + name + "%%"); - break; - - case SearchFilter::Field::Track: - for (const std::string& name : nameLikeMatch.second) - likeWhereClause.Or( WhereClause("t.name LIKE ?") ).bind("%%" + name + "%%"); - break; - } - } - sqlQuery.where().And( likeWhereClause ); - } - - // Process id exact match parameters - // Id list may be long, we do not bind the parameters - // Safe since we already known these are just ints - for (auto idMatch : filter.idMatch) - { - WhereClause idWhereClause; - - switch (idMatch.first) - { - case SearchFilter::Field::Artist: - { - std::ostringstream oss; - oss << "a.id IN (" << idMatch.second << ")"; - idWhereClause.Or(oss.str()); - } - break; - case SearchFilter::Field::Release: - { - std::ostringstream oss; - oss << "r.id IN (" << idMatch.second << ")"; - idWhereClause.Or(oss.str()); - } - break; - case SearchFilter::Field::Cluster: - { - std::ostringstream oss; - oss << "c.id IN (" << idMatch.second << ")"; - idWhereClause.Or(oss.str()); - } - break; - case SearchFilter::Field::Track: - { - std::ostringstream oss; - oss << "t.id IN (" << idMatch.second << ")"; - idWhereClause.Or(oss.str()); - } - break; - } - - sqlQuery.where().And( idWhereClause ); - } - return sqlQuery; } diff --git a/src/database/SearchFilter.hpp b/src/database/SearchFilter.hpp index 2156ecfe..01bbcb06 100644 --- a/src/database/SearchFilter.hpp +++ b/src/database/SearchFilter.hpp @@ -31,71 +31,37 @@ namespace Database { +typedef Wt::Dbo::dbo_default_traits::IdType id_type; + class SearchFilter { public: - enum class Field { - Artist, // artist - Release, // release - Track, // track - Cluster, // cluster - }; - - typedef std::vector > > NameLikeMatchType; - typedef std::map > IdMatchType; + typedef int id_type; SearchFilter() {} - // Helpers - static SearchFilter IdMatch( const IdMatchType& _idMatch ) - { - return SearchFilter(_idMatch); - } + static SearchFilter Artist(std::string name) {return SearchFilter();} + static SearchFilter Artist(id_type id) {return SearchFilter();} - static SearchFilter NameLikeMatch( const NameLikeMatchType& _nameLikeMatch ) - { - return SearchFilter(_nameLikeMatch); - } + static SearchFilter Release(std::string name) {return SearchFilter();} + static SearchFilter Release(id_type id) {return SearchFilter();} - // Single Field ID match - static SearchFilter ById(Field field, Wt::Dbo::dbo_default_traits::IdType id) - { - return SearchFilter({{field, {id} }}); - } + static SearchFilter Track(std::string name) {return SearchFilter();} - // Single Field Name match OR - static SearchFilter ByNameOr(Field field, std::vector keywords) - { - return NameLikeMatch({{{field, keywords}}}); - } + static SearchFilter Cluster(id_type id) {return SearchFilter();} - // Single Field Name match AND - static SearchFilter ByNameAnd(Field field, std::vector keywords) - { - NameLikeMatchType nameLikeMatch; + // Combine search filters by add operation + // Caution: multiple filters on different artist/release/track + // values may lead to empty results + void operator+=(const SearchFilter& filter); - for (auto keyword : keywords) - nameLikeMatch.push_back({{{field, {keyword}}}}); - - return NameLikeMatch(nameLikeMatch); - } - - // The filter is a AND of the following conditions: - - // ((Field1.name LIKE STR1-1 OR Field1.name LIKE STR1-2 ...) OR (Field2.name LIKE STR2-1 OR Field2.name LIKE STR2-2 ...) ... - NameLikeMatchType nameLikeMatch; - - // (Field1.id IN (ID1-1,ID1-2 ... ) AND (Field2.id IN (ID2-1,ID2-2 ... ) ... - IdMatchType idMatch; + SqlQuery generatePartialQuery(); private: - SearchFilter(const NameLikeMatchType& _nameLikeMatch) : nameLikeMatch(_nameLikeMatch) {} - SearchFilter(const IdMatchType& _idMatch) : idMatch(_idMatch) {} }; -SqlQuery generatePartialQuery(SearchFilter& filter); } // namespace Database diff --git a/src/database/Track.cpp b/src/database/Track.cpp index cfb3f8ea..ac7faa18 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -108,29 +108,42 @@ Track::getClusters(void) const return clusters; } +static Wt::Dbo::Query< Track::pointer > -Track::getQuery(Wt::Dbo::Session& session, SearchFilter filter) +getQuery(Wt::Dbo::Session& session, + const std::vector& clusterIds, + const std::vector keywords) { - SqlQuery sqlQuery = generatePartialQuery(filter); + WhereClause where; - Wt::Dbo::Query query - = session.query( "SELECT t FROM track t INNER JOIN artist a ON t.artist_id = a.id INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN release r ON r.id = t.release_id " + sqlQuery.where().get()).groupBy("t.id").orderBy("a.name,t.date,r.name,t.disc_number,t.track_number"); + std::ostringstream oss; + oss << "SELECT t FROM track t"; - for (const std::string& bindArg : sqlQuery.where().getBindArgs()) - query.bind(bindArg); + for (auto keyword : keywords) + where.And(WhereClause("t.name LIKE ?")).bind("%%" + keyword + "%%"); - return query; -} + if (!clusterIds.empty()) + { + oss << " INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id"; -Wt::Dbo::Query< Track::UIQueryResult > -Track::getUIQuery(Wt::Dbo::Session& session, SearchFilter filter) -{ - SqlQuery sqlQuery = generatePartialQuery(filter); + WhereClause clusterClause; - Wt::Dbo::Query query - = session.query( "SELECT t.id, a.name, r.name, t.disc_number, t.track_number, t.name, t.duration, t.date, t.original_date, t.genre_list FROM track t INNER JOIN artist a ON t.artist_id = a.id INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN release r ON r.id = t.release_id " + sqlQuery.where().get()).groupBy("t.id").orderBy("a.name,t.date,r.name,t.disc_number,t.track_number"); + for (auto id : clusterIds) + clusterClause.And(WhereClause("c.id = ?")).bind(std::to_string(id)); - for (const std::string& bindArg : sqlQuery.where().getBindArgs()) + where.And(clusterClause); + } + + oss << " " << where.get(); + + if (!clusterIds.empty()) + oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size(); + + oss << " ORDER BY t.name"; + + Wt::Dbo::Query query = session.query( oss.str() ); + + for (const std::string& bindArg : where.getBindArgs()) query.bind(bindArg); return query; @@ -139,7 +152,7 @@ Track::getUIQuery(Wt::Dbo::Session& session, SearchFilter filter) Track::StatsQueryResult Track::getStats(Wt::Dbo::Session& session, SearchFilter filter) { - SqlQuery sqlQuery = generatePartialQuery(filter); + SqlQuery sqlQuery = filter.generatePartialQuery(); Wt::Dbo::Query query = session.query( "SELECT COUNT(\"id\"), SUM(\"dur\") FROM (SELECT t.id as \"id\", t.duration as \"dur\" FROM track t INNER JOIN artist a ON t.artist_id = a.id INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN release r ON r.id = t.release_id " + sqlQuery.where().get() + " GROUP BY t.id)"); @@ -151,17 +164,14 @@ Track::getStats(Wt::Dbo::Session& session, SearchFilter filter) std::vector -Track::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size) +Track::getByFilter(Wt::Dbo::Session& session, + const std::vector& clusterIds, + const std::vector keywords, + int offset, int size, bool& moreResults) { - Wt::Dbo::collection res = getQuery(session, filter).limit(size).offset(offset); + Wt::Dbo::collection collection = getQuery(session, clusterIds, keywords).limit(size).offset(offset); - return std::vector(res.begin(), res.end()); -} - -std::vector -Track::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size, bool& moreResults) -{ - auto res = getByFilter(session, filter, offset, size + 1); + auto res = std::vector(collection.begin(), collection.end()); if (size != -1 && res.size() == static_cast(size) + 1) { @@ -174,26 +184,28 @@ Track::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, i return res; } -void -Track::updateUIQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel< UIQueryResult >& model, SearchFilter filter, const std::vector& columnNames) +boost::optional +Track::getTrackNumber(void) const { - Wt::Dbo::Query< UIQueryResult > query = getUIQuery(session, filter); - model.setQuery(query, columnNames.empty() ? true : false); + return (_trackNumber > 0) ? boost::make_optional(_trackNumber) : boost::none; +} - // TODO do something better - if (columnNames.size() == 9) - { - model.addColumn( "a.name", columnNames[0] ); - model.addColumn( "r.name", columnNames[1] ); - model.addColumn( "t.disc_number", columnNames[2] ); - model.addColumn( "t.track_number", columnNames[3] ); - model.addColumn( "t.name", columnNames[4] ); - model.addColumn( "t.duration", columnNames[5] ); - model.addColumn( "t.date", columnNames[6] ); - model.addColumn( "t.original_date", columnNames[7] ); - model.addColumn( "t.genre_list", columnNames[8] ); - } +boost::optional +Track::getTotalTrackNumber(void) const +{ + return (_totalTrackNumber > 0) ? boost::make_optional(_totalTrackNumber) : boost::none; +} +boost::optional +Track::getDiscNumber(void) const +{ + return (_discNumber > 0) ? boost::make_optional(_discNumber) : boost::none; +} + +boost::optional +Track::getTotalDiscNumber(void) const +{ + return (_totalDiscNumber > 0) ? boost::make_optional(_totalDiscNumber) : boost::none; } @@ -221,6 +233,13 @@ Cluster::get(Wt::Dbo::Session& session, std::string type, std::string name) return session.find().where("type = ?").where("name = ?").bind( std::string(type, 0, _maxTypeLength)).bind( std::string(name, 0, _maxNameLength)); } +std::vector +Cluster::getByType(Wt::Dbo::Session& session, std::string type) +{ + Wt::Dbo::collection res = session.find().where("type = ?").bind( std::string(type, 0, _maxTypeLength)).orderBy("name"); + return std::vector(res.begin(), res.end()); +} + Cluster::pointer Cluster::getNone(Wt::Dbo::Session& session) { @@ -252,7 +271,7 @@ Cluster::remove(Wt::Dbo::Session& session, std::string type) Wt::Dbo::Query Cluster::getQuery(Wt::Dbo::Session& session, SearchFilter filter) { - SqlQuery sqlQuery = generatePartialQuery(filter); + SqlQuery sqlQuery = filter.generatePartialQuery(); Wt::Dbo::Query query = session.query( "SELECT g FROM cluster c INNER JOIN track_cluster t_c ON t_c.cluster_id = c.id INNER JOIN artist a ON t.artist_id = a.id INNER JOIN release r ON r.id = t.release_id INNER JOIN track t ON t.id = t_c.track_id " + sqlQuery.where().get()).groupBy("c.name").orderBy("c.name"); @@ -263,34 +282,6 @@ Cluster::getQuery(Wt::Dbo::Session& session, SearchFilter filter) return query; } -Wt::Dbo::Query -Cluster::getUIQuery(Wt::Dbo::Session& session, SearchFilter filter) -{ - SqlQuery sqlQuery = generatePartialQuery(filter); - - Wt::Dbo::Query query - = session.query( "SELECT c.id, c.name, COUNT(DISTINCT t.id) FROM cluster c INNER JOIN track_cluster t_c ON t_c.cluster_id = c.id INNER JOIN artist a ON t.artist_id = a.id INNER JOIN release r ON r.id = t.release_id INNER JOIN track t ON t.id = t_c.track_id " + sqlQuery.where().get()).groupBy("c.name").orderBy("c.name"); - - for (const std::string& bindArg : sqlQuery.where().getBindArgs()) - query.bind(bindArg); - - return query; -} - -void -Cluster::updateUIQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel& model, SearchFilter filter, const std::vector& columnNames) -{ - Wt::Dbo::Query query = getUIQuery(session, filter); - model.setQuery(query, columnNames.empty() ? true : false); - - // TODO do something better - if (columnNames.size() == 2) - { - model.addColumn( "c.name", columnNames[0] ); - model.addColumn( "COUNT(DISTINCT t.id)", columnNames[1] ); - } -} - std::vector Cluster::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size) { diff --git a/src/database/Track.hpp b/src/database/Track.hpp index 3d523814..d1af053c 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -24,6 +24,7 @@ #include #include +#include #include #include @@ -44,6 +45,12 @@ class Cluster { public: + enum class Type + { + Genre = 1, + Mood = 2, + }; + typedef Wt::Dbo::ptr pointer; typedef Wt::Dbo::dbo_traits::IdType id_type; @@ -57,12 +64,6 @@ class Cluster static Wt::Dbo::collection getAll(Wt::Dbo::Session& session); static std::vector getByType(Wt::Dbo::Session& session, std::string type); - // MVC models for the user interface - // ClusterID, type, name, track count - typedef boost::tuple UIQueryResult; - static Wt::Dbo::Query getUIQuery(Wt::Dbo::Session& session, SearchFilter filter); - static void updateUIQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel& model, SearchFilter filter, const std::vector& columnNames = std::vector()); - // Create utility static pointer create(Wt::Dbo::Session& session, std::string type, std::string name); @@ -118,8 +119,13 @@ class Track static pointer getByPath(Wt::Dbo::Session& session, const boost::filesystem::path& p); static pointer getById(Wt::Dbo::Session& session, id_type id); static pointer getByMBID(Wt::Dbo::Session& session, const std::string& MBID); - static std::vector getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1); - static std::vector getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size, bool &moreResults); + static std::vector getByFilter(Wt::Dbo::Session& session, + const std::vector& clusters, // tracks that belong to these clusters + const std::vector keywords, // name must match all of these keywords + int offset, + int size, + bool& moreExpected); + static Wt::Dbo::collection< pointer > getAll(Wt::Dbo::Session& session); static std::vector getAllIds(Wt::Dbo::Session& session); // nested transaction static std::vector getAllPaths(Wt::Dbo::Session& session); // nested transaction @@ -127,22 +133,6 @@ class Track static std::vector getChecksumDuplicates(Wt::Dbo::Session& session); // Utility fonctions - // MVC models for the user interface - // ID, Artist name, Release Name, DiscNumber, TrackNumber, Name, duration, date, original date, genre list - typedef boost::tuple // genre list - UIQueryResult; - static Wt::Dbo::Query< UIQueryResult > getUIQuery(Wt::Dbo::Session& session, SearchFilter filter); - static void updateUIQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel< UIQueryResult >& model, SearchFilter filter, const std::vector& columnNames = std::vector()); - // Stats for a given search filter typedef boost::tuple< int, // Total tracks @@ -174,10 +164,10 @@ class Track void setArtist(Wt::Dbo::ptr artist) { _artist = artist; } void setRelease(Wt::Dbo::ptr release) { _release = release; } - int getTrackNumber(void) const { return _trackNumber; } - int getTotalTrackNumber(void) const { return _totalTrackNumber; } - int getDiscNumber(void) const { return _discNumber; } - int getTotalDiscNumber(void) const { return _totalDiscNumber; } + boost::optional getTrackNumber(void) const; + boost::optional getTotalTrackNumber(void) const; + boost::optional getDiscNumber(void) const; + boost::optional getTotalDiscNumber(void) const; std::string getName(void) const { return _name; } boost::filesystem::path getPath(void) const { return _filePath; } boost::posix_time::time_duration getDuration(void) const { return _duration; } @@ -218,8 +208,6 @@ class Track private: - static Wt::Dbo::Query< pointer > getQuery(Wt::Dbo::Session& session, SearchFilter filter); - static const std::size_t _maxNameLength = 128; int _trackNumber; diff --git a/src/database/Types.hpp b/src/database/Types.hpp index a04b978b..681e4c97 100644 --- a/src/database/Types.hpp +++ b/src/database/Types.hpp @@ -19,7 +19,7 @@ // header file aimed to ease database class declarations -#include "Artist.hpp" +#include "DbArtist.hpp" #include "Track.hpp" #include "Playlist.hpp" #include "Release.hpp" diff --git a/src/ui/ArtistView.cpp b/src/ui/ArtistView.cpp new file mode 100644 index 00000000..5327ced6 --- /dev/null +++ b/src/ui/ArtistView.cpp @@ -0,0 +1,122 @@ +/* + * 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 . + */ + +#include +#include +#include +#include +#include + +#include "database/Types.hpp" + +#include "utils/Logger.hpp" +#include "utils/Utils.hpp" + +#include "LmsApplication.hpp" +#include "ArtistView.hpp" + +namespace UserInterface { + +Artist::Artist(Filters* filters, Wt::WContainerWidget* parent) +: Wt::WContainerWidget(parent), + _filters(filters) +{ + wApp->internalPathChanged().connect(std::bind([=] + { + refresh(); + })); + + refresh(); +} + +void +Artist::refresh() +{ + if (!wApp->internalPathMatches("/artist/")) + return; + + clear(); + + Database::Artist::id_type artistId; + if (!readAs(wApp->internalPathNextPart("/artist/"), artistId)) + return; + + Wt::Dbo::Transaction transaction(DboSession()); + auto artist = Database::Artist::getById(DboSession(), artistId); + + if (!artist) + { + LmsApp->goHome(); + return; + } + + auto t = new Wt::WTemplate(Wt::WString::tr("template-artist"), this); + t->addFunction("tr", &Wt::WTemplate::Functions::tr); + + t->bindString("name", Wt::WString::fromUTF8(artist->getName()), Wt::PlainText); + + auto releasesContainer = new Wt::WContainerWidget(); + t->bindWidget("releases", releasesContainer); + + auto releases = artist->getReleases(_filters->getClusterIds()); + for (auto release : releases) + { + if (release->isNone()) + continue; + + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-artist-entry"), releasesContainer); + entry->addFunction("tr", Wt::WTemplate::Functions::tr); + + { + Wt::WAnchor *coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); + Wt::WImage *cover = new Wt::WImage(coverAnchor); + cover->setImageLink(SessionImageResource()->getReleaseUrl(release.id(), 128)); + // Some images may not be square + cover->setWidth(128); + entry->bindWidget("cover", coverAnchor); + } + + { + Wt::WAnchor *releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); + Wt::WText *releaseName = new Wt::WText(releaseAnchor); + releaseName->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); + entry->bindWidget("name", releaseAnchor); + } + + if (release->hasVariousArtists()) + entry->setCondition("if-has-various-artists", true); + + boost::optional year = release->getReleaseYear(); + if (year) + { + entry->setCondition("if-has-year", true); + entry->bindInt("year", *year); + + boost::optional originalYear = release->getReleaseYear(true); + if (originalYear && *originalYear != *year) + { + entry->setCondition("if-has-orig-year", true); + entry->bindInt("orig-year", *originalYear); + } + } + } +} + +} // namespace UserInterface + diff --git a/src/ui/audio/mobile/TrackSearchView.hpp b/src/ui/ArtistView.hpp similarity index 77% rename from src/ui/audio/mobile/TrackSearchView.hpp rename to src/ui/ArtistView.hpp index 602d9c56..eb7262d7 100644 --- a/src/ui/audio/mobile/TrackSearchView.hpp +++ b/src/ui/ArtistView.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -20,19 +20,21 @@ #pragma once #include -#include + +#include "Filters.hpp" namespace UserInterface { -namespace Mobile { -class TrackSearchView : public Wt::WContainerWidget +class Artist : public Wt::WContainerWidget { public: + Artist(Filters* filters, Wt::WContainerWidget* parent = 0); - TrackSearchView(PlayQueueEvents& events, Wt::WContainerWidget* parent = 0); + private: + void refresh(); + Filters* _filters; }; -} // namespace Mobile } // namespace UserInterface diff --git a/src/ui/ArtistsView.cpp b/src/ui/ArtistsView.cpp new file mode 100644 index 00000000..e684db2d --- /dev/null +++ b/src/ui/ArtistsView.cpp @@ -0,0 +1,92 @@ +/* + * 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 . + */ + +#include +#include +#include +#include + +#include "database/Types.hpp" + +#include "utils/Logger.hpp" +#include "utils/Utils.hpp" + +#include "LmsApplication.hpp" +#include "ArtistsView.hpp" + +namespace UserInterface { + +using namespace Database; + +Artists::Artists(Filters* filters, Wt::WContainerWidget* parent) +: Wt::WContainerWidget(parent), + _filters(filters) +{ + auto artists = new Wt::WTemplate(Wt::WString::tr("template-artists"), this); + artists->addFunction("tr", &Wt::WTemplate::Functions::tr); + + auto search = new Wt::WLineEdit(); + artists->bindWidget("search", search); + search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); + search->textInput().connect(std::bind([this, search] + { + auto keywords = splitString(search->text().toUTF8(), " "); + refresh(keywords); + })); + + _artistsContainer = new Wt::WContainerWidget(); + artists->bindWidget("artists", _artistsContainer); + + refresh(); +} + + +void +Artists::refresh(std::vector searchKeywords) +{ + _artistsContainer->clear(); + + auto clusterIds = _filters->getClusterIds(); + + Wt::Dbo::Transaction transaction(DboSession()); + + bool moreResults; + auto artists = Artist::getByFilter(DboSession(), + clusterIds, + searchKeywords, + 0, 40, moreResults); + + for (auto artist : artists) + { + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-artists-entry"), _artistsContainer); + + entry->bindInt("nb-release", artist->getReleases(clusterIds).size()); + + { + Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(artist.id()))); + Wt::WText *artistText = new Wt::WText(artistAnchor); + artistText->setText(Wt::WString::fromUTF8(artist->getName(), Wt::PlainText)); + entry->bindWidget("name", artistAnchor); + } + } + +} + +} // namespace UserInterface + diff --git a/src/ui/audio/mobile/MobileAudio.hpp b/src/ui/ArtistsView.hpp similarity index 71% rename from src/ui/audio/mobile/MobileAudio.hpp rename to src/ui/ArtistsView.hpp index c49b24ae..2cc29bfc 100644 --- a/src/ui/audio/mobile/MobileAudio.hpp +++ b/src/ui/ArtistsView.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -21,27 +21,21 @@ #include -#include "audio/Audio.hpp" - -#include "MobilePlayQueueEvents.hpp" - +#include "Filters.hpp" namespace UserInterface { -namespace Mobile { -class Audio : public UserInterface::Audio +class Artists : public Wt::WContainerWidget { public: - Audio(Wt::WContainerWidget *parent = 0); - - void search(std::string text); + Artists(Filters* filters, Wt::WContainerWidget* parent = 0); private: + void refresh(std::vector searchKeywords = std::vector()); - PlayQueueEvents _playQueueEvents; - + Filters* _filters; + Wt::WContainerWidget* _artistsContainer; }; -} // namespace Mobile } // namespace UserInterface diff --git a/src/ui/Explore.cpp b/src/ui/Explore.cpp new file mode 100644 index 00000000..46cfc5ca --- /dev/null +++ b/src/ui/Explore.cpp @@ -0,0 +1,98 @@ +/* + * 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 . + */ + +#include +#include +#include + +#include "utils/Logger.hpp" + +#include "LmsApplication.hpp" + +#include "ArtistsView.hpp" +#include "ArtistView.hpp" +#include "ReleasesView.hpp" +#include "ReleaseView.hpp" +#include "TracksView.hpp" + +#include "Explore.hpp" + +namespace UserInterface { + + +enum IdxRoot +{ + IdxArtists = 0, + IdxArtist, + IdxReleases, + IdxRelease, + IdxTracks, +}; + +static void +handlePathChange(Wt::WStackedWidget* stack) +{ + static const std::map indexes = + { + { "/artists", IdxArtists }, + { "/artist", IdxArtist }, + { "/releases", IdxReleases }, + { "/release", IdxRelease }, + { "/tracks", IdxTracks }, + }; + + LMS_LOG(UI, DEBUG) << "Internal path changed to '" << wApp->internalPath() << "'"; + + for (auto index : indexes) + { + if (wApp->internalPathMatches(index.first)) + { + stack->setCurrentIndex(index.second); + return; + } + } +} + +Explore::Explore(Wt::WContainerWidget* parent) +: Wt::WContainerWidget(parent) +{ + auto container = new Wt::WTemplate(Wt::WString::tr("template-explore"), this); + + auto filters = new Filters(); + container->bindWidget("filters", filters); + + // Contents + Wt::WStackedWidget* stack = new Wt::WStackedWidget(); + container->bindWidget("contents", stack); + + stack->addWidget(new Artists(filters)); + stack->addWidget(new Artist(filters)); + stack->addWidget(new Releases(/*filters*/)); + stack->addWidget(new Release(/*filters*/)); + stack->addWidget(new Tracks(/*filters*/)); + + wApp->internalPathChanged().connect(std::bind([=] + { + handlePathChange(stack); + })); + + handlePathChange(stack); +} +} // namespace UserInterface + diff --git a/src/ui/audio/mobile/ArtistSearchView.hpp b/src/ui/Explore.hpp similarity index 80% rename from src/ui/audio/mobile/ArtistSearchView.hpp rename to src/ui/Explore.hpp index 29971950..ac360a83 100644 --- a/src/ui/audio/mobile/ArtistSearchView.hpp +++ b/src/ui/Explore.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -22,16 +22,12 @@ #include namespace UserInterface { -namespace Mobile { -class ArtistSearchView : public Wt::WContainerWidget +class Explore : public Wt::WContainerWidget { public: - - ArtistSearchView(Wt::WContainerWidget* parent = 0); - + Explore(Wt::WContainerWidget *parent = 0); }; -} // namespace Mobile } // namespace UserInterface diff --git a/src/ui/audio/Audio.hpp b/src/ui/Filters.cpp similarity index 57% rename from src/ui/audio/Audio.hpp rename to src/ui/Filters.cpp index 422b0cca..8dc3f131 100644 --- a/src/ui/audio/Audio.hpp +++ b/src/ui/Filters.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -17,25 +17,29 @@ * along with LMS. If not, see . */ -#ifndef UI_AUDIO_HPP -#define UI_AUDIO_HPP +#include +#include -#include -#include +#include "Filters.hpp" namespace UserInterface { -class Audio : public Wt::WContainerWidget +Filters::Filters(Wt::WContainerWidget *parent) +: Wt::WContainerWidget(parent) { - public: + auto container = new Wt::WTemplate(Wt::WString::tr("template-filters"), this); - Audio(Wt::WContainerWidget *parent) : Wt::WContainerWidget(parent) {} - virtual ~Audio() {} + // Filters + Wt::WPushButton *addFilterBtn = new Wt::WPushButton(Wt::WText::tr("msg-filter-add")); + container->bindWidget("add-filter", addFilterBtn); + + _filters = new Wt::WContainerWidget(); + container->bindWidget("filters", _filters); + +// _filterIds = {108, 419}; +} - virtual void search(std::string text) = 0; -}; } // namespace UserInterface -#endif diff --git a/src/ui/audio/mobile/ArtistView.hpp b/src/ui/Filters.hpp similarity index 68% rename from src/ui/audio/mobile/ArtistView.hpp rename to src/ui/Filters.hpp index 089e6f53..98d2e4c0 100644 --- a/src/ui/audio/mobile/ArtistView.hpp +++ b/src/ui/Filters.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -20,24 +20,25 @@ #pragma once #include -#include #include "database/Types.hpp" -namespace UserInterface { -namespace Mobile { +#include "Filters.hpp" -class ArtistView : public Wt::WContainerWidget +namespace UserInterface { + +class Filters : public Wt::WContainerWidget { public: + Filters(Wt::WContainerWidget *parent = 0); - static Wt::WLink getLink(Database::Artist::id_type id); + std::vector getClusterIds() const { return _filterIds; } - ArtistView(Wt::WContainerWidget *parent = 0); + private: + Wt::WContainerWidget *_filters; + std::vector _filterIds; }; - -} //namespace Mobile -} //namespace UserInterface +} // namespace UserInterface diff --git a/src/ui/audio/mobile/MobilePlayQueueEvents.hpp b/src/ui/HomeView.cpp similarity index 71% rename from src/ui/audio/mobile/MobilePlayQueueEvents.hpp rename to src/ui/HomeView.cpp index 61775642..730f981e 100644 --- a/src/ui/audio/mobile/MobilePlayQueueEvents.hpp +++ b/src/ui/HomeView.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -17,20 +17,22 @@ * along with LMS. If not, see . */ -#pragma once +#include -#include -#include "database/Types.hpp" +#include "utils/Logger.hpp" + +#include "LmsApplication.hpp" + +#include "HomeView.hpp" namespace UserInterface { -namespace Mobile { -struct PlayQueueEvents + +Home::Home(Wt::WContainerWidget *parent) +: Wt::WContainerWidget(parent) { - Wt::Signal trackPlay; - Wt::Signal trackAdd; -}; + addWidget(new Wt::WTemplate(Wt::WString::tr("template-home"))); +} - -} // namespace Mobile } // namespace UserInterface + diff --git a/src/ui/audio/mobile/ReleaseSearchView.hpp b/src/ui/HomeView.hpp similarity index 80% rename from src/ui/audio/mobile/ReleaseSearchView.hpp rename to src/ui/HomeView.hpp index 8427fe68..33f65d5e 100644 --- a/src/ui/audio/mobile/ReleaseSearchView.hpp +++ b/src/ui/HomeView.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -22,16 +22,18 @@ #include namespace UserInterface { -namespace Mobile { -class ReleaseSearchView : public Wt::WContainerWidget +class Home : public Wt::WContainerWidget { public: + Home(Wt::WContainerWidget *parent = 0); - ReleaseSearchView(Wt::WContainerWidget* parent = 0); + private: + + void displayFilter(void); + void displayContents(void); }; -} // namespace Mobile } // namespace UserInterface diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index d68c2f02..063e97be 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -19,28 +19,19 @@ #include #include -#include #include #include #include -#include -#include -#include +#include #include "config/config.h" #include "utils/Logger.hpp" #include "utils/Utils.hpp" -#include "settings/Settings.hpp" -#include "settings/SettingsFirstConnectionFormView.hpp" - #include "auth/LmsAuth.hpp" -#include "audio/desktop/DesktopAudio.hpp" -#include "audio/mobile/MobileAudio.hpp" -#if HAVE_VIDEO -#include "video/VideoWidget.hpp" -#endif -#include "common/LineEdit.hpp" +#include "Explore.hpp" +#include "HomeView.hpp" + #include "LmsApplication.hpp" @@ -48,19 +39,6 @@ namespace skeletons { extern const char *AuthStrings_xml1; } -namespace { - -bool agentIsMobile() -{ - const Wt::WEnvironment& env = Wt::WApplication::instance()->environment(); - return (env.agentIsIEMobile() - || env.agentIsMobileWebKit() - || env.userAgent().find("Mobile") != std::string::npos // Workaround for firefox - || env.userAgent().find("Tablet") != std::string::npos // Workaround for firefox - ); -} -} - namespace UserInterface { Wt::WApplication* @@ -100,7 +78,13 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti useStyleSheet("resources/font-awesome/css/font-awesome.min.css"); // Add a resource bundle + messageResourceBundle().use(appRoot() + "artist"); + messageResourceBundle().use(appRoot() + "artists"); + messageResourceBundle().use(appRoot() + "messages"); messageResourceBundle().use(appRoot() + "templates"); + messageResourceBundle().use(appRoot() + "release"); + messageResourceBundle().use(appRoot() + "releases"); + messageResourceBundle().use(appRoot() + "tracks"); setTitle("LMS"); @@ -114,9 +98,9 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti LMS_LOG(UI, DEBUG) << "Creating root widget. First connection = " << std::boolalpha << firstConnection; // If here is no account in the database, launch the first connection wizard - if (firstConnection) - createFirstConnectionUI(); - else +// if (firstConnection) +// createFirstConnectionUI(); +// else createLmsUI(); } @@ -149,13 +133,19 @@ TranscodeResource* SessionTranscodeResource() return LmsApplication::instance()->getTranscodeResource(); } +void +LmsApplication::goHome() +{ + setInternalPath("/home", true); +} + void LmsApplication::createFirstConnectionUI() { // Hack, use the auth widget builtin strings builtinLocalizedStrings().useBuiltin(skeletons::AuthStrings_xml1); - root()->addWidget( new Settings::FirstConnectionFormView()); +// root()->addWidget( new Settings::FirstConnectionFormView()); } void @@ -164,6 +154,8 @@ LmsApplication::createLmsUI() _imageResource = new ImageResource(_db, root()); _transcodeResource = new TranscodeResource(_db, root()); + handleAuthEvent(); + /* DbHandler().getLogin().changed().connect(this, &LmsApplication::handleAuthEvent); LmsAuth *authWidget = new LmsAuth(); @@ -174,11 +166,53 @@ LmsApplication::createLmsUI() authWidget->processEnvironment(); root()->addWidget(authWidget); + */ +} + + +enum IdxRoot +{ + IdxHome = 0, + IdxExplore, + IdxPlaylist, + IdxSettings, +}; + + + +static void +handlePathChange(Wt::WStackedWidget* stack) +{ + static const std::map indexes = + { + { "/home", IdxHome }, + { "/artists", IdxExplore }, + { "/artist", IdxExplore }, + { "/releases", IdxExplore }, + { "/release", IdxExplore }, + { "/tracks", IdxExplore }, + { "/playlist", IdxPlaylist }, + { "/settings", IdxSettings }, + }; + + LMS_LOG(UI, DEBUG) << "Internal path changed to '" << wApp->internalPath() << "'"; + + for (auto index : indexes) + { + if (wApp->internalPathMatches(index.first)) + { + stack->setCurrentIndex(index.second); + return; + } + } + + wApp->setInternalPath("/home", true); } void LmsApplication::handleAuthEvent(void) { + /* if (!DbHandler().getLogin().loggedIn()) { LMS_LOG(UI, INFO) << "User logged out, session = " << Wt::WApplication::instance()->sessionId(); @@ -190,76 +224,61 @@ LmsApplication::handleAuthEvent(void) } LMS_LOG(UI, INFO) << "User '" << CurrentAuthUser().identity(Wt::Auth::Identity::LoginName) << "' logged in from '" << Wt::WApplication::instance()->environment().clientAddress() << "', user agent = " << Wt::WApplication::instance()->environment().agent() << ", session = " << Wt::WApplication::instance()->sessionId(); +*/ + setConfirmCloseMessage(Wt::WString::tr("msg-quit-confirm")); - this->root()->setOverflow(Wt::WContainerWidget::OverflowHidden); - setConfirmCloseMessage("Closing LMS. Are you sure?"); + auto main = new Wt::WTemplate(Wt::WString::tr("template-main"), root()); - // Create a Vertical layout: top is the nav bar, bottom is the contents - Wt::WVBoxLayout *layout = new Wt::WVBoxLayout(this->root()); + // Navbar + auto navbar = new Wt::WNavigationBar(); + navbar->setTitle("LMS", Wt::WLink(Wt::WLink::InternalPath, "/home")); + navbar->setResponsive(true); +// navbar->setStyleClass("main-nav"); - Wt::WNavigationBar *navigation = new Wt::WNavigationBar(); - navigation->setTitle("LMS", "https://github.com/epoupon/lms"); - navigation->setResponsive(true); - navigation->addStyleClass("main-nav"); + main->bindWidget("navbar-top", navbar); - Wt::WStackedWidget *contentsStack = new Wt::WStackedWidget(); - - contentsStack->setOverflow(Wt::WContainerWidget::OverflowAuto); - contentsStack->addStyleClass("contents"); - - Wt::WMenu *menu = new Wt::WMenu(contentsStack); - navigation->addMenu(menu, Wt::AlignRight); - - LineEdit *searchEdit = new LineEdit(500); - navigation->bindWidget("search", searchEdit); - searchEdit->setEmptyText("Search..."); - searchEdit->addStyleClass("navbar-form navbar-nav"); - searchEdit->setWidth(150); - // TODO add a span with a search icon - - menu->setInternalPathEnabled(); - menu->setInternalBasePath("/"); - - Audio *audio; - if (agentIsMobile()) - audio = new Mobile::Audio(); - else - audio = new Desktop::Audio(); - - menu->addItem("Audio", audio)->setPathComponent("audio");; -#if defined HAVE_VIDEO - menu->addItem("Video", new VideoWidget())->setPathComponent("video"); -#endif - menu->addItem("Settings", new Settings::Settings())->setPathComponent("settings"); - - Wt::WPopupMenu *popup = new Wt::WPopupMenu(); - popup->addItem("Logout"); - - Wt::WMenuItem *item = new Wt::WMenuItem( CurrentAuthUser().identity(Wt::Auth::Identity::LoginName) ); - item->setMenu(popup); - menu->addItem(item); - - popup->itemSelected().connect(std::bind([=] (Wt::WMenuItem* item) + auto menu = new Wt::WMenu(); { - if (item && item->text() == "Logout") - DbHandler().getLogin().logout(); - }, std::placeholders::_1)); - - searchEdit->timedChanged().connect(std::bind([=] () + auto menuItem = menu->insertItem(0, Wt::WString::tr("msg-artists")); + menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/artists")); + menuItem->setSelectable(false); + } { - // TODO: check which view is activated and search into it - audio->search(searchEdit->text().toUTF8()); + auto menuItem = menu->insertItem(1, Wt::WString::tr("msg-releases")); + menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/releases")); + menuItem->setSelectable(false); + } + { + auto menuItem = menu->insertItem(2, Wt::WString::tr("msg-tracks")); + menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/tracks")); + menuItem->setSelectable(false); + } + { + auto menuItem = menu->insertItem(3, Wt::WString::tr("msg-playlist")); + menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/playlist")); + menuItem->setSelectable(false); + } + navbar->addMenu(menu); + + // Contents + Wt::WStackedWidget* mainStack = new Wt::WStackedWidget(); + main->bindWidget("contents", mainStack); + + mainStack->addWidget(new Home()); + mainStack->addWidget(new Explore()); + mainStack->addWidget(new Wt::WText("PLAYLIST")); + mainStack->addWidget(new Wt::WText("SETTINGS")); + + // MediaPlayer +// auto player = new AudioPlayer(AudioPlayer::ControlPlayqueue); +// main->bindWidget("player", player); + + internalPathChanged().connect(std::bind([=] + { + handlePathChange(mainStack); })); - layout->addWidget(navigation); - layout->addWidget(contentsStack, 1); - layout->setContentsMargins(0, 0, 0, 0); - - if (agentIsMobile()) - setInternalPath("/audio/search/preview", true); - else - setInternalPath("/audio"); - + handlePathChange(mainStack); } } // namespace UserInterface diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index ee0cfe52..de460e4e 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -44,6 +44,9 @@ class LmsApplication : public Wt::WApplication TranscodeResource* getTranscodeResource() { return _transcodeResource; } Database::Handler& getDbHandler() { return _db;} + // Utils + void goHome(); + private: void handleAuthEvent(void); @@ -67,6 +70,7 @@ Database::User::pointer CurrentUser(); ImageResource *SessionImageResource(); TranscodeResource *SessionTranscodeResource(); + } // namespace UserInterface #endif diff --git a/src/ui/ReleaseView.cpp b/src/ui/ReleaseView.cpp new file mode 100644 index 00000000..098b12a5 --- /dev/null +++ b/src/ui/ReleaseView.cpp @@ -0,0 +1,151 @@ +/* + * 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 . + */ + +#include +#include +#include +#include +#include + +#include "database/Types.hpp" + +#include "utils/Logger.hpp" +#include "utils/Utils.hpp" + +#include "LmsApplication.hpp" +#include "ReleaseView.hpp" + +namespace UserInterface { + +Release::Release(Wt::WContainerWidget* parent) +: Wt::WContainerWidget(parent) +{ + wApp->internalPathChanged().connect(std::bind([=] + { + refresh(); + })); + + refresh(); +} + +void +Release::refresh() +{ + if (!wApp->internalPathMatches("/release/")) + return; + + clear(); + + Database::Release::id_type releaseId; + + if (!readAs(wApp->internalPathNextPart("/release/"), releaseId)) + return; + + Wt::Dbo::Transaction transaction(DboSession()); + + auto release = Database::Release::getById(DboSession(), releaseId); + if (!release) + { + LmsApp->goHome(); + return; + } + + auto t = new Wt::WTemplate(Wt::WString::tr("template-release"), this); + t->addFunction("tr", &Wt::WTemplate::Functions::tr); + + t->bindString("name", Wt::WString::fromUTF8(release->getName()), Wt::PlainText); + + boost::optional year = release->getReleaseYear(); + if (year) + { + t->setCondition("if-has-year", true); + t->bindInt("year", *year); + + boost::optional originalYear = release->getReleaseYear(true); + if (originalYear && *originalYear != *year) + { + t->setCondition("if-has-orig-year", true); + t->bindInt("orig-year", *originalYear); + } + } + + { + auto artists = release->getArtists(); + if (artists.size() > 1) + { + t->bindString("artist-name", Wt::WString::tr("msg-various-artists")); + } + else + { + Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(artists.front().id()))); + Wt::WText *artist = new Wt::WText(artistAnchor); + artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText)); + t->bindWidget("artist-name", artistAnchor); + } + } + + Wt::WImage *cover = new Wt::WImage(); + cover->setImageLink(Wt::WLink (SessionImageResource()->getReleaseUrl(release.id(), 512))); + t->bindWidget("cover", cover); + + // TODO play/add button + + auto tracksContainer = new Wt::WContainerWidget(); + t->bindWidget("tracks", tracksContainer); + + std::vector clusterIds; // TODO fill + +// auto tracks = release->getTracks(clusterIds); + auto tracks = release->getTracks(); + bool variousArtists = release->hasVariousArtists(); + + for (auto track : tracks) + { + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-release-entry"), tracksContainer); + + entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); + + if (variousArtists && !track->getArtist()->isNone()) + { + entry->setCondition("if-has-artist", true); + Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(track->getArtist().id()))); + Wt::WText *artistText = new Wt::WText(artistAnchor); + artistText->setText(Wt::WString::fromUTF8(track->getArtist()->getName(), Wt::PlainText)); + entry->bindWidget("artist-name", artistAnchor); + } + + auto trackNumber = track->getTrackNumber(); + if (trackNumber) + { + entry->setCondition("if-has-track-number", true); + entry->bindInt("track-number", *trackNumber); + } + + auto discNumber = track->getDiscNumber(); + auto totalDiscNumber = track->getTotalDiscNumber(); + if (discNumber && totalDiscNumber && *totalDiscNumber > 1) + { + entry->setCondition("if-has-disc-number", true); + entry->bindInt("disc-number", *discNumber); + } + } +} + +} // namespace UserInterface + diff --git a/src/ui/settings/Settings.hpp b/src/ui/ReleaseView.hpp similarity index 81% rename from src/ui/settings/Settings.hpp rename to src/ui/ReleaseView.hpp index 30ffa0b8..0a68a9e9 100644 --- a/src/ui/settings/Settings.hpp +++ b/src/ui/ReleaseView.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -17,18 +17,20 @@ * along with LMS. If not, see . */ +#pragma once + #include namespace UserInterface { -namespace Settings { -class Settings : public Wt::WContainerWidget +class Release : public Wt::WContainerWidget { public: - Settings(Wt::WContainerWidget* parent = 0); + Release(Wt::WContainerWidget* parent = 0); private: + void refresh(); }; -} // namespace Settings } // namespace UserInterface + diff --git a/src/ui/ReleasesView.cpp b/src/ui/ReleasesView.cpp new file mode 100644 index 00000000..7c7da4de --- /dev/null +++ b/src/ui/ReleasesView.cpp @@ -0,0 +1,103 @@ +/* + * 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 . + */ + +#include +#include +#include +#include +#include +#include + +#include "database/Types.hpp" + +#include "utils/Logger.hpp" +#include "utils/Utils.hpp" + +#include "LmsApplication.hpp" +#include "ReleasesView.hpp" + +namespace UserInterface { + +using namespace Database; + +Releases::Releases(Wt::WContainerWidget* parent) +: Wt::WContainerWidget(parent) +{ + auto releases = new Wt::WTemplate(Wt::WString::tr("template-releases"), this); + releases->addFunction("tr", &Wt::WTemplate::Functions::tr); + + auto search = new Wt::WLineEdit(); + releases->bindWidget("search", search); + search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); + search->textInput().connect(std::bind([this, search] + { + auto keywords = splitString(search->text().toUTF8(), " "); + refresh(keywords); + })); + + _releasesContainer = new Wt::WContainerWidget(); + releases->bindWidget("releases", _releasesContainer); + + refresh(); +} + + +void +Releases::refresh(std::vector searchKeywords) +{ + _releasesContainer->clear(); + + std::vector clusterIds; // TODO fill + + Wt::Dbo::Transaction transaction(DboSession()); + + bool moreResults; + auto releases = Release::getByFilter(DboSession(), clusterIds, searchKeywords, 0, 40, moreResults); + + for (auto release : releases) + { + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-releases-entry"), _releasesContainer); + entry->addFunction("tr", Wt::WTemplate::Functions::tr); + + Wt::WAnchor *coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); + Wt::WImage *cover = new Wt::WImage(coverAnchor); + cover->setImageLink(SessionImageResource()->getReleaseUrl(release.id(), 128)); + // Some images may not be square + cover->setWidth(128); + entry->bindWidget("cover", coverAnchor); + + entry->bindString("release-name", Wt::WString::fromUTF8(release->getName()), Wt::PlainText); + + auto artists = release->getArtists(); + if (artists.size() > 1) + { + entry->bindString("artist-name", Wt::WString::tr("msg-various-artists")); + } + else + { + Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(artists.front().id()))); + Wt::WText *artist = new Wt::WText(artistAnchor); + artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText)); + entry->bindWidget("artist-name", artistAnchor); + } + } +} + +} // namespace UserInterface + diff --git a/src/ui/ReleasesView.hpp b/src/ui/ReleasesView.hpp new file mode 100644 index 00000000..7a4325cd --- /dev/null +++ b/src/ui/ReleasesView.hpp @@ -0,0 +1,38 @@ +/* + * 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 . + */ + +#pragma once + +#include + +namespace UserInterface { + +class Releases : public Wt::WContainerWidget +{ + public: + Releases(Wt::WContainerWidget* parent = 0); + + private: + void refresh(std::vector searchKeywords = std::vector()); + + Wt::WContainerWidget *_releasesContainer; +}; + +} // namespace UserInterface + diff --git a/src/ui/TracksView.cpp b/src/ui/TracksView.cpp new file mode 100644 index 00000000..bc834de5 --- /dev/null +++ b/src/ui/TracksView.cpp @@ -0,0 +1,109 @@ +/* + * 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 . + */ + +#include +#include +#include +#include +#include + +#include "database/Types.hpp" + +#include "utils/Logger.hpp" +#include "utils/Utils.hpp" + +#include "LmsApplication.hpp" +#include "TracksView.hpp" + +namespace UserInterface { + +using namespace Database; + +Tracks::Tracks(Wt::WContainerWidget* parent) +: Wt::WContainerWidget(parent) +{ + auto tracks = new Wt::WTemplate(Wt::WString::tr("template-tracks"), this); + tracks->addFunction("tr", &Wt::WTemplate::Functions::tr); + + auto search = new Wt::WLineEdit(); + tracks->bindWidget("search", search); + search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); + search->textInput().connect(std::bind([this, search] + { + auto keywords = splitString(search->text().toUTF8(), " "); + refresh(keywords); + })); + + _tracksContainer = new Wt::WContainerWidget(); + tracks->bindWidget("tracks", _tracksContainer); + + refresh(); +} + + +void +Tracks::refresh(std::vector searchKeywords) +{ + _tracksContainer->clear(); + + std::vector clusterIds; // TODO fill + + Wt::Dbo::Transaction transaction(DboSession()); + + bool moreResults; + auto tracks = Track::getByFilter(DboSession(), clusterIds, searchKeywords, 0, 40, moreResults); + + for (auto track : tracks) + { + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-tracks-entry"), _tracksContainer); + + entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); + + auto artist = track->getArtist(); + if (!artist->isNone()) + { + entry->setCondition("if-has-artist", true); + Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(track->getArtist().id()))); + Wt::WText *artistText = new Wt::WText(artistAnchor); + artistText->setText(Wt::WString::fromUTF8(artist->getName(), Wt::PlainText)); + entry->bindWidget("artist-name", artistAnchor); + } + + auto release = track->getRelease(); + if (!release->isNone()) + { + entry->setCondition("if-has-release", true); + // TODO anchor + Wt::WAnchor *releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(track->getRelease().id()))); + Wt::WText *releaseText = new Wt::WText(releaseAnchor); + releaseText->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); + entry->bindWidget("release-name", releaseAnchor); + } + + Wt::WImage *cover = new Wt::WImage(); + cover->setImageLink(SessionImageResource()->getTrackUrl(track.id(), 64)); + // Some images may not be square + cover->setWidth(64); + entry->bindWidget("cover", cover); + } + +} + +} // namespace UserInterface + diff --git a/src/ui/audio/mobile/PreviewSearchView.hpp b/src/ui/TracksView.hpp similarity index 74% rename from src/ui/audio/mobile/PreviewSearchView.hpp rename to src/ui/TracksView.hpp index fab0b4e9..7ba2c61c 100644 --- a/src/ui/audio/mobile/PreviewSearchView.hpp +++ b/src/ui/TracksView.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -21,19 +21,18 @@ #include -#include "MobilePlayQueueEvents.hpp" - namespace UserInterface { -namespace Mobile { -class PreviewSearchView : public Wt::WContainerWidget +class Tracks : public Wt::WContainerWidget { public: + Tracks(Wt::WContainerWidget* parent = 0); - PreviewSearchView(PlayQueueEvents& events, Wt::WContainerWidget* parent = 0); + private: + void refresh(std::vector searchKeywords = std::vector()); + Wt::WContainerWidget *_tracksContainer; }; -} // namespace Mobile } // namespace UserInterface diff --git a/src/ui/audio/AudioPlayer.cpp b/src/ui/audio/AudioPlayer.cpp deleted file mode 100644 index bb487af9..00000000 --- a/src/ui/audio/AudioPlayer.cpp +++ /dev/null @@ -1,357 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include -#include -#include -#include -#include - -#include "common/InputRange.hpp" - -#include "utils/Logger.hpp" -#include "utils/Utils.hpp" - -#include "LmsApplication.hpp" - -#include "AudioPlayer.hpp" - -namespace UserInterface { - - -Av::Encoding -AudioPlayer::getBestEncoding() const -{ - // TODO get the supported formats of the player and pick one - return Av::Encoding::MP3; -} - -bool -AudioPlayer::loadTrack(Database::Track::id_type trackId) -{ - // TODO reduce this scope - Wt::Dbo::Transaction transaction(DboSession()); - - Database::Track::pointer track = Database::Track::getById(DboSession(), trackId); - if (!track) - { - LMS_LOG(UI, INFO) << "No track found for id " << trackId; - return false; - } - - Database::User::pointer user = CurrentUser(); - if (!user) - { - LMS_LOG(UI, ERROR) << "No user found!"; - return false; - } - - Av::Encoding encoding; - switch (user->getAudioEncoding()) - { - case Database::AudioEncoding::MP3: encoding = Av::Encoding::MP3; break; - case Database::AudioEncoding::OGA: encoding = Av::Encoding::OGA; break; - case Database::AudioEncoding::WEBMA: encoding = Av::Encoding::WEBMA; break; - case Database::AudioEncoding::AUTO: - default: - encoding = getBestEncoding(); - break; - } - - bindString("track", Wt::WString::fromUTF8(track->getName())); - bindString("artist", Wt::WString::fromUTF8(track->getArtist()->getName())); - _cover->setImageLink(SessionImageResource()->getTrackUrl(trackId, 64)); - - std::string durationFormat = track->getDuration().total_seconds() < 3600 ? "%M:%S" : "%H:%M:%S"; - - _trackDuration->setText(durationToString(track->getDuration(), durationFormat)); - _trackCurTime->setText(durationToString(boost::posix_time::seconds(0), durationFormat)); - - // Analyse track, select the best media stream - Av::MediaFile mediaFile(track->getPath()); - - if (!mediaFile.open() || !mediaFile.scan()) - { - LMS_LOG(UI, ERROR) << "Cannot open file '" << track->getPath(); - return false; - } - - - int audioBestStreamId = mediaFile.getBestStreamId(Av::Stream::Type::Audio); - std::vector streams; - if (audioBestStreamId != -1) - streams.push_back(audioBestStreamId); - - this->doJavaScript("\ - document.lms.audio.state = \"loaded\";\ - document.lms.audio.seekbar.min = " + std::to_string(0) + ";\ - document.lms.audio.seekbar.max = " + std::to_string(track->getDuration().total_seconds()) + ";\ - document.lms.audio.seekbar.value = 0;\ - document.lms.audio.seekbar.disabled = false;\ - document.lms.audio.offset = 0;\ - document.lms.audio.curTime = 0;\ - "); - - LMS_LOG(UI, DEBUG) << "Loading, URL = '" << SessionTranscodeResource()->getUrl(trackId, encoding, 0, streams) << "'"; - - //TODO, try to load everything in JS in order to prevent the WriteError bug? - _audio->pause(); - _audio->clearSources(); - _audio->addSource(SessionTranscodeResource()->getUrl(trackId, encoding, 0, streams)); - _audio->setPreloadMode(Wt::WAudio::PreloadNone); - _audio->play(); - - return true; -} - -AudioPlayer::AudioPlayer(ControlFlags controls, Wt::WContainerWidget *parent) -: Wt::WTemplate(parent) -{ - setTemplateText(Wt::WString::tr("wa-audio-player")); - addStyleClass("mediaplayer"); - - // TODO potential leak here - _audio = new Wt::WAudio(); - _audio->setOptions(Wt::WAudio::Autoplay); - _audio->setPreloadMode(Wt::WAudio::PreloadNone); - bindWidget("audio", _audio); - - _audio->ended().connect(std::bind([=] () - { - _playbackEnded.emit(); - })); - - _cover = new Wt::WImage(); - bindWidget("cover", _cover); - _cover->setImageLink(SessionImageResource()->getUnknownTrackUrl(64)); - - InputRange *seekbar = new InputRange(); - seekbar->addStyleClass("mediaplayer-seekbar"); - bindWidget("seekbar", seekbar); - - bindString("track", "Track"); - bindString("artist", "Artist"); - - InputRange *volumeSlider = new InputRange(); - volumeSlider->addStyleClass("mediaplayer-volume"); - volumeSlider->setAttributeValue("orient", "vertical"); // firefox - bindWidget("volume", volumeSlider); - - if (controls & ControlRepeat) - { - setCondition("if-has-repeat", true); - Wt::WText *repeatBtn = new Wt::WText("", Wt::XHTMLText); - repeatBtn->addStyleClass("mediaplayer-btn hidden-xs"); - bindWidget("repeat", repeatBtn); - repeatBtn->clicked().connect(std::bind([=] () - { - if (repeatBtn->hasStyleClass("mediaplayer-btn-active")) - { - repeatBtn->removeStyleClass("mediaplayer-btn-active"); - _loop.emit(false); - } - else - { - repeatBtn->addStyleClass("mediaplayer-btn-active"); - _loop.emit(true); - } - })); - } - - if (controls & ControlPlayqueue) - { - setCondition("if-has-playqueue", true); - Wt::WText *playQueueBtn = new Wt::WText("", Wt::XHTMLText); - bindWidget("playqueue", playQueueBtn); - playQueueBtn->addStyleClass("mediaplayer-btn"); - playQueueBtn->clicked().connect(std::bind([=] () - { - _playQueue.emit(); - })); - } - - if (controls & ControlShuffle) - { - setCondition("if-has-shuffle", true); - Wt::WText *shuffleBtn = new Wt::WText("", Wt::XHTMLText); - shuffleBtn->addStyleClass("mediaplayer-btn hidden-xs"); - bindWidget("shuffle", shuffleBtn); - shuffleBtn->clicked().connect(std::bind([=] () - { - if (shuffleBtn->hasStyleClass("mediaplayer-btn-active")) - { - shuffleBtn->removeStyleClass("mediaplayer-btn-active"); - _shuffle.emit(false); - } - else - { - shuffleBtn->addStyleClass("mediaplayer-btn-active"); - _shuffle.emit(true); - } - })); - } - - Wt::WText *prevBtn = new Wt::WText("", Wt::XHTMLText); - prevBtn->addStyleClass("mediaplayer-btn"); - bindWidget("prev", prevBtn); - prevBtn->clicked().connect(std::bind([=] () - { - _playPrevious.emit(); - })); - - Wt::WText *nextBtn = new Wt::WText("", Wt::XHTMLText); - nextBtn->addStyleClass("mediaplayer-btn"); - bindWidget("next", nextBtn); - nextBtn->clicked().connect(std::bind([=] () - { - _playNext.emit(); - })); - - Wt::WText *playPauseBtn = new Wt::WText("", Wt::XHTMLText); - playPauseBtn->addStyleClass("mediaplayer-btn"); - bindWidget("play-pause", playPauseBtn); - - _trackCurTime = new Wt::WText("--:--"); - _trackCurTime->addStyleClass("hidden-xs badge mediaplayer-badge mediaplayer-current-duration"); - bindWidget("curtime", _trackCurTime); - - _trackDuration = new Wt::WText("--:--"); - _trackDuration->addStyleClass("hidden-xs badge mediaplayer-badge mediaplayer-total-duration"); - bindWidget("duration", _trackDuration); - - this->doJavaScript( - "\ - document.lms = {};\ - document.lms.audio = {};\ - document.lms.audio.audio = " + _audio->jsRef() + ";\ - document.lms.audio.seekbar = " + seekbar->jsRef() +";\ - document.lms.audio.volumeSlider = " + volumeSlider->jsRef() + ";\ - document.lms.audio.curTimeText = " + _trackCurTime->jsRef() + ";\ - document.lms.audio.playPause = " + playPauseBtn->jsRef() + ";\ - \ - document.lms.audio.offset = 0;\ - document.lms.audio.curTime = 0;\ - document.lms.audio.state = \"init\";\ - document.lms.audio.volume = 1;\ - \ - document.lms.audio.seekbar.value = 0;\ - document.lms.audio.seekbar.disabled = true;\ - \ - document.lms.audio.volumeSlider.min = 0;\ - document.lms.audio.volumeSlider.max = 100;\ - document.lms.audio.volumeSlider.value = 100;\ - \ - function updateUIPlaying() { \ - var icon = document.lms.audio.playPause.getElementsByTagName(\"i\")[0]; \ - icon.className = \"fa fa-pause fa-3x fa-fw\"; \ - } \ - \ - function updateUIStopped() { \ - var icon = document.lms.audio.playPause.getElementsByTagName(\"i\")[0]; \ - icon.className = \"fa fa-play fa-3x fa-fw\"; \ - } \ - \ - function durationToString(duration, displayHours) { \ - var hours = parseInt( duration / 3600 ) % 24; \ - var minutes = parseInt( duration / 60) % 60; \ - var seconds = duration % 60; \ - \ - var res = \"\"; \ - if (displayHours) \ - res = (hours < 10 ? \"0\" + hours : hours) + \":\"; \ - \ - res += (minutes < 10 ? \"0\" + minutes : minutes) + \":\"; \ - res += (seconds < 10 ? \"0\" + seconds : seconds); \ - return res; \ - } \ - \ - function updateUI() {\ - document.lms.audio.curTimeText.innerHTML = durationToString(document.lms.audio.curTime, document.lms.audio.seekbar.max > 3600); \ - document.lms.audio.seekbar.value = document.lms.audio.curTime;\ - }\ - \ - var mouseDown = 0;\ - function seekMouseDown(e) {\ - ++mouseDown;\ - }\ - function seekMouseUp(e) {\ - --mouseDown;\ - }\ - \ - function seeking(e) {\ - if (document.lms.audio.state == \"init\")\ - return;\ - \ - document.lms.audio.curTimeText.innerHTML = durationToString(document.lms.audio.seekbar.value, document.lms.audio.seekbar.max > 3600); \ - }\ - \ - function seek(e) {\ - if (document.lms.audio.state == \"init\")\ - return;\ - \ - document.lms.audio.audio.pause(); \ - document.lms.audio.offset = parseInt(document.lms.audio.seekbar.value);\ - document.lms.audio.curTime = document.lms.audio.seekbar.value;\ - var audioSource = document.lms.audio.audio.getElementsByTagName(\"source\")[0];\ - var src = audioSource.src;\ - src = src.slice(0, src.lastIndexOf(\"=\") + 1);\ - audioSource.src = src + document.lms.audio.seekbar.value;\ - document.lms.audio.audio.load(); \ - document.lms.audio.audio.play(); \ - document.lms.audio.curTimeText.innerHTML = durationToString(document.lms.audio.curTime, document.lms.audio.seekbar.max > 3600); \ - }\ - \ - function volumeChanged() {\ - document.lms.audio.audio.volume = document.lms.audio.volumeSlider.value / 100;\ - }\ - \ - function updateCurTime() {\ - document.lms.audio.curTime = document.lms.audio.offset + ~~document.lms.audio.audio.currentTime; \ - if (mouseDown == 0)\ - updateUI();\ - } \ - \ - function playPause() { \ - if (document.lms.audio.state == \"init\") \ - return;\ - \ - if (document.lms.audio.audio.paused) \ - document.lms.audio.audio.play(); \ - else \ - document.lms.audio.audio.pause();\ - \ - }\ - \ - document.lms.audio.audio.addEventListener('timeupdate', updateCurTime); \ - document.lms.audio.audio.addEventListener('playing', updateUIPlaying); \ - document.lms.audio.audio.addEventListener('play', updateUIPlaying); \ - document.lms.audio.audio.addEventListener('pause', updateUIStopped); \ - document.lms.audio.audio.addEventListener('ended', updateUIStopped); \ - document.lms.audio.seekbar.addEventListener('change', seek);\ - document.lms.audio.seekbar.addEventListener('input', seeking);\ - document.lms.audio.seekbar.addEventListener('mousedown', seekMouseDown);\ - document.lms.audio.seekbar.addEventListener('mouseup', seekMouseUp);\ - document.lms.audio.volumeSlider.addEventListener('input', volumeChanged);\ - document.lms.audio.playPause.addEventListener('click', playPause);\ - " - ); -} - - -} // namespaceUserInterface diff --git a/src/ui/audio/AudioPlayer.hpp b/src/ui/audio/AudioPlayer.hpp deleted file mode 100644 index 669091e7..00000000 --- a/src/ui/audio/AudioPlayer.hpp +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#pragma once - -#include -#include - -#include "common/InputRange.hpp" -#include "database/Types.hpp" -#include "av/AvTranscoder.hpp" - -namespace UserInterface { - -class AudioPlayer : public Wt::WTemplate -{ - public: - - enum ControlFlags - { - ControlNone = 0, - ControlShuffle = 1 << 0, - ControlRepeat = 1 << 1, - ControlPlayqueue = 1 << 2, - }; - - AudioPlayer(ControlFlags controls, Wt::WContainerWidget *parent = 0); - - Av::Encoding getBestEncoding() const; - bool loadTrack(Database::Track::id_type trackId); - - // Signals - Wt::Signal& playbackEnded() {return _playbackEnded;} - Wt::Signal& playNext() {return _playNext;} - Wt::Signal& playPrevious() {return _playPrevious;} - Wt::Signal& shuffle() {return _shuffle;} - Wt::Signal& loop() {return _loop;} - Wt::Signal& showPlayQueue() {return _playQueue;} - - private: - - // Signals - Wt::Signal _playbackEnded; - Wt::Signal _playNext; - Wt::Signal _playPrevious; - Wt::Signal _shuffle; - Wt::Signal _loop; - Wt::Signal _playQueue; - - Wt::WAudio* _audio; - Wt::WText* _trackCurTime; - Wt::WText* _trackDuration; - Wt::WText* _trackName; - Wt::WImage* _cover; -}; - -constexpr AudioPlayer::ControlFlags operator|(AudioPlayer::ControlFlags f1, AudioPlayer::ControlFlags f2) { return AudioPlayer::ControlFlags(int(f1)|int(f2)); } - - -} // namespace UserInterface diff --git a/src/ui/audio/desktop/DesktopAudio.cpp b/src/ui/audio/desktop/DesktopAudio.cpp deleted file mode 100644 index 63e73c53..00000000 --- a/src/ui/audio/desktop/DesktopAudio.cpp +++ /dev/null @@ -1,556 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "utils/Logger.hpp" - -#include "LmsApplication.hpp" - -#include "TableFilter.hpp" -#include "KeywordSearchFilter.hpp" - -#include "DesktopAudio.hpp" - -namespace { - -void WPopupMenuClear(Wt::WPopupMenu* menu) -{ - while(menu->count() > 0) - menu->removeItem(menu->itemAt(0)); -} - -} - -namespace UserInterface { -namespace Desktop { - -using namespace Database; - -// Special playlist generated each time the playque gets changed -// Restored at the beginning of the session -static const std::string CurrentQueuePlaylistName = "__current__"; - -Audio::Audio(Wt::WContainerWidget* parent) -: UserInterface::Audio(parent), -_mediaPlayer(nullptr), -_trackView(nullptr), -_playQueue(nullptr) -{ - Wt::WGridLayout *mainLayout = new Wt::WGridLayout(); - this->setLayout(mainLayout); - mainLayout->setContentsMargins(9,4,9,9); - - // Filters - Wt::WHBoxLayout *filterLayout = new Wt::WHBoxLayout(); - - TableFilterCluster *filterCluster = new TableFilterCluster(); - filterLayout->addWidget(filterCluster); - _filterChain.addFilter(filterCluster); - - TableFilterArtist *filterArtist = new TableFilterArtist(); - filterLayout->addWidget(filterArtist); - _filterChain.addFilter(filterArtist); - - TableFilterRelease *filterRelease = new TableFilterRelease(); - filterLayout->addWidget(filterRelease); - _filterChain.addFilter(filterRelease); - - mainLayout->addLayout(filterLayout, 0, 1); - // ENDOF(Filters) - - // TODO ADD some stats (nb files, total duration, etc.) - - Wt::WVBoxLayout* trackLayout = new Wt::WVBoxLayout(); - - _trackView = new TrackView(); - trackLayout->addWidget(_trackView, 1); - - Wt::WHBoxLayout* trackControls = new Wt::WHBoxLayout(); - - Wt::WPushButton* playBtn = new Wt::WPushButton("Play"); - playBtn->setStyleClass("btn-sm"); - trackControls->addWidget(playBtn); - - Wt::WPushButton* addBtn = new Wt::WPushButton("Add"); - addBtn->setStyleClass("btn-sm"); - trackControls->addWidget(addBtn); - - Wt::WText *statsText = new Wt::WText(); - statsText->setStyleClass("vertical-align"); - trackControls->addWidget(statsText, 1); - _trackView->statsUpdated().connect(std::bind([=] (Wt::WString stats) { - statsText->setText(stats); - }, std::placeholders::_1)); - - trackLayout->addLayout(trackControls); - - mainLayout->addLayout(trackLayout, 1, 1); - - _filterChain.addFilter(_trackView); - - - _playQueue = new PlayQueue(); - - // Playlist/PlayQueue - Wt::WContainerWidget* playQueueContainer = new Wt::WContainerWidget(); - playQueueContainer->setStyleClass("playqueue"); - Wt::WVBoxLayout* playQueueLayout = new Wt::WVBoxLayout(); - playQueueContainer->setLayout(playQueueLayout); - - playQueueLayout->addWidget( _playQueue, 1); - - Wt::WHBoxLayout* playlistControls = new Wt::WHBoxLayout(); - - Wt::WPushButton *playlistBtn = new Wt::WPushButton("Playlist"); - playlistBtn->setStyleClass("btn-sm btn-primary"); - playlistControls->addWidget(playlistBtn); - - // Playlist menu - { - Wt::WPopupMenu *popupMain = new Wt::WPopupMenu(); - - _popupMenuSave = new Wt::WPopupMenu(); - popupMain->addMenu("Save", _popupMenuSave); - - _popupMenuLoad = new Wt::WPopupMenu(); - popupMain->addMenu("Load", _popupMenuLoad); - - _popupMenuDelete = new Wt::WPopupMenu(); - popupMain->addMenu("Delete", _popupMenuDelete); - - playlistBtn->setMenu(popupMain); - } - -#if WT_VERSION >= 0X03030400 - Wt::WPushButton *upBtn = new Wt::WPushButton("", Wt::XHTMLText); -#else - Wt::WPushButton *upBtn = new Wt::WPushButton("UP"); -#endif - upBtn->setStyleClass("btn-sm"); - playlistControls->addWidget(upBtn); - -#if WT_VERSION >= 0X03030400 - Wt::WPushButton *downBtn = new Wt::WPushButton("", Wt::XHTMLText); -#else - Wt::WPushButton *downBtn = new Wt::WPushButton("DOWN"); -#endif - downBtn->setStyleClass("btn-sm"); - playlistControls->addWidget(downBtn); -#if WT_VERSION >= 0X03030400 - Wt::WPushButton *delBtn = new Wt::WPushButton("", Wt::XHTMLText); -#else - Wt::WPushButton *delBtn = new Wt::WPushButton("DEL"); -#endif - - delBtn->setStyleClass("btn-sm btn-warning"); - playlistControls->addWidget(delBtn); -#if WT_VERSION >= 0X03030400 - Wt::WPushButton *clearBtn = new Wt::WPushButton("", Wt::XHTMLText); -#else - Wt::WPushButton *clearBtn = new Wt::WPushButton("CLR"); -#endif - clearBtn->setStyleClass("btn-sm btn-danger"); - playlistControls->addWidget(clearBtn); - - delBtn->clicked().connect(_playQueue, &PlayQueue::delSelected); - upBtn->clicked().connect(_playQueue, &PlayQueue::moveSelectedUp); - downBtn->clicked().connect(_playQueue, &PlayQueue::moveSelectedDown); - clearBtn->clicked().connect(std::bind([=] - { - Wt::WMessageBox *messageBox = new Wt::WMessageBox - ("Clear playqueue", - Wt::WString( "Are you sure?"), - Wt::Question, Wt::Yes | Wt::No); - - messageBox->setModal(true); - - messageBox->buttonClicked().connect(std::bind([=] () - { - if (messageBox->buttonResult() == Wt::Yes) - _playQueue->delAll(); - - delete messageBox; - })); - - messageBox->show(); - })); - - playQueueLayout->addLayout(playlistControls); - - mainLayout->addWidget(playQueueContainer, 0, 0, 2, 1); - - // Load the last known queue - playlistLoadToPlayqueue(CurrentQueuePlaylistName); - - // Select the last known playing track - { - Wt::Dbo::Transaction transaction(DboSession()); - _playQueue->select(CurrentUser()->getCurPlayingTrackPos()); - } - - _mediaPlayer = new AudioPlayer(AudioPlayer::ControlShuffle | AudioPlayer::ControlRepeat); - mainLayout->addWidget(_mediaPlayer, 2, 0, 1, 4); - - mainLayout->setRowStretch(1, 1); - mainLayout->setRowResizable(0, true, Wt::WLength(250, Wt::WLength::Pixel)); - mainLayout->setColumnResizable(0, true, Wt::WLength(400, Wt::WLength::Pixel)); - - // Double click on track - // Set the selected tracks to the play queue - _trackView->trackDoubleClicked().connect(boost::bind(&Audio::playSelectedTracks, this, PlayQueueAddSelectedTracks)); - - // Double click on artist - // Set the selected tracks to the play queue - filterArtist->sigDoubleClicked().connect(boost::bind(&Audio::playSelectedTracks, this, PlayQueueAddAllTracks)); - filterRelease->sigDoubleClicked().connect(boost::bind(&Audio::playSelectedTracks, this, PlayQueueAddAllTracks)); - filterCluster->sigDoubleClicked().connect(boost::bind(&Audio::playSelectedTracks, this, PlayQueueAddAllTracks)); - - // Play button - // Set the selected tracks to the play queue - playBtn->clicked().connect(boost::bind(&Audio::playSelectedTracks, this, PlayQueueAddSelectedTracks)); - - // Add Button - // Add the selected tracks at the end of the play queue - addBtn->clicked().connect(this, &Audio::addSelectedTracks); - - _playQueue->playTrack().connect(this, &Audio::playTrack); - - _mediaPlayer->playbackEnded().connect(_playQueue, &PlayQueue::handlePlaybackComplete); - _mediaPlayer->playNext().connect(_playQueue, &PlayQueue::playNext); - _mediaPlayer->playPrevious().connect(_playQueue, &PlayQueue::playPrevious); - _mediaPlayer->shuffle().connect(boost::bind(&PlayQueue::setShuffle, _playQueue, _1)); - _mediaPlayer->loop().connect(boost::bind(&PlayQueue::setLoop,_playQueue, _1)); - - _playQueue->tracksUpdated().connect(std::bind([=] () { - LMS_LOG(UI, INFO) << "Playqueue updated!"; - - playlistSaveFromPlayqueue(CurrentQueuePlaylistName); - })); - - - playlistRefreshMenus(); - - // Initially, search for everything - _filterChain.searchKeyword(""); -} - -void -Audio::playlistShowSaveNewDialog() -{ - Wt::WDialog *dialog = new Wt::WDialog("New playlist"); - - Wt::WLabel *label = new Wt::WLabel("Name", dialog->contents()); - Wt::WLineEdit *edit = new Wt::WLineEdit(dialog->contents()); - label->setBuddy(edit); - - Wt::WLengthValidator* validator = new Wt::WLengthValidator(); - validator->setMinimumLength(3); - validator->setMandatory(true); - edit->setValidator(validator); - - Wt::WPushButton *save = new Wt::WPushButton("Save", dialog->footer()); - save->setStyleClass("btn-success"); - save->setDefault(true); - save->disable(); - - Wt::WPushButton *cancel = new Wt::WPushButton("Cancel", dialog->footer()); - dialog->rejectWhenEscapePressed(); - - edit->keyWentUp().connect(std::bind([=] () { - save->setDisabled(edit->validate() != Wt::WValidator::Valid); - })); - - save->clicked().connect(std::bind([=] () - { - if (edit->validate()) - dialog->accept(); - })); - - cancel->clicked().connect(dialog, &Wt::WDialog::reject); - - dialog->finished().connect(std::bind([=] () - { - if (dialog->result() == Wt::WDialog::Accepted) - { - playlistShowSaveDialog(edit->text().toUTF8()); - } - - delete dialog; - })); - - dialog->show(); -} - -void -Audio::playlistShowSaveDialog(std::string playlistName) -{ - Wt::Dbo::Transaction transaction(DboSession()); - - // Actually create the dialog only if the given list already exists - if (Playlist::get(DboSession(), playlistName, CurrentUser())) - { - Wt::WMessageBox *messageBox = new Wt::WMessageBox - ("Overwrite playlist", - Wt::WString( "Overwrite playlist '{1}'?").arg(playlistName), - Wt::Question, Wt::Yes | Wt::No); - - messageBox->setModal(true); - - messageBox->buttonClicked().connect(std::bind([=] () { - if (messageBox->buttonResult() == Wt::Yes) - playlistSaveFromPlayqueue(playlistName); - - delete messageBox; - })); - - messageBox->show(); - } - else - { - playlistSaveFromPlayqueue(playlistName); - playlistRefreshMenus(); - } -} - -void -Audio::playlistSaveFromPlayqueue(std::string playlistName) -{ - LMS_LOG(UI, INFO) << "Saving playqueue to playlist '" << playlistName << "'"; - - Wt::Dbo::Transaction transaction(DboSession()); - - Playlist::pointer playlist = Playlist::get(DboSession(), playlistName, CurrentUser()); - if (playlist) - { - LMS_LOG(UI, INFO) << "Erasing playlist '" << playlistName << "'"; - playlist.remove(); - } - - playlist = Playlist::create(DboSession(), playlistName, false, CurrentUser()); - - std::vector trackIds; - _playQueue->getTracks(trackIds); - - int pos = 0; - for (Track::id_type trackId : trackIds) - { - Track::pointer track = Track::getById(DboSession(), trackId); - - if (track) - PlaylistEntry::create(DboSession(), track, playlist, pos++); - } - - LMS_LOG(UI, INFO) << "Saving playqueue to playlist '" << playlistName << "' done. Contains " << pos << " entries"; -} - -void -Audio::playlistLoadToPlayqueue(std::string playlistName) -{ - LMS_LOG(UI, DEBUG) << "Loading playlist '" << playlistName << "' to playqueue"; - - std::vector entries; - - { - Wt::Dbo::Transaction transaction(DboSession()); - - Playlist::pointer playlist = Playlist::get(DboSession(), playlistName, CurrentUser()); - if (!playlist) - return; - - entries = PlaylistEntry::getEntries(DboSession(), playlist); - } - - _playQueue->clear(); - _playQueue->addTracks(entries); - - LMS_LOG(UI, DEBUG) << "Loading playlist '" << playlistName << "' to playqueue done. " << entries.size() << " entries"; -} - - -void -Audio::playlistShowDeleteDialog(std::string name) -{ - - Wt::WMessageBox *messageBox = new Wt::WMessageBox - ("Delete playlist", - Wt::WString( "Deleting playlist '{1}'?").arg(name), - Wt::Question, Wt::Yes | Wt::No); - - messageBox->setModal(true); - - messageBox->buttonClicked().connect(std::bind([=] () { - if (messageBox->buttonResult() == Wt::Yes) - { - Wt::Dbo::Transaction transaction(DboSession()); - - Playlist::pointer playlist = Playlist::get(DboSession(), name, CurrentUser()); - if (playlist) - playlist.remove(); - - playlistRefreshMenus(); - } - - delete messageBox; - })); - - messageBox->show(); -} - -void -Audio::playlistRefreshMenus() -{ - Wt::Dbo::Transaction transaction(DboSession()); - - // Clear playlists in each menu - LMS_LOG(UI, DEBUG) << "Save item count: " << _popupMenuSave->count(); - - WPopupMenuClear(_popupMenuDelete); - WPopupMenuClear(_popupMenuLoad); - WPopupMenuClear(_popupMenuSave); - - _popupMenuSave->addItem("New")->triggered().connect(std::bind([=] () - { - playlistShowSaveNewDialog(); - })); - _popupMenuSave->addSeparator(); - - std::vector playlists = Playlist::get(DboSession(), CurrentUser()); - - for (Playlist::pointer playlist : playlists) - { - if (playlist->getName() == CurrentQueuePlaylistName) - continue; - - // Add playlists in each menu - _popupMenuDelete->addItem(playlist->getName())->triggered().connect(std::bind([=] () - { - playlistShowDeleteDialog(playlist->getName()); - })); - - _popupMenuLoad->addItem(playlist->getName())->triggered().connect(std::bind([=] () - { - playlistLoadToPlayqueue(playlist->getName()); - playlistRefreshMenus(); // in case deleted in other session - })); - - _popupMenuSave->addItem(playlist->getName())->triggered().connect(std::bind([=] () - { - playlistShowSaveDialog(playlist->getName()); - })); - } -} - - -void -Audio::search(std::string searchText) -{ - _filterChain.searchKeyword(searchText); -} - -void -Audio::addSelectedTracks(void) -{ - std::vector trackIds; - _trackView->getSelectedTracks(trackIds); - - // If nothing is selected, get the whole track list - if (trackIds.empty()) - _trackView->getTracks(trackIds); - - _playQueue->addTracks(trackIds); -} - -void -Audio::playSelectedTracks(PlayQueueAddType addType) -{ - std::vector trackIds; - - LMS_LOG(UI, DEBUG) << "Playing selected tracks... nb selected = " << _trackView->getNbSelectedTracks() << ", add type = " << (addType == PlayQueueAddAllTracks ? "AddAll" : "AddSelected"); - - _playQueue->clear(); - - switch(addType) - { - case PlayQueueAddAllTracks: - // Play all the tracks - _trackView->getTracks(trackIds); - _playQueue->addTracks(trackIds); - _playQueue->play(); - - break; - case PlayQueueAddSelectedTracks: - - LMS_LOG(UI, DEBUG) << "Adding selected tracks..."; - - // If nothing selected, get all the track and play everything - if (_trackView->getNbSelectedTracks() == 0) - { - _trackView->getTracks(trackIds); - _playQueue->addTracks(trackIds); - _playQueue->play(); - } - // If only ONE selected, get them all and pre select the track - else if (_trackView->getNbSelectedTracks() == 1) - { - // Start to play at the selected track, if any - _trackView->getTracks(trackIds); - _playQueue->addTracks(trackIds); - _playQueue->play(_trackView->getFirstSelectedTrackPosition()); - } - else - { - // Play all the selected tracks - _trackView->getSelectedTracks(trackIds); - _playQueue->addTracks(trackIds); - _playQueue->play(); - } - break; - } -} - -void -Audio::playTrack(Track::id_type trackId, int pos) -{ - { - Wt::Dbo::Transaction transaction(DboSession()); - - // Update user current track position - CurrentUser().modify()->setCurPlayingTrackPos(pos); - } - - if (!_mediaPlayer->loadTrack(trackId)) - _playQueue->playNext(); -} - -} // namespace Desktop -} // namespace UserInterface - diff --git a/src/ui/audio/desktop/DesktopAudio.hpp b/src/ui/audio/desktop/DesktopAudio.hpp deleted file mode 100644 index ac7bda65..00000000 --- a/src/ui/audio/desktop/DesktopAudio.hpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#pragma once - -#include - -#include - -#include "audio/AudioPlayer.hpp" -#include "TrackView.hpp" -#include "PlayQueue.hpp" - -#include "FilterChain.hpp" - -#include "audio/Audio.hpp" - -namespace UserInterface { -namespace Desktop { - -class Audio : public UserInterface::Audio -{ - - public: - - Audio(Wt::WContainerWidget* parent = 0); - - void search(std::string searchText); - - private: - - void playlistSaveFromPlayqueue(std::string name); - void playlistLoadToPlayqueue(std::string name); - void playlistShowSaveNewDialog(); - void playlistShowSaveDialog(std::string name); - void playlistShowDeleteDialog(std::string name); - void playlistRefreshMenus(); - - void playTrack(Database::Track::id_type id, int pos); - - enum PlayQueueAddType - { - PlayQueueAddAllTracks, - PlayQueueAddSelectedTracks, - }; - - void playSelectedTracks(PlayQueueAddType addType); - void addSelectedTracks(); - - void handlePlaylistSelected(Wt::WString name); - - AudioPlayer* _mediaPlayer; - TrackView* _trackView; - PlayQueue* _playQueue; - - FilterChain _filterChain; - - Wt::WPopupMenu* _popupMenuSave; - Wt::WPopupMenu* _popupMenuLoad; - Wt::WPopupMenu* _popupMenuDelete; -}; - -} // namespace Desktop -} // namespace UserInterface - diff --git a/src/ui/audio/desktop/Filter.hpp b/src/ui/audio/desktop/Filter.hpp deleted file mode 100644 index 5feb120a..00000000 --- a/src/ui/audio/desktop/Filter.hpp +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef FILTER_HPP -#define FILTER_HPP - -#include - -#include "database/Types.hpp" - -namespace UserInterface { -namespace Desktop { - -class Filter -{ - public: - Filter() {} - virtual ~Filter() {} - - // Refresh filter using constraints created by parent filters - virtual void refresh(Database::SearchFilter& filter) = 0; - - // Update constraints for next filters - virtual void getConstraint(Database::SearchFilter& filter) = 0; - - // Emitted when a constraint has changed - Wt::Signal& update() { return _update; }; - - protected: - - void emitUpdate() { _update.emit(); } - - private: - - Wt::Signal _update; -}; - -} // namespace Dekstop -} // namespace UserInterface - -#endif diff --git a/src/ui/audio/desktop/FilterChain.cpp b/src/ui/audio/desktop/FilterChain.cpp deleted file mode 100644 index d94ddea5..00000000 --- a/src/ui/audio/desktop/FilterChain.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2014 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 . - */ - -#include "FilterChain.hpp" - -namespace UserInterface { -namespace Desktop { - - -FilterChain::FilterChain() -: _refreshingFilters(false) -{ - addFilter(&_keywordSearchFilter); -} - -void -FilterChain::addFilter(Filter* filter) -{ - filter->update().connect(boost::bind(&FilterChain::updateFilters, this, _filters.size())); - _filters.push_back(filter); -} - -void -FilterChain::searchKeyword(const std::string& text) -{ - _keywordSearchFilter.setText(text); -} - -void -FilterChain::updateFilters(std::size_t startIdx) -{ - // Prevent loops - if (_refreshingFilters) - return; - - _refreshingFilters = true; - - Database::SearchFilter searchFilter; - - for (std::size_t idFilter = 0; idFilter < _filters.size(); ++idFilter) - { - Filter* filter = _filters.at(idFilter); - - // Apply contraints created by previous filters - if (idFilter > startIdx) { - filter->refresh(searchFilter); - } - - // Get constraints generated by this filter - // (Note: adding accross successive calls) - filter->getConstraint(searchFilter); - } - - _refreshingFilters = false; -} - -} // namespace Desktop -} // namespace UserInterface - diff --git a/src/ui/audio/desktop/FilterChain.hpp b/src/ui/audio/desktop/FilterChain.hpp deleted file mode 100644 index c9625941..00000000 --- a/src/ui/audio/desktop/FilterChain.hpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2014 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 . - */ - -#ifndef FILTER_CHAIN_HPP -#define FILTER_CHAIN_HPP - -#include - -#include "Filter.hpp" -#include "KeywordSearchFilter.hpp" - -namespace UserInterface { -namespace Desktop { - -// FilterChain -class FilterChain -{ - public: - - FilterChain(); - - void addFilter(Filter* filter); - - // First filter is a keywork search - void searchKeyword(const std::string& text); - - // Update filters from filter @ startIdx - void updateFilters(std::size_t startIdx); - - private: - - KeywordSearchFilter _keywordSearchFilter; - - // No ownership - std::vector _filters; - - bool _refreshingFilters; -}; - -} // namespace Desktop -} // namespace UserInterface - -#endif diff --git a/src/ui/audio/desktop/KeywordSearchFilter.cpp b/src/ui/audio/desktop/KeywordSearchFilter.cpp deleted file mode 100644 index 3749960a..00000000 --- a/src/ui/audio/desktop/KeywordSearchFilter.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include -#include -#include - -#include "KeywordSearchFilter.hpp" - -namespace UserInterface { -namespace Desktop { - -KeywordSearchFilter::KeywordSearchFilter() -{ -} - -void -KeywordSearchFilter::setText(const std::string& text) -{ - _lastEmittedText = text; - emitUpdate(); -} - -// Get constraints created by this filter -void -KeywordSearchFilter::getConstraint(Database::SearchFilter& filter) -{ - // No active search means no constaint! - if (!_lastEmittedText.empty()) { - std::vector values; - boost::algorithm::split(values, _lastEmittedText, boost::is_any_of(" "), boost::token_compress_on); - - // For each part, do a global search on all searchable fields - for (const std::string& value : values) - { - filter.nameLikeMatch.push_back({ - {Database::SearchFilter::Field::Artist, {value}}, - {Database::SearchFilter::Field::Release, {value}}, - {Database::SearchFilter::Field::Cluster, {value}}, - {Database::SearchFilter::Field::Track, {value}} - }); - } - } -} - -} // namespace Desktop -} // namespace UserInterface - diff --git a/src/ui/audio/desktop/KeywordSearchFilter.hpp b/src/ui/audio/desktop/KeywordSearchFilter.hpp deleted file mode 100644 index acf62b0b..00000000 --- a/src/ui/audio/desktop/KeywordSearchFilter.hpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef KEYWORD_SEARCH_FILTER_HPP -#define KEYWORD_SEARCH_FILTER_HPP - -#include - -#include "Filter.hpp" - -namespace UserInterface { -namespace Desktop { - -class KeywordSearchFilter : public Filter -{ - public: - KeywordSearchFilter(); - - void setText(const std::string& text); - - // Set constraint on this filter - void refresh(Database::SearchFilter& filter) {} - - // Get constraints created by this filter - void getConstraint(Database::SearchFilter& filter); - - private: - - void handleKeyWentUp(void); - - std::string _lastEmittedText; -}; - -} // namespace Desktop -} // namespace UserInterface - -#endif - diff --git a/src/ui/audio/desktop/PlayQueue.cpp b/src/ui/audio/desktop/PlayQueue.cpp deleted file mode 100644 index 8eea4231..00000000 --- a/src/ui/audio/desktop/PlayQueue.cpp +++ /dev/null @@ -1,634 +0,0 @@ -/* - * Copyright (C) 2014 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 . - */ - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "utils/Logger.hpp" - -#include "LmsApplication.hpp" -#include "PlayQueue.hpp" - -static const int TrackInfoRole = Wt::UserRole; - -namespace { - - void swapRows(Wt::WStandardItemModel *model, int row1, int row2) - { - // Swap data column by column - for (int i = 0; i < model->columnCount(); ++i) - { - Wt::WModelIndex index1 = model->index(row1, i); - Wt::WModelIndex index2 = model->index(row2, i); - - // swap data associated with standard roles - { - auto tmp = model->itemData(index1); // 1 -> tmp - model->setItemData(index1, model->itemData(index2)); // 2 -> 1 - model->setItemData(index2, tmp); // tmp-> 2 - } - // caution: swap data associated with our custom roles if any!! - } - } -} - -namespace UserInterface { -namespace Desktop { - -enum ColumnId -{ - COLUMN_ID_TRACK_ID = 0, - COLUMN_ID_COVER = 1, - COLUMN_ID_NAME = 2, -}; - -static const int trackPosInvalid = -1; - -class TrackSelector -{ - public: - TrackSelector(); - - void setShuffle(bool enable); - void setLoop(bool enable) { _loop = enable; } - - int previous(void); - int next(void); - int getCurrent(void); - - // Set the internal pos thanks to the track pos - void setPosByRowId(int rowId); - void setPos(int pos) { _curPos = pos; } - - void setSize(std::size_t size); - std::size_t getSize(void) const { return _size;} - - private: - - void refreshPositions(); - - bool _loop; - bool _shuffle; - - std::size_t _size; - std::size_t _curPos; - - std::vector _trackPos; -}; - -TrackSelector::TrackSelector() -: _loop(false), -_shuffle(false), -_size(0), -_curPos(0) -{ -} - -void -TrackSelector::refreshPositions() -{ - _trackPos.clear(); - - if (_size == 0) - return; - - for (std::size_t i = 0; i < _size; ++i) - _trackPos.push_back(i); - - // Now shuffle - // Source: http://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle - boost::random::mt19937 rng; // produces randomness out of thin air - rng.seed(static_cast(std::time(0))); - - for (std::size_t i = 0; i < _size; ++i) - { - boost::random::uniform_int_distribution<> distribution(i, _size - 1); - int val1 = distribution(rng); - int tmp = _trackPos[i]; - _trackPos[i] = _trackPos[val1]; - _trackPos[val1] = tmp; - } -} - -int -TrackSelector::getCurrent() -{ - return _shuffle ? _trackPos[_curPos] : _curPos; -} - -void -TrackSelector::setShuffle(bool enable) -{ - _shuffle = enable; - - if (_size != 0) - { - // Update the current index we are playing if we switch shuffle - if (_shuffle) - setPosByRowId(_curPos); - else - setPos(_trackPos[_curPos]); - } -} - -int -TrackSelector::next() -{ - if (_size == 0) - return trackPosInvalid; - - if (_curPos == _size - 1) - { - if (!_loop) - return trackPosInvalid; - else - _curPos = 0; - } - else - ++_curPos; - - return _shuffle ? _trackPos[_curPos] : _curPos; -} - -int -TrackSelector::previous() -{ - if (_size == 0) - return trackPosInvalid; - - if (_curPos == 0) - { - if (!_loop) - return trackPosInvalid; - else - _curPos = _size - 1; - } - else - --_curPos; - - return _shuffle ? _trackPos[_curPos] : _curPos; -} - -void -TrackSelector::setPosByRowId(int rowId) -{ - if (_shuffle) - { - for (std::size_t i = 0; i < _trackPos.size(); ++i) - { - if (rowId == _trackPos[i]) - { - _curPos = i; - break; - } - } - } - else - _curPos = rowId; -} - -void -TrackSelector::setSize(std::size_t size) -{ - _size = size; - _curPos = 0; - refreshPositions(); -} - -struct TrackInfo -{ - Wt::WString track; - Wt::WString artist; - Wt::WString release; -}; - -class PlayQueueItemDelegate : public Wt::WItemDelegate -{ - public: - PlayQueueItemDelegate(Wt::WObject *parent = 0) : Wt::WItemDelegate(parent) {} - - Wt::WWidget* update(Wt::WWidget *widget, const Wt::WModelIndex &index, Wt::WFlags< Wt::ViewItemRenderFlag > flags) - { - Wt::WWidget* res; - - if (!index.data(TrackInfoRole).empty()) - { - TrackInfo trackInfo = boost::any_cast(index.data(TrackInfoRole)); - - Wt::WContainerWidget *container = new Wt::WContainerWidget(); - Wt::WText* track = new Wt::WText(trackInfo.track, Wt::PlainText, container); - Wt::WText* artist = new Wt::WText(trackInfo.artist + " - " + trackInfo.release, Wt::PlainText, container); - - artist->setInline(false); - track->setInline(false); - - artist->setStyleClass("playqueue-artist"); - track->setStyleClass("playqueue-track"); - - // Apply style if any - Wt::WString styleClass = Wt::asString(index.data(Wt::StyleClassRole)); - - // Apply selection style if any - if (flags & Wt::RenderSelected) - styleClass += " " + Wt::WApplication::instance()->theme()->activeClass(); - - container->setStyleClass(styleClass); - - res = container; - } - else - res = Wt::WItemDelegate::update(widget, index, flags); - - return res; - } - - private: - -}; - - -PlayQueue::PlayQueue(Wt::WContainerWidget* parent) -: Wt::WTableView(parent), -_curPlayedTrackPos(trackPosInvalid), -_trackSelector(new TrackSelector()) -{ - _model = new Wt::WStandardItemModel(0, 3, this); - - // 0 Column is hidden (track id) - - this->setHeaderHeight(0); - this->setModel(_model); - this->setSelectionMode(Wt::ExtendedSelection); - this->setSortingEnabled(false); - this->setAlternatingRowColors(true); - this->setRowHeight(64); - this->setColumnWidth(COLUMN_ID_COVER, 64); - this->setColumnWidth(COLUMN_ID_NAME, 240); - - this->setLayoutSizeAware(true); -#if WT_VERSION >= 0X03030400 - this->setOverflow(Wt::WContainerWidget::OverflowHidden, Wt::Horizontal); - this->setOverflow(Wt::WContainerWidget::OverflowScroll, Wt::Vertical); -#endif - this->setColumnHidden(COLUMN_ID_TRACK_ID, true); - - _itemDelegate = new PlayQueueItemDelegate(); - this->setItemDelegate(_itemDelegate); - - this->doubleClicked().connect( std::bind([=] (Wt::WModelIndex idx, Wt::WMouseEvent evt) - { - if (!idx.isValid()) - return; - - // Update selection - Wt::WModelIndexSet indexSet; - indexSet.insert(idx); - - this->setSelectedIndexes( indexSet ); - - // Read the requested track - play(idx.row()); - - }, std::placeholders::_1, std::placeholders::_2)); - -} - -void -PlayQueue::layoutSizeChanged (int width, int height) -{ - std::size_t coverColumnSize = this->columnWidth(COLUMN_ID_COVER).toPixels(); - // Set the remaining size for the name column - this->setColumnWidth(COLUMN_ID_NAME, width - coverColumnSize - (7 * 2) - 2); -} - -void -PlayQueue::setShuffle(bool enable) -{ - _trackSelector->setShuffle(enable); -} - -void -PlayQueue::setLoop(bool enable) -{ - _trackSelector->setLoop(enable); -} - -void -PlayQueue::play() -{ - _trackSelector->setPos(0); - - readTrack(_trackSelector->getCurrent()); -} - -void -PlayQueue::play(int rowId) -{ - // Update the track selector to use the requested track as current position - _trackSelector->setPosByRowId(rowId); - - readTrack(_trackSelector->getCurrent()); -} - -void -PlayQueue::select(int rowId) -{ - // Update the track selector to use the requested track as current position - _trackSelector->setPosByRowId(rowId); - - Wt::WTableView::select(_model->index(_trackSelector->getCurrent(), 0)); - - this->scrollTo( _model->index(_trackSelector->getCurrent(), 0)); -} - -void -PlayQueue::addTracks(const std::vector& trackIds) -{ - using namespace Database; - - LMS_LOG(UI, DEBUG) << "Adding " << trackIds.size() << " tracks to play queue"; - - // Add tracks to model - for (Track::id_type trackId : trackIds) - { - Wt::Dbo::Transaction transaction(DboSession()); - - Track::pointer track (Track::getById(DboSession(), trackId)); - - if (track) - { - int dataRow = _model->rowCount(); - - _model->insertRows(dataRow, 1); - - _model->setData(dataRow, COLUMN_ID_TRACK_ID, track.id(), Wt::UserRole); - - std::string coverUrl; - coverUrl = SessionImageResource()->getTrackUrl(track.id(), 64); - - _model->setData(dataRow, COLUMN_ID_COVER, coverUrl, Wt::DecorationRole); - _model->setData(dataRow, COLUMN_ID_COVER, std::string("playqueue-cover"), Wt::StyleClassRole); - - TrackInfo trackInfo; - trackInfo.track = Wt::WString::fromUTF8(track->getName()); - trackInfo.artist = Wt::WString::fromUTF8(track->getArtist()->getName()); - trackInfo.release = Wt::WString::fromUTF8(track->getRelease()->getName()); - _model->setData(dataRow, COLUMN_ID_NAME, trackInfo, TrackInfoRole); - } - } - - _trackSelector->setSize( _model->rowCount() ); - - _sigTracksUpdated.emit(); -} - -void -PlayQueue::clear(void) -{ - _model->removeRows(0, _model->rowCount()); - - // Reset play id - _curPlayedTrackPos = trackPosInvalid; - _trackSelector->setSize( 0 ); - - _sigTracksUpdated.emit(); -} - -void -PlayQueue::handlePlaybackComplete(void) -{ - playNext(); -} - -void -PlayQueue::playNext(void) -{ - std::size_t nbTries = _trackSelector->getSize(); - - while (nbTries > 0) - { - int pos = _trackSelector->next(); - if (pos == trackPosInvalid) - break; - - readTrack(pos); - - break; - } -} - -void -PlayQueue::playPrevious(void) -{ - std::size_t nbTries = _trackSelector->getSize(); - - while (nbTries > 0) - { - int pos = _trackSelector->previous(); - if (pos == trackPosInvalid) - break; - - readTrack(pos); - break; - - } -} - -void -PlayQueue::readTrack(int rowPos) -{ - LMS_LOG(UI, DEBUG) << "Reading track at pos " << rowPos << ", row count = " << _model->rowCount(); - - if (rowPos < _model->rowCount()) - { - Database::Track::id_type trackId = boost::any_cast(_model->data(rowPos, COLUMN_ID_TRACK_ID, Wt::UserRole)); - - setPlayingTrackPos(rowPos); - - _sigTrackPlay.emit(trackId, rowPos); - - this->scrollTo( _model->index(_trackSelector->getCurrent(), 0)); - } -} - -void -PlayQueue::setPlayingTrackPos(int newRowPos) -{ - int oldRowPos = _curPlayedTrackPos; - _curPlayedTrackPos = newRowPos; - - // Hack re-set the data in order to trigger the rerending of the widget - // calling the update method of our custom item delegate gives bad results - if (oldRowPos >= 0) - { - _model->setData(oldRowPos, COLUMN_ID_NAME, boost::any(), Wt::StyleClassRole); - } - - if (newRowPos >= 0) - { - _model->setData(newRowPos, COLUMN_ID_NAME, std::string("playqueue-playing"), Wt::StyleClassRole); - } -} - -void -PlayQueue::delSelected(void) -{ - int minId = _model->rowCount(); - Wt::WModelIndexSet indexSet = this->selectedIndexes(); - - // Make sure to delete entries in the reverse order - std::vector rowIds; - for (Wt::WModelIndex index : indexSet) - rowIds.push_back(index.row()); - - std::sort(rowIds.begin(), rowIds.end(), std::greater()); - if (!rowIds.empty()) - minId = rowIds.back(); - - for (int rowId : rowIds) - _model->removeRow(rowId); - - // If the current played track is removed, make sure to unselect it - _trackSelector->setSize(_model->rowCount()); - - renumber(minId, _model->rowCount() - 1); - _sigTracksUpdated.emit(); -} - -void -PlayQueue::delAll(void) -{ - _model->removeRows(0, _model->rowCount()); - _trackSelector->setSize(0); - _sigTracksUpdated.emit(); -} - -void -PlayQueue::moveSelectedUp(void) -{ - int minId = _model->rowCount(); - int maxId = 0; - - Wt::WModelIndexSet indexSet = this->selectedIndexes(); - Wt::WModelIndexSet newIndexSet; - - // ordered from up to down - for (Wt::WModelIndex index : indexSet) - { - // Do nothing if the first selected index is on the top - if (index.row() == 0) - return; - - // TODO optimize for blocks - swapRows(_model, index.row() - 1, index.row()); - - if (index.row() - 1 < minId) - minId = index.row() - 1; - - if (index.row() > maxId) - maxId = index.row(); - - // Update playing status - if (_curPlayedTrackPos == index.row()) - setPlayingTrackPos(_curPlayedTrackPos - 1); - else if (_curPlayedTrackPos == index.row() - 1) - setPlayingTrackPos(_curPlayedTrackPos + 1); - - newIndexSet.insert( _model->index(index.row() - 1, 0)); - } - - _trackSelector->setPosByRowId(_curPlayedTrackPos); - this->setSelectedIndexes( newIndexSet ); - - renumber(minId, maxId); - - _sigTracksUpdated.emit(); -} - - -void -PlayQueue::moveSelectedDown(void) -{ - int minId = _model->rowCount(); - int maxId = 0; - - Wt::WModelIndexSet indexSet = this->selectedIndexes(); - Wt::WModelIndexSet newIndexSet; - - // ordered from up to down - for (Wt::WModelIndex index : indexSet) - { - // Do nothing if the last selected index is the last one - if (index.row() == _model->rowCount() - 1) - return; - - // TODO optimize for blocks - swapRows(_model, index.row(), index.row() + 1); - - if (index.row() < minId) - minId = index.row(); - - if (index.row() + 1 > maxId) - maxId = index.row() + 1; - - // Update playing status - if (_curPlayedTrackPos == index.row()) - setPlayingTrackPos(_curPlayedTrackPos + 1); - else if (_curPlayedTrackPos == index.row() + 1) - setPlayingTrackPos(_curPlayedTrackPos - 1); - - newIndexSet.insert( _model->index(index.row() + 1, 0)); - } - - _trackSelector->setPosByRowId(_curPlayedTrackPos); - this->setSelectedIndexes( newIndexSet ); - - renumber(minId, maxId); - - _sigTracksUpdated.emit(); -} - -void -PlayQueue::renumber(int firstId, int lastId) -{ - for (int i = firstId; i <= lastId; ++i) - _model->setData( i, 1, i + 1); -} - -void -PlayQueue::getTracks(std::vector& trackIds) const -{ - // Now add each entry in the playlist - for (int i = 0; i < _model->rowCount(); ++i) - { - Database::Track::id_type trackId = boost::any_cast(_model->data(i, COLUMN_ID_TRACK_ID, Wt::UserRole)); - trackIds.push_back(trackId); - } -} - -} // namespace Desktop -} // namespace UserInterface - diff --git a/src/ui/audio/desktop/PlayQueue.hpp b/src/ui/audio/desktop/PlayQueue.hpp deleted file mode 100644 index 0f0ca22d..00000000 --- a/src/ui/audio/desktop/PlayQueue.hpp +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (C) 2014 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 . - */ - -#ifndef PLAY_QUEUE_HPP -#define PLAY_QUEUE_HPP - -#include -#include - -#include "database/Types.hpp" - -namespace UserInterface { -namespace Desktop { - -class PlayQueueItemDelegate; -class TrackSelector; - -class PlayQueue : public Wt::WTableView -{ - public: - PlayQueue(Wt::WContainerWidget* parent = 0); - - void addTracks(const std::vector& trackIds); - void getTracks(std::vector& trackIds) const; - - void clear(void); - - void setShuffle(bool enable); // true to enable shuffle - void setLoop(bool enable); // true to enable loop - - // Play functions - void play(void); // Play the queue from the beginning - void play(int rowId); // Play the queue from the given rowId - void select(int rowId); // Select the given rowId - void playNext(void); // Play the next track - void playPrevious(void); // Play the previous track - - // List manipulations - void delSelected(void); - void delAll(void); - void moveSelectedUp(void); - void moveSelectedDown(void); - - // Signals - // Emitted when a song has to be played - Wt::Signal< Database::Track::id_type, int >& playTrack() { return _sigTrackPlay; } - // Emitted when the list has changed - Wt::Signal< void >& tracksUpdated() { return _sigTracksUpdated; } - - // Slots - void handlePlaybackComplete(void); - - private: - - void layoutSizeChanged (int width, int height); - - void readTrack(int rowId); - void setPlayingTrackPos(int newRowPos); - void renumber(int firstId, int lastId); - - Wt::Signal< Database::Track::id_type, int > _sigTrackPlay; - Wt::Signal< void > _sigTracksUpdated; - - Wt::WStandardItemModel* _model; - - PlayQueueItemDelegate* _itemDelegate; - - int _curPlayedTrackPos; - std::unique_ptr _trackSelector; - -}; - -} // namespace Desktop -} // namespace UserInterface - -#endif diff --git a/src/ui/audio/desktop/TableFilter.cpp b/src/ui/audio/desktop/TableFilter.cpp deleted file mode 100644 index 6af45e97..00000000 --- a/src/ui/audio/desktop/TableFilter.cpp +++ /dev/null @@ -1,282 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include -#include - -#include "database/Types.hpp" - -#include "utils/Logger.hpp" - -#include "LmsApplication.hpp" -#include "TableFilter.hpp" - -namespace UserInterface { -namespace Desktop { - -using namespace Database; - -TableFilterCluster::TableFilterCluster(Wt::WContainerWidget* parent) -: Wt::WTableView( parent ), Filter() -{ - const std::vector columnNames = {"Tag", "Tracks"}; - - SearchFilter filter; - - Cluster::updateUIQueryModel(DboSession(), _queryModel, filter, columnNames); - - this->setSelectionMode(Wt::ExtendedSelection); - this->setSortingEnabled(true); - this->setAlternatingRowColors(true); - this->setModel(&_queryModel); - - this->setColumnWidth(1, 80); - - this->selectionChanged().connect(this, &TableFilterCluster::emitUpdate); - -#if WT_VERSION >= 0X03030400 - this->setOverflow(Wt::WContainerWidget::OverflowHidden, Wt::Horizontal); - this->setOverflow(Wt::WContainerWidget::OverflowScroll, Wt::Vertical); -#endif - - this->setLayoutSizeAware(true); - - _queryModel.setBatchSize(150); - - // If an item is double clicked, select and emit signal - this->doubleClicked().connect( std::bind([=] (Wt::WModelIndex idx, Wt::WMouseEvent evt) - { - if (!idx.isValid()) - return; - - Wt::WModelIndexSet indexSet; - indexSet.insert(idx); - - this->setSelectedIndexes( indexSet ); - _sigDoubleClicked.emit( ); - - }, std::placeholders::_1, std::placeholders::_2)); - -} - -void -TableFilterCluster::layoutSizeChanged (int width, int height) -{ - std::size_t trackColumnSize = this->columnWidth(1).toPixels(); - // Set the remaining size for the name column - this->setColumnWidth(0, width - trackColumnSize - (7 * 2) - 2); -} - -// Set constraints on this filter -void -TableFilterCluster::refresh(SearchFilter& filter) -{ -#if WT_VERSION >= 0X03030500 - this->clearSelection(); -#endif - - Cluster::updateUIQueryModel(DboSession(), _queryModel, filter); -} - -// Get constraint created by this filter -void -TableFilterCluster::getConstraint(SearchFilter& filter) -{ - Wt::WModelIndexSet indexSet = this->selectedIndexes(); - - for (Wt::WModelIndex index : indexSet) - { - if (!index.isValid()) - continue; - - // TODO set invisible track id - Cluster::id_type id = _queryModel.resultRow( index.row() ).get<0>(); - - filter.idMatch[Database::SearchFilter::Field::Cluster].push_back(id); - } -} - -TableFilterArtist::TableFilterArtist(Wt::WContainerWidget* parent) -: Wt::WTableView( parent ), Filter() -{ - const std::vector columnNames = {"Artist", "Releases", "Tracks"}; - - SearchFilter filter; - - Artist::updateUIQueryModel(DboSession(), _queryModel, filter, columnNames); - - this->setSelectionMode(Wt::ExtendedSelection); - this->setSortingEnabled(true); - this->setAlternatingRowColors(true); - this->setModel(&_queryModel); - - this->setColumnWidth(1, 80); - this->setColumnWidth(2, 80); - - this->selectionChanged().connect(this, &TableFilterArtist::emitUpdate); - -#if WT_VERSION >= 0X03030400 - this->setOverflow(Wt::WContainerWidget::OverflowHidden, Wt::Horizontal); - this->setOverflow(Wt::WContainerWidget::OverflowScroll, Wt::Vertical); -#endif - - this->setLayoutSizeAware(true); - - _queryModel.setBatchSize(150); - - // If an item is double clicked, select and emit signal - this->doubleClicked().connect( std::bind([=] (Wt::WModelIndex idx, Wt::WMouseEvent evt) - { - if (!idx.isValid()) - return; - - Wt::WModelIndexSet indexSet; - indexSet.insert(idx); - - this->setSelectedIndexes( indexSet ); - _sigDoubleClicked.emit( ); - - }, std::placeholders::_1, std::placeholders::_2)); - -} - -void -TableFilterArtist::layoutSizeChanged (int width, int height) -{ - std::size_t otherColumnsSize = this->columnWidth(1).toPixels() + this->columnWidth(2).toPixels(); - // Set the remaining size for the name column - this->setColumnWidth(0, width - otherColumnsSize - (7 * 3) - 2); -} - -// Set constraints on this filter -void -TableFilterArtist::refresh(SearchFilter& filter) -{ -#if WT_VERSION >= 0X03030500 - this->clearSelection(); -#endif - Artist::updateUIQueryModel(DboSession(), _queryModel, filter); -} - -// Get constraint created by this filter -void -TableFilterArtist::getConstraint(SearchFilter& filter) -{ - Wt::WModelIndexSet indexSet = this->selectedIndexes(); - - for (Wt::WModelIndex index : indexSet) - { - if (!index.isValid()) - continue; - - Artist::id_type id = _queryModel.resultRow( index.row() ).get<0>(); - - filter.idMatch[SearchFilter::Field::Artist].push_back(id); - } -} - -TableFilterRelease::TableFilterRelease(Wt::WContainerWidget* parent) -: Wt::WTableView( parent ), Filter() -{ - const std::vector columnNames = {"Release", "Date", "Tracks"}; - - SearchFilter filter; - - Release::updateUIQueryModel(DboSession(), _queryModel, filter, columnNames); - - this->setSelectionMode(Wt::ExtendedSelection); - this->setSortingEnabled(true); - this->setAlternatingRowColors(true); - this->setModel(&_queryModel); - - this->setColumnWidth(1, 60); - this->setColumnWidth(2, 80); - - // Date display, just the year - { - Wt::WItemDelegate *delegate = new Wt::WItemDelegate(this); - delegate->setTextFormat("yyyy"); - this->setItemDelegateForColumn(1, delegate); - } - - this->selectionChanged().connect(this, &TableFilterRelease::emitUpdate); - -#if WT_VERSION >= 0X03030400 - this->setOverflow(Wt::WContainerWidget::OverflowHidden, Wt::Horizontal); - this->setOverflow(Wt::WContainerWidget::OverflowScroll, Wt::Vertical); -#endif - - this->setLayoutSizeAware(true); - - _queryModel.setBatchSize(150); - - // If an item is double clicked, select and emit signal - this->doubleClicked().connect( std::bind([=] (Wt::WModelIndex idx, Wt::WMouseEvent evt) - { - if (!idx.isValid()) - return; - - Wt::WModelIndexSet indexSet; - indexSet.insert(idx); - - this->setSelectedIndexes( indexSet ); - _sigDoubleClicked.emit( ); - - }, std::placeholders::_1, std::placeholders::_2)); - -} - -void -TableFilterRelease::layoutSizeChanged (int width, int height) -{ - std::size_t otherColumnSizes = this->columnWidth(1).toPixels() + this->columnWidth(2).toPixels(); - // Set the remaining size for the name column - this->setColumnWidth(0, width - otherColumnSizes - (7 * 3) - 2); -} - -// Set constraints on this filter -void -TableFilterRelease::refresh(SearchFilter& filter) -{ -#if WT_VERSION >= 0X03030500 - this->clearSelection(); -#endif - Release::updateUIQueryModel(DboSession(), _queryModel, filter); -} - -// Get constraint created by this filter -void -TableFilterRelease::getConstraint(SearchFilter& filter) -{ - Wt::WModelIndexSet indexSet = this->selectedIndexes(); - - for (Wt::WModelIndex index : indexSet) - { - if (!index.isValid()) - continue; - - Release::id_type id = _queryModel.resultRow( index.row() ).get<0>(); - - filter.idMatch[Database::SearchFilter::Field::Release].push_back(id); - } -} - -} // namespace Desktop -} // namespace UserInterface - diff --git a/src/ui/audio/desktop/TableFilter.hpp b/src/ui/audio/desktop/TableFilter.hpp deleted file mode 100644 index 243b17f2..00000000 --- a/src/ui/audio/desktop/TableFilter.hpp +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef TABLE_FILTER_HPP -#define TABLE_FILTER_HPP - - -#include -#include - -#include "Filter.hpp" -#include "database/Types.hpp" - -namespace UserInterface { -namespace Desktop { - -class TableFilterCluster : public Wt::WTableView, public Filter -{ - public: - TableFilterCluster(Wt::WContainerWidget* parent = 0); - - // Set constraints on this filter - void refresh(Database::SearchFilter& filter); - - // Get constraints created by this filter - void getConstraint(Database::SearchFilter& filter); - - void layoutSizeChanged (int width, int height); - - typedef Wt::Signal SigDoubleClicked; - - SigDoubleClicked& sigDoubleClicked() { return _sigDoubleClicked; } - - protected: - - SigDoubleClicked _sigDoubleClicked; - - Wt::Dbo::QueryModel _queryModel; -}; - -class TableFilterArtist : public Wt::WTableView, public Filter -{ - public: - TableFilterArtist(Wt::WContainerWidget* parent = 0); - - // Set constraints on this filter - void refresh(Database::SearchFilter& filter); - - // Get constraints created by this filter - void getConstraint(Database::SearchFilter& filter); - - void layoutSizeChanged (int width, int height); - - typedef Wt::Signal SigDoubleClicked; - - SigDoubleClicked& sigDoubleClicked() { return _sigDoubleClicked; } - - protected: - - SigDoubleClicked _sigDoubleClicked; - - // Name, track count - Wt::Dbo::QueryModel _queryModel; -}; - -class TableFilterRelease : public Wt::WTableView, public Filter -{ - public: - TableFilterRelease(Wt::WContainerWidget* parent = 0); - - // Set constraints on this filter - void refresh(Database::SearchFilter& filter); - - // Get constraints created by this filter - void getConstraint(Database::SearchFilter& filter); - - void layoutSizeChanged (int width, int height); - - typedef Wt::Signal SigDoubleClicked; - - SigDoubleClicked& sigDoubleClicked() { return _sigDoubleClicked; } - - protected: - - SigDoubleClicked _sigDoubleClicked; - - // Name, track count - Wt::Dbo::QueryModel _queryModel; -}; - - -} // namespace Desktop -} // namespace UserInterface - -#endif - diff --git a/src/ui/audio/desktop/TrackView.cpp b/src/ui/audio/desktop/TrackView.cpp deleted file mode 100644 index aaec7939..00000000 --- a/src/ui/audio/desktop/TrackView.cpp +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include - -#include -#include -#include - -#include "utils/Logger.hpp" -#include "utils/Utils.hpp" - -#include "LmsApplication.hpp" -#include "TrackView.hpp" - -namespace UserInterface { -namespace Desktop { - -using namespace Database; - -class DurationItemDelegate : public Wt::WItemDelegate -{ - public: - DurationItemDelegate(Wt::WObject *parent = 0) : Wt::WItemDelegate(parent) {} - - Wt::WWidget* update(Wt::WWidget *widget, const Wt::WModelIndex &index, Wt::WFlags< Wt::ViewItemRenderFlag > flags) - { - boost::posix_time::time_duration duration = boost::any_cast(index.data(Wt::DisplayRole)); - - // TODO bug when redrawn - std::string format = duration.total_seconds() < 3600 ? "%M:%S" : "%H:%M:%S"; - - return new Wt::WText(durationToString(duration, format), Wt::PlainText); - } -}; - -TrackView::TrackView(Wt::WContainerWidget* parent) -: Wt::WTableView( parent ) -{ - - static const std::vector columnNames = - { - "Artist", - "Album", - "Disc #", - "Track #", - "Track", - "Duration", - "Date", - "Original Date", - "Genres", - }; - - SearchFilter filter; - - Track::updateUIQueryModel(DboSession(), _queryModel, filter, columnNames); - - _queryModel.setBatchSize(500); - - this->setSortingEnabled(true); - this->setSelectionMode(Wt::ExtendedSelection); - this->setAlternatingRowColors(true); - this->setModel(&_queryModel); - - this->setColumnWidth(0, 180); // Artist - this->setColumnWidth(1, 180); // Album - this->setColumnWidth(2, 70); // Disc Number - this->setColumnWidth(3, 70); // Track Number - this->setColumnWidth(4, 180); // Track - this->setColumnWidth(5, 70); // Duration - this->setColumnWidth(6, 70); // Date - this->setColumnWidth(7, 70); // Original Date - this->setColumnWidth(8, 180); // Genres -#if WT_VERSION >= 0X03030400 - this->setOverflow(Wt::WContainerWidget::OverflowScroll, Wt::Vertical); -#endif - - // Duration display - { - // TODO better handle 1 hour+ files! - DurationItemDelegate *delegate = new DurationItemDelegate(this); - this->setItemDelegateForColumn(5, delegate); - } - - // Date display, just the year - { - Wt::WItemDelegate *delegate = new Wt::WItemDelegate(this); - delegate->setTextFormat("yyyy"); - this->setItemDelegateForColumn(6, delegate); - } - { - Wt::WItemDelegate *delegate = new Wt::WItemDelegate(this); - delegate->setTextFormat("yyyy"); - this->setItemDelegateForColumn(7, delegate); - } - - // If an item is double clicked, select the track and emit signal - this->doubleClicked().connect( std::bind([=] (Wt::WModelIndex idx, Wt::WMouseEvent evt) - { - if (!idx.isValid()) - return; - - Wt::WModelIndexSet indexSet; - indexSet.insert(idx); - - this->setSelectedIndexes( indexSet ); - - _sigTrackDoubleClicked.emit( ); - - }, std::placeholders::_1, std::placeholders::_2)); - -} - -void -TrackView::emitStats(const SearchFilter& filter) -{ - Wt::Dbo::Transaction transaction (DboSession()); - - // Update stats on the view - Track::StatsQueryResult stats = Track::getStats(DboSession(), filter); - - transaction.commit(); - - int nbTracks = stats.get<0>(); - boost::posix_time::time_duration totalDuration = stats.get<1>(); - - std::ostringstream oss; - - oss << nbTracks << " track" << (nbTracks > 1 ? "s" : "") << ", "; - - if (totalDuration.hours() >= 24) - { - auto days = totalDuration.hours() / 24; - oss << days << " day" << (days > 1 ? "s " : " "); - } - - oss << std::setw(2) << std::setfill('0') << totalDuration.hours() % 24 - << ":" << std::setw(2) << std::setfill('0') << totalDuration.minutes() - << ":" << std::setw(2) << std::setfill('0') << totalDuration.seconds(); - - _sigStatsUpdated.emit(Wt::WString(oss.str())); -} - -// Set constraints created by parent filters -void -TrackView::refresh(SearchFilter& filter) -{ -#if WT_VERSION >= 0X03030500 - this->clearSelection(); -#endif - Track::updateUIQueryModel(DboSession(), _queryModel, filter); - - emitStats(filter); -} - -void -TrackView::getSelectedTracks(std::vector& track_ids) -{ - LMS_LOG(UI, DEBUG) << "Getting selected tracks..."; - - Wt::WModelIndexSet indexSet = this->selectedIndexes(); - - for (Wt::WModelIndex index : indexSet) - { - if (!index.isValid()) - continue; - - Track::id_type id = _queryModel.resultRow( index.row() ).get<0>(); - - track_ids.push_back(id); - } - - LMS_LOG(UI, DEBUG) << "Getting all selected tracks: " << track_ids.size(); -} - -std::size_t -TrackView::getNbSelectedTracks(void) -{ - return this->selectedIndexes().size(); -} - -int -TrackView::getFirstSelectedTrackPosition(void) -{ - Wt::WModelIndexSet indexSet = this->selectedIndexes(); - - for (Wt::WModelIndex index : indexSet) - { - if (!index.isValid()) - continue; - - return index.row(); - } - - return 0; -} - -void -TrackView::getTracks(std::vector& trackIds) -{ - LMS_LOG(UI, DEBUG) << "Getting all tracks..."; - - Wt::Dbo::Transaction transaction(DboSession()); - Wt::Dbo::Query query = _queryModel.query(); - Wt::Dbo::collection results = query.limit(-1).offset(-1); - - for (auto it = results.begin(); it != results.end(); ++it) - { - Track::id_type id = it->get<0>(); - trackIds.push_back(id); - } - - LMS_LOG(UI, DEBUG) << "Getting all tracks done! " << trackIds.size() << " tracks!"; -} - -} // namespace Desktop -} // namespace UserInterface - diff --git a/src/ui/audio/desktop/TrackView.hpp b/src/ui/audio/desktop/TrackView.hpp deleted file mode 100644 index 2fef0556..00000000 --- a/src/ui/audio/desktop/TrackView.hpp +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef TRACK_HPP -#define TRACK_HPP - -#include -#include - -#include "database/DatabaseHandler.hpp" - -#include "Filter.hpp" - -namespace UserInterface { -namespace Desktop { - -class TrackView : public Wt::WTableView, public Filter -{ - public: - - TrackView(Wt::WContainerWidget* parent = 0); - - // Filter interface - // Set constraints created by parent filters - void refresh(Database::SearchFilter& filter); - - // Create constraints for child filters (N/A) - void getConstraint(Database::SearchFilter& filter) {} - - // Get all the tracks that are currently selected - void getSelectedTracks(std::vector& trackIds); - - std::size_t getNbSelectedTracks(void); - - // Get the first position of the selected tracks (0 if nothing selected) - int getFirstSelectedTrackPosition(void); - - // Get all the tracks - void getTracks(std::vector& track_ids); - - typedef Wt::Signal SigTrackDoubleClicked; - typedef Wt::Signal SigStatsUpdated; - - SigTrackDoubleClicked& trackDoubleClicked() { return _sigTrackDoubleClicked; } - SigStatsUpdated& statsUpdated() { return _sigStatsUpdated; } - - private: - - SigTrackDoubleClicked _sigTrackDoubleClicked; - SigStatsUpdated _sigStatsUpdated; - - void emitStats(const Database::SearchFilter& filter); - - typedef Database::Track::UIQueryResult ResultType; - Wt::Dbo::QueryModel< ResultType > _queryModel; - Wt::WTableView* _tableView; - -}; - -} // namespace Desktop -} // namespace UserInterface - -#endif - diff --git a/src/ui/audio/mobile/ArtistSearch.cpp b/src/ui/audio/mobile/ArtistSearch.cpp deleted file mode 100644 index 0f9762a8..00000000 --- a/src/ui/audio/mobile/ArtistSearch.cpp +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include -#include -#include -#include - -#include "LmsApplication.hpp" - -#include "ArtistSearch.hpp" - -namespace UserInterface { -namespace Mobile { - -ArtistSearch::ArtistSearch(Wt::WString title, Wt::WContainerWidget *parent) -: Wt::WContainerWidget(parent) -{ - Wt::WTemplate* t = new Wt::WTemplate(this); - t->setTemplateText(Wt::WString::tr("wa-artist-search")); - - Wt::WTemplate *titleTemplate = new Wt::WTemplate(this); - titleTemplate->setTemplateText(Wt::WString::tr("mobile-search-title")); - titleTemplate->bindString("text", title); - t->bindWidget("title", titleTemplate); - - _contents = new Wt::WContainerWidget(); - t->bindWidget("contents", _contents ); - - _showMore = new Wt::WTemplate(); - _showMore->setTemplateText(Wt::WString::tr("mobile-search-more")); - _showMore->bindString("text", "Tap to show more results..."); - _showMore->hide(); - _showMore->clicked().connect(std::bind([=] { - _sigShowMore.emit(); - })); - t->bindWidget("show-more", _showMore); -} - -void -ArtistSearch::clear() -{ - _contents->clear(); - _showMore->hide(); -} - -void -ArtistSearch::search(Database::SearchFilter filter, size_t nb) -{ - _filter = filter; - - clear(); - addResults(nb); -} - -void -ArtistSearch::addResults(std::size_t nb) -{ - using namespace Database; - - Wt::Dbo::Transaction transaction(DboSession()); - - bool moreResults; - std::vector artists = Artist::getByFilter(DboSession(), _filter, _contents->count(), nb, moreResults); - - for (Artist::pointer artist : artists) - { - Wt::WTemplate* res = new Wt::WTemplate(_contents); - res->setTemplateText(Wt::WString::tr("wa-artist-search-res")); - - Wt::WAnchor *coverAnchor = new Wt::WAnchor(Wt::WLink(Wt:: WLink::InternalPath, "/audio/artist/" + std::to_string(artist.id()))); - Wt::WImage *artistImg = new Wt::WImage(coverAnchor); - artistImg->setImageLink( SessionImageResource()->getArtistUrl(artist.id(), 512)); - artistImg->setStyleClass("center-block"); // TODO move in css? - artistImg->setStyleClass("release_res_shadow release_img-responsive"); // TODO move in css? - - res->bindWidget("gif", coverAnchor); - res->bindString("name", Wt::WString::fromUTF8(artist->getName(), Wt::PlainText)); - } - - if (moreResults) - _showMore->show(); - else - _showMore->hide(); -} - -} // namespace Mobile -} // namespace UserInterface diff --git a/src/ui/audio/mobile/ArtistSearch.hpp b/src/ui/audio/mobile/ArtistSearch.hpp deleted file mode 100644 index 50dc22de..00000000 --- a/src/ui/audio/mobile/ArtistSearch.hpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#ifndef UI_MOBILE_ARTIST_SEARCH_HPP -#define UI_MOBILE_ARTIST_SEARCH_HPP - -#include - -#include "database/Types.hpp" -#include "database/SearchFilter.hpp" - -namespace UserInterface { -namespace Mobile { - -class ArtistSearch : public Wt::WContainerWidget -{ - public: - - ArtistSearch(Wt::WString title, Wt::WContainerWidget *parent = 0); - - void search(Database::SearchFilter filter, std::size_t nb); - void addResults(std::size_t nb); - - // Slots - Wt::Signal& showMore() { return _sigShowMore;} - - private: - - Wt::Signal _sigShowMore; - - void clear(void); - - Wt::WTemplate* _showMore; - - Database::SearchFilter _filter; - Wt::WContainerWidget* _contents; - std::size_t _count; -}; - -} // namespace Mobile -} // namespace UserInterface - -#endif diff --git a/src/ui/audio/mobile/ArtistSearchView.cpp b/src/ui/audio/mobile/ArtistSearchView.cpp deleted file mode 100644 index d05f00dd..00000000 --- a/src/ui/audio/mobile/ArtistSearchView.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include -#include - -#include "utils/Logger.hpp" - -#include "SearchUtils.hpp" - -#include "ArtistSearch.hpp" - -#include "ArtistSearchView.hpp" - -namespace UserInterface { -namespace Mobile { - -#define SEARCH_NB_ITEMS 20 - -using namespace Database; - -ArtistSearchView::ArtistSearchView(Wt::WContainerWidget* parent) -{ - ArtistSearch* artistSearch = new ArtistSearch("Artists", this); - artistSearch->showMore().connect(std::bind([=] { - artistSearch->addResults(SEARCH_NB_ITEMS); - })); - - wApp->internalPathChanged().connect(std::bind([=] (std::string path) - { - const std::string pathPrefix = "/audio/search/artist"; - - if (!wApp->internalPathMatches(pathPrefix)) - return; - - std::vector keywords = searchPathToSearchKeywords(path.substr(pathPrefix.length())); - - artistSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Artist, keywords), SEARCH_NB_ITEMS); - - }, std::placeholders::_1)); -} - -} // namespace Mobile -} // namespace UserInterface - diff --git a/src/ui/audio/mobile/ArtistView.cpp b/src/ui/audio/mobile/ArtistView.cpp deleted file mode 100644 index 0d365624..00000000 --- a/src/ui/audio/mobile/ArtistView.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include "LmsApplication.hpp" - -#include "utils/Utils.hpp" - -#include "ReleaseSearch.hpp" -#include "ArtistView.hpp" - -namespace UserInterface { -namespace Mobile { - -using namespace Database; - -ArtistView::ArtistView(Wt::WContainerWidget *parent) -: Wt::WContainerWidget(parent) -{ - ReleaseSearch *releases = new ReleaseSearch(this); - - wApp->internalPathChanged().connect(std::bind([=] (std::string path) - { - const std::string pathPrefix = "/audio/artist/"; - - if (!wApp->internalPathMatches(pathPrefix)) - return; - - std::string strId = path.substr(pathPrefix.length()); - - Artist::id_type id; - if (readAs(strId, id)) - { - Wt::Dbo::Transaction transaction(DboSession()); - - auto artist = Artist::getById(DboSession(), id); - releases->search(SearchFilter::ById(SearchFilter::Field::Artist, id), 20, artist ? Wt::WString::fromUTF8(artist->getName()) : "Unknown artist"); - } - - }, std::placeholders::_1)); -} - -Wt::WLink -ArtistView::getLink(Database::Artist::id_type id) -{ - return Wt::WLink(Wt::WLink::InternalPath, "/audio/artist/" + std::to_string(id)); -} - -} //namespace Mobile -} //namespace UserInterface - diff --git a/src/ui/audio/mobile/MobileAudio.cpp b/src/ui/audio/mobile/MobileAudio.cpp deleted file mode 100644 index ab08aa30..00000000 --- a/src/ui/audio/mobile/MobileAudio.cpp +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include - -#include -#include -#include - -#include "audio/AudioPlayer.hpp" - -#include "LmsApplication.hpp" - -#include "PreviewSearchView.hpp" -#include "ArtistSearchView.hpp" -#include "ReleaseSearchView.hpp" -#include "TrackSearchView.hpp" - -#include "ArtistView.hpp" -#include "ReleaseView.hpp" - -#include "MobilePlayQueue.hpp" - -#include "utils/Logger.hpp" -#include "utils/Utils.hpp" - -#include "MobileAudio.hpp" - - -namespace UserInterface { -namespace Mobile { - -enum WidgetIdx -{ - WidgetIdxSearchPreview = 0, - WidgetIdxSearchArtist = 1, - WidgetIdxSearchRelease = 2, - WidgetIdxSearchTrack = 3, - WidgetIdxArtist = 4, - WidgetIdxRelease = 5, - WidgetIdxPlayQueue = 6, -}; - -using namespace Database; - -void -Audio::search(std::string text) -{ - wApp->setInternalPath("/audio/search/preview/" + stringToUTF8(text), true); -} - -Audio::Audio(Wt::WContainerWidget *parent) -: UserInterface::Audio(parent) -{ - // Root div has to be a "container" - this->setStyleClass("container-fluid"); - this->setPadding(60, Wt::Bottom); - - Wt::WStackedWidget *stack = new Wt::WStackedWidget(this); - - PlayQueue *playQueue = new PlayQueue(); - - // Same order as WidgetIdxXXX - stack->addWidget(new PreviewSearchView(_playQueueEvents)); - stack->addWidget(new ArtistSearchView()); - stack->addWidget(new ReleaseSearchView()); - stack->addWidget(new TrackSearchView(_playQueueEvents)); - stack->addWidget(new ArtistView()); - stack->addWidget(new ReleaseView(_playQueueEvents)); - stack->addWidget(playQueue); - - wApp->internalPathChanged().connect(std::bind([=] (std::string path) - { - // order is important: most specific path first - static std::map indexes = - { - { "/audio/search/preview", WidgetIdxSearchPreview}, - { "/audio/search/artist", WidgetIdxSearchArtist}, - { "/audio/search/release", WidgetIdxSearchRelease}, - { "/audio/search/track", WidgetIdxSearchTrack}, - { "/audio/artist", WidgetIdxArtist}, - { "/audio/release", WidgetIdxRelease}, - { "/audio/playqueue", WidgetIdxPlayQueue}, - }; - - for (auto index : indexes) - { - if (wApp->internalPathMatches(index.first)) - stack->setCurrentIndex(index.second); - } - - }, std::placeholders::_1)); - - Wt::WTemplate* footer = new Wt::WTemplate(this); - footer->setTemplateText(Wt::WString::tr("mobile-audio-footer")); - - AudioPlayer* audioPlayer = new AudioPlayer(AudioPlayer::ControlPlayqueue); - footer->bindWidget("player", audioPlayer); - - audioPlayer->showPlayQueue().connect(std::bind([=] - { - wApp->setInternalPath("/audio/playqueue", true); - })); - - // Connect the audio player events to the playqueue - playQueue->playTrack().connect(std::bind([=] (Database::Track::id_type id) - { - audioPlayer->loadTrack(id); - }, std::placeholders::_1)); - audioPlayer->playNext().connect(std::bind([=] - { - playQueue->playNext(); - })); - audioPlayer->playPrevious().connect(std::bind([=] - { - playQueue->playPrevious(); - })); - audioPlayer->playbackEnded().connect(std::bind([=] - { - playQueue->playNext(); - })); - audioPlayer->shuffle().connect(std::bind(&PlayQueue::setShuffle, playQueue, std::placeholders::_1)); - audioPlayer->loop().connect(std::bind(&PlayQueue::setLoop, playQueue, std::placeholders::_1)); - - // Connect the events to the player - _playQueueEvents.trackPlay.connect(std::bind([=] (Database::Track::id_type id) - { - std::size_t pos = playQueue->addTrack(id); - playQueue->play(pos); - }, std::placeholders::_1)); - - _playQueueEvents.trackAdd.connect(std::bind([=] (Database::Track::id_type id) - { - playQueue->addTrack(id); - }, std::placeholders::_1)); - - -} - -} // namespace Mobile -} // namespace UserInterface - diff --git a/src/ui/audio/mobile/MobilePlayQueue.cpp b/src/ui/audio/mobile/MobilePlayQueue.cpp deleted file mode 100644 index c14d0ff7..00000000 --- a/src/ui/audio/mobile/MobilePlayQueue.cpp +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ - -#include -#include -#include -#include - -#include "utils/Logger.hpp" - -#include "LmsApplication.hpp" - -#include "MobilePlayQueue.hpp" - - -namespace UserInterface { -namespace Mobile { - - -PlayQueue::PlayQueue(Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent) -{ - Wt::WTemplate* t = new Wt::WTemplate(this); - t->setTemplateText(Wt::WString::tr("wa-playqueue-view")); - - _trackContainer = new Wt::WContainerWidget(); - t->bindWidget("contents", _trackContainer); - - Wt::WTemplate* controls = new Wt::WTemplate(); - t->bindWidget("controls", controls); - controls->setTemplateText(Wt::WString::tr("wa-playqueue-controls")); - - Wt::WText *loadBtn = new Wt::WText("", Wt::XHTMLText); - controls->bindWidget("load", loadBtn); - loadBtn->setStyleClass("mobile-btn"); - - Wt::WText *saveBtn = new Wt::WText("", Wt::XHTMLText); - controls->bindWidget("save", saveBtn); - saveBtn->setStyleClass("mobile-btn"); - - Wt::WText *clearBtn = new Wt::WText("", Wt::XHTMLText); - controls->bindWidget("clear", clearBtn); - clearBtn->setStyleClass("mobile-btn"); - clearBtn->clicked().connect(std::bind([=] - { - clear(); - })); - - _shuffleBtn = new Wt::WText("", Wt::XHTMLText); - controls->bindWidget("shuffle", _shuffleBtn); - _shuffleBtn->setStyleClass("mobile-btn"); - _shuffleBtn->clicked().connect(std::bind([=] () - { - setShuffle(!_shuffle); - })); - - _loopBtn = new Wt::WText("", Wt::XHTMLText); - controls->bindWidget("repeat", _loopBtn); - _loopBtn->setStyleClass("mobile-btn"); - _loopBtn->clicked().connect(std::bind([=] () - { - setLoop(!_loop); - })); - -} - -std::size_t -PlayQueue::addTrack(Database::Track::id_type id) -{ - Wt::Dbo::Transaction transaction(DboSession()); - - Database::Track::pointer track = Database::Track::getById(DboSession(), id); - if (!track) - { - LMS_LOG(UI, INFO) << "No track found for id " << id; - return 0; - } - - std::size_t trackPos = _trackIds.size(); - _trackIds.push_back(id); - - Wt::WTemplate* t = new Wt::WTemplate(_trackContainer); - t->setTemplateText(Wt::WString::tr("wa-playqueue-track")); - - Wt::WImage *cover = new Wt::WImage(); - t->bindWidget("cover", cover); - cover->setStyleClass ("center-block img-responsive"); - cover->setImageLink(SessionImageResource()->getTrackUrl(track.id(), 64)); - t->bindString("track-name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); - t->bindString("artist-name", Wt::WString::fromUTF8(track->getArtist()->getName()), Wt::PlainText); - - Wt::WText *playBtn = new Wt::WText("", Wt::XHTMLText); - t->bindWidget("play-btn", playBtn); - playBtn->addStyleClass("mobile-btn"); - playBtn->clicked().connect(std::bind([=] - { - int pos = _trackContainer->indexOf(t); - play(pos); - })); - - Wt::WText *delBtn = new Wt::WText("", Wt::XHTMLText); - t->bindWidget("del-btn", delBtn); - delBtn->addStyleClass("mobile-btn"); - delBtn->clicked().connect(std::bind([=] - { - int pos = _trackContainer->indexOf(t); - _trackContainer->removeWidget(t); - _trackIds.erase(_trackIds.begin() + pos); - })); - - return trackPos; -} - -void -PlayQueue::clear(void) -{ - _trackIds.clear(); - _trackContainer->clear(); - _currentPos = 0; -} - -void -PlayQueue::play(size_t pos) -{ - if (_trackIds.empty() || pos >= _trackIds.size()) - return; - - _trackContainer->widget(_currentPos)->removeStyleClass("playqueue-playing"); - - _currentPos = pos; - _trackContainer->widget(_currentPos)->addStyleClass("playqueue-playing"); - - _sigTrackPlay.emit(_trackIds[pos]); -} - -void -PlayQueue::playNext(void) -{ - if (_currentPos == (_trackIds.size() - 1) && _loop) - play(0); - else - play(_currentPos + 1); -} - -void -PlayQueue::playPrevious(void) -{ - if (_currentPos == 0) - { - if (_loop) - { - play(_trackIds.size() - 1); - } - else - return; - } - else - play(_currentPos - 1); -} - -void -PlayQueue::handlePlaybackComplete(void) -{ - playNext(); -} - -void -PlayQueue::setShuffle(bool value) -{ - _shuffle = value; - - if (value) - _shuffleBtn->addStyleClass("mobile-btn-active"); - else - _shuffleBtn->removeStyleClass("mobile-btn-active"); -} - -void -PlayQueue::setLoop(bool value) -{ - _loop = value; - - if (value) - _loopBtn->addStyleClass("mobile-btn-active"); - else - _loopBtn->removeStyleClass("mobile-btn-active"); -} - -} // namespace Mobile -} // namespace UserInterface diff --git a/src/ui/audio/mobile/MobilePlayQueue.hpp b/src/ui/audio/mobile/MobilePlayQueue.hpp deleted file mode 100644 index ab8a1dfc..00000000 --- a/src/ui/audio/mobile/MobilePlayQueue.hpp +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ - -#pragma once - -#include - -#include -#include - -#include "database/Types.hpp" - -namespace UserInterface { -namespace Mobile { - -class PlayQueue : public Wt::WContainerWidget -{ - public: - PlayQueue(Wt::WContainerWidget* parent = 0); - - // Contents - std::size_t addArtist(Database::Artist::id_type id); - std::size_t addRelease(Database::Release::id_type id); - std::size_t addTrack(Database::Track::id_type id); - void clear(void); - - // Controls - void play(size_t pos); // Play the track at a given position - void playNext(void); - void playPrevious(void); - - void setShuffle(bool enable); // true to enable shuffle - void setLoop(bool enable); // true to enable loop - - // Signals - // Emitted when a song has to be played - Wt::Signal& playTrack() { return _sigTrackPlay; } - - // Slots - // Song has finished - void handlePlaybackComplete(void); - - private: - - bool _loop = false; - bool _shuffle = false; - std::size_t _currentPos = 0; - - Wt::WText* _shuffleBtn = nullptr; - Wt::WText* _loopBtn = nullptr; - - Wt::Signal _sigTrackPlay; - - std::vector _trackIds; - Wt::WContainerWidget* _trackContainer; -}; - -} // namespace Mobile -} // namespace UserInterface diff --git a/src/ui/audio/mobile/PreviewSearchView.cpp b/src/ui/audio/mobile/PreviewSearchView.cpp deleted file mode 100644 index 8a602e24..00000000 --- a/src/ui/audio/mobile/PreviewSearchView.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include -#include - -#include "utils/Logger.hpp" - -#include "SearchUtils.hpp" - -#include "ArtistSearch.hpp" -#include "ReleaseSearch.hpp" -#include "TrackSearch.hpp" - -#include "PreviewSearchView.hpp" - -namespace UserInterface { -namespace Mobile { - -#define SEARCH_NB_ITEMS 4 - -using namespace Database; - -PreviewSearchView::PreviewSearchView(PlayQueueEvents& events, Wt::WContainerWidget* parent) -{ - const std::string pathPrefix = "/audio/search/preview"; - - ArtistSearch* artistSearch = new ArtistSearch("Artists", this); - ReleaseSearch* releaseSearch = new ReleaseSearch(this); - TrackSearch* trackSearch = new TrackSearch(events, this); - - artistSearch->showMore().connect(std::bind([=] - { - std::string path = wApp->internalPath(); - path.replace(0, pathPrefix.length(), "/audio/search/artist"); - - wApp->setInternalPath(path, true); - })); - - releaseSearch->showMore().connect(std::bind([=] - { - std::string path = wApp->internalPath(); - path.replace(0, pathPrefix.length(), "/audio/search/release"); - - wApp->setInternalPath(path, true); - })); - - trackSearch->showMore().connect(std::bind([=] - { - std::string path = wApp->internalPath(); - path.replace(0, pathPrefix.length(), "/audio/search/track"); - - wApp->setInternalPath(path, true); - })); - - wApp->internalPathChanged().connect(std::bind([=] (std::string path) - { - if (!wApp->internalPathMatches(pathPrefix)) - return; - - std::vector keywords = searchPathToSearchKeywords(path.substr(pathPrefix.length())); - - artistSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Artist, keywords), SEARCH_NB_ITEMS); - releaseSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Release, keywords), SEARCH_NB_ITEMS, "Releases"); - trackSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Track, keywords), SEARCH_NB_ITEMS); - - }, std::placeholders::_1)); -} - -} // namespace Mobile -} // namespace UserInterface - diff --git a/src/ui/audio/mobile/ReleaseSearch.cpp b/src/ui/audio/mobile/ReleaseSearch.cpp deleted file mode 100644 index c45c83cc..00000000 --- a/src/ui/audio/mobile/ReleaseSearch.cpp +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include -#include -#include -#include - -#include "utils/Logger.hpp" - -#include "LmsApplication.hpp" - -#include "ReleaseSearch.hpp" -#include "ReleaseView.hpp" -#include "ArtistView.hpp" - -namespace UserInterface { -namespace Mobile { - -using namespace Database; - -ReleaseSearch::ReleaseSearch(Wt::WContainerWidget *parent) -: Wt::WContainerWidget(parent) -{ - Wt::WTemplate* t = new Wt::WTemplate(this); - t->setTemplateText(Wt::WString::tr("wa-release-search")); - - Wt::WTemplate *titleTemplate = new Wt::WTemplate(this); - titleTemplate->setTemplateText(Wt::WString::tr("mobile-search-title")); - - _title = new Wt::WText(); - titleTemplate->bindWidget("text", _title); - - t->bindWidget("title", titleTemplate); - - _contents = new Wt::WContainerWidget(); - t->bindWidget("contents", _contents ); - - _showMore = new Wt::WTemplate(); - _showMore->setTemplateText(Wt::WString::tr("mobile-search-more")); - _showMore->bindString("text", "Tap to show more results..."); - _showMore->hide(); - _showMore->clicked().connect(std::bind([=] { - _sigShowMore.emit(); - })); - - t->bindWidget("show-more", _showMore); -} - -void -ReleaseSearch::clear() -{ - _contents->clear(); - _showMore->hide(); -} - -void -ReleaseSearch::search(Database::SearchFilter filter, size_t max, Wt::WString title) -{ - _filter = filter; - _title->setText(title); - - clear(); - addResults(max); -} - -void -ReleaseSearch::addResults(size_t nb) -{ - using namespace Database; - - Wt::Dbo::Transaction transaction(DboSession()); - - bool moreResults; - std::vector releases = Release::getByFilter(DboSession(), _filter, _contents->count(), nb, moreResults); - - for (Release::pointer release : releases) - { - Wt::WTemplate* res = new Wt::WTemplate(_contents); - res->setTemplateText(Wt::WString::tr("wa-release-search-res")); - - Wt::WAnchor *coverAnchor = new Wt::WAnchor(ReleaseView::getLink(release.id())); - Wt::WImage *cover = new Wt::WImage(coverAnchor); - cover->setStyleClass("center-block"); - cover->setImageLink( SessionImageResource()->getReleaseUrl(release.id(), 512)); - cover->setStyleClass("release_res_shadow release_img-responsive"); // TODO move? - - res->bindWidget("cover", coverAnchor); - res->bindWidget("name", new Wt::WText(Wt::WString::fromUTF8(release->getName()), Wt::PlainText)); - res->bindString("release_name", Wt::WString::fromUTF8(release->getName()), Wt::PlainText); - - bool variousArtists; - auto artists = Artist::getByFilter(DboSession(), - SearchFilter::ById(SearchFilter::Field::Release, release.id()), 0, 1, variousArtists); - if (!artists.empty()) - { - if (variousArtists) - { - res->bindWidget("artist", new Wt::WText(Wt::WString::fromUTF8("Various Artists", Wt::PlainText))); - } - else - { - Wt::WAnchor *artistAnchor = new Wt::WAnchor(ArtistView::getLink(artists.front().id())); - Wt::WText *artist = new Wt::WText(artistAnchor); - artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText)); - res->bindWidget("artist", artistAnchor); - } - } - } - - if (moreResults) - _showMore->show(); - else - _showMore->hide(); - -} - -} // namespace Mobile -} // namespace UserInterface diff --git a/src/ui/audio/mobile/ReleaseSearch.hpp b/src/ui/audio/mobile/ReleaseSearch.hpp deleted file mode 100644 index 3e82eb57..00000000 --- a/src/ui/audio/mobile/ReleaseSearch.hpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#pragma once - -#include -#include - -#include "database/SearchFilter.hpp" -#include "database/Types.hpp" - -namespace UserInterface { -namespace Mobile { - -class ReleaseSearch : public Wt::WContainerWidget -{ - public: - - ReleaseSearch(Wt::WContainerWidget *parent = 0); - - void search(Database::SearchFilter filter, std::size_t nb, Wt::WString title); - void addResults(std::size_t nb); - - // Slots - Wt::Signal& showMore() { return _sigShowMore;} - - private: - - Wt::Signal _sigShowMore; - - void clear(void); - - Wt::WTemplate* _showMore; - Database::SearchFilter _filter; - Wt::WContainerWidget* _contents; - Wt::WText* _title; - std::size_t _count; -}; - -} // namespace Mobile -} // namespace UserInterface - diff --git a/src/ui/audio/mobile/ReleaseSearchView.cpp b/src/ui/audio/mobile/ReleaseSearchView.cpp deleted file mode 100644 index 09bfaf9f..00000000 --- a/src/ui/audio/mobile/ReleaseSearchView.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include - -#include "SearchUtils.hpp" - -#include "ReleaseSearch.hpp" - -#include "ReleaseSearchView.hpp" - -namespace UserInterface { -namespace Mobile { - -#define SEARCH_NB_ITEMS 20 - -using namespace Database; - -ReleaseSearchView::ReleaseSearchView(Wt::WContainerWidget* parent) -{ - ReleaseSearch* artistSearch = new ReleaseSearch(this); - artistSearch->showMore().connect(std::bind([=] { - artistSearch->addResults(SEARCH_NB_ITEMS); - })); - - wApp->internalPathChanged().connect(std::bind([=] (std::string path) - { - const std::string pathPrefix = "/audio/search/release"; - - if (!wApp->internalPathMatches(pathPrefix)) - return; - - std::vector keywords = searchPathToSearchKeywords(path.substr(pathPrefix.length())); - - artistSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Release, keywords), SEARCH_NB_ITEMS, "Releases"); - - }, std::placeholders::_1)); -} - -} // namespace Mobile -} // namespace UserInterface - diff --git a/src/ui/audio/mobile/ReleaseView.cpp b/src/ui/audio/mobile/ReleaseView.cpp deleted file mode 100644 index 93c1e5fc..00000000 --- a/src/ui/audio/mobile/ReleaseView.cpp +++ /dev/null @@ -1,214 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include -#include -#include -#include - -#include "utils/Logger.hpp" -#include "utils/Utils.hpp" - -#include "LmsApplication.hpp" - -#include "ReleaseView.hpp" - -namespace UserInterface { -namespace Mobile { - -using namespace Database; - -ReleaseView::ReleaseView(PlayQueueEvents& events, Wt::WContainerWidget *parent) -: Wt::WContainerWidget(parent), - _events(events) -{ - Wt::WTemplate* wrapper = new Wt::WTemplate(this); - wrapper->setTemplateText(Wt::WString::tr("wa-trackview-wrapper")); - - Wt::WTemplate* title = new Wt::WTemplate(this); - wrapper->bindWidget("title", title); - - title->setTemplateText(Wt::WString::tr("mobile-search-title")); - title->bindString("text", "Releases", Wt::PlainText); - - _releaseContainer = new Wt::WContainerWidget(); - wrapper->bindWidget("release-container", _releaseContainer); - - _showMore = new Wt::WTemplate(); - wrapper->bindWidget("show-more", _showMore); - - _showMore->setTemplateText(Wt::WString::tr("mobile-search-more")); - _showMore->bindString("text", "Tap to show more results..."); - _showMore->hide(); - _showMore->clicked().connect(std::bind([=] { - addResults(20); - })); - - wApp->internalPathChanged().connect(std::bind([=] (std::string path) - { - const std::string pathPrefix = "/audio/release/"; - - if (!wApp->internalPathMatches(pathPrefix)) - return; - - std::string strId = path.substr(pathPrefix.length()); - - Release::id_type id; - if (readAs(strId, id)) - { - clear(); - search(SearchFilter::ById(SearchFilter::Field::Release, id), 20); - } - }, std::placeholders::_1)); -} - -void -ReleaseView::clear() -{ - // Flush the release container - _releaseContainer->clear(); - - // Flush the current context - _currentTrackContainer = nullptr; - _nbTracks = 0; - _showMore->hide(); -} - -void -ReleaseView::search(SearchFilter filter, size_t nb) -{ - _filter = filter; - - clear(); - addResults(nb); -} - -static Wt::WString -getArtistNameFromRelease(Release::pointer release) -{ - auto artists = Artist::getByFilter(DboSession(), - SearchFilter::ById(SearchFilter::Field::Release, release.id()), -1, 2); - - if (artists.size() > 1) - return Wt::WString::fromUTF8("Various artists", Wt::PlainText); - else if (artists.size() == 1) - return Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText); - else - return Wt::WString(); -} - -void -ReleaseView::addResults(size_t nb) -{ - Wt::Dbo::Transaction transaction(DboSession()); - - bool moreResults; - std::vector tracks = Track::getByFilter(DboSession(), _filter, _nbTracks, nb, moreResults); - - for (Track::pointer track : tracks) - { - // First check if we need to create a new track container - - // New container if it is the first one or if the release has changed - if (!_currentTrackContainer - || _currentReleaseId != track->getRelease().id()) - { - Release::pointer release = track->getRelease(); - - Wt::WTemplate *releaseContainer = new Wt::WTemplate(_releaseContainer); - releaseContainer->setTemplateText(Wt::WString::tr("wa-trackview-release-container")); - _currentReleaseId = release.id(); - - Wt::WImage *cover = new Wt::WImage(); - cover->setStyleClass ("center-block img-responsive"); // TODO move to CSS? - cover->setImageLink(Wt::WLink (SessionImageResource()->getReleaseUrl(release.id(), 512))); - - releaseContainer->bindWidget("cover", cover); - releaseContainer->bindString("artist-name", getArtistNameFromRelease(release), Wt::PlainText); - releaseContainer->bindString("release-name", release->getName(), Wt::PlainText); - int year = release->getReleaseYear(); - if (year > 0) - { - releaseContainer->setCondition("if-has-year", true); - releaseContainer->bindInt("year", year); - - int originalYear = release->getReleaseYear(true); - if (originalYear > 0 && originalYear != year) - { - releaseContainer->setCondition("if-has-orig-year", true); - releaseContainer->bindInt("orig-year", originalYear); - } - } - - _currentTrackContainer = new Wt::WContainerWidget(); - releaseContainer->bindWidget("track-container", _currentTrackContainer); - } - - assert(_currentTrackContainer != nullptr); - - Wt::WTemplate* trackRes = new Wt::WTemplate(_currentTrackContainer); - trackRes->setTemplateText(Wt::WString::tr("wa-trackview-track")); - - if (track->getTrackNumber() > 0 && !track->getRelease()->isNone()) - { - trackRes->setCondition("if-has-track-num", true); - trackRes->bindInt("track-num", track->getTrackNumber()); - - if (track->getDiscNumber() > 0 && track->getTotalDiscNumber() > 1) - { trackRes->setCondition("if-has-disc-num", true); - trackRes->bindInt("disc-num", track->getDiscNumber()); - } - } - trackRes->bindString("track-name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); - // TODO, display artist name for compilation releases? - - Wt::WText *playBtn = new Wt::WText("", Wt::XHTMLText); - trackRes->bindWidget("play-btn", playBtn); - playBtn->setStyleClass("mobile-btn"); - playBtn->clicked().connect(std::bind([=] { - _events.trackPlay.emit(track.id()); - })); - - Wt::WText *addBtn = new Wt::WText("", Wt::XHTMLText); - trackRes->bindWidget("add-btn", addBtn); - addBtn->setStyleClass("mobile-btn"); - addBtn->clicked().connect(std::bind([=] { - _events.trackAdd.emit(track.id()); - })); - - - - - _nbTracks++; - } - - if (moreResults) - _showMore->show(); - else - _showMore->hide(); -} - -Wt::WLink -ReleaseView::getLink(Database::Release::id_type id) -{ - return Wt::WLink(Wt::WLink::InternalPath, "/audio/release/" + std::to_string(id)); -} - -} // namespace Mobile -} // namespace UserInterface diff --git a/src/ui/audio/mobile/ReleaseView.hpp b/src/ui/audio/mobile/ReleaseView.hpp deleted file mode 100644 index bb590702..00000000 --- a/src/ui/audio/mobile/ReleaseView.hpp +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#pragma once - -#include -#include - -#include "MobilePlayQueueEvents.hpp" - -namespace UserInterface { -namespace Mobile { - -class ReleaseView : public Wt::WContainerWidget -{ - public: - - static Wt::WLink getLink(Database::Release::id_type id); - - ReleaseView(PlayQueueEvents& events, Wt::WContainerWidget *parent = 0); - - void search(Database::SearchFilter filter, size_t nb); - - // Slots - Wt::Signal& moreTracksSelected() { return _sigMoreTracksSelected;} - - private: - - Wt::Signal _sigMoreTracksSelected; - - void clear(void); - void addResults(size_t nb); - - PlayQueueEvents& _events; - Wt::WTemplate* _showMore; - - Database::SearchFilter _filter; - std::size_t _nbTracks; - - // Main container that holds the releases - Wt::WContainerWidget* _releaseContainer; - - // Used to add more results on the fly - Database::Release::id_type _currentReleaseId; - Wt::WContainerWidget* _currentTrackContainer; -}; - -} // namespace Mobile -} // namespace UserInterface - diff --git a/src/ui/audio/mobile/SearchUtils.hpp b/src/ui/audio/mobile/SearchUtils.hpp deleted file mode 100644 index 04743b15..00000000 --- a/src/ui/audio/mobile/SearchUtils.hpp +++ /dev/null @@ -1,32 +0,0 @@ - -/* - * Copyright (C) 2015 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 . - */ - -#pragma once - -#include "utils/Utils.hpp" - -static inline std::vector searchPathToSearchKeywords(std::string path) -{ - if (!path.empty() && path[0] == '/') - path.erase(path.begin()); - - return splitString(path, " \t"); -} - diff --git a/src/ui/audio/mobile/TrackSearch.cpp b/src/ui/audio/mobile/TrackSearch.cpp deleted file mode 100644 index db5d4427..00000000 --- a/src/ui/audio/mobile/TrackSearch.cpp +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include -#include -#include -#include - -#include "utils/Logger.hpp" -#include "utils/Utils.hpp" - -#include "LmsApplication.hpp" - -#include "TrackSearch.hpp" - -namespace UserInterface { -namespace Mobile { - -using namespace Database; - -TrackSearch::TrackSearch(PlayQueueEvents& events, Wt::WContainerWidget *parent) -: Wt::WContainerWidget(parent), - _events(events) -{ - Wt::WTemplate* t = new Wt::WTemplate(this); - t->setTemplateText(Wt::WString::tr("wa-track-search")); - - Wt::WTemplate* title = new Wt::WTemplate(this); - title->setTemplateText(Wt::WString::tr("mobile-search-title")); - title->bindString("text", "Tracks", Wt::PlainText); - t->bindWidget("title", title); - - _contents = new Wt::WContainerWidget(); - t->bindWidget("contents", _contents); - - _showMore = new Wt::WTemplate(); - _showMore->setTemplateText(Wt::WString::tr("mobile-search-more")); - _showMore->bindString("text", "Tap to show more results..."); - _showMore->hide(); - _showMore->clicked().connect(std::bind([=] { - _sigShowMore.emit(); - addResults(20); - })); - t->bindWidget("show-more", _showMore); -} - -void -TrackSearch::clear() -{ - _contents->clear(); - _showMore->hide(); -} - -void -TrackSearch::search(SearchFilter filter, size_t nb) -{ - _filter = filter; - - clear(); - addResults(nb); -} - -void -TrackSearch::addResults(size_t nb) -{ - Wt::Dbo::Transaction transaction(DboSession()); - - bool moreResults; - std::vector tracks = Track::getByFilter(DboSession(), _filter, _contents->count(), nb, moreResults); - - for (Track::pointer track : tracks) - { - Wt::WTemplate* res = new Wt::WTemplate(_contents); - res->setTemplateText(Wt::WString::tr("wa-track-search-res")); - - Wt::WImage *cover = new Wt::WImage(); - res->bindWidget("cover", cover); - cover->setStyleClass ("center-block img-responsive"); - cover->setImageLink(SessionImageResource()->getTrackUrl(track.id(), 64)); - res->bindString("track-name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); - res->bindString("artist-name", Wt::WString::fromUTF8(track->getArtist()->getName()), Wt::PlainText); - - Wt::WText *playBtn = new Wt::WText("", Wt::XHTMLText); - res->bindWidget("play-btn", playBtn); - playBtn->setStyleClass("mobile-btn"); - playBtn->clicked().connect(std::bind([=] { - _events.trackPlay.emit(track.id()); - })); - - Wt::WText *addBtn = new Wt::WText("", Wt::XHTMLText); - res->bindWidget("add-btn", addBtn); - addBtn->setStyleClass("mobile-btn"); - addBtn->clicked().connect(std::bind([=] { - _events.trackAdd.emit(track.id()); - })); - - - } - - if (moreResults) - _showMore->show(); - else - _showMore->hide(); -} - -} // namespace Mobile -} // namespace UserInterface diff --git a/src/ui/audio/mobile/TrackSearch.hpp b/src/ui/audio/mobile/TrackSearch.hpp deleted file mode 100644 index 0a98d886..00000000 --- a/src/ui/audio/mobile/TrackSearch.hpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#pragma once - -#include -#include - -#include "database/SearchFilter.hpp" -#include "database/Types.hpp" - -#include "MobilePlayQueueEvents.hpp" - -namespace UserInterface { -namespace Mobile { - -class TrackSearch : public Wt::WContainerWidget -{ - public: - - TrackSearch(PlayQueueEvents& events, Wt::WContainerWidget *parent = 0); - - void addResults(size_t nb); - void search(Database::SearchFilter filter, size_t nb); - - // Slots - Wt::Signal& showMore() { return _sigShowMore;} - - private: - - Wt::Signal _sigShowMore; - - void clear(void); - - PlayQueueEvents& _events; - Wt::WTemplate* _showMore; - Database::SearchFilter _filter; - Wt::WContainerWidget* _contents; -}; - -} // namespace Mobile -} // namespace UserInterface - diff --git a/src/ui/audio/mobile/TrackSearchView.cpp b/src/ui/audio/mobile/TrackSearchView.cpp deleted file mode 100644 index bff89ee0..00000000 --- a/src/ui/audio/mobile/TrackSearchView.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ - -#include -#include - -#include "utils/Logger.hpp" - -#include "SearchUtils.hpp" - -#include "TrackSearch.hpp" - -#include "TrackSearchView.hpp" - -namespace UserInterface { -namespace Mobile { - -#define SEARCH_NB_ITEMS 20 - -using namespace Database; - -TrackSearchView::TrackSearchView(PlayQueueEvents& events, Wt::WContainerWidget* parent) -{ - TrackSearch* trackSearch = new TrackSearch(events, this); - trackSearch->showMore().connect(std::bind([=] { - trackSearch->addResults(SEARCH_NB_ITEMS); - })); - - wApp->internalPathChanged().connect(std::bind([=] (std::string path) - { - const std::string pathPrefix = "/audio/search/track"; - - if (!wApp->internalPathMatches(pathPrefix)) - return; - - std::vector keywords = searchPathToSearchKeywords(path.substr(pathPrefix.length())); - - trackSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Track, keywords), SEARCH_NB_ITEMS); - - }, std::placeholders::_1)); -} - -} // namespace Mobile -} // namespace UserInterface - diff --git a/src/ui/settings/Settings.cpp b/src/ui/settings/Settings.cpp deleted file mode 100644 index 52e75376..00000000 --- a/src/ui/settings/Settings.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include -#include -#include -#include - -#include "SettingsAudioFormView.hpp" -#include "SettingsUserFormView.hpp" -#include "SettingsAccountFormView.hpp" -#include "SettingsDatabaseFormView.hpp" -#include "SettingsMediaDirectories.hpp" -#include "SettingsUsers.hpp" - -#include "utils/Logger.hpp" - -#include "database/Setting.hpp" -#include "database/updater/DatabaseUpdater.hpp" - -#include "LmsApplication.hpp" - -#include "Settings.hpp" - -namespace UserInterface { -namespace Settings { - -using namespace Database; - -Settings::Settings(Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent) -{ - Wt::WHBoxLayout* hLayout = new Wt::WHBoxLayout(this); - - // Create a stack where the contents will be located. - Wt::WStackedWidget *contents = new Wt::WStackedWidget(); - - contents->setStyleClass("contents"); - contents->setOverflow(WContainerWidget::OverflowHidden); - - // TODO menu style on hover - Wt::WMenu *menu = new Wt::WMenu(contents, Wt::Vertical); - menu->setStyleClass("nav nav-pills nav-stacked submenu"); - menu->setWidth(150); - menu->setInternalPathEnabled(); - menu->setInternalBasePath("/settings/"); - - hLayout->addWidget(menu); - hLayout->addWidget(contents, 1); - - std::string userId; - bool userIsAdmin; - { - Wt::Dbo::Transaction transaction(DboSession()); - - userId = User::getId(CurrentUser()); - userIsAdmin = CurrentUser()->isAdmin(); - } - - menu->addItem("Audio", new AudioFormView())->setPathComponent("audio"); - if (userIsAdmin) - { - MediaDirectories* mediaDirectories = new MediaDirectories(); - mediaDirectories->changed().connect(std::bind([=] - { - LMS_LOG(UI, INFO) << "Media directories have changed: requesting imediate scan"; - - // On directory change, request an immediate scan - std::lock_guard lock(Updater::instance().getMutex()); - - Setting::setBool(DboSession(), "manual_scan_requested", true); - Updater::instance().restart(); - })); - menu->addItem("Media Folders", mediaDirectories)->setPathComponent("mediadirectories"); - - DatabaseFormView* databaseFormView = new DatabaseFormView(); - databaseFormView->changed().connect(std::bind([=] - { - std::lock_guard lock(Updater::instance().getMutex()); - Updater::instance().restart(); - })); - menu->addItem("Database", databaseFormView)->setPathComponent("database"); - - menu->addItem("Users", new Users())->setPathComponent("users"); - } - else - { - menu->addItem("Account", new AccountFormView(userId))->setPathComponent("account"); - } - -} - -} // namespace Settings -} // namespace UserInterface diff --git a/src/ui/settings/SettingsAccountFormView.cpp b/src/ui/settings/SettingsAccountFormView.cpp deleted file mode 100644 index bbffbd2a..00000000 --- a/src/ui/settings/SettingsAccountFormView.cpp +++ /dev/null @@ -1,285 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include - -#include -#include -#include -#include -#include -#include - -#include "utils/Logger.hpp" - -#include "common/Validators.hpp" -#include "LmsApplication.hpp" - -#include "SettingsAccountFormView.hpp" - -namespace UserInterface { -namespace Settings { - -class AccountFormModel : public Wt::WFormModel -{ - public: - - // Associate each field with a unique string literal. - static const Field NameField; - static const Field EmailField; - static const Field PasswordField; - static const Field PasswordConfirmField; - - AccountFormModel(std::string userId, Wt::WObject *parent = 0) - : Wt::WFormModel(parent), - _userId(userId) - { - addField(NameField); - addField(EmailField); - addField(PasswordField); - addField(PasswordConfirmField); - - setValidator(NameField, createNameValidator()); - setValidator(EmailField, createEmailValidator()); - - // populate the model with initial data - loadData(); - } - - void loadData() - { - Wt::Dbo::Transaction transaction(DboSession()); - - Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId( _userId ); - Database::User::pointer user = DbHandler().getUser(authUser); - - if (user && authUser.isValid()) - { - setValue(NameField, authUser.identity(Wt::Auth::Identity::LoginName)); - if (!authUser.email().empty()) - setValue(EmailField, authUser.email()); - else - setValue(EmailField, authUser.unverifiedEmail()); - } - setValue(PasswordField, Wt::WString()); - setValue(PasswordConfirmField, Wt::WString()); - } - - bool saveData(Wt::WString& error) - { - // DBO transaction active here - try { - Wt::Dbo::Transaction transaction(DboSession()); - - // Update user - Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId(_userId); - Database::User::pointer user = DbHandler().getUser( authUser ); - - // user may have been deleted by someone else - if (!authUser.isValid()) { - error = Wt::WString("User identity does not exist"); - return false; - } - else if(!user) - { - error = Wt::WString("User not found"); - return false; - } - - // Account - authUser.setIdentity(Wt::Auth::Identity::LoginName, valueText(NameField)); - authUser.setEmail(valueText(EmailField).toUTF8()); - - // Password - if (!valueText(PasswordField).empty()) - Database::Handler::getPasswordService().updatePassword(authUser, valueText(PasswordField)); - - setValue(PasswordField, Wt::WString()); - setValue(PasswordConfirmField, Wt::WString()); - - } - catch(Wt::Dbo::Exception& exception) - { - LMS_LOG(UI, ERROR) << "Dbo exception: " << exception.what(); - return false; - } - - return true; - } - - bool validateField(Field field) - { - // DBO transaction active here - - Wt::WString error; - - if (field == NameField) - { - Wt::Dbo::Transaction transaction(DboSession()); - // Must be unique since used as LoginIdentity - Wt::Auth::User user = DbHandler().getUserDatabase().findWithIdentity(Wt::Auth::Identity::LoginName, valueText(field)); - if (user.isValid() && user.id() != _userId) - error = "Already exists"; - else - return Wt::WFormModel::validateField(field); - } - else if (field == PasswordField) - { - // Password is mandatory if we create the user - if (!valueText(PasswordField).empty()) - { - // Evaluate the strength of the password - Wt::Auth::AbstractPasswordService::StrengthValidatorResult res - = Database::Handler::getPasswordService().strengthValidator()->evaluateStrength(valueText(PasswordField), - valueText(NameField), - valueText(EmailField).toUTF8()); - - if (!res.isValid()) - error = res.message(); - } - else - return Wt::WFormModel::validateField(field); - } - else if (field == PasswordConfirmField) - { - if (validation(PasswordField).state() == Wt::WValidator::Valid) - { - if (valueText(PasswordField) != valueText(PasswordConfirmField)) - error = Wt::WString::tr("Wt.Auth.passwords-dont-match"); - } - } - else - { - // Apply validators - return Wt::WFormModel::validateField(field); - } - - setValidation(field, Wt::WValidator::Result( error.empty() ? Wt::WValidator::Valid : Wt::WValidator::Invalid, error)); - - return validation(field).state() == Wt::WValidator::Valid; - } - - - private: - - std::string _userId; -}; - -const Wt::WFormModel::Field AccountFormModel::NameField = "name"; -const Wt::WFormModel::Field AccountFormModel::EmailField = "email"; -const Wt::WFormModel::Field AccountFormModel::PasswordField = "password"; -const Wt::WFormModel::Field AccountFormModel::PasswordConfirmField = "password-confirm"; - -AccountFormView::AccountFormView(std::string userId, Wt::WContainerWidget *parent) -: Wt::WTemplateFormView(parent) -{ - - _model = new AccountFormModel(userId, this); - - setTemplateText(tr("settings-account")); - addFunction("id", &WTemplate::Functions::id); - addFunction("block", &WTemplate::Functions::id); - - _applyInfo = new Wt::WText(); - _applyInfo->setInline(false); - _applyInfo->hide(); - bindWidget("apply-info", _applyInfo); - - // Name - Wt::WLineEdit* accountEdit = new Wt::WLineEdit(); - setFormWidget(AccountFormModel::NameField, accountEdit); - accountEdit->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Email - Wt::WLineEdit* emailEdit = new Wt::WLineEdit(); - setFormWidget(AccountFormModel::EmailField, emailEdit); - emailEdit->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Password - Wt::WLineEdit* passwordEdit = new Wt::WLineEdit(); - setFormWidget(AccountFormModel::PasswordField, passwordEdit ); - passwordEdit->setEchoMode(Wt::WLineEdit::Password); - passwordEdit->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Password confirmation - Wt::WLineEdit* passwordConfirmEdit = new Wt::WLineEdit(); - setFormWidget(AccountFormModel::PasswordConfirmField, passwordConfirmEdit); - passwordConfirmEdit->setEchoMode(Wt::WLineEdit::Password); - passwordConfirmEdit->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Title & Buttons - bindString("title", "Account settings"); - - Wt::WPushButton *saveButton = new Wt::WPushButton("Apply"); - saveButton->setStyleClass("btn-primary"); - bindWidget("save-button", saveButton); - saveButton->clicked().connect(this, &AccountFormView::processSave); - - Wt::WPushButton *cancelButton = new Wt::WPushButton("Discard"); - bindWidget("cancel-button", cancelButton); - cancelButton->clicked().connect(this, &AccountFormView::processCancel); - - updateView(_model); - -} - - void -AccountFormView::processCancel() -{ - _applyInfo->show(); - - _applyInfo->setText( Wt::WString::fromUTF8("Parameters reverted!")); - _applyInfo->setStyleClass("alert alert-info"); - _model->loadData(); - - _model->validate(); - updateView(_model); -} - -void -AccountFormView::processSave() -{ - updateModel(_model); - - _applyInfo->show(); - if (_model->validate()) - { - Wt::WString error; - // commit model into DB - if (_model->saveData(error) ) - { - _applyInfo->setText( Wt::WString::fromUTF8("New parameters successfully applied!")); - _applyInfo->setStyleClass("alert alert-success"); - } - else - { - _applyInfo->setText( Wt::WString::fromUTF8("Cannot apply new parameters: ") + error); - _applyInfo->setStyleClass("alert alert-danger"); - } - } - else - { - _applyInfo->setText( Wt::WString::fromUTF8("Cannot apply new parameters!")); - _applyInfo->setStyleClass("alert alert-danger"); - } - updateView(_model); -} - -} // namespace Settings -} // namespace UserInterface diff --git a/src/ui/settings/SettingsAccountFormView.hpp b/src/ui/settings/SettingsAccountFormView.hpp deleted file mode 100644 index ebe02e5e..00000000 --- a/src/ui/settings/SettingsAccountFormView.hpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef UI_SETTINGS_ACCOUNT_FORM_VIEW_HPP -#define UI_SETTINGS_ACCOUNT_FORM_VIEW_HPP - -#include -#include -#include - -namespace UserInterface { -namespace Settings { - -class AccountFormModel; - -class AccountFormView : public Wt::WTemplateFormView -{ - public: - AccountFormView(std::string userId, Wt::WContainerWidget *parent = 0); - - private: - void processCancel(); // reload from DB - void processSave(); // commit into DB - - AccountFormModel* _model; - Wt::WText* _applyInfo; - -}; - -} // namespace Settings -} // namespace UserInterface - -#endif diff --git a/src/ui/settings/SettingsAudioFormView.cpp b/src/ui/settings/SettingsAudioFormView.cpp deleted file mode 100644 index 91c49015..00000000 --- a/src/ui/settings/SettingsAudioFormView.cpp +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include - -#include -#include -#include -#include - -#include "utils/Logger.hpp" - -#include "common/Validators.hpp" -#include "LmsApplication.hpp" - -#include "SettingsAudioFormView.hpp" - -namespace { -std::string encodingToString(Database::AudioEncoding encoding) -{ - - switch (encoding) - { - case Database::AudioEncoding::AUTO: return "Automatic"; - case Database::AudioEncoding::MP3: return "MP3"; - case Database::AudioEncoding::OGA: return "OGG"; - case Database::AudioEncoding::WEBMA: return "WebM"; - } - - return "?"; -} -} - -namespace UserInterface { -namespace Settings { - -class AudioFormModel : public Wt::WFormModel -{ - public: - - // Associate each field with a unique string literal. - static const Field BitrateField; - static const Field EncodingField; - - AudioFormModel(Wt::WObject *parent = 0) - : Wt::WFormModel(parent) - { - initializeModels(); - - addField(BitrateField); - addField(EncodingField); - - setValidator(BitrateField, new Wt::WValidator(true)); // mandatory - setValidator(EncodingField, new Wt::WValidator(true)); // mandatory - - // populate the model with initial data - loadData(); - } - - Wt::WAbstractItemModel *bitrateModel() { return _bitrateModel; } - Wt::WAbstractItemModel *encodingModel() { return _encodingModel; } - - void loadData() - { - Wt::Dbo::Transaction transaction(DboSession()); - - setValue(BitrateField, std::min(CurrentUser()->getMaxAudioBitrate(), CurrentUser()->getAudioBitrate()) / 1000); // in kps - int encodingRow = getAudioEncodingRow( CurrentUser()->getAudioEncoding()); - setValue(EncodingField, getAudioEncodingString(encodingRow)); - } - - bool saveData(Wt::WString& error) - { - // DBO transaction active here - try { - Wt::Dbo::Transaction transaction(DboSession()); - - // user may have been deleted by someone else - CurrentUser().modify()->setAudioBitrate( Wt::asNumber(value(BitrateField)) * 1000); // in kbps - - int encodingRow = getAudioEncodingRow( boost::any_cast(value((EncodingField)))); - CurrentUser().modify()->setAudioEncoding( getAudioEncodingValue(encodingRow)); - } - catch(Wt::Dbo::Exception& exception) - { - LMS_LOG(UI, ERROR) << "Dbo exception: " << exception.what(); - return false; - } - - return true; - } - - int getAudioEncodingRow( Database::AudioEncoding encoding) - { - for (int i = 0; i < _encodingModel->rowCount(); ++i) - { - if (getAudioEncodingValue(i) == encoding) - return i; - } - return -1; - } - - int getAudioEncodingRow( Wt::WString encoding) - { - for (int i = 0; i < _encodingModel->rowCount(); ++i) - { - if (getAudioEncodingString(i) == encoding) - return i; - } - return -1; - } - - Database::AudioEncoding getAudioEncodingValue(int row) - { - return boost::any_cast - (_encodingModel->data(_encodingModel->index(row, 0), Wt::UserRole)); - } - - Wt::WString getAudioEncodingString(int row) - { - return boost::any_cast - (_encodingModel->data(_encodingModel->index(row, 0), Wt::DisplayRole)); - } - - - private: - void initializeModels() - { - Wt::Dbo::Transaction transaction(DboSession()); - - _bitrateModel = new Wt::WStringListModel(this); - BOOST_FOREACH(std::size_t bitrate, Database::User::audioBitrates) - { - if (bitrate <= CurrentUser()->getMaxAudioBitrate()) - _bitrateModel->addString( Wt::WString("{1}").arg( bitrate / 1000 ) ); // in kbps - } - - _encodingModel = new Wt::WStringListModel(this); - int row = 0; - BOOST_FOREACH(Database::AudioEncoding encoding, Database::User::audioEncodings) - { - _encodingModel->addString(encodingToString(encoding)); - _encodingModel->setData(row, 0, encoding, Wt::UserRole); - row++; - } - } - - std::string _userId; - Wt::WStringListModel* _bitrateModel; - Wt::WStringListModel* _encodingModel; -}; - -const Wt::WFormModel::Field AudioFormModel::BitrateField = "bitrate"; -const Wt::WFormModel::Field AudioFormModel::EncodingField = "encoding"; - -AudioFormView::AudioFormView(Wt::WContainerWidget *parent) -: Wt::WTemplateFormView(parent) -{ - - _model = new AudioFormModel(this); - - setTemplateText(tr("settings-audio")); - addFunction("id", &WTemplate::Functions::id); - addFunction("block", &WTemplate::Functions::id); - - _applyInfo = new Wt::WText(); - _applyInfo->setInline(false); - _applyInfo->hide(); - bindWidget("apply-info", _applyInfo); - - // Bitrate - Wt::WComboBox *bitrateCB = new Wt::WComboBox(); - setFormWidget(AudioFormModel::BitrateField, bitrateCB); - bitrateCB->setStyleClass("span2"); - bitrateCB->setModel(_model->bitrateModel()); - bitrateCB->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Encoding - Wt::WComboBox *encodingCB = new Wt::WComboBox(); - setFormWidget(AudioFormModel::EncodingField, encodingCB); - encodingCB->setModel(_model->encodingModel()); - encodingCB->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Title & Buttons - bindString("title", "Audio settings"); - - Wt::WPushButton *saveButton = new Wt::WPushButton("Apply"); - saveButton->setStyleClass("btn-primary"); - bindWidget("save-button", saveButton); - saveButton->clicked().connect(this, &AudioFormView::processSave); - - Wt::WPushButton *cancelButton = new Wt::WPushButton("Discard"); - bindWidget("cancel-button", cancelButton); - cancelButton->clicked().connect(this, &AudioFormView::processCancel); - - updateView(_model); -} - -void -AudioFormView::processCancel() -{ - _applyInfo->show(); - - _applyInfo->setText( Wt::WString::fromUTF8("Parameters reverted!")); - _applyInfo->setStyleClass("alert alert-info"); - _model->loadData(); - - _model->validate(); - updateView(_model); -} - -void -AudioFormView::processSave() -{ - updateModel(_model); - - _applyInfo->show(); - if (_model->validate()) - { - Wt::WString error; - // commit model into DB - if (_model->saveData(error) ) - { - _applyInfo->setText( Wt::WString::fromUTF8("New parameters successfully applied!")); - _applyInfo->setStyleClass("alert alert-success"); - } - else - { - _applyInfo->setText( Wt::WString::fromUTF8("Cannot apply new parameters: ") + error); - _applyInfo->setStyleClass("alert alert-danger"); - } - } - else - { - _applyInfo->setText( Wt::WString::fromUTF8("Cannot apply new parameters!")); - _applyInfo->setStyleClass("alert alert-danger"); - } - updateView(_model); -} - -} // namespace Settings -} // namespace UserInterface diff --git a/src/ui/settings/SettingsAudioFormView.hpp b/src/ui/settings/SettingsAudioFormView.hpp deleted file mode 100644 index deed1ea6..00000000 --- a/src/ui/settings/SettingsAudioFormView.hpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef UI_SETTINGS_AUDIO_FORM_VIEW_HPP -#define UI_SETTINGS_AUDIO_ACCOUNT_FORM_VIEW_HPP - -#include -#include -#include - -namespace UserInterface { -namespace Settings { - -class AudioFormModel; - -class AudioFormView : public Wt::WTemplateFormView -{ - public: - AudioFormView(Wt::WContainerWidget *parent = 0); - - private: - void processCancel(); // reload from DB - void processSave(); // commit into DB - - AudioFormModel* _model; - Wt::WText* _applyInfo; - -}; - -} // namespace Settings -} // namespace UserInterface - -#endif diff --git a/src/ui/settings/SettingsDatabaseFormView.cpp b/src/ui/settings/SettingsDatabaseFormView.cpp deleted file mode 100644 index 1379d0d1..00000000 --- a/src/ui/settings/SettingsDatabaseFormView.cpp +++ /dev/null @@ -1,400 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "utils/Logger.hpp" - -#include "database/Setting.hpp" - -#include "common/DirectoryValidator.hpp" -#include "LmsApplication.hpp" - -#include "SettingsDatabaseFormView.hpp" - -namespace UserInterface { -namespace Settings { - -using namespace Database; - -class DatabaseFormModel : public Wt::WFormModel -{ - public: - // Associate each field with a unique string literal. - static const Field UpdatePeriodField; - static const Field UpdateStartTimeField; - static const Field AudioFileExtensionsField; - static const Field VideoFileExtensionsField; - static const Field TagsHighLevelAcousticBrainz; - static const Field TagsHighLevelAcousticBrainzMinProbability; - static const Field TagsSimilarityAcousticBrainz; - - DatabaseFormModel(Wt::WObject *parent = 0) - : Wt::WFormModel(parent) - { - initializeModels(); - - addField(UpdatePeriodField); - addField(UpdateStartTimeField); - addField(AudioFileExtensionsField); - addField(VideoFileExtensionsField); - addField(TagsHighLevelAcousticBrainz); - addField(TagsHighLevelAcousticBrainzMinProbability); - addField(TagsSimilarityAcousticBrainz); - - setValidator(UpdatePeriodField, createUpdatePeriodValidator()); - setValidator(UpdateStartTimeField, createStartTimeValidator()); - setValidator(AudioFileExtensionsField, createFileExtensionValidator()); - setValidator(VideoFileExtensionsField, createFileExtensionValidator()); - setValidator(TagsHighLevelAcousticBrainzMinProbability, createMinProbabilityValidator()); - - // populate the model with initial data - loadData(); - } - - Wt::WAbstractItemModel *updatePeriodModel() { return _updatePeriodModel; } - Wt::WAbstractItemModel *updateStartTimeModel() { return _updateStartTimeModel; } - - void loadData() - { - int periodRow = getUpdatePeriodModelRow( Setting::getString(DboSession(), "update_period")); - if (periodRow != -1) - setValue(UpdatePeriodField, updatePeriodDisplay(periodRow)); - - int startTimeRow = getUpdateStartTimeModelRow( Setting::getDuration(DboSession(), "update_start_time") ); - if (startTimeRow != -1) - setValue(UpdateStartTimeField, updateStartTime( startTimeRow ) ); - - setValue(AudioFileExtensionsField, Setting::getString(DboSession(), "audio_file_extensions")); - setValue(VideoFileExtensionsField, Setting::getString(DboSession(), "video_file_extensions")); - - setValue(TagsHighLevelAcousticBrainz, Setting::getBool(DboSession(), "tags_highlevel_acousticbrainz")); - setValue(TagsHighLevelAcousticBrainzMinProbability, Setting::getInt(DboSession(), "tags_highlevel_acousticbrainz_min_probability")); - setValue(TagsSimilarityAcousticBrainz, Setting::getBool(DboSession(), "tags_similarity_acousticbrainz")); - } - - void saveData() - { - int periodRow = getUpdatePeriodModelRow( boost::any_cast(value(UpdatePeriodField))); - assert(periodRow != -1); - Setting::setString(DboSession(), "update_period", updatePeriodSetting( periodRow ) ); - - int startTimeRow = getUpdateStartTimeModelRow( boost::any_cast(value(UpdateStartTimeField))); - assert(startTimeRow != -1); - Setting::setDuration(DboSession(), "update_start_time", updateStartTimeDuration( startTimeRow ) ); - - Setting::setString(DboSession(), "audio_file_extensions", boost::any_cast(value(AudioFileExtensionsField)).toUTF8()); - Setting::setString(DboSession(), "video_file_extensions", boost::any_cast(value(VideoFileExtensionsField)).toUTF8()); - - Setting::setBool(DboSession(), "tags_highlevel_acousticbrainz", boost::any_cast(value(TagsHighLevelAcousticBrainz))); - Setting::setInt(DboSession(), "tags_highlevel_acousticbrainz_min_probability", std::stoi(boost::any_cast(value(TagsHighLevelAcousticBrainzMinProbability)).toUTF8())); - Setting::setBool(DboSession(), "tags_similarity_acousticbrainz", boost::any_cast(value(TagsSimilarityAcousticBrainz))); - } - - void setImmediateScan() - { - Setting::setBool(DboSession(), "manual_scan_requested", true); - } - - int getUpdatePeriodModelRow(Wt::WString value) - { - for (int i = 0; i < _updatePeriodModel->rowCount(); ++i) - { - if (updatePeriodDisplay(i) == value) - return i; - } - return -1; - } - - int getUpdatePeriodModelRow(std::string value) - { - for (int i = 0; i < _updatePeriodModel->rowCount(); ++i) - { - if (updatePeriodSetting(i) == value) - return i; - } - - return -1; - } - - std::string updatePeriodSetting(int row) { - return boost::any_cast - (_updatePeriodModel->data(_updatePeriodModel->index(row, 0), Wt::UserRole)); - } - - Wt::WString updatePeriodDisplay(int row) { - return boost::any_cast - (_updatePeriodModel->data(_updatePeriodModel->index(row, 0), Wt::DisplayRole)); - } - - - int getUpdateStartTimeModelRow(Wt::WString value) - { - for (int i = 0; i < _updateStartTimeModel->rowCount(); ++i) - { - if (updateStartTime(i) == value) - return i; - } - - return -1; - } - - int getUpdateStartTimeModelRow(boost::posix_time::time_duration duration) - { - for (int i = 0; i < _updateStartTimeModel->rowCount(); ++i) - { - if (updateStartTimeDuration(i) == duration) - return i; - } - - return -1; - } - - boost::posix_time::time_duration updateStartTimeDuration(int row) { - return boost::any_cast - (_updateStartTimeModel->data(_updateStartTimeModel->index(row, 0), Wt::UserRole)); - } - - Wt::WString updateStartTime(int row) { - return boost::any_cast - (_updateStartTimeModel->data(_updateStartTimeModel->index(row, 0), Wt::DisplayRole)); - } - - - private: - - void initializeModels() { - - _updatePeriodModel = new Wt::WStringListModel(this); - - _updatePeriodModel->addString("Never"); - _updatePeriodModel->setData(0, 0, std::string("never"), Wt::UserRole); - - _updatePeriodModel->addString("Daily"); - _updatePeriodModel->setData(1, 0, std::string("daily"), Wt::UserRole); - - _updatePeriodModel->addString("Weekly"); - _updatePeriodModel->setData(2, 0, std::string("weekly"), Wt::UserRole); - - _updatePeriodModel->addString("Monthly"); - _updatePeriodModel->setData(3, 0, std::string("monthly"), Wt::UserRole); - - _updateStartTimeModel = new Wt::WStringListModel(this); - - for (std::size_t i = 0; i < 24; ++i) - { - boost::posix_time::time_duration dur = boost::posix_time::hours(i); - - boost::posix_time::time_facet* facet = new boost::posix_time::time_facet("%H:%M"); - facet->time_duration_format("%H:%M"); - - std::ostringstream oss; - oss.imbue(std::locale(oss.getloc(), facet)); - - oss << dur; - - _updateStartTimeModel->addString( oss.str() ); - _updateStartTimeModel->setData(i, 0, dur, Wt::UserRole); - } - - } - - Wt::WValidator *createUpdatePeriodValidator() - { - Wt::WValidator* v = new Wt::WValidator(); - v->setMandatory(true); - return v; - } - - Wt::WValidator *createStartTimeValidator() - { - Wt::WValidator* v = new Wt::WValidator(); - v->setMandatory(true); - return v; - } - - Wt::WValidator *createFileExtensionValidator() - { - Wt::WRegExpValidator *v = new Wt::WRegExpValidator("(?:\\.\\w+(?:\\s*))+"); - return v; - } - - Wt::WValidator *createMinProbabilityValidator() - { - Wt::WIntValidator *v = new Wt::WIntValidator(50, 100); - v->setMandatory(true); - return v; - } - - Wt::WStringListModel* _updatePeriodModel; - Wt::WStringListModel* _updateStartTimeModel; - -}; - -const Wt::WFormModel::Field DatabaseFormModel::UpdatePeriodField = "update-period"; -const Wt::WFormModel::Field DatabaseFormModel::UpdateStartTimeField = "update-start-time"; -const Wt::WFormModel::Field DatabaseFormModel::AudioFileExtensionsField = "audio-file-extensions"; -const Wt::WFormModel::Field DatabaseFormModel::VideoFileExtensionsField = "video-file-extensions"; -const Wt::WFormModel::Field DatabaseFormModel::TagsHighLevelAcousticBrainz = "tags-highlevel-acousticbrainz"; -const Wt::WFormModel::Field DatabaseFormModel::TagsHighLevelAcousticBrainzMinProbability = "tags-highlevel-acousticbrainz-min-probability"; -const Wt::WFormModel::Field DatabaseFormModel::TagsSimilarityAcousticBrainz = "tags-similarity-acousticbrainz"; - - -DatabaseFormView::DatabaseFormView(Wt::WContainerWidget *parent) -: Wt::WTemplateFormView(parent) -{ - _model = new DatabaseFormModel(this); - - setTemplateText(tr("settings-database")); - addFunction("id", &WTemplate::Functions::id); - addFunction("block", &WTemplate::Functions::id); - - _applyInfo = new Wt::WText(); - _applyInfo->setInline(false); - _applyInfo->hide(); - bindWidget("apply-info", _applyInfo); - - // Update Period - Wt::WComboBox *updatePeriodCB = new Wt::WComboBox(); - setFormWidget(DatabaseFormModel::UpdatePeriodField, updatePeriodCB); - updatePeriodCB->setModel(_model->updatePeriodModel()); - updatePeriodCB->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Update Start Time - Wt::WComboBox *updateStartTimeCB = new Wt::WComboBox(); - setFormWidget(DatabaseFormModel::UpdateStartTimeField, updateStartTimeCB); - updateStartTimeCB->setModel(_model->updateStartTimeModel()); - updateStartTimeCB->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Audio file extensions - Wt::WLineEdit *audioFileExtensionsEdit = new Wt::WLineEdit(); - setFormWidget(DatabaseFormModel::AudioFileExtensionsField, audioFileExtensionsEdit); - audioFileExtensionsEdit->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Video file extensions - Wt::WLineEdit *videoFileExtensionsEdit = new Wt::WLineEdit(); - setFormWidget(DatabaseFormModel::VideoFileExtensionsField, videoFileExtensionsEdit); - videoFileExtensionsEdit->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Tags from AB high level - Wt::WCheckBox* highLevel = new Wt::WCheckBox(); - setFormWidget(DatabaseFormModel::TagsHighLevelAcousticBrainz, highLevel); - - setFormWidget(DatabaseFormModel::TagsHighLevelAcousticBrainzMinProbability, new Wt::WSpinBox()); - - highLevel->changed().connect(std::bind([=] { - _model->setReadOnly(DatabaseFormModel::TagsHighLevelAcousticBrainzMinProbability, - !(highLevel->checkState() == Wt::Checked)); - updateModel(_model); - updateViewField(_model, DatabaseFormModel::TagsHighLevelAcousticBrainzMinProbability); - })); - - // Tags from AB similarity - setFormWidget(DatabaseFormModel::TagsSimilarityAcousticBrainz, new Wt::WCheckBox()); - - // Title & Buttons - bindString("scan-title", "Scan settings"); - bindString("tags-title", "Tag settings"); - - Wt::WPushButton *saveButton = new Wt::WPushButton("Apply"); - bindWidget("apply-button", saveButton); - saveButton->setStyleClass("btn-primary"); - - Wt::WPushButton *discardButton = new Wt::WPushButton("Discard"); - bindWidget("discard-button", discardButton); - - saveButton->clicked().connect(this, &DatabaseFormView::processSave); - discardButton->clicked().connect(this, &DatabaseFormView::processDiscard); - - Wt::WPushButton *immediateScanButton = new Wt::WPushButton("Immediate scan"); - immediateScanButton->setStyleClass("btn-warning"); - bindWidget("immediate-scan-button", immediateScanButton); - immediateScanButton->clicked().connect(this, &DatabaseFormView::processImmediateScan); - - updateView(_model); - -} - -void -DatabaseFormView::processImmediateScan() -{ - - _model->setImmediateScan(); - - _applyInfo->setText( Wt::WString::fromUTF8("Media folder scan has been started!" ) ); - _applyInfo->setStyleClass("alert alert-warning"); - _applyInfo->show(); - - _sigChanged.emit(); -} - -void -DatabaseFormView::processDiscard() -{ - _applyInfo->show(); - - _applyInfo->setText( Wt::WString::fromUTF8("Parameters reverted!")); - _applyInfo->setStyleClass("alert alert-info"); - - _model->loadData(); - - _model->validate(); - updateView(_model); -} - -void -DatabaseFormView::processSave() -{ - updateModel(_model); - - _applyInfo->show(); - - if (_model->validate()) { - // Make the model to commit data into DB - _model->saveData(); - - _sigChanged.emit(); - - _applyInfo->setText( Wt::WString::fromUTF8("New parameters successfully applied!")); - _applyInfo->setStyleClass("alert alert-success"); - } - else { - _applyInfo->setText( Wt::WString::fromUTF8("Cannot apply new parameters!")); - _applyInfo->setStyleClass("alert alert-danger"); - } - // Udate the view: Delete any validation message in the view, etc. - updateView(_model); -} - - -} // namespace Settings -} // namespace UserInterface - - diff --git a/src/ui/settings/SettingsDatabaseFormView.hpp b/src/ui/settings/SettingsDatabaseFormView.hpp deleted file mode 100644 index 23585fdb..00000000 --- a/src/ui/settings/SettingsDatabaseFormView.hpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef UI_SETTINGS_DB_FORM_VIEW_HPP -#define UI_SETTINGS_DB_FORM_VIEW_HPP - -#include -#include -#include -#include - -namespace UserInterface { -namespace Settings { - -class DatabaseFormModel; - -class DatabaseFormView : public Wt::WTemplateFormView -{ - public: - DatabaseFormView(Wt::WContainerWidget *parent = 0); - - Wt::Signal& changed() { return _sigChanged; } - - private: - - Wt::Signal _sigChanged; - - void processSave(); - void processDiscard(); - void processImmediateScan(); - - Wt::WText *_applyInfo; - DatabaseFormModel *_model; - -}; - - -} // namespace Settings -} // namespace UserInterface - -#endif - diff --git a/src/ui/settings/SettingsFirstConnectionFormView.cpp b/src/ui/settings/SettingsFirstConnectionFormView.cpp deleted file mode 100644 index c6873079..00000000 --- a/src/ui/settings/SettingsFirstConnectionFormView.cpp +++ /dev/null @@ -1,229 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include - -#include -#include -#include -#include - -#include "utils/Logger.hpp" - -#include "common/Validators.hpp" -#include "LmsApplication.hpp" - -#include "SettingsFirstConnectionFormView.hpp" - -namespace UserInterface { -namespace Settings { - -class FirstConnectionFormModel : public Wt::WFormModel -{ - public: - - // Associate each field with a unique string literal. - static const Field NameField; - static const Field EmailField; - static const Field PasswordField; - static const Field PasswordConfirmField; - - FirstConnectionFormModel(Wt::WObject *parent = 0) - : Wt::WFormModel(parent) - { - addField(NameField); - addField(EmailField); - addField(PasswordField); - addField(PasswordConfirmField); - - setValidator(NameField, createNameValidator()); - setValidator(EmailField, createEmailValidator()); - - } - - bool saveData(Wt::WString& error) - { - // DBO transaction active here - try { - Wt::Dbo::Transaction transaction(DboSession()); - - // Check if a user already exist - // If it's the case, just do nothing - if (!Database::User::getAll(DboSession()).empty()) - { - LMS_LOG(UI, ERROR) << "Admin user already created"; - error = Wt::WString("Admin user already created!"); - return false; - } - - // Create user - Wt::Auth::User authUser = DbHandler().getUserDatabase().registerNew(); - Database::User::pointer user = DbHandler().getUser(authUser); - - // Account - authUser.setIdentity(Wt::Auth::Identity::LoginName, valueText(NameField)); - authUser.setEmail(valueText(EmailField).toUTF8()); - Database::Handler::getPasswordService().updatePassword(authUser, valueText(PasswordField)); - - user.modify()->setAdmin( true ); - - } - catch(Wt::Dbo::Exception& exception) - { - LMS_LOG(UI, ERROR) << "Dbo exception: " << exception.what(); - error = Wt::WString(exception.what()); - return false; - } - - return true; - } - - bool validateField(Field field) - { - // DBO transaction active here - - Wt::WString error; - - if (field == PasswordField) - { - // Password is mandatory if we create the user - if (!valueText(PasswordField).empty()) - { - // Evaluate the strength of the password - Wt::Auth::AbstractPasswordService::StrengthValidatorResult res - = Database::Handler::getPasswordService().strengthValidator()->evaluateStrength(valueText(PasswordField), - valueText(NameField), - valueText(EmailField).toUTF8()); - - if (!res.isValid()) - error = res.message(); - } - else - return Wt::WFormModel::validateField(field); - } - else if (field == PasswordConfirmField) - { - if (validation(PasswordField).state() == Wt::WValidator::Valid) - { - if (valueText(PasswordField) != valueText(PasswordConfirmField)) - error = Wt::WString::tr("Wt.Auth.passwords-dont-match"); - } - } - else - { - // Apply validators - return Wt::WFormModel::validateField(field); - } - - setValidation(field, Wt::WValidator::Result( error.empty() ? Wt::WValidator::Valid : Wt::WValidator::Invalid, error)); - - return validation(field).state() == Wt::WValidator::Valid; - } - - - private: - -}; - -const Wt::WFormModel::Field FirstConnectionFormModel::NameField = "name"; -const Wt::WFormModel::Field FirstConnectionFormModel::EmailField = "email"; -const Wt::WFormModel::Field FirstConnectionFormModel::PasswordField = "password"; -const Wt::WFormModel::Field FirstConnectionFormModel::PasswordConfirmField = "password-confirm"; - -FirstConnectionFormView::FirstConnectionFormView(Wt::WContainerWidget *parent) -: Wt::WTemplateFormView(parent) -{ - - _model = new FirstConnectionFormModel(this); - - setTemplateText(tr("settings-first-connection")); - addFunction("id", &WTemplate::Functions::id); - addFunction("block", &WTemplate::Functions::id); - - _applyInfo = new Wt::WText(); - _applyInfo->setInline(false); - _applyInfo->hide(); - bindWidget("apply-info", _applyInfo); - - // Name - Wt::WLineEdit* accountEdit = new Wt::WLineEdit(); - setFormWidget(FirstConnectionFormModel::NameField, accountEdit); - accountEdit->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Email - Wt::WLineEdit* emailEdit = new Wt::WLineEdit(); - setFormWidget(FirstConnectionFormModel::EmailField, emailEdit); - emailEdit->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Password - Wt::WLineEdit* passwordEdit = new Wt::WLineEdit(); - setFormWidget(FirstConnectionFormModel::PasswordField, passwordEdit ); - passwordEdit->setEchoMode(Wt::WLineEdit::Password); - passwordEdit->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Password confirmation - Wt::WLineEdit* passwordConfirmEdit = new Wt::WLineEdit(); - setFormWidget(FirstConnectionFormModel::PasswordConfirmField, passwordConfirmEdit); - passwordConfirmEdit->setEchoMode(Wt::WLineEdit::Password); - passwordConfirmEdit->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Title & Buttons - bindString("title", "Create Admin account"); - - _saveButton = new Wt::WPushButton("Create"); - _saveButton->setStyleClass("btn-primary"); - bindWidget("save-button", _saveButton); - _saveButton->clicked().connect(this, &FirstConnectionFormView::processSave); - - updateView(_model); - -} - -void -FirstConnectionFormView::processSave() -{ - updateModel(_model); - - _applyInfo->show(); - if (_model->validate()) - { - Wt::WString error; - // commit model into DB - if (_model->saveData(error) ) - { - _applyInfo->setText( Wt::WString::fromUTF8("New parameters successfully applied! Please refresh this page in order to login")); - _applyInfo->setStyleClass("alert alert-success"); - _saveButton->hide(); - } - else - { - _applyInfo->setText( Wt::WString::fromUTF8("Cannot apply new parameters: ") + error); - _applyInfo->setStyleClass("alert alert-danger"); - } - } - else - { - _applyInfo->setText( Wt::WString::fromUTF8("Cannot apply new parameters!")); - _applyInfo->setStyleClass("alert alert-danger"); - } - updateView(_model); -} - -} // namespace Settings -} // namespace UserInterface diff --git a/src/ui/settings/SettingsFirstConnectionFormView.hpp b/src/ui/settings/SettingsFirstConnectionFormView.hpp deleted file mode 100644 index 1761c192..00000000 --- a/src/ui/settings/SettingsFirstConnectionFormView.hpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef UI_SETTINGS_FIRST_CONNECTION_FORM_VIEW_HPP -#define UI_SETTINGS_FIRST_CONNECTION_FORM_VIEW_HPP - -#include -#include -#include -#include - -namespace UserInterface { -namespace Settings { - -class FirstConnectionFormModel; - -class FirstConnectionFormView : public Wt::WTemplateFormView -{ - public: - FirstConnectionFormView(Wt::WContainerWidget *parent = 0); - - private: - - void processSave(); - - Wt::WPushButton* _saveButton; - FirstConnectionFormModel* _model; - Wt::WText* _applyInfo; - -}; - - -} // namespace Settings -} // namespace UserInterface - -#endif diff --git a/src/ui/settings/SettingsMediaDirectories.cpp b/src/ui/settings/SettingsMediaDirectories.cpp deleted file mode 100644 index d9b75a20..00000000 --- a/src/ui/settings/SettingsMediaDirectories.cpp +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include -#include -#include -#include - -#include "database/MediaDirectory.hpp" - -#include "LmsApplication.hpp" - -#include "SettingsMediaDirectoryFormView.hpp" - -#include "SettingsMediaDirectories.hpp" - -namespace UserInterface { -namespace Settings { - -MediaDirectories::MediaDirectories(Wt::WContainerWidget *parent) -: Wt::WContainerWidget(parent) -{ - // Stack two widgets: - _stack = new Wt::WStackedWidget(this); - - // 1/ the media directory table view - { - Wt::WGroupBox *container = new Wt::WGroupBox("Media Folders", _stack); - - _table = new Wt::WTable(container); - - _table->addStyleClass("table form-inline"); - - _table->toggleStyleClass("table-hover", true); - _table->toggleStyleClass("table-striped", true); - - _table->setHeaderCount(1); - - _table->elementAt(0, 0)->addWidget(new Wt::WText("#")); - _table->elementAt(0, 1)->addWidget(new Wt::WText("Path")); - _table->elementAt(0, 2)->addWidget(new Wt::WText("Type")); - - Wt::WPushButton* addBtn = new Wt::WPushButton("Add Folder"); - addBtn->setStyleClass("btn-success"); - container->addWidget( addBtn ); - addBtn->clicked().connect(boost::bind(&MediaDirectories::handleCreateMediaDirectory, this)); - } - - refresh(); -} - -void -MediaDirectories::refresh(void) -{ - - assert(_table->rowCount() > 0); - for (int i = _table->rowCount() - 1; i > 0; --i) - _table->deleteRow(i); - - Wt::Dbo::Transaction transaction(DboSession()); - - std::vector mediaDirectories = Database::MediaDirectory::getAll(DboSession()); - - std::size_t id = 1; - BOOST_FOREACH(Database::MediaDirectory::pointer mediaDirectory, mediaDirectories) - { - _table->elementAt(id, 0)->addWidget(new Wt::WText( Wt::WString::fromUTF8("{1}").arg(id))); - _table->elementAt(id, 1)->addWidget(new Wt::WText( Wt::WString::fromUTF8(mediaDirectory->getPath().string()) )); - - Wt::WString dirType; - switch(mediaDirectory->getType()) - { - case Database::MediaDirectory::Video: dirType = "Video"; break; - case Database::MediaDirectory::Audio: dirType = "Audio"; break; - } - - _table->elementAt(id, 2)->addWidget( new Wt::WText( dirType )); - - Wt::WPushButton* delBtn = new Wt::WPushButton("Delete"); - delBtn->setStyleClass("btn-danger"); - _table->elementAt(id, 3)->addWidget(delBtn); - delBtn->clicked().connect(boost::bind( &MediaDirectories::handleDelMediaDirectory, this, mediaDirectory->getPath(), mediaDirectory->getType() ) ); - - ++id; - } -} - -void -MediaDirectories::handleDelMediaDirectory(boost::filesystem::path p, Database::MediaDirectory::Type type) -{ - Wt::WMessageBox *messageBox = new Wt::WMessageBox - ("Delete Folder", - Wt::WString( "Deleting folder '{1}'?").arg(p.string()), - Wt::Question, Wt::Yes | Wt::No); - - messageBox->setModal(true); - - messageBox->buttonClicked().connect(std::bind([=] () { - if (messageBox->buttonResult() == Wt::Yes) - { - { - Wt::Dbo::Transaction transaction(DboSession()); - - // Delete the media diretory - Database::MediaDirectory::pointer mediaDirectory = Database::MediaDirectory::get(DboSession(), p, type); - if (mediaDirectory) - mediaDirectory.remove(); - } - - refresh(); - - // Emit something changed in the settings - _sigChanged.emit(); - } - - delete messageBox; - })); - - messageBox->show(); - -} - -void -MediaDirectories::handleCreateMediaDirectory(void) -{ - assert(_stack->count() == 1); - - MediaDirectoryFormView* formView = new MediaDirectoryFormView(_stack); - formView->completed().connect(this, &MediaDirectories::handleMediaDirectoryFormCompleted); - - _stack->setCurrentIndex(1); -} - -void -MediaDirectories::handleMediaDirectoryFormCompleted(bool changed) -{ - _stack->setCurrentIndex(0); - - if (changed) - { - // Refresh the user table if a change has been made - refresh(); - - // Emit something changed in the settings - _sigChanged.emit(); - } - - // Delete the form view - delete _stack->widget(1); - -} - -} // namespace UserInterface -} // namespace Settings - - diff --git a/src/ui/settings/SettingsMediaDirectories.hpp b/src/ui/settings/SettingsMediaDirectories.hpp deleted file mode 100644 index 4fb2bdf8..00000000 --- a/src/ui/settings/SettingsMediaDirectories.hpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef UI_SETTINGS_MEDIA_DIRECTORIES_HPP -#define UI_SETTINGS_MEDIA_DIRECTORIES_HPP - -#include -#include -#include -#include - -#include "database/MediaDirectory.hpp" - -namespace UserInterface { -namespace Settings { - -class MediaDirectories : public Wt::WContainerWidget -{ - public: - MediaDirectories(Wt::WContainerWidget *parent = 0); - - void refresh(); - - Wt::Signal& changed() { return _sigChanged; } - - private: - - Wt::Signal _sigChanged; - - void handleMediaDirectoryFormCompleted(bool changed); - - void handleDelMediaDirectory(boost::filesystem::path p, Database::MediaDirectory::Type type); - void handleCreateMediaDirectory(void); - - Wt::WStackedWidget* _stack; - Wt::WTable* _table; -}; - -} // namespace UserInterface -} // namespace Settings - -#endif - diff --git a/src/ui/settings/SettingsMediaDirectoryFormView.cpp b/src/ui/settings/SettingsMediaDirectoryFormView.cpp deleted file mode 100644 index a9e4a2f9..00000000 --- a/src/ui/settings/SettingsMediaDirectoryFormView.cpp +++ /dev/null @@ -1,185 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include - -#include -#include -#include -#include -#include - -#include "utils/Logger.hpp" - -#include "database/MediaDirectory.hpp" - -#include "common/DirectoryValidator.hpp" -#include "LmsApplication.hpp" - -#include "SettingsMediaDirectoryFormView.hpp" - -namespace UserInterface { -namespace Settings { - -// TODO validate if directory already exists -class MediaDirectoryFormModel : public Wt::WFormModel -{ - public: - - // Associate each field with a unique string literal. - static const Field PathField; - static const Field TypeField; - - MediaDirectoryFormModel(Wt::WObject *parent = 0) - : Wt::WFormModel(parent) - { - initializeModels(); - - addField(PathField); - addField(TypeField); - - DirectoryValidator* dirValidator = new DirectoryValidator(); - dirValidator->setMandatory(true); - setValidator(PathField, dirValidator); - setValidator(TypeField, new Wt::WValidator(true)); // mandatory - - } - - Wt::WAbstractItemModel *typeModel() { return _typeModel; } - - bool saveData(Wt::WString& error) - { - try { - Wt::Dbo::Transaction transaction(DboSession()); - - Database::MediaDirectory::Type type - = (valueText(TypeField) == "Audio") ? Database::MediaDirectory::Audio : Database::MediaDirectory::Video; - - if (Database::MediaDirectory::get(DboSession(), valueText(PathField).toUTF8(), type)) - { - error = "This Path/Type already exists!"; - return false; - } - - Database::MediaDirectory::create(DboSession(), valueText(PathField).toUTF8(), type); - - } - catch(Wt::Dbo::Exception& exception) - { - LMS_LOG(UI, ERROR) << "Dbo exception: " << exception.what(); - return false; - } - - return true; - } - - private: - void initializeModels() - { - _typeModel = new Wt::WStringListModel(this); - _typeModel->addString("Audio"); - _typeModel->addString("Video"); - } - - std::string _userId; - Wt::WStringListModel* _typeModel; -}; - -const Wt::WFormModel::Field MediaDirectoryFormModel::PathField = "path"; -const Wt::WFormModel::Field MediaDirectoryFormModel::TypeField = "type"; - -MediaDirectoryFormView::MediaDirectoryFormView(Wt::WContainerWidget *parent) -: Wt::WTemplateFormView(parent) -{ - - _model = new MediaDirectoryFormModel(this); - - setTemplateText(tr("settings-new-media-directory")); - addFunction("id", &WTemplate::Functions::id); - addFunction("block", &WTemplate::Functions::id); - - _applyInfo = new Wt::WText(); - _applyInfo->setInline(false); - _applyInfo->hide(); - bindWidget("apply-info", _applyInfo); - - // Path - Wt::WLineEdit* pathEdit = new Wt::WLineEdit(); - setFormWidget(MediaDirectoryFormModel::PathField, pathEdit); - pathEdit->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Type - Wt::WComboBox *typeCB = new Wt::WComboBox(); - setFormWidget(MediaDirectoryFormModel::TypeField, typeCB); - typeCB->setModel(_model->typeModel()); - typeCB->changed().connect(_applyInfo, &Wt::WWidget::hide); - - // Title & Buttons - bindString("title", "Add media folder"); - - Wt::WPushButton *saveButton = new Wt::WPushButton("Add"); - saveButton->setStyleClass("btn-primary"); - bindWidget("save-button", saveButton); - saveButton->clicked().connect(this, &MediaDirectoryFormView::processSave); - - Wt::WPushButton *cancelButton = new Wt::WPushButton("Cancel"); - bindWidget("cancel-button", cancelButton); - cancelButton->clicked().connect(this, &MediaDirectoryFormView::processCancel); - - updateView(_model); -} - -void -MediaDirectoryFormView::processCancel() -{ - // parent widget will delete this widget - completed().emit(false); -} - -void -MediaDirectoryFormView::processSave() -{ - updateModel(_model); - - _applyInfo->show(); - if (_model->validate()) - { - Wt::WString error; - // commit model into DB - if (_model->saveData(error) ) { - completed().emit(true); - return; - } - else - { - _applyInfo->setText( Wt::WString::fromUTF8("Cannot apply new parameters: ") + error); - _applyInfo->setStyleClass("alert alert-danger"); - } - } - else - { - _applyInfo->setText( Wt::WString::fromUTF8("Cannot apply new parameters!")); - _applyInfo->setStyleClass("alert alert-danger"); - } - - updateView(_model); -} - -} // namespace Settings -} // namespace UserInterface diff --git a/src/ui/settings/SettingsMediaDirectoryFormView.hpp b/src/ui/settings/SettingsMediaDirectoryFormView.hpp deleted file mode 100644 index 29554c74..00000000 --- a/src/ui/settings/SettingsMediaDirectoryFormView.hpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef UI_SETTINGS_MEDIA_DIR_FORM_VIEW_HPP -#define UI_SETTINGS_MEDIA_DIR_FORM_VIEW_HPP - -#include -#include -#include -#include - -namespace UserInterface { -namespace Settings { - -class MediaDirectoryFormModel; - -class MediaDirectoryFormView : public Wt::WTemplateFormView -{ - public: - MediaDirectoryFormView(Wt::WContainerWidget *parent = 0); - - // Signal emitted once the form is completed - Wt::Signal& completed() { return _sigCompleted; } - - private: - void processCancel(); // reload from DB - void processSave(); // commit into DB - - Wt::Signal _sigCompleted; - MediaDirectoryFormModel* _model; - Wt::WText* _applyInfo; - -}; - -} // namespace Settings -} // namespace UserInterface - -#endif diff --git a/src/ui/settings/SettingsUserFormView.cpp b/src/ui/settings/SettingsUserFormView.cpp deleted file mode 100644 index fc3224dd..00000000 --- a/src/ui/settings/SettingsUserFormView.cpp +++ /dev/null @@ -1,411 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "utils/Logger.hpp" - -#include "common/Validators.hpp" -#include "LmsApplication.hpp" - -#include "SettingsUserFormView.hpp" - - -namespace UserInterface { -namespace Settings { - -class UserFormModel : public Wt::WFormModel -{ - public: - - // Associate each field with a unique string literal. - static const Field NameField; - static const Field EmailField; - static const Field PasswordField; - static const Field PasswordConfirmField; - static const Field AdminField; - static const Field AudioBitrateLimitField; - static const Field VideoBitrateLimitField; - - UserFormModel(std::string userId, Wt::WObject *parent = 0) - : Wt::WFormModel(parent), - _userId(userId) - { - initializeModels(); - - addField(NameField); - addField(EmailField); - addField(PasswordField); - addField(PasswordConfirmField); - addField(AdminField); - addField(AudioBitrateLimitField); - addField(VideoBitrateLimitField); - - setValidator(NameField, createNameValidator()); - setValidator(EmailField, createEmailValidator()); - // If creating a user, passwords are mandatory - if (_userId.empty()) - { - setValidator(PasswordField, new Wt::WValidator(true)); // mandatory - setValidator(PasswordConfirmField, new Wt::WValidator(true)); // mandatory - } - setValidator(AudioBitrateLimitField, new Wt::WValidator(true)); // mandatory - setValidator(VideoBitrateLimitField, new Wt::WValidator(true)); // mandatory - - // populate the model with initial data - loadData(userId); - } - - Wt::WAbstractItemModel *audioBitrateModel() { return _audioBitrateModel; } - Wt::WAbstractItemModel *videoBitrateModel() { return _videoBitrateModel; } - - void loadData(std::string userId) - { - - if (!userId.empty()) - { - Wt::Dbo::Transaction transaction(DboSession()); - - Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId( userId ); - Database::User::pointer user = DbHandler().getUser(authUser); - - Wt::Auth::User currentUser = CurrentAuthUser(); - - if (user && authUser.isValid()) - { - if (user->isAdmin()) - { - setValue(AdminField, true); - - // We can cannot remove admin rights to ourselves - if (currentUser == authUser) - setReadOnly(AdminField, true); - - // if the user is admin, no need to limit it - setReadOnly(AudioBitrateLimitField, true); - setValidator(AudioBitrateLimitField, nullptr); - - setReadOnly(VideoBitrateLimitField, true); - setValidator(VideoBitrateLimitField, nullptr); - } - else - { - setValue(AudioBitrateLimitField, user->getMaxAudioBitrate() / 1000); // in kbps - setValue(VideoBitrateLimitField, user->getMaxVideoBitrate() / 1000); // in kbps - } - - setValue(NameField, authUser.identity(Wt::Auth::Identity::LoginName)); - if (!authUser.email().empty()) - setValue(EmailField, authUser.email()); - else - setValue(EmailField, authUser.unverifiedEmail()); - } - } - } - - bool saveData() - { - try { - Wt::Dbo::Transaction transaction(DboSession()); - - if (_userId.empty()) - { - // Create user - Wt::Auth::User authUser = DbHandler().getUserDatabase().registerNew(); - Database::User::pointer user = DbHandler().getUser(authUser); - - // Account - authUser.setIdentity(Wt::Auth::Identity::LoginName, valueText(NameField)); - authUser.setEmail(valueText(EmailField).toUTF8()); - Database::Handler::getPasswordService().updatePassword(authUser, valueText(PasswordField)); - - // Access - { - boost::any v = value(AdminField); - if (!v.empty() && boost::any_cast(v) == true) - user.modify()->setAdmin( true ); - else - user.modify()->setAdmin( false ); - } - - if (!isReadOnly(AudioBitrateLimitField)) - user.modify()->setMaxAudioBitrate( Wt::asNumber(value(AudioBitrateLimitField)) * 1000); // in bps - - if (!isReadOnly(VideoBitrateLimitField)) - user.modify()->setMaxVideoBitrate( Wt::asNumber(value(VideoBitrateLimitField)) * 1000); // in bps - - transaction.commit(); - } - else - { - // Update user - Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId(_userId); - Database::User::pointer user = DbHandler().getUser( authUser ); - - // user may have been deleted by someone else - if (!authUser.isValid()) { - LMS_LOG(UI, ERROR) << "user identity does not exist!"; - return false; - } - else if(!user) - { - LMS_LOG(UI, ERROR) << "User not found!"; - return false; - } - - // Account - authUser.setIdentity(Wt::Auth::Identity::LoginName, valueText(NameField)); - authUser.setEmail(valueText(EmailField).toUTF8()); - - // Password - if (!valueText(PasswordField).empty()) - Database::Handler::getPasswordService().updatePassword(authUser, valueText(PasswordField)); - - // Access - if (!isReadOnly(AdminField)) - { - boost::any v = value(AdminField); - if (!v.empty() && boost::any_cast(v) == true) - user.modify()->setAdmin( true ); - else - user.modify()->setAdmin( false ); - } - - if (!isReadOnly(AudioBitrateLimitField)) - user.modify()->setMaxAudioBitrate( Wt::asNumber(value(AudioBitrateLimitField)) * 1000); // in bps - - if (!isReadOnly(VideoBitrateLimitField)) - user.modify()->setMaxVideoBitrate( Wt::asNumber(value(VideoBitrateLimitField)) * 1000); // in bps - - transaction.commit(); - } - } - catch(Wt::Dbo::Exception& exception) - { - LMS_LOG(UI, ERROR) << "Dbo exception: " << exception.what(); - return false; - } - - return true; - } - - bool validateField(Field field) - { - Wt::WString error; - - if (field == NameField) - { - Wt::Dbo::Transaction transaction(DboSession()); - // Must be unique since used as LoginIdentity - Wt::Auth::User user = DbHandler().getUserDatabase().findWithIdentity(Wt::Auth::Identity::LoginName, valueText(field)); - if (user.isValid() && user.id() != _userId) - error = "Already exists"; - else - return Wt::WFormModel::validateField(field); - } - else if (field == PasswordField) - { - // Password is mandatory if we create the user - if (!valueText(PasswordField).empty()) - { - // Evaluate the strength of the password - Wt::Auth::AbstractPasswordService::StrengthValidatorResult res - = Database::Handler::getPasswordService().strengthValidator()->evaluateStrength(valueText(PasswordField), - valueText(NameField), - valueText(EmailField).toUTF8()); - - if (!res.isValid()) - error = res.message(); - } - else - return Wt::WFormModel::validateField(field); - } - else if (field == PasswordConfirmField) - { - if (validation(PasswordField).state() == Wt::WValidator::Valid) - { - if (valueText(PasswordField) != valueText(PasswordConfirmField)) - error = Wt::WString::tr("Wt.Auth.passwords-dont-match"); - } - } - else - { - // Apply validators - return Wt::WFormModel::validateField(field); - } - - setValidation(field, Wt::WValidator::Result( error.empty() ? Wt::WValidator::Valid : Wt::WValidator::Invalid, error)); - - return validation(field).state() == Wt::WValidator::Valid; - } - - - private: - - void initializeModels() - { - // AUDIO - _audioBitrateModel = new Wt::WStringListModel(this); - BOOST_FOREACH(std::size_t bitrate, Database::User::audioBitrates) - _audioBitrateModel->addString( Wt::WString("{1}").arg( bitrate / 1000 ) ); // in kbps - - // VIDEO - _videoBitrateModel = new Wt::WStringListModel(this); - BOOST_FOREACH(std::size_t bitrate, Database::User::videoBitrates) - _videoBitrateModel->addString( Wt::WString("{1}").arg( bitrate / 1000 ) ); // in kbps - - } - - std::string _userId; - Wt::WStringListModel* _audioBitrateModel; - Wt::WStringListModel* _videoBitrateModel; -}; - -const Wt::WFormModel::Field UserFormModel::NameField = "name"; -const Wt::WFormModel::Field UserFormModel::EmailField = "email"; -const Wt::WFormModel::Field UserFormModel::PasswordField = "password"; -const Wt::WFormModel::Field UserFormModel::PasswordConfirmField = "password-confirm"; -const Wt::WFormModel::Field UserFormModel::AdminField = "admin"; -const Wt::WFormModel::Field UserFormModel::AudioBitrateLimitField = "audio-bitrate-limit"; -const Wt::WFormModel::Field UserFormModel::VideoBitrateLimitField = "video-bitrate-limit"; - - -UserFormView::UserFormView(std::string userId, Wt::WContainerWidget *parent) -: Wt::WTemplateFormView(parent) -{ - - _model = new UserFormModel(userId, this); - - setTemplateText(tr("settings-new-user")); - addFunction("id", &WTemplate::Functions::id); - addFunction("block", &WTemplate::Functions::id); - - // Name - setFormWidget(UserFormModel::NameField, new Wt::WLineEdit()); - - // Email - setFormWidget(UserFormModel::EmailField, new Wt::WLineEdit()); - - // Password - Wt::WLineEdit* passwordEdit = new Wt::WLineEdit(); - setFormWidget(UserFormModel::PasswordField, passwordEdit ); - passwordEdit->setEchoMode(Wt::WLineEdit::Password); - - // Password confirmation - Wt::WLineEdit* passwordConfirmEdit = new Wt::WLineEdit(); - setFormWidget(UserFormModel::PasswordConfirmField, passwordConfirmEdit); - passwordConfirmEdit->setEchoMode(Wt::WLineEdit::Password); - - bindString("access", "Access"); - - // Admin Field - setFormWidget(UserFormModel::AdminField, new Wt::WCheckBox()); - - // AudioBitrate - Wt::WComboBox *audioBitrateCB = new Wt::WComboBox(); - setFormWidget(UserFormModel::AudioBitrateLimitField, audioBitrateCB); - audioBitrateCB->setStyleClass("span2"); - audioBitrateCB->setModel(_model->audioBitrateModel()); - - // VideoBitrate - Wt::WComboBox *videoBitrateCB = new Wt::WComboBox(); - setFormWidget(UserFormModel::VideoBitrateLimitField, videoBitrateCB); - videoBitrateCB->setStyleClass("span2"); - videoBitrateCB->setModel(_model->videoBitrateModel()); - - // Title & Buttons - Wt::WString title; - if (userId.empty()) { - title = Wt::WString("Create user"); - } - else { - Wt::Dbo::Transaction transaction (DboSession()); - Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId( userId ); - - Wt::WString userName; - if (authUser.isValid()) - userName = authUser.identity(Wt::Auth::Identity::LoginName); - else - ; // TODO display user deleted and close the widget - - title = Wt::WString("Edit user {1}").arg(userName); - } - - bindString("title", title); - - Wt::WPushButton *saveButton = new Wt::WPushButton(); - if (userId.empty()) { - saveButton->setText("Create user"); - saveButton->setStyleClass("btn-success"); - } - else - { - saveButton->setText("Save"); - saveButton->setStyleClass("btn-primary"); - } - bindWidget("save-button", saveButton); - saveButton->clicked().connect(this, &UserFormView::processSave); - - Wt::WPushButton *cancelButton = new Wt::WPushButton("Cancel"); - bindWidget("cancel-button", cancelButton); - cancelButton->clicked().connect(this, &UserFormView::processCancel); - - updateView(_model); - -} - - void -UserFormView::processCancel() -{ - // parent widget will delete this widget - completed().emit(false); -} - -void -UserFormView::processSave() -{ - updateModel(_model); - - - if (_model->validate()) - { - // commit model into DB - if (_model->saveData() ) - { - // parent widget will delete this widget - completed().emit(true); - } - // else TODO display a nice error message - } - else - { - updateView(_model); - } -} - -} // namespace Settings -} // namespace UserInterface diff --git a/src/ui/settings/SettingsUserFormView.hpp b/src/ui/settings/SettingsUserFormView.hpp deleted file mode 100644 index 1e495784..00000000 --- a/src/ui/settings/SettingsUserFormView.hpp +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef UI_SETTINGS_USER_FORM_VIEW_HPP -#define UI_SETTINGS_USER_FORM_VIEW_HPP - -#include -#include -#include - -namespace UserInterface { -namespace Settings { - -class UserFormModel; - -class UserFormView : public Wt::WTemplateFormView -{ - public: - - UserFormView(std::string userId, Wt::WContainerWidget *parent = 0); - - // Signal emitted once the form is completed - Wt::Signal& completed() { return _sigCompleted; } - - private: - - Wt::Signal _sigCompleted; - - void processSave(); - void processCancel(); - - UserFormModel* _model; - -}; - -} // namespace Settings -} // namespace UserInterface - -#endif diff --git a/src/ui/settings/SettingsUsers.cpp b/src/ui/settings/SettingsUsers.cpp deleted file mode 100644 index 314a2a59..00000000 --- a/src/ui/settings/SettingsUsers.cpp +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - - -#include -#include -#include -#include - -#include - -#include "utils/Logger.hpp" - -#include "SettingsUserFormView.hpp" -#include "LmsApplication.hpp" - -#include "SettingsUsers.hpp" - -namespace UserInterface { -namespace Settings { - -Users::Users(Wt::WContainerWidget *parent) -: Wt::WContainerWidget(parent) -{ - // Stack two widgets: - _stack = new Wt::WStackedWidget(this); - - // 1/ the user table view - { - Wt::WGroupBox *container = new Wt::WGroupBox("Users", _stack); - - _table = new Wt::WTable(container); - - _table->addStyleClass("table form-inline"); - - _table->toggleStyleClass("table-hover", true); - _table->toggleStyleClass("table-striped", true); - - _table->setHeaderCount(1); - - _table->elementAt(0, 0)->addWidget(new Wt::WText("#")); - _table->elementAt(0, 1)->addWidget(new Wt::WText("Name")); - _table->elementAt(0, 2)->addWidget(new Wt::WText("e-Mail")); - _table->elementAt(0, 3)->addWidget(new Wt::WText("Admin")); - - Wt::WPushButton* addBtn = new Wt::WPushButton("Add User"); - addBtn->setStyleClass("btn-success"); - container->addWidget( addBtn ); - addBtn->clicked().connect(boost::bind(&Users::handleCreateUser, this, "")); - } - - refresh(); -} - -void -Users::refresh(void) -{ - - assert(_table->rowCount() > 0); - for (int i = _table->rowCount() - 1; i > 0; --i) - _table->deleteRow(i); - - Wt::Dbo::Transaction transaction(DboSession()); - - const Wt::Auth::User& currentUser = CurrentAuthUser(); - - std::vector users = Database::User::getAll(DboSession()); - - std::size_t userIndex = 1; - for (std::size_t i = 0; i < users.size(); ++i) - { - - std::string userId = Database::User::getId(users[i]); - - Wt::Auth::User authUser; - - // Hack try/catch here since it may fail! - try { - authUser = DbHandler().getUserDatabase().findWithId( userId ); - } - catch(Wt::Dbo::Exception& e) - { - LMS_LOG(UI, ERROR) << "Caught exception when getting userId=" << userId << ": " << e.code(); - continue; - } - - if (!authUser.isValid()) { - LMS_LOG(UI, ERROR) << "Users::refresh: skipping invalid userId = " << userId; - continue; - } - - _table->elementAt(userIndex, 0)->addWidget(new Wt::WText( Wt::WString::fromUTF8("{1}").arg(userIndex))); - _table->elementAt(userIndex, 1)->addWidget(new Wt::WText( authUser.identity(Wt::Auth::Identity::LoginName)) ); - - Wt::WText* email = new Wt::WText(); - if (!authUser.email().empty()) { - email->setText(authUser.email()); - } - else { - email->setStyleClass("alert-danger"); - email->setText(authUser.unverifiedEmail()); - } - _table->elementAt(userIndex, 2)->addWidget( email ) ; - _table->elementAt(userIndex, 3)->addWidget(new Wt::WText( users[i]->isAdmin() ? "Yes" : "No" )); - - Wt::WPushButton* editBtn = new Wt::WPushButton("Edit"); - _table->elementAt(userIndex, 4)->addWidget(editBtn); - editBtn->clicked().connect(boost::bind( &Users::handleCreateUser, this, userId)); - - if (currentUser != authUser) - { - Wt::WPushButton* delBtn = new Wt::WPushButton("Delete"); - delBtn->setStyleClass("btn-danger"); - delBtn->setMargin(5, Wt::Left); - _table->elementAt(userIndex, 4)->addWidget(delBtn); - delBtn->clicked().connect(boost::bind( &Users::handleDelUser, this, authUser.identity(Wt::Auth::Identity::LoginName), userId)); - } - - ++userIndex; - } - -} - -void -Users::handleDelUser(Wt::WString loginNameIdentity, std::string id) -{ - Wt::WMessageBox *messageBox = new Wt::WMessageBox - ("Delete User", - Wt::WString( "Deleting user '{1}'?").arg(loginNameIdentity), - Wt::Question, Wt::Yes | Wt::No); - - messageBox->setModal(true); - - messageBox->buttonClicked().connect(std::bind([=] () { - if (messageBox->buttonResult() == Wt::Yes) - { - Wt::Dbo::Transaction transaction(DboSession()); - - // Delete the user - Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId( id ); - - DbHandler().getUserDatabase().deleteUser( authUser ); - - Database::User::pointer user = Database::User::getById(DboSession(), id); - if (user) - user.remove(); - - refresh(); - } - - delete messageBox; - })); - - messageBox->show(); - -} - -void -Users::handleCreateUser(std::string id) -{ - assert(_stack->count() == 1); - - UserFormView* userFormView = new UserFormView(id, _stack); - userFormView->completed().connect(this, &Users::handleUserFormCompleted); - - _stack->setCurrentIndex(1); -} - -void -Users::handleUserFormCompleted(bool changed) -{ - _stack->setCurrentIndex(0); - - // Refresh the user table if a change has been made - if (changed) - refresh(); - - // Delete the form view - delete _stack->widget(1); - -} - -} // namespace UserInterface -} // namespace Settings - - diff --git a/src/ui/settings/SettingsUsers.hpp b/src/ui/settings/SettingsUsers.hpp deleted file mode 100644 index 4f67f672..00000000 --- a/src/ui/settings/SettingsUsers.hpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef UI_SETTINGS_USERS_HPP -#define UI_SETTINGS_USERS_HPP - -#include -#include -#include - -namespace UserInterface { -namespace Settings { - -class Users : public Wt::WContainerWidget -{ - public: - Users(Wt::WContainerWidget *parent = 0); - - void refresh(); - - private: - - void handleUserFormCompleted(bool changed); - - void handleDelUser(Wt::WString loginNameIdentity, std::string id); - void handleCreateUser(std::string id); // set the id in order to edit the user - - Wt::WStackedWidget* _stack; - Wt::WTable* _table; -}; - -} // namespace UserInterface -} // namespace Settings - -#endif - diff --git a/src/ui/video/VideoDatabaseWidget.cpp b/src/ui/video/VideoDatabaseWidget.cpp deleted file mode 100644 index 5e25e8bc..00000000 --- a/src/ui/video/VideoDatabaseWidget.cpp +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include - -#include -#include - -#include -#include - -#include "LmsApplication.hpp" - -#include "VideoDatabaseWidget.hpp" - -namespace UserInterface { - -VideoDatabaseWidget::VideoDatabaseWidget(Wt::WContainerWidget *parent) -: Wt::WContainerWidget(parent) -{ - _table = new Wt::WTable( this ); - _table->setHeaderCount(1); - - _table->addStyleClass("table form-inline"); - - _table->toggleStyleClass("table-hover", true); - _table->toggleStyleClass("table-striped", true); - - updateView( boost::filesystem::path(), 0); -} - -void -VideoDatabaseWidget::addHeader(void) -{ - _table->elementAt(0, 0)->addWidget(new Wt::WText("Name")); - _table->elementAt(0, 1)->addWidget(new Wt::WText("Duration")); - _table->elementAt(0, 2)->addWidget(new Wt::WText("Action")); -} - -void -VideoDatabaseWidget::addDirectory(const std::string& name, boost::filesystem::path path, size_t depth) -{ - - int row = _table->rowCount(); - - new Wt::WText(Wt::WString::fromUTF8( name ), _table->elementAt(row, 0)); - new Wt::WText(Wt::WString::fromUTF8( " " ), _table->elementAt(row, 1)); - - Wt::WPushButton* btn = new Wt::WPushButton(Wt::WString::fromUTF8( "Open"), _table->elementAt(row, 2)); - - btn->clicked().connect(std::bind([=] () { - updateView(path, depth); - })); - -} - - -void -VideoDatabaseWidget::addVideo(const std::string& name, const boost::posix_time::time_duration& duration, const boost::filesystem::path& path) -{ - - int row = _table->rowCount(); - - new Wt::WText(Wt::WString::fromUTF8( name ), _table->elementAt(row, 0)); - new Wt::WText(Wt::WString::fromUTF8( boost::posix_time::to_simple_string( duration )), _table->elementAt(row, 1)); - - Wt::WPushButton* btn = new Wt::WPushButton(Wt::WString::fromUTF8( "Play"), _table->elementAt(row, 2)); - - btn->clicked().connect(std::bind([=] () { - playVideo().emit(path); - })); -} - - -void -VideoDatabaseWidget::updateView(boost::filesystem::path directory, size_t depth) -{ - _table->clear(); - addHeader(); - - // If directory is not valid, add the root Media Directories - if (depth == 0) - { - Wt::Dbo::Transaction transaction ( DboSession() ); - - std::vector dirs - = Database::MediaDirectory::getByType(DboSession(), Database::MediaDirectory::Video); - - BOOST_FOREACH(Database::MediaDirectory::pointer dir, dirs) - { - addDirectory( dir->getPath().filename().string(), - dir->getPath(), - depth + 1); - } - } - else - { - addDirectory( "..", directory.parent_path(), depth - 1); - - // Iterators over files in the directory - // If directory, add a directory entry - // If video, add a video entry - std::vector paths; - std::copy(boost::filesystem::directory_iterator(directory), boost::filesystem::directory_iterator(), std::back_inserter(paths)); - - std::sort(paths.begin(), paths.end()); - - BOOST_FOREACH(const boost::filesystem::path& path, paths) - { - if (boost::filesystem::is_directory(path)) - addDirectory( path.filename().string(), path, depth + 1); - else if (boost::filesystem::is_regular(path) ) - { - Wt::Dbo::Transaction transaction ( DboSession() ); - - Database::Video::pointer video = Database::Video::getByPath( DboSession(), path); - if (video) - addVideo( video->getName(), video->getDuration(), path); - } - } - } - -} - - -} // namespace UserInterface - diff --git a/src/ui/video/VideoDatabaseWidget.hpp b/src/ui/video/VideoDatabaseWidget.hpp deleted file mode 100644 index 8ab399d4..00000000 --- a/src/ui/video/VideoDatabaseWidget.hpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef VIDEO_DB_WIDGET_HPP -#define VIDEO_DB_WIDGET_HPP - -#include -#include - -namespace UserInterface { - -class VideoDatabaseWidget : public Wt::WContainerWidget -{ - public: - VideoDatabaseWidget(Wt::WContainerWidget *parent = 0); - - // Signals - Wt::Signal< boost::filesystem::path >& playVideo() { return _playVideo; } - - private: - - void addHeader(void); - void addDirectory(const std::string& name, boost::filesystem::path path, size_t depth); - void addVideo(const std::string& name, const boost::posix_time::time_duration& duration, const boost::filesystem::path& path); - - void updateView(boost::filesystem::path directory, size_t depth); - - Wt::Signal< boost::filesystem::path > _playVideo; - - Wt::WTable* _table; -}; - -} // namespace UserInterface - -#endif - diff --git a/src/ui/video/VideoMediaPlayerWidget.cpp b/src/ui/video/VideoMediaPlayerWidget.cpp deleted file mode 100644 index 2062cd4d..00000000 --- a/src/ui/video/VideoMediaPlayerWidget.cpp +++ /dev/null @@ -1,200 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include //include all types plus i/o - -#include - -#include "VideoParametersDialog.hpp" - -#include "VideoMediaPlayerWidget.hpp" - -namespace UserInterface { - -Wt::WMediaPlayer::Encoding -AvEncoding_to_WtEncoding(Av::Encoding encoding) -{ - switch( encoding ) - { - case Av::Encoding::OGA: return Wt::WMediaPlayer::OGA; - case Av::Encoding::OGV: return Wt::WMediaPlayer::OGV; - case Av::Encoding::MP3: return Wt::WMediaPlayer::MP3; - case Av::Encoding::WEBMA: return Wt::WMediaPlayer::WEBMA; - case Av::Encoding::WEBMV: return Wt::WMediaPlayer::WEBMV; - case Av::Encoding::FLA: return Wt::WMediaPlayer::FLA; - case Av::Encoding::FLV: return Wt::WMediaPlayer::FLV; - case Av::Encoding::M4A: return Wt::WMediaPlayer::M4A; - case Av::Encoding::M4V: return Wt::WMediaPlayer::M4V; - } - assert(0); -} - - -VideoMediaPlayerWidget::VideoMediaPlayerWidget( const Av::MediaFile& mediaFile, Av::TranscodeParameters parameters, Wt::WContainerWidget *parent) - : Wt::WContainerWidget(parent), - _mediaResource(nullptr), - _currentParameters(parameters), - _dialog(nullptr) -{ - _mediaPlayer = new Wt::WMediaPlayer( Wt::WMediaPlayer::Video, this ); -// _mediaPlayer->setAlternativeContent (new Wt::WText("You don't have HTML5 audio support!")); -// _mediaPlayer->setOptions( Wt::WMediaPlayer::Autoplay ); -// _mediaPlayer->addSource( Wt::WMediaPlayer::WEBMV, "" ); - - { - Wt::WContainerWidget *container = new Wt::WContainerWidget(this); - - _playBtn = new Wt::WPushButton("Play", container ); - _pauseBtn = new Wt::WPushButton("Pause", container ); - - _curTime = new Wt::WText(container); - _timeSlider = new Wt::WSlider( container ); - _duration = new Wt::WText(container); - - _volumeSlider = new Wt::WSlider( container ); - _volumeSlider->setRange(0,100); - _volumeSlider->setValue(_mediaPlayer->volume() * 100); - - _mediaPlayer->setControlsWidget( container ); - _mediaPlayer->setButton(Wt::WMediaPlayer::Play, _playBtn); - _mediaPlayer->setButton(Wt::WMediaPlayer::Pause, _pauseBtn); - - _mediaPlayer->setText( Wt::WMediaPlayer::CurrentTime, _curTime); - _mediaPlayer->setText( Wt::WMediaPlayer::Duration, _duration); - - _mediaPlayer->timeUpdated().connect(this, &VideoMediaPlayerWidget::handleTimeUpdated); - - Wt::WPushButton* fullScreenButton = new Wt::WPushButton("Fullscreen", container); - _mediaPlayer->setButton(Wt::WMediaPlayer::FullScreen, fullScreenButton); - - Wt::WPushButton* restoreScreenButton = new Wt::WPushButton("Restore screen", container); - _mediaPlayer->setButton(Wt::WMediaPlayer::RestoreScreen, restoreScreenButton); - - _mediaPlayer->timeUpdated().connect(this, &VideoMediaPlayerWidget::handleTimeUpdated); - - _timeSlider->valueChanged().connect(this, &VideoMediaPlayerWidget::handlePlayOffset); - _timeSlider->sliderMoved().connect(this, &VideoMediaPlayerWidget::handleSliderMoved); - - _volumeSlider->sliderMoved().connect(this, &VideoMediaPlayerWidget::handleVolumeSliderMoved); - } - - - Wt::WPushButton* closeButton = new Wt::WPushButton("Close", this); - closeButton->clicked().connect( this, &VideoMediaPlayerWidget::handleClose ); - - Wt::WPushButton* parametersButton = new Wt::WPushButton("Parameters", this); - parametersButton->clicked().connect( this, &VideoMediaPlayerWidget::handleParametersEdit ); - - _currentFile = mediaFile.getPath(); - - load(parameters); - - _timeSlider->setRange(0, mediaFile.getDuration().total_seconds() ); - _duration->setText( boost::posix_time::to_simple_string( mediaFile.getDuration() )); -} - -void -VideoMediaPlayerWidget::load(Av::TranscodeParameters parameters) -{ - _mediaPlayer->clearSources(); - - _currentParameters = parameters; - - _mediaInternalLink.setResource( nullptr ); - if (_mediaResource) - delete _mediaResource; - - _mediaResource = new AvConvTranscodeStreamResource( _currentFile, parameters, this ); - _mediaInternalLink.setResource( _mediaResource ); - - _mediaPlayer->addSource( AvEncoding_to_WtEncoding(parameters.getEncoding()), _mediaInternalLink ); - - _timeSlider->setValue( 0 ); - - - _mediaPlayer->play(); -} - -void -VideoMediaPlayerWidget::handlePlayOffset(int offsetSecs) -{ - _currentParameters.setOffset( boost::posix_time::seconds(offsetSecs) ); - load( _currentParameters ); - - _timeSlider->setValue( offsetSecs ); -} - -void -VideoMediaPlayerWidget::handleSliderMoved(int value) -{ - _curTime->setText( boost::posix_time::to_simple_string( boost::posix_time::seconds( value ) ) ); -} - -void -VideoMediaPlayerWidget::handleTimeUpdated(void) -{ - - boost::posix_time::time_duration currentTime ( boost::posix_time::seconds( _mediaPlayer->currentTime() + _currentParameters.getOffset().total_seconds())); - - _timeSlider->setValue( currentTime.total_seconds() ); - _curTime->setText( boost::posix_time::to_simple_string( currentTime) ); -} - -void -VideoMediaPlayerWidget::handleVolumeSliderMoved(int value) -{ - _mediaPlayer->setVolume( value / 100. ); -} - -void -VideoMediaPlayerWidget::handleClose(void) -{ - _close.emit(); -} - -void -VideoMediaPlayerWidget::handleParametersEdit(void) -{ -/* - _dialog = new VideoParametersDialog("Parameters"); - _dialog->load(_currentParameters); - - _dialog->show(); - - _dialog->finished().connect(this, &VideoMediaPlayerWidget::handleParametersDone); - */ -} - -void -VideoMediaPlayerWidget::handleParametersDone(Wt::WDialog::DialogCode code) -{ - assert(_dialog != nullptr); - - if (code == Wt::WDialog::Accepted) - { - _dialog->save( _currentParameters ); - - // TODO SYNC current offset with player? - // HACK use slider current value - handlePlayOffset( _timeSlider->value()); - } - -} - -} // namespace UserInterface diff --git a/src/ui/video/VideoMediaPlayerWidget.hpp b/src/ui/video/VideoMediaPlayerWidget.hpp deleted file mode 100644 index ef292c52..00000000 --- a/src/ui/video/VideoMediaPlayerWidget.hpp +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef __VIDEO_MEDIA_PLAYER_WIDGET_HPP -#define __VIDEO_MEDIA_PLAYER_WIDGET_HPP - -#include -#include -#include -#include -#include - -#include "VideoParametersDialog.hpp" - -#include "av/AvTranscoder.hpp" -#include "resource/AvConvTranscodeStreamResource.hpp" - -namespace UserInterface { - -class VideoMediaPlayerWidget : public Wt::WContainerWidget -{ - public: - - VideoMediaPlayerWidget( const Av::MediaFile& mediaFile, Av::TranscodeParameters parameters, Wt::WContainerWidget *parent = 0); - - Wt::Signal& close() { return _close; }; - - private: - - // Signals - Wt::Signal _close; - - void load(Av::TranscodeParameters parameters); - - // Player controls - void handlePlayOffset(int offsetSecs); - void handleTimeUpdated(void); - void handleSliderMoved(int value); - void handleFullscreen(void); - void handleVolumeSliderMoved(int value); - - void handleClose(void); - - void handleParametersEdit(void); - void handleParametersDone(Wt::WDialog::DialogCode); - - boost::filesystem::path _currentFile; - - // Core - Wt::WMediaPlayer* _mediaPlayer; - AvConvTranscodeStreamResource* _mediaResource; - Wt::WLink _mediaInternalLink; - - // Controls - Av::TranscodeParameters _currentParameters; - Wt::WPushButton* _playBtn; - Wt::WPushButton* _pauseBtn; - Wt::WSlider* _timeSlider; - Wt::WSlider* _volumeSlider; - Wt::WText* _curTime; - Wt::WText* _duration; - - VideoParametersDialog* _dialog; -}; - -} // namespace UserInterface - -#endif - diff --git a/src/ui/video/VideoParametersDialog.cpp b/src/ui/video/VideoParametersDialog.cpp deleted file mode 100644 index 88b578c2..00000000 --- a/src/ui/video/VideoParametersDialog.cpp +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include -#include -#include - -#include "VideoParametersDialog.hpp" - -namespace UserInterface { - -static const std::list streamTypes = {Av::Stream::Type::Video, Av::Stream::Type::Audio, Av::Stream::Type::Subtitle}; - -VideoParametersDialog::VideoParametersDialog(Wt::WString windowTitle, Wt::WDialog* parent) -: Wt::WDialog(windowTitle, parent) -{ - - Wt::WTable* layout = new Wt::WTable(contents()); - - createStreamWidgets("Video", Av::Stream::Type::Video, layout); - createStreamWidgets("Audio", Av::Stream::Type::Audio, layout); - createStreamWidgets("Subtitles", Av::Stream::Type::Subtitle, layout); - - Wt::WPushButton *ok = new Wt::WPushButton("Apply", contents()); - ok->clicked().connect(this, &Wt::WDialog::accept); - - Wt::WPushButton *cancel = new Wt::WPushButton("Cancel", contents()); - cancel->clicked().connect(this, &Wt::WDialog::reject); -} - -void -VideoParametersDialog::createStreamWidgets(const Wt::WString& labelString, Av::Stream::Type type, Wt::WTable* layout) -{ - int row = layout->rowCount(); - - Wt::WLabel* label = new Wt::WLabel(labelString); - Wt::WComboBox *combo = new Wt::WComboBox(); - label->setBuddy(combo); - - layout->elementAt(row, 0)->addWidget(label); - layout->elementAt(row, 1)->addWidget(combo); - - Wt::WStringListModel* model = new Wt::WStringListModel(combo); - - combo->setModel(model); - - _streamSelection.insert( std::make_pair(type, std::make_pair(combo, model) ) ); -} - - -void -VideoParametersDialog::handleApply() -{ - _apply.emit(); -} - -void -VideoParametersDialog::addStreams(Wt::WStringListModel* model, const std::vector& streams) -{ - for (const Av::Stream& stream : streams) - { - model->addString(stream.desc); - model->setData(model->rowCount(), 0, stream.id, Wt::UserRole); - } -} - -void -VideoParametersDialog::selectStream(const Wt::WStringListModel* model, int streamId, Wt::WComboBox* combo) -{ - for (int idStream = 0; idStream < model->rowCount(); ++idStream) - { - int id = boost::any_cast( model->data( model->index(idStream, 0), Wt::UserRole)); - if (id == streamId) - { - combo->setCurrentIndex(idStream); - break; - } - } -} - - -void -VideoParametersDialog::load(const Av::MediaFile& mediaFile, Av::TranscodeParameters currentParameters) -{ - // Populate the combox with the available streams - // And then show the selected one - for (Av::Stream::Type streamType : streamTypes) - { - Wt::WComboBox* combo = _streamSelection[streamType].first; - Wt::WStringListModel* model = _streamSelection[streamType].second; - - addStreams(model, mediaFile.getStreams(streamType) ); - - // Pre Select if necessary - std::set selectedStreams = currentParameters.getSelectedStreamIds(); - for (Av::Stream stream : mediaFile.getStreams(streamType)) - { - if (selectedStreams.find(stream.id) != selectedStreams.end()) - { - selectStream(model, stream.id, combo); - break; - } - } - } -} - -void -VideoParametersDialog::save(Av::TranscodeParameters& parameters) -{ - // Get stream selected, if any - for (Av::Stream::Type streamType : streamTypes) - { - Wt::WComboBox* combo = _streamSelection[streamType].first; - Wt::WStringListModel* model = _streamSelection[streamType].second; - - if (combo->currentIndex() >= 0) - { - int streamId = boost::any_cast( model->data(model->index(combo->currentIndex(), 0), Wt::UserRole)); - - parameters.addStream(streamId); - } - - } -} - -} // namespace UserInterface - diff --git a/src/ui/video/VideoParametersDialog.hpp b/src/ui/video/VideoParametersDialog.hpp deleted file mode 100644 index 01219c01..00000000 --- a/src/ui/video/VideoParametersDialog.hpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#pragma once - -#include - -#include -#include -#include -#include -#include - -#include "av/AvTranscoder.hpp" - -namespace UserInterface { - -class VideoParametersDialog : public Wt::WDialog -{ - public: - // parameters to be edited - VideoParametersDialog(Wt::WString windowTitle, Wt::WDialog* parent = 0); - - // Populates widget contents using these paramaters - void load(const Av::MediaFile& mediaFile, Av::TranscodeParameters currentParameters); - - // Save widgets contents into these parameters - void save(Av::TranscodeParameters& parameters); - - // Signal to be emitted if parameters are changed - Wt::Signal& apply() { return _apply; } - - private: - - void handleApply(void); - - // Stream handling - void createStreamWidgets(const Wt::WString& label, Av::Stream::Type type, Wt::WTable* layout); - void addStreams(Wt::WStringListModel* model, const std::vector& streams); - void selectStream(const Wt::WStringListModel* model, int streamId, Wt::WComboBox* combo); - - Wt::Signal _apply; - - std::map > _streamSelection; -}; - -} // namespace UserInterface - diff --git a/src/ui/video/VideoWidget.cpp b/src/ui/video/VideoWidget.cpp deleted file mode 100644 index bfa38d7f..00000000 --- a/src/ui/video/VideoWidget.cpp +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include -#include - -#include "logger/Logger.hpp" - -#include "LmsApplication.hpp" - -#include "VideoWidget.hpp" - -namespace UserInterface { - -VideoWidget::VideoWidget(Wt::WContainerWidget* parent ) -: Wt::WContainerWidget(parent) -{ - - _videoDbWidget = new VideoDatabaseWidget(this); - - _videoDbWidget->playVideo().connect(this, &VideoWidget::playVideo); - - -} - - -void -VideoWidget::search(const std::string& searchText) -{ - //TODO -} - -void -VideoWidget::playVideo(boost::filesystem::path p) -{ - LMS_LOG(UI, DEBUG) << "Want to play video " << p << "'"; - - std::size_t audioBitrate = 0; - std::size_t videoBitrate = 0; - - // Get user preferences - { - Wt::Dbo::Transaction transaction(DboSession()); - - audioBitrate = CurrentUser()->getMaxAudioBitrate(); - videoBitrate = CurrentUser()->getMaxVideoBitrate(); - } - - LMS_LOG(UI, DEBUG) << "Max bitrate set to " << videoBitrate << "/" << audioBitrate; - - Av::MediaFile mediaFile(p); - - if (!mediaFile.open()) - return; - - if (!mediaFile.scan()) - return; - - Av::TranscodeParameters parameters; - - parameters.setEncoding( Av::Encoding::WEBMV ); - - VideoMediaPlayerWidget *mediaPlayer = new VideoMediaPlayerWidget(mediaFile, parameters, this); - - mediaPlayer->close().connect(std::bind([=] () - { - _videoDbWidget->setHidden(false); - delete mediaPlayer; - })); - - _videoDbWidget->setHidden(true); -} - -} // namespace UserInterface - diff --git a/src/ui/video/VideoWidget.hpp b/src/ui/video/VideoWidget.hpp deleted file mode 100644 index 68b2109a..00000000 --- a/src/ui/video/VideoWidget.hpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef VIDEO_WIDGET_HPP -#define VIDEO_WIDGET_HPP - -#include - -#include - -#include "video/VideoMediaPlayerWidget.hpp" -#include "video/VideoDatabaseWidget.hpp" - -namespace UserInterface { - -class VideoWidget : public Wt::WContainerWidget -{ - public: - - VideoWidget(Wt::WContainerWidget* parent = 0); - - void search(const std::string& searchText); - - private: - - void backToList(void); - void playVideo(boost::filesystem::path p); - - VideoDatabaseWidget* _videoDbWidget; - VideoMediaPlayerWidget* _mediaPlayer; - -}; - -} // namespace UserInterface - -#endif - From 0da8d83288ed9fcd2983016c71e6f6707ce196c9 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 31 Jan 2018 13:06:59 +0100 Subject: [PATCH 031/195] New UI: filters now operational on all views --- README.md | 2 +- src/database/Release.cpp | 47 +++++++++++++++++++++++++++++++++------- src/database/Release.hpp | 2 +- src/database/Track.cpp | 2 +- src/ui/ArtistView.cpp | 8 +++---- src/ui/Explore.cpp | 6 ++--- src/ui/ReleaseView.cpp | 10 ++++----- src/ui/ReleaseView.hpp | 6 ++++- src/ui/ReleasesView.cpp | 15 +++++++------ src/ui/ReleasesView.hpp | 7 ++++-- src/ui/TracksView.cpp | 7 +++--- src/ui/TracksView.hpp | 7 ++++-- 12 files changed, 81 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 8f985bb4..923266e5 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ LMS is written entirely in C++. Therefore, it is suitable to run on embedded dev ### Debian ```sh -$ apt-get install g++ autoconf automake libboost-dev libboost-locale-dev libboost-iostreams-dev libavcodec-dev libwtdbosqlite-dev libwthttp-dev libwtdbo-dev libwt-dev libmagick++-dev libavcodec-dev libavformat-dev libav-tools libpstreams-dev libcurl-dev libcurlpp-dev libconfig++-dev ffmpeg +$ apt-get install g++ autoconf automake libboost-dev libboost-locale-dev libboost-iostreams-dev libavcodec-dev libavutil-dev libavformat-dev libav-tools libwtdbosqlite-dev libwthttp-dev libwtdbo-dev libwt-dev libmagick++-dev libpstreams-dev libcurlpp-dev libconfig++-dev libpstreams-dev ffmpeg libtag1-dev ``` ## Build diff --git a/src/database/Release.cpp b/src/database/Release.cpp index ca9e1fb5..a7f15dea 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -108,7 +108,7 @@ getQuery(Wt::Dbo::Session& session, WhereClause clusterClause; for (auto id : clusterIds) - clusterClause.And(WhereClause("c.id = ?")).bind(std::to_string(id)); + clusterClause.Or(WhereClause("c.id = ?")).bind(std::to_string(id)); where.And(clusterClause); } @@ -195,17 +195,48 @@ Release::hasVariousArtists() const } std::vector> -Release::getTracks() const +Release::getTracks(const std::vector& clusterIds) const { assert(self()); + assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); assert(session()); - Wt::Dbo::collection> res = session()->query>( - "SELECT t FROM track t INNER JOIN release r ON t.release_id = r.id") - .where("r.id = ?") - .orderBy("t.disc_number,t.track_number") - .bind(id()); + WhereClause where; - return std::vector>(res.begin(), res.end()); + std::ostringstream oss; + oss << "SELECT t FROM track t INNER JOIN release r ON t.release_id = r.id"; + + if (!clusterIds.empty()) + { + oss << " INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id"; + + WhereClause clusterClause; + + for (auto id : clusterIds) + clusterClause.Or(WhereClause("c.id = ?")).bind(std::to_string(id)); + + where.And(clusterClause); + } + + where.And(WhereClause("r.id = ?")).bind(std::to_string(id())); + + oss << " " << where.get(); + + if (!clusterIds.empty()) + oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size(); + + oss << " ORDER BY t.disc_number,t.track_number"; + + Wt::Dbo::Query query = session()->query( oss.str() ); + + for (const std::string& bindArg : where.getBindArgs()) + { + query.bind(bindArg); + } + + Wt::Dbo::collection< Wt::Dbo::ptr > res = query; + + return std::vector< Wt::Dbo::ptr > (res.begin(), res.end()); } + } // namespace Database diff --git a/src/database/Release.hpp b/src/database/Release.hpp index fc6fedcb..390d60a0 100644 --- a/src/database/Release.hpp +++ b/src/database/Release.hpp @@ -57,7 +57,7 @@ class Release : public Wt::Dbo::Dbo int size, bool& moreExpected); - std::vector> getTracks() const; + std::vector> getTracks(const std::vector& clusters = std::vector()) const; // Create static pointer create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID = ""); diff --git a/src/database/Track.cpp b/src/database/Track.cpp index ac7faa18..65e3319e 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -129,7 +129,7 @@ getQuery(Wt::Dbo::Session& session, WhereClause clusterClause; for (auto id : clusterIds) - clusterClause.And(WhereClause("c.id = ?")).bind(std::to_string(id)); + clusterClause.Or(WhereClause("c.id = ?")).bind(std::to_string(id)); where.And(clusterClause); } diff --git a/src/ui/ArtistView.cpp b/src/ui/ArtistView.cpp index 5327ced6..9c98dd93 100644 --- a/src/ui/ArtistView.cpp +++ b/src/ui/ArtistView.cpp @@ -84,8 +84,8 @@ Artist::refresh() entry->addFunction("tr", Wt::WTemplate::Functions::tr); { - Wt::WAnchor *coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); - Wt::WImage *cover = new Wt::WImage(coverAnchor); + Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); + Wt::WImage* cover = new Wt::WImage(coverAnchor); cover->setImageLink(SessionImageResource()->getReleaseUrl(release.id(), 128)); // Some images may not be square cover->setWidth(128); @@ -93,8 +93,8 @@ Artist::refresh() } { - Wt::WAnchor *releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); - Wt::WText *releaseName = new Wt::WText(releaseAnchor); + Wt::WAnchor* releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); + Wt::WText* releaseName = new Wt::WText(releaseAnchor); releaseName->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); entry->bindWidget("name", releaseAnchor); } diff --git a/src/ui/Explore.cpp b/src/ui/Explore.cpp index 46cfc5ca..8686f0f2 100644 --- a/src/ui/Explore.cpp +++ b/src/ui/Explore.cpp @@ -83,9 +83,9 @@ Explore::Explore(Wt::WContainerWidget* parent) stack->addWidget(new Artists(filters)); stack->addWidget(new Artist(filters)); - stack->addWidget(new Releases(/*filters*/)); - stack->addWidget(new Release(/*filters*/)); - stack->addWidget(new Tracks(/*filters*/)); + stack->addWidget(new Releases(filters)); + stack->addWidget(new Release(filters)); + stack->addWidget(new Tracks(filters)); wApp->internalPathChanged().connect(std::bind([=] { diff --git a/src/ui/ReleaseView.cpp b/src/ui/ReleaseView.cpp index 098b12a5..69b5078f 100644 --- a/src/ui/ReleaseView.cpp +++ b/src/ui/ReleaseView.cpp @@ -33,8 +33,9 @@ namespace UserInterface { -Release::Release(Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent) +Release::Release(Filters* filters, Wt::WContainerWidget* parent) +: Wt::WContainerWidget(parent), + _filters(filters) { wApp->internalPathChanged().connect(std::bind([=] { @@ -109,10 +110,9 @@ Release::refresh() auto tracksContainer = new Wt::WContainerWidget(); t->bindWidget("tracks", tracksContainer); - std::vector clusterIds; // TODO fill + auto clusterIds = _filters->getClusterIds(); + auto tracks = release->getTracks(clusterIds); -// auto tracks = release->getTracks(clusterIds); - auto tracks = release->getTracks(); bool variousArtists = release->hasVariousArtists(); for (auto track : tracks) diff --git a/src/ui/ReleaseView.hpp b/src/ui/ReleaseView.hpp index 0a68a9e9..b51568cd 100644 --- a/src/ui/ReleaseView.hpp +++ b/src/ui/ReleaseView.hpp @@ -21,15 +21,19 @@ #include +#include "Filters.hpp" + namespace UserInterface { class Release : public Wt::WContainerWidget { public: - Release(Wt::WContainerWidget* parent = 0); + Release(Filters* filters, Wt::WContainerWidget* parent = 0); private: void refresh(); + + Filters* _filters; }; } // namespace UserInterface diff --git a/src/ui/ReleasesView.cpp b/src/ui/ReleasesView.cpp index 7c7da4de..414c1418 100644 --- a/src/ui/ReleasesView.cpp +++ b/src/ui/ReleasesView.cpp @@ -36,8 +36,9 @@ namespace UserInterface { using namespace Database; -Releases::Releases(Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent) +Releases::Releases(Filters* filters, Wt::WContainerWidget* parent) +: Wt::WContainerWidget(parent), + _filters(filters) { auto releases = new Wt::WTemplate(Wt::WString::tr("template-releases"), this); releases->addFunction("tr", &Wt::WTemplate::Functions::tr); @@ -63,7 +64,7 @@ Releases::refresh(std::vector searchKeywords) { _releasesContainer->clear(); - std::vector clusterIds; // TODO fill + auto clusterIds = _filters->getClusterIds(); Wt::Dbo::Transaction transaction(DboSession()); @@ -75,8 +76,8 @@ Releases::refresh(std::vector searchKeywords) Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-releases-entry"), _releasesContainer); entry->addFunction("tr", Wt::WTemplate::Functions::tr); - Wt::WAnchor *coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); - Wt::WImage *cover = new Wt::WImage(coverAnchor); + Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); + Wt::WImage* cover = new Wt::WImage(coverAnchor); cover->setImageLink(SessionImageResource()->getReleaseUrl(release.id(), 128)); // Some images may not be square cover->setWidth(128); @@ -91,8 +92,8 @@ Releases::refresh(std::vector searchKeywords) } else { - Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(artists.front().id()))); - Wt::WText *artist = new Wt::WText(artistAnchor); + Wt::WAnchor* artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(artists.front().id()))); + Wt::WText* artist = new Wt::WText(artistAnchor); artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText)); entry->bindWidget("artist-name", artistAnchor); } diff --git a/src/ui/ReleasesView.hpp b/src/ui/ReleasesView.hpp index 7a4325cd..bf741678 100644 --- a/src/ui/ReleasesView.hpp +++ b/src/ui/ReleasesView.hpp @@ -21,17 +21,20 @@ #include +#include "Filters.hpp" + namespace UserInterface { class Releases : public Wt::WContainerWidget { public: - Releases(Wt::WContainerWidget* parent = 0); + Releases(Filters* filters, Wt::WContainerWidget* parent = 0); private: void refresh(std::vector searchKeywords = std::vector()); - Wt::WContainerWidget *_releasesContainer; + Filters* _filters; + Wt::WContainerWidget* _releasesContainer; }; } // namespace UserInterface diff --git a/src/ui/TracksView.cpp b/src/ui/TracksView.cpp index bc834de5..c904c6ae 100644 --- a/src/ui/TracksView.cpp +++ b/src/ui/TracksView.cpp @@ -35,8 +35,9 @@ namespace UserInterface { using namespace Database; -Tracks::Tracks(Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent) +Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) +: Wt::WContainerWidget(parent), + _filters(filters) { auto tracks = new Wt::WTemplate(Wt::WString::tr("template-tracks"), this); tracks->addFunction("tr", &Wt::WTemplate::Functions::tr); @@ -62,7 +63,7 @@ Tracks::refresh(std::vector searchKeywords) { _tracksContainer->clear(); - std::vector clusterIds; // TODO fill + auto clusterIds = _filters->getClusterIds(); Wt::Dbo::Transaction transaction(DboSession()); diff --git a/src/ui/TracksView.hpp b/src/ui/TracksView.hpp index 7ba2c61c..3210e666 100644 --- a/src/ui/TracksView.hpp +++ b/src/ui/TracksView.hpp @@ -21,17 +21,20 @@ #include +#include "Filters.hpp" + namespace UserInterface { class Tracks : public Wt::WContainerWidget { public: - Tracks(Wt::WContainerWidget* parent = 0); + Tracks(Filters* filters, Wt::WContainerWidget* parent = 0); private: void refresh(std::vector searchKeywords = std::vector()); - Wt::WContainerWidget *_tracksContainer; + Wt::WContainerWidget* _tracksContainer; + Filters* _filters; }; } // namespace UserInterface From 1e470a34b1f69151ffb091f919751703ca190a88 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 3 Feb 2018 15:50:03 +0100 Subject: [PATCH 032/195] Removed unused html templates --- approot/templates.xml | 552 ------------------------------------------ 1 file changed, 552 deletions(-) diff --git a/approot/templates.xml b/approot/templates.xml index 9894b02e..1780e53d 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -22,556 +22,4 @@
- - ${title} -
-
- -
- ${name} -
-
- ${name-info} -
-
-
- -
- ${email} -
-
- ${email-info} -
-
-
- -
- ${password} -
- ${password-info} -
-
- -
- ${password-confirm} -
-
- ${password-confirm-info} -
-
-
-
- ${save-button} -
-
- ${apply-info} -
- - - - - ${title} -
-
- -
- ${name} -
-
- ${name-info} -
-
-
- -
- ${email} -
-
- ${email-info} -
-
-
- -
- ${password} -
-
- ${password-info} -
-
-
- -
- ${password-confirm} -
-
- ${password-confirm-info} -
-
-
- ${access} -
-
- -
- ${admin} -
-
- ${admin-info} -
-
-
- -
-
- ${audio-bitrate-limit} - kbps -
-
-
- ${audio-bitrate-limit-info} -
-
-
- -
-
- ${video-bitrate-limit} - kbps -
-
-
- ${video-bitrate-limit-info} -
-
-
-
-
-
- ${save-button} ${cancel-button} -
-
-
- - - - - ${title} -
-
- -
- ${name} -
-
- ${name-info} -
-
-
- -
- ${email} -
-
- ${email-info} -
-
-
- -
- ${password} -
-
- ${password-info} -
-
-
- -
- ${password-confirm} -
-
- ${password-confirm-info} -
-
-
-
- ${save-button} ${cancel-button} -
-
- ${apply-info} -
- - - - ${title} -
-
- -
-
- ${bitrate} - kbps -
-
-
- ${bitrate-info} -
-
-
- -
- ${encoding} -
-
- ${encoding-info} -
-
-
-
- ${save-button} ${cancel-button} -
-
- ${apply-info} -
- - - - ${title} -
-
- -
- ${path} -
-
- ${path-info} -
-
-
- -
- ${type} -
-
- ${type-info} -
-
-
-
- ${save-button} ${cancel-button} -
-
- ${apply-info} -
- - - - ${scan-title} -
-
- -
- ${update-period} -
-
- ${update-period-info} -
-
- -
- -
- ${update-start-time} -
-
- ${update-start-time-info} -
-
- -
- -
- ${audio-file-extensions} -
-
- ${audio-file-extensions-info} -
-
- -
- -
- ${video-file-extensions} -
-
- ${video-file-extensions-info} -
-
-
- ${tags-title} -
-
- -
- ${tags-highlevel-acousticbrainz} -
-
- ${tags-highlevel-acousticbrainz-info} -
-
- -
- -
- ${tags-highlevel-acousticbrainz-min-probability} -
-
- ${tags-highlevel-acousticbrainz-min-probability-info} -
-
- - -
- -
- ${tags-similarity-acousticbrainz} -
-
- ${tags-similarity-acousticbrainz-info} -
-
- -
-
- ${apply-button} ${discard-button} ${immediate-scan-button} -
-
- ${apply-info} -
- - - -
-
-
${text}
-
-
- - -
-
-
${text}
-
-
- - - - - - - - - - ${title} - ${contents} - ${show-more} - - - -
-
${gif} -

${name}

-
- - - - - ${title} - ${contents} - ${show-more} - - - -
-
${cover} -

${name}

${artist}

-
- - - - - ${title} -
- ${contents} -
- ${show-more} - - - -
-
-
-
${cover}
-
${artist-name}
${track-name}
-
${play-btn}${add-btn}
-
-
-
- - - - - - ${title} - ${release-container} - ${show-more} - - - -
-
-
-
- ${cover} -
-

${release-name}
${artist-name}${} - ${year}${}${} (${orig-year})${}

-
-
-
-
- ${track-container} -
-
-
- - - -
${}${disc-num}-${}${}${track-num}. ${}${track-name} ${play-btn}${add-btn}
- - - - - ${controls} -
- ${contents} -
- - - - ${load}${save}${clear}${shuffle}${repeat} - - - -
-
-
${cover}
-
${artist-name}
${track-name}
-
${play-btn}${del-btn}
-
-
- - - - ${audio} - ${prev}${play-pause}${next} - - -
-
- ${track} ${artist} -
-
- ${curtime}${seekbar}${duration} -
-
- ${}${shuffle}${}${}${repeat}${}${}${playqueue}${} - - From cea01d06b72e22e7b8fdea8e4aec4e86da790724 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 5 Feb 2018 13:39:45 +0100 Subject: [PATCH 033/195] Make filters really work --- approot/messages.xml | 5 ++ approot/templates.xml | 26 +++++++++ src/database/DbArtist.cpp | 6 +-- src/database/DbArtist.hpp | 4 +- src/database/Release.cpp | 6 +-- src/database/Release.hpp | 4 +- src/database/Track.cpp | 13 ++++- src/database/Track.hpp | 3 +- src/ui/ArtistView.cpp | 4 ++ src/ui/ArtistsView.cpp | 5 +- src/ui/Filters.cpp | 111 +++++++++++++++++++++++++++++++++++++- src/ui/Filters.hpp | 10 +++- src/ui/ReleasesView.cpp | 4 ++ src/ui/TracksView.cpp | 4 ++ 14 files changed, 187 insertions(+), 18 deletions(-) diff --git a/approot/messages.xml b/approot/messages.xml index 196a7296..44479447 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -10,4 +10,9 @@ Add filter Search... +Add +Cancel + +Type +Value diff --git a/approot/templates.xml b/approot/templates.xml index 1780e53d..5f93b41d 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -22,4 +22,30 @@
+ +
+
+ +
+ ${type} +
+
+
+ +
+ ${value} +
+
+
+
+ ${add class="btn-primary"} ${cancel} +
+
+
+ + diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp index 7dc341f6..413e40c4 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/DbArtist.cpp @@ -91,7 +91,7 @@ Artist::getAllOrphans(Wt::Dbo::Session& session) static Wt::Dbo::Query getQuery(Wt::Dbo::Session& session, - const std::vector& clusterIds, + const std::set& clusterIds, const std::vector& keywords) { WhereClause where; @@ -132,7 +132,7 @@ getQuery(Wt::Dbo::Session& session, std::vector Artist::getByFilter(Wt::Dbo::Session& session, - const std::vector& clusters, + const std::set& clusters, const std::vector keywords, int offset, int size, bool& moreResults) { @@ -152,7 +152,7 @@ Artist::getByFilter(Wt::Dbo::Session& session, } std::vector > -Artist::getReleases(const std::vector& clusterIds) const +Artist::getReleases(const std::set& clusterIds) const { assert(self()); assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); diff --git a/src/database/DbArtist.hpp b/src/database/DbArtist.hpp index 7b45bcb6..47c7d24f 100644 --- a/src/database/DbArtist.hpp +++ b/src/database/DbArtist.hpp @@ -51,7 +51,7 @@ class Artist : public Wt::Dbo::Dbo static pointer getNone(Wt::Dbo::Session& session); // Special entry static std::vector getByName(Wt::Dbo::Session& session, const std::string& name); static std::vector getByFilter(Wt::Dbo::Session& session, - const std::vector& clusters, // at least one track that belongs to these clusters + const std::set& clusters, // at least one track that belongs to these clusters const std::vector keywords, // name must match all of these keywords int offset, int size, @@ -65,7 +65,7 @@ class Artist : public Wt::Dbo::Dbo std::string getMBID(void) const { return _MBID; } // Get the releases that have at least one track for this artist + belongs to optonal cluster filters - std::vector> getReleases(const std::vector& clusterIds = std::vector()) const; + std::vector> getReleases(const std::set& clusterIds = std::set()) const; void setMBID(std::string mbid) { _MBID = mbid; } diff --git a/src/database/Release.cpp b/src/database/Release.cpp index a7f15dea..2b338e34 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -90,7 +90,7 @@ Release::getAllOrphans(Wt::Dbo::Session& session) static Wt::Dbo::Query getQuery(Wt::Dbo::Session& session, - const std::vector& clusterIds, + const std::set& clusterIds, const std::vector keywords) { WhereClause where; @@ -130,7 +130,7 @@ getQuery(Wt::Dbo::Session& session, std::vector Release::getByFilter(Wt::Dbo::Session& session, - const std::vector& clusterIds, + const std::set& clusterIds, const std::vector keywords, int offset, int size, bool& moreResults) { @@ -195,7 +195,7 @@ Release::hasVariousArtists() const } std::vector> -Release::getTracks(const std::vector& clusterIds) const +Release::getTracks(const std::set& clusterIds) const { assert(self()); assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); diff --git a/src/database/Release.hpp b/src/database/Release.hpp index 390d60a0..3feb0100 100644 --- a/src/database/Release.hpp +++ b/src/database/Release.hpp @@ -51,13 +51,13 @@ class Release : public Wt::Dbo::Dbo static std::vector getAll(Wt::Dbo::Session& session, int offset, int size); static std::vector getByFilter(Wt::Dbo::Session& session, - const std::vector& clusters, // at least one track that belongs to these clusters + const std::set& clusters, // at least one track that belongs to these clusters const std::vector keywords, // name must match all of these keywords int offset, int size, bool& moreExpected); - std::vector> getTracks(const std::vector& clusters = std::vector()) const; + std::vector> getTracks(const std::set& clusters = std::set()) const; // Create static pointer create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID = ""); diff --git a/src/database/Track.cpp b/src/database/Track.cpp index 65e3319e..50c16a4d 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -111,7 +111,7 @@ Track::getClusters(void) const static Wt::Dbo::Query< Track::pointer > getQuery(Wt::Dbo::Session& session, - const std::vector& clusterIds, + const std::set& clusterIds, const std::vector keywords) { WhereClause where; @@ -165,7 +165,7 @@ Track::getStats(Wt::Dbo::Session& session, SearchFilter filter) std::vector Track::getByFilter(Wt::Dbo::Session& session, - const std::vector& clusterIds, + const std::set& clusterIds, const std::vector keywords, int offset, int size, bool& moreResults) { @@ -282,6 +282,15 @@ Cluster::getQuery(Wt::Dbo::Session& session, SearchFilter filter) return query; } +std::vector +Cluster::getAllTypes(Wt::Dbo::Session& session) +{ + Wt::Dbo::collection res + = session.query("SELECT type from cluster").groupBy("type").orderBy("type"); + + return std::vector(res.begin(), res.end()); +} + std::vector Cluster::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size) { diff --git a/src/database/Track.hpp b/src/database/Track.hpp index d1af053c..0d81a36d 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -62,6 +62,7 @@ class Cluster static pointer getNone(Wt::Dbo::Session& session); static std::vector getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1); static Wt::Dbo::collection getAll(Wt::Dbo::Session& session); + static std::vector getAllTypes(Wt::Dbo::Session& session); static std::vector getByType(Wt::Dbo::Session& session, std::string type); // Create utility @@ -120,7 +121,7 @@ class Track static pointer getById(Wt::Dbo::Session& session, id_type id); static pointer getByMBID(Wt::Dbo::Session& session, const std::string& MBID); static std::vector getByFilter(Wt::Dbo::Session& session, - const std::vector& clusters, // tracks that belong to these clusters + const std::set& clusters, // tracks that belong to these clusters const std::vector keywords, // name must match all of these keywords int offset, int size, diff --git a/src/ui/ArtistView.cpp b/src/ui/ArtistView.cpp index 9c98dd93..0e17096b 100644 --- a/src/ui/ArtistView.cpp +++ b/src/ui/ArtistView.cpp @@ -43,6 +43,10 @@ Artist::Artist(Filters* filters, Wt::WContainerWidget* parent) })); refresh(); + + filters->updated().connect(std::bind([=] { + refresh(); + })); } void diff --git a/src/ui/ArtistsView.cpp b/src/ui/ArtistsView.cpp index e684db2d..be50e252 100644 --- a/src/ui/ArtistsView.cpp +++ b/src/ui/ArtistsView.cpp @@ -54,8 +54,11 @@ Artists::Artists(Filters* filters, Wt::WContainerWidget* parent) artists->bindWidget("artists", _artistsContainer); refresh(); -} + filters->updated().connect(std::bind([=] { + refresh(); + })); +} void Artists::refresh(std::vector searchKeywords) diff --git a/src/ui/Filters.cpp b/src/ui/Filters.cpp index 8dc3f131..872ba5ce 100644 --- a/src/ui/Filters.cpp +++ b/src/ui/Filters.cpp @@ -17,13 +17,116 @@ * along with LMS. If not, see . */ -#include +#include +#include #include +#include #include "Filters.hpp" +#include "LmsApplication.hpp" + namespace UserInterface { +void +Filters::showDialog() +{ + auto dialog = new Wt::WDialog("Go to cell"); + + auto container = new Wt::WTemplate(Wt::WString::tr("template-filter-add")); + container->addFunction("tr", &Wt::WTemplate::Functions::tr); + + dialog->contents()->addWidget(container); + + auto typeCombo = new Wt::WComboBox(); + container->bindWidget("type", typeCombo); + + auto valueCombo = new Wt::WComboBox(); + container->bindWidget("value", valueCombo); + + auto addBtn = new Wt::WPushButton(Wt::WString::tr("msg-add")); + container->bindWidget("add", addBtn); + addBtn->clicked().connect(dialog, &Wt::WDialog::accept); + + auto cancelBtn = new Wt::WPushButton(Wt::WString::tr("msg-cancel")); + container->bindWidget("cancel", cancelBtn); + cancelBtn->clicked().connect(dialog, &Wt::WDialog::reject); + + // Populate data + { + Wt::Dbo::Transaction transaction(DboSession()); + + auto types = Database::Cluster::getAllTypes(DboSession()); + + for (auto type : types) + typeCombo->addItem(Wt::WString::fromUTF8(type)); + + if (!types.empty()) + { + auto values = Database::Cluster::getByType(DboSession(), types.front()); + + for (auto value : values) + { + if (_filterIds.find(value.id()) == _filterIds.end()) + valueCombo->addItem(Wt::WString::fromUTF8(value->getName())); + } + } + + } + + typeCombo->changed().connect(std::bind([=] + { + auto type = typeCombo->valueText().toUTF8(); + + valueCombo->clear(); + + Wt::Dbo::Transaction transaction(DboSession()); + + auto values = Database::Cluster::getByType(DboSession(), type); + for (auto value : values) + { + if (_filterIds.find(value.id()) == _filterIds.end()) + valueCombo->addItem(Wt::WString::fromUTF8(value->getName())); + } + })); + + dialog->setModal(true); + dialog->setMovable(false); + dialog->setResizable(false); + dialog->setClosable(false); + + dialog->finished().connect(std::bind([=] + { + if (dialog->result() != Wt::WDialog::Accepted) + return; + + auto type = typeCombo->valueText().toUTF8(); + auto value = valueCombo->valueText().toUTF8(); + + Wt::Dbo::Transaction transaction(DboSession()); + + auto cluster = Database::Cluster::get(DboSession(), type, value); + if (!cluster) + return; + + auto clusterId = cluster.id(); + _filterIds.insert(clusterId); + _sigUpdated.emit(); + + auto filterBtn = new Wt::WPushButton(Wt::WString::fromUTF8(value)); + _filters->addWidget(filterBtn); + + filterBtn->clicked().connect(std::bind([=] + { + _filters->removeWidget(filterBtn); + _filterIds.erase(clusterId); + _sigUpdated.emit(); + })); + })); + + dialog->show(); +} + Filters::Filters(Wt::WContainerWidget *parent) : Wt::WContainerWidget(parent) { @@ -36,7 +139,11 @@ Filters::Filters(Wt::WContainerWidget *parent) _filters = new Wt::WContainerWidget(); container->bindWidget("filters", _filters); -// _filterIds = {108, 419}; + addFilterBtn->clicked().connect(std::bind([this] + { + showDialog(); + })); + } diff --git a/src/ui/Filters.hpp b/src/ui/Filters.hpp index 98d2e4c0..d0753915 100644 --- a/src/ui/Filters.hpp +++ b/src/ui/Filters.hpp @@ -20,6 +20,7 @@ #pragma once #include +#include #include "database/Types.hpp" @@ -32,12 +33,17 @@ class Filters : public Wt::WContainerWidget public: Filters(Wt::WContainerWidget *parent = 0); - std::vector getClusterIds() const { return _filterIds; } + std::set getClusterIds() const { return _filterIds; } + + Wt::Signal& updated() { return _sigUpdated; } private: + void showDialog(); + Wt::WContainerWidget *_filters; - std::vector _filterIds; + Wt::Signal _sigUpdated; + std::set _filterIds; }; } // namespace UserInterface diff --git a/src/ui/ReleasesView.cpp b/src/ui/ReleasesView.cpp index 414c1418..270abe89 100644 --- a/src/ui/ReleasesView.cpp +++ b/src/ui/ReleasesView.cpp @@ -56,6 +56,10 @@ Releases::Releases(Filters* filters, Wt::WContainerWidget* parent) releases->bindWidget("releases", _releasesContainer); refresh(); + + filters->updated().connect(std::bind([=] { + refresh(); + })); } diff --git a/src/ui/TracksView.cpp b/src/ui/TracksView.cpp index c904c6ae..7ae1b3ae 100644 --- a/src/ui/TracksView.cpp +++ b/src/ui/TracksView.cpp @@ -55,6 +55,10 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) tracks->bindWidget("tracks", _tracksContainer); refresh(); + + filters->updated().connect(std::bind([=] { + refresh(); + })); } From f24e63444732906f665821592042b6819f538a12 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 6 Feb 2018 20:14:27 +0100 Subject: [PATCH 034/195] Fix build with Wt < 3.3.7 --- src/ui/Filters.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ui/Filters.cpp b/src/ui/Filters.cpp index 872ba5ce..4040f723 100644 --- a/src/ui/Filters.cpp +++ b/src/ui/Filters.cpp @@ -91,7 +91,10 @@ Filters::showDialog() })); dialog->setModal(true); +#if WT_VERSION >= 0x030307 dialog->setMovable(false); +#endif + dialog->setResizable(false); dialog->setClosable(false); From 5cc2a29b59a458664d682fc56853db6d139839ca Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 6 Feb 2018 20:29:19 +0100 Subject: [PATCH 035/195] Really fix build with Wt < 3.3.7 --- src/ui/Filters.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/Filters.cpp b/src/ui/Filters.cpp index 4040f723..9ecdc704 100644 --- a/src/ui/Filters.cpp +++ b/src/ui/Filters.cpp @@ -91,7 +91,7 @@ Filters::showDialog() })); dialog->setModal(true); -#if WT_VERSION >= 0x030307 +#if WT_VERSION >= 0x03030700 dialog->setMovable(false); #endif From 18a446a0a2be9547b97389f616979c2ec5811e66 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 10 Feb 2018 16:30:19 +0100 Subject: [PATCH 036/195] Remove special None handling and video --- configure.ac | 8 -- src/Makefile.am | 9 -- src/cover/CoverArtGrabber.cpp | 4 +- src/database/Artist.cpp | 168 ----------------------- src/database/Artist.hpp | 102 -------------- src/database/DatabaseHandler.cpp | 1 - src/database/DbArtist.cpp | 16 --- src/database/DbArtist.hpp | 2 - src/database/MediaDirectory.hpp | 1 - src/database/Release.cpp | 16 --- src/database/Release.hpp | 2 - src/database/Track.cpp | 15 -- src/database/Track.hpp | 2 - src/database/Types.hpp | 1 - src/database/Video.cpp | 59 -------- src/database/Video.hpp | 84 ------------ src/database/updater/DatabaseUpdater.cpp | 121 +--------------- src/ui/ArtistView.cpp | 3 - src/ui/ReleaseView.cpp | 2 +- src/ui/TracksView.cpp | 4 +- 20 files changed, 11 insertions(+), 609 deletions(-) delete mode 100644 src/database/Artist.cpp delete mode 100644 src/database/Artist.hpp delete mode 100644 src/database/Video.cpp delete mode 100644 src/database/Video.hpp diff --git a/configure.ac b/configure.ac index fe932bb4..41173572 100644 --- a/configure.ac +++ b/configure.ac @@ -8,14 +8,6 @@ AC_LANG_CPLUSPLUS # Checks for programs AC_PROG_CXX -AC_ARG_ENABLE([video], AS_HELP_STRING([--enable-video], - [Enable Video support. Default to no.])], - [enable_video="$enableval"], - [enable_video="no"]) - -AM_CONDITIONAL([VIDEO], [test x$enable_video = xyes]) -AS_IF([test x$enable_video = xyes], [AC_DEFINE(HAVE_VIDEO, [1], [Enable Video support])]) - PKG_CHECK_MODULES(IMAGEMAGICKXX, "ImageMagick++", [ HAVE_IMAGEMAGICKXX=yes ], [ ]) if test -n "$HAVE_IMAGEMAGICKXX"; then MAGICKXX_CFLAGS="$IMAGEMAGICKXX_CFLAGS" diff --git a/src/Makefile.am b/src/Makefile.am index 02bd8c3b..5bcbc8a6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,6 @@ lms_SOURCES = \ $(srcdir)/database/SqlQuery.cpp \ $(srcdir)/database/Track.cpp \ $(srcdir)/database/User.cpp \ - $(srcdir)/database/Video.cpp \ $(srcdir)/database/updater/DatabaseUpdater.cpp \ $(srcdir)/database/updater/DatabaseFeatureExtractor.cpp \ $(srcdir)/database/updater/DatabaseHighLevelCluster.cpp \ @@ -45,14 +44,6 @@ lms_SOURCES = \ $(srcdir)/utils/Path.cpp \ $(srcdir)/utils/Utils.cpp -if VIDEO -lms_SOURCES += \ - $(srcdir)/ui/video/VideoWidget.cpp \ - $(srcdir)/ui/video/VideoDatabaseWidget.cpp \ - $(srcdir)/ui/video/VideoMediaPlayerWidget.cpp \ - $(srcdir)/ui/video/VideoParametersDialog.cpp -endif - lms_CXXFLAGS=-std=c++11 -Wall -I$(srcdir)/third-party -I$(srcdir)/ui $(MAGICKXX_CFLAGS) -D_REENTRANT -DBOOST_SPIRIT_THREADSAFE lms_LDADD=$(MAGICKXX_LIBS) diff --git a/src/cover/CoverArtGrabber.cpp b/src/cover/CoverArtGrabber.cpp index a73a502c..56967cda 100644 --- a/src/cover/CoverArtGrabber.cpp +++ b/src/cover/CoverArtGrabber.cpp @@ -173,9 +173,9 @@ Grabber::getFromRelease(Wt::Dbo::Session& session, Database::Release::id_type re Wt::Dbo::Transaction transaction(session); - // If the release does not exist or is the special release "None", do nothing + // If the release does not exist, do nothing Release::pointer release = Release::getById(session, releaseId); - if (!release || release->isNone()) + if (!release) return std::vector(); std::vector tracks = release->getTracks(); diff --git a/src/database/Artist.cpp b/src/database/Artist.cpp deleted file mode 100644 index 67f4f340..00000000 --- a/src/database/Artist.cpp +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include "Types.hpp" -#include "SqlQuery.hpp" - -#include "utils/Logger.hpp" - -namespace Database -{ - -Artist::Artist(const std::string& name, const std::string& MBID) -: _name(std::string(name, 0 , _maxNameLength)), -_MBID(MBID) -{ - -} - -std::vector -Artist::getByName(Wt::Dbo::Session& session, const std::string& name) -{ - Wt::Dbo::collection res = session.find().where("name = ?").bind( std::string(name, 0, _maxNameLength) ); - return std::vector(res.begin(), res.end()); -} - -Artist::pointer -Artist::getByMBID(Wt::Dbo::Session& session, const std::string& mbid) -{ - return session.find().where("mbid = ?").bind(mbid); -} - -Artist::pointer -Artist::getById(Wt::Dbo::Session& session, Artist::id_type id) -{ - return session.find().where("id = ?").bind(id); -} - -Artist::pointer -Artist::create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID) -{ - return session.add(new Artist(name, MBID)); -} - -Artist::pointer -Artist::getNone(Wt::Dbo::Session& session) -{ - std::vector res = getByName(session, ""); - if (res.empty()) - return create(session, ""); - - return res.front(); -} - -std::vector -Artist::getAll(Wt::Dbo::Session& session, int offset, int size) -{ - Wt::Dbo::collection res = session.find().offset(offset).limit(size); - return std::vector(res.begin(), res.end()); -} - -std::vector -Artist::getAllOrphans(Wt::Dbo::Session& session) -{ - Wt::Dbo::collection res = session.query< Wt::Dbo::ptr >("select a from artist a LEFT OUTER JOIN Track t ON a.id = t.artist_id WHERE t.id IS NULL"); - - return std::vector(res.begin(), res.end()); -} - -std::vector -Artist::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size) -{ - Wt::Dbo::collection res = getQuery(session, filter).limit(size).offset(offset); - - return std::vector(res.begin(), res.end()); -} - -std::vector -Artist::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size, bool& moreResults) -{ - auto res = getByFilter(session, filter, offset, size + 1); - - if (size != -1 && res.size() == static_cast(size) + 1) - { - moreResults = true; - res.pop_back(); - } - else - moreResults = false; - - return res; -} - - - -std::vector > -Artist::getReleases() const -{ - assert(self()); - assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); - assert(session()); - - Wt::Dbo::collection< Wt::Dbo::ptr > res = session()->query >("SELECT r FROM release r INNER JOIN artist a ON t.artist_id = a.id INNER JOIN track t ON t.release_id = r.id").where("a.id = ?").bind(id()); - - return std::vector< Wt::Dbo::ptr > (res.begin(), res.end()); -} - -Wt::Dbo::Query -Artist::getQuery(Wt::Dbo::Session& session, SearchFilter filter) -{ - SqlQuery sqlQuery = generatePartialQuery(filter); - - Wt::Dbo::Query query - = session.query( "SELECT a FROM artist a INNER JOIN track t ON t.artist_id = a.id INNER JOIN release r ON r.id = t.release_id INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id " + sqlQuery.where().get()).groupBy("a.id").orderBy("a.name"); - - for (const std::string& bindArg : sqlQuery.where().getBindArgs()) - query.bind(bindArg); - - return query; -} - -Wt::Dbo::Query -Artist::getUIQuery(Wt::Dbo::Session& session, SearchFilter filter) -{ - SqlQuery sqlQuery = generatePartialQuery(filter); - - Wt::Dbo::Query query - = session.query( "SELECT a.id, a.name, COUNT(DISTINCT r.id), COUNT(DISTINCT t.id) FROM artist a INNER JOIN track t ON t.artist_id = a.id INNER JOIN release r ON r.id = t.release_id INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id " + sqlQuery.where().get()).groupBy("a.id").orderBy("a.name"); - - for (const std::string& bindArg : sqlQuery.where().getBindArgs()) - query.bind(bindArg); - - return query; -} - -void -Artist::updateUIQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel& model, SearchFilter filter, const std::vector& columnNames) -{ - Wt::Dbo::Query query = getUIQuery(session, filter); - - model.setQuery(query, columnNames.empty() ? true : false); - - // TODO do something better - if (columnNames.size() == 3) - { - model.addColumn( "a.name", columnNames.at(0)); - model.addColumn( "COUNT(DISTINCT r.id)", columnNames.at(1) ); - model.addColumn( "COUNT(DISTINCT t.id)", columnNames.at(2) ); - } -} - - -} // namespace Database diff --git a/src/database/Artist.hpp b/src/database/Artist.hpp deleted file mode 100644 index 638a0847..00000000 --- a/src/database/Artist.hpp +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#ifndef _DB_ARTIST_HPP_ -#define _DB_ARTIST_HPP_ - -#include -#include - -#include -#include - -#include "SearchFilter.hpp" - -namespace Database -{ - -class Track; -class Cluster; -class Release; - -class Artist : public Wt::Dbo::Dbo -{ - public: - - typedef Wt::Dbo::ptr pointer; - typedef Wt::Dbo::dbo_traits::IdType id_type; - - Artist() {} - Artist(const std::string& name, const std::string& MBID = ""); - - // Accessors - static pointer getByMBID(Wt::Dbo::Session& session, const std::string& MBID); - static pointer getById(Wt::Dbo::Session& session, id_type id); - static pointer getNone(Wt::Dbo::Session& session); // Special entry - static std::vector getByName(Wt::Dbo::Session& session, const std::string& name); - static std::vector getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1); - static std::vector getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size, bool& moreExpected); - - static std::vector getAll(Wt::Dbo::Session& session, int offset = -1, int size = -1); - static std::vector getAllOrphans(Wt::Dbo::Session& session); - - // Accessors - std::string getName(void) const { return _name; } - std::string getMBID(void) const { return _MBID; } - - // Get the releases that have at least one track for this artist - std::vector > getReleases() const; - - void setMBID(std::string mbid) { _MBID = mbid; } - - // Create - static pointer create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID = ""); - - // MVC models for the user interface - // ID, Artist name, albums, tracks - typedef boost::tuple UIQueryResult; - static Wt::Dbo::Query getUIQuery(Wt::Dbo::Session& session, SearchFilter filter); - static void updateUIQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel& model, SearchFilter filter, const std::vector& columnNames = std::vector()); - - bool isNone(void) const; - - template - void persist(Action& a) - { - Wt::Dbo::field(a, _name, "name"); - Wt::Dbo::field(a, _MBID, "mbid"); - - Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToOne, "artist"); - } - - private: - - static Wt::Dbo::Query getQuery(Wt::Dbo::Session& session, SearchFilter filter); - - static const std::size_t _maxNameLength = 128; - - std::string _name; - std::string _MBID; // Musicbrainz Identifier - - Wt::Dbo::collection< Wt::Dbo::ptr > _tracks; // Tracks of this artist -}; - -} // namespace Database - -#endif diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index 1aedb3b8..85164449 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -87,7 +87,6 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) _session.mapClass("playlist"); _session.mapClass("playlist_entry"); _session.mapClass("release"); - _session.mapClass("video"); _session.mapClass("media_directory"); _session.mapClass("setting"); diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp index 413e40c4..7c65b231 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/DbArtist.cpp @@ -57,22 +57,6 @@ Artist::create(Wt::Dbo::Session& session, const std::string& name, const std::st return session.add(new Artist(name, MBID)); } -Artist::pointer -Artist::getNone(Wt::Dbo::Session& session) -{ - std::vector res = getByName(session, ""); - if (res.empty()) - return create(session, ""); - - return res.front(); -} - -bool -Artist::isNone() const -{ - return _name == ""; -} - std::vector Artist::getAll(Wt::Dbo::Session& session, int offset, int size) { diff --git a/src/database/DbArtist.hpp b/src/database/DbArtist.hpp index 47c7d24f..a22360dc 100644 --- a/src/database/DbArtist.hpp +++ b/src/database/DbArtist.hpp @@ -48,7 +48,6 @@ class Artist : public Wt::Dbo::Dbo // Accessors static pointer getByMBID(Wt::Dbo::Session& session, const std::string& MBID); static pointer getById(Wt::Dbo::Session& session, id_type id); - static pointer getNone(Wt::Dbo::Session& session); // Special entry static std::vector getByName(Wt::Dbo::Session& session, const std::string& name); static std::vector getByFilter(Wt::Dbo::Session& session, const std::set& clusters, // at least one track that belongs to these clusters @@ -72,7 +71,6 @@ class Artist : public Wt::Dbo::Dbo // Create static pointer create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID = ""); - bool isNone(void) const; template void persist(Action& a) diff --git a/src/database/MediaDirectory.hpp b/src/database/MediaDirectory.hpp index c77b6b0c..e00892dd 100644 --- a/src/database/MediaDirectory.hpp +++ b/src/database/MediaDirectory.hpp @@ -36,7 +36,6 @@ class MediaDirectory enum Type { Audio = 1, - Video = 2, }; MediaDirectory() {} diff --git a/src/database/Release.cpp b/src/database/Release.cpp index 2b338e34..d3d73732 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -56,22 +56,6 @@ Release::create(Wt::Dbo::Session& session, const std::string& name, const std::s return session.add(new Release(name, MBID)); } -bool -Release::isNone() const -{ - return _name == ""; -} - -Release::pointer -Release::getNone(Wt::Dbo::Session& session) -{ - std::vector res = getByName(session, ""); - if (res.empty()) - return create(session, ""); - - return res.front(); -} - std::vector Release::getAll(Wt::Dbo::Session& session, int offset, int size) { diff --git a/src/database/Release.hpp b/src/database/Release.hpp index 3feb0100..b9d8acac 100644 --- a/src/database/Release.hpp +++ b/src/database/Release.hpp @@ -46,7 +46,6 @@ class Release : public Wt::Dbo::Dbo static pointer getByMBID(Wt::Dbo::Session& session, const std::string& MBID); static std::vector getByName(Wt::Dbo::Session& session, const std::string& name); static pointer getById(Wt::Dbo::Session& session, id_type id); - static pointer getNone(Wt::Dbo::Session& session); // Special entry static std::vector getAllOrphans(Wt::Dbo::Session& session); // no track related static std::vector getAll(Wt::Dbo::Session& session, int offset, int size); @@ -68,7 +67,6 @@ class Release : public Wt::Dbo::Dbo // Accessors std::string getName() const { return _name; } std::string getMBID() const { return _MBID; } - bool isNone(void) const; boost::posix_time::time_duration getDuration(void) const; // Get the artists of this release diff --git a/src/database/Track.cpp b/src/database/Track.cpp index 50c16a4d..a7d5ab9c 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -240,21 +240,6 @@ Cluster::getByType(Wt::Dbo::Session& session, std::string type) return std::vector(res.begin(), res.end()); } -Cluster::pointer -Cluster::getNone(Wt::Dbo::Session& session) -{ - pointer res = get(session, "", ""); - if (!res) - res = create(session, "", ""); - return res; -} - -bool -Cluster::isNone(void) const -{ - return (_type == "" && _name == ""); -} - Cluster::pointer Cluster::create(Wt::Dbo::Session& session, std::string type, std::string name) { diff --git a/src/database/Track.hpp b/src/database/Track.hpp index 0d81a36d..01a1566c 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -59,7 +59,6 @@ class Cluster // Find utility static pointer get(Wt::Dbo::Session& session, std::string type, std::string name); - static pointer getNone(Wt::Dbo::Session& session); static std::vector getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1); static Wt::Dbo::collection getAll(Wt::Dbo::Session& session); static std::vector getAllTypes(Wt::Dbo::Session& session); @@ -74,7 +73,6 @@ class Cluster // Accessors const std::string& getName(void) const { return _name; } const std::string& getType(void) const { return _type; } - bool isNone(void) const; const Wt::Dbo::collection< Wt::Dbo::ptr >& getTracks() const { return _tracks;} void addTrack(Wt::Dbo::Session& session, Wt::Dbo::dbo_traits::IdType trackId); diff --git a/src/database/Types.hpp b/src/database/Types.hpp index 681e4c97..0518cbe5 100644 --- a/src/database/Types.hpp +++ b/src/database/Types.hpp @@ -23,7 +23,6 @@ #include "Track.hpp" #include "Playlist.hpp" #include "Release.hpp" -#include "Video.hpp" #include "MediaDirectory.hpp" #include "User.hpp" diff --git a/src/database/Video.cpp b/src/database/Video.cpp deleted file mode 100644 index 6568604d..00000000 --- a/src/database/Video.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include "Types.hpp" - -namespace Database { - -Video::Video() -{ -} - -Video::Video(const boost::filesystem::path& p) -: _filePath(p.string()) -{ -} - -Video::pointer -Video::create(Wt::Dbo::Session& session, const boost::filesystem::path& p) -{ - return session.add(new Video(p)); -} - -Wt::Dbo::collection< Video::pointer > -Video::getAll(Wt::Dbo::Session& session) -{ - return session.find
${}${tr:msg-various-artists}${}

${}${year}${}${} (${orig-year})${}

+ ${play-btn}${add-btn}
diff --git a/approot/release.xml b/approot/release.xml index e92c6289..1748c3cd 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -3,6 +3,14 @@ + + + + + + + + ${cover}
diff --git a/approot/tracks.xml b/approot/tracks.xml index 047796e8..62091789 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -16,6 +16,14 @@ ${tracks class="list-group"} + + + + + + + +
diff --git a/src/ui/ArtistView.cpp b/src/ui/ArtistView.cpp index c9452408..47f1094e 100644 --- a/src/ui/ArtistView.cpp +++ b/src/ui/ArtistView.cpp @@ -74,6 +74,15 @@ Artist::refresh() t->addFunction("tr", &Wt::WTemplate::Functions::tr); t->bindString("name", Wt::WString::fromUTF8(artist->getName()), Wt::PlainText); + { + auto playBtn = new Wt::WText(Wt::WString::tr("btn-artist-play-btn"), Wt::XHTMLText); + t->bindWidget("play-btn", playBtn); + } + + { + auto addBtn = new Wt::WText(Wt::WString::tr("btn-artist-add-btn"), Wt::XHTMLText); + t->bindWidget("add-btn", addBtn); + } auto releasesContainer = new Wt::WContainerWidget(); t->bindWidget("releases", releasesContainer); @@ -116,6 +125,12 @@ Artist::refresh() entry->bindInt("orig-year", *originalYear); } } + + auto playBtn = new Wt::WText(Wt::WString::tr("btn-artist-play-btn"), Wt::XHTMLText); + entry->bindWidget("play-btn", playBtn); + + auto addBtn = new Wt::WText(Wt::WString::tr("btn-artist-add-btn"), Wt::XHTMLText); + entry->bindWidget("add-btn", addBtn); } } diff --git a/src/ui/ReleaseView.cpp b/src/ui/ReleaseView.cpp index 2fdcd568..a98adb8a 100644 --- a/src/ui/ReleaseView.cpp +++ b/src/ui/ReleaseView.cpp @@ -105,7 +105,15 @@ Release::refresh() cover->setImageLink(Wt::WLink (SessionImageResource()->getReleaseUrl(release.id(), 512))); t->bindWidget("cover", cover); - // TODO play/add button + { + auto playBtn = new Wt::WText(Wt::WString::tr("btn-release-play-btn"), Wt::XHTMLText); + t->bindWidget("play-btn", playBtn); + } + + { + auto addBtn = new Wt::WText(Wt::WString::tr("btn-release-add-btn"), Wt::XHTMLText); + t->bindWidget("add-btn", addBtn); + } auto tracksContainer = new Wt::WContainerWidget(); t->bindWidget("tracks", tracksContainer); @@ -144,6 +152,12 @@ Release::refresh() entry->setCondition("if-has-disc-number", true); entry->bindInt("disc-number", *discNumber); } + + auto playBtn = new Wt::WText(Wt::WString::tr("btn-release-play-btn"), Wt::XHTMLText); + entry->bindWidget("play-btn", playBtn); + + auto addBtn = new Wt::WText(Wt::WString::tr("btn-release-add-btn"), Wt::XHTMLText); + entry->bindWidget("add-btn", addBtn); } } diff --git a/src/ui/TracksView.cpp b/src/ui/TracksView.cpp index 152970ac..d995a078 100644 --- a/src/ui/TracksView.cpp +++ b/src/ui/TracksView.cpp @@ -106,6 +106,12 @@ Tracks::refresh(std::vector searchKeywords) // Some images may not be square cover->setWidth(64); entry->bindWidget("cover", cover); + + auto playBtn = new Wt::WText(Wt::WString::tr("btn-tracks-play-btn"), Wt::XHTMLText); + entry->bindWidget("play-btn", playBtn); + + auto addBtn = new Wt::WText(Wt::WString::tr("btn-tracks-add-btn"), Wt::XHTMLText); + entry->bindWidget("add-btn", addBtn); } } From cbd77a7a73d41c8da5790f7a22d7324be66f9907 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 11 Feb 2018 12:26:43 +0100 Subject: [PATCH 041/195] Added play/pause buttons --- approot/release.xml | 2 +- approot/releases.xml | 9 +++++++++ src/ui/ReleasesView.cpp | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/approot/release.xml b/approot/release.xml index 1748c3cd..eff1d0a2 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -17,7 +17,7 @@

${name}

${artist-name}

${}${year}${}${} (${orig-year})${}

- ${play-btn}${add-btn} + ${play-btn}${add-btn}
${tracks} diff --git a/approot/releases.xml b/approot/releases.xml index a7cca098..374bcd91 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -16,6 +16,14 @@ ${releases class="list-group"} + + + + + + + +
@@ -25,6 +33,7 @@

${release-name}

${artist-name}
+ ${play-btn}${add-btn}
diff --git a/src/ui/ReleasesView.cpp b/src/ui/ReleasesView.cpp index 95f99ab9..6b5d148f 100644 --- a/src/ui/ReleasesView.cpp +++ b/src/ui/ReleasesView.cpp @@ -107,6 +107,12 @@ Releases::refresh(std::vector searchKeywords) artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText)); entry->bindWidget("artist-name", artistAnchor); } + + auto playBtn = new Wt::WText(Wt::WString::tr("btn-releases-play-btn"), Wt::XHTMLText); + entry->bindWidget("play-btn", playBtn); + + auto addBtn = new Wt::WText(Wt::WString::tr("btn-releases-add-btn"), Wt::XHTMLText); + entry->bindWidget("add-btn", addBtn); } } From 591b5c62c320e25392d4c9a2260e24767bc841c6 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 12 Feb 2018 13:46:41 +0100 Subject: [PATCH 042/195] Added missing filter event on release view --- src/ui/ReleaseView.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ui/ReleaseView.cpp b/src/ui/ReleaseView.cpp index a98adb8a..db6d597b 100644 --- a/src/ui/ReleaseView.cpp +++ b/src/ui/ReleaseView.cpp @@ -43,6 +43,10 @@ Release::Release(Filters* filters, Wt::WContainerWidget* parent) })); refresh(); + + filters->updated().connect(std::bind([=] { + refresh(); + })); } void From 058f1e4529cb7a1f73dba491b5baf920f0d8b8aa Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 14 Feb 2018 13:28:33 +0100 Subject: [PATCH 043/195] Added mediaplayer skeleton --- Makefile.am | 1 + approot/mediaplayer.xml | 38 ++++++++++++++++++++++++++++++++++++++ approot/templates.xml | 1 + src/Makefile.am | 1 + src/ui/LmsApplication.cpp | 7 ++++--- 5 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 approot/mediaplayer.xml diff --git a/Makefile.am b/Makefile.am index ae035de4..0be57c11 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ lms_images_DATA = \ lms_approot_DATA = \ approot/artists.xml \ approot/artist.xml \ + approot/mediaplayer.xml \ approot/messages.xml \ approot/releases.xml \ approot/release.xml \ diff --git a/approot/mediaplayer.xml b/approot/mediaplayer.xml new file mode 100644 index 00000000..945a307a --- /dev/null +++ b/approot/mediaplayer.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${previous} ${play-pause} ${next} + ${next} ${cover} + ${current-time} ${total-time} ${shuffle} ${repeat} + ${}${artist-name}${} + ${}${release-name}${} + ${track-name} + + + diff --git a/approot/templates.xml b/approot/templates.xml index 5f93b41d..a6581c0f 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -5,6 +5,7 @@ ${navbar-top class="main-nav"} ${contents class="container"} + ${player} diff --git a/src/Makefile.am b/src/Makefile.am index 5bcbc8a6..58cd27d6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,6 +29,7 @@ lms_SOURCES = \ $(srcdir)/ui/Filters.cpp \ $(srcdir)/ui/HomeView.cpp \ $(srcdir)/ui/LmsApplication.cpp \ + $(srcdir)/ui/MediaPlayer.cpp \ $(srcdir)/ui/ReleasesView.cpp \ $(srcdir)/ui/ReleaseView.cpp \ $(srcdir)/ui/TracksView.cpp \ diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 063e97be..b5582f34 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -31,7 +31,7 @@ #include "auth/LmsAuth.hpp" #include "Explore.hpp" #include "HomeView.hpp" - +#include "MediaPlayer.hpp" #include "LmsApplication.hpp" @@ -81,6 +81,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti messageResourceBundle().use(appRoot() + "artist"); messageResourceBundle().use(appRoot() + "artists"); messageResourceBundle().use(appRoot() + "messages"); + messageResourceBundle().use(appRoot() + "mediaplayer"); messageResourceBundle().use(appRoot() + "templates"); messageResourceBundle().use(appRoot() + "release"); messageResourceBundle().use(appRoot() + "releases"); @@ -270,8 +271,8 @@ LmsApplication::handleAuthEvent(void) mainStack->addWidget(new Wt::WText("SETTINGS")); // MediaPlayer -// auto player = new AudioPlayer(AudioPlayer::ControlPlayqueue); -// main->bindWidget("player", player); + auto player = new MediaPlayer(); + main->bindWidget("player", player); internalPathChanged().connect(std::bind([=] { From e88bcfd2c5693777ff0b77bbbeca6dff9a25a3cf Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 14 Feb 2018 13:30:54 +0100 Subject: [PATCH 044/195] Added mediaplayer skeleton --- approot/mediaplayer.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/approot/mediaplayer.xml b/approot/mediaplayer.xml index 945a307a..0d445ca6 100644 --- a/approot/mediaplayer.xml +++ b/approot/mediaplayer.xml @@ -28,7 +28,7 @@ ${previous} ${play-pause} ${next} - ${next} ${cover} + ${cover} ${current-time} ${total-time} ${shuffle} ${repeat} ${}${artist-name}${} ${}${release-name}${} From 7ffc9a3262908d862ba182a156e475ff85ebc91a Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 16 Feb 2018 12:42:27 +0100 Subject: [PATCH 045/195] Added mediaplayer skeleton --- src/ui/MediaPlayer.cpp | 60 ++++++++++++++++++++++++++++++++++++++++++ src/ui/MediaPlayer.hpp | 33 +++++++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 src/ui/MediaPlayer.cpp create mode 100644 src/ui/MediaPlayer.hpp diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp new file mode 100644 index 00000000..23d603c6 --- /dev/null +++ b/src/ui/MediaPlayer.cpp @@ -0,0 +1,60 @@ +/* + * 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 . + */ +#include +#include +#include +#include + +#include "MediaPlayer.hpp" + +namespace UserInterface { + +MediaPlayer::MediaPlayer(Wt::WContainerWidget* parent) +: Wt::WContainerWidget(parent) +{ + auto player = new Wt::WTemplate(Wt::WString::tr("template-mediaplayer"), this); + + auto playPauseBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-play"), Wt::XHTMLText); + player->bindWidget("play-pause", playPauseBtn); + + auto prevBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-prev"), Wt::XHTMLText); + player->bindWidget("previous", prevBtn); + + auto nextBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-next"), Wt::XHTMLText); + player->bindWidget("next", nextBtn); + + auto shuffleBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-shuffle"), Wt::XHTMLText); + player->bindWidget("shuffle", shuffleBtn); + + auto repeatBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-repeat"), Wt::XHTMLText); + player->bindWidget("repeat", repeatBtn); + + player->bindString("current-time", "00:00"); + player->bindString("total-time", "00:00"); + + auto cover = new Wt::WImage(); + player->bindWidget("cover", cover); + + auto trackName = new Wt::WText("---"); + player->bindWidget("track-name", trackName); + +} + +} // namespace UserInterface + diff --git a/src/ui/MediaPlayer.hpp b/src/ui/MediaPlayer.hpp new file mode 100644 index 00000000..69615b68 --- /dev/null +++ b/src/ui/MediaPlayer.hpp @@ -0,0 +1,33 @@ +/* + * 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 . + */ + +#pragma once + +#include + +namespace UserInterface { + +class MediaPlayer : public Wt::WContainerWidget +{ + public: + MediaPlayer(Wt::WContainerWidget* parent = 0); +}; + +} // namespace UserInterface + From 606029664906c341e37d1fdfc6e7cfcd8f42a234 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 19 Feb 2018 16:07:14 +0100 Subject: [PATCH 046/195] Added playlist skeleton --- Makefile.am | 1 + approot/playlist.xml | 40 ++++++++++++ approot/release.xml | 1 - src/Makefile.am | 1 + src/database/Playlist.cpp | 6 +- src/database/Playlist.hpp | 18 +++--- src/ui/ArtistView.cpp | 25 +++++++- src/ui/ArtistView.hpp | 11 +++- src/ui/ArtistsView.cpp | 1 + src/ui/ArtistsView.hpp | 8 ++- src/ui/Explore.cpp | 125 +++++++++++++++++++++++++++++++++++--- src/ui/Explore.hpp | 18 ++++++ src/ui/LmsApplication.cpp | 24 ++++++-- src/ui/PlaylistView.cpp | 67 ++++++++++++++++++++ src/ui/PlaylistView.hpp | 43 +++++++++++++ src/ui/ReleaseView.cpp | 19 ++++++ src/ui/ReleaseView.hpp | 9 ++- src/ui/ReleasesView.cpp | 17 +++++- src/ui/ReleasesView.hpp | 7 ++- src/ui/TracksView.cpp | 10 +++ src/ui/TracksView.hpp | 6 +- 21 files changed, 419 insertions(+), 38 deletions(-) create mode 100644 approot/playlist.xml create mode 100644 src/ui/PlaylistView.cpp create mode 100644 src/ui/PlaylistView.hpp diff --git a/Makefile.am b/Makefile.am index 0be57c11..7153c82b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,7 @@ lms_approot_DATA = \ approot/artist.xml \ approot/mediaplayer.xml \ approot/messages.xml \ + approot/playlist.xml \ approot/releases.xml \ approot/release.xml \ approot/templates.xml \ diff --git a/approot/playlist.xml b/approot/playlist.xml new file mode 100644 index 00000000..077f9557 --- /dev/null +++ b/approot/playlist.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + +
+

${tr:msg-playlist}

+ ${save-btn} ${load-btn} ${clear-btn} +
+ ${entries} + + + +
+
+ ${cover class="media-object"} +
+
+

${name}

+
+
+ ${}${release-name}${} + ${}${artist-name}${} + + ${play-btn} ${remove-btn} + + + diff --git a/approot/release.xml b/approot/release.xml index eff1d0a2..68def396 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -1,4 +1,3 @@ - diff --git a/src/Makefile.am b/src/Makefile.am index 58cd27d6..54f36b85 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,6 +30,7 @@ lms_SOURCES = \ $(srcdir)/ui/HomeView.cpp \ $(srcdir)/ui/LmsApplication.cpp \ $(srcdir)/ui/MediaPlayer.cpp \ + $(srcdir)/ui/PlaylistView.cpp \ $(srcdir)/ui/ReleasesView.cpp \ $(srcdir)/ui/ReleaseView.cpp \ $(srcdir)/ui/TracksView.cpp \ diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index 38aec290..c63e3777 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -54,7 +54,7 @@ Playlist::get(Wt::Dbo::Session& session, std::string name, Wt::Dbo::ptr us } std::vector -Playlist::get(Wt::Dbo::Session& session, Wt::Dbo::ptr user) +Playlist::getAll(Wt::Dbo::Session& session, Wt::Dbo::ptr user) { Wt::Dbo::collection res = session.find().where("user_id = ?").bind(user.id()).orderBy("name"); @@ -74,7 +74,7 @@ PlaylistEntry::create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt:: { return session.add( new PlaylistEntry( track, playlist, pos) ); } - +/* std::vector PlaylistEntry::getEntries(Wt::Dbo::Session& session, Playlist::pointer playlist) { @@ -87,6 +87,6 @@ PlaylistEntry::getEntries(Wt::Dbo::Session& session, Playlist::pointer playlist) res.push_back((*it)->getTrack().id()); return res; -} +}*/ } // namespace Database diff --git a/src/database/Playlist.hpp b/src/database/Playlist.hpp index a8e0ddf0..c2a02a36 100644 --- a/src/database/Playlist.hpp +++ b/src/database/Playlist.hpp @@ -40,15 +40,22 @@ class Playlist // Search utility static pointer get(Wt::Dbo::Session& session, std::string name, Wt::Dbo::ptr user); - - // ordered by name - static std::vector get(Wt::Dbo::Session& session, Wt::Dbo::ptr user); + static std::vector getAll(Wt::Dbo::Session& session, Wt::Dbo::ptr user); // Create utility static pointer create(Wt::Dbo::Session& session, std::string name, bool isPublic, Wt::Dbo::ptr user); // Accessors std::string getName() const { return _name; } + bool isPublic() const { return _isPublic; } + + // Modifiers + void addTrack(id_type trackId); + void addTracks(const std::vector& trackIds); + void clear(); + + // Get tracks, ordered by position + std::vector getEntries(Wt::Dbo::Session& session, int offset = -1, int size = -1); template void persist(Action& a) @@ -77,11 +84,6 @@ class PlaylistEntry PlaylistEntry(); PlaylistEntry(Wt::Dbo::ptr rack, Wt::Dbo::ptr playlist, int position); - // Search utility - - // Get the position ordered track id list - static std::vector getEntries(Wt::Dbo::Session& session,Wt::Dbo::ptr playlist); - // Create utility static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr playlist, int position); diff --git a/src/ui/ArtistView.cpp b/src/ui/ArtistView.cpp index 47f1094e..fc529a4f 100644 --- a/src/ui/ArtistView.cpp +++ b/src/ui/ArtistView.cpp @@ -29,6 +29,7 @@ #include "utils/Utils.hpp" #include "LmsApplication.hpp" +#include "Filters.hpp" #include "ArtistView.hpp" namespace UserInterface { @@ -77,11 +78,21 @@ Artist::refresh() { auto playBtn = new Wt::WText(Wt::WString::tr("btn-artist-play-btn"), Wt::XHTMLText); t->bindWidget("play-btn", playBtn); + + playBtn->clicked().connect(std::bind([=] + { + artistPlay.emit(artistId); + })); } { auto addBtn = new Wt::WText(Wt::WString::tr("btn-artist-add-btn"), Wt::XHTMLText); t->bindWidget("add-btn", addBtn); + + addBtn->clicked().connect(std::bind([=] + { + artistAdd.emit(artistId); + })); } auto releasesContainer = new Wt::WContainerWidget(); @@ -90,11 +101,13 @@ Artist::refresh() auto releases = artist->getReleases(_filters->getClusterIds()); for (auto release : releases) { + auto releaseId = release.id(); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-artist-entry"), releasesContainer); entry->addFunction("tr", Wt::WTemplate::Functions::tr); { - Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); + Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(releaseId))); Wt::WImage* cover = new Wt::WImage(coverAnchor); cover->setImageLink(SessionImageResource()->getReleaseUrl(release.id(), 128)); // Some images may not be square @@ -103,7 +116,7 @@ Artist::refresh() } { - Wt::WAnchor* releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); + Wt::WAnchor* releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(releaseId))); Wt::WText* releaseName = new Wt::WText(releaseAnchor); releaseName->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); entry->bindWidget("name", releaseAnchor); @@ -128,9 +141,17 @@ Artist::refresh() auto playBtn = new Wt::WText(Wt::WString::tr("btn-artist-play-btn"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); + playBtn->clicked().connect(std::bind([=] + { + releasePlay.emit(releaseId); + })); auto addBtn = new Wt::WText(Wt::WString::tr("btn-artist-add-btn"), Wt::XHTMLText); entry->bindWidget("add-btn", addBtn); + addBtn->clicked().connect(std::bind([=] + { + releaseAdd.emit(releaseId); + })); } } diff --git a/src/ui/ArtistView.hpp b/src/ui/ArtistView.hpp index eb7262d7..b6f7d78e 100644 --- a/src/ui/ArtistView.hpp +++ b/src/ui/ArtistView.hpp @@ -20,16 +20,23 @@ #pragma once #include - -#include "Filters.hpp" +#include namespace UserInterface { +class Filters; + class Artist : public Wt::WContainerWidget { public: Artist(Filters* filters, Wt::WContainerWidget* parent = 0); + Wt::Signal artistAdd; + Wt::Signal artistPlay; + + Wt::Signal releaseAdd; + Wt::Signal releasePlay; + private: void refresh(); diff --git a/src/ui/ArtistsView.cpp b/src/ui/ArtistsView.cpp index be50e252..c30ad77e 100644 --- a/src/ui/ArtistsView.cpp +++ b/src/ui/ArtistsView.cpp @@ -28,6 +28,7 @@ #include "utils/Utils.hpp" #include "LmsApplication.hpp" +#include "Filters.hpp" #include "ArtistsView.hpp" namespace UserInterface { diff --git a/src/ui/ArtistsView.hpp b/src/ui/ArtistsView.hpp index 2cc29bfc..74e07bab 100644 --- a/src/ui/ArtistsView.hpp +++ b/src/ui/ArtistsView.hpp @@ -20,16 +20,20 @@ #pragma once #include - -#include "Filters.hpp" +#include namespace UserInterface { +class Filters; + class Artists : public Wt::WContainerWidget { public: Artists(Filters* filters, Wt::WContainerWidget* parent = 0); + Wt::Signal artistAdd; + Wt::Signal artistPlay; + private: void refresh(std::vector searchKeywords = std::vector()); diff --git a/src/ui/Explore.cpp b/src/ui/Explore.cpp index 8686f0f2..20539133 100644 --- a/src/ui/Explore.cpp +++ b/src/ui/Explore.cpp @@ -25,6 +25,7 @@ #include "LmsApplication.hpp" +#include "Filters.hpp" #include "ArtistsView.hpp" #include "ArtistView.hpp" #include "ReleasesView.hpp" @@ -74,18 +75,47 @@ Explore::Explore(Wt::WContainerWidget* parent) { auto container = new Wt::WTemplate(Wt::WString::tr("template-explore"), this); - auto filters = new Filters(); - container->bindWidget("filters", filters); + _filters = new Filters(); + container->bindWidget("filters", _filters); // Contents Wt::WStackedWidget* stack = new Wt::WStackedWidget(); container->bindWidget("contents", stack); - stack->addWidget(new Artists(filters)); - stack->addWidget(new Artist(filters)); - stack->addWidget(new Releases(filters)); - stack->addWidget(new Release(filters)); - stack->addWidget(new Tracks(filters)); + auto artists = new Artists(_filters); + stack->addWidget(artists); + + artists->artistAdd.connect(this, &Explore::handleArtistAdd); + artists->artistPlay.connect(this, &Explore::handleArtistPlay); + + auto artist = new Artist(_filters); + stack->addWidget(artist); + + artist->artistAdd.connect(this, &Explore::handleArtistAdd); + artist->artistPlay.connect(this, &Explore::handleArtistPlay); + artist->releaseAdd.connect(this, &Explore::handleReleaseAdd); + artist->releasePlay.connect(this, &Explore::handleReleasePlay); + + auto releases = new Releases(_filters); + stack->addWidget(releases); + + releases->releaseAdd.connect(this, &Explore::handleReleaseAdd); + releases->releasePlay.connect(this, &Explore::handleReleasePlay); + + auto release = new Release(_filters); + stack->addWidget(release); + + release->releaseAdd.connect(this, &Explore::handleReleaseAdd); + release->releasePlay.connect(this, &Explore::handleReleasePlay); + release->trackAdd.connect(this, &Explore::handleTrackAdd); + release->trackPlay.connect(this, &Explore::handleTrackPlay); + + auto tracks = new Tracks(_filters); + stack->addWidget(tracks); + + tracks->trackAdd.connect(this, &Explore::handleTrackAdd); + tracks->trackPlay.connect(this, &Explore::handleTrackPlay); + wApp->internalPathChanged().connect(std::bind([=] { @@ -94,5 +124,86 @@ Explore::Explore(Wt::WContainerWidget* parent) handlePathChange(stack); } + +// TODO SQL this? +static std::vector getArtistTracks(Wt::Dbo::Session& session, Database::id_type artistId, std::set clusters) +{ + std::vector res; + + Wt::Dbo::Transaction transaction(session); + + auto artist = Database::Artist::getById(session, artistId); + if (!artist) + return res; + + auto releases = artist->getReleases(clusters); + for (auto release : releases) + { + auto tracks = release->getTracks(clusters); + + for (auto track : tracks) + { + res.push_back(track.id()); + } + } + + return res; +} + +static std::vector getReleaseTracks(Wt::Dbo::Session& session, Database::id_type releaseId, std::set clusters) +{ + std::vector res; + + Wt::Dbo::Transaction transaction(session); + + auto release = Database::Release::getById(session, releaseId); + if (!release) + return res; + + auto tracks = release->getTracks(clusters); + for (auto track : tracks) + { + res.push_back(track.id()); + } + + return res; +} + +void +Explore::handleArtistAdd(Database::id_type id) +{ + tracksAdd.emit(getArtistTracks(DboSession(), id, _filters->getClusterIds())); +} + +void +Explore::handleArtistPlay(Database::id_type id) +{ + tracksPlay.emit(getArtistTracks(DboSession(), id, _filters->getClusterIds())); +} + +void +Explore::handleReleaseAdd(Database::id_type id) +{ + tracksAdd.emit(getReleaseTracks(DboSession(), id, _filters->getClusterIds())); +} + +void +Explore::handleReleasePlay(Database::id_type id) +{ + tracksPlay.emit(getReleaseTracks(DboSession(), id, _filters->getClusterIds())); +} + +void +Explore::handleTrackAdd(Database::id_type id) +{ + tracksAdd.emit(std::vector(1, id)); +} + +void +Explore::handleTrackPlay(Database::id_type id) +{ + tracksPlay.emit(std::vector(1, id)); +} + } // namespace UserInterface diff --git a/src/ui/Explore.hpp b/src/ui/Explore.hpp index ac360a83..c7857811 100644 --- a/src/ui/Explore.hpp +++ b/src/ui/Explore.hpp @@ -21,12 +21,30 @@ #include +#include "database/Types.hpp" + namespace UserInterface { +class Filters; + class Explore : public Wt::WContainerWidget { public: Explore(Wt::WContainerWidget *parent = 0); + + Wt::Signal> tracksAdd; + Wt::Signal> tracksPlay; + + private: + + void handleArtistAdd(Database::id_type id); + void handleArtistPlay(Database::id_type id); + void handleReleaseAdd(Database::id_type id); + void handleReleasePlay(Database::id_type id); + void handleTrackAdd(Database::id_type id); + void handleTrackPlay(Database::id_type id); + + Filters* _filters; }; } // namespace UserInterface diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index b5582f34..51d0d665 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -32,6 +32,7 @@ #include "Explore.hpp" #include "HomeView.hpp" #include "MediaPlayer.hpp" +#include "PlaylistView.hpp" #include "LmsApplication.hpp" @@ -80,12 +81,13 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti // Add a resource bundle messageResourceBundle().use(appRoot() + "artist"); messageResourceBundle().use(appRoot() + "artists"); - messageResourceBundle().use(appRoot() + "messages"); messageResourceBundle().use(appRoot() + "mediaplayer"); - messageResourceBundle().use(appRoot() + "templates"); + messageResourceBundle().use(appRoot() + "messages"); + messageResourceBundle().use(appRoot() + "playlist"); messageResourceBundle().use(appRoot() + "release"); messageResourceBundle().use(appRoot() + "releases"); messageResourceBundle().use(appRoot() + "tracks"); + messageResourceBundle().use(appRoot() + "templates"); setTitle("LMS"); @@ -266,10 +268,24 @@ LmsApplication::handleAuthEvent(void) main->bindWidget("contents", mainStack); mainStack->addWidget(new Home()); - mainStack->addWidget(new Explore()); - mainStack->addWidget(new Wt::WText("PLAYLIST")); + + auto explore = new Explore(); + mainStack->addWidget(explore); + + auto playlist = new Playlist(); + mainStack->addWidget(playlist); mainStack->addWidget(new Wt::WText("SETTINGS")); + explore->tracksAdd.connect(std::bind([=] (std::vector tracks) + { + playlist->addTracks(tracks); + }, std::placeholders::_1)); + + explore->tracksPlay.connect(std::bind([=] (std::vector tracks) + { + playlist->playTracks(tracks); + }, std::placeholders::_1)); + // MediaPlayer auto player = new MediaPlayer(); main->bindWidget("player", player); diff --git a/src/ui/PlaylistView.cpp b/src/ui/PlaylistView.cpp new file mode 100644 index 00000000..93f32f7a --- /dev/null +++ b/src/ui/PlaylistView.cpp @@ -0,0 +1,67 @@ +/* + * 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 . + */ + +#include +#include + +#include "PlaylistView.hpp" + +namespace UserInterface { + +Playlist::Playlist(Wt::WContainerWidget* parent) +: Wt::WContainerWidget(parent) +{ + auto t = new Wt::WTemplate(Wt::WString::tr("template-playlist"), this); + t->addFunction("tr", &Wt::WTemplate::Functions::tr); + + auto saveBtn = new Wt::WText(Wt::WString::tr("btn-playlist-save-btn"), Wt::XHTMLText); + t->bindWidget("save-btn", saveBtn); + + auto loadBtn = new Wt::WText(Wt::WString::tr("btn-playlist-load-btn"), Wt::XHTMLText); + t->bindWidget("load-btn", loadBtn); + + auto clearBtn = new Wt::WText(Wt::WString::tr("btn-playlist-clear-btn"), Wt::XHTMLText); + t->bindWidget("clear-btn", clearBtn); + + _entriesContainer = new Wt::WContainerWidget(); + t->bindWidget("entries", _entriesContainer); +} + +void +Playlist::addTracks(const std::vector& trackIds) +{ + for (auto trackId : trackIds) + std::cerr << "Adding track " << trackId << std::endl; +} + +void +Playlist::playTracks(const std::vector& trackIds) +{ + for (auto trackId : trackIds) + std::cerr << "Playing track " << trackId << std::endl; +} + +void +Playlist::refresh() +{ + +} + +} // namespace UserInterface + diff --git a/src/ui/PlaylistView.hpp b/src/ui/PlaylistView.hpp new file mode 100644 index 00000000..fa1f6863 --- /dev/null +++ b/src/ui/PlaylistView.hpp @@ -0,0 +1,43 @@ +/* + * 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 . + */ + +#pragma once + +#include + +#include "database/Types.hpp" + +namespace UserInterface { + +class Playlist : public Wt::WContainerWidget +{ + public: + Playlist(Wt::WContainerWidget* parent = 0); + + void addTracks(const std::vector& trackIds); + void playTracks(const std::vector& trackIds); + + private: + void refresh(); + + Wt::WContainerWidget* _entriesContainer; +}; + +} // namespace UserInterface + diff --git a/src/ui/ReleaseView.cpp b/src/ui/ReleaseView.cpp index db6d597b..bd224e47 100644 --- a/src/ui/ReleaseView.cpp +++ b/src/ui/ReleaseView.cpp @@ -29,6 +29,7 @@ #include "utils/Utils.hpp" #include "LmsApplication.hpp" +#include "Filters.hpp" #include "ReleaseView.hpp" namespace UserInterface { @@ -112,11 +113,19 @@ Release::refresh() { auto playBtn = new Wt::WText(Wt::WString::tr("btn-release-play-btn"), Wt::XHTMLText); t->bindWidget("play-btn", playBtn); + playBtn->clicked().connect(std::bind([=] + { + releasePlay.emit(releaseId); + })); } { auto addBtn = new Wt::WText(Wt::WString::tr("btn-release-add-btn"), Wt::XHTMLText); t->bindWidget("add-btn", addBtn); + addBtn->clicked().connect(std::bind([=] + { + releaseAdd.emit(releaseId); + })); } auto tracksContainer = new Wt::WContainerWidget(); @@ -129,6 +138,8 @@ Release::refresh() for (auto track : tracks) { + auto trackId = track.id(); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-release-entry"), tracksContainer); entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); @@ -159,9 +170,17 @@ Release::refresh() auto playBtn = new Wt::WText(Wt::WString::tr("btn-release-play-btn"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); + playBtn->clicked().connect(std::bind([=] + { + trackPlay.emit(trackId); + })); auto addBtn = new Wt::WText(Wt::WString::tr("btn-release-add-btn"), Wt::XHTMLText); entry->bindWidget("add-btn", addBtn); + addBtn->clicked().connect(std::bind([=] + { + trackAdd.emit(trackId); + })); } } diff --git a/src/ui/ReleaseView.hpp b/src/ui/ReleaseView.hpp index b51568cd..a11be0c2 100644 --- a/src/ui/ReleaseView.hpp +++ b/src/ui/ReleaseView.hpp @@ -21,15 +21,20 @@ #include -#include "Filters.hpp" - namespace UserInterface { +class Filters; class Release : public Wt::WContainerWidget { public: Release(Filters* filters, Wt::WContainerWidget* parent = 0); + Wt::Signal releaseAdd; + Wt::Signal releasePlay; + + Wt::Signal trackAdd; + Wt::Signal trackPlay; + private: void refresh(); diff --git a/src/ui/ReleasesView.cpp b/src/ui/ReleasesView.cpp index 6b5d148f..9c1bfdf7 100644 --- a/src/ui/ReleasesView.cpp +++ b/src/ui/ReleasesView.cpp @@ -30,6 +30,7 @@ #include "utils/Utils.hpp" #include "LmsApplication.hpp" +#include "Filters.hpp" #include "ReleasesView.hpp" namespace UserInterface { @@ -77,18 +78,20 @@ Releases::refresh(std::vector searchKeywords) for (auto release : releases) { + auto releaseId = release.id(); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-releases-entry"), _releasesContainer); entry->addFunction("tr", Wt::WTemplate::Functions::tr); - Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); + Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(releaseId))); Wt::WImage* cover = new Wt::WImage(coverAnchor); - cover->setImageLink(SessionImageResource()->getReleaseUrl(release.id(), 128)); + cover->setImageLink(SessionImageResource()->getReleaseUrl(releaseId, 128)); // Some images may not be square cover->setWidth(128); entry->bindWidget("cover", coverAnchor); { - Wt::WAnchor* releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); + Wt::WAnchor* releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(releaseId))); Wt::WText* releaseName = new Wt::WText(releaseAnchor); releaseName->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); entry->bindWidget("release-name", releaseAnchor); @@ -110,9 +113,17 @@ Releases::refresh(std::vector searchKeywords) auto playBtn = new Wt::WText(Wt::WString::tr("btn-releases-play-btn"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); + playBtn->clicked().connect(std::bind([=] + { + releasePlay.emit(releaseId); + })); auto addBtn = new Wt::WText(Wt::WString::tr("btn-releases-add-btn"), Wt::XHTMLText); entry->bindWidget("add-btn", addBtn); + addBtn->clicked().connect(std::bind([=] + { + releaseAdd.emit(releaseId); + })); } } diff --git a/src/ui/ReleasesView.hpp b/src/ui/ReleasesView.hpp index bf741678..7cae344d 100644 --- a/src/ui/ReleasesView.hpp +++ b/src/ui/ReleasesView.hpp @@ -21,15 +21,18 @@ #include -#include "Filters.hpp" - namespace UserInterface { +class Filters; + class Releases : public Wt::WContainerWidget { public: Releases(Filters* filters, Wt::WContainerWidget* parent = 0); + Wt::Signal releaseAdd; + Wt::Signal releasePlay; + private: void refresh(std::vector searchKeywords = std::vector()); diff --git a/src/ui/TracksView.cpp b/src/ui/TracksView.cpp index d995a078..24e8fe54 100644 --- a/src/ui/TracksView.cpp +++ b/src/ui/TracksView.cpp @@ -29,6 +29,7 @@ #include "utils/Utils.hpp" #include "LmsApplication.hpp" +#include "Filters.hpp" #include "TracksView.hpp" namespace UserInterface { @@ -76,6 +77,7 @@ Tracks::refresh(std::vector searchKeywords) for (auto track : tracks) { + auto trackId = track.id(); Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-tracks-entry"), _tracksContainer); entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); @@ -109,9 +111,17 @@ Tracks::refresh(std::vector searchKeywords) auto playBtn = new Wt::WText(Wt::WString::tr("btn-tracks-play-btn"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); + playBtn->clicked().connect(std::bind([=] + { + trackPlay.emit(trackId); + })); auto addBtn = new Wt::WText(Wt::WString::tr("btn-tracks-add-btn"), Wt::XHTMLText); entry->bindWidget("add-btn", addBtn); + addBtn->clicked().connect(std::bind([=] + { + trackAdd.emit(trackId); + })); } } diff --git a/src/ui/TracksView.hpp b/src/ui/TracksView.hpp index 3210e666..516e4f9b 100644 --- a/src/ui/TracksView.hpp +++ b/src/ui/TracksView.hpp @@ -21,15 +21,17 @@ #include -#include "Filters.hpp" - namespace UserInterface { +class Filters; class Tracks : public Wt::WContainerWidget { public: Tracks(Filters* filters, Wt::WContainerWidget* parent = 0); + Wt::Signal trackAdd; + Wt::Signal trackPlay; + private: void refresh(std::vector searchKeywords = std::vector()); From f40df1fc299d1481a75287036db08e682d53d63a Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 20 Feb 2018 14:02:28 +0100 Subject: [PATCH 047/195] Continued playlist handling --- approot/playlist.xml | 17 ++++++-- src/database/Playlist.cpp | 28 +++++++++---- src/database/Playlist.hpp | 11 +++-- src/database/User.cpp | 2 +- src/database/User.hpp | 2 +- src/ui/ArtistsView.cpp | 20 ++++----- src/ui/ArtistsView.hpp | 4 +- src/ui/Explore.cpp | 49 +++++++++++++--------- src/ui/Explore.hpp | 4 +- src/ui/LmsApplication.cpp | 7 ++-- src/ui/PlaylistView.cpp | 87 ++++++++++++++++++++++++++++++++++++--- src/ui/PlaylistView.hpp | 4 +- src/ui/ReleasesView.cpp | 21 ++++------ src/ui/ReleasesView.hpp | 4 +- src/ui/TracksView.cpp | 20 ++++----- src/ui/TracksView.hpp | 4 +- 16 files changed, 190 insertions(+), 94 deletions(-) diff --git a/approot/playlist.xml b/approot/playlist.xml index 077f9557..5b097e83 100644 --- a/approot/playlist.xml +++ b/approot/playlist.xml @@ -22,6 +22,14 @@ ${entries} + + + + + + + +
@@ -30,11 +38,12 @@

${name}

-
- ${}${release-name}${} - ${}${artist-name}${} - ${play-btn} ${remove-btn} + ${}${release-name}${} + ${}${artist-name}${} + + ${play-btn} ${del-btn} +
diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index c63e3777..0094fa7b 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -61,6 +61,12 @@ Playlist::getAll(Wt::Dbo::Session& session, Wt::Dbo::ptr user) return std::vector(res.begin(), res.end()); } +void +Playlist::addTrack(Wt::Dbo::ptr track) +{ + _entries.insert( PlaylistEntry::create(*session(), track, self(), _entries.size()) ); +} + PlaylistEntry::PlaylistEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr playlist, int pos) : _pos(pos), _track(track), @@ -74,19 +80,23 @@ PlaylistEntry::create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt:: { return session.add( new PlaylistEntry( track, playlist, pos) ); } -/* -std::vector -PlaylistEntry::getEntries(Wt::Dbo::Session& session, Playlist::pointer playlist) + + +std::vector> +Playlist::getTracks(int offset, int size) const { - typedef Wt::Dbo::collection Entries; + assert(session()); - Entries entries = session.find().where("playlist_id = ?").bind(playlist.id()).orderBy("pos"); + Wt::Dbo::collection> entries = session()->find().where("playlist_id = ?").bind(self().id()).orderBy("pos").offset(offset).limit(size); - std::vector res; - for (Entries::iterator it = entries.begin(); it != entries.end(); ++it) - res.push_back((*it)->getTrack().id()); + std::vector> res; + + for (auto entry : entries) + { + res.push_back(entry->getTrack()); + } return res; -}*/ +} } // namespace Database diff --git a/src/database/Playlist.hpp b/src/database/Playlist.hpp index c2a02a36..b8f62474 100644 --- a/src/database/Playlist.hpp +++ b/src/database/Playlist.hpp @@ -30,7 +30,7 @@ class PlaylistEntry; class User; class Track; -class Playlist +class Playlist : public Wt::Dbo::Dbo { public: typedef Wt::Dbo::ptr pointer; @@ -50,12 +50,11 @@ class Playlist bool isPublic() const { return _isPublic; } // Modifiers - void addTrack(id_type trackId); - void addTracks(const std::vector& trackIds); - void clear(); + void addTrack(Wt::Dbo::ptr track); + void clear() { _entries.clear(); } // Get tracks, ordered by position - std::vector getEntries(Wt::Dbo::Session& session, int offset = -1, int size = -1); + std::vector> getTracks(int offset = -1, int size = -1) const; template void persist(Action& a) @@ -82,7 +81,7 @@ class PlaylistEntry typedef Wt::Dbo::ptr pointer; PlaylistEntry(); - PlaylistEntry(Wt::Dbo::ptr rack, Wt::Dbo::ptr playlist, int position); + PlaylistEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr playlist, int position); // Create utility static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr playlist, int position); diff --git a/src/database/User.cpp b/src/database/User.cpp index d25410c3..751e614e 100644 --- a/src/database/User.cpp +++ b/src/database/User.cpp @@ -84,7 +84,7 @@ User::getAll(Wt::Dbo::Session& session) } User::pointer -User::getById(Wt::Dbo::Session& session, std::string id) +User::getById(Wt::Dbo::Session& session, id_type id) { return session.find().where("id = ?").bind( id ); } diff --git a/src/database/User.hpp b/src/database/User.hpp index 0bf1138a..de065e68 100644 --- a/src/database/User.hpp +++ b/src/database/User.hpp @@ -65,7 +65,7 @@ class User typedef Wt::Dbo::ptr pointer; // accessors - static pointer getById(Wt::Dbo::Session& session, std::string id); + static pointer getById(Wt::Dbo::Session& session, id_type id); static std::vector getAll(Wt::Dbo::Session& session); static std::string getId(pointer user); diff --git a/src/ui/ArtistsView.cpp b/src/ui/ArtistsView.cpp index c30ad77e..7373c39b 100644 --- a/src/ui/ArtistsView.cpp +++ b/src/ui/ArtistsView.cpp @@ -42,28 +42,24 @@ Artists::Artists(Filters* filters, Wt::WContainerWidget* parent) auto artists = new Wt::WTemplate(Wt::WString::tr("template-artists"), this); artists->addFunction("tr", &Wt::WTemplate::Functions::tr); - auto search = new Wt::WLineEdit(); - artists->bindWidget("search", search); - search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); - search->textInput().connect(std::bind([this, search] - { - auto keywords = splitString(search->text().toUTF8(), " "); - refresh(keywords); - })); + _search = new Wt::WLineEdit(); + artists->bindWidget("search", _search); + _search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); + _search->textInput().connect(this, &Artists::refresh); _artistsContainer = new Wt::WContainerWidget(); artists->bindWidget("artists", _artistsContainer); refresh(); - filters->updated().connect(std::bind([=] { - refresh(); - })); + filters->updated().connect(this, &Artists::refresh); } void -Artists::refresh(std::vector searchKeywords) +Artists::refresh() { + auto searchKeywords = splitString(_search->text().toUTF8(), " "); + _artistsContainer->clear(); auto clusterIds = _filters->getClusterIds(); diff --git a/src/ui/ArtistsView.hpp b/src/ui/ArtistsView.hpp index 74e07bab..cbf9c26a 100644 --- a/src/ui/ArtistsView.hpp +++ b/src/ui/ArtistsView.hpp @@ -20,6 +20,7 @@ #pragma once #include +#include #include namespace UserInterface { @@ -35,9 +36,10 @@ class Artists : public Wt::WContainerWidget Wt::Signal artistPlay; private: - void refresh(std::vector searchKeywords = std::vector()); + void refresh(); Filters* _filters; + Wt::WLineEdit* _search; Wt::WContainerWidget* _artistsContainer; }; diff --git a/src/ui/Explore.cpp b/src/ui/Explore.cpp index 20539133..d11df72a 100644 --- a/src/ui/Explore.cpp +++ b/src/ui/Explore.cpp @@ -126,11 +126,9 @@ Explore::Explore(Wt::WContainerWidget* parent) } // TODO SQL this? -static std::vector getArtistTracks(Wt::Dbo::Session& session, Database::id_type artistId, std::set clusters) +static std::vector getArtistTracks(Wt::Dbo::Session& session, Database::id_type artistId, std::set clusters) { - std::vector res; - - Wt::Dbo::Transaction transaction(session); + std::vector res; auto artist = Database::Artist::getById(session, artistId); if (!artist) @@ -140,31 +138,30 @@ static std::vector getArtistTracks(Wt::Dbo::Session& session, for (auto release : releases) { auto tracks = release->getTracks(clusters); - - for (auto track : tracks) - { - res.push_back(track.id()); - } + res.insert( res.end(), tracks.begin(), tracks.end() ); } return res; } -static std::vector getReleaseTracks(Wt::Dbo::Session& session, Database::id_type releaseId, std::set clusters) +static std::vector getReleaseTracks(Wt::Dbo::Session& session, Database::id_type releaseId, std::set clusters) { - std::vector res; - - Wt::Dbo::Transaction transaction(session); + std::vector res; auto release = Database::Release::getById(session, releaseId); if (!release) return res; - auto tracks = release->getTracks(clusters); - for (auto track : tracks) - { - res.push_back(track.id()); - } + return release->getTracks(clusters); +} + +static std::vector getTrack(Wt::Dbo::Session& session, Database::id_type trackId) +{ + std::vector res; + + auto track = Database::Track::getById(session, trackId); + if (track) + res.push_back(track); return res; } @@ -172,37 +169,49 @@ static std::vector getReleaseTracks(Wt::Dbo::Session& session void Explore::handleArtistAdd(Database::id_type id) { + Wt::Dbo::Transaction transaction(DboSession()); + tracksAdd.emit(getArtistTracks(DboSession(), id, _filters->getClusterIds())); } void Explore::handleArtistPlay(Database::id_type id) { + Wt::Dbo::Transaction transaction(DboSession()); + tracksPlay.emit(getArtistTracks(DboSession(), id, _filters->getClusterIds())); } void Explore::handleReleaseAdd(Database::id_type id) { + Wt::Dbo::Transaction transaction(DboSession()); + tracksAdd.emit(getReleaseTracks(DboSession(), id, _filters->getClusterIds())); } void Explore::handleReleasePlay(Database::id_type id) { + Wt::Dbo::Transaction transaction(DboSession()); + tracksPlay.emit(getReleaseTracks(DboSession(), id, _filters->getClusterIds())); } void Explore::handleTrackAdd(Database::id_type id) { - tracksAdd.emit(std::vector(1, id)); + Wt::Dbo::Transaction transaction(DboSession()); + + tracksAdd.emit(getTrack(DboSession(), id)); } void Explore::handleTrackPlay(Database::id_type id) { - tracksPlay.emit(std::vector(1, id)); + Wt::Dbo::Transaction transaction(DboSession()); + + tracksPlay.emit(getTrack(DboSession(), id)); } } // namespace UserInterface diff --git a/src/ui/Explore.hpp b/src/ui/Explore.hpp index c7857811..0e04a967 100644 --- a/src/ui/Explore.hpp +++ b/src/ui/Explore.hpp @@ -32,8 +32,8 @@ class Explore : public Wt::WContainerWidget public: Explore(Wt::WContainerWidget *parent = 0); - Wt::Signal> tracksAdd; - Wt::Signal> tracksPlay; + Wt::Signal> tracksAdd; + Wt::Signal> tracksPlay; private: diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 51d0d665..ba1997ab 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -123,7 +123,8 @@ const Wt::Auth::User& CurrentAuthUser() Database::User::pointer CurrentUser() { - return DbHandler().getCurrentUser(); + return Database::User::getById(DboSession(), 1); +// return DbHandler().getCurrentUser(); } ImageResource* SessionImageResource() @@ -276,12 +277,12 @@ LmsApplication::handleAuthEvent(void) mainStack->addWidget(playlist); mainStack->addWidget(new Wt::WText("SETTINGS")); - explore->tracksAdd.connect(std::bind([=] (std::vector tracks) + explore->tracksAdd.connect(std::bind([=] (std::vector tracks) { playlist->addTracks(tracks); }, std::placeholders::_1)); - explore->tracksPlay.connect(std::bind([=] (std::vector tracks) + explore->tracksPlay.connect(std::bind([=] (std::vector tracks) { playlist->playTracks(tracks); }, std::placeholders::_1)); diff --git a/src/ui/PlaylistView.cpp b/src/ui/PlaylistView.cpp index 93f32f7a..57f8474c 100644 --- a/src/ui/PlaylistView.cpp +++ b/src/ui/PlaylistView.cpp @@ -17,13 +17,18 @@ * along with LMS. If not, see . */ +#include +#include #include #include +#include "LmsApplication.hpp" #include "PlaylistView.hpp" namespace UserInterface { +static const std::string currentPlaylistName = "__current__playlist__"; + Playlist::Playlist(Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent) { @@ -41,26 +46,96 @@ Playlist::Playlist(Wt::WContainerWidget* parent) _entriesContainer = new Wt::WContainerWidget(); t->bindWidget("entries", _entriesContainer); + + refresh(); } void -Playlist::addTracks(const std::vector& trackIds) +Playlist::addTracks(const std::vector& tracks) { - for (auto trackId : trackIds) - std::cerr << "Adding track " << trackId << std::endl; + // Use a "session" playlist in order to store the current playlist + // so that the user can disconnect and get its playlist back + + auto playlist = Database::Playlist::get(DboSession(), currentPlaylistName, CurrentUser()); + if (!playlist) + { + playlist = Database::Playlist::create(DboSession(), currentPlaylistName, false, CurrentUser()); + } + + for (auto track : tracks) + { + playlist.modify()->addTrack(track); + } + + refresh(); } void -Playlist::playTracks(const std::vector& trackIds) +Playlist::playTracks(const std::vector& tracks) { - for (auto trackId : trackIds) - std::cerr << "Playing track " << trackId << std::endl; + Wt::Dbo::Transaction transaction(DboSession()); + + auto playlist = Database::Playlist::get(DboSession(), currentPlaylistName, CurrentUser()); + if (playlist) + playlist.modify()->clear(); + + _entriesContainer->clear(); + + addTracks(tracks); + + // TODO Immediate play } void Playlist::refresh() { + Wt::Dbo::Transaction transaction (DboSession()); + auto playlist = Database::Playlist::get(DboSession(), currentPlaylistName, CurrentUser()); + if (!playlist) + return; + + auto tracks = playlist->getTracks(_entriesContainer->count(), 20); // TODO + for (auto track : tracks) + { + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-playlist-entry"), _entriesContainer); + + entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); + + auto artist = track->getArtist(); + if (artist) + { + entry->setCondition("if-has-artist", true); + Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(track->getArtist().id()))); + Wt::WText *artistText = new Wt::WText(artistAnchor); + artistText->setText(Wt::WString::fromUTF8(artist->getName(), Wt::PlainText)); + entry->bindWidget("artist-name", artistAnchor); + } + auto release = track->getRelease(); + if (release) + { + entry->setCondition("if-has-release", true); + // TODO anchor + Wt::WAnchor *releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(track->getRelease().id()))); + Wt::WText *releaseText = new Wt::WText(releaseAnchor); + releaseText->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); + entry->bindWidget("release-name", releaseAnchor); + } + + Wt::WImage *cover = new Wt::WImage(); + cover->setImageLink(SessionImageResource()->getTrackUrl(track.id(), 64)); + // Some images may not be square + cover->setWidth(64); + entry->bindWidget("cover", cover); + + auto playBtn = new Wt::WText(Wt::WString::tr("btn-playlist-entry-play-btn"), Wt::XHTMLText); + entry->bindWidget("play-btn", playBtn); + // TODO + + auto addBtn = new Wt::WText(Wt::WString::tr("btn-playlist-entry-del-btn"), Wt::XHTMLText); + entry->bindWidget("del-btn", addBtn); + // TODO + } } } // namespace UserInterface diff --git a/src/ui/PlaylistView.hpp b/src/ui/PlaylistView.hpp index fa1f6863..7a0dc595 100644 --- a/src/ui/PlaylistView.hpp +++ b/src/ui/PlaylistView.hpp @@ -30,8 +30,8 @@ class Playlist : public Wt::WContainerWidget public: Playlist(Wt::WContainerWidget* parent = 0); - void addTracks(const std::vector& trackIds); - void playTracks(const std::vector& trackIds); + void addTracks(const std::vector& tracks); + void playTracks(const std::vector& tracks); private: void refresh(); diff --git a/src/ui/ReleasesView.cpp b/src/ui/ReleasesView.cpp index 9c1bfdf7..dce1b8eb 100644 --- a/src/ui/ReleasesView.cpp +++ b/src/ui/ReleasesView.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -44,29 +43,25 @@ Releases::Releases(Filters* filters, Wt::WContainerWidget* parent) auto releases = new Wt::WTemplate(Wt::WString::tr("template-releases"), this); releases->addFunction("tr", &Wt::WTemplate::Functions::tr); - auto search = new Wt::WLineEdit(); - releases->bindWidget("search", search); - search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); - search->textInput().connect(std::bind([this, search] - { - auto keywords = splitString(search->text().toUTF8(), " "); - refresh(keywords); - })); + _search = new Wt::WLineEdit(); + releases->bindWidget("search", _search); + _search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); + _search->textInput().connect(this, &Releases::refresh); _releasesContainer = new Wt::WContainerWidget(); releases->bindWidget("releases", _releasesContainer); refresh(); - filters->updated().connect(std::bind([=] { - refresh(); - })); + filters->updated().connect(this, &Releases::refresh); } void -Releases::refresh(std::vector searchKeywords) +Releases::refresh() { + auto searchKeywords = splitString(_search->text().toUTF8(), " "); + _releasesContainer->clear(); auto clusterIds = _filters->getClusterIds(); diff --git a/src/ui/ReleasesView.hpp b/src/ui/ReleasesView.hpp index 7cae344d..9bc9c996 100644 --- a/src/ui/ReleasesView.hpp +++ b/src/ui/ReleasesView.hpp @@ -20,6 +20,7 @@ #pragma once #include +#include namespace UserInterface { @@ -34,9 +35,10 @@ class Releases : public Wt::WContainerWidget Wt::Signal releasePlay; private: - void refresh(std::vector searchKeywords = std::vector()); + void refresh(); Filters* _filters; + Wt::WLineEdit* _search; Wt::WContainerWidget* _releasesContainer; }; diff --git a/src/ui/TracksView.cpp b/src/ui/TracksView.cpp index 24e8fe54..a4414f2f 100644 --- a/src/ui/TracksView.cpp +++ b/src/ui/TracksView.cpp @@ -43,29 +43,25 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) auto tracks = new Wt::WTemplate(Wt::WString::tr("template-tracks"), this); tracks->addFunction("tr", &Wt::WTemplate::Functions::tr); - auto search = new Wt::WLineEdit(); - tracks->bindWidget("search", search); - search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); - search->textInput().connect(std::bind([this, search] - { - auto keywords = splitString(search->text().toUTF8(), " "); - refresh(keywords); - })); + _search = new Wt::WLineEdit(); + tracks->bindWidget("search", _search); + _search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); + _search->textInput().connect(this, &Tracks::refresh); _tracksContainer = new Wt::WContainerWidget(); tracks->bindWidget("tracks", _tracksContainer); refresh(); - filters->updated().connect(std::bind([=] { - refresh(); - })); + filters->updated().connect(this, &Tracks::refresh); } void -Tracks::refresh(std::vector searchKeywords) +Tracks::refresh() { + auto searchKeywords = splitString(_search->text().toUTF8(), " "); + _tracksContainer->clear(); auto clusterIds = _filters->getClusterIds(); diff --git a/src/ui/TracksView.hpp b/src/ui/TracksView.hpp index 516e4f9b..4f82cfe9 100644 --- a/src/ui/TracksView.hpp +++ b/src/ui/TracksView.hpp @@ -20,6 +20,7 @@ #pragma once #include +#include namespace UserInterface { @@ -33,9 +34,10 @@ class Tracks : public Wt::WContainerWidget Wt::Signal trackPlay; private: - void refresh(std::vector searchKeywords = std::vector()); + void refresh(); Wt::WContainerWidget* _tracksContainer; + Wt::WLineEdit* _search; Filters* _filters; }; From 5b4fe044de6a33e778460684196d6078f400fb9b Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 21 Feb 2018 13:34:29 +0100 Subject: [PATCH 048/195] Added a show more functionnality --- approot/artists.xml | 1 + approot/messages.xml | 2 ++ approot/releases.xml | 1 + approot/templates.xml | 4 ++++ approot/tracks.xml | 1 + src/database/DbArtist.cpp | 2 +- src/database/Release.cpp | 2 +- src/database/Track.cpp | 2 +- src/ui/ArtistsView.cpp | 29 ++++++++++++++++++++++------- src/ui/ArtistsView.hpp | 2 ++ src/ui/ReleasesView.cpp | 33 +++++++++++++++++++++++++-------- src/ui/ReleasesView.hpp | 3 +++ src/ui/TracksView.cpp | 30 ++++++++++++++++++++++-------- src/ui/TracksView.hpp | 3 +++ 14 files changed, 89 insertions(+), 26 deletions(-) diff --git a/approot/artists.xml b/approot/artists.xml index 92696a37..933930f3 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -13,6 +13,7 @@
${artists class="list-group"} + ${show-more} diff --git a/approot/messages.xml b/approot/messages.xml index 44479447..38d2396f 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -15,4 +15,6 @@ Type Value + +Show more diff --git a/approot/releases.xml b/approot/releases.xml index 374bcd91..23957a5f 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -14,6 +14,7 @@
${releases class="list-group"} + ${show-more} diff --git a/approot/templates.xml b/approot/templates.xml index a6581c0f..d0b47ac9 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -17,6 +17,10 @@ ${contents} + + ${tr:msg-show-more} + +
${add-filter}${filters} diff --git a/approot/tracks.xml b/approot/tracks.xml index 62091789..823e6fb9 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -14,6 +14,7 @@
${tracks class="list-group"} + ${show-more} diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp index 7c65b231..bce519e2 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/DbArtist.cpp @@ -120,7 +120,7 @@ Artist::getByFilter(Wt::Dbo::Session& session, const std::vector keywords, int offset, int size, bool& moreResults) { - Wt::Dbo::collection collection = getQuery(session, clusters, keywords).limit(size).offset(offset); + Wt::Dbo::collection collection = getQuery(session, clusters, keywords).limit(size + 1).offset(offset); auto res = std::vector(collection.begin(), collection.end()); diff --git a/src/database/Release.cpp b/src/database/Release.cpp index d3d73732..0e902da8 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -118,7 +118,7 @@ Release::getByFilter(Wt::Dbo::Session& session, const std::vector keywords, int offset, int size, bool& moreResults) { - Wt::Dbo::collection collection = getQuery(session, clusterIds, keywords).limit(size).offset(offset); + Wt::Dbo::collection collection = getQuery(session, clusterIds, keywords).limit(size + 1).offset(offset); auto res = std::vector(collection.begin(), collection.end()); diff --git a/src/database/Track.cpp b/src/database/Track.cpp index a7d5ab9c..efd5944a 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -169,7 +169,7 @@ Track::getByFilter(Wt::Dbo::Session& session, const std::vector keywords, int offset, int size, bool& moreResults) { - Wt::Dbo::collection collection = getQuery(session, clusterIds, keywords).limit(size).offset(offset); + Wt::Dbo::collection collection = getQuery(session, clusterIds, keywords).limit(size + 1).offset(offset); auto res = std::vector(collection.begin(), collection.end()); diff --git a/src/ui/ArtistsView.cpp b/src/ui/ArtistsView.cpp index 7373c39b..3038b861 100644 --- a/src/ui/ArtistsView.cpp +++ b/src/ui/ArtistsView.cpp @@ -39,16 +39,25 @@ Artists::Artists(Filters* filters, Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent), _filters(filters) { - auto artists = new Wt::WTemplate(Wt::WString::tr("template-artists"), this); - artists->addFunction("tr", &Wt::WTemplate::Functions::tr); + auto container = new Wt::WTemplate(Wt::WString::tr("template-artists"), this); + container->addFunction("tr", &Wt::WTemplate::Functions::tr); _search = new Wt::WLineEdit(); - artists->bindWidget("search", _search); + container->bindWidget("search", _search); _search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); _search->textInput().connect(this, &Artists::refresh); _artistsContainer = new Wt::WContainerWidget(); - artists->bindWidget("artists", _artistsContainer); + container->bindWidget("artists", _artistsContainer); + + _showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more")); + _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); + container->bindWidget("show-more", _showMore); + + _showMore->clicked().connect(std::bind([=] + { + add_some(); + })); refresh(); @@ -58,9 +67,14 @@ Artists::Artists(Filters* filters, Wt::WContainerWidget* parent) void Artists::refresh() { - auto searchKeywords = splitString(_search->text().toUTF8(), " "); - _artistsContainer->clear(); + add_some(); +} + +void +Artists::add_some() +{ + auto searchKeywords = splitString(_search->text().toUTF8(), " "); auto clusterIds = _filters->getClusterIds(); @@ -70,7 +84,7 @@ Artists::refresh() auto artists = Artist::getByFilter(DboSession(), clusterIds, searchKeywords, - 0, 40, moreResults); + _artistsContainer->count(), 20, moreResults); for (auto artist : artists) { @@ -86,6 +100,7 @@ Artists::refresh() } } + _showMore->setHidden(!moreResults); } } // namespace UserInterface diff --git a/src/ui/ArtistsView.hpp b/src/ui/ArtistsView.hpp index cbf9c26a..c8b42a39 100644 --- a/src/ui/ArtistsView.hpp +++ b/src/ui/ArtistsView.hpp @@ -37,8 +37,10 @@ class Artists : public Wt::WContainerWidget private: void refresh(); + void add_some(); Filters* _filters; + Wt::WTemplate* _showMore; Wt::WLineEdit* _search; Wt::WContainerWidget* _artistsContainer; }; diff --git a/src/ui/ReleasesView.cpp b/src/ui/ReleasesView.cpp index dce1b8eb..1353a2b8 100644 --- a/src/ui/ReleasesView.cpp +++ b/src/ui/ReleasesView.cpp @@ -40,36 +40,49 @@ Releases::Releases(Filters* filters, Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent), _filters(filters) { - auto releases = new Wt::WTemplate(Wt::WString::tr("template-releases"), this); - releases->addFunction("tr", &Wt::WTemplate::Functions::tr); + auto container = new Wt::WTemplate(Wt::WString::tr("template-releases"), this); + container->addFunction("tr", &Wt::WTemplate::Functions::tr); _search = new Wt::WLineEdit(); - releases->bindWidget("search", _search); + container->bindWidget("search", _search); _search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); _search->textInput().connect(this, &Releases::refresh); _releasesContainer = new Wt::WContainerWidget(); - releases->bindWidget("releases", _releasesContainer); + container->bindWidget("releases", _releasesContainer); + + _showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more")); + _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); + container->bindWidget("show-more", _showMore); + + _showMore->clicked().connect(std::bind([=] + { + add_some(); + })); refresh(); filters->updated().connect(this, &Releases::refresh); } - void Releases::refresh() { - auto searchKeywords = splitString(_search->text().toUTF8(), " "); - _releasesContainer->clear(); + add_some(); +} + +void +Releases::add_some() +{ + auto searchKeywords = splitString(_search->text().toUTF8(), " "); auto clusterIds = _filters->getClusterIds(); Wt::Dbo::Transaction transaction(DboSession()); bool moreResults; - auto releases = Release::getByFilter(DboSession(), clusterIds, searchKeywords, 0, 40, moreResults); + auto releases = Release::getByFilter(DboSession(), clusterIds, searchKeywords, _releasesContainer->count(), 20, moreResults); for (auto release : releases) { @@ -120,6 +133,10 @@ Releases::refresh() releaseAdd.emit(releaseId); })); } + + std::cerr << "if-show-more = " << moreResults << "\n"; + + _showMore->setHidden(!moreResults); } } // namespace UserInterface diff --git a/src/ui/ReleasesView.hpp b/src/ui/ReleasesView.hpp index 9bc9c996..b14fcdf9 100644 --- a/src/ui/ReleasesView.hpp +++ b/src/ui/ReleasesView.hpp @@ -21,6 +21,7 @@ #include #include +#include namespace UserInterface { @@ -36,8 +37,10 @@ class Releases : public Wt::WContainerWidget private: void refresh(); + void add_some(); Filters* _filters; + Wt::WTemplate* _showMore; Wt::WLineEdit* _search; Wt::WContainerWidget* _releasesContainer; }; diff --git a/src/ui/TracksView.cpp b/src/ui/TracksView.cpp index a4414f2f..31ae4233 100644 --- a/src/ui/TracksView.cpp +++ b/src/ui/TracksView.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include "database/Types.hpp" @@ -40,16 +39,25 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent), _filters(filters) { - auto tracks = new Wt::WTemplate(Wt::WString::tr("template-tracks"), this); - tracks->addFunction("tr", &Wt::WTemplate::Functions::tr); + auto container = new Wt::WTemplate(Wt::WString::tr("template-tracks"), this); + container->addFunction("tr", &Wt::WTemplate::Functions::tr); _search = new Wt::WLineEdit(); - tracks->bindWidget("search", _search); + container->bindWidget("search", _search); _search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); _search->textInput().connect(this, &Tracks::refresh); _tracksContainer = new Wt::WContainerWidget(); - tracks->bindWidget("tracks", _tracksContainer); + container->bindWidget("tracks", _tracksContainer); + + _showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more")); + _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); + container->bindWidget("show-more", _showMore); + + _showMore->clicked().connect(std::bind([=] + { + add_some(); + })); refresh(); @@ -60,16 +68,21 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) void Tracks::refresh() { - auto searchKeywords = splitString(_search->text().toUTF8(), " "); - _tracksContainer->clear(); + add_some(); +} + +void +Tracks::add_some() +{ + auto searchKeywords = splitString(_search->text().toUTF8(), " "); auto clusterIds = _filters->getClusterIds(); Wt::Dbo::Transaction transaction(DboSession()); bool moreResults; - auto tracks = Track::getByFilter(DboSession(), clusterIds, searchKeywords, 0, 40, moreResults); + auto tracks = Track::getByFilter(DboSession(), clusterIds, searchKeywords, _tracksContainer->count(), 20, moreResults); for (auto track : tracks) { @@ -120,6 +133,7 @@ Tracks::refresh() })); } + _showMore->setHidden(!moreResults); } } // namespace UserInterface diff --git a/src/ui/TracksView.hpp b/src/ui/TracksView.hpp index 4f82cfe9..a6b52b42 100644 --- a/src/ui/TracksView.hpp +++ b/src/ui/TracksView.hpp @@ -21,6 +21,7 @@ #include #include +#include namespace UserInterface { @@ -35,8 +36,10 @@ class Tracks : public Wt::WContainerWidget private: void refresh(); + void add_some(); Wt::WContainerWidget* _tracksContainer; + Wt::WTemplate* _showMore; Wt::WLineEdit* _search; Filters* _filters; }; From 86077c1e44242784cdb62467386a558f51184c13 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 22 Feb 2018 13:54:32 +0100 Subject: [PATCH 049/195] Added show more to playlist --- approot/playlist.xml | 1 + src/database/Playlist.cpp | 12 ++++++++++-- src/database/Playlist.hpp | 2 +- src/ui/ArtistsView.cpp | 6 +++--- src/ui/ArtistsView.hpp | 2 +- src/ui/PlaylistView.cpp | 37 ++++++++++++++++++++++++++++--------- src/ui/PlaylistView.hpp | 3 +++ src/ui/ReleasesView.cpp | 6 +++--- src/ui/ReleasesView.hpp | 2 +- src/ui/TracksView.cpp | 6 +++--- src/ui/TracksView.hpp | 2 +- 11 files changed, 55 insertions(+), 24 deletions(-) diff --git a/approot/playlist.xml b/approot/playlist.xml index 5b097e83..2543d616 100644 --- a/approot/playlist.xml +++ b/approot/playlist.xml @@ -20,6 +20,7 @@ ${save-btn} ${load-btn} ${clear-btn}
${entries} + ${show-more} diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index 0094fa7b..24e8e68b 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -83,16 +83,24 @@ PlaylistEntry::create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt:: std::vector> -Playlist::getTracks(int offset, int size) const +Playlist::getTracks(int offset, int size, bool& moreResults) const { assert(session()); - Wt::Dbo::collection> entries = session()->find().where("playlist_id = ?").bind(self().id()).orderBy("pos").offset(offset).limit(size); + moreResults = false; + + Wt::Dbo::collection> entries = session()->find().where("playlist_id = ?").bind(self().id()).orderBy("pos").offset(offset).limit(size + 1); std::vector> res; for (auto entry : entries) { + if (size != -1 && res.size() == static_cast(size)) + { + moreResults = true; + break; + } + res.push_back(entry->getTrack()); } diff --git a/src/database/Playlist.hpp b/src/database/Playlist.hpp index b8f62474..816e4098 100644 --- a/src/database/Playlist.hpp +++ b/src/database/Playlist.hpp @@ -54,7 +54,7 @@ class Playlist : public Wt::Dbo::Dbo void clear() { _entries.clear(); } // Get tracks, ordered by position - std::vector> getTracks(int offset = -1, int size = -1) const; + std::vector> getTracks(int offset, int size, bool& moreResults) const; template void persist(Action& a) diff --git a/src/ui/ArtistsView.cpp b/src/ui/ArtistsView.cpp index 3038b861..f801fa05 100644 --- a/src/ui/ArtistsView.cpp +++ b/src/ui/ArtistsView.cpp @@ -56,7 +56,7 @@ Artists::Artists(Filters* filters, Wt::WContainerWidget* parent) _showMore->clicked().connect(std::bind([=] { - add_some(); + addSome(); })); refresh(); @@ -68,11 +68,11 @@ void Artists::refresh() { _artistsContainer->clear(); - add_some(); + addSome(); } void -Artists::add_some() +Artists::addSome() { auto searchKeywords = splitString(_search->text().toUTF8(), " "); diff --git a/src/ui/ArtistsView.hpp b/src/ui/ArtistsView.hpp index c8b42a39..f51c8706 100644 --- a/src/ui/ArtistsView.hpp +++ b/src/ui/ArtistsView.hpp @@ -37,7 +37,7 @@ class Artists : public Wt::WContainerWidget private: void refresh(); - void add_some(); + void addSome(); Filters* _filters; Wt::WTemplate* _showMore; diff --git a/src/ui/PlaylistView.cpp b/src/ui/PlaylistView.cpp index 57f8474c..d3644bc2 100644 --- a/src/ui/PlaylistView.cpp +++ b/src/ui/PlaylistView.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include "LmsApplication.hpp" @@ -32,20 +31,29 @@ static const std::string currentPlaylistName = "__current__playlist__"; Playlist::Playlist(Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent) { - auto t = new Wt::WTemplate(Wt::WString::tr("template-playlist"), this); - t->addFunction("tr", &Wt::WTemplate::Functions::tr); + auto container = new Wt::WTemplate(Wt::WString::tr("template-playlist"), this); + container->addFunction("tr", &Wt::WTemplate::Functions::tr); auto saveBtn = new Wt::WText(Wt::WString::tr("btn-playlist-save-btn"), Wt::XHTMLText); - t->bindWidget("save-btn", saveBtn); + container->bindWidget("save-btn", saveBtn); auto loadBtn = new Wt::WText(Wt::WString::tr("btn-playlist-load-btn"), Wt::XHTMLText); - t->bindWidget("load-btn", loadBtn); + container->bindWidget("load-btn", loadBtn); auto clearBtn = new Wt::WText(Wt::WString::tr("btn-playlist-clear-btn"), Wt::XHTMLText); - t->bindWidget("clear-btn", clearBtn); + container->bindWidget("clear-btn", clearBtn); _entriesContainer = new Wt::WContainerWidget(); - t->bindWidget("entries", _entriesContainer); + container->bindWidget("entries", _entriesContainer); + + _showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more")); + _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); + container->bindWidget("show-more", _showMore); + + _showMore->clicked().connect(std::bind([=] + { + addSome(); + })); refresh(); } @@ -67,7 +75,7 @@ Playlist::addTracks(const std::vector& tracks) playlist.modify()->addTrack(track); } - refresh(); + addSome(); } void @@ -86,8 +94,16 @@ Playlist::playTracks(const std::vector& tracks) // TODO Immediate play } + void Playlist::refresh() +{ + _entriesContainer->clear(); + addSome(); +} + +void +Playlist::addSome() { Wt::Dbo::Transaction transaction (DboSession()); @@ -95,7 +111,8 @@ Playlist::refresh() if (!playlist) return; - auto tracks = playlist->getTracks(_entriesContainer->count(), 20); // TODO + bool moreResults; + auto tracks = playlist->getTracks(_entriesContainer->count(), 20, moreResults); for (auto track : tracks) { Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-playlist-entry"), _entriesContainer); @@ -136,6 +153,8 @@ Playlist::refresh() entry->bindWidget("del-btn", addBtn); // TODO } + + _showMore->setHidden(!moreResults); } } // namespace UserInterface diff --git a/src/ui/PlaylistView.hpp b/src/ui/PlaylistView.hpp index 7a0dc595..03db9226 100644 --- a/src/ui/PlaylistView.hpp +++ b/src/ui/PlaylistView.hpp @@ -20,6 +20,7 @@ #pragma once #include +#include #include "database/Types.hpp" @@ -35,8 +36,10 @@ class Playlist : public Wt::WContainerWidget private: void refresh(); + void addSome(); Wt::WContainerWidget* _entriesContainer; + Wt::WTemplate* _showMore; }; } // namespace UserInterface diff --git a/src/ui/ReleasesView.cpp b/src/ui/ReleasesView.cpp index 1353a2b8..f8b9df0e 100644 --- a/src/ui/ReleasesView.cpp +++ b/src/ui/ReleasesView.cpp @@ -57,7 +57,7 @@ Releases::Releases(Filters* filters, Wt::WContainerWidget* parent) _showMore->clicked().connect(std::bind([=] { - add_some(); + addSome(); })); refresh(); @@ -69,11 +69,11 @@ void Releases::refresh() { _releasesContainer->clear(); - add_some(); + addSome(); } void -Releases::add_some() +Releases::addSome() { auto searchKeywords = splitString(_search->text().toUTF8(), " "); diff --git a/src/ui/ReleasesView.hpp b/src/ui/ReleasesView.hpp index b14fcdf9..6626656b 100644 --- a/src/ui/ReleasesView.hpp +++ b/src/ui/ReleasesView.hpp @@ -37,7 +37,7 @@ class Releases : public Wt::WContainerWidget private: void refresh(); - void add_some(); + void addSome(); Filters* _filters; Wt::WTemplate* _showMore; diff --git a/src/ui/TracksView.cpp b/src/ui/TracksView.cpp index 31ae4233..cbfd45a8 100644 --- a/src/ui/TracksView.cpp +++ b/src/ui/TracksView.cpp @@ -56,7 +56,7 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) _showMore->clicked().connect(std::bind([=] { - add_some(); + addSome(); })); refresh(); @@ -69,11 +69,11 @@ void Tracks::refresh() { _tracksContainer->clear(); - add_some(); + addSome(); } void -Tracks::add_some() +Tracks::addSome() { auto searchKeywords = splitString(_search->text().toUTF8(), " "); diff --git a/src/ui/TracksView.hpp b/src/ui/TracksView.hpp index a6b52b42..3f949770 100644 --- a/src/ui/TracksView.hpp +++ b/src/ui/TracksView.hpp @@ -36,7 +36,7 @@ class Tracks : public Wt::WContainerWidget private: void refresh(); - void add_some(); + void addSome(); Wt::WContainerWidget* _tracksContainer; Wt::WTemplate* _showMore; From 373d7ff12bedb8e5aff104b61f9e8ace93506a46 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 22 Feb 2018 13:59:43 +0100 Subject: [PATCH 050/195] When adding an artist to the playlist, add only the tracks he actually made (and not whole compilations for example) --- src/ui/Explore.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ui/Explore.cpp b/src/ui/Explore.cpp index d11df72a..fcd41278 100644 --- a/src/ui/Explore.cpp +++ b/src/ui/Explore.cpp @@ -138,7 +138,11 @@ static std::vector getArtistTracks(Wt::Dbo::Session& s for (auto release : releases) { auto tracks = release->getTracks(clusters); - res.insert( res.end(), tracks.begin(), tracks.end() ); + for (auto track : tracks) + { + if (track->getArtist() && track->getArtist().id() == artistId) + res.push_back(track); + } } return res; From fe53103445d532e9492adabcc0ceca7065c561bc Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 24 Feb 2018 14:52:54 +0100 Subject: [PATCH 051/195] Do not display covers in playlist --- approot/playlist.xml | 14 +------------- src/ui/PlaylistView.cpp | 7 +------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/approot/playlist.xml b/approot/playlist.xml index 2543d616..266baa33 100644 --- a/approot/playlist.xml +++ b/approot/playlist.xml @@ -32,19 +32,7 @@ -
-
- ${cover class="media-object"} -
-
-

${name}

-
- - ${}${release-name}${} - ${}${artist-name}${} - - ${play-btn} ${del-btn} -
+ ${pos} ${name} ${}${release-name}${} ${}${artist-name}${} ${play-btn} ${del-btn} diff --git a/src/ui/PlaylistView.cpp b/src/ui/PlaylistView.cpp index d3644bc2..a5fef657 100644 --- a/src/ui/PlaylistView.cpp +++ b/src/ui/PlaylistView.cpp @@ -117,6 +117,7 @@ Playlist::addSome() { Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-playlist-entry"), _entriesContainer); + entry->bindString("pos", std::to_string(_entriesContainer->count())); entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); auto artist = track->getArtist(); @@ -139,12 +140,6 @@ Playlist::addSome() entry->bindWidget("release-name", releaseAnchor); } - Wt::WImage *cover = new Wt::WImage(); - cover->setImageLink(SessionImageResource()->getTrackUrl(track.id(), 64)); - // Some images may not be square - cover->setWidth(64); - entry->bindWidget("cover", cover); - auto playBtn = new Wt::WText(Wt::WString::tr("btn-playlist-entry-play-btn"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); // TODO From aa54b5b5993df89c7b6dcfbef34da6e624199230 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 25 Feb 2018 08:57:05 +0100 Subject: [PATCH 052/195] Added a play/add all on tracks view --- approot/tracks.xml | 1 + src/database/DbArtist.cpp | 4 +++- src/database/Playlist.cpp | 12 ++++++------ src/database/Playlist.hpp | 2 +- src/database/Release.cpp | 4 +++- src/database/Track.cpp | 13 ++++++++++++- src/database/Track.hpp | 2 ++ src/ui/Explore.cpp | 14 ++++++++++++++ src/ui/Explore.hpp | 2 ++ src/ui/PlaylistView.cpp | 4 ++-- src/ui/TracksView.cpp | 38 ++++++++++++++++++++++++++++++++------ src/ui/TracksView.hpp | 6 ++++++ 12 files changed, 84 insertions(+), 18 deletions(-) diff --git a/approot/tracks.xml b/approot/tracks.xml index 823e6fb9..ef3d7320 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -6,6 +6,7 @@

${tr:msg-tracks}

+ ${play-btn}${add-btn}
diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp index bce519e2..32654f5e 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/DbArtist.cpp @@ -120,7 +120,9 @@ Artist::getByFilter(Wt::Dbo::Session& session, const std::vector keywords, int offset, int size, bool& moreResults) { - Wt::Dbo::collection collection = getQuery(session, clusters, keywords).limit(size + 1).offset(offset); + Wt::Dbo::collection collection = getQuery(session, clusters, keywords) + .limit(size != -1 ? size + 1 : -1) + .offset(offset); auto res = std::vector(collection.begin(), collection.end()); diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index 24e8e68b..47e259b3 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -61,12 +61,6 @@ Playlist::getAll(Wt::Dbo::Session& session, Wt::Dbo::ptr user) return std::vector(res.begin(), res.end()); } -void -Playlist::addTrack(Wt::Dbo::ptr track) -{ - _entries.insert( PlaylistEntry::create(*session(), track, self(), _entries.size()) ); -} - PlaylistEntry::PlaylistEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr playlist, int pos) : _pos(pos), _track(track), @@ -107,4 +101,10 @@ Playlist::getTracks(int offset, int size, bool& moreResults) const return res; } +std::size_t +Playlist::getCount() const +{ + return _entries.size(); +} + } // namespace Database diff --git a/src/database/Playlist.hpp b/src/database/Playlist.hpp index 816e4098..0acc41b8 100644 --- a/src/database/Playlist.hpp +++ b/src/database/Playlist.hpp @@ -50,10 +50,10 @@ class Playlist : public Wt::Dbo::Dbo bool isPublic() const { return _isPublic; } // Modifiers - void addTrack(Wt::Dbo::ptr track); void clear() { _entries.clear(); } // Get tracks, ordered by position + std::size_t getCount() const; std::vector> getTracks(int offset, int size, bool& moreResults) const; template diff --git a/src/database/Release.cpp b/src/database/Release.cpp index 0e902da8..134db031 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -118,7 +118,9 @@ Release::getByFilter(Wt::Dbo::Session& session, const std::vector keywords, int offset, int size, bool& moreResults) { - Wt::Dbo::collection collection = getQuery(session, clusterIds, keywords).limit(size + 1).offset(offset); + Wt::Dbo::collection collection = getQuery(session, clusterIds, keywords) + .limit(size != -1 ? size + 1 : -1) + .offset(offset); auto res = std::vector(collection.begin(), collection.end()); diff --git a/src/database/Track.cpp b/src/database/Track.cpp index efd5944a..5853a293 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -169,7 +169,9 @@ Track::getByFilter(Wt::Dbo::Session& session, const std::vector keywords, int offset, int size, bool& moreResults) { - Wt::Dbo::collection collection = getQuery(session, clusterIds, keywords).limit(size + 1).offset(offset); + Wt::Dbo::collection collection = getQuery(session, clusterIds, keywords) + .limit(size != -1 ? size + 1 : -1) + .offset(offset); auto res = std::vector(collection.begin(), collection.end()); @@ -184,6 +186,15 @@ Track::getByFilter(Wt::Dbo::Session& session, return res; } +std::vector +Track::getByFilter(Wt::Dbo::Session& session, + const std::set& clusters) +{ + bool moreResults; + + return getByFilter(session, clusters, std::vector(), -1, -1, moreResults); +} + boost::optional Track::getTrackNumber(void) const { diff --git a/src/database/Track.hpp b/src/database/Track.hpp index 01a1566c..7c0f1bc2 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -118,6 +118,8 @@ class Track static pointer getByPath(Wt::Dbo::Session& session, const boost::filesystem::path& p); static pointer getById(Wt::Dbo::Session& session, id_type id); static pointer getByMBID(Wt::Dbo::Session& session, const std::string& MBID); + static std::vector getByFilter(Wt::Dbo::Session& session, + const std::set& clusters); // tracks that belong to these clusters static std::vector getByFilter(Wt::Dbo::Session& session, const std::set& clusters, // tracks that belong to these clusters const std::vector keywords, // name must match all of these keywords diff --git a/src/ui/Explore.cpp b/src/ui/Explore.cpp index fcd41278..7a8d463c 100644 --- a/src/ui/Explore.cpp +++ b/src/ui/Explore.cpp @@ -115,6 +115,8 @@ Explore::Explore(Wt::WContainerWidget* parent) tracks->trackAdd.connect(this, &Explore::handleTrackAdd); tracks->trackPlay.connect(this, &Explore::handleTrackPlay); + tracks->tracksAdd.connect(this, &Explore::handleTracksAdd); + tracks->tracksPlay.connect(this, &Explore::handleTracksPlay); wApp->internalPathChanged().connect(std::bind([=] @@ -218,5 +220,17 @@ Explore::handleTrackPlay(Database::id_type id) tracksPlay.emit(getTrack(DboSession(), id)); } +void +Explore::handleTracksAdd(std::vector tracks) +{ + tracksAdd.emit(tracks); +} + +void +Explore::handleTracksPlay(std::vector tracks) +{ + tracksPlay.emit(tracks); +} + } // namespace UserInterface diff --git a/src/ui/Explore.hpp b/src/ui/Explore.hpp index 0e04a967..3c0dd136 100644 --- a/src/ui/Explore.hpp +++ b/src/ui/Explore.hpp @@ -43,6 +43,8 @@ class Explore : public Wt::WContainerWidget void handleReleasePlay(Database::id_type id); void handleTrackAdd(Database::id_type id); void handleTrackPlay(Database::id_type id); + void handleTracksAdd(std::vector tracks); + void handleTracksPlay(std::vector tracks); Filters* _filters; }; diff --git a/src/ui/PlaylistView.cpp b/src/ui/PlaylistView.cpp index a5fef657..b7a74384 100644 --- a/src/ui/PlaylistView.cpp +++ b/src/ui/PlaylistView.cpp @@ -70,9 +70,10 @@ Playlist::addTracks(const std::vector& tracks) playlist = Database::Playlist::create(DboSession(), currentPlaylistName, false, CurrentUser()); } + std::size_t pos = playlist->getCount(); for (auto track : tracks) { - playlist.modify()->addTrack(track); + Database::PlaylistEntry::create(DboSession(), track, playlist, pos++); } addSome(); @@ -133,7 +134,6 @@ Playlist::addSome() if (release) { entry->setCondition("if-has-release", true); - // TODO anchor Wt::WAnchor *releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(track->getRelease().id()))); Wt::WText *releaseText = new Wt::WText(releaseAnchor); releaseText->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); diff --git a/src/ui/TracksView.cpp b/src/ui/TracksView.cpp index cbfd45a8..8240986d 100644 --- a/src/ui/TracksView.cpp +++ b/src/ui/TracksView.cpp @@ -47,6 +47,20 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) _search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); _search->textInput().connect(this, &Tracks::refresh); + auto playBtn = new Wt::WText(Wt::WString::tr("btn-tracks-play-btn"), Wt::XHTMLText); + container->bindWidget("play-btn", playBtn); + playBtn->clicked().connect(std::bind([=] + { + tracksPlay.emit(getTracks()); + })); + + auto addBtn = new Wt::WText(Wt::WString::tr("btn-tracks-add-btn"), Wt::XHTMLText); + container->bindWidget("add-btn", addBtn); + addBtn->clicked().connect(std::bind([=] + { + tracksAdd.emit(getTracks()); + })); + _tracksContainer = new Wt::WContainerWidget(); container->bindWidget("tracks", _tracksContainer); @@ -64,6 +78,23 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) filters->updated().connect(this, &Tracks::refresh); } +std::vector +Tracks::getTracks(int offset, int size, bool& moreResults) +{ + auto searchKeywords = splitString(_search->text().toUTF8(), " "); + auto clusterIds = _filters->getClusterIds(); + + Wt::Dbo::Transaction transaction(DboSession()); + + return Track::getByFilter(DboSession(), clusterIds, searchKeywords, offset, size, moreResults); +} + +std::vector +Tracks::getTracks() +{ + bool moreResults; + return getTracks(-1, -1, moreResults); +} void Tracks::refresh() @@ -75,14 +106,10 @@ Tracks::refresh() void Tracks::addSome() { - auto searchKeywords = splitString(_search->text().toUTF8(), " "); - - auto clusterIds = _filters->getClusterIds(); - Wt::Dbo::Transaction transaction(DboSession()); bool moreResults; - auto tracks = Track::getByFilter(DboSession(), clusterIds, searchKeywords, _tracksContainer->count(), 20, moreResults); + auto tracks = getTracks(_tracksContainer->count(), 20, moreResults); for (auto track : tracks) { @@ -105,7 +132,6 @@ Tracks::addSome() if (release) { entry->setCondition("if-has-release", true); - // TODO anchor Wt::WAnchor *releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(track->getRelease().id()))); Wt::WText *releaseText = new Wt::WText(releaseAnchor); releaseText->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); diff --git a/src/ui/TracksView.hpp b/src/ui/TracksView.hpp index 3f949770..9b7e1c5c 100644 --- a/src/ui/TracksView.hpp +++ b/src/ui/TracksView.hpp @@ -34,10 +34,16 @@ class Tracks : public Wt::WContainerWidget Wt::Signal trackAdd; Wt::Signal trackPlay; + Wt::Signal> tracksAdd; + Wt::Signal> tracksPlay; + private: void refresh(); void addSome(); + std::vector getTracks(int offset, int size, bool& moreResults); + std::vector getTracks(); + Wt::WContainerWidget* _tracksContainer; Wt::WTemplate* _showMore; Wt::WLineEdit* _search; From e9da3adbf6f2a619ad219595868b9881ee51ab2b Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 25 Feb 2018 12:14:34 +0100 Subject: [PATCH 053/195] Added artist tag cloud --- approot/artist.xml | 5 +++++ src/database/DbArtist.cpp | 21 ++++++++++++++++++++- src/database/DbArtist.hpp | 5 ++++- src/ui/ArtistView.cpp | 14 ++++++++++++++ 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/approot/artist.xml b/approot/artist.xml index 434e056b..070c46c7 100644 --- a/approot/artist.xml +++ b/approot/artist.xml @@ -13,11 +13,16 @@

${name}

+ ${tags} ${play-btn}${add-btn}
${releases class="list-group"} + + ${name} + +
diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp index 32654f5e..bd871e7f 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/DbArtist.cpp @@ -137,7 +137,7 @@ Artist::getByFilter(Wt::Dbo::Session& session, return res; } -std::vector > +std::vector> Artist::getReleases(const std::set& clusterIds) const { assert(self()); @@ -183,6 +183,25 @@ Artist::getReleases(const std::set& clusterIds) const return std::vector< Wt::Dbo::ptr > (res.begin(), res.end()); } +std::vector> +Artist::getClusters(int size) const +{ + assert(self()); + assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(session()); + + Wt::Dbo::Query query = session()->query + ("select c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN artist a ON t.artist_id = a.id") + .where("a.id = ?").bind(self()->id()) + .groupBy("c.id") + .orderBy("COUNT(c.id) DESC") + .limit(size); + + Wt::Dbo::collection res = query; + + return std::vector(res.begin(), res.end()); +} + } // namespace Database diff --git a/src/database/DbArtist.hpp b/src/database/DbArtist.hpp index a22360dc..6ee5b283 100644 --- a/src/database/DbArtist.hpp +++ b/src/database/DbArtist.hpp @@ -63,9 +63,12 @@ class Artist : public Wt::Dbo::Dbo std::string getName(void) const { return _name; } std::string getMBID(void) const { return _MBID; } - // Get the releases that have at least one track for this artist + belongs to optonal cluster filters + // Get the releases that have at least one track for this artist that belongs to optional cluster filters std::vector> getReleases(const std::set& clusterIds = std::set()) const; + // Get the cluster of the tracks made by this artist + std::vector> getClusters(int size) const; + void setMBID(std::string mbid) { _MBID = mbid; } // Create diff --git a/src/ui/ArtistView.cpp b/src/ui/ArtistView.cpp index fc529a4f..6b770af0 100644 --- a/src/ui/ArtistView.cpp +++ b/src/ui/ArtistView.cpp @@ -74,6 +74,20 @@ Artist::refresh() auto t = new Wt::WTemplate(Wt::WString::tr("template-artist"), this); t->addFunction("tr", &Wt::WTemplate::Functions::tr); + auto clusterContainers = new Wt::WContainerWidget(); + t->bindWidget("tags", clusterContainers); + + { + auto clusters = artist->getClusters(3); + + for (auto cluster : clusters) + { + auto entry = new Wt::WTemplate(Wt::WString::tr("template-artist-tag-entry"), clusterContainers); + + entry->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::PlainText); + } + } + t->bindString("name", Wt::WString::fromUTF8(artist->getName()), Wt::PlainText); { auto playBtn = new Wt::WText(Wt::WString::tr("btn-artist-play-btn"), Wt::XHTMLText); From d6f0e34b622c5ceeec999b1515fe9544d0a2d69e Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 25 Feb 2018 12:27:16 +0100 Subject: [PATCH 054/195] Added release tag cloud --- approot/artist.xml | 4 ++-- approot/release.xml | 5 +++++ src/database/DbArtist.cpp | 2 -- src/database/Release.cpp | 19 +++++++++++++++++++ src/database/Release.hpp | 1 + src/ui/ArtistView.cpp | 4 ++-- src/ui/ReleaseView.cpp | 14 ++++++++++++++ 7 files changed, 43 insertions(+), 6 deletions(-) diff --git a/approot/artist.xml b/approot/artist.xml index 070c46c7..b3252bf0 100644 --- a/approot/artist.xml +++ b/approot/artist.xml @@ -13,13 +13,13 @@

${name}

- ${tags} + ${clusters} ${play-btn}${add-btn}
${releases class="list-group"} - + ${name} diff --git a/approot/release.xml b/approot/release.xml index 68def396..dcefa70c 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -16,11 +16,16 @@

${name}

${artist-name}

${}${year}${}${} (${orig-year})${}

+ ${clusters} ${play-btn}${add-btn}
${tracks} + + ${name} + + ${}${disc-number}-${}${}${track-number}. ${} ${}${artist-name} - ${} diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp index bd871e7f..ec08bc52 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/DbArtist.cpp @@ -202,6 +202,4 @@ Artist::getClusters(int size) const return std::vector(res.begin(), res.end()); } - - } // namespace Database diff --git a/src/database/Release.cpp b/src/database/Release.cpp index 134db031..73c65bdf 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -225,4 +225,23 @@ Release::getTracks(const std::set& clusterIds) const return std::vector< Wt::Dbo::ptr > (res.begin(), res.end()); } +std::vector> +Release::getClusters(int size) const +{ + assert(self()); + assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(session()); + + Wt::Dbo::Query query = session()->query + ("select c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN release r ON t.release_id = r.id") + .where("r.id = ?").bind(self()->id()) + .groupBy("c.id") + .orderBy("COUNT(c.id) DESC") + .limit(size); + + Wt::Dbo::collection res = query; + + return std::vector(res.begin(), res.end()); +} + } // namespace Database diff --git a/src/database/Release.hpp b/src/database/Release.hpp index b9d8acac..7e46795e 100644 --- a/src/database/Release.hpp +++ b/src/database/Release.hpp @@ -57,6 +57,7 @@ class Release : public Wt::Dbo::Dbo bool& moreExpected); std::vector> getTracks(const std::set& clusters = std::set()) const; + std::vector> getClusters(int size) const; // Create static pointer create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID = ""); diff --git a/src/ui/ArtistView.cpp b/src/ui/ArtistView.cpp index 6b770af0..eefc62a6 100644 --- a/src/ui/ArtistView.cpp +++ b/src/ui/ArtistView.cpp @@ -75,14 +75,14 @@ Artist::refresh() t->addFunction("tr", &Wt::WTemplate::Functions::tr); auto clusterContainers = new Wt::WContainerWidget(); - t->bindWidget("tags", clusterContainers); + t->bindWidget("clusters", clusterContainers); { auto clusters = artist->getClusters(3); for (auto cluster : clusters) { - auto entry = new Wt::WTemplate(Wt::WString::tr("template-artist-tag-entry"), clusterContainers); + auto entry = new Wt::WTemplate(Wt::WString::tr("template-artist-cluster-entry"), clusterContainers); entry->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::PlainText); } diff --git a/src/ui/ReleaseView.cpp b/src/ui/ReleaseView.cpp index bd224e47..8493da75 100644 --- a/src/ui/ReleaseView.cpp +++ b/src/ui/ReleaseView.cpp @@ -110,6 +110,20 @@ Release::refresh() cover->setImageLink(Wt::WLink (SessionImageResource()->getReleaseUrl(release.id(), 512))); t->bindWidget("cover", cover); + auto clusterContainers = new Wt::WContainerWidget(); + t->bindWidget("clusters", clusterContainers); + + { + auto clusters = release->getClusters(3); + + for (auto cluster : clusters) + { + auto entry = new Wt::WTemplate(Wt::WString::tr("template-release-cluster-entry"), clusterContainers); + + entry->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::PlainText); + } + } + { auto playBtn = new Wt::WText(Wt::WString::tr("btn-release-play-btn"), Wt::XHTMLText); t->bindWidget("play-btn", playBtn); From 9cf89893e0d7e40b19b1bb433e1a07c655da976d Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 1 Mar 2018 22:20:53 +0100 Subject: [PATCH 055/195] Prepare multi cluster tag parsing --- TODO | 4 + src/Makefile.am | 4 +- src/database/DatabaseHandler.cpp | 25 +- src/database/DatabaseHandler.hpp | 1 + src/database/MediaDirectory.cpp | 23 +- src/database/MediaDirectory.hpp | 16 +- src/database/Track.cpp | 97 +++--- src/database/Track.hpp | 81 +++-- .../updater/DatabaseHighLevelCluster.cpp | 12 +- src/main/main.cpp | 19 +- src/metadata/AvFormat.cpp | 149 ++++----- src/metadata/AvFormat.hpp | 20 +- src/metadata/MetaData.hpp | 26 +- src/metadata/TagLibParser.cpp | 64 ++-- src/metadata/TagLibParser.hpp | 16 +- .../MediaScanner.cpp} | 312 ++++++++---------- .../MediaScanner.hpp} | 110 ++---- src/ui/Filters.cpp | 19 +- test/Makefile.am | 4 +- test/TestAvMetadata.cpp | 24 +- 20 files changed, 504 insertions(+), 522 deletions(-) rename src/{database/updater/DatabaseUpdater.cpp => scanner/MediaScanner.cpp} (59%) rename src/{database/updater/DatabaseUpdater.hpp => scanner/MediaScanner.hpp} (50%) diff --git a/TODO b/TODO index 15b32001..d55ee917 100644 --- a/TODO +++ b/TODO @@ -12,6 +12,8 @@ - handle access rights problems (instead of aborting) - add a global play counter for tracks. This will help people to spot most popular files - Use the WServer::post method to notify the end of the database scan? (with results?) +- Make clusters based on different metadata (albumgrouping, genre, mood, etc.). Make it configurable somewhere as it is very difficult to handle them all? +- Use albumartist when available (useful for compilations) [Metadata] - WMA covers: add support @@ -31,6 +33,8 @@ - Add a hint for the user to get the nature of tag (created from genre ? created from audio features?) - Implement a play queue - Implement a decent player + - Tags cloud for artist/release + - Dedicate a color for each tag type [REST API] - Make a dedicated REST API. Maybe use the SubSonic API or Ampache API? diff --git a/src/Makefile.am b/src/Makefile.am index 54f36b85..7842e2dd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,14 +15,12 @@ lms_SOURCES = \ $(srcdir)/database/SqlQuery.cpp \ $(srcdir)/database/Track.cpp \ $(srcdir)/database/User.cpp \ - $(srcdir)/database/updater/DatabaseUpdater.cpp \ - $(srcdir)/database/updater/DatabaseFeatureExtractor.cpp \ - $(srcdir)/database/updater/DatabaseHighLevelCluster.cpp \ $(srcdir)/feature/FeatureExtractor.cpp \ $(srcdir)/feature/FeatureStore.cpp \ $(srcdir)/image/Image.cpp \ $(srcdir)/metadata/AvFormat.cpp \ $(srcdir)/metadata/TagLibParser.cpp \ + $(srcdir)/scanner/MediaScanner.cpp \ $(srcdir)/ui/ArtistView.cpp \ $(srcdir)/ui/ArtistsView.cpp \ $(srcdir)/ui/Explore.cpp \ diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index 85164449..c063bbf0 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include + #include #include @@ -83,22 +85,25 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) _session.mapClass("artist"); _session.mapClass("cluster"); - _session.mapClass("track"); + _session.mapClass("cluster_type"); + _session.mapClass("media_directory"); _session.mapClass("playlist"); _session.mapClass("playlist_entry"); _session.mapClass("release"); - _session.mapClass("media_directory"); _session.mapClass("setting"); + _session.mapClass("track"); - _session.mapClass("user"); _session.mapClass("auth_info"); _session.mapClass("auth_identity"); _session.mapClass("auth_token"); + _session.mapClass("user"); try { Wt::Dbo::Transaction transaction(_session); _session.createTables(); + + LMS_LOG(DB, INFO) << "Tables created"; } catch(std::exception& e) { LMS_LOG(DB, ERROR) << "Cannot create tables: " << e.what(); @@ -108,21 +113,17 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) Wt::Dbo::Transaction transaction(_session); // Indexes - _session.execute("PRAGMA journal_mode=WAL"); + // _session.execute("PRAGMA journal_mode=WAL"); _session.execute("CREATE INDEX IF NOT EXISTS track_path_idx ON track(file_path)"); _session.execute("CREATE INDEX IF NOT EXISTS artist_name_idx ON artist(name)"); _session.execute("CREATE INDEX IF NOT EXISTS release_name_idx ON release(name)"); _session.execute("CREATE INDEX IF NOT EXISTS track_artist_idx ON track(artist_id)"); _session.execute("CREATE INDEX IF NOT EXISTS track_release_idx ON track(release_id)"); - _session.execute("CREATE INDEX IF NOT EXISTS cluster_type_idx ON cluster(type)"); + _session.execute("CREATE INDEX IF NOT EXISTS cluster_name_idx ON cluster(name)"); + _session.execute("CREATE INDEX IF NOT EXISTS cluster_type_name_idx ON cluster_type(name)"); + // TODO move this // Default values - if (!Setting::exists(_session, "audio_file_extensions")) - Setting::setString(_session, "audio_file_extensions", ".mp3 .ogg .oga .aac .m4a .flac .wav .wma .aif .aiff .ape .mpc .shn" ); - - if (!Setting::exists(_session, "video_file_extensions")) - Setting::setString(_session, "video_file_extensions", ".flv .avi .mpg .mpeg .mp4 .m4v .mkv .mov .wmv .ogv .divx .m2ts"); - if (!Setting::exists(_session, "tags_highlevel_acousticbrainz")) Setting::setBool(_session, "tags_highlevel_acousticbrainz", true); @@ -184,7 +185,7 @@ Handler::createConnectionPool(boost::filesystem::path p) Wt::Dbo::backend::Sqlite3 *connection = new Wt::Dbo::backend::Sqlite3(p.string()); - connection->executeSql("pragma journal_mode=WAL"); +// connection->executeSql("pragma journal_mode=WAL"); connection->setProperty("show-queries", "true"); return new Wt::Dbo::FixedSqlConnectionPool(connection, 1); diff --git a/src/database/DatabaseHandler.hpp b/src/database/DatabaseHandler.hpp index 6b07984e..28f5600a 100644 --- a/src/database/DatabaseHandler.hpp +++ b/src/database/DatabaseHandler.hpp @@ -21,6 +21,7 @@ #define DATABASE_HANDLER_HPP #include +#include #include #include diff --git a/src/database/MediaDirectory.cpp b/src/database/MediaDirectory.cpp index cd2a0cc2..88b30e88 100644 --- a/src/database/MediaDirectory.cpp +++ b/src/database/MediaDirectory.cpp @@ -23,16 +23,15 @@ namespace Database { -MediaDirectory::MediaDirectory(boost::filesystem::path p, Type type) -: _type(type), - _path(stringTrimEnd(p.string(), "/\\")) +MediaDirectory::MediaDirectory(boost::filesystem::path p) +: _path(stringTrimEnd(p.string(), "/\\")) { } MediaDirectory::pointer -MediaDirectory::create(Wt::Dbo::Session& session, boost::filesystem::path p, Type type) +MediaDirectory::create(Wt::Dbo::Session& session, boost::filesystem::path p) { - return session.add( new MediaDirectory( p, type ) ); + return session.add( new MediaDirectory(p) ); } void @@ -50,20 +49,6 @@ MediaDirectory::getAll(Wt::Dbo::Session& session) return std::vector(res.begin(), res.end()); } -std::vector -MediaDirectory::getByType(Wt::Dbo::Session& session, Type type) -{ - Wt::Dbo::collection< MediaDirectory::pointer > res = session.find().where("type = ?").bind (type); - - return std::vector(res.begin(), res.end()); -} - -MediaDirectory::pointer -MediaDirectory::get(Wt::Dbo::Session& session, boost::filesystem::path p, Type type) -{ - return session.find().where("path = ?").where("type = ?").bind( p.string()).bind(type); -} - boost::filesystem::path MediaDirectory::getPath(void) const { diff --git a/src/database/MediaDirectory.hpp b/src/database/MediaDirectory.hpp index e00892dd..3bc2e497 100644 --- a/src/database/MediaDirectory.hpp +++ b/src/database/MediaDirectory.hpp @@ -31,39 +31,29 @@ namespace Database { class MediaDirectory { public: - typedef Wt::Dbo::ptr pointer; - enum Type { - Audio = 1, - }; - MediaDirectory() {} - MediaDirectory(boost::filesystem::path p, Type type); + MediaDirectory(boost::filesystem::path p); // Accessors - static pointer create(Wt::Dbo::Session& session, boost::filesystem::path p, Type type); + static pointer create(Wt::Dbo::Session& session, boost::filesystem::path p); static std::vector getAll(Wt::Dbo::Session& session); - static std::vector getByType(Wt::Dbo::Session& session, Type type); - static pointer get(Wt::Dbo::Session& session, boost::filesystem::path p, Type type); static void eraseAll(Wt::Dbo::Session& session); + static void eraseByPath(Wt::Dbo::Session& session, boost::filesystem::path p); - Type getType(void) const { return _type; } boost::filesystem::path getPath(void) const; template void persist(Action& a) { - Wt::Dbo::field(a, _type, "type"); Wt::Dbo::field(a, _path, "path"); } private: - Type _type; std::string _path; - }; } // namespace Database diff --git a/src/database/Track.cpp b/src/database/Track.cpp index 5853a293..d913980f 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -224,44 +224,24 @@ Cluster::Cluster() { } -Cluster::Cluster(std::string type, std::string name) -: -_type( std::string(type, 0, _maxTypeLength)), -_name( std::string(name, 0, _maxNameLength)) +Cluster::Cluster(Wt::Dbo::ptr type, std::string name) + : _name(std::string(name, 0, _maxNameLength)), + _clusterType(type) { } -Wt::Dbo::collection -Cluster::getAll(Wt::Dbo::Session& session) -{ - return session.find(); -} - Cluster::pointer -Cluster::get(Wt::Dbo::Session& session, std::string type, std::string name) -{ - // TODO use like search - return session.find().where("type = ?").where("name = ?").bind( std::string(type, 0, _maxTypeLength)).bind( std::string(name, 0, _maxNameLength)); -} - -std::vector -Cluster::getByType(Wt::Dbo::Session& session, std::string type) -{ - Wt::Dbo::collection res = session.find().where("type = ?").bind( std::string(type, 0, _maxTypeLength)).orderBy("name"); - return std::vector(res.begin(), res.end()); -} - -Cluster::pointer -Cluster::create(Wt::Dbo::Session& session, std::string type, std::string name) +Cluster::create(Wt::Dbo::Session& session, Wt::Dbo::ptr type, std::string name) { return session.add(new Cluster(type, name)); } -void -Cluster::remove(Wt::Dbo::Session& session, std::string type) +std::vector +Cluster::getAll(Wt::Dbo::Session& session) { - Wt::Dbo::Transaction transaction(session); - session.execute("DELETE FROM cluster WHERE type = ?").bind(type); + Wt::Dbo::collection res = session.find(); + + return std::vector(res.begin(), res.end()); } Wt::Dbo::Query @@ -278,15 +258,6 @@ Cluster::getQuery(Wt::Dbo::Session& session, SearchFilter filter) return query; } -std::vector -Cluster::getAllTypes(Wt::Dbo::Session& session) -{ - Wt::Dbo::collection res - = session.query("SELECT type from cluster").groupBy("type").orderBy("type"); - - return std::vector(res.begin(), res.end()); -} - std::vector Cluster::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size) { @@ -295,6 +266,56 @@ Cluster::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, return std::vector(res.begin(), res.end()); } +ClusterType::ClusterType(std::string name) + : _name(name) +{ +} + +ClusterType::pointer +ClusterType::getByName(Wt::Dbo::Session& session, std::string name) +{ + return session.find().where("name = ?").bind(name); +} + +std::vector +ClusterType::getAll(Wt::Dbo::Session& session) +{ + Wt::Dbo::collection res = session.find(); + + return std::vector(res.begin(), res.end()); +} + +ClusterType::pointer +ClusterType::create(Wt::Dbo::Session& session, std::string name) +{ + return session.add(new ClusterType(name)); +} + +Cluster::pointer +ClusterType::getCluster(std::string name) const +{ + assert(self()); + assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(session()); + + return session()->find() + .where("name = ?").bind(name) + .where("cluster_type_id = ").bind(self()->id()); +} + +std::vector +ClusterType::getClusters() const +{ + assert(self()); + assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(session()); + + Wt::Dbo::collection res = session()->find() + .where("cluster_type_id = ").bind(self()->id()) + .orderBy("name"); + + return std::vector(res.begin(), res.end()); +} } // namespace Database diff --git a/src/database/Track.hpp b/src/database/Track.hpp index 7c0f1bc2..878ef796 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -40,64 +40,89 @@ class Artist; class Release; class Track; class PlaylistEntry; +class ClusterType; -class Cluster +class Cluster : public Wt::Dbo::Dbo { public: - - enum class Type - { - Genre = 1, - Mood = 2, - }; - typedef Wt::Dbo::ptr pointer; typedef Wt::Dbo::dbo_traits::IdType id_type; Cluster(); - Cluster(std::string type, std::string name); + Cluster(Wt::Dbo::ptr type, std::string name); // Find utility - static pointer get(Wt::Dbo::Session& session, std::string type, std::string name); static std::vector getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1); - static Wt::Dbo::collection getAll(Wt::Dbo::Session& session); - static std::vector getAllTypes(Wt::Dbo::Session& session); - static std::vector getByType(Wt::Dbo::Session& session, std::string type); + static std::vector getAll(Wt::Dbo::Session& session); // Create utility - static pointer create(Wt::Dbo::Session& session, std::string type, std::string name); - - // Remove utility - static void remove(Wt::Dbo::Session& session, std::string type); // nested transaction + static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr type, std::string name); // Accessors const std::string& getName(void) const { return _name; } - const std::string& getType(void) const { return _type; } - const Wt::Dbo::collection< Wt::Dbo::ptr >& getTracks() const { return _tracks;} + Wt::Dbo::ptr getType() const { return _clusterType; } + const Wt::Dbo::collection>& getTracks() const { return _tracks; } - void addTrack(Wt::Dbo::Session& session, Wt::Dbo::dbo_traits::IdType trackId); void addTrack(Wt::Dbo::ptr track) { _tracks.insert(track); } template - void persist(Action& a) - { - Wt::Dbo::field(a, _name, "name"); - Wt::Dbo::field(a, _type, "type"); - Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToMany, "track_cluster", "", Wt::Dbo::OnDeleteCascade); - } + void persist(Action& a) + { + Wt::Dbo::field(a, _name, "name"); + + Wt::Dbo::belongsTo(a, _clusterType, "cluster_type", Wt::Dbo::OnDeleteCascade); + Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToMany, "track_cluster", "", Wt::Dbo::OnDeleteCascade); + } private: static Wt::Dbo::Query getQuery(Wt::Dbo::Session& session, SearchFilter filter); static const std::size_t _maxNameLength = 128; - static const std::size_t _maxTypeLength = 128; - std::string _type; std::string _name; + Wt::Dbo::ptr _clusterType; Wt::Dbo::collection< Wt::Dbo::ptr > _tracks; }; + +class ClusterType : public Wt::Dbo::Dbo +{ + public: + + using pointer = Wt::Dbo::ptr; + using id_type = Wt::Dbo::dbo_traits::IdType; + + ClusterType() {} + ClusterType(std::string name); + + static pointer getByName(Wt::Dbo::Session& session, std::string name); + static std::vector getAll(Wt::Dbo::Session& session); + + static pointer create(Wt::Dbo::Session& session, std::string name); + static void remove(Wt::Dbo::Session& session, std::string name); + + // Accessors + const std::string& getName(void) const { return _name; } + std::vector getClusters() const; + Cluster::pointer getCluster(std::string name) const; + + template + void persist(Action& a) + { + Wt::Dbo::field(a, _name, "name"); + Wt::Dbo::hasMany(a, _clusters, Wt::Dbo::ManyToOne, "cluster_type"); + } + + private: + + static const std::size_t _maxNameLength = 128; + + std::string _name; + Wt::Dbo::collection< Wt::Dbo::ptr > _clusters; +}; + + class Track { public: diff --git a/src/database/updater/DatabaseHighLevelCluster.cpp b/src/database/updater/DatabaseHighLevelCluster.cpp index 60d54918..5cc37607 100644 --- a/src/database/updater/DatabaseHighLevelCluster.cpp +++ b/src/database/updater/DatabaseHighLevelCluster.cpp @@ -26,11 +26,15 @@ namespace Database { -static Cluster::pointer getCluster(std::string type, std::string value) +static Cluster::pointer getCluster(std::string type, std::string name) { - Cluster::pointer cluster = ( Cluster::get(UpdaterDboSession(), type, value) ); + ClusterType::pointer clusterType = ClusterType::getByName(UpdaterDboSession(), type); + if (!clusterType) + clusterType = ClusterType::create(UpdaterDboSession(), type); + + auto cluster = clusterType->getCluster(name); if (!cluster) - cluster = Cluster::create(UpdaterDboSession(), type, value); + cluster = Cluster::create(UpdaterDboSession(), clusterType, name); return cluster; } @@ -196,7 +200,7 @@ HighLevelCluster::handleFilesUpdated(void) for (auto cluster : clusters) { // Check if removed - if (cluster->getType() != "high_level") + if (cluster->getType()->getName() != "high_level") continue; auto it = std::find(newClusterNames.begin(), newClusterNames.end(), cluster->getName()); diff --git a/src/main/main.cpp b/src/main/main.cpp index bcd80006..c2b24416 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -29,9 +29,9 @@ #include "image/Image.hpp" #include "feature/FeatureExtractor.hpp" -#include "database/updater/DatabaseUpdater.hpp" -#include "database/updater/DatabaseFeatureExtractor.hpp" -#include "database/updater/DatabaseHighLevelCluster.hpp" +#include "scanner/MediaScanner.hpp" +//#include "database/updater/DatabaseFeatureExtractor.hpp" +//#include "database/updater/DatabaseHighLevelCluster.hpp" #include "ui/LmsApplication.hpp" @@ -125,20 +125,19 @@ int main(int argc, char* argv[]) std::unique_ptr connectionPool( Database::Handler::createConnectionPool(Config::instance().getPath("working-dir") / "lms.db")); - Database::Updater& dbUpdater = Database::Updater::instance(); - dbUpdater.setConnectionPool(*connectionPool); + Scanner::MediaScanner scanner(*connectionPool); // Instanciate the updater's event handler. Order is important - dbUpdater.registerEventHandler(std::make_shared()); - dbUpdater.registerEventHandler(std::make_shared()); +// dbUpdater.registerEventHandler(std::make_shared()); +// dbUpdater.registerEventHandler(std::make_shared()); // bind entry point server.addEntryPoint(Wt::Application, boost::bind(UserInterface::LmsApplication::create, _1, boost::ref(*connectionPool))); // Start - LMS_LOG(MAIN, INFO) << "Starting database updater..."; - dbUpdater.start(); + LMS_LOG(MAIN, INFO) << "Starting Media scanner..."; + scanner.start(); LMS_LOG(MAIN, INFO) << "Starting server..."; server.start(); @@ -152,7 +151,7 @@ int main(int argc, char* argv[]) server.stop(); LMS_LOG(MAIN, INFO) << "Stopping database updater..."; - dbUpdater.stop(); + scanner.stop(); res = EXIT_SUCCESS; } diff --git a/src/metadata/AvFormat.cpp b/src/metadata/AvFormat.cpp index da5fc3bb..9b13a731 100644 --- a/src/metadata/AvFormat.cpp +++ b/src/metadata/AvFormat.cpp @@ -30,19 +30,23 @@ namespace MetaData { -bool -AvFormat::parse(const boost::filesystem::path& p, Items& items) +AvFormat::AvFormat(const std::map& clusterMap) +: _clusterMap(clusterMap) { +} + +boost::optional +AvFormat::parse(const boost::filesystem::path& p) +{ + Items items; Av::MediaFile mediaFile(p); if (!mediaFile.open()) - return false; + return boost::none; if (!mediaFile.scan()) - return false; - - std::map metadata = mediaFile.getMetaData(); + return boost::none; // Stream info { @@ -63,41 +67,6 @@ AvFormat::parse(const boost::filesystem::path& p, Items& items) items.insert( std::make_pair(MetaData::Type::AudioStreams, audioStreams)); } - { - std::vector videoStreams; - - std::vector streams = mediaFile.getStreams(Av::Stream::Type::Video); - - for (Av::Stream& stream : streams) - { - VideoStream videoStream; - videoStream.desc = stream.desc; - videoStream.bitRate = stream.bitrate; - - videoStreams.push_back(videoStream); - } - - if (!videoStreams.empty()) - items.insert( std::make_pair(MetaData::Type::VideoStreams, videoStreams)); - } - - { - std::vector subtitleStreams; - - std::vector streams = mediaFile.getStreams(Av::Stream::Type::Subtitle); - - for (Av::Stream& stream : streams) - { - SubtitleStream subtitleStream; - subtitleStream.desc = stream.desc; - - subtitleStreams.push_back(subtitleStream); - } - - if (!subtitleStreams.empty()) - items.insert( std::make_pair(MetaData::Type::SubtitleStreams, subtitleStreams)); - } - // Duration items.insert( std::make_pair(MetaData::Type::Duration, mediaFile.getDuration() )); @@ -106,19 +75,27 @@ AvFormat::parse(const boost::filesystem::path& p, Items& items) // Embedded MetaData // Make sure to convert strings into UTF-8 - std::map::const_iterator it; - for (it = metadata.begin(); it != metadata.end(); ++it) + + MetaData::Clusters clusters; + + std::map metadataMap = mediaFile.getMetaData(); + for (auto metadata : metadataMap) { - if (boost::iequals(it->first, "artist")) - items.insert( std::make_pair(MetaData::Type::Artist, stringTrim( stringToUTF8(it->second)) )); - else if (boost::iequals(it->first, "album")) - items.insert( std::make_pair(MetaData::Type::Album, stringTrim( stringToUTF8(it->second)) )); - else if (boost::iequals(it->first, "title")) - items.insert( std::make_pair(MetaData::Type::Title, stringTrim( stringToUTF8(it->second)) )); - else if (boost::iequals(it->first, "track")) + const std::string tag = boost::to_upper_copy(metadata.first); + const std::string value = metadata.second; +#if 0 + std::cout << "TAG = " << tag << ", VAL = " << value << std::endl; +#endif + if (tag == "ARTIST") + items.insert( std::make_pair(MetaData::Type::Artist, stringTrim( stringToUTF8(value)) )); + else if (tag == "ALBUM") + items.insert( std::make_pair(MetaData::Type::Album, stringTrim( stringToUTF8(value)) )); + else if (tag == "TITLE") + items.insert( std::make_pair(MetaData::Type::Title, stringTrim( stringToUTF8(value)) )); + else if (tag == "TRACK") { // Expecting 'Number/Total' - auto strings = splitString(it->second, "/"); + auto strings = splitString(value, "/"); if (strings.size() > 0) { @@ -134,10 +111,10 @@ AvFormat::parse(const boost::filesystem::path& p, Items& items) } } } - else if (boost::iequals(it->first, "disc")) + else if (tag == "DISC") { // Expecting 'Number/Total' - auto strings = splitString(it->second, "/"); + auto strings = splitString(value, "/"); if (strings.size() > 0) { @@ -153,49 +130,57 @@ AvFormat::parse(const boost::filesystem::path& p, Items& items) } } } - else if (boost::iequals(it->first, "date") - || boost::iequals(it->first, "year") - || boost::iequals(it->first, "WM/Year")) + else if (tag == "DATE" + || tag == "YEAR" + || tag == "WM/Year") { boost::posix_time::ptime p; - if (readAsPosixTime(it->second, p)) + if (readAsPosixTime(value, p)) items.insert( std::make_pair(MetaData::Type::Date, p)); } - else if (boost::iequals(it->first, "TDOR") // Original release time (ID3v2 2.4) - || boost::iequals(it->first, "TORY")) // Original release year + else if (tag == "TDOR" // Original release time (ID3v2 2.4) + || tag == "TORY") // Original release year { boost::posix_time::ptime p; - if (readAsPosixTime(it->second, p)) + if (readAsPosixTime(value, p)) items.insert( std::make_pair(MetaData::Type::OriginalDate, p)); } - else if (boost::iequals(it->first, "genre")) + else if (tag == "MUSICBRAINZ ARTIST ID" + || tag == "MUSICBRAINZ_ARTISTID") { - // TODO use splitStrings - std::list genres; - if (readList(it->second, ";,\\", genres)) - items.insert( std::make_pair(MetaData::Type::Genres, genres)); + items.insert( std::make_pair(MetaData::Type::MusicBrainzArtistID, stringTrim( stringToUTF8(value)) )); + } + else if (tag == "MUSICBRAINZ ALBUM ID" + || tag == "MUSICBRAINZ_ALBUMID") + { + items.insert( std::make_pair(MetaData::Type::MusicBrainzAlbumID, stringTrim( stringToUTF8(value)) )); + } + else if (tag == "MUSICBRAINZ RELEASE TRACK ID" + || tag == "MUSICBRAINZ_RELEASETRACKID" + || tag == "MUSICBRAINZ_TRACKID") + { + items.insert( std::make_pair(MetaData::Type::MusicBrainzTrackID, stringTrim( stringToUTF8(value)) )); + } + else if (tag == "ACOUSTID ID") + { + items.insert( std::make_pair(MetaData::Type::AcoustID, stringTrim( stringToUTF8(value)) )); + } + else if (_clusterMap.find(tag) != _clusterMap.end()) + { + std::vector clusterNames = splitString(value, ";,\\"); - } - else if (boost::iequals(it->first, "MusicBrainz Artist Id") - || boost::iequals(it->first, "MUSICBRAINZ_ARTISTID")) - { - items.insert( std::make_pair(MetaData::Type::MusicBrainzArtistID, stringTrim( stringToUTF8(it->second)) )); - } - else if (boost::iequals(it->first, "MusicBrainz Album Id") - || boost::iequals(it->first, "MUSICBRAINZ_ALBUMID")) - { - items.insert( std::make_pair(MetaData::Type::MusicBrainzAlbumID, stringTrim( stringToUTF8(it->second)) )); - } - else if (boost::iequals(it->first, "MusicBrainz Release Track Id") - || boost::iequals(it->first, "MUSICBRAINZ_RELEASETRACKID") - || boost::iequals(it->first, "MUSICBRAINZ_TRACKID")) - { - items.insert( std::make_pair(MetaData::Type::MusicBrainzTrackID, stringTrim( stringToUTF8(it->second)) )); + if (!clusterNames.empty()) + { + clusters[_clusterMap[tag]] = std::set(clusterNames.begin(), clusterNames.end()); + } } } - return true; + if (!clusters.empty()) + items.insert( std::make_pair(MetaData::Type::Clusters, clusters) ); + + return items; } } // namespace MetaData diff --git a/src/metadata/AvFormat.hpp b/src/metadata/AvFormat.hpp index 4c08d943..8c3c9504 100644 --- a/src/metadata/AvFormat.hpp +++ b/src/metadata/AvFormat.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -17,8 +17,10 @@ * along with LMS. If not, see . */ -#ifndef METADATA_AVFORMAT_HPP -#define METADATA_AVFORMAT_HPP +#pragma once + +#include +#include #include "MetaData.hpp" @@ -30,13 +32,19 @@ class AvFormat : public Parser { public: - bool parse(const boost::filesystem::path& p, Items& items); + AvFormat(const std::map& clusterMap + = { + {"GENRE", "Genre" }, + {"ALBUMGROUPING", "Group" } + }); + + + boost::optional parse(const boost::filesystem::path& p); private: + std::map _clusterMap; }; - } // namespace MetaData -#endif diff --git a/src/metadata/MetaData.hpp b/src/metadata/MetaData.hpp index 019184a3..6bbea293 100644 --- a/src/metadata/MetaData.hpp +++ b/src/metadata/MetaData.hpp @@ -21,8 +21,10 @@ #define METADATA_HPP #include +#include #include +#include #include namespace MetaData @@ -30,10 +32,11 @@ namespace MetaData enum class Type { + // Name Type of the value Artist, // string Title, // string Album, // string - Genres, // list + Clusters, // Clusters, ex: { "genre", {"death metal", "brutal death"} }, { "albumgrouping", {"metal"} } Duration, // boost::posix_time::time_duration TrackNumber, // size_t DiscNumber, // size_t @@ -43,12 +46,11 @@ namespace MetaData OriginalDate, // boost::posix_time::ptime HasCover, // bool AudioStreams, // vector - VideoStreams, // vector - SubtitleStreams, // vector MusicBrainzArtistID, // string MusicBrainzAlbumID, // string MusicBrainzTrackID, // string MusicBrainzRecordingID, // string + AcoustID, // string }; // Used by Streams @@ -58,28 +60,16 @@ namespace MetaData std::size_t bitRate; }; - struct VideoStream - { - std::string desc; - std::size_t bitRate; - }; - - struct SubtitleStream - { - std::string desc; - }; - // Type and associated data // See enum Type's comments - typedef std::map Items; + using Items = std::map; + using Clusters = std::map>; class Parser { public: - typedef std::shared_ptr pointer; - - virtual bool parse(const boost::filesystem::path& p, Items& items) = 0; + virtual boost::optional parse(const boost::filesystem::path& p) = 0; }; diff --git a/src/metadata/TagLibParser.cpp b/src/metadata/TagLibParser.cpp index 7afa6140..5508ef46 100644 --- a/src/metadata/TagLibParser.cpp +++ b/src/metadata/TagLibParser.cpp @@ -32,18 +32,25 @@ namespace MetaData { -bool -TagLibParser::parse(const boost::filesystem::path& p, Items& items) +TagLibParser::TagLibParser(const std::map& clusterMap) +: _clusterMap(clusterMap) +{ +} + +boost::optional +TagLibParser::parse(const boost::filesystem::path& p) { TagLib::FileRef f(p.string().c_str(), true, // read audio properties TagLib::AudioProperties::Average); if (f.isNull()) - return false; + return boost::none; if (!f.audioProperties()) - return false; + return boost::none; + + Items items; { TagLib::AudioProperties *properties = f.audioProperties(); @@ -70,32 +77,46 @@ TagLibParser::parse(const boost::filesystem::path& p, Items& items) if (f.tag()) { - TagLib::PropertyMap tags = f.file()->properties(); + MetaData::Clusters clusters; + TagLib::PropertyMap properties = f.file()->properties(); - for(TagLib::PropertyMap::ConstIterator itElem = tags.begin(); itElem != tags.end(); ++itElem) + for(auto property : properties) { - const std::string tag = itElem->first.to8Bit(true); - const TagLib::StringList &values = itElem->second; + const std::string tag = property.first.upper().to8Bit(true); + const TagLib::StringList& values = property.second; if (tag.empty() || values.isEmpty() || values.front().isEmpty()) continue; // TODO validate MBID format +#if 0 + std::cout << "TAG = '" << tag << "'" << std::endl; + for (auto value : values) + { + std::cout << "\t'" << value.to8Bit(true) << "'" << std::endl; + } +#endif + if (tag == "ARTIST") items.insert( std::make_pair(MetaData::Type::Artist, stringTrim( values.front().to8Bit(true)))); else if (tag == "ALBUM") items.insert( std::make_pair(MetaData::Type::Album, stringTrim( values.front().to8Bit(true)))); else if (tag == "TITLE") items.insert( std::make_pair(MetaData::Type::Title, stringTrim( values.front().to8Bit(true)))); - else if (tag == "MUSICBRAINZ_RELEASETRACKID") + else if (tag == "MUSICBRAINZ_RELEASETRACKID" + || tag == "MUSICBRAINZ RELEASE TRACK ID") + { items.insert( std::make_pair(MetaData::Type::MusicBrainzTrackID, stringTrim( values.front().to8Bit(true)))); + } else if (tag == "MUSICBRAINZ_ARTISTID") items.insert( std::make_pair(MetaData::Type::MusicBrainzArtistID, stringTrim( values.front().to8Bit(true)))); else if (tag == "MUSICBRAINZ_ALBUMID") items.insert( std::make_pair(MetaData::Type::MusicBrainzAlbumID, stringTrim( values.front().to8Bit(true)))); else if (tag == "MUSICBRAINZ_TRACKID") - items.insert( std::make_pair(MetaData::Type::MusicBrainzRecordingID, stringTrim( tags["MUSICBRAINZ_TRACKID"].front().to8Bit(true)))); + items.insert( std::make_pair(MetaData::Type::MusicBrainzRecordingID, stringTrim( values.front().to8Bit(true)))); + else if (tag == "ACOUSTID_ID") + items.insert( std::make_pair(MetaData::Type::AcoustID, stringTrim( values.front().to8Bit(true)))); else if (tag == "TRACKNUMBER") { // Expecting 'Number/Total' @@ -160,24 +181,29 @@ TagLibParser::parse(const boost::filesystem::path& p, Items& items) items.insert( std::make_pair(MetaData::Type::OriginalDate, p)); } } - else if (tag == "GENRE") - { - std::list genreList; - for (TagLib::StringList::ConstIterator itGenre = values.begin(); itGenre != values.end(); ++itGenre) - genreList.push_back(itGenre->to8Bit(true)); - - items.insert( std::make_pair(MetaData::Type::Genres, genreList) ); - } else if (tag == "METADATA_BLOCK_PICTURE") { // Only add once if (items.find(MetaData::Type::HasCover) == items.end()) items.insert( std::make_pair(MetaData::Type::HasCover, true)); } + // Check if a hit a cluster tag + else if (_clusterMap.find(tag) != _clusterMap.end()) + { + std::set clusterNames; + for (const auto& value : values) + clusterNames.insert(value.to8Bit(true)); + + if (!clusterNames.empty()) + clusters[_clusterMap[tag]] = clusterNames; + } } + + if (!clusters.empty()) + items.insert( std::make_pair(MetaData::Type::Clusters, clusters) ); } - return true; + return items; } } // namespace MetaData diff --git a/src/metadata/TagLibParser.hpp b/src/metadata/TagLibParser.hpp index a05364aa..baefc112 100644 --- a/src/metadata/TagLibParser.hpp +++ b/src/metadata/TagLibParser.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -19,6 +19,9 @@ #pragma once +#include +#include + #include "MetaData.hpp" namespace MetaData @@ -28,10 +31,19 @@ namespace MetaData class TagLibParser : public Parser { public: - bool parse(const boost::filesystem::path& p, Items& items); + + // Provide a map for TagLib name -> Cluster name + TagLibParser(const std::map& clusterMap + = { + {"GENRE", "Genre" }, + {"ALBUMGROUPING", "Group" } + }); + + boost::optional parse(const boost::filesystem::path& p); private: + std::map _clusterMap; }; } // namespace MetaData diff --git a/src/database/updater/DatabaseUpdater.cpp b/src/scanner/MediaScanner.cpp similarity index 59% rename from src/database/updater/DatabaseUpdater.cpp rename to src/scanner/MediaScanner.cpp index b0484f40..60f19f55 100644 --- a/src/database/updater/DatabaseUpdater.cpp +++ b/src/scanner/MediaScanner.cpp @@ -32,8 +32,7 @@ #include "utils/Path.hpp" #include "utils/Utils.hpp" - -#include "DatabaseUpdater.hpp" +#include "MediaScanner.hpp" namespace { @@ -85,20 +84,6 @@ isFileSupported(const boost::filesystem::path& file, const std::vector -getRootDirectoriesByType(Wt::Dbo::Session& session, Database::MediaDirectory::Type type) -{ - Wt::Dbo::Transaction transaction(session); - - std::vector rootDirs = Database::MediaDirectory::getByType(session, type); - - std::vector res; - for (auto rootDir : rootDirs) - res.push_back(rootDir->getPath()); - - return res; -} - bool isPathInParentPath(const boost::filesystem::path& path, const boost::filesystem::path& parentPath) { @@ -118,40 +103,33 @@ isPathInParentPath(const boost::filesystem::path& path, const boost::filesystem: } // namespace -namespace Database { +namespace Scanner { -Updater& Updater::instance(void) -{ - static Updater updater; - return updater; -} +using namespace Database; -Updater::Updater() - : _running(true), -_scheduleTimer(_ioService) +MediaScanner::MediaScanner(Wt::Dbo::SqlConnectionPool& connectionPool) + : _running(false), +_scheduleTimer(_ioService), +_db(connectionPool) { _ioService.setThreadCount(1); + + Wt::Dbo::Transaction transaction(_db.getSession()); + + if (!Setting::exists(_db.getSession(), "file_extensions")) + Setting::setString(_db.getSession(), "file_extensions", ".mp3 .ogg .oga .aac .m4a .flac .wav .wma .aif .aiff .ape .mpc .shn" ); } void -Updater::setConnectionPool(Wt::Dbo::SqlConnectionPool& connectionPool) -{ - _db = new Database::Handler(connectionPool); -} - -void -Updater::restart(void) +MediaScanner::restart(void) { stop(); start(); } void -Updater::start(void) +MediaScanner::start(void) { - if (_db == nullptr) - throw std::logic_error("uninitialized db!"); - _running = true; // post some jobs in the io_service @@ -161,7 +139,7 @@ Updater::start(void) } void -Updater::stop(void) +MediaScanner::stop(void) { _running = false; @@ -171,9 +149,9 @@ Updater::stop(void) } void -Updater::processNextJob(void) +MediaScanner::processNextJob(void) { - if (Setting::getBool(_db->getSession(), "manual_scan_requested", false)) + if (Setting::getBool(_db.getSession(), "manual_scan_requested", false)) { LMS_LOG(DBUPDATER, INFO) << "Manual scan requested!"; scheduleScan( boost::posix_time::seconds(0) ); @@ -181,11 +159,11 @@ Updater::processNextJob(void) else { boost::posix_time::ptime now = boost::posix_time::second_clock::local_time(); - boost::posix_time::time_duration startTime = Setting::getDuration(_db->getSession(), "update_start_time"); + boost::posix_time::time_duration startTime = Setting::getDuration(_db.getSession(), "update_start_time"); boost::gregorian::date nextScanDate; - std::string updatePeriod = Setting::getString(_db->getSession(), "update_period", "never"); + std::string updatePeriod = Setting::getString(_db.getSession(), "update_period", "never"); if (updatePeriod == "daily") { if (now.time_of_day() < startTime) @@ -214,72 +192,58 @@ Updater::processNextJob(void) } void -Updater::scheduleScan( boost::posix_time::time_duration duration) +MediaScanner::scheduleScan( boost::posix_time::time_duration duration) { LMS_LOG(DBUPDATER, INFO) << "Scheduling next scan in " << duration; _scheduleTimer.expires_from_now(duration); - _scheduleTimer.async_wait( boost::bind( &Updater::process, this, boost::asio::placeholders::error) ); + _scheduleTimer.async_wait( boost::bind( &MediaScanner::process, this, boost::asio::placeholders::error) ); } void -Updater::scheduleScan( boost::posix_time::ptime time) +MediaScanner::scheduleScan( boost::posix_time::ptime time) { LMS_LOG(DBUPDATER, INFO) << "Scheduling next scan at " << time; _scheduleTimer.expires_at(time); - _scheduleTimer.async_wait( boost::bind( &Updater::process, this, boost::asio::placeholders::error) ); + _scheduleTimer.async_wait( boost::bind( &MediaScanner::process, this, boost::asio::placeholders::error) ); } void -Updater::process(boost::system::error_code err) +MediaScanner::process(boost::system::error_code err) { if (err) return; - updateFileExtensions(); + refreshScanSettings(); Stats stats; checkAudioFiles(stats); - std::vector rootDirectories; - { - Wt::Dbo::Transaction transaction(_db->getSession()); - - for (MediaDirectory::pointer directory : MediaDirectory::getAll(_db->getSession())) - rootDirectories.push_back( RootDirectory( directory->getType(), directory->getPath() )); - } - - for (RootDirectory rootDirectory : rootDirectories) + for (auto rootDirectory : _rootDirectories) { if (!_running) break; - LMS_LOG(DBUPDATER, INFO) << "Processing root directory '" << rootDirectory.path << "'..."; + LMS_LOG(DBUPDATER, INFO) << "Processing root directory '" << rootDirectory << "'..."; processRootDirectory(rootDirectory, stats); - LMS_LOG(DBUPDATER, INFO) << "Processing root directory '" << rootDirectory.path << "' DONE"; + LMS_LOG(DBUPDATER, INFO) << "Processing root directory '" << rootDirectory << "' DONE"; } if (_running) - { checkDuplicatedAudioFiles(stats); - LMS_LOG(DBUPDATER, INFO) << "Processed all files, now calling listeners..."; - for (auto eventHandler : _eventHandlers) - eventHandler->handleFilesUpdated(); - } - LMS_LOG(DBUPDATER, INFO) << "Scan " << (_running ? "complete" : "aborted") << ". Changes = " << stats.nbChanges() << " (added = " << stats.nbAdded << ", removed = " << stats.nbRemoved << ", updated = " << stats.nbUpdated << "), Not changed = " << stats.nbNoChange << ", Scanned = " << stats.nbScanned << " (errors = " << stats.nbScanErrors << ", not imported = " << stats.nbNotImported << ")"; // Update database stats boost::posix_time::ptime now = boost::posix_time::second_clock::local_time(); if (stats.nbChanges() > 0) - Setting::setTime(_db->getSession(), "last_update", now); + Setting::setTime(_db.getSession(), "last_update", now); // Save the last scan only if it has been completed if (_running) { - Setting::setTime(_db->getSession(), "last_scan", now); - Setting::setBool(_db->getSession(), "manual_scan_requested", false); + Setting::setTime(_db.getSession(), "last_scan", now); + Setting::setBool(_db.getSession(), "manual_scan_requested", false); processNextJob(); @@ -288,26 +252,30 @@ Updater::process(boost::system::error_code err) } void -Updater::updateFileExtensions() +MediaScanner::refreshScanSettings() { - Wt::Dbo::Transaction transaction(_db->getSession()); + Wt::Dbo::Transaction transaction(_db.getSession()); - _audioFileExtensions.clear(); - for (auto extension : splitString(Setting::getString(_db->getSession(), "audio_file_extensions"), " ")) - _audioFileExtensions.push_back( extension ); + _fileExtensions.clear(); + for (auto extension : splitString(Setting::getString(_db.getSession(), "file_extensions"), " ")) + _fileExtensions.push_back( extension ); + + _rootDirectories.clear(); + for (auto rootDir : Database::MediaDirectory::getAll(_db.getSession())) + _rootDirectories.push_back(rootDir->getPath()); } Artist::pointer -Updater::getArtist( const boost::filesystem::path& file, const std::string& name, const std::string& mbid) +MediaScanner::getArtist( const boost::filesystem::path& file, const std::string& name, const std::string& mbid) { Artist::pointer artist; // First try to get by MBID if (!mbid.empty()) { - artist = Artist::getByMBID( _db->getSession(), mbid ); + artist = Artist::getByMBID( _db.getSession(), mbid ); if (!artist) - artist = Artist::create( _db->getSession(), name, mbid); + artist = Artist::create( _db.getSession(), name, mbid); return artist; } @@ -315,7 +283,7 @@ Updater::getArtist( const boost::filesystem::path& file, const std::string& name // Fall back on artist name (collisions may occur) if (!name.empty()) { - for (Artist::pointer sameNamedArtist : Artist::getByName( _db->getSession(), name )) + for (Artist::pointer sameNamedArtist : Artist::getByName( _db.getSession(), name )) { if (sameNamedArtist->getMBID().empty()) { @@ -326,7 +294,7 @@ Updater::getArtist( const boost::filesystem::path& file, const std::string& name // No Artist found with the same name and without MBID -> creating if (!artist) - artist = Artist::create( _db->getSession(), name); + artist = Artist::create( _db.getSession(), name); return artist; } @@ -335,16 +303,16 @@ Updater::getArtist( const boost::filesystem::path& file, const std::string& name } Release::pointer -Updater::getRelease( const boost::filesystem::path& file, const std::string& name, const std::string& mbid) +MediaScanner::getRelease( const boost::filesystem::path& file, const std::string& name, const std::string& mbid) { Release::pointer release; // First try to get by MBID if (!mbid.empty()) { - release = Release::getByMBID( _db->getSession(), mbid ); + release = Release::getByMBID( _db.getSession(), mbid ); if (!release) - release = Release::create( _db->getSession(), name, mbid); + release = Release::create( _db.getSession(), name, mbid); return release; } @@ -352,7 +320,7 @@ Updater::getRelease( const boost::filesystem::path& file, const std::string& nam // Fall back on release name (collisions may occur) if (!name.empty()) { - for (Release::pointer sameNamedRelease : Release::getByName( _db->getSession(), name )) + for (Release::pointer sameNamedRelease : Release::getByName( _db.getSession(), name )) { if (sameNamedRelease->getMBID().empty()) { @@ -363,7 +331,7 @@ Updater::getRelease( const boost::filesystem::path& file, const std::string& nam // No release found with the same name and without MBID -> creating if (!release) - release = Release::create( _db->getSession(), name); + release = Release::create( _db.getSession(), name); return release; } @@ -372,32 +340,39 @@ Updater::getRelease( const boost::filesystem::path& file, const std::string& nam } std::vector -Updater::getGenreClusters( const std::list& names) +MediaScanner::getClusters( const MetaData::Clusters& clustersNames) { - std::vector< Cluster::pointer > genres; + std::vector< Cluster::pointer > clusters; - for (const std::string& name : names) + for (auto clusterNames : clustersNames) { - Cluster::pointer genre ( Cluster::get(_db->getSession(), "Genre", name) ); - if (!genre) - genre = Cluster::create(_db->getSession(), "Genre", name); + ClusterType::pointer clusterType = ClusterType::getByName(_db.getSession(), clusterNames.first); + if (!clusterType) + clusterType = ClusterType::create(_db.getSession(), clusterNames.first); - genres.push_back( genre ); + for (auto clusterName : clusterNames.second) + { + Cluster::pointer cluster = clusterType->getCluster(clusterName); + if (!cluster) + cluster = Cluster::create(_db.getSession(), clusterType, clusterName); + + clusters.push_back(cluster); + } } - return genres; + return clusters; } void -Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) +MediaScanner::processAudioFile( const boost::filesystem::path& file, Stats& stats) { boost::posix_time::ptime lastWriteTime (boost::posix_time::from_time_t( boost::filesystem::last_write_time( file ) ) ); // Skip file if last write is the same { - Wt::Dbo::Transaction transaction(_db->getSession()); + Wt::Dbo::Transaction transaction(_db.getSession()); - Wt::Dbo::ptr track = Track::getByPath(_db->getSession(), file); + Wt::Dbo::ptr track = Track::getByPath(_db.getSession(), file); if (track && track->getLastWriteTime() == lastWriteTime) { @@ -406,8 +381,8 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) } } - MetaData::Items items; - if (!_metadataParser.parse(file, items)) + boost::optional items = _metadataParser.parse(file); + if (!items) { stats.nbScanErrors++; return; @@ -418,15 +393,15 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) std::vector checksum ; computeCrc(file, checksum); - Wt::Dbo::Transaction transaction(_db->getSession()); + Wt::Dbo::Transaction transaction(_db.getSession()); - Wt::Dbo::ptr track = Track::getByPath(_db->getSession(), file); + Wt::Dbo::ptr track = Track::getByPath(_db.getSession(), file); // We estimate this is a audio file if: // - we found a least one audio stream // - the duration is not null - if (items.find(MetaData::Type::AudioStreams) == items.end() - || boost::any_cast >(items[MetaData::Type::AudioStreams]).empty()) + if ((*items).find(MetaData::Type::AudioStreams) == (*items).end() + || boost::any_cast> ((*items)[MetaData::Type::AudioStreams]).empty()) { LMS_LOG(DBUPDATER, INFO) << "Skipped '" << file << "' (no audio stream found)"; @@ -439,8 +414,8 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) stats.nbNotImported++; return; } - if (items.find(MetaData::Type::Duration) == items.end() - || boost::any_cast(items[MetaData::Type::Duration]).total_seconds() <= 0) + if ((*items).find(MetaData::Type::Duration) == (*items).end() + || boost::any_cast((*items)[MetaData::Type::Duration]).total_seconds() <= 0) { LMS_LOG(DBUPDATER, INFO) << "Skipped '" << file << "' (no duration or duration <= 0)"; @@ -456,9 +431,9 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) // ***** Title std::string title; - if (items.find(MetaData::Type::Title) != items.end()) + if ((*items).find(MetaData::Type::Title) != (*items).end()) { - title = boost::any_cast(items[MetaData::Type::Title]); + title = boost::any_cast((*items)[MetaData::Type::Title]); } else { @@ -470,13 +445,15 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) // ***** Clusters std::vector< Cluster::pointer > genres; { - std::list genreList; + MetaData::Clusters clusterNames; - if (items.find(MetaData::Type::Genres) != items.end()) - genreList = boost::any_cast< std::list > (items[MetaData::Type::Genres]); + if ((*items).find(MetaData::Type::Clusters) != (*items).end()) + { + clusterNames = boost::any_cast ((*items)[MetaData::Type::Clusters]); + } // TODO rename - genres = getGenreClusters( genreList ); + genres = getClusters( clusterNames ); } // ***** Artist @@ -485,11 +462,11 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) std::string artistName; std::string artistMusicBrainzID; - if (items.find(MetaData::Type::MusicBrainzArtistID) != items.end()) - artistMusicBrainzID = boost::any_cast(items[MetaData::Type::MusicBrainzArtistID] ); + if ((*items).find(MetaData::Type::MusicBrainzArtistID) != (*items).end()) + artistMusicBrainzID = boost::any_cast((*items)[MetaData::Type::MusicBrainzArtistID] ); - if (items.find(MetaData::Type::Artist) != items.end()) - artistName = boost::any_cast(items[MetaData::Type::Artist]); + if ((*items).find(MetaData::Type::Artist) != (*items).end()) + artistName = boost::any_cast((*items)[MetaData::Type::Artist]); artist = getArtist(file, artistName, artistMusicBrainzID); } @@ -500,11 +477,11 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) std::string releaseName; std::string releaseMusicBrainzID; - if (items.find(MetaData::Type::MusicBrainzAlbumID) != items.end()) - releaseMusicBrainzID = boost::any_cast(items[MetaData::Type::MusicBrainzAlbumID] ); + if ((*items).find(MetaData::Type::MusicBrainzAlbumID) != (*items).end()) + releaseMusicBrainzID = boost::any_cast((*items)[MetaData::Type::MusicBrainzAlbumID] ); - if (items.find(MetaData::Type::Album) != items.end()) - releaseName = boost::any_cast(items[MetaData::Type::Album]); + if ((*items).find(MetaData::Type::Album) != (*items).end()) + releaseName = boost::any_cast((*items)[MetaData::Type::Album]); release = getRelease(file, releaseName, releaseMusicBrainzID); } @@ -515,7 +492,7 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) if (!track) { // Create a new song - track = Track::create(_db->getSession(), file); + track = Track::create(_db.getSession(), file); LMS_LOG(DBUPDATER, INFO) << "Adding '" << file << "'"; stats.nbAdded++; } @@ -537,7 +514,7 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) track.modify()->setRelease(release); track.modify()->setLastWriteTime(lastWriteTime); track.modify()->setName(title); - track.modify()->setDuration( boost::any_cast(items[MetaData::Type::Duration]) ); + track.modify()->setDuration( boost::any_cast((*items)[MetaData::Type::Duration]) ); track.modify()->setAddedTime( boost::posix_time::second_clock::local_time() ); { @@ -555,53 +532,54 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats) track.modify()->setGenres( trackClusterList ); } - if (items.find(MetaData::Type::TrackNumber) != items.end()) - track.modify()->setTrackNumber( boost::any_cast(items[MetaData::Type::TrackNumber]) ); + if ((*items).find(MetaData::Type::TrackNumber) != (*items).end()) + track.modify()->setTrackNumber( boost::any_cast((*items)[MetaData::Type::TrackNumber]) ); - if (items.find(MetaData::Type::TotalTrack) != items.end()) - track.modify()->setTotalTrackNumber( boost::any_cast(items[MetaData::Type::TotalTrack]) ); + if ((*items).find(MetaData::Type::TotalTrack) != (*items).end()) + track.modify()->setTotalTrackNumber( boost::any_cast((*items)[MetaData::Type::TotalTrack]) ); - if (items.find(MetaData::Type::DiscNumber) != items.end()) - track.modify()->setDiscNumber( boost::any_cast(items[MetaData::Type::DiscNumber]) ); + if ((*items).find(MetaData::Type::DiscNumber) != (*items).end()) + track.modify()->setDiscNumber( boost::any_cast((*items)[MetaData::Type::DiscNumber]) ); - if (items.find(MetaData::Type::TotalDisc) != items.end()) - track.modify()->setTotalDiscNumber( boost::any_cast(items[MetaData::Type::TotalDisc]) ); + if ((*items).find(MetaData::Type::TotalDisc) != (*items).end()) + track.modify()->setTotalDiscNumber( boost::any_cast((*items)[MetaData::Type::TotalDisc]) ); - if (items.find(MetaData::Type::Date) != items.end()) - track.modify()->setDate( boost::any_cast(items[MetaData::Type::Date]) ); + if ((*items).find(MetaData::Type::Date) != (*items).end()) + track.modify()->setDate( boost::any_cast((*items)[MetaData::Type::Date]) ); - if (items.find(MetaData::Type::OriginalDate) != items.end()) + if ((*items).find(MetaData::Type::OriginalDate) != (*items).end()) { - track.modify()->setOriginalDate( boost::any_cast(items[MetaData::Type::OriginalDate]) ); + track.modify()->setOriginalDate( boost::any_cast((*items)[MetaData::Type::OriginalDate]) ); // If a file has an OriginalDate but no date, set the date to ease filtering - if (items.find(MetaData::Type::Date) == items.end()) - track.modify()->setDate( boost::any_cast(items[MetaData::Type::OriginalDate]) ); + if ((*items).find(MetaData::Type::Date) == (*items).end()) + track.modify()->setDate( boost::any_cast((*items)[MetaData::Type::OriginalDate]) ); } - if (items.find(MetaData::Type::MusicBrainzRecordingID) != items.end()) + if ((*items).find(MetaData::Type::MusicBrainzRecordingID) != (*items).end()) { - track.modify()->setMBID( boost::any_cast(items[MetaData::Type::MusicBrainzRecordingID]) ); + track.modify()->setMBID( boost::any_cast((*items)[MetaData::Type::MusicBrainzRecordingID]) ); } - if (items.find(MetaData::Type::HasCover) != items.end()) + if ((*items).find(MetaData::Type::HasCover) != (*items).end()) { - bool hasCover = boost::any_cast(items[MetaData::Type::HasCover]); + bool hasCover = boost::any_cast((*items)[MetaData::Type::HasCover]); track.modify()->setCoverType( hasCover ? Track::CoverType::Embedded : Track::CoverType::None ); } - transaction.commit(); + // TODO check added/modified + _sigAddedTrack.emit(track); - _sigTrackChanged.emit(true, track.id(), track->getMBID(), track->getPath()); + transaction.commit(); } void -Updater::processRootDirectory(RootDirectory rootDirectory, Stats& stats) +MediaScanner::processRootDirectory(boost::filesystem::path rootDirectory, Stats& stats) { boost::system::error_code ec; - boost::filesystem::recursive_directory_iterator itPath(rootDirectory.path, ec); + boost::filesystem::recursive_directory_iterator itPath(rootDirectory, ec); boost::filesystem::recursive_directory_iterator itEnd; while (!ec && itPath != itEnd) @@ -614,20 +592,15 @@ Updater::processRootDirectory(RootDirectory rootDirectory, Stats& stats) if (boost::filesystem::is_regular(path)) { - switch( rootDirectory.type ) - { - case Database::MediaDirectory::Audio: - if (isFileSupported(path, _audioFileExtensions)) - processAudioFile(path, stats ); - - break; - } + if (isFileSupported(path, _fileExtensions)) + processAudioFile(path, stats ); } } } -bool -Updater::checkFile(const boost::filesystem::path& p, const std::vector& rootDirs, const std::vector& extensions) +// Check if a file exists and is still in a root directory +static bool +checkFile(const boost::filesystem::path& p, const std::vector& rootDirs, const std::vector& extensions) { try { @@ -678,12 +651,11 @@ Updater::checkFile(const boost::filesystem::path& p, const std::vector trackPaths = Track::getAllPaths(_db->getSession());; - std::vector rootDirs = getRootDirectoriesByType(_db->getSession(), Database::MediaDirectory::Audio); + std::vector trackPaths = Track::getAllPaths(_db.getSession());; LMS_LOG(DBUPDATER, DEBUG) << "Checking tracks..."; for (auto& trackPath : trackPaths) @@ -691,11 +663,11 @@ Updater::checkAudioFiles( Stats& stats ) if (!_running) return; - if (!checkFile(trackPath, rootDirs, _audioFileExtensions)) + if (!checkFile(trackPath, _rootDirectories, _fileExtensions)) { - Wt::Dbo::Transaction transaction(_db->getSession()); + Wt::Dbo::Transaction transaction(_db.getSession()); - Track::pointer track = Track::getByPath(_db->getSession(), trackPath); + Track::pointer track = Track::getByPath(_db.getSession(), trackPath); if (track) { track.remove(); @@ -706,25 +678,25 @@ Updater::checkAudioFiles( Stats& stats ) LMS_LOG(DBUPDATER, DEBUG) << "Checking Clusters..."; { - Wt::Dbo::Transaction transaction(_db->getSession()); + Wt::Dbo::Transaction transaction(_db.getSession()); // Now process orphan Cluster (no track) - auto genres = Cluster::getAll(_db->getSession()); - for (auto genre : genres) + auto clusters = Cluster::getAll(_db.getSession()); + for (auto cluster : clusters) { - if (genre->getTracks().size() == 0) + if (cluster->getTracks().size() == 0) { - LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan genre '" << genre->getName() << "'"; - genre.remove(); + LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan cluster '" << cluster->getName() << "'"; + cluster.remove(); } } } LMS_LOG(DBUPDATER, DEBUG) << "Checking artists..."; { - Wt::Dbo::Transaction transaction(_db->getSession()); + Wt::Dbo::Transaction transaction(_db.getSession()); - auto artists = Artist::getAllOrphans(_db->getSession()); + auto artists = Artist::getAllOrphans(_db.getSession()); for (auto artist : artists) { LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan artist '" << artist->getName() << "'"; @@ -734,9 +706,9 @@ Updater::checkAudioFiles( Stats& stats ) LMS_LOG(DBUPDATER, DEBUG) << "Checking releases..."; { - Wt::Dbo::Transaction transaction(_db->getSession()); + Wt::Dbo::Transaction transaction(_db.getSession()); - auto releases = Release::getAllOrphans(_db->getSession()); + auto releases = Release::getAllOrphans(_db.getSession()); for (auto release : releases) { LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan release '" << release->getName() << "'"; @@ -748,19 +720,19 @@ Updater::checkAudioFiles( Stats& stats ) } void -Updater::checkDuplicatedAudioFiles(Stats& stats) +MediaScanner::checkDuplicatedAudioFiles(Stats& stats) { LMS_LOG(DBUPDATER, INFO) << "Checking duplicated audio files"; - Wt::Dbo::Transaction transaction(_db->getSession()); + Wt::Dbo::Transaction transaction(_db.getSession()); - std::vector tracks = Database::Track::getMBIDDuplicates(_db->getSession()); + std::vector tracks = Database::Track::getMBIDDuplicates(_db.getSession()); for (Track::pointer track : tracks) { LMS_LOG(DBUPDATER, INFO) << "Found duplicated MBID [" << track->getMBID() << "], file: " << track->getPath() << " - " << track->getArtist()->getName() << " - " << track->getName(); } - tracks = Database::Track::getChecksumDuplicates(_db->getSession()); + tracks = Database::Track::getChecksumDuplicates(_db.getSession()); for (Track::pointer track : tracks) { LMS_LOG(DBUPDATER, INFO) << "Found duplicated checksum [" << bufferToString(track->getChecksum()) << "], file: " << track->getPath() << " - " << track->getArtist()->getName() << " - " << track->getName(); @@ -771,4 +743,4 @@ Updater::checkDuplicatedAudioFiles(Stats& stats) } -} // namespace Database +} // namespace Scanner diff --git a/src/database/updater/DatabaseUpdater.hpp b/src/scanner/MediaScanner.hpp similarity index 50% rename from src/database/updater/DatabaseUpdater.hpp rename to src/scanner/MediaScanner.hpp index f9945b70..fd8d1e5f 100644 --- a/src/database/updater/DatabaseUpdater.hpp +++ b/src/scanner/MediaScanner.hpp @@ -19,9 +19,6 @@ #pragma once -#include -#include - #include #include @@ -31,21 +28,14 @@ #include "database/DatabaseHandler.hpp" -namespace Database { +namespace Scanner { -class UpdaterEventHandler; - -class Updater +class MediaScanner { public: - static Updater& instance(); - - void setConnectionPool(Wt::Dbo::SqlConnectionPool& connectionPool); - - void setAudioExtensions(const std::vector& extensions); - void setVideoExtensions(const std::vector& extensions); + MediaScanner(Wt::Dbo::SqlConnectionPool& connectionPool); void start(); void stop(); @@ -64,37 +54,21 @@ class Updater std::size_t nbChanges() const { return nbAdded + nbRemoved + nbUpdated;} }; - // Emitted when the whole database has been scanned (and all the event handlers have been called) + + // Called just after track addition + Wt::Signal& addedTrack() { return _sigAddedTrack; } + + // Called just before track removal + Wt::Signal& removedTrack() { return _sigRemovedTrack; } + + // Called just after track modification + Wt::Signal& modifiedTrack() { return _sigModifiedTrack; } + + // Called just after scan complete Wt::Signal& scanComplete() { return _sigScanComplete; } - // Emitted when a track changed - // true -> added or modified, false -> to be deleted - // id of the track - // musicbrainz recordid - // path of the track - typedef Wt::Signal SigTrackChanged; - SigTrackChanged& trackChanged() { return _sigTrackChanged; } - - std::mutex& getMutex(void) { return _mutex; } - - Database::Handler& getDb(void) { return *_db; } - - bool quitRequested(void) const { return !_running;} - - void registerEventHandler(std::shared_ptr handler) { _eventHandlers.push_back(handler); } - private: - Updater(); - - struct RootDirectory - { - Database::MediaDirectory::Type type; - boost::filesystem::path path; - - RootDirectory(Database::MediaDirectory::Type t, boost::filesystem::path p) : type(t), path(p) {} - }; - // Job handling void processNextJob(); void scheduleScan(boost::posix_time::time_duration duration); @@ -103,19 +77,13 @@ class Updater // Update database (scheduled callback) void process(boost::system::error_code ec); - // Check if a file exists and is still in a root directory - static bool checkFile(const boost::filesystem::path& p, - const std::vector& rootDirectories, - const std::vector& extensions); - - - void processRootDirectory( RootDirectory rootDirectory, Stats& stats); + void processRootDirectory( boost::filesystem::path rootDirectory, Stats& stats); // Helpers Database::Artist::pointer getArtist( const boost::filesystem::path& file, const std::string& name, const std::string& MBID); Database::Release::pointer getRelease( const boost::filesystem::path& file, const std::string& name, const std::string& MBID); - std::vector getGenreClusters( const std::list& names); - void updateFileExtensions(); + std::vector getClusters( const MetaData::Clusters& names); + void refreshScanSettings(); // Audio void checkAudioFiles( Stats& stats ); @@ -128,47 +96,23 @@ class Updater bool _running; Wt::WIOService _ioService; + Wt::Signal _sigScanComplete; - Wt::Signal _sigArtistChanged; - Wt::Signal _sigReleaseChanged; - SigTrackChanged _sigTrackChanged; - std::mutex _mutex; + Wt::Signal _sigModifiedTrack; + Wt::Signal _sigAddedTrack; + Wt::Signal _sigRemovedTrack; boost::asio::deadline_timer _scheduleTimer; - Database::Handler* _db = nullptr; + Database::Handler _db; - std::vector _audioFileExtensions; - std::vector _videoFileExtensions; + // Scan settings + std::vector _fileExtensions; + std::vector _rootDirectories; MetaData::TagLibParser _metadataParser; - std::list > _eventHandlers; +}; // class MediaScanner -}; // class Updater - -// Helper to get the updater session data -static inline Wt::Dbo::Session& UpdaterDboSession() -{ - return Updater::instance().getDb().getSession(); -} - -static inline bool UpdaterQuitRequested() -{ - return Updater::instance().quitRequested(); -} - - -class UpdaterEventHandler -{ - public: - - // called when all the files have been scanned by the updater - virtual void handleFilesUpdated(void) = 0; - - private: - -}; - -} // Database +} // Scanner diff --git a/src/ui/Filters.cpp b/src/ui/Filters.cpp index 9ecdc704..efc2ae07 100644 --- a/src/ui/Filters.cpp +++ b/src/ui/Filters.cpp @@ -56,14 +56,15 @@ Filters::showDialog() { Wt::Dbo::Transaction transaction(DboSession()); - auto types = Database::Cluster::getAllTypes(DboSession()); + auto types = Database::ClusterType::getAll(DboSession()); for (auto type : types) - typeCombo->addItem(Wt::WString::fromUTF8(type)); + typeCombo->addItem(Wt::WString::fromUTF8(type->getName())); + if (!types.empty()) { - auto values = Database::Cluster::getByType(DboSession(), types.front()); + auto values = types.front()->getClusters(); for (auto value : values) { @@ -76,13 +77,15 @@ Filters::showDialog() typeCombo->changed().connect(std::bind([=] { - auto type = typeCombo->valueText().toUTF8(); + auto name = typeCombo->valueText().toUTF8(); valueCombo->clear(); Wt::Dbo::Transaction transaction(DboSession()); - auto values = Database::Cluster::getByType(DboSession(), type); + auto clusterType = Database::ClusterType::getByName(DboSession(), name); + + auto values = clusterType->getClusters(); for (auto value : values) { if (_filterIds.find(value.id()) == _filterIds.end()) @@ -108,7 +111,11 @@ Filters::showDialog() Wt::Dbo::Transaction transaction(DboSession()); - auto cluster = Database::Cluster::get(DboSession(), type, value); + auto clusterType = Database::ClusterType::getByName(DboSession(), type); + if (!clusterType) + return; + + auto cluster = clusterType->getCluster(value); if (!cluster) return; diff --git a/test/Makefile.am b/test/Makefile.am index 0df0354b..411aef1a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,7 @@ TESTS = sql-query database-user -check_PROGRAMS = sql-query database-user test-wt test-avmetadata +check_PROGRAMS = test-avmetadata database_basics_SOURCES = \ $(srcdir)/CheckDbBasics.cpp \ @@ -88,7 +88,7 @@ test_wt_audio_LDADD=$(MAGICKXX_LIBS) test_avmetadata_SOURCES = TestAvMetadata.cpp \ - $(top_srcdir)/src/logger/Logger.cpp \ + $(top_srcdir)/src/utils/Logger.cpp \ $(top_srcdir)/src/utils/Utils.cpp \ $(top_srcdir)/src/metadata/AvFormat.cpp \ $(top_srcdir)/src/metadata/TagLibParser.cpp \ diff --git a/test/TestAvMetadata.cpp b/test/TestAvMetadata.cpp index b42d53f8..c91d0ea3 100644 --- a/test/TestAvMetadata.cpp +++ b/test/TestAvMetadata.cpp @@ -26,20 +26,20 @@ int main(int argc, char *argv[]) MetaData::AvFormat avFormatParser; MetaData::TagLibParser tagLibParser; - std::vector parsers = { &avFormatParser, &tagLibParser }; + std::vector parsers = {&avFormatParser, &tagLibParser }; for (auto& parser : parsers) { - MetaData::Items items; + boost::optional items = parser->parse(argv[1]); - if (!parser->parse(argv[1], items)) + if (!items) { std::cout << "Parsing failed" << std::endl; continue; } std::cout << "Items:" << std::endl; - for (auto item : items) + for (auto item : (*items)) { switch (item.first) { @@ -55,9 +55,15 @@ int main(int argc, char *argv[]) std::cout << "Album: " << boost::any_cast(item.second) << std::endl; break; - case MetaData::Type::Genres: - for (auto& genre : boost::any_cast >(item.second)) - std::cout << "Genre: " << genre << std::endl; + case MetaData::Type::Clusters: + for (const auto& cluster : boost::any_cast(item.second)) + { + std::cout << "Cluster: " << cluster.first << std::endl; + for (const auto name : cluster.second) + { + std::cout << "\t" << name << std::endl; + } + } break; case MetaData::Type::Duration: @@ -113,6 +119,10 @@ int main(int argc, char *argv[]) std::cout << "MusicBrainzRecordingID: " << boost::any_cast(item.second) << std::endl; break; + case MetaData::Type::AcoustID: + std::cout << "AcoustID: " << boost::any_cast(item.second) << std::endl; + break; + default: break; } From 4b20f713f3ce5a99f76404274ec7d209f062e907 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 2 Mar 2018 13:05:30 +0100 Subject: [PATCH 056/195] Do not display show more for playlist if no playlist is found --- src/database/Playlist.cpp | 7 ++++++- src/ui/PlaylistView.cpp | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index 47e259b3..c5b2e125 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -83,7 +83,12 @@ Playlist::getTracks(int offset, int size, bool& moreResults) const moreResults = false; - Wt::Dbo::collection> entries = session()->find().where("playlist_id = ?").bind(self().id()).orderBy("pos").offset(offset).limit(size + 1); + Wt::Dbo::collection> entries + = session()->find() + .where("playlist_id = ?").bind(self().id()) + .orderBy("pos") + .limit(size != -1 ? size + 1 : -1) + .offset(offset); std::vector> res; diff --git a/src/ui/PlaylistView.cpp b/src/ui/PlaylistView.cpp index b7a74384..4ee8f58f 100644 --- a/src/ui/PlaylistView.cpp +++ b/src/ui/PlaylistView.cpp @@ -48,6 +48,7 @@ Playlist::Playlist(Wt::WContainerWidget* parent) _showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); + _showMore->setHidden(true); container->bindWidget("show-more", _showMore); _showMore->clicked().connect(std::bind([=] From 529055d432b32580248ad1770bc0fc3df27512d4 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 3 Mar 2018 17:23:28 +0100 Subject: [PATCH 057/195] Added database settings view --- Makefile.am | 1 + approot/messages.xml | 15 ++ approot/settings.xml | 54 +++++ src/Makefile.am | 1 + src/main/main.cpp | 4 - src/scanner/MediaScanner.cpp | 68 ++++-- src/scanner/MediaScanner.hpp | 12 ++ src/ui/LmsApplication.cpp | 25 ++- src/ui/common/DirectoryValidator.cpp | 5 +- src/ui/settings/DatabaseView.cpp | 298 +++++++++++++++++++++++++++ src/ui/settings/DatabaseView.hpp | 54 +++++ 11 files changed, 506 insertions(+), 31 deletions(-) create mode 100644 approot/settings.xml create mode 100644 src/ui/settings/DatabaseView.cpp create mode 100644 src/ui/settings/DatabaseView.hpp diff --git a/Makefile.am b/Makefile.am index 7153c82b..95bf74bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,7 @@ lms_approot_DATA = \ approot/playlist.xml \ approot/releases.xml \ approot/release.xml \ + approot/settings.xml \ approot/templates.xml \ approot/tracks.xml diff --git a/approot/messages.xml b/approot/messages.xml index 38d2396f..6bf0010a 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -17,4 +17,19 @@ Value Show more + +Settings +Database +Media root directory +Update period +Update start time +Never +Daily +Weekly +Monthly +Not a directory +Apply +Discard + + diff --git a/approot/settings.xml b/approot/settings.xml new file mode 100644 index 00000000..75f4c661 --- /dev/null +++ b/approot/settings.xml @@ -0,0 +1,54 @@ + + + + + + + ${tr:msg-settings-database} +
+ +
+ +
+ ${media-directory} +
+
+ ${media-directory-info} +
+
+ +
+ +
+ ${update-period} +
+
+ ${update-period-info} +
+
+ +
+ +
+ ${update-start-time} +
+
+ ${update-start-time-info} +
+
+ +
+
+ ${apply-btn class="btn-primary"} ${discard-btn} +
+
+
+ + + diff --git a/src/Makefile.am b/src/Makefile.am index 7842e2dd..ec57c4a9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,6 +39,7 @@ lms_SOURCES = \ $(srcdir)/ui/resource/AvConvTranscodeStreamResource.cpp \ $(srcdir)/ui/resource/ImageResource.cpp \ $(srcdir)/ui/resource/TranscodeResource.cpp \ + $(srcdir)/ui/settings/DatabaseView.cpp \ $(srcdir)/utils/Config.cpp \ $(srcdir)/utils/Logger.cpp \ $(srcdir)/utils/Path.cpp \ diff --git a/src/main/main.cpp b/src/main/main.cpp index c2b24416..2901d976 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -127,10 +127,6 @@ int main(int argc, char* argv[]) Scanner::MediaScanner scanner(*connectionPool); - // Instanciate the updater's event handler. Order is important -// dbUpdater.registerEventHandler(std::make_shared()); -// dbUpdater.registerEventHandler(std::make_shared()); - // bind entry point server.addEntryPoint(Wt::Application, boost::bind(UserInterface::LmsApplication::create, _1, boost::ref(*connectionPool))); diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 60f19f55..7f1239d8 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -107,6 +107,28 @@ namespace Scanner { using namespace Database; +UpdatePeriod +getUpdatePeriod(Wt::Dbo::Session& session) +{ + return static_cast(Setting::getInt(session, "update_period", static_cast(UpdatePeriod::Never))); +} + +void +setUpdatePeriod(Wt::Dbo::Session& session, UpdatePeriod updatePeriod) +{ + Setting::setInt(session, "update_period", static_cast(updatePeriod)); +} + +boost::posix_time::time_duration getUpdateStartTime(Wt::Dbo::Session& session) +{ + return Setting::getDuration(session, "update_start_time"); +} + +void setUpdateStartTime(Wt::Dbo::Session& session, boost::posix_time::time_duration startTime) +{ + Setting::setDuration(session, "update_start_time", startTime); +} + MediaScanner::MediaScanner(Wt::Dbo::SqlConnectionPool& connectionPool) : _running(false), _scheduleTimer(_ioService), @@ -159,31 +181,35 @@ MediaScanner::processNextJob(void) else { boost::posix_time::ptime now = boost::posix_time::second_clock::local_time(); - boost::posix_time::time_duration startTime = Setting::getDuration(_db.getSession(), "update_start_time"); + boost::posix_time::time_duration startTime = getUpdateStartTime(_db.getSession()); boost::gregorian::date nextScanDate; - std::string updatePeriod = Setting::getString(_db.getSession(), "update_period", "never"); - if (updatePeriod == "daily") + switch ( getUpdatePeriod(_db.getSession()) ) { - if (now.time_of_day() < startTime) - nextScanDate = now.date(); - else - nextScanDate = getNextDay(now.date()); - } - else if (updatePeriod == "weekly") - { - if (now.time_of_day() < startTime && now.date().day_of_week() == 1) - nextScanDate = now.date(); - else - nextScanDate = getNextMonday(now.date()); - } - else if (updatePeriod == "monthly") - { - if (now.time_of_day() < startTime && now.date().day() == 1) - nextScanDate = now.date(); - else - nextScanDate = getNextFirstOfMonth(now.date()); + case UpdatePeriod::Daily: + if (now.time_of_day() < startTime) + nextScanDate = now.date(); + else + nextScanDate = getNextDay(now.date()); + break; + + case UpdatePeriod::Weekly: + if (now.time_of_day() < startTime && now.date().day_of_week() == 1) + nextScanDate = now.date(); + else + nextScanDate = getNextMonday(now.date()); + break; + + case UpdatePeriod::Monthly: + if (now.time_of_day() < startTime && now.date().day() == 1) + nextScanDate = now.date(); + else + nextScanDate = getNextFirstOfMonth(now.date()); + break; + + case UpdatePeriod::Never: + break; } if (!nextScanDate.is_special()) diff --git a/src/scanner/MediaScanner.hpp b/src/scanner/MediaScanner.hpp index fd8d1e5f..6d319f0b 100644 --- a/src/scanner/MediaScanner.hpp +++ b/src/scanner/MediaScanner.hpp @@ -30,6 +30,18 @@ namespace Scanner { +enum class UpdatePeriod { + Never = 0, + Daily, + Weekly, + Monthly +}; + +UpdatePeriod getUpdatePeriod(Wt::Dbo::Session& session); +void setUpdatePeriod(Wt::Dbo::Session& session, UpdatePeriod updatePeriod); + +boost::posix_time::time_duration getUpdateStartTime(Wt::Dbo::Session& session); +void setUpdateStartTime(Wt::Dbo::Session& session, boost::posix_time::time_duration); class MediaScanner { diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index ba1997ab..dcfd42ff 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "config/config.h" @@ -34,6 +35,8 @@ #include "MediaPlayer.hpp" #include "PlaylistView.hpp" +#include "settings/DatabaseView.hpp" + #include "LmsApplication.hpp" namespace skeletons { @@ -86,6 +89,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti messageResourceBundle().use(appRoot() + "playlist"); messageResourceBundle().use(appRoot() + "release"); messageResourceBundle().use(appRoot() + "releases"); + messageResourceBundle().use(appRoot() + "settings"); messageResourceBundle().use(appRoot() + "tracks"); messageResourceBundle().use(appRoot() + "templates"); @@ -179,7 +183,7 @@ enum IdxRoot IdxHome = 0, IdxExplore, IdxPlaylist, - IdxSettings, + IdxSettingsDatabase, }; @@ -196,7 +200,7 @@ handlePathChange(Wt::WStackedWidget* stack) { "/release", IdxExplore }, { "/tracks", IdxExplore }, { "/playlist", IdxPlaylist }, - { "/settings", IdxSettings }, + { "/settings/database", IdxSettingsDatabase }, }; LMS_LOG(UI, DEBUG) << "Internal path changed to '" << wApp->internalPath() << "'"; @@ -237,7 +241,6 @@ LmsApplication::handleAuthEvent(void) auto navbar = new Wt::WNavigationBar(); navbar->setTitle("LMS", Wt::WLink(Wt::WLink::InternalPath, "/home")); navbar->setResponsive(true); -// navbar->setStyleClass("main-nav"); main->bindWidget("navbar-top", navbar); @@ -262,6 +265,18 @@ LmsApplication::handleAuthEvent(void) menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/playlist")); menuItem->setSelectable(false); } + { + auto menuItem = menu->insertItem(4, Wt::WString::tr("msg-settings")); + menuItem->setSelectable(false); + + Wt::WPopupMenu *settings = new Wt::WPopupMenu(); + auto dbSettings = settings->insertItem(0, Wt::WString::tr("msg-settings-database")); + dbSettings->setLink(Wt::WLink(Wt::WLink::InternalPath, "/settings/database")); + dbSettings->setSelectable(false); + + menuItem->setMenu(settings); + } + navbar->addMenu(menu); // Contents @@ -275,7 +290,9 @@ LmsApplication::handleAuthEvent(void) auto playlist = new Playlist(); mainStack->addWidget(playlist); - mainStack->addWidget(new Wt::WText("SETTINGS")); + + auto databaseSettings = new Settings::DatabaseView(); + mainStack->addWidget(databaseSettings); explore->tracksAdd.connect(std::bind([=] (std::vector tracks) { diff --git a/src/ui/common/DirectoryValidator.cpp b/src/ui/common/DirectoryValidator.cpp index c0093f1d..cf6c16fd 100644 --- a/src/ui/common/DirectoryValidator.cpp +++ b/src/ui/common/DirectoryValidator.cpp @@ -38,13 +38,14 @@ DirectoryValidator::validate(const Wt::WString& input) const boost::filesystem::path p(input.toUTF8()); boost::system::error_code ec; + // TODO check rights bool res = boost::filesystem::is_directory(p, ec); if (ec) - return Wt::WValidator::Result(Wt::WValidator::Invalid, ec.message()); + return Wt::WValidator::Result(Wt::WValidator::Invalid, ec.message()); // TODO translate common errors else if (res) return Wt::WValidator::Result(Wt::WValidator::Valid); else - return Wt::WValidator::Result(Wt::WValidator::Invalid, "Not a directory"); + return Wt::WValidator::Result(Wt::WValidator::Invalid, Wt::WString::tr("msg-error-not-a-directory")); } diff --git a/src/ui/settings/DatabaseView.cpp b/src/ui/settings/DatabaseView.cpp new file mode 100644 index 00000000..355b3b25 --- /dev/null +++ b/src/ui/settings/DatabaseView.cpp @@ -0,0 +1,298 @@ +/* + * 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 . + */ + +#include +#include +#include +#include +#include + +#include +#include + +#include "common/DirectoryValidator.hpp" +#include "database/MediaDirectory.hpp" +#include "scanner/MediaScanner.hpp" +#include "utils/Logger.hpp" + +#include "LmsApplication.hpp" + +#include "DatabaseView.hpp" + +namespace UserInterface { +namespace Settings { + +using namespace Database; + +class DatabaseModel : public Wt::WFormModel +{ + public: + // Associate each field with a unique string literal. + static const Field MediaDirectoryField; + static const Field UpdatePeriodField; + static const Field UpdateStartTimeField; + + DatabaseModel(Wt::WObject *parent = 0) + : Wt::WFormModel(parent) + { + initializeModels(); + + addField(MediaDirectoryField); + addField(UpdatePeriodField); + addField(UpdateStartTimeField); + + DirectoryValidator* dirValidator = new DirectoryValidator(); + dirValidator->setMandatory(true); + setValidator(MediaDirectoryField, dirValidator); + + setValidator(UpdatePeriodField, createMandatoryValidator()); + setValidator(UpdateStartTimeField, createMandatoryValidator()); + + // populate the model with initial data + loadData(); + } + + Wt::WAbstractItemModel *updatePeriodModel() { return _updatePeriodModel; } + Wt::WAbstractItemModel *updateStartTimeModel() { return _updateStartTimeModel; } + + void loadData() + { + using namespace Database; + + Wt::Dbo::Transaction transaction(DboSession()); + + std::vector mediaDirectories = MediaDirectory::getAll(DboSession()); + if (!mediaDirectories.empty()) + setValue(MediaDirectoryField, mediaDirectories.front()->getPath().string()); + + auto periodRow = getUpdatePeriodModelRow( Scanner::getUpdatePeriod(DboSession()) ); + if (periodRow) + setValue(UpdatePeriodField, updatePeriodString(*periodRow)); + + auto startTimeRow = getUpdateStartTimeModelRow( Scanner::getUpdateStartTime(DboSession()) ); + if (startTimeRow) + setValue(UpdateStartTimeField, updateStartTimeString(*startTimeRow) ); + } + + void saveData() + { + Wt::Dbo::Transaction transaction(DboSession()); + + MediaDirectory::eraseAll(DboSession()); + MediaDirectory::create(DboSession(), boost::any_cast(value(MediaDirectoryField)).toUTF8()); + + auto updatePeriodRow = getUpdatePeriodModelRow( boost::any_cast(value(UpdatePeriodField))); + assert(updatePeriodRow); + Scanner::setUpdatePeriod(DboSession(), updatePeriod(*updatePeriodRow)); + + auto startTimeRow = getUpdateStartTimeModelRow( boost::any_cast(value(UpdateStartTimeField))); + assert(startTimeRow); + Scanner::setUpdateStartTime(DboSession(), updateStartTime(*startTimeRow)); + } + + boost::optional getUpdatePeriodModelRow(Wt::WString value) + { + for (int i = 0; i < _updatePeriodModel->rowCount(); ++i) + { + if (updatePeriodString(i) == value) + return i; + } + + return boost::none; + } + + boost::optional getUpdatePeriodModelRow(Scanner::UpdatePeriod period) + { + for (int i = 0; i < _updatePeriodModel->rowCount(); ++i) + { + if (updatePeriod(i) == period) + return i; + } + + return boost::none; + } + + Scanner::UpdatePeriod updatePeriod(int row) + { + return boost::any_cast + (_updatePeriodModel->data(_updatePeriodModel->index(row, 0), Wt::UserRole)); + } + + Wt::WString updatePeriodString(int row) + { + return boost::any_cast + (_updatePeriodModel->data(_updatePeriodModel->index(row, 0), Wt::DisplayRole)); + } + + + boost::optional getUpdateStartTimeModelRow(Wt::WString value) + { + for (int i = 0; i < _updateStartTimeModel->rowCount(); ++i) + { + if (updateStartTimeString(i) == value) + return i; + } + + return boost::none; + } + + boost::optional getUpdateStartTimeModelRow(boost::posix_time::time_duration startTime) + { + for (int i = 0; i < _updateStartTimeModel->rowCount(); ++i) + { + if (updateStartTime(i) == startTime) + return i; + } + + return boost::none; + } + + boost::posix_time::time_duration updateStartTime(int row) + { + return boost::any_cast + (_updateStartTimeModel->data(_updateStartTimeModel->index(row, 0), Wt::UserRole)); + } + + Wt::WString updateStartTimeString(int row) + { + return boost::any_cast + (_updateStartTimeModel->data(_updateStartTimeModel->index(row, 0), Wt::DisplayRole)); + } + + + private: + + void initializeModels() { + + _updatePeriodModel = new Wt::WStringListModel(this); + + _updatePeriodModel->addString(Wt::WString::tr("msg-update-period-never")); + _updatePeriodModel->setData(0, 0, Scanner::UpdatePeriod::Never, Wt::UserRole); + + _updatePeriodModel->addString(Wt::WString::tr("msg-update-period-daily")); + _updatePeriodModel->setData(1, 0, Scanner::UpdatePeriod::Daily, Wt::UserRole); + + _updatePeriodModel->addString(Wt::WString::tr("msg-update-period-weekly")); + _updatePeriodModel->setData(2, 0, Scanner::UpdatePeriod::Weekly, Wt::UserRole); + + _updatePeriodModel->addString(Wt::WString::tr("msg-update-period-monthly")); + _updatePeriodModel->setData(3, 0, Scanner::UpdatePeriod::Monthly, Wt::UserRole); + + _updateStartTimeModel = new Wt::WStringListModel(this); + + for (std::size_t i = 0; i < 24; ++i) + { + boost::posix_time::time_duration dur = boost::posix_time::hours(i); + + boost::posix_time::time_facet* facet = new boost::posix_time::time_facet("%H:%M"); + facet->time_duration_format("%H:%M"); + + std::ostringstream oss; + oss.imbue(std::locale(oss.getloc(), facet)); + + oss << dur; + + _updateStartTimeModel->addString( oss.str() ); + _updateStartTimeModel->setData(i, 0, dur, Wt::UserRole); + } + + } + + Wt::WValidator *createMandatoryValidator() + { + Wt::WValidator* v = new Wt::WValidator(); + v->setMandatory(true); + return v; + } + + Wt::WStringListModel* _updatePeriodModel; + Wt::WStringListModel* _updateStartTimeModel; + +}; + +const Wt::WFormModel::Field DatabaseModel::MediaDirectoryField = "media-directory"; +const Wt::WFormModel::Field DatabaseModel::UpdatePeriodField = "update-period"; +const Wt::WFormModel::Field DatabaseModel::UpdateStartTimeField = "update-start-time"; + + +DatabaseView::DatabaseView(Wt::WContainerWidget *parent) +: Wt::WTemplateFormView(parent) +{ + _model = new DatabaseModel(this); + + setTemplateText(tr("template-settings-database")); + addFunction("tr", &WTemplate::Functions::tr); + addFunction("id", &WTemplate::Functions::id); + + // Media Directory + Wt::WLineEdit *mediaDirectoryEdit = new Wt::WLineEdit(); + setFormWidget(DatabaseModel::MediaDirectoryField, mediaDirectoryEdit); + + // Update Period + Wt::WComboBox *updatePeriodCB = new Wt::WComboBox(); + setFormWidget(DatabaseModel::UpdatePeriodField, updatePeriodCB); + updatePeriodCB->setModel(_model->updatePeriodModel()); + + // Update Start Time + Wt::WComboBox *updateStartTimeCB = new Wt::WComboBox(); + setFormWidget(DatabaseModel::UpdateStartTimeField, updateStartTimeCB); + updateStartTimeCB->setModel(_model->updateStartTimeModel()); + + // Buttons + + Wt::WPushButton *saveBtn = new Wt::WPushButton(Wt::WString::tr("msg-btn-apply")); + bindWidget("apply-btn", saveBtn); + saveBtn->setStyleClass("btn-primary"); + + Wt::WPushButton *discardBtn = new Wt::WPushButton(Wt::WString::tr("msg-btn-discard")); + bindWidget("discard-btn", discardBtn); + + saveBtn->clicked().connect(this, &DatabaseView::processSave); + discardBtn->clicked().connect(this, &DatabaseView::processDiscard); + + updateView(_model); +} + +void +DatabaseView::processDiscard() +{ + _model->loadData(); + _model->validate(); + updateView(_model); +} + +void +DatabaseView::processSave() +{ + updateModel(_model); + + if (_model->validate()) { + _model->saveData(); + +// _sigChanged.emit(); + } + // Udate the view: Delete any validation message in the view, etc. + updateView(_model); +} + + +} // namespace Settings +} // namespace UserInterface + + diff --git a/src/ui/settings/DatabaseView.hpp b/src/ui/settings/DatabaseView.hpp new file mode 100644 index 00000000..ad82178c --- /dev/null +++ b/src/ui/settings/DatabaseView.hpp @@ -0,0 +1,54 @@ +/* + * 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 . + */ + +#pragma once + +#include +#include +#include +#include + +namespace UserInterface { +namespace Settings { + +class DatabaseModel; + +class DatabaseView : public Wt::WTemplateFormView +{ + public: + DatabaseView(Wt::WContainerWidget *parent = 0); + + Wt::Signal& changed() { return _sigChanged; } + + private: + + Wt::Signal _sigChanged; + + void processSave(); + void processDiscard(); + void processImmediateScan(); + + Wt::WText *_applyInfo; + DatabaseModel *_model; +}; + + +} // namespace Settings +} // namespace UserInterface + From 2db46260ab99f37b827ac37408c38a47a2845986 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 4 Mar 2018 15:19:44 +0100 Subject: [PATCH 058/195] Made database scan work, added immediate scan option --- approot/messages.xml | 2 +- approot/settings.xml | 2 +- src/database/Track.cpp | 6 +- src/main/main.cpp | 3 +- src/scanner/MediaScanner.cpp | 111 ++++++++++++++++++------------- src/scanner/MediaScanner.hpp | 15 ++--- src/ui/LmsApplication.cpp | 12 +++- src/ui/LmsApplication.hpp | 12 +++- src/ui/settings/DatabaseView.cpp | 10 ++- 9 files changed, 105 insertions(+), 68 deletions(-) diff --git a/approot/messages.xml b/approot/messages.xml index 6bf0010a..b3e1146e 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -30,6 +30,6 @@ Not a directory Apply Discard - +Scan now! diff --git a/approot/settings.xml b/approot/settings.xml index 75f4c661..f5107fcc 100644 --- a/approot/settings.xml +++ b/approot/settings.xml @@ -45,7 +45,7 @@
- ${apply-btn class="btn-primary"} ${discard-btn} + ${apply-btn class="btn-primary"} ${discard-btn} ${immediate-scan-btn class="btn-info"}
diff --git a/src/database/Track.cpp b/src/database/Track.cpp index d913980f..d66327f0 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -295,12 +295,12 @@ Cluster::pointer ClusterType::getCluster(std::string name) const { assert(self()); - assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); assert(session()); return session()->find() .where("name = ?").bind(name) - .where("cluster_type_id = ").bind(self()->id()); + .where("cluster_type_id = ?").bind(self()->id()); } std::vector @@ -311,7 +311,7 @@ ClusterType::getClusters() const assert(session()); Wt::Dbo::collection res = session()->find() - .where("cluster_type_id = ").bind(self()->id()) + .where("cluster_type_id = ?").bind(self()->id()) .orderBy("name"); return std::vector(res.begin(), res.end()); diff --git a/src/main/main.cpp b/src/main/main.cpp index 2901d976..4715640c 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -129,7 +129,7 @@ int main(int argc, char* argv[]) // bind entry point server.addEntryPoint(Wt::Application, boost::bind(UserInterface::LmsApplication::create, - _1, boost::ref(*connectionPool))); + _1, boost::ref(*connectionPool), boost::ref(scanner))); // Start LMS_LOG(MAIN, INFO) << "Starting Media scanner..."; @@ -149,6 +149,7 @@ int main(int argc, char* argv[]) LMS_LOG(MAIN, INFO) << "Stopping database updater..."; scanner.stop(); + LMS_LOG(MAIN, INFO) << "Clean stop!"; res = EXIT_SUCCESS; } catch( libconfig::FileIOException& e) diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 7f1239d8..2e56944f 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -155,7 +155,7 @@ MediaScanner::start(void) _running = true; // post some jobs in the io_service - processNextJob(); + scheduleScan(); _ioService.start(); } @@ -171,50 +171,63 @@ MediaScanner::stop(void) } void -MediaScanner::processNextJob(void) +MediaScanner::scheduleImmediateScan() { - if (Setting::getBool(_db.getSession(), "manual_scan_requested", false)) + _ioService.post([=]() { - LMS_LOG(DBUPDATER, INFO) << "Manual scan requested!"; + LMS_LOG(DBUPDATER, INFO) << "Schedule immediate scan"; scheduleScan( boost::posix_time::seconds(0) ); - } - else + }); +} + +void +MediaScanner::reschedule() +{ + _ioService.post([=]() { - boost::posix_time::ptime now = boost::posix_time::second_clock::local_time(); - boost::posix_time::time_duration startTime = getUpdateStartTime(_db.getSession()); + LMS_LOG(DBUPDATER, INFO) << "Rescheduling scan"; + scheduleScan(); + }); +} - boost::gregorian::date nextScanDate; +void +MediaScanner::scheduleScan() +{ + boost::posix_time::ptime now = boost::posix_time::second_clock::local_time(); + boost::posix_time::time_duration startTime = getUpdateStartTime(_db.getSession()); - switch ( getUpdatePeriod(_db.getSession()) ) - { - case UpdatePeriod::Daily: - if (now.time_of_day() < startTime) - nextScanDate = now.date(); - else - nextScanDate = getNextDay(now.date()); - break; + boost::gregorian::date nextScanDate; - case UpdatePeriod::Weekly: - if (now.time_of_day() < startTime && now.date().day_of_week() == 1) - nextScanDate = now.date(); - else - nextScanDate = getNextMonday(now.date()); - break; + switch ( getUpdatePeriod(_db.getSession()) ) + { + case UpdatePeriod::Daily: + if (now.time_of_day() < startTime) + nextScanDate = now.date(); + else + nextScanDate = getNextDay(now.date()); + break; - case UpdatePeriod::Monthly: - if (now.time_of_day() < startTime && now.date().day() == 1) - nextScanDate = now.date(); - else - nextScanDate = getNextFirstOfMonth(now.date()); - break; + case UpdatePeriod::Weekly: + if (now.time_of_day() < startTime && now.date().day_of_week() == 1) + nextScanDate = now.date(); + else + nextScanDate = getNextMonday(now.date()); + break; - case UpdatePeriod::Never: - break; - } + case UpdatePeriod::Monthly: + if (now.time_of_day() < startTime && now.date().day() == 1) + nextScanDate = now.date(); + else + nextScanDate = getNextFirstOfMonth(now.date()); + break; - if (!nextScanDate.is_special()) - scheduleScan( boost::posix_time::ptime (nextScanDate, startTime) ); + case UpdatePeriod::Never: + LMS_LOG(DBUPDATER, INFO) << "Auto scan disabled!"; + break; } + + if (!nextScanDate.is_special()) + scheduleScan( boost::posix_time::ptime (nextScanDate, startTime) ); } void @@ -222,7 +235,7 @@ MediaScanner::scheduleScan( boost::posix_time::time_duration duration) { LMS_LOG(DBUPDATER, INFO) << "Scheduling next scan in " << duration; _scheduleTimer.expires_from_now(duration); - _scheduleTimer.async_wait( boost::bind( &MediaScanner::process, this, boost::asio::placeholders::error) ); + _scheduleTimer.async_wait( boost::bind( &MediaScanner::scan, this, boost::asio::placeholders::error) ); } void @@ -230,11 +243,11 @@ MediaScanner::scheduleScan( boost::posix_time::ptime time) { LMS_LOG(DBUPDATER, INFO) << "Scheduling next scan at " << time; _scheduleTimer.expires_at(time); - _scheduleTimer.async_wait( boost::bind( &MediaScanner::process, this, boost::asio::placeholders::error) ); + _scheduleTimer.async_wait( boost::bind( &MediaScanner::scan, this, boost::asio::placeholders::error) ); } void -MediaScanner::process(boost::system::error_code err) +MediaScanner::scan(boost::system::error_code err) { if (err) return; @@ -250,9 +263,9 @@ MediaScanner::process(boost::system::error_code err) if (!_running) break; - LMS_LOG(DBUPDATER, INFO) << "Processing root directory '" << rootDirectory << "'..."; - processRootDirectory(rootDirectory, stats); - LMS_LOG(DBUPDATER, INFO) << "Processing root directory '" << rootDirectory << "' DONE"; + LMS_LOG(DBUPDATER, INFO) << "scaning root directory '" << rootDirectory << "'..."; + scanRootDirectory(rootDirectory, stats); + LMS_LOG(DBUPDATER, INFO) << "scaning root directory '" << rootDirectory << "' DONE"; } if (_running) @@ -269,9 +282,8 @@ MediaScanner::process(boost::system::error_code err) if (_running) { Setting::setTime(_db.getSession(), "last_scan", now); - Setting::setBool(_db.getSession(), "manual_scan_requested", false); - processNextJob(); + scheduleScan(); scanComplete().emit(stats); } @@ -373,12 +385,19 @@ MediaScanner::getClusters( const MetaData::Clusters& clustersNames) for (auto clusterNames : clustersNames) { ClusterType::pointer clusterType = ClusterType::getByName(_db.getSession(), clusterNames.first); + bool newType = !clusterType; + if (!clusterType) clusterType = ClusterType::create(_db.getSession(), clusterNames.first); + std::cout << "Cluster type = " << clusterType.id() << "\n"; for (auto clusterName : clusterNames.second) { - Cluster::pointer cluster = clusterType->getCluster(clusterName); + Cluster::pointer cluster; + + if (!newType) + cluster = clusterType->getCluster(clusterName); + if (!cluster) cluster = Cluster::create(_db.getSession(), clusterType, clusterName); @@ -390,7 +409,7 @@ MediaScanner::getClusters( const MetaData::Clusters& clustersNames) } void -MediaScanner::processAudioFile( const boost::filesystem::path& file, Stats& stats) +MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) { boost::posix_time::ptime lastWriteTime (boost::posix_time::from_time_t( boost::filesystem::last_write_time( file ) ) ); @@ -601,7 +620,7 @@ MediaScanner::processAudioFile( const boost::filesystem::path& file, Stats& stat } void -MediaScanner::processRootDirectory(boost::filesystem::path rootDirectory, Stats& stats) +MediaScanner::scanRootDirectory(boost::filesystem::path rootDirectory, Stats& stats) { boost::system::error_code ec; @@ -619,7 +638,7 @@ MediaScanner::processRootDirectory(boost::filesystem::path rootDirectory, Stats& if (boost::filesystem::is_regular(path)) { if (isFileSupported(path, _fileExtensions)) - processAudioFile(path, stats ); + scanAudioFile(path, stats ); } } } diff --git a/src/scanner/MediaScanner.hpp b/src/scanner/MediaScanner.hpp index 6d319f0b..902dc29b 100644 --- a/src/scanner/MediaScanner.hpp +++ b/src/scanner/MediaScanner.hpp @@ -53,6 +53,9 @@ class MediaScanner void stop(); void restart(); + void scheduleImmediateScan(); + void reschedule(); + struct Stats { std::size_t nbNoChange = 0; // no change since last scan @@ -82,14 +85,14 @@ class MediaScanner private: // Job handling - void processNextJob(); + void scheduleScan(); void scheduleScan(boost::posix_time::time_duration duration); void scheduleScan(boost::posix_time::ptime time); // Update database (scheduled callback) - void process(boost::system::error_code ec); + void scan(boost::system::error_code ec); - void processRootDirectory( boost::filesystem::path rootDirectory, Stats& stats); + void scanRootDirectory( boost::filesystem::path rootDirectory, Stats& stats); // Helpers Database::Artist::pointer getArtist( const boost::filesystem::path& file, const std::string& name, const std::string& MBID); @@ -100,11 +103,7 @@ class MediaScanner // Audio void checkAudioFiles( Stats& stats ); void checkDuplicatedAudioFiles( Stats& stats ); - void processAudioFile( const boost::filesystem::path& file, Stats& stats); - - // Video - void checkVideoFiles( Stats& stats ); - void processVideoFile( const boost::filesystem::path& file, Stats& stats); + void scanAudioFile( const boost::filesystem::path& file, Stats& stats); bool _running; Wt::WIOService _ioService; diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index dcfd42ff..3e935f67 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -46,13 +46,13 @@ namespace skeletons { namespace UserInterface { Wt::WApplication* -LmsApplication::create(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool) +LmsApplication::create(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner) { /* * You could read information from the environment to decide whether * the user has permission to start a new application */ - return new LmsApplication(env, connectionPool); + return new LmsApplication(env, connectionPool, scanner); } LmsApplication* @@ -67,9 +67,10 @@ LmsApplication::instance() * constructor so it is typically also an argument for your custom * application constructor. */ -LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool) +LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner) : Wt::WApplication(env), _db(connectionPool), + _scanner(scanner), _imageResource(nullptr), _transcodeResource(nullptr) { @@ -141,6 +142,11 @@ TranscodeResource* SessionTranscodeResource() return LmsApplication::instance()->getTranscodeResource(); } +Scanner::MediaScanner& MediaScanner() +{ + return LmsApplication::instance()->getMediaScanner(); +} + void LmsApplication::goHome() { diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index de460e4e..e36fcbee 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -26,6 +26,8 @@ #include #include "database/DatabaseHandler.hpp" +#include "scanner/MediaScanner.hpp" + #include "resource/ImageResource.hpp" #include "resource/TranscodeResource.hpp" @@ -34,26 +36,29 @@ namespace UserInterface { class LmsApplication : public Wt::WApplication { public: - static Wt::WApplication *create(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool); + static Wt::WApplication *create(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner); static LmsApplication* instance(); - LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool); - // Session application data ImageResource* getImageResource() { return _imageResource; } TranscodeResource* getTranscodeResource() { return _transcodeResource; } Database::Handler& getDbHandler() { return _db;} + Scanner::MediaScanner& getMediaScanner() { return _scanner; } + // Utils void goHome(); private: + LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner); + void handleAuthEvent(void); void createFirstConnectionUI(); void createLmsUI(); Database::Handler _db; + Scanner::MediaScanner& _scanner; ImageResource* _imageResource; TranscodeResource* _transcodeResource; }; @@ -70,6 +75,7 @@ Database::User::pointer CurrentUser(); ImageResource *SessionImageResource(); TranscodeResource *SessionTranscodeResource(); +Scanner::MediaScanner& MediaScanner(); } // namespace UserInterface diff --git a/src/ui/settings/DatabaseView.cpp b/src/ui/settings/DatabaseView.cpp index 355b3b25..712794c8 100644 --- a/src/ui/settings/DatabaseView.cpp +++ b/src/ui/settings/DatabaseView.cpp @@ -258,13 +258,19 @@ DatabaseView::DatabaseView(Wt::WContainerWidget *parent) Wt::WPushButton *saveBtn = new Wt::WPushButton(Wt::WString::tr("msg-btn-apply")); bindWidget("apply-btn", saveBtn); - saveBtn->setStyleClass("btn-primary"); Wt::WPushButton *discardBtn = new Wt::WPushButton(Wt::WString::tr("msg-btn-discard")); bindWidget("discard-btn", discardBtn); + Wt::WPushButton *immScanBtn = new Wt::WPushButton(Wt::WString::tr("msg-btn-immediate-scan")); + bindWidget("immediate-scan-btn", immScanBtn); + saveBtn->clicked().connect(this, &DatabaseView::processSave); discardBtn->clicked().connect(this, &DatabaseView::processDiscard); + immScanBtn->clicked().connect(std::bind([=] () + { + MediaScanner().scheduleImmediateScan(); + })); updateView(_model); } @@ -285,7 +291,7 @@ DatabaseView::processSave() if (_model->validate()) { _model->saveData(); -// _sigChanged.emit(); + MediaScanner().reschedule(); } // Udate the view: Delete any validation message in the view, etc. updateView(_model); From c0c5273e9266698375918146e51278c2d4985508 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 4 Mar 2018 15:34:33 +0100 Subject: [PATCH 059/195] Remove orphaned cluster types --- src/database/Track.cpp | 9 +++++++++ src/database/Track.hpp | 1 + src/scanner/MediaScanner.cpp | 9 +++++++++ 3 files changed, 19 insertions(+) diff --git a/src/database/Track.cpp b/src/database/Track.cpp index d66327f0..a222e77a 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -271,6 +271,15 @@ ClusterType::ClusterType(std::string name) { } +std::vector +ClusterType::getAllOrphans(Wt::Dbo::Session& session) +{ + Wt::Dbo::collection res = session.query>("select c_t from cluster_type c_t LEFT OUTER JOIN cluster c ON c_t.id = c.cluster_type_id WHERE c.id IS NULL"); + + return std::vector(res.begin(), res.end()); +} + + ClusterType::pointer ClusterType::getByName(Wt::Dbo::Session& session, std::string name) { diff --git a/src/database/Track.hpp b/src/database/Track.hpp index 878ef796..3bec8ee9 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -96,6 +96,7 @@ class ClusterType : public Wt::Dbo::Dbo ClusterType() {} ClusterType(std::string name); + static std::vector getAllOrphans(Wt::Dbo::Session& session); static pointer getByName(Wt::Dbo::Session& session, std::string name); static std::vector getAll(Wt::Dbo::Session& session); diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 2e56944f..e4b12f43 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -725,6 +725,7 @@ MediaScanner::checkAudioFiles( Stats& stats ) { Wt::Dbo::Transaction transaction(_db.getSession()); + // TODO better query for this // Now process orphan Cluster (no track) auto clusters = Cluster::getAll(_db.getSession()); for (auto cluster : clusters) @@ -735,6 +736,14 @@ MediaScanner::checkAudioFiles( Stats& stats ) cluster.remove(); } } + + // Now process orphan cluster types + auto clusterTypes = ClusterType::getAllOrphans(_db.getSession()); + for (auto clusterType : clusterTypes) + { + LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan cluster type '" << clusterType->getName() << "'"; + clusterType.remove(); + } } LMS_LOG(DBUPDATER, DEBUG) << "Checking artists..."; From ceab623e5742dfa93394dbd659318600a1869299 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 4 Mar 2018 15:36:39 +0100 Subject: [PATCH 060/195] Restored WAL to improve import perfs --- src/database/DatabaseHandler.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index c063bbf0..f47fa8a8 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -113,7 +113,6 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) Wt::Dbo::Transaction transaction(_session); // Indexes - // _session.execute("PRAGMA journal_mode=WAL"); _session.execute("CREATE INDEX IF NOT EXISTS track_path_idx ON track(file_path)"); _session.execute("CREATE INDEX IF NOT EXISTS artist_name_idx ON artist(name)"); _session.execute("CREATE INDEX IF NOT EXISTS release_name_idx ON release(name)"); @@ -185,7 +184,7 @@ Handler::createConnectionPool(boost::filesystem::path p) Wt::Dbo::backend::Sqlite3 *connection = new Wt::Dbo::backend::Sqlite3(p.string()); -// connection->executeSql("pragma journal_mode=WAL"); + connection->executeSql("pragma journal_mode=WAL"); connection->setProperty("show-queries", "true"); return new Wt::Dbo::FixedSqlConnectionPool(connection, 1); From 3ac4d1b4f340fcfff2d5ed4c88a27070a64ed633 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 4 Mar 2018 15:48:14 +0100 Subject: [PATCH 061/195] Fixed regression when adding all tracks to play queue --- src/ui/PlaylistView.cpp | 6 ++++++ src/ui/TracksView.cpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/ui/PlaylistView.cpp b/src/ui/PlaylistView.cpp index 4ee8f58f..c50d3925 100644 --- a/src/ui/PlaylistView.cpp +++ b/src/ui/PlaylistView.cpp @@ -21,6 +21,8 @@ #include #include +#include "utils/Logger.hpp" + #include "LmsApplication.hpp" #include "PlaylistView.hpp" @@ -65,6 +67,8 @@ Playlist::addTracks(const std::vector& tracks) // Use a "session" playlist in order to store the current playlist // so that the user can disconnect and get its playlist back + LMS_LOG(UI, DEBUG) << "Adding tracks to the current queue"; + auto playlist = Database::Playlist::get(DboSession(), currentPlaylistName, CurrentUser()); if (!playlist) { @@ -83,6 +87,8 @@ Playlist::addTracks(const std::vector& tracks) void Playlist::playTracks(const std::vector& tracks) { + LMS_LOG(UI, DEBUG) << "Emptying current queue to play new tracks"; + Wt::Dbo::Transaction transaction(DboSession()); auto playlist = Database::Playlist::get(DboSession(), currentPlaylistName, CurrentUser()); diff --git a/src/ui/TracksView.cpp b/src/ui/TracksView.cpp index 8240986d..db82be6a 100644 --- a/src/ui/TracksView.cpp +++ b/src/ui/TracksView.cpp @@ -51,6 +51,7 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) container->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] { + Wt::Dbo::Transaction transaction(DboSession()); tracksPlay.emit(getTracks()); })); @@ -58,6 +59,7 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) container->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] { + Wt::Dbo::Transaction transaction(DboSession()); tracksAdd.emit(getTracks()); })); From bbb988266def7679d3e9ae5796c16bb2611c0611 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 4 Mar 2018 15:52:16 +0100 Subject: [PATCH 062/195] Better handler ClusterType creation --- src/scanner/MediaScanner.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index e4b12f43..5c1b6e2e 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -385,18 +385,15 @@ MediaScanner::getClusters( const MetaData::Clusters& clustersNames) for (auto clusterNames : clustersNames) { ClusterType::pointer clusterType = ClusterType::getByName(_db.getSession(), clusterNames.first); - bool newType = !clusterType; - if (!clusterType) + { clusterType = ClusterType::create(_db.getSession(), clusterNames.first); + _db.getSession().flush(); // Make sure the newly createdType has an id + } - std::cout << "Cluster type = " << clusterType.id() << "\n"; for (auto clusterName : clusterNames.second) { - Cluster::pointer cluster; - - if (!newType) - cluster = clusterType->getCluster(clusterName); + Cluster::pointer cluster = clusterType->getCluster(clusterName); if (!cluster) cluster = Cluster::create(_db.getSession(), clusterType, clusterName); From a3fd11c85b3e53bd8e67442780df6963d2e74476 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 4 Mar 2018 16:09:03 +0100 Subject: [PATCH 063/195] Create a fake user if not existing --- src/database/User.cpp | 6 ++++++ src/database/User.hpp | 3 +++ src/ui/LmsApplication.cpp | 4 ++++ src/ui/PlaylistView.cpp | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/database/User.cpp b/src/database/User.cpp index 751e614e..4024e2d4 100644 --- a/src/database/User.cpp +++ b/src/database/User.cpp @@ -83,6 +83,12 @@ User::getAll(Wt::Dbo::Session& session) return std::vector(res.begin(), res.end()); } +User::pointer +User::create(Wt::Dbo::Session& session) +{ + return session.add(new User()); +} + User::pointer User::getById(Wt::Dbo::Session& session, id_type id) { diff --git a/src/database/User.hpp b/src/database/User.hpp index de065e68..e772f404 100644 --- a/src/database/User.hpp +++ b/src/database/User.hpp @@ -64,6 +64,9 @@ class User typedef Wt::Dbo::ptr pointer; + // utility + static pointer create(Wt::Dbo::Session& session); + // accessors static pointer getById(Wt::Dbo::Session& session, id_type id); static std::vector getAll(Wt::Dbo::Session& session); diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 3e935f67..db4ee7b4 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -101,6 +101,10 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti Wt::Dbo::Transaction transaction(DboSession()); firstConnection = (Database::User::getAll(DboSession()).size() == 0); + + // Create a fake user + // TODO settings + Database::User::create(DboSession()); } LMS_LOG(UI, DEBUG) << "Creating root widget. First connection = " << std::boolalpha << firstConnection; diff --git a/src/ui/PlaylistView.cpp b/src/ui/PlaylistView.cpp index c50d3925..5cc4350c 100644 --- a/src/ui/PlaylistView.cpp +++ b/src/ui/PlaylistView.cpp @@ -120,7 +120,7 @@ Playlist::addSome() return; bool moreResults; - auto tracks = playlist->getTracks(_entriesContainer->count(), 20, moreResults); + auto tracks = playlist->getTracks(_entriesContainer->count(), 50, moreResults); for (auto track : tracks) { Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-playlist-entry"), _entriesContainer); From da138aa06e82295bd381efe2b24f88a77c8529e6 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 4 Mar 2018 20:25:03 +0100 Subject: [PATCH 064/195] Renamed playlist to playqueue --- Makefile.am | 2 +- approot/messages.xml | 2 +- approot/{playlist.xml => playqueue.xml} | 16 +++---- src/Makefile.am | 2 +- src/ui/LmsApplication.cpp | 20 ++++----- .../{PlaylistView.cpp => PlayQueueView.cpp} | 44 +++++++++---------- .../{PlaylistView.hpp => PlayQueueView.hpp} | 4 +- 7 files changed, 45 insertions(+), 45 deletions(-) rename approot/{playlist.xml => playqueue.xml} (66%) rename src/ui/{PlaylistView.cpp => PlayQueueView.cpp} (75%) rename src/ui/{PlaylistView.hpp => PlayQueueView.hpp} (92%) diff --git a/Makefile.am b/Makefile.am index 95bf74bc..caa0718b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ lms_approot_DATA = \ approot/artist.xml \ approot/mediaplayer.xml \ approot/messages.xml \ - approot/playlist.xml \ + approot/playqueue.xml \ approot/releases.xml \ approot/release.xml \ approot/settings.xml \ diff --git a/approot/messages.xml b/approot/messages.xml index b3e1146e..1ebc8dcf 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -6,7 +6,7 @@ Artists Albums Tracks -Playlist +Play Queue Add filter Search... diff --git a/approot/playlist.xml b/approot/playqueue.xml similarity index 66% rename from approot/playlist.xml rename to approot/playqueue.xml index 266baa33..a48b1570 100644 --- a/approot/playlist.xml +++ b/approot/playqueue.xml @@ -2,36 +2,36 @@ - + - + - + - +
-

${tr:msg-playlist}

+

${tr:msg-playqueue}

${save-btn} ${load-btn} ${clear-btn}
${entries} ${show-more} - + - + - + ${pos} ${name} ${}${release-name}${} ${}${artist-name}${} ${play-btn} ${del-btn} diff --git a/src/Makefile.am b/src/Makefile.am index ec57c4a9..b958dfca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,7 @@ lms_SOURCES = \ $(srcdir)/ui/HomeView.cpp \ $(srcdir)/ui/LmsApplication.cpp \ $(srcdir)/ui/MediaPlayer.cpp \ - $(srcdir)/ui/PlaylistView.cpp \ + $(srcdir)/ui/PlayQueueView.cpp \ $(srcdir)/ui/ReleasesView.cpp \ $(srcdir)/ui/ReleaseView.cpp \ $(srcdir)/ui/TracksView.cpp \ diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index db4ee7b4..2b0d4baa 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -33,7 +33,7 @@ #include "Explore.hpp" #include "HomeView.hpp" #include "MediaPlayer.hpp" -#include "PlaylistView.hpp" +#include "PlayQueueView.hpp" #include "settings/DatabaseView.hpp" @@ -87,7 +87,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti messageResourceBundle().use(appRoot() + "artists"); messageResourceBundle().use(appRoot() + "mediaplayer"); messageResourceBundle().use(appRoot() + "messages"); - messageResourceBundle().use(appRoot() + "playlist"); + messageResourceBundle().use(appRoot() + "playqueue"); messageResourceBundle().use(appRoot() + "release"); messageResourceBundle().use(appRoot() + "releases"); messageResourceBundle().use(appRoot() + "settings"); @@ -192,7 +192,7 @@ enum IdxRoot { IdxHome = 0, IdxExplore, - IdxPlaylist, + IdxPlayQueue, IdxSettingsDatabase, }; @@ -209,7 +209,7 @@ handlePathChange(Wt::WStackedWidget* stack) { "/releases", IdxExplore }, { "/release", IdxExplore }, { "/tracks", IdxExplore }, - { "/playlist", IdxPlaylist }, + { "/playqueue", IdxPlayQueue }, { "/settings/database", IdxSettingsDatabase }, }; @@ -271,8 +271,8 @@ LmsApplication::handleAuthEvent(void) menuItem->setSelectable(false); } { - auto menuItem = menu->insertItem(3, Wt::WString::tr("msg-playlist")); - menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/playlist")); + auto menuItem = menu->insertItem(3, Wt::WString::tr("msg-playqueue")); + menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/playqueue")); menuItem->setSelectable(false); } { @@ -298,20 +298,20 @@ LmsApplication::handleAuthEvent(void) auto explore = new Explore(); mainStack->addWidget(explore); - auto playlist = new Playlist(); - mainStack->addWidget(playlist); + auto playqueue = new PlayQueue(); + mainStack->addWidget(playqueue); auto databaseSettings = new Settings::DatabaseView(); mainStack->addWidget(databaseSettings); explore->tracksAdd.connect(std::bind([=] (std::vector tracks) { - playlist->addTracks(tracks); + playqueue->addTracks(tracks); }, std::placeholders::_1)); explore->tracksPlay.connect(std::bind([=] (std::vector tracks) { - playlist->playTracks(tracks); + playqueue->playTracks(tracks); }, std::placeholders::_1)); // MediaPlayer diff --git a/src/ui/PlaylistView.cpp b/src/ui/PlayQueueView.cpp similarity index 75% rename from src/ui/PlaylistView.cpp rename to src/ui/PlayQueueView.cpp index 5cc4350c..db265b9a 100644 --- a/src/ui/PlaylistView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -24,25 +24,25 @@ #include "utils/Logger.hpp" #include "LmsApplication.hpp" -#include "PlaylistView.hpp" +#include "PlayQueueView.hpp" namespace UserInterface { -static const std::string currentPlaylistName = "__current__playlist__"; +static const std::string currentPlayQueueName = "__current__playqueue__"; -Playlist::Playlist(Wt::WContainerWidget* parent) +PlayQueue::PlayQueue(Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent) { - auto container = new Wt::WTemplate(Wt::WString::tr("template-playlist"), this); + auto container = new Wt::WTemplate(Wt::WString::tr("template-playqueue"), this); container->addFunction("tr", &Wt::WTemplate::Functions::tr); - auto saveBtn = new Wt::WText(Wt::WString::tr("btn-playlist-save-btn"), Wt::XHTMLText); + auto saveBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-save-btn"), Wt::XHTMLText); container->bindWidget("save-btn", saveBtn); - auto loadBtn = new Wt::WText(Wt::WString::tr("btn-playlist-load-btn"), Wt::XHTMLText); + auto loadBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-load-btn"), Wt::XHTMLText); container->bindWidget("load-btn", loadBtn); - auto clearBtn = new Wt::WText(Wt::WString::tr("btn-playlist-clear-btn"), Wt::XHTMLText); + auto clearBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-clear-btn"), Wt::XHTMLText); container->bindWidget("clear-btn", clearBtn); _entriesContainer = new Wt::WContainerWidget(); @@ -62,17 +62,17 @@ Playlist::Playlist(Wt::WContainerWidget* parent) } void -Playlist::addTracks(const std::vector& tracks) +PlayQueue::addTracks(const std::vector& tracks) { - // Use a "session" playlist in order to store the current playlist - // so that the user can disconnect and get its playlist back + // Use a "session" playqueue in order to store the current playqueue + // so that the user can disconnect and get its playqueue back LMS_LOG(UI, DEBUG) << "Adding tracks to the current queue"; - auto playlist = Database::Playlist::get(DboSession(), currentPlaylistName, CurrentUser()); + auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); if (!playlist) { - playlist = Database::Playlist::create(DboSession(), currentPlaylistName, false, CurrentUser()); + playlist = Database::Playlist::create(DboSession(), currentPlayQueueName, false, CurrentUser()); } std::size_t pos = playlist->getCount(); @@ -85,15 +85,15 @@ Playlist::addTracks(const std::vector& tracks) } void -Playlist::playTracks(const std::vector& tracks) +PlayQueue::playTracks(const std::vector& tracks) { LMS_LOG(UI, DEBUG) << "Emptying current queue to play new tracks"; Wt::Dbo::Transaction transaction(DboSession()); - auto playlist = Database::Playlist::get(DboSession(), currentPlaylistName, CurrentUser()); - if (playlist) - playlist.modify()->clear(); + auto playqueue = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); + if (playqueue) + playqueue.modify()->clear(); _entriesContainer->clear(); @@ -104,18 +104,18 @@ Playlist::playTracks(const std::vector& tracks) void -Playlist::refresh() +PlayQueue::refresh() { _entriesContainer->clear(); addSome(); } void -Playlist::addSome() +PlayQueue::addSome() { Wt::Dbo::Transaction transaction (DboSession()); - auto playlist = Database::Playlist::get(DboSession(), currentPlaylistName, CurrentUser()); + auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); if (!playlist) return; @@ -123,7 +123,7 @@ Playlist::addSome() auto tracks = playlist->getTracks(_entriesContainer->count(), 50, moreResults); for (auto track : tracks) { - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-playlist-entry"), _entriesContainer); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-playqueue-entry"), _entriesContainer); entry->bindString("pos", std::to_string(_entriesContainer->count())); entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); @@ -147,11 +147,11 @@ Playlist::addSome() entry->bindWidget("release-name", releaseAnchor); } - auto playBtn = new Wt::WText(Wt::WString::tr("btn-playlist-entry-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-entry-play-btn"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); // TODO - auto addBtn = new Wt::WText(Wt::WString::tr("btn-playlist-entry-del-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-entry-del-btn"), Wt::XHTMLText); entry->bindWidget("del-btn", addBtn); // TODO } diff --git a/src/ui/PlaylistView.hpp b/src/ui/PlayQueueView.hpp similarity index 92% rename from src/ui/PlaylistView.hpp rename to src/ui/PlayQueueView.hpp index 03db9226..9f8e932a 100644 --- a/src/ui/PlaylistView.hpp +++ b/src/ui/PlayQueueView.hpp @@ -26,10 +26,10 @@ namespace UserInterface { -class Playlist : public Wt::WContainerWidget +class PlayQueue : public Wt::WContainerWidget { public: - Playlist(Wt::WContainerWidget* parent = 0); + PlayQueue(Wt::WContainerWidget* parent = 0); void addTracks(const std::vector& tracks); void playTracks(const std::vector& tracks); From 711dc613aac9623205b253fb77ba51f94f27d0a9 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 4 Mar 2018 22:35:08 +0100 Subject: [PATCH 065/195] Added a notify system --- approot/messages.xml | 4 ++++ src/ui/LmsApplication.cpp | 27 +++++++++++++++++++++++++++ src/ui/LmsApplication.hpp | 4 ++++ src/ui/settings/DatabaseView.cpp | 8 +++++++- 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/approot/messages.xml b/approot/messages.xml index 1ebc8dcf..14e4bc54 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -23,6 +23,7 @@ Media root directory Update period Update start time +Update start time Never Daily Weekly @@ -31,5 +32,8 @@ Apply Discard Scan now! +Scan launched! +New settings saved! +Scan finished, {1} imported file(s), {2} removed file(s)! diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 2b0d4baa..496df353 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -318,6 +318,21 @@ LmsApplication::handleAuthEvent(void) auto player = new MediaPlayer(); main->bindWidget("player", player); + // Events from MediaScanner + // TODO: only if admin + enableUpdates(true); + std::string sessionId = this->sessionId(); + _scanner.scanComplete().connect(std::bind([=] (Scanner::MediaScanner::Stats stats) + { + Wt::WServer::instance()->post(sessionId, [=] + { + notify(Wt::WString::tr("msg-notify-scan-complete").arg(stats.nbAdded).arg(stats.nbRemoved)); + triggerUpdate(); + }); +// notify("TEST"); + }, std::placeholders::_1)); + + internalPathChanged().connect(std::bind([=] { handlePathChange(mainStack); @@ -326,6 +341,18 @@ LmsApplication::handleAuthEvent(void) handlePathChange(mainStack); } +void +LmsApplication::notify(const Wt::WString& message) +{ + LMS_LOG(UI, INFO) << "Notifying message '" << message.toUTF8() << "'"; + root()->addWidget(new Wt::WText(message)); +} + +void notify(const Wt::WString& message) +{ + LmsApplication::instance()->notify(message); +} + } // namespace UserInterface diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index e36fcbee..f3e4dd2b 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -48,6 +48,7 @@ class LmsApplication : public Wt::WApplication // Utils void goHome(); + void notify(const Wt::WString& message); private: @@ -77,6 +78,9 @@ TranscodeResource *SessionTranscodeResource(); Scanner::MediaScanner& MediaScanner(); +void notify(const Wt::WString& message); + + } // namespace UserInterface #endif diff --git a/src/ui/settings/DatabaseView.cpp b/src/ui/settings/DatabaseView.cpp index 712794c8..05dad344 100644 --- a/src/ui/settings/DatabaseView.cpp +++ b/src/ui/settings/DatabaseView.cpp @@ -270,6 +270,8 @@ DatabaseView::DatabaseView(Wt::WContainerWidget *parent) immScanBtn->clicked().connect(std::bind([=] () { MediaScanner().scheduleImmediateScan(); + + notify(Wt::WString::tr("msg-notify-scan-launched")); })); updateView(_model); @@ -288,11 +290,15 @@ DatabaseView::processSave() { updateModel(_model); - if (_model->validate()) { + if (_model->validate()) + { _model->saveData(); MediaScanner().reschedule(); + + notify(Wt::WString::tr("msg-notify-settings-saved")); } + // Udate the view: Delete any validation message in the view, etc. updateView(_model); } From 6ef33f69b6175f142f38745a9713df623f340c69 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 4 Mar 2018 22:46:56 +0100 Subject: [PATCH 066/195] Better home template --- approot/messages.xml | 3 +++ src/ui/HomeView.cpp | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/approot/messages.xml b/approot/messages.xml index 14e4bc54..a0c99722 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -2,6 +2,9 @@ + +

Welcome!

 + Various artists Artists Albums diff --git a/src/ui/HomeView.cpp b/src/ui/HomeView.cpp index 730f981e..e97d8b33 100644 --- a/src/ui/HomeView.cpp +++ b/src/ui/HomeView.cpp @@ -31,7 +31,9 @@ namespace UserInterface { Home::Home(Wt::WContainerWidget *parent) : Wt::WContainerWidget(parent) { - addWidget(new Wt::WTemplate(Wt::WString::tr("template-home"))); + auto t = new Wt::WTemplate(Wt::WString::tr("template-home"), this); + t->addFunction("tr", &Wt::WTemplate::Functions::tr); + } } // namespace UserInterface From 7d081d39454163773e939da60d511d8f99c272c1 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 4 Mar 2018 23:02:31 +0100 Subject: [PATCH 067/195] Updated TODO list --- TODO | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/TODO b/TODO index d55ee917..bcdc9f75 100644 --- a/TODO +++ b/TODO @@ -4,16 +4,16 @@ [Cover] - Handle preferred cover file names ("front.xxx", "cover.xxx", ...) -- Implement a cache and a grabber from some web service (mandatory for artists?) coverartarchive.org +- Implement a cache to improve speed [Database] - Optim, use SQL query to get the "genre" orphans - Use Inotify like system to watch modified/added files? - handle access rights problems (instead of aborting) - add a global play counter for tracks. This will help people to spot most popular files -- Use the WServer::post method to notify the end of the database scan? (with results?) -- Make clusters based on different metadata (albumgrouping, genre, mood, etc.). Make it configurable somewhere as it is very difficult to handle them all? +- Make cluster scan configurable as it is very difficult to handle them all? - Use albumartist when available (useful for compilations) +- Add AcousticBrainz support to create new kind of clusters [Metadata] - WMA covers: add support @@ -27,14 +27,20 @@ - Limit multi login from UI and API interfaces (limit per interface is acceptable) [UI] - - Add a download button to get the current playlist in a streamed zip file + - Add a download button to get the current playqueue in a streamed zip file - Save user prefs in local storage (volume, loop, shuffle, current playqueue, etc.) - Add keyboard shortcuts - Add a hint for the user to get the nature of tag (created from genre ? created from audio features?) - Implement a play queue - Implement a decent player - - Tags cloud for artist/release - Dedicate a color for each tag type + - Display only the most popular cluster of each cluster type? + +[Settings] + - Add a audio settings: format + bitrate to be used + - Add a user management view + - Add multi root directories support + - Add a first connection wizard [REST API] - Make a dedicated REST API. Maybe use the SubSonic API or Ampache API? From db0fe53aa38f20332937176dfce7778ac913c314 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 5 Mar 2018 23:13:44 +0100 Subject: [PATCH 068/195] Better scan stats --- approot/messages.xml | 2 +- src/scanner/MediaScanner.cpp | 24 +++++++++++++----------- src/scanner/MediaScanner.hpp | 22 ++++++++++++++-------- src/ui/LmsApplication.cpp | 7 ++++++- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/approot/messages.xml b/approot/messages.xml index a0c99722..03322b49 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -37,6 +37,6 @@ Scan now! Scan launched! New settings saved! -Scan finished, {1} imported file(s), {2} removed file(s)! +Scan complete: {1} total files, {2} additions, {3} deletions, {4} duplicates, {5} errors diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 5c1b6e2e..492ad6f4 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -271,7 +271,7 @@ MediaScanner::scan(boost::system::error_code err) if (_running) checkDuplicatedAudioFiles(stats); - LMS_LOG(DBUPDATER, INFO) << "Scan " << (_running ? "complete" : "aborted") << ". Changes = " << stats.nbChanges() << " (added = " << stats.nbAdded << ", removed = " << stats.nbRemoved << ", updated = " << stats.nbUpdated << "), Not changed = " << stats.nbNoChange << ", Scanned = " << stats.nbScanned << " (errors = " << stats.nbScanErrors << ", not imported = " << stats.nbNotImported << ")"; + LMS_LOG(DBUPDATER, INFO) << "Scan " << (_running ? "complete" : "aborted") << ". Changes = " << stats.nbChanges() << " (added = " << stats.additions << ", removed = " << stats.deletions << ", updated = " << stats.updates << "), Not changed = " << stats.skips << ", Scanned = " << stats.scans << " (errors = " << stats.scanErrors << ", not imported = " << stats.incompleteScans << "), duplicates = " << stats.nbDuplicates() << " (hash = " << stats.duplicateHashes << ", mbid = " << stats.duplicateMBID << ")"; // Update database stats boost::posix_time::ptime now = boost::posix_time::second_clock::local_time(); @@ -418,7 +418,7 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) if (track && track->getLastWriteTime() == lastWriteTime) { - stats.nbNoChange++; + stats.skips++; return; } } @@ -426,11 +426,11 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) boost::optional items = _metadataParser.parse(file); if (!items) { - stats.nbScanErrors++; + stats.scanErrors++; return; } - stats.nbScanned++; + stats.scans++; std::vector checksum ; computeCrc(file, checksum); @@ -451,9 +451,9 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) if (track) { track.remove(); - stats.nbRemoved++; + stats.deletions++; } - stats.nbNotImported++; + stats.incompleteScans++; return; } if ((*items).find(MetaData::Type::Duration) == (*items).end() @@ -465,9 +465,9 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) if (track) { track.remove(); - stats.nbRemoved++; + stats.deletions++; } - stats.nbNotImported++; + stats.incompleteScans++; return; } @@ -536,7 +536,7 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) // Create a new song track = Track::create(_db.getSession(), file); LMS_LOG(DBUPDATER, INFO) << "Adding '" << file << "'"; - stats.nbAdded++; + stats.additions++; } else { @@ -546,7 +546,7 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) for (auto cluster : track->getClusters()) cluster.remove(); - stats.nbUpdated++; + stats.updates++; } assert(track); @@ -713,7 +713,7 @@ MediaScanner::checkAudioFiles( Stats& stats ) if (track) { track.remove(); - stats.nbRemoved++; + stats.deletions++; } } } @@ -781,12 +781,14 @@ MediaScanner::checkDuplicatedAudioFiles(Stats& stats) for (Track::pointer track : tracks) { LMS_LOG(DBUPDATER, INFO) << "Found duplicated MBID [" << track->getMBID() << "], file: " << track->getPath() << " - " << track->getArtist()->getName() << " - " << track->getName(); + stats.duplicateMBID++; } tracks = Database::Track::getChecksumDuplicates(_db.getSession()); for (Track::pointer track : tracks) { LMS_LOG(DBUPDATER, INFO) << "Found duplicated checksum [" << bufferToString(track->getChecksum()) << "], file: " << track->getPath() << " - " << track->getArtist()->getName() << " - " << track->getName(); + stats.duplicateHashes++; } diff --git a/src/scanner/MediaScanner.hpp b/src/scanner/MediaScanner.hpp index 902dc29b..cb011c1b 100644 --- a/src/scanner/MediaScanner.hpp +++ b/src/scanner/MediaScanner.hpp @@ -58,15 +58,21 @@ class MediaScanner struct Stats { - std::size_t nbNoChange = 0; // no change since last scan - std::size_t nbScanned = 0; // total scanned filed - std::size_t nbScanErrors = 0; // cannot scan file - std::size_t nbNotImported = 0; // Scanned, but not imported (criteria not filled) - std::size_t nbAdded = 0; // Added in DB - std::size_t nbRemoved = 0; // removed from DB - std::size_t nbUpdated = 0; // updated file in DB + std::size_t skips = 0; // no change since last scan + std::size_t scans = 0; // actually scanned filed + std::size_t scanErrors = 0; // cannot scan file + std::size_t incompleteScans = 0; // Scanned, but not imported (criteria not filled) + std::size_t additions = 0; // Added in DB + std::size_t deletions = 0; // removed from DB + std::size_t updates = 0; // updated file in DB - std::size_t nbChanges() const { return nbAdded + nbRemoved + nbUpdated;} + std::size_t duplicateHashes = 0; // Same file hashes + std::size_t duplicateMBID = 0; // Same MBID + + std::size_t nbFiles() const { return skips + additions + updates; } + std::size_t nbChanges() const { return additions + deletions + updates; } + std::size_t nbErrors() const { return scanErrors + incompleteScans; } + std::size_t nbDuplicates() const { return duplicateHashes + duplicateMBID; } }; diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 496df353..ab5a6ad7 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -326,7 +326,12 @@ LmsApplication::handleAuthEvent(void) { Wt::WServer::instance()->post(sessionId, [=] { - notify(Wt::WString::tr("msg-notify-scan-complete").arg(stats.nbAdded).arg(stats.nbRemoved)); + notify(Wt::WString::tr("msg-notify-scan-complete") + .arg(stats.nbFiles()) + .arg(stats.additions) + .arg(stats.deletions) + .arg(stats.nbDuplicates()) + .arg(stats.nbErrors())); triggerUpdate(); }); // notify("TEST"); From 86fc1415d5538aed8cc25d082468d2dc052acfc9 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 8 Mar 2018 22:57:56 +0100 Subject: [PATCH 069/195] Added first connection wizard to create the administrator account --- Makefile.am | 3 +- approot/messages.xml | 8 + .../{settings.xml => settings-database.xml} | 0 approot/settings-first-connection.xml | 57 ++++++ src/Makefile.am | 3 +- src/database/DatabaseHandler.cpp | 2 +- src/database/User.cpp | 56 ------ src/database/User.hpp | 31 +--- src/ui/LmsApplication.cpp | 18 +- ...{DirectoryValidator.cpp => Validators.cpp} | 19 +- src/ui/common/Validators.hpp | 25 ++- src/ui/settings/DatabaseView.cpp | 8 +- src/ui/settings/DatabaseView.hpp | 7 - src/ui/settings/FirstConnectionView.cpp | 164 ++++++++++++++++++ .../FirstConnectionView.hpp} | 18 +- 15 files changed, 287 insertions(+), 132 deletions(-) rename approot/{settings.xml => settings-database.xml} (100%) create mode 100644 approot/settings-first-connection.xml rename src/ui/common/{DirectoryValidator.cpp => Validators.cpp} (79%) create mode 100644 src/ui/settings/FirstConnectionView.cpp rename src/ui/{common/DirectoryValidator.hpp => settings/FirstConnectionView.hpp} (72%) diff --git a/Makefile.am b/Makefile.am index caa0718b..ddd7cc97 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,8 @@ lms_approot_DATA = \ approot/playqueue.xml \ approot/releases.xml \ approot/release.xml \ - approot/settings.xml \ + approot/settings-database.xml \ + approot/settings-first-connection.xml \ approot/templates.xml \ approot/tracks.xml diff --git a/approot/messages.xml b/approot/messages.xml index 03322b49..ff60b3c9 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -21,6 +21,14 @@ Show more +Login +Password +Verify password +Create + +Administrator account +Account created. Please refresh to continue! + Settings Database Media root directory diff --git a/approot/settings.xml b/approot/settings-database.xml similarity index 100% rename from approot/settings.xml rename to approot/settings-database.xml diff --git a/approot/settings-first-connection.xml b/approot/settings-first-connection.xml new file mode 100644 index 00000000..c4fda6db --- /dev/null +++ b/approot/settings-first-connection.xml @@ -0,0 +1,57 @@ + + + + + + +
+
+

${tr:msg-settings-admin-account}

+
+
+
+ +
+ ${admin-login} +
+
+ ${admin-login-info} +
+
+ +
+ +
+ ${password} +
+
+ ${password-info} +
+
+ +
+ +
+ ${password-confirm} +
+
+ ${password-confirm-info} +
+
+ +
+
+ ${create-btn class="btn-primary"} +
+
+
+
+ + + diff --git a/src/Makefile.am b/src/Makefile.am index b958dfca..8aa3f025 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,13 +33,14 @@ lms_SOURCES = \ $(srcdir)/ui/ReleaseView.cpp \ $(srcdir)/ui/TracksView.cpp \ $(srcdir)/ui/auth/LmsAuth.cpp \ - $(srcdir)/ui/common/DirectoryValidator.cpp \ + $(srcdir)/ui/common/Validators.cpp \ $(srcdir)/ui/common/InputRange.cpp \ $(srcdir)/ui/common/LineEdit.cpp \ $(srcdir)/ui/resource/AvConvTranscodeStreamResource.cpp \ $(srcdir)/ui/resource/ImageResource.cpp \ $(srcdir)/ui/resource/TranscodeResource.cpp \ $(srcdir)/ui/settings/DatabaseView.cpp \ + $(srcdir)/ui/settings/FirstConnectionView.cpp \ $(srcdir)/utils/Config.cpp \ $(srcdir)/utils/Logger.cpp \ $(srcdir)/utils/Path.cpp \ diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index f47fa8a8..7334dbde 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -61,7 +61,7 @@ Handler::configureAuth(void) strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::OneCharClass, 4); strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::TwoCharClass, 4); strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::ThreeCharClass, 4 ); - strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::FourCharClass, 4 ); + strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::FourCharClass, 4 ); passwordService.setStrengthValidator(strengthValidator); } diff --git a/src/database/User.cpp b/src/database/User.cpp index 4024e2d4..bd1dfa2c 100644 --- a/src/database/User.cpp +++ b/src/database/User.cpp @@ -26,26 +26,9 @@ const std::vector User::audioBitrates = { 64000, - 96000, 128000, - 160000, 192000, - 224000, - 256000, 320000, - 512000 -}; - - -const std::vector -User::videoBitrates = -{ - 256000, - 512000, - 1024000, - 2048000, - 4096000, - 8192000 }; const std::vector @@ -57,20 +40,11 @@ User::audioEncodings = AudioEncoding::WEBMA, }; -const std::vector -User::videoEncodings = -{ - VideoEncoding::AUTO, -}; - User::User() : _maxAudioBitrate(maxAudioBitrate), - _maxVideoBitrate(maxVideoBitrate), _isAdmin(false), _audioBitrate(defaultAudioBitrate), _audioEncoding(AudioEncoding::AUTO), -_videoBitrate(defaultVideoBitrate), -_videoEncoding(VideoEncoding::AUTO), _curPlayingTrackPos(0) { @@ -108,24 +82,12 @@ User::setAudioBitrate(std::size_t bitrate) _audioBitrate = std::min(bitrate, std::min(static_cast(_maxAudioBitrate), audioBitrates.back())); } -void -User::setVideoBitrate(std::size_t bitrate) -{ - _videoBitrate = std::min(bitrate, std::min(static_cast(_maxVideoBitrate), videoBitrates.back())); -} - void User::setMaxAudioBitrate(std::size_t bitrate) { _maxAudioBitrate = std::min(bitrate, static_cast(_maxAudioBitrate)); } -void -User::setMaxVideoBitrate(std::size_t bitrate) -{ - _maxVideoBitrate = std::min(bitrate, static_cast(_maxVideoBitrate)); -} - std::size_t User::getAudioBitrate(void) const { @@ -135,15 +97,6 @@ User::getAudioBitrate(void) const return std::min(static_cast(_audioBitrate), audioBitrates.back()); } -std::size_t -User::getVideoBitrate(void) const -{ - if (!isAdmin()) - return std::min(static_cast(_videoBitrate), std::min(static_cast(_maxVideoBitrate), videoBitrates.back())); - else - return std::min(static_cast(_videoBitrate), videoBitrates.back()); -} - std::size_t User::getMaxAudioBitrate(void) const { @@ -153,15 +106,6 @@ User::getMaxAudioBitrate(void) const return audioBitrates.back(); } -std::size_t -User::getMaxVideoBitrate(void) const -{ - if (!isAdmin()) - return std::min(static_cast(_maxVideoBitrate), videoBitrates.back()); - else - return videoBitrates.back(); -} - } // namespace Database diff --git a/src/database/User.hpp b/src/database/User.hpp index e772f404..a422c369 100644 --- a/src/database/User.hpp +++ b/src/database/User.hpp @@ -41,29 +41,21 @@ enum class AudioEncoding WEBMA, }; -enum class VideoEncoding -{ - AUTO, -}; - class User { - public: + typedef Wt::Dbo::dbo_traits::IdType id_type; + typedef Wt::Dbo::ptr pointer; + static const std::size_t MinNameLength = 3; static const std::size_t MaxNameLength = 15; - // list of audio/video parameters + // list of audio parameters static const std::vector audioBitrates; static const std::vector audioEncodings; - static const std::vector videoBitrates; - static const std::vector videoEncodings; - User(); - typedef Wt::Dbo::ptr pointer; - // utility static pointer create(Wt::Dbo::Session& session); @@ -76,32 +68,23 @@ class User void setAdmin(bool admin) { _isAdmin = admin; } void setAudioBitrate(std::size_t bitrate); void setAudioEncoding(AudioEncoding encoding) { _audioEncoding = encoding; } - void setVideoBitrate(std::size_t bitrate); - void setVideoEncoding(VideoEncoding encoding) { _videoEncoding = encoding; } void setMaxAudioBitrate(std::size_t bitrate); - void setMaxVideoBitrate(std::size_t bitrate); void setCurPlayingTrackPos(std::size_t pos) { _curPlayingTrackPos = pos; } // read bool isAdmin() const {return _isAdmin;} std::size_t getAudioBitrate() const; AudioEncoding getAudioEncoding() const { return _audioEncoding;} - std::size_t getVideoBitrate() const; - VideoEncoding getVideoEncoding() const { return _videoEncoding;} std::size_t getMaxAudioBitrate() const; - std::size_t getMaxVideoBitrate() const; std::size_t getCurPlayingTrackPos() const { return _curPlayingTrackPos; } template void persist(Action& a) { Wt::Dbo::field(a, _maxAudioBitrate, "max_audio_bitrate"); - Wt::Dbo::field(a, _maxVideoBitrate, "max_video_bitrate"); Wt::Dbo::field(a, _isAdmin, "admin"); Wt::Dbo::field(a, _audioBitrate, "audio_bitrate"); Wt::Dbo::field(a, _audioEncoding, "audio_encoding"); - Wt::Dbo::field(a, _videoBitrate, "video_bitrate"); - Wt::Dbo::field(a, _videoEncoding, "video_encoding"); // User's dynamic data Wt::Dbo::field(a, _curPlayingTrackPos, "cur_playing_track_pos"); Wt::Dbo::hasMany(a, _playlists, Wt::Dbo::ManyToOne, "user"); @@ -110,21 +93,15 @@ class User private: static const std::size_t maxAudioBitrate = 320000; - static const std::size_t maxVideoBitrate = 2048000; - static const std::size_t defaultAudioBitrate = 128000; - static const std::size_t defaultVideoBitrate = 1024000; // Admin defined settings int _maxAudioBitrate; - int _maxVideoBitrate; bool _isAdmin; // User defined settings int _audioBitrate; AudioEncoding _audioEncoding; - int _videoBitrate; - VideoEncoding _videoEncoding; // User's dynamic data int _curPlayingTrackPos; // Current track position in queue diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index ab5a6ad7..84dc0c46 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -36,6 +36,7 @@ #include "PlayQueueView.hpp" #include "settings/DatabaseView.hpp" +#include "settings/FirstConnectionView.hpp" #include "LmsApplication.hpp" @@ -90,29 +91,26 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti messageResourceBundle().use(appRoot() + "playqueue"); messageResourceBundle().use(appRoot() + "release"); messageResourceBundle().use(appRoot() + "releases"); - messageResourceBundle().use(appRoot() + "settings"); + messageResourceBundle().use(appRoot() + "settings-database"); + messageResourceBundle().use(appRoot() + "settings-first-connection"); messageResourceBundle().use(appRoot() + "tracks"); messageResourceBundle().use(appRoot() + "templates"); setTitle("LMS"); + // If here is no account in the database, launch the first connection wizard bool firstConnection; { Wt::Dbo::Transaction transaction(DboSession()); firstConnection = (Database::User::getAll(DboSession()).size() == 0); - - // Create a fake user - // TODO settings - Database::User::create(DboSession()); } LMS_LOG(UI, DEBUG) << "Creating root widget. First connection = " << std::boolalpha << firstConnection; - // If here is no account in the database, launch the first connection wizard -// if (firstConnection) -// createFirstConnectionUI(); -// else + if (firstConnection) + createFirstConnectionUI(); + else createLmsUI(); } @@ -163,7 +161,7 @@ LmsApplication::createFirstConnectionUI() // Hack, use the auth widget builtin strings builtinLocalizedStrings().useBuiltin(skeletons::AuthStrings_xml1); -// root()->addWidget( new Settings::FirstConnectionFormView()); + root()->addWidget(new Settings::FirstConnectionView()); } void diff --git a/src/ui/common/DirectoryValidator.cpp b/src/ui/common/Validators.cpp similarity index 79% rename from src/ui/common/DirectoryValidator.cpp rename to src/ui/common/Validators.cpp index cf6c16fd..2d8b2170 100644 --- a/src/ui/common/DirectoryValidator.cpp +++ b/src/ui/common/Validators.cpp @@ -19,16 +19,31 @@ #include -#include "DirectoryValidator.hpp" +#include "Validators.hpp" namespace UserInterface { +Wt::WValidator* createNameValidator() +{ + Wt::WLengthValidator *v = new Wt::WLengthValidator(); + v->setMandatory(true); + v->setMinimumLength(::Database::User::MinNameLength); + v->setMaximumLength(::Database::User::MaxNameLength); + return v; +} + +Wt::WValidator* createMandatoryValidator() +{ + auto v = new Wt::WValidator(); + v->setMandatory(true); + return v; +} + DirectoryValidator::DirectoryValidator(Wt::WObject *parent) : Wt::WValidator(parent) { } - Wt::WValidator::Result DirectoryValidator::validate(const Wt::WString& input) const { diff --git a/src/ui/common/Validators.hpp b/src/ui/common/Validators.hpp index 76e1b3a5..45f5fd99 100644 --- a/src/ui/common/Validators.hpp +++ b/src/ui/common/Validators.hpp @@ -19,26 +19,23 @@ #pragma once -#include #include #include "database/User.hpp" namespace UserInterface { -static inline Wt::WValidator *createEmailValidator() -{ - Wt::WValidator *res = new Wt::WRegExpValidator("[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}"); - res->setMandatory(true); - return res; -} +Wt::WValidator* createNameValidator(); +Wt::WValidator* createMandatoryValidator(); -static inline Wt::WValidator *createNameValidator() { - Wt::WLengthValidator *v = new Wt::WLengthValidator(); - v->setMandatory(true); - v->setMinimumLength(3); - v->setMaximumLength(::Database::User::MaxNameLength); - return v; -} +class DirectoryValidator : public Wt::WValidator +{ + public: + DirectoryValidator(Wt::WObject *parent = 0); + + Wt::WValidator::Result validate(const Wt::WString& input) const override; + +}; } // namespace UserInterface + diff --git a/src/ui/settings/DatabaseView.cpp b/src/ui/settings/DatabaseView.cpp index 05dad344..2a8940d0 100644 --- a/src/ui/settings/DatabaseView.cpp +++ b/src/ui/settings/DatabaseView.cpp @@ -26,7 +26,7 @@ #include #include -#include "common/DirectoryValidator.hpp" +#include "common/Validators.hpp" #include "database/MediaDirectory.hpp" #include "scanner/MediaScanner.hpp" #include "utils/Logger.hpp" @@ -214,12 +214,6 @@ class DatabaseModel : public Wt::WFormModel } - Wt::WValidator *createMandatoryValidator() - { - Wt::WValidator* v = new Wt::WValidator(); - v->setMandatory(true); - return v; - } Wt::WStringListModel* _updatePeriodModel; Wt::WStringListModel* _updateStartTimeModel; diff --git a/src/ui/settings/DatabaseView.hpp b/src/ui/settings/DatabaseView.hpp index ad82178c..ab930efb 100644 --- a/src/ui/settings/DatabaseView.hpp +++ b/src/ui/settings/DatabaseView.hpp @@ -21,8 +21,6 @@ #include #include -#include -#include namespace UserInterface { namespace Settings { @@ -34,17 +32,12 @@ class DatabaseView : public Wt::WTemplateFormView public: DatabaseView(Wt::WContainerWidget *parent = 0); - Wt::Signal& changed() { return _sigChanged; } - private: - Wt::Signal _sigChanged; - void processSave(); void processDiscard(); void processImmediateScan(); - Wt::WText *_applyInfo; DatabaseModel *_model; }; diff --git a/src/ui/settings/FirstConnectionView.cpp b/src/ui/settings/FirstConnectionView.cpp new file mode 100644 index 00000000..5b1dac97 --- /dev/null +++ b/src/ui/settings/FirstConnectionView.cpp @@ -0,0 +1,164 @@ +/* + * 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 . + */ + +#include +#include +#include +#include + +#include "utils/Logger.hpp" + +#include "common/Validators.hpp" +#include "LmsApplication.hpp" + +#include "FirstConnectionView.hpp" + +namespace UserInterface { +namespace Settings { + +class FirstConnectionModel : public Wt::WFormModel +{ + public: + + // Associate each field with a unique string literal. + static const Field AdminLoginField; + static const Field PasswordField; + static const Field PasswordConfirmField; + + FirstConnectionModel(Wt::WObject *parent = 0) + : Wt::WFormModel(parent) + { + addField(AdminLoginField); + addField(PasswordField); + addField(PasswordConfirmField); + + setValidator(AdminLoginField, createNameValidator()); + setValidator(PasswordField, createMandatoryValidator()); + setValidator(PasswordConfirmField, createMandatoryValidator()); + } + + void saveData() + { + Wt::Dbo::Transaction transaction(DboSession()); + + // Check if a user already exist + // If it's the case, just do nothing + if (!Database::User::getAll(DboSession()).empty()) + throw std::runtime_error("Admin user already created"); + + // Create user + Wt::Auth::User authUser = DbHandler().getUserDatabase().registerNew(); + Database::User::pointer user = DbHandler().getUser(authUser); + + // Account + authUser.setIdentity(Wt::Auth::Identity::LoginName, valueText(AdminLoginField)); + Database::Handler::getPasswordService().updatePassword(authUser, valueText(PasswordField)); + + user.modify()->setAdmin( true ); + } + + bool validateField(Field field) + { + Wt::WString error; + + if (field == PasswordField) + { + // Password is mandatory if we create the user + if (!valueText(PasswordField).empty()) + { + // Evaluate the strength of the password + Wt::Auth::AbstractPasswordService::StrengthValidatorResult res + = Database::Handler::getPasswordService().strengthValidator()->evaluateStrength(valueText(PasswordField), + valueText(AdminLoginField), ""); + + if (!res.isValid()) + error = res.message(); + } + else + return Wt::WFormModel::validateField(field); + } + else if (field == PasswordConfirmField) + { + if (validation(PasswordField).state() == Wt::WValidator::Valid) + { + if (valueText(PasswordField) != valueText(PasswordConfirmField)) + error = Wt::WString::tr("Wt.Auth.passwords-dont-match"); + } + } + else + { + return Wt::WFormModel::validateField(field); + } + + setValidation(field, Wt::WValidator::Result( error.empty() ? Wt::WValidator::Valid : Wt::WValidator::Invalid, error)); + + return (validation(field).state() == Wt::WValidator::Valid); + } + +}; + +const Wt::WFormModel::Field FirstConnectionModel::AdminLoginField = "admin-login"; +const Wt::WFormModel::Field FirstConnectionModel::PasswordField = "password"; +const Wt::WFormModel::Field FirstConnectionModel::PasswordConfirmField = "password-confirm"; + +FirstConnectionView::FirstConnectionView(Wt::WContainerWidget *parent) +: Wt::WTemplateFormView(parent) +{ + auto model = new FirstConnectionModel(this); + + setTemplateText(Wt::WString::tr("template-settings-first-connection")); + addFunction("tr", &WTemplate::Functions::tr); + addFunction("id", &WTemplate::Functions::id); + + // AdminLogin + Wt::WLineEdit* accountEdit = new Wt::WLineEdit(); + setFormWidget(FirstConnectionModel::AdminLoginField, accountEdit); + + // Password + Wt::WLineEdit* passwordEdit = new Wt::WLineEdit(); + setFormWidget(FirstConnectionModel::PasswordField, passwordEdit ); + passwordEdit->setEchoMode(Wt::WLineEdit::Password); + + // Password confirmation + Wt::WLineEdit* passwordConfirmEdit = new Wt::WLineEdit(); + setFormWidget(FirstConnectionModel::PasswordConfirmField, passwordConfirmEdit); + passwordConfirmEdit->setEchoMode(Wt::WLineEdit::Password); + + auto saveButton = new Wt::WPushButton(Wt::WString::tr("msg-create")); + bindWidget("create-btn", saveButton); + saveButton->clicked().connect(std::bind([=] + { + updateModel(model); + + if (model->validate()) + { + model->saveData(); + notify(Wt::WString::tr("msg-settings-first-connection-done")); + saveButton->setEnabled(false); + } + + updateView(model); + })); + + updateView(model); +} + +} // namespace Settings +} // namespace UserInterface + diff --git a/src/ui/common/DirectoryValidator.hpp b/src/ui/settings/FirstConnectionView.hpp similarity index 72% rename from src/ui/common/DirectoryValidator.hpp rename to src/ui/settings/FirstConnectionView.hpp index 8ee161e2..2a9485e3 100644 --- a/src/ui/common/DirectoryValidator.hpp +++ b/src/ui/settings/FirstConnectionView.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -17,17 +17,23 @@ * along with LMS. If not, see . */ -#include +#pragma once + +#include +#include namespace UserInterface { +namespace Settings { -class DirectoryValidator : public Wt::WValidator +class FirstConnectionView : public Wt::WTemplateFormView { public: - DirectoryValidator(Wt::WObject *parent = 0); - - Wt::WValidator::Result validate(const Wt::WString& input) const; + FirstConnectionView(Wt::WContainerWidget *parent = 0); }; + +} // namespace Settings } // namespace UserInterface + + From 85a3e42dace06200095acc8f405a25f883cd8355 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 8 Mar 2018 23:18:27 +0100 Subject: [PATCH 070/195] Simplified implementation --- src/ui/settings/DatabaseView.cpp | 61 +++++++++++++++----------------- src/ui/settings/DatabaseView.hpp | 10 ------ 2 files changed, 28 insertions(+), 43 deletions(-) diff --git a/src/ui/settings/DatabaseView.cpp b/src/ui/settings/DatabaseView.cpp index 2a8940d0..4986348c 100644 --- a/src/ui/settings/DatabaseView.cpp +++ b/src/ui/settings/DatabaseView.cpp @@ -228,7 +228,7 @@ const Wt::WFormModel::Field DatabaseModel::UpdateStartTimeField = "update-start DatabaseView::DatabaseView(Wt::WContainerWidget *parent) : Wt::WTemplateFormView(parent) { - _model = new DatabaseModel(this); + auto model = new DatabaseModel(this); setTemplateText(tr("template-settings-database")); addFunction("tr", &WTemplate::Functions::tr); @@ -241,12 +241,12 @@ DatabaseView::DatabaseView(Wt::WContainerWidget *parent) // Update Period Wt::WComboBox *updatePeriodCB = new Wt::WComboBox(); setFormWidget(DatabaseModel::UpdatePeriodField, updatePeriodCB); - updatePeriodCB->setModel(_model->updatePeriodModel()); + updatePeriodCB->setModel(model->updatePeriodModel()); // Update Start Time Wt::WComboBox *updateStartTimeCB = new Wt::WComboBox(); setFormWidget(DatabaseModel::UpdateStartTimeField, updateStartTimeCB); - updateStartTimeCB->setModel(_model->updateStartTimeModel()); + updateStartTimeCB->setModel(model->updateStartTimeModel()); // Buttons @@ -259,8 +259,30 @@ DatabaseView::DatabaseView(Wt::WContainerWidget *parent) Wt::WPushButton *immScanBtn = new Wt::WPushButton(Wt::WString::tr("msg-btn-immediate-scan")); bindWidget("immediate-scan-btn", immScanBtn); - saveBtn->clicked().connect(this, &DatabaseView::processSave); - discardBtn->clicked().connect(this, &DatabaseView::processDiscard); + saveBtn->clicked().connect(std::bind([=] () + { + updateModel(model); + + if (model->validate()) + { + model->saveData(); + + MediaScanner().reschedule(); + + notify(Wt::WString::tr("msg-notify-settings-saved")); + } + + // Udate the view: Delete any validation message in the view, etc. + updateView(model); + })); + + discardBtn->clicked().connect(std::bind([=] () + { + model->loadData(); + model->validate(); + updateView(model); + })); + immScanBtn->clicked().connect(std::bind([=] () { MediaScanner().scheduleImmediateScan(); @@ -268,36 +290,9 @@ DatabaseView::DatabaseView(Wt::WContainerWidget *parent) notify(Wt::WString::tr("msg-notify-scan-launched")); })); - updateView(_model); + updateView(model); } -void -DatabaseView::processDiscard() -{ - _model->loadData(); - _model->validate(); - updateView(_model); -} - -void -DatabaseView::processSave() -{ - updateModel(_model); - - if (_model->validate()) - { - _model->saveData(); - - MediaScanner().reschedule(); - - notify(Wt::WString::tr("msg-notify-settings-saved")); - } - - // Udate the view: Delete any validation message in the view, etc. - updateView(_model); -} - - } // namespace Settings } // namespace UserInterface diff --git a/src/ui/settings/DatabaseView.hpp b/src/ui/settings/DatabaseView.hpp index ab930efb..a985a69c 100644 --- a/src/ui/settings/DatabaseView.hpp +++ b/src/ui/settings/DatabaseView.hpp @@ -25,20 +25,10 @@ namespace UserInterface { namespace Settings { -class DatabaseModel; - class DatabaseView : public Wt::WTemplateFormView { public: DatabaseView(Wt::WContainerWidget *parent = 0); - - private: - - void processSave(); - void processDiscard(); - void processImmediateScan(); - - DatabaseModel *_model; }; From f91aacb0a356b001417fb4c735313fe8a043304a Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 13 Mar 2018 09:43:16 +0100 Subject: [PATCH 071/195] Added a login view --- Makefile.am | 1 + approot/login.xml | 56 ++++++++++++++ approot/messages.xml | 4 + src/Makefile.am | 2 +- src/database/DatabaseHandler.cpp | 7 +- src/ui/LmsApplication.cpp | 79 +++++++++---------- src/ui/LmsApplication.hpp | 5 +- src/ui/LoginView.cpp | 89 ++++++++++++++++++++++ src/ui/{auth/LmsAuth.hpp => LoginView.hpp} | 26 ++----- src/ui/auth/LmsAuth.cpp | 49 ------------ 10 files changed, 203 insertions(+), 115 deletions(-) create mode 100644 approot/login.xml create mode 100644 src/ui/LoginView.cpp rename src/ui/{auth/LmsAuth.hpp => LoginView.hpp} (69%) delete mode 100644 src/ui/auth/LmsAuth.cpp diff --git a/Makefile.am b/Makefile.am index ddd7cc97..3c24abc5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ lms_images_DATA = \ lms_approot_DATA = \ approot/artists.xml \ approot/artist.xml \ + approot/login.xml \ approot/mediaplayer.xml \ approot/messages.xml \ approot/playqueue.xml \ diff --git a/approot/login.xml b/approot/login.xml new file mode 100644 index 00000000..e031a36b --- /dev/null +++ b/approot/login.xml @@ -0,0 +1,56 @@ + + + + + +
+
+

${tr:msg-login-welcome}

+
+
+
+ +
+ ${user-name} +
+
+ ${user-name-info} +
+
+ +
+ +
+ ${password} +
+
+ ${password-info} +
+
+ +
+ +
+ ${remember-me} +
+
+ ${remember-me-info} +
+
+
+
+ ${login-btn class="btn-primary"} +
+
+
+
+ + + + diff --git a/approot/messages.xml b/approot/messages.xml index ff60b3c9..74ab5522 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -26,6 +26,10 @@ Verify password Create +Remember me +Welcome! +Logout + Administrator account Account created. Please refresh to continue! diff --git a/src/Makefile.am b/src/Makefile.am index 8aa3f025..6e998f5b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,12 +27,12 @@ lms_SOURCES = \ $(srcdir)/ui/Filters.cpp \ $(srcdir)/ui/HomeView.cpp \ $(srcdir)/ui/LmsApplication.cpp \ + $(srcdir)/ui/LoginView.cpp \ $(srcdir)/ui/MediaPlayer.cpp \ $(srcdir)/ui/PlayQueueView.cpp \ $(srcdir)/ui/ReleasesView.cpp \ $(srcdir)/ui/ReleaseView.cpp \ $(srcdir)/ui/TracksView.cpp \ - $(srcdir)/ui/auth/LmsAuth.cpp \ $(srcdir)/ui/common/Validators.cpp \ $(srcdir)/ui/common/InputRange.cpp \ $(srcdir)/ui/common/LineEdit.cpp \ diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index 7334dbde..862d6034 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -48,7 +49,11 @@ namespace { void Handler::configureAuth(void) { - authService.setEmailVerificationEnabled(true); + authService.setEmailVerificationEnabled(false); + authService.setAuthTokensEnabled(true, "lmsauth"); + authService.setIdentityPolicy(Wt::Auth::LoginNameIdentity); + authService.setRandomTokenLength(32); + authService.setTokenHashFunction(new Wt::Auth::BCryptHashFunction(8)); Wt::Auth::PasswordVerifier *verifier = new Wt::Auth::PasswordVerifier(); verifier->addHashFunction(new Wt::Auth::BCryptHashFunction(8)); diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 84dc0c46..dcb6f86e 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -24,12 +24,13 @@ #include #include #include +#include #include "config/config.h" #include "utils/Logger.hpp" #include "utils/Utils.hpp" -#include "auth/LmsAuth.hpp" +#include "LoginView.hpp" #include "Explore.hpp" #include "HomeView.hpp" #include "MediaPlayer.hpp" @@ -86,6 +87,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti // Add a resource bundle messageResourceBundle().use(appRoot() + "artist"); messageResourceBundle().use(appRoot() + "artists"); + messageResourceBundle().use(appRoot() + "login"); messageResourceBundle().use(appRoot() + "mediaplayer"); messageResourceBundle().use(appRoot() + "messages"); messageResourceBundle().use(appRoot() + "playqueue"); @@ -109,9 +111,19 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti LMS_LOG(UI, DEBUG) << "Creating root widget. First connection = " << std::boolalpha << firstConnection; if (firstConnection) - createFirstConnectionUI(); + { + // Hack, use the auth widget builtin strings + builtinLocalizedStrings().useBuiltin(skeletons::AuthStrings_xml1); + + root()->addWidget(new Settings::FirstConnectionView()); + } else - createLmsUI(); + { + DbHandler().getLogin().changed().connect(this, &LmsApplication::handleAuthEvent); + + auto auth = new LoginView(DbHandler().getLogin()); + root()->addWidget(auth); + } } Database::Handler& DbHandler() @@ -130,8 +142,7 @@ const Wt::Auth::User& CurrentAuthUser() Database::User::pointer CurrentUser() { - return Database::User::getById(DboSession(), 1); -// return DbHandler().getCurrentUser(); + return DbHandler().getCurrentUser(); } ImageResource* SessionImageResource() @@ -156,36 +167,12 @@ LmsApplication::goHome() } void -LmsApplication::createFirstConnectionUI() +LmsApplication::quit() { - // Hack, use the auth widget builtin strings - builtinLocalizedStrings().useBuiltin(skeletons::AuthStrings_xml1); - - root()->addWidget(new Settings::FirstConnectionView()); + WApplication::quit(""); + redirect("/"); } -void -LmsApplication::createLmsUI() -{ - _imageResource = new ImageResource(_db, root()); - _transcodeResource = new TranscodeResource(_db, root()); - - handleAuthEvent(); - /* - DbHandler().getLogin().changed().connect(this, &LmsApplication::handleAuthEvent); - - LmsAuth *authWidget = new LmsAuth(); - - authWidget->model()->addPasswordAuth(&Database::Handler::getPasswordService()); - authWidget->setRegistrationEnabled(false); - - authWidget->processEnvironment(); - - root()->addWidget(authWidget); - */ -} - - enum IdxRoot { IdxHome = 0, @@ -194,8 +181,6 @@ enum IdxRoot IdxSettingsDatabase, }; - - static void handlePathChange(Wt::WStackedWidget* stack) { @@ -228,19 +213,19 @@ handlePathChange(Wt::WStackedWidget* stack) void LmsApplication::handleAuthEvent(void) { - /* if (!DbHandler().getLogin().loggedIn()) { LMS_LOG(UI, INFO) << "User logged out, session = " << Wt::WApplication::instance()->sessionId(); - quit(""); - redirect("/"); - + quit(); return; } LMS_LOG(UI, INFO) << "User '" << CurrentAuthUser().identity(Wt::Auth::Identity::LoginName) << "' logged in from '" << Wt::WApplication::instance()->environment().clientAddress() << "', user agent = " << Wt::WApplication::instance()->environment().agent() << ", session = " << Wt::WApplication::instance()->sessionId(); -*/ + + _imageResource = new ImageResource(_db, root()); + _transcodeResource = new TranscodeResource(_db, root()); + setConfirmCloseMessage(Wt::WString::tr("msg-quit-confirm")); auto main = new Wt::WTemplate(Wt::WString::tr("template-main"), root()); @@ -273,8 +258,11 @@ LmsApplication::handleAuthEvent(void) menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/playqueue")); menuItem->setSelectable(false); } + navbar->addMenu(menu); + + auto rightMenu = new Wt::WMenu(); { - auto menuItem = menu->insertItem(4, Wt::WString::tr("msg-settings")); + auto menuItem = rightMenu->insertItem(0, Wt::WString::tr("msg-settings")); menuItem->setSelectable(false); Wt::WPopupMenu *settings = new Wt::WPopupMenu(); @@ -285,7 +273,16 @@ LmsApplication::handleAuthEvent(void) menuItem->setMenu(settings); } - navbar->addMenu(menu); + { + auto menuItem = rightMenu->insertItem(1, Wt::WString::tr("msg-logout")); + menuItem->setSelectable(true); + menuItem->triggered().connect(std::bind([=] + { + setConfirmCloseMessage(""); + DbHandler().getLogin().logout(); + })); + } + navbar->addMenu(rightMenu, Wt::AlignRight); // Contents Wt::WStackedWidget* mainStack = new Wt::WStackedWidget(); diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index f3e4dd2b..74006fee 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -20,9 +20,7 @@ #ifndef LMS_APPLICATION_HPP #define LMS_APPLICATION_HPP -#include #include - #include #include "database/DatabaseHandler.hpp" @@ -48,6 +46,7 @@ class LmsApplication : public Wt::WApplication // Utils void goHome(); + void quit(); void notify(const Wt::WString& message); private: @@ -55,8 +54,6 @@ class LmsApplication : public Wt::WApplication LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner); void handleAuthEvent(void); - void createFirstConnectionUI(); - void createLmsUI(); Database::Handler _db; Scanner::MediaScanner& _scanner; diff --git a/src/ui/LoginView.cpp b/src/ui/LoginView.cpp new file mode 100644 index 00000000..f37fde26 --- /dev/null +++ b/src/ui/LoginView.cpp @@ -0,0 +1,89 @@ +/* + * 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 . + */ + +#include +#include +#include +#include +#include + +#include "utils/Logger.hpp" + +#include "common/Validators.hpp" +#include "LmsApplication.hpp" + +#include "LoginView.hpp" + +namespace UserInterface { + +LoginView::LoginView(Wt::Auth::Login& login, Wt::WContainerWidget *parent) +: Wt::WTemplateFormView(parent) +{ + auto model = new Wt::Auth::AuthModel(DbHandler().getAuthService(), DbHandler().getUserDatabase()); + + model->addPasswordAuth(&Database::Handler::getPasswordService()); + + setTemplateText(Wt::WString::tr("template-login")); + addFunction("tr", &WTemplate::Functions::tr); + addFunction("id", &WTemplate::Functions::id); + + // LoginName + auto loginName = new Wt::WLineEdit(); + setFormWidget(Wt::Auth::AuthModel::LoginNameField, loginName); + + // Password + auto password = new Wt::WLineEdit(); + setFormWidget(Wt::Auth::AuthModel::PasswordField, password); + password->setEchoMode(Wt::WLineEdit::Password); + + // Remember Me + auto rememberMe = new Wt::WCheckBox(); + setFormWidget(Wt::Auth::AuthModel::RememberMeField, rememberMe); + + auto loginBtn = new Wt::WPushButton(Wt::WString::tr("msg-login")); + bindWidget("login-btn", loginBtn); + loginBtn->clicked().connect(std::bind([=, &login] + { + updateModel(model); + + if (model->validate()) + model->login(login); + else + updateView(model); + })); + + password->enterPressed().connect(std::bind([=] + { + loginBtn->clicked().emit(Wt::WMouseEvent()); + })); + + login.changed().connect(std::bind([=, &login] + { + if (login.loggedIn()) + this->setHidden(true); + })); + + Wt::Auth::User user = model->processAuthToken(); + model->loginUser(login, user, Wt::Auth::WeakLogin); + + updateView(model); +} + +} // namespace UserInterface + diff --git a/src/ui/auth/LmsAuth.hpp b/src/ui/LoginView.hpp similarity index 69% rename from src/ui/auth/LmsAuth.hpp rename to src/ui/LoginView.hpp index bcf8fc7f..7a7bbea2 100644 --- a/src/ui/auth/LmsAuth.hpp +++ b/src/ui/LoginView.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -17,33 +17,21 @@ * along with LMS. If not, see . */ -#ifndef UI_AUTH_HPP -#define UI_AUTH_HPP +#pragma once -#include -#include -#include -#include #include +#include +#include namespace UserInterface { -class LmsAuth : public Wt::Auth::AuthWidget +class LoginView : public Wt::WTemplateFormView { public: - - LmsAuth(); - - // LoggedInView is delegated to LmsHome - void createLoggedInView () ; - void createLoginView (); - - private: - - + LoginView(Wt::Auth::Login& login, Wt::WContainerWidget *parent = 0); }; + } // namespace UserInterface -#endif diff --git a/src/ui/auth/LmsAuth.cpp b/src/ui/auth/LmsAuth.cpp deleted file mode 100644 index eb3a8559..00000000 --- a/src/ui/auth/LmsAuth.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include "LmsAuth.hpp" - -#include "LmsApplication.hpp" - -namespace UserInterface { - -LmsAuth::LmsAuth() -: Wt::Auth::AuthWidget(DbHandler().getAuthService(), - DbHandler().getUserDatabase(), - DbHandler().getLogin()) -{ - // Root div has to be a container - this->setStyleClass("container"); -} - - -void -LmsAuth::createLoggedInView() -{ - hide(); -} - -void -LmsAuth::createLoginView() -{ - show(); - Wt::Auth::AuthWidget::createLoginView(); -} - -} // namespace UserInterface From ba1968b02c8396f353509eb3e2f526a916e02b3a Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 13 Mar 2018 11:24:20 +0100 Subject: [PATCH 072/195] Now deleting auth cookie when logging out --- src/Makefile.am | 2 +- src/ui/{LoginView.cpp => Auth.cpp} | 35 +++++++++++++++++------------- src/ui/{LoginView.hpp => Auth.hpp} | 10 +++++++-- src/ui/LmsApplication.cpp | 8 +++---- src/ui/LmsApplication.hpp | 2 ++ 5 files changed, 35 insertions(+), 22 deletions(-) rename src/ui/{LoginView.cpp => Auth.cpp} (72%) rename src/ui/{LoginView.hpp => Auth.hpp} (83%) diff --git a/src/Makefile.am b/src/Makefile.am index 6e998f5b..70143ff1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,7 @@ lms_SOURCES = \ $(srcdir)/ui/Filters.cpp \ $(srcdir)/ui/HomeView.cpp \ $(srcdir)/ui/LmsApplication.cpp \ - $(srcdir)/ui/LoginView.cpp \ + $(srcdir)/ui/Auth.cpp \ $(srcdir)/ui/MediaPlayer.cpp \ $(srcdir)/ui/PlayQueueView.cpp \ $(srcdir)/ui/ReleasesView.cpp \ diff --git a/src/ui/LoginView.cpp b/src/ui/Auth.cpp similarity index 72% rename from src/ui/LoginView.cpp rename to src/ui/Auth.cpp index f37fde26..70bd63c9 100644 --- a/src/ui/LoginView.cpp +++ b/src/ui/Auth.cpp @@ -21,23 +21,22 @@ #include #include #include -#include #include "utils/Logger.hpp" #include "common/Validators.hpp" #include "LmsApplication.hpp" -#include "LoginView.hpp" +#include "Auth.hpp" namespace UserInterface { -LoginView::LoginView(Wt::Auth::Login& login, Wt::WContainerWidget *parent) +Auth::Auth(Wt::WContainerWidget *parent) : Wt::WTemplateFormView(parent) { - auto model = new Wt::Auth::AuthModel(DbHandler().getAuthService(), DbHandler().getUserDatabase()); + _model = new Wt::Auth::AuthModel(DbHandler().getAuthService(), DbHandler().getUserDatabase()); - model->addPasswordAuth(&Database::Handler::getPasswordService()); + _model->addPasswordAuth(&Database::Handler::getPasswordService()); setTemplateText(Wt::WString::tr("template-login")); addFunction("tr", &WTemplate::Functions::tr); @@ -58,14 +57,14 @@ LoginView::LoginView(Wt::Auth::Login& login, Wt::WContainerWidget *parent) auto loginBtn = new Wt::WPushButton(Wt::WString::tr("msg-login")); bindWidget("login-btn", loginBtn); - loginBtn->clicked().connect(std::bind([=, &login] + loginBtn->clicked().connect(std::bind([=] { - updateModel(model); + updateModel(_model); - if (model->validate()) - model->login(login); + if (_model->validate()) + _model->login(DbHandler().getLogin()); else - updateView(model); + updateView(_model); })); password->enterPressed().connect(std::bind([=] @@ -73,16 +72,22 @@ LoginView::LoginView(Wt::Auth::Login& login, Wt::WContainerWidget *parent) loginBtn->clicked().emit(Wt::WMouseEvent()); })); - login.changed().connect(std::bind([=, &login] + DbHandler().getLogin().changed().connect(std::bind([=] { - if (login.loggedIn()) + if (DbHandler().getLogin().loggedIn()) this->setHidden(true); })); - Wt::Auth::User user = model->processAuthToken(); - model->loginUser(login, user, Wt::Auth::WeakLogin); + Wt::Auth::User user = _model->processAuthToken(); + _model->loginUser(DbHandler().getLogin(), user, Wt::Auth::WeakLogin); - updateView(model); + updateView(_model); +} + +void +Auth::logout() +{ + _model->logout(DbHandler().getLogin()); } } // namespace UserInterface diff --git a/src/ui/LoginView.hpp b/src/ui/Auth.hpp similarity index 83% rename from src/ui/LoginView.hpp rename to src/ui/Auth.hpp index 7a7bbea2..37e09eff 100644 --- a/src/ui/LoginView.hpp +++ b/src/ui/Auth.hpp @@ -22,13 +22,19 @@ #include #include #include +#include namespace UserInterface { -class LoginView : public Wt::WTemplateFormView +class Auth : public Wt::WTemplateFormView { public: - LoginView(Wt::Auth::Login& login, Wt::WContainerWidget *parent = 0); + Auth(Wt::WContainerWidget *parent = 0); + + void logout(); + + private: + Wt::Auth::AuthModel* _model; }; diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index dcb6f86e..75451c6c 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -30,7 +30,7 @@ #include "utils/Logger.hpp" #include "utils/Utils.hpp" -#include "LoginView.hpp" +#include "Auth.hpp" #include "Explore.hpp" #include "HomeView.hpp" #include "MediaPlayer.hpp" @@ -121,8 +121,8 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti { DbHandler().getLogin().changed().connect(this, &LmsApplication::handleAuthEvent); - auto auth = new LoginView(DbHandler().getLogin()); - root()->addWidget(auth); + _auth = new Auth(); + root()->addWidget(_auth); } } @@ -279,7 +279,7 @@ LmsApplication::handleAuthEvent(void) menuItem->triggered().connect(std::bind([=] { setConfirmCloseMessage(""); - DbHandler().getLogin().logout(); + _auth->logout(); })); } navbar->addMenu(rightMenu, Wt::AlignRight); diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index 74006fee..f812cad4 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -28,6 +28,7 @@ #include "resource/ImageResource.hpp" #include "resource/TranscodeResource.hpp" +#include "Auth.hpp" namespace UserInterface { @@ -56,6 +57,7 @@ class LmsApplication : public Wt::WApplication void handleAuthEvent(void); Database::Handler _db; + Auth* _auth; Scanner::MediaScanner& _scanner; ImageResource* _imageResource; TranscodeResource* _transcodeResource; From acf769c129d99976716e94a13b4236858dbe060a Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 13 Mar 2018 16:52:08 +0100 Subject: [PATCH 073/195] Minor cleanup to acces Application elements --- src/ui/ArtistView.cpp | 6 +++--- src/ui/ArtistsView.cpp | 2 +- src/ui/LmsApplication.cpp | 27 +++++++++++++++---------- src/ui/LmsApplication.hpp | 11 +++------- src/ui/ReleaseView.cpp | 6 +++--- src/ui/ReleasesView.cpp | 8 ++++---- src/ui/TracksView.cpp | 6 +++--- src/ui/settings/DatabaseView.cpp | 10 ++++----- src/ui/settings/FirstConnectionView.cpp | 2 +- 9 files changed, 38 insertions(+), 40 deletions(-) diff --git a/src/ui/ArtistView.cpp b/src/ui/ArtistView.cpp index eefc62a6..1a524ba0 100644 --- a/src/ui/ArtistView.cpp +++ b/src/ui/ArtistView.cpp @@ -121,16 +121,16 @@ Artist::refresh() entry->addFunction("tr", Wt::WTemplate::Functions::tr); { - Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(releaseId))); + Wt::WAnchor* coverAnchor = LmsApplication::createReleaseAnchor(releaseId); Wt::WImage* cover = new Wt::WImage(coverAnchor); - cover->setImageLink(SessionImageResource()->getReleaseUrl(release.id(), 128)); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); // Some images may not be square cover->setWidth(128); entry->bindWidget("cover", coverAnchor); } { - Wt::WAnchor* releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(releaseId))); + Wt::WAnchor* releaseAnchor = LmsApplication::createReleaseAnchor(releaseId); Wt::WText* releaseName = new Wt::WText(releaseAnchor); releaseName->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); entry->bindWidget("name", releaseAnchor); diff --git a/src/ui/ArtistsView.cpp b/src/ui/ArtistsView.cpp index f801fa05..b5d1addb 100644 --- a/src/ui/ArtistsView.cpp +++ b/src/ui/ArtistsView.cpp @@ -93,7 +93,7 @@ Artists::addSome() entry->bindInt("nb-release", artist->getReleases(clusterIds).size()); { - Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(artist.id()))); + Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(artist.id()); Wt::WText *artistText = new Wt::WText(artistAnchor); artistText->setText(Wt::WString::fromUTF8(artist->getName(), Wt::PlainText)); entry->bindWidget("name", artistAnchor); diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 75451c6c..0db39c96 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -17,12 +17,13 @@ * along with LMS. If not, see . */ -#include +#include #include -#include -#include +#include #include +#include #include +#include #include #include @@ -30,7 +31,6 @@ #include "utils/Logger.hpp" #include "utils/Utils.hpp" -#include "Auth.hpp" #include "Explore.hpp" #include "HomeView.hpp" #include "MediaPlayer.hpp" @@ -41,10 +41,6 @@ #include "LmsApplication.hpp" -namespace skeletons { - extern const char *AuthStrings_xml1; -} - namespace UserInterface { Wt::WApplication* @@ -112,9 +108,6 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti if (firstConnection) { - // Hack, use the auth widget builtin strings - builtinLocalizedStrings().useBuiltin(skeletons::AuthStrings_xml1); - root()->addWidget(new Settings::FirstConnectionView()); } else @@ -160,6 +153,18 @@ Scanner::MediaScanner& MediaScanner() return LmsApplication::instance()->getMediaScanner(); } +Wt::WAnchor* +LmsApplication::createArtistAnchor(Database::id_type id) +{ + return new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(id))); +} + +Wt::WAnchor* +LmsApplication::createReleaseAnchor(Database::id_type id) +{ + return new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(id))); +} + void LmsApplication::goHome() { diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index f812cad4..59f0875a 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -50,6 +50,9 @@ class LmsApplication : public Wt::WApplication void quit(); void notify(const Wt::WString& message); + static Wt::WAnchor* createArtistAnchor(Database::id_type id); + static Wt::WAnchor* createReleaseAnchor(Database::id_type id); + private: LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner); @@ -72,14 +75,6 @@ Wt::Dbo::Session& DboSession(); const Wt::Auth::User& CurrentAuthUser(); Database::User::pointer CurrentUser(); -ImageResource *SessionImageResource(); -TranscodeResource *SessionTranscodeResource(); - -Scanner::MediaScanner& MediaScanner(); - -void notify(const Wt::WString& message); - - } // namespace UserInterface #endif diff --git a/src/ui/ReleaseView.cpp b/src/ui/ReleaseView.cpp index 8493da75..123b7eea 100644 --- a/src/ui/ReleaseView.cpp +++ b/src/ui/ReleaseView.cpp @@ -99,7 +99,7 @@ Release::refresh() } else { - Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(artists.front().id()))); + Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(artists.front().id()); Wt::WText *artist = new Wt::WText(artistAnchor); artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText)); t->bindWidget("artist-name", artistAnchor); @@ -107,7 +107,7 @@ Release::refresh() } Wt::WImage *cover = new Wt::WImage(); - cover->setImageLink(Wt::WLink (SessionImageResource()->getReleaseUrl(release.id(), 512))); + cover->setImageLink(Wt::WLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 512))); t->bindWidget("cover", cover); auto clusterContainers = new Wt::WContainerWidget(); @@ -161,7 +161,7 @@ Release::refresh() if (variousArtists && track->getArtist()) { entry->setCondition("if-has-artist", true); - Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(track->getArtist().id()))); + Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(track->getArtist().id()); Wt::WText *artistText = new Wt::WText(artistAnchor); artistText->setText(Wt::WString::fromUTF8(track->getArtist()->getName(), Wt::PlainText)); entry->bindWidget("artist-name", artistAnchor); diff --git a/src/ui/ReleasesView.cpp b/src/ui/ReleasesView.cpp index f8b9df0e..1cb5a00a 100644 --- a/src/ui/ReleasesView.cpp +++ b/src/ui/ReleasesView.cpp @@ -91,15 +91,15 @@ Releases::addSome() Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-releases-entry"), _releasesContainer); entry->addFunction("tr", Wt::WTemplate::Functions::tr); - Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(releaseId))); + Wt::WAnchor* coverAnchor = LmsApplication::createReleaseAnchor(releaseId); Wt::WImage* cover = new Wt::WImage(coverAnchor); - cover->setImageLink(SessionImageResource()->getReleaseUrl(releaseId, 128)); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(releaseId, 128)); // Some images may not be square cover->setWidth(128); entry->bindWidget("cover", coverAnchor); { - Wt::WAnchor* releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(releaseId))); + Wt::WAnchor* releaseAnchor = LmsApplication::createReleaseAnchor(releaseId); Wt::WText* releaseName = new Wt::WText(releaseAnchor); releaseName->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); entry->bindWidget("release-name", releaseAnchor); @@ -113,7 +113,7 @@ Releases::addSome() } else { - Wt::WAnchor* artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(artists.front().id()))); + Wt::WAnchor* artistAnchor = LmsApplication::createArtistAnchor(artists.front().id()); Wt::WText* artist = new Wt::WText(artistAnchor); artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText)); entry->bindWidget("artist-name", artistAnchor); diff --git a/src/ui/TracksView.cpp b/src/ui/TracksView.cpp index db82be6a..81341975 100644 --- a/src/ui/TracksView.cpp +++ b/src/ui/TracksView.cpp @@ -124,7 +124,7 @@ Tracks::addSome() if (artist) { entry->setCondition("if-has-artist", true); - Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(track->getArtist().id()))); + Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(track->getArtist().id()); Wt::WText *artistText = new Wt::WText(artistAnchor); artistText->setText(Wt::WString::fromUTF8(artist->getName(), Wt::PlainText)); entry->bindWidget("artist-name", artistAnchor); @@ -134,14 +134,14 @@ Tracks::addSome() if (release) { entry->setCondition("if-has-release", true); - Wt::WAnchor *releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(track->getRelease().id()))); + Wt::WAnchor *releaseAnchor = LmsApplication::createReleaseAnchor(track->getRelease().id()); Wt::WText *releaseText = new Wt::WText(releaseAnchor); releaseText->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); entry->bindWidget("release-name", releaseAnchor); } Wt::WImage *cover = new Wt::WImage(); - cover->setImageLink(SessionImageResource()->getTrackUrl(track.id(), 64)); + cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(track.id(), 64)); // Some images may not be square cover->setWidth(64); entry->bindWidget("cover", cover); diff --git a/src/ui/settings/DatabaseView.cpp b/src/ui/settings/DatabaseView.cpp index 4986348c..1ee1ac28 100644 --- a/src/ui/settings/DatabaseView.cpp +++ b/src/ui/settings/DatabaseView.cpp @@ -267,9 +267,8 @@ DatabaseView::DatabaseView(Wt::WContainerWidget *parent) { model->saveData(); - MediaScanner().reschedule(); - - notify(Wt::WString::tr("msg-notify-settings-saved")); + LmsApp->getMediaScanner().reschedule(); + LmsApp->notify(Wt::WString::tr("msg-notify-settings-saved")); } // Udate the view: Delete any validation message in the view, etc. @@ -285,9 +284,8 @@ DatabaseView::DatabaseView(Wt::WContainerWidget *parent) immScanBtn->clicked().connect(std::bind([=] () { - MediaScanner().scheduleImmediateScan(); - - notify(Wt::WString::tr("msg-notify-scan-launched")); + LmsApp->getMediaScanner().scheduleImmediateScan(); + LmsApp->notify(Wt::WString::tr("msg-notify-scan-launched")); })); updateView(model); diff --git a/src/ui/settings/FirstConnectionView.cpp b/src/ui/settings/FirstConnectionView.cpp index 5b1dac97..5ac4dfc9 100644 --- a/src/ui/settings/FirstConnectionView.cpp +++ b/src/ui/settings/FirstConnectionView.cpp @@ -149,7 +149,7 @@ FirstConnectionView::FirstConnectionView(Wt::WContainerWidget *parent) if (model->validate()) { model->saveData(); - notify(Wt::WString::tr("msg-settings-first-connection-done")); + LmsApp->notify(Wt::WString::tr("msg-settings-first-connection-done")); saveButton->setEnabled(false); } From 98f64e62f98633d77a3d9b76ad28ef7214762393 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 13 Mar 2018 17:18:57 +0100 Subject: [PATCH 074/195] Removed overkill settings namespace --- Makefile.am | 2 +- ...nnection.xml => settings-admin-wizard.xml} | 2 +- src/Makefile.am | 4 +-- src/ui/LmsApplication.cpp | 10 +++---- ...ConnectionView.cpp => AdminWizardView.cpp} | 26 +++++++++---------- .../{DatabaseView.hpp => AdminWizardView.hpp} | 9 +++---- ...abaseView.cpp => DatabaseSettingsView.cpp} | 24 ++++++++--------- ...ctionView.hpp => DatabaseSettingsView.hpp} | 8 ++---- 8 files changed, 38 insertions(+), 47 deletions(-) rename approot/{settings-first-connection.xml => settings-admin-wizard.xml} (96%) rename src/ui/settings/{FirstConnectionView.cpp => AdminWizardView.cpp} (82%) rename src/ui/settings/{DatabaseView.hpp => AdminWizardView.hpp} (85%) rename src/ui/settings/{DatabaseView.cpp => DatabaseSettingsView.cpp} (91%) rename src/ui/settings/{FirstConnectionView.hpp => DatabaseSettingsView.hpp} (84%) diff --git a/Makefile.am b/Makefile.am index 3c24abc5..deedb672 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,7 @@ lms_approot_DATA = \ approot/releases.xml \ approot/release.xml \ approot/settings-database.xml \ - approot/settings-first-connection.xml \ + approot/settings-admin-wizard.xml \ approot/templates.xml \ approot/tracks.xml diff --git a/approot/settings-first-connection.xml b/approot/settings-admin-wizard.xml similarity index 96% rename from approot/settings-first-connection.xml rename to approot/settings-admin-wizard.xml index c4fda6db..4618b6c8 100644 --- a/approot/settings-first-connection.xml +++ b/approot/settings-admin-wizard.xml @@ -3,7 +3,7 @@ - +

${tr:msg-settings-admin-account}

diff --git a/src/Makefile.am b/src/Makefile.am index 70143ff1..9adb8fc1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,8 +39,8 @@ lms_SOURCES = \ $(srcdir)/ui/resource/AvConvTranscodeStreamResource.cpp \ $(srcdir)/ui/resource/ImageResource.cpp \ $(srcdir)/ui/resource/TranscodeResource.cpp \ - $(srcdir)/ui/settings/DatabaseView.cpp \ - $(srcdir)/ui/settings/FirstConnectionView.cpp \ + $(srcdir)/ui/settings/DatabaseSettingsView.cpp \ + $(srcdir)/ui/settings/AdminWizardView.cpp \ $(srcdir)/utils/Config.cpp \ $(srcdir)/utils/Logger.cpp \ $(srcdir)/utils/Path.cpp \ diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 0db39c96..a64f6d64 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -36,8 +36,8 @@ #include "MediaPlayer.hpp" #include "PlayQueueView.hpp" -#include "settings/DatabaseView.hpp" -#include "settings/FirstConnectionView.hpp" +#include "settings/DatabaseSettingsView.hpp" +#include "settings/AdminWizardView.hpp" #include "LmsApplication.hpp" @@ -90,7 +90,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti messageResourceBundle().use(appRoot() + "release"); messageResourceBundle().use(appRoot() + "releases"); messageResourceBundle().use(appRoot() + "settings-database"); - messageResourceBundle().use(appRoot() + "settings-first-connection"); + messageResourceBundle().use(appRoot() + "settings-admin-wizard"); messageResourceBundle().use(appRoot() + "tracks"); messageResourceBundle().use(appRoot() + "templates"); @@ -108,7 +108,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti if (firstConnection) { - root()->addWidget(new Settings::FirstConnectionView()); + root()->addWidget(new AdminWizardView()); } else { @@ -301,7 +301,7 @@ LmsApplication::handleAuthEvent(void) auto playqueue = new PlayQueue(); mainStack->addWidget(playqueue); - auto databaseSettings = new Settings::DatabaseView(); + auto databaseSettings = new DatabaseSettingsView(); mainStack->addWidget(databaseSettings); explore->tracksAdd.connect(std::bind([=] (std::vector tracks) diff --git a/src/ui/settings/FirstConnectionView.cpp b/src/ui/settings/AdminWizardView.cpp similarity index 82% rename from src/ui/settings/FirstConnectionView.cpp rename to src/ui/settings/AdminWizardView.cpp index 5ac4dfc9..aa78b04f 100644 --- a/src/ui/settings/FirstConnectionView.cpp +++ b/src/ui/settings/AdminWizardView.cpp @@ -27,12 +27,11 @@ #include "common/Validators.hpp" #include "LmsApplication.hpp" -#include "FirstConnectionView.hpp" +#include "AdminWizardView.hpp" namespace UserInterface { -namespace Settings { -class FirstConnectionModel : public Wt::WFormModel +class AdminWizardModel : public Wt::WFormModel { public: @@ -41,7 +40,7 @@ class FirstConnectionModel : public Wt::WFormModel static const Field PasswordField; static const Field PasswordConfirmField; - FirstConnectionModel(Wt::WObject *parent = 0) + AdminWizardModel(Wt::WObject *parent = 0) : Wt::WFormModel(parent) { addField(AdminLoginField); @@ -113,31 +112,31 @@ class FirstConnectionModel : public Wt::WFormModel }; -const Wt::WFormModel::Field FirstConnectionModel::AdminLoginField = "admin-login"; -const Wt::WFormModel::Field FirstConnectionModel::PasswordField = "password"; -const Wt::WFormModel::Field FirstConnectionModel::PasswordConfirmField = "password-confirm"; +const Wt::WFormModel::Field AdminWizardModel::AdminLoginField = "admin-login"; +const Wt::WFormModel::Field AdminWizardModel::PasswordField = "password"; +const Wt::WFormModel::Field AdminWizardModel::PasswordConfirmField = "password-confirm"; -FirstConnectionView::FirstConnectionView(Wt::WContainerWidget *parent) +AdminWizardView::AdminWizardView(Wt::WContainerWidget *parent) : Wt::WTemplateFormView(parent) { - auto model = new FirstConnectionModel(this); + auto model = new AdminWizardModel(this); - setTemplateText(Wt::WString::tr("template-settings-first-connection")); + setTemplateText(Wt::WString::tr("template-settings-admin-wizard")); addFunction("tr", &WTemplate::Functions::tr); addFunction("id", &WTemplate::Functions::id); // AdminLogin Wt::WLineEdit* accountEdit = new Wt::WLineEdit(); - setFormWidget(FirstConnectionModel::AdminLoginField, accountEdit); + setFormWidget(AdminWizardModel::AdminLoginField, accountEdit); // Password Wt::WLineEdit* passwordEdit = new Wt::WLineEdit(); - setFormWidget(FirstConnectionModel::PasswordField, passwordEdit ); + setFormWidget(AdminWizardModel::PasswordField, passwordEdit ); passwordEdit->setEchoMode(Wt::WLineEdit::Password); // Password confirmation Wt::WLineEdit* passwordConfirmEdit = new Wt::WLineEdit(); - setFormWidget(FirstConnectionModel::PasswordConfirmField, passwordConfirmEdit); + setFormWidget(AdminWizardModel::PasswordConfirmField, passwordConfirmEdit); passwordConfirmEdit->setEchoMode(Wt::WLineEdit::Password); auto saveButton = new Wt::WPushButton(Wt::WString::tr("msg-create")); @@ -159,6 +158,5 @@ FirstConnectionView::FirstConnectionView(Wt::WContainerWidget *parent) updateView(model); } -} // namespace Settings } // namespace UserInterface diff --git a/src/ui/settings/DatabaseView.hpp b/src/ui/settings/AdminWizardView.hpp similarity index 85% rename from src/ui/settings/DatabaseView.hpp rename to src/ui/settings/AdminWizardView.hpp index a985a69c..ecf486ea 100644 --- a/src/ui/settings/DatabaseView.hpp +++ b/src/ui/settings/AdminWizardView.hpp @@ -23,15 +23,14 @@ #include namespace UserInterface { -namespace Settings { -class DatabaseView : public Wt::WTemplateFormView +class AdminWizardView : public Wt::WTemplateFormView { public: - DatabaseView(Wt::WContainerWidget *parent = 0); + AdminWizardView(Wt::WContainerWidget *parent = 0); + }; - -} // namespace Settings } // namespace UserInterface + diff --git a/src/ui/settings/DatabaseView.cpp b/src/ui/settings/DatabaseSettingsView.cpp similarity index 91% rename from src/ui/settings/DatabaseView.cpp rename to src/ui/settings/DatabaseSettingsView.cpp index 1ee1ac28..b801529f 100644 --- a/src/ui/settings/DatabaseView.cpp +++ b/src/ui/settings/DatabaseSettingsView.cpp @@ -33,14 +33,13 @@ #include "LmsApplication.hpp" -#include "DatabaseView.hpp" +#include "DatabaseSettingsView.hpp" namespace UserInterface { -namespace Settings { using namespace Database; -class DatabaseModel : public Wt::WFormModel +class DatabaseSettingsModel : public Wt::WFormModel { public: // Associate each field with a unique string literal. @@ -48,7 +47,7 @@ class DatabaseModel : public Wt::WFormModel static const Field UpdatePeriodField; static const Field UpdateStartTimeField; - DatabaseModel(Wt::WObject *parent = 0) + DatabaseSettingsModel(Wt::WObject *parent = 0) : Wt::WFormModel(parent) { initializeModels(); @@ -220,15 +219,15 @@ class DatabaseModel : public Wt::WFormModel }; -const Wt::WFormModel::Field DatabaseModel::MediaDirectoryField = "media-directory"; -const Wt::WFormModel::Field DatabaseModel::UpdatePeriodField = "update-period"; -const Wt::WFormModel::Field DatabaseModel::UpdateStartTimeField = "update-start-time"; +const Wt::WFormModel::Field DatabaseSettingsModel::MediaDirectoryField = "media-directory"; +const Wt::WFormModel::Field DatabaseSettingsModel::UpdatePeriodField = "update-period"; +const Wt::WFormModel::Field DatabaseSettingsModel::UpdateStartTimeField = "update-start-time"; -DatabaseView::DatabaseView(Wt::WContainerWidget *parent) +DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) : Wt::WTemplateFormView(parent) { - auto model = new DatabaseModel(this); + auto model = new DatabaseSettingsModel(this); setTemplateText(tr("template-settings-database")); addFunction("tr", &WTemplate::Functions::tr); @@ -236,16 +235,16 @@ DatabaseView::DatabaseView(Wt::WContainerWidget *parent) // Media Directory Wt::WLineEdit *mediaDirectoryEdit = new Wt::WLineEdit(); - setFormWidget(DatabaseModel::MediaDirectoryField, mediaDirectoryEdit); + setFormWidget(DatabaseSettingsModel::MediaDirectoryField, mediaDirectoryEdit); // Update Period Wt::WComboBox *updatePeriodCB = new Wt::WComboBox(); - setFormWidget(DatabaseModel::UpdatePeriodField, updatePeriodCB); + setFormWidget(DatabaseSettingsModel::UpdatePeriodField, updatePeriodCB); updatePeriodCB->setModel(model->updatePeriodModel()); // Update Start Time Wt::WComboBox *updateStartTimeCB = new Wt::WComboBox(); - setFormWidget(DatabaseModel::UpdateStartTimeField, updateStartTimeCB); + setFormWidget(DatabaseSettingsModel::UpdateStartTimeField, updateStartTimeCB); updateStartTimeCB->setModel(model->updateStartTimeModel()); // Buttons @@ -291,7 +290,6 @@ DatabaseView::DatabaseView(Wt::WContainerWidget *parent) updateView(model); } -} // namespace Settings } // namespace UserInterface diff --git a/src/ui/settings/FirstConnectionView.hpp b/src/ui/settings/DatabaseSettingsView.hpp similarity index 84% rename from src/ui/settings/FirstConnectionView.hpp rename to src/ui/settings/DatabaseSettingsView.hpp index 2a9485e3..2ae471db 100644 --- a/src/ui/settings/FirstConnectionView.hpp +++ b/src/ui/settings/DatabaseSettingsView.hpp @@ -23,17 +23,13 @@ #include namespace UserInterface { -namespace Settings { -class FirstConnectionView : public Wt::WTemplateFormView +class DatabaseSettingsView : public Wt::WTemplateFormView { public: - FirstConnectionView(Wt::WContainerWidget *parent = 0); - + DatabaseSettingsView(Wt::WContainerWidget *parent = 0); }; -} // namespace Settings } // namespace UserInterface - From bc26ddae502ebbe06f75e838d2cd75adab015529 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 14 Mar 2018 13:17:04 +0100 Subject: [PATCH 075/195] Reorganized the UI/xml part to better handle next steps --- Makefile.am | 10 ++- ...ttings-database.xml => admin-database.xml} | 10 +-- ...ings-admin-wizard.xml => admin-wizard.xml} | 10 +-- approot/artist.xml | 12 +-- approot/artists.xml | 6 +- approot/explore.xml | 45 ++++++++++ approot/home.xml | 9 ++ approot/login.xml | 10 +-- approot/messages.xml | 90 ++++++++++--------- approot/playqueue.xml | 2 +- approot/release.xml | 10 +-- approot/releases.xml | 11 ++- approot/templates.xml | 48 +--------- approot/tracks.xml | 10 +-- src/Makefile.am | 22 ++--- src/ui/Auth.cpp | 4 +- src/ui/HomeView.cpp | 2 +- src/ui/LmsApplication.cpp | 58 +++++++----- .../{settings => admin}/AdminWizardView.cpp | 6 +- .../{settings => admin}/AdminWizardView.hpp | 0 .../DatabaseSettingsView.cpp | 20 ++--- .../DatabaseSettingsView.hpp | 0 src/ui/common/Validators.cpp | 2 +- src/ui/{ => explore}/ArtistView.cpp | 14 +-- src/ui/{ => explore}/ArtistView.hpp | 0 src/ui/{ => explore}/ArtistsView.cpp | 8 +- src/ui/{ => explore}/ArtistsView.hpp | 0 src/ui/{ => explore}/Explore.cpp | 2 +- src/ui/{ => explore}/Explore.hpp | 0 src/ui/{ => explore}/Filters.cpp | 16 ++-- src/ui/{ => explore}/Filters.hpp | 0 src/ui/{ => explore}/ReleaseView.cpp | 16 ++-- src/ui/{ => explore}/ReleaseView.hpp | 0 src/ui/{ => explore}/ReleasesView.cpp | 16 ++-- src/ui/{ => explore}/ReleasesView.hpp | 0 src/ui/{ => explore}/TracksView.cpp | 16 ++-- src/ui/{ => explore}/TracksView.hpp | 0 37 files changed, 257 insertions(+), 228 deletions(-) rename approot/{settings-database.xml => admin-database.xml} (83%) rename approot/{settings-admin-wizard.xml => admin-wizard.xml} (87%) create mode 100644 approot/explore.xml create mode 100644 approot/home.xml rename src/ui/{settings => admin}/AdminWizardView.cpp (95%) rename src/ui/{settings => admin}/AdminWizardView.hpp (100%) rename src/ui/{settings => admin}/DatabaseSettingsView.cpp (93%) rename src/ui/{settings => admin}/DatabaseSettingsView.hpp (100%) rename src/ui/{ => explore}/ArtistView.cpp (85%) rename src/ui/{ => explore}/ArtistView.hpp (100%) rename src/ui/{ => explore}/ArtistsView.cpp (87%) rename src/ui/{ => explore}/ArtistsView.hpp (100%) rename src/ui/{ => explore}/Explore.cpp (98%) rename src/ui/{ => explore}/Explore.hpp (100%) rename src/ui/{ => explore}/Filters.cpp (87%) rename src/ui/{ => explore}/Filters.hpp (100%) rename src/ui/{ => explore}/ReleaseView.cpp (86%) rename src/ui/{ => explore}/ReleaseView.hpp (100%) rename src/ui/{ => explore}/ReleasesView.cpp (84%) rename src/ui/{ => explore}/ReleasesView.hpp (100%) rename src/ui/{ => explore}/TracksView.cpp (85%) rename src/ui/{ => explore}/TracksView.hpp (100%) diff --git a/Makefile.am b/Makefile.am index deedb672..9b4a576f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,16 +17,18 @@ lms_images_DATA = \ docroot/images/unknown-artist.jpg lms_approot_DATA = \ - approot/artists.xml \ + approot/admin-database.xml \ + approot/admin-wizard.xml \ approot/artist.xml \ + approot/artists.xml \ + approot/explore.xml \ + approot/home.xml \ approot/login.xml \ approot/mediaplayer.xml \ approot/messages.xml \ approot/playqueue.xml \ - approot/releases.xml \ approot/release.xml \ - approot/settings-database.xml \ - approot/settings-admin-wizard.xml \ + approot/releases.xml \ approot/templates.xml \ approot/tracks.xml diff --git a/approot/settings-database.xml b/approot/admin-database.xml similarity index 83% rename from approot/settings-database.xml rename to approot/admin-database.xml index f5107fcc..839d7dac 100644 --- a/approot/settings-database.xml +++ b/approot/admin-database.xml @@ -3,13 +3,13 @@ - - ${tr:msg-settings-database} + + ${tr:Lms.Admin.Database.database}
${media-directory} @@ -21,7 +21,7 @@
${update-period} @@ -33,7 +33,7 @@
${update-start-time} diff --git a/approot/settings-admin-wizard.xml b/approot/admin-wizard.xml similarity index 87% rename from approot/settings-admin-wizard.xml rename to approot/admin-wizard.xml index 4618b6c8..c2af28e8 100644 --- a/approot/settings-admin-wizard.xml +++ b/approot/admin-wizard.xml @@ -3,15 +3,15 @@ - +
-

${tr:msg-settings-admin-account}

+

${tr:Lms.AdminWizard.header}

${admin-login} @@ -23,7 +23,7 @@
${password} @@ -35,7 +35,7 @@
${password-confirm} diff --git a/approot/artist.xml b/approot/artist.xml index b3252bf0..d9946518 100644 --- a/approot/artist.xml +++ b/approot/artist.xml @@ -2,15 +2,15 @@ - + - + - +

${name}

${clusters} @@ -19,11 +19,11 @@ ${releases class="list-group"} - + ${name} - +
${cover class="media-object"} @@ -31,7 +31,7 @@

${name}

- ${}${tr:msg-various-artists}${} + ${}${tr:Lms.Explore.various-artists}${}

${}${year}${}${} (${orig-year})${}

${play-btn}${add-btn}
diff --git a/approot/artists.xml b/approot/artists.xml index 933930f3..368eb13f 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -2,9 +2,9 @@ - +
-

${tr:msg-artists}

+

${tr:Lms.Explore.artists}

@@ -16,7 +16,7 @@ ${show-more} - +
${nb-release} ${name} diff --git a/approot/explore.xml b/approot/explore.xml new file mode 100644 index 00000000..f20c320b --- /dev/null +++ b/approot/explore.xml @@ -0,0 +1,45 @@ + + + + + ${filters} + ${contents} + + + + ${tr:Lms.Explore.show-more} + + + +
+ ${add-filter}${filters} +
+ + + +
+
+ +
+ ${type} +
+
+
+ +
+ ${value} +
+
+
+
+ ${add-btn class="btn-primary"} ${cancel-btn} +
+
+
+ + + diff --git a/approot/home.xml b/approot/home.xml new file mode 100644 index 00000000..8b877520 --- /dev/null +++ b/approot/home.xml @@ -0,0 +1,9 @@ + + + + + ${tr:Lms.Home.welcome} + + + + diff --git a/approot/login.xml b/approot/login.xml index e031a36b..16e5c1b2 100644 --- a/approot/login.xml +++ b/approot/login.xml @@ -2,15 +2,15 @@ - +
-

${tr:msg-login-welcome}

+

${tr:Lms.Auth.welcome}

${user-name} @@ -22,7 +22,7 @@
${password} @@ -34,7 +34,7 @@
${remember-me} diff --git a/approot/messages.xml b/approot/messages.xml index 74ab5522..6d8f9fb0 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -1,54 +1,62 @@ - + + +Add +Apply +Discard +Administration +Cancel +Create +Login +Logout +Not a directory +Password +Confirm password +Play Queue +Are you sure? +Settings + + +Daily +Database +Scan now! +Monthly +Never +Media root directory +Scan complete: {1} total files, {2} additions, {3} deletions, {4} duplicates, {5} errors +Scan launched! +New settings saved! +Update period +Update start time +Weekly -

Welcome!

 + +Administration account created. Please refresh to continue! +Create administrator account -Various artists -Artists -Albums -Tracks -Play Queue -Add filter -Search... + +Remember me +Welcome! -Add -Cancel + +

Welcome!

 -Type -Value + +Add filter +Artists +Albums +Search... +Show more +Tracks +Type +Value +Various artists -Show more -Login -Password -Verify password -Create -Remember me -Welcome! -Logout + -Administrator account -Account created. Please refresh to continue! - -Settings -Database -Media root directory -Update period -Update start time -Update start time -Never -Daily -Weekly -Monthly -Not a directory -Apply -Discard -Scan now! -Scan launched! -New settings saved! -Scan complete: {1} total files, {2} additions, {3} deletions, {4} duplicates, {5} errors diff --git a/approot/playqueue.xml b/approot/playqueue.xml index a48b1570..8e8ff74d 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -16,7 +16,7 @@
-

${tr:msg-playqueue}

+

${tr:Lms.playqueue}

${save-btn} ${load-btn} ${clear-btn}
${entries} diff --git a/approot/release.xml b/approot/release.xml index dcefa70c..b42206a2 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -2,15 +2,15 @@ - + - + - + ${cover}

${name}

@@ -22,11 +22,11 @@ ${tracks} - + ${name} - + ${}${disc-number}-${}${}${track-number}. ${} ${}${artist-name} - ${} ${name} diff --git a/approot/releases.xml b/approot/releases.xml index 23957a5f..5c784d39 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -1,11 +1,10 @@ - - +
-

${tr:msg-releases}

+

${tr:Lms.Explore.releases}

@@ -17,15 +16,15 @@ ${show-more} - + - + - +
${cover class="media-object"} diff --git a/approot/templates.xml b/approot/templates.xml index d0b47ac9..76e1f019 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -1,56 +1,10 @@ - - + ${navbar-top class="main-nav"} ${contents class="container"} ${player} - - ${tr:msg-home-welcome} - - - - ${filters} - ${contents} - - - - ${tr:msg-show-more} - - - -
- ${add-filter}${filters} -
- - - -
-
- -
- ${type} -
-
-
- -
- ${value} -
-
-
-
- ${add class="btn-primary"} ${cancel} -
-
-
- - diff --git a/approot/tracks.xml b/approot/tracks.xml index ef3d7320..41f92006 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -3,9 +3,9 @@ - +
-

${tr:msg-tracks}

+

${tr:Lms.Explore.tracks}

${play-btn}${add-btn}
@@ -18,15 +18,15 @@ ${show-more} - + - + - +
${cover class="media-object"} diff --git a/src/Makefile.am b/src/Makefile.am index 9adb8fc1..6289feca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,26 +21,26 @@ lms_SOURCES = \ $(srcdir)/metadata/AvFormat.cpp \ $(srcdir)/metadata/TagLibParser.cpp \ $(srcdir)/scanner/MediaScanner.cpp \ - $(srcdir)/ui/ArtistView.cpp \ - $(srcdir)/ui/ArtistsView.cpp \ - $(srcdir)/ui/Explore.cpp \ - $(srcdir)/ui/Filters.cpp \ + $(srcdir)/ui/explore/ArtistView.cpp \ + $(srcdir)/ui/explore/ArtistsView.cpp \ + $(srcdir)/ui/explore/Explore.cpp \ + $(srcdir)/ui/explore/Filters.cpp \ + $(srcdir)/ui/explore/ReleasesView.cpp \ + $(srcdir)/ui/explore/ReleaseView.cpp \ + $(srcdir)/ui/explore/TracksView.cpp \ + $(srcdir)/ui/Auth.cpp \ $(srcdir)/ui/HomeView.cpp \ $(srcdir)/ui/LmsApplication.cpp \ - $(srcdir)/ui/Auth.cpp \ $(srcdir)/ui/MediaPlayer.cpp \ $(srcdir)/ui/PlayQueueView.cpp \ - $(srcdir)/ui/ReleasesView.cpp \ - $(srcdir)/ui/ReleaseView.cpp \ - $(srcdir)/ui/TracksView.cpp \ - $(srcdir)/ui/common/Validators.cpp \ + $(srcdir)/ui/admin/DatabaseSettingsView.cpp \ + $(srcdir)/ui/admin/AdminWizardView.cpp \ $(srcdir)/ui/common/InputRange.cpp \ $(srcdir)/ui/common/LineEdit.cpp \ + $(srcdir)/ui/common/Validators.cpp \ $(srcdir)/ui/resource/AvConvTranscodeStreamResource.cpp \ $(srcdir)/ui/resource/ImageResource.cpp \ $(srcdir)/ui/resource/TranscodeResource.cpp \ - $(srcdir)/ui/settings/DatabaseSettingsView.cpp \ - $(srcdir)/ui/settings/AdminWizardView.cpp \ $(srcdir)/utils/Config.cpp \ $(srcdir)/utils/Logger.cpp \ $(srcdir)/utils/Path.cpp \ diff --git a/src/ui/Auth.cpp b/src/ui/Auth.cpp index 70bd63c9..bf242a64 100644 --- a/src/ui/Auth.cpp +++ b/src/ui/Auth.cpp @@ -38,7 +38,7 @@ Auth::Auth(Wt::WContainerWidget *parent) _model->addPasswordAuth(&Database::Handler::getPasswordService()); - setTemplateText(Wt::WString::tr("template-login")); + setTemplateText(Wt::WString::tr("Lms.Auth.template")); addFunction("tr", &WTemplate::Functions::tr); addFunction("id", &WTemplate::Functions::id); @@ -55,7 +55,7 @@ Auth::Auth(Wt::WContainerWidget *parent) auto rememberMe = new Wt::WCheckBox(); setFormWidget(Wt::Auth::AuthModel::RememberMeField, rememberMe); - auto loginBtn = new Wt::WPushButton(Wt::WString::tr("msg-login")); + auto loginBtn = new Wt::WPushButton(Wt::WString::tr("Lms.login")); bindWidget("login-btn", loginBtn); loginBtn->clicked().connect(std::bind([=] { diff --git a/src/ui/HomeView.cpp b/src/ui/HomeView.cpp index e97d8b33..9d857b4c 100644 --- a/src/ui/HomeView.cpp +++ b/src/ui/HomeView.cpp @@ -31,7 +31,7 @@ namespace UserInterface { Home::Home(Wt::WContainerWidget *parent) : Wt::WContainerWidget(parent) { - auto t = new Wt::WTemplate(Wt::WString::tr("template-home"), this); + auto t = new Wt::WTemplate(Wt::WString::tr("Lms.Home.template"), this); t->addFunction("tr", &Wt::WTemplate::Functions::tr); } diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index a64f6d64..7fff12f9 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -31,13 +31,13 @@ #include "utils/Logger.hpp" #include "utils/Utils.hpp" -#include "Explore.hpp" +#include "explore/Explore.hpp" #include "HomeView.hpp" #include "MediaPlayer.hpp" #include "PlayQueueView.hpp" -#include "settings/DatabaseSettingsView.hpp" -#include "settings/AdminWizardView.hpp" +#include "admin/DatabaseSettingsView.hpp" +#include "admin/AdminWizardView.hpp" #include "LmsApplication.hpp" @@ -81,16 +81,18 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti useStyleSheet("resources/font-awesome/css/font-awesome.min.css"); // Add a resource bundle + messageResourceBundle().use(appRoot() + "admin-database"); + messageResourceBundle().use(appRoot() + "admin-wizard"); messageResourceBundle().use(appRoot() + "artist"); messageResourceBundle().use(appRoot() + "artists"); + messageResourceBundle().use(appRoot() + "home"); + messageResourceBundle().use(appRoot() + "explore"); messageResourceBundle().use(appRoot() + "login"); messageResourceBundle().use(appRoot() + "mediaplayer"); messageResourceBundle().use(appRoot() + "messages"); messageResourceBundle().use(appRoot() + "playqueue"); messageResourceBundle().use(appRoot() + "release"); messageResourceBundle().use(appRoot() + "releases"); - messageResourceBundle().use(appRoot() + "settings-database"); - messageResourceBundle().use(appRoot() + "settings-admin-wizard"); messageResourceBundle().use(appRoot() + "tracks"); messageResourceBundle().use(appRoot() + "templates"); @@ -183,7 +185,7 @@ enum IdxRoot IdxHome = 0, IdxExplore, IdxPlayQueue, - IdxSettingsDatabase, + IdxAdminDatabase, }; static void @@ -198,7 +200,7 @@ handlePathChange(Wt::WStackedWidget* stack) { "/release", IdxExplore }, { "/tracks", IdxExplore }, { "/playqueue", IdxPlayQueue }, - { "/settings/database", IdxSettingsDatabase }, + { "/admin/database", IdxAdminDatabase }, }; LMS_LOG(UI, DEBUG) << "Internal path changed to '" << wApp->internalPath() << "'"; @@ -231,9 +233,9 @@ LmsApplication::handleAuthEvent(void) _imageResource = new ImageResource(_db, root()); _transcodeResource = new TranscodeResource(_db, root()); - setConfirmCloseMessage(Wt::WString::tr("msg-quit-confirm")); + setConfirmCloseMessage(Wt::WString::tr("Lms.quit-confirm")); - auto main = new Wt::WTemplate(Wt::WString::tr("template-main"), root()); + auto main = new Wt::WTemplate(Wt::WString::tr("Lms.template"), root()); // Navbar auto navbar = new Wt::WNavigationBar(); @@ -244,42 +246,54 @@ LmsApplication::handleAuthEvent(void) auto menu = new Wt::WMenu(); { - auto menuItem = menu->insertItem(0, Wt::WString::tr("msg-artists")); + auto menuItem = menu->insertItem(0, Wt::WString::tr("Lms.Explore.artists")); menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/artists")); menuItem->setSelectable(false); } { - auto menuItem = menu->insertItem(1, Wt::WString::tr("msg-releases")); + auto menuItem = menu->insertItem(1, Wt::WString::tr("Lms.Explore.releases")); menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/releases")); menuItem->setSelectable(false); } { - auto menuItem = menu->insertItem(2, Wt::WString::tr("msg-tracks")); + auto menuItem = menu->insertItem(2, Wt::WString::tr("Lms.Explore.tracks")); menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/tracks")); menuItem->setSelectable(false); } { - auto menuItem = menu->insertItem(3, Wt::WString::tr("msg-playqueue")); + auto menuItem = menu->insertItem(3, Wt::WString::tr("Lms.playqueue")); menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/playqueue")); menuItem->setSelectable(false); } navbar->addMenu(menu); auto rightMenu = new Wt::WMenu(); + std::size_t itemCounter = 0; + { - auto menuItem = rightMenu->insertItem(0, Wt::WString::tr("msg-settings")); - menuItem->setSelectable(false); + Wt::Dbo::Transaction transaction (DboSession()); - Wt::WPopupMenu *settings = new Wt::WPopupMenu(); - auto dbSettings = settings->insertItem(0, Wt::WString::tr("msg-settings-database")); - dbSettings->setLink(Wt::WLink(Wt::WLink::InternalPath, "/settings/database")); - dbSettings->setSelectable(false); + if (CurrentUser()->isAdmin()) + { + auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.administration")); + menuItem->setSelectable(false); - menuItem->setMenu(settings); + Wt::WPopupMenu *admin = new Wt::WPopupMenu(); + auto dbSettings = admin->insertItem(0, Wt::WString::tr("Lms.Admin.Database.database")); + dbSettings->setLink(Wt::WLink(Wt::WLink::InternalPath, "/admin/database")); + dbSettings->setSelectable(false); + + menuItem->setMenu(admin); + } } { - auto menuItem = rightMenu->insertItem(1, Wt::WString::tr("msg-logout")); + auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.settings")); + menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/settings")); + menuItem->setSelectable(false); + } + { + auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.logout")); menuItem->setSelectable(true); menuItem->triggered().connect(std::bind([=] { @@ -326,7 +340,7 @@ LmsApplication::handleAuthEvent(void) { Wt::WServer::instance()->post(sessionId, [=] { - notify(Wt::WString::tr("msg-notify-scan-complete") + notify(Wt::WString::tr("Lms.Admin.Database.scan-complete") .arg(stats.nbFiles()) .arg(stats.additions) .arg(stats.deletions) diff --git a/src/ui/settings/AdminWizardView.cpp b/src/ui/admin/AdminWizardView.cpp similarity index 95% rename from src/ui/settings/AdminWizardView.cpp rename to src/ui/admin/AdminWizardView.cpp index aa78b04f..44cc6e76 100644 --- a/src/ui/settings/AdminWizardView.cpp +++ b/src/ui/admin/AdminWizardView.cpp @@ -121,7 +121,7 @@ AdminWizardView::AdminWizardView(Wt::WContainerWidget *parent) { auto model = new AdminWizardModel(this); - setTemplateText(Wt::WString::tr("template-settings-admin-wizard")); + setTemplateText(Wt::WString::tr("Lms.AdminWizard.template")); addFunction("tr", &WTemplate::Functions::tr); addFunction("id", &WTemplate::Functions::id); @@ -139,7 +139,7 @@ AdminWizardView::AdminWizardView(Wt::WContainerWidget *parent) setFormWidget(AdminWizardModel::PasswordConfirmField, passwordConfirmEdit); passwordConfirmEdit->setEchoMode(Wt::WLineEdit::Password); - auto saveButton = new Wt::WPushButton(Wt::WString::tr("msg-create")); + auto saveButton = new Wt::WPushButton(Wt::WString::tr("Lms.create")); bindWidget("create-btn", saveButton); saveButton->clicked().connect(std::bind([=] { @@ -148,7 +148,7 @@ AdminWizardView::AdminWizardView(Wt::WContainerWidget *parent) if (model->validate()) { model->saveData(); - LmsApp->notify(Wt::WString::tr("msg-settings-first-connection-done")); + LmsApp->notify(Wt::WString::tr("Lms.AdminWizard.done")); saveButton->setEnabled(false); } diff --git a/src/ui/settings/AdminWizardView.hpp b/src/ui/admin/AdminWizardView.hpp similarity index 100% rename from src/ui/settings/AdminWizardView.hpp rename to src/ui/admin/AdminWizardView.hpp diff --git a/src/ui/settings/DatabaseSettingsView.cpp b/src/ui/admin/DatabaseSettingsView.cpp similarity index 93% rename from src/ui/settings/DatabaseSettingsView.cpp rename to src/ui/admin/DatabaseSettingsView.cpp index b801529f..6db7b934 100644 --- a/src/ui/settings/DatabaseSettingsView.cpp +++ b/src/ui/admin/DatabaseSettingsView.cpp @@ -181,16 +181,16 @@ class DatabaseSettingsModel : public Wt::WFormModel _updatePeriodModel = new Wt::WStringListModel(this); - _updatePeriodModel->addString(Wt::WString::tr("msg-update-period-never")); + _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.never")); _updatePeriodModel->setData(0, 0, Scanner::UpdatePeriod::Never, Wt::UserRole); - _updatePeriodModel->addString(Wt::WString::tr("msg-update-period-daily")); + _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.daily")); _updatePeriodModel->setData(1, 0, Scanner::UpdatePeriod::Daily, Wt::UserRole); - _updatePeriodModel->addString(Wt::WString::tr("msg-update-period-weekly")); + _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.weekly")); _updatePeriodModel->setData(2, 0, Scanner::UpdatePeriod::Weekly, Wt::UserRole); - _updatePeriodModel->addString(Wt::WString::tr("msg-update-period-monthly")); + _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.monthly")); _updatePeriodModel->setData(3, 0, Scanner::UpdatePeriod::Monthly, Wt::UserRole); _updateStartTimeModel = new Wt::WStringListModel(this); @@ -229,7 +229,7 @@ DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) { auto model = new DatabaseSettingsModel(this); - setTemplateText(tr("template-settings-database")); + setTemplateText(tr("Lms.Admin.Database.template")); addFunction("tr", &WTemplate::Functions::tr); addFunction("id", &WTemplate::Functions::id); @@ -249,13 +249,13 @@ DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) // Buttons - Wt::WPushButton *saveBtn = new Wt::WPushButton(Wt::WString::tr("msg-btn-apply")); + Wt::WPushButton *saveBtn = new Wt::WPushButton(Wt::WString::tr("Lms.apply")); bindWidget("apply-btn", saveBtn); - Wt::WPushButton *discardBtn = new Wt::WPushButton(Wt::WString::tr("msg-btn-discard")); + Wt::WPushButton *discardBtn = new Wt::WPushButton(Wt::WString::tr("Lms.discard")); bindWidget("discard-btn", discardBtn); - Wt::WPushButton *immScanBtn = new Wt::WPushButton(Wt::WString::tr("msg-btn-immediate-scan")); + Wt::WPushButton *immScanBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Database.immediate-scan")); bindWidget("immediate-scan-btn", immScanBtn); saveBtn->clicked().connect(std::bind([=] () @@ -267,7 +267,7 @@ DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) model->saveData(); LmsApp->getMediaScanner().reschedule(); - LmsApp->notify(Wt::WString::tr("msg-notify-settings-saved")); + LmsApp->notify(Wt::WString::tr("Lms.Admin.Database.settings-saved")); } // Udate the view: Delete any validation message in the view, etc. @@ -284,7 +284,7 @@ DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) immScanBtn->clicked().connect(std::bind([=] () { LmsApp->getMediaScanner().scheduleImmediateScan(); - LmsApp->notify(Wt::WString::tr("msg-notify-scan-launched")); + LmsApp->notify(Wt::WString::tr("Lms.Admin.Database.scan-launched")); })); updateView(model); diff --git a/src/ui/settings/DatabaseSettingsView.hpp b/src/ui/admin/DatabaseSettingsView.hpp similarity index 100% rename from src/ui/settings/DatabaseSettingsView.hpp rename to src/ui/admin/DatabaseSettingsView.hpp diff --git a/src/ui/common/Validators.cpp b/src/ui/common/Validators.cpp index 2d8b2170..39308989 100644 --- a/src/ui/common/Validators.cpp +++ b/src/ui/common/Validators.cpp @@ -60,7 +60,7 @@ DirectoryValidator::validate(const Wt::WString& input) const else if (res) return Wt::WValidator::Result(Wt::WValidator::Valid); else - return Wt::WValidator::Result(Wt::WValidator::Invalid, Wt::WString::tr("msg-error-not-a-directory")); + return Wt::WValidator::Result(Wt::WValidator::Invalid, Wt::WString::tr("Lms.not-a-directory")); } diff --git a/src/ui/ArtistView.cpp b/src/ui/explore/ArtistView.cpp similarity index 85% rename from src/ui/ArtistView.cpp rename to src/ui/explore/ArtistView.cpp index 1a524ba0..1f443339 100644 --- a/src/ui/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -71,7 +71,7 @@ Artist::refresh() return; } - auto t = new Wt::WTemplate(Wt::WString::tr("template-artist"), this); + auto t = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artist.template"), this); t->addFunction("tr", &Wt::WTemplate::Functions::tr); auto clusterContainers = new Wt::WContainerWidget(); @@ -82,7 +82,7 @@ Artist::refresh() for (auto cluster : clusters) { - auto entry = new Wt::WTemplate(Wt::WString::tr("template-artist-cluster-entry"), clusterContainers); + auto entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artist.template.cluster-entry"), clusterContainers); entry->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::PlainText); } @@ -90,7 +90,7 @@ Artist::refresh() t->bindString("name", Wt::WString::fromUTF8(artist->getName()), Wt::PlainText); { - auto playBtn = new Wt::WText(Wt::WString::tr("btn-artist-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Artist.play"), Wt::XHTMLText); t->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] @@ -100,7 +100,7 @@ Artist::refresh() } { - auto addBtn = new Wt::WText(Wt::WString::tr("btn-artist-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Artist.add"), Wt::XHTMLText); t->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] @@ -117,7 +117,7 @@ Artist::refresh() { auto releaseId = release.id(); - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-artist-entry"), releasesContainer); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artist.template.entry"), releasesContainer); entry->addFunction("tr", Wt::WTemplate::Functions::tr); { @@ -153,14 +153,14 @@ Artist::refresh() } } - auto playBtn = new Wt::WText(Wt::WString::tr("btn-artist-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Artist.play"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] { releasePlay.emit(releaseId); })); - auto addBtn = new Wt::WText(Wt::WString::tr("btn-artist-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Artist.add"), Wt::XHTMLText); entry->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] { diff --git a/src/ui/ArtistView.hpp b/src/ui/explore/ArtistView.hpp similarity index 100% rename from src/ui/ArtistView.hpp rename to src/ui/explore/ArtistView.hpp diff --git a/src/ui/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp similarity index 87% rename from src/ui/ArtistsView.cpp rename to src/ui/explore/ArtistsView.cpp index b5d1addb..b48ce1b6 100644 --- a/src/ui/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -39,18 +39,18 @@ Artists::Artists(Filters* filters, Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent), _filters(filters) { - auto container = new Wt::WTemplate(Wt::WString::tr("template-artists"), this); + auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template"), this); container->addFunction("tr", &Wt::WTemplate::Functions::tr); _search = new Wt::WLineEdit(); container->bindWidget("search", _search); - _search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); + _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); _search->textInput().connect(this, &Artists::refresh); _artistsContainer = new Wt::WContainerWidget(); container->bindWidget("artists", _artistsContainer); - _showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more")); + _showMore = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); container->bindWidget("show-more", _showMore); @@ -88,7 +88,7 @@ Artists::addSome() for (auto artist : artists) { - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-artists-entry"), _artistsContainer); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template.entry"), _artistsContainer); entry->bindInt("nb-release", artist->getReleases(clusterIds).size()); diff --git a/src/ui/ArtistsView.hpp b/src/ui/explore/ArtistsView.hpp similarity index 100% rename from src/ui/ArtistsView.hpp rename to src/ui/explore/ArtistsView.hpp diff --git a/src/ui/Explore.cpp b/src/ui/explore/Explore.cpp similarity index 98% rename from src/ui/Explore.cpp rename to src/ui/explore/Explore.cpp index 7a8d463c..42be7b49 100644 --- a/src/ui/Explore.cpp +++ b/src/ui/explore/Explore.cpp @@ -73,7 +73,7 @@ handlePathChange(Wt::WStackedWidget* stack) Explore::Explore(Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent) { - auto container = new Wt::WTemplate(Wt::WString::tr("template-explore"), this); + auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template"), this); _filters = new Filters(); container->bindWidget("filters", _filters); diff --git a/src/ui/Explore.hpp b/src/ui/explore/Explore.hpp similarity index 100% rename from src/ui/Explore.hpp rename to src/ui/explore/Explore.hpp diff --git a/src/ui/Filters.cpp b/src/ui/explore/Filters.cpp similarity index 87% rename from src/ui/Filters.cpp rename to src/ui/explore/Filters.cpp index efc2ae07..719e5444 100644 --- a/src/ui/Filters.cpp +++ b/src/ui/explore/Filters.cpp @@ -31,9 +31,9 @@ namespace UserInterface { void Filters::showDialog() { - auto dialog = new Wt::WDialog("Go to cell"); + auto dialog = new Wt::WDialog(Wt::WString::tr("Lms.Explore.add-filter")); - auto container = new Wt::WTemplate(Wt::WString::tr("template-filter-add")); + auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.add-filter")); container->addFunction("tr", &Wt::WTemplate::Functions::tr); dialog->contents()->addWidget(container); @@ -44,12 +44,12 @@ Filters::showDialog() auto valueCombo = new Wt::WComboBox(); container->bindWidget("value", valueCombo); - auto addBtn = new Wt::WPushButton(Wt::WString::tr("msg-add")); - container->bindWidget("add", addBtn); + auto addBtn = new Wt::WPushButton(Wt::WString::tr("Lms.add")); + container->bindWidget("add-btn", addBtn); addBtn->clicked().connect(dialog, &Wt::WDialog::accept); - auto cancelBtn = new Wt::WPushButton(Wt::WString::tr("msg-cancel")); - container->bindWidget("cancel", cancelBtn); + auto cancelBtn = new Wt::WPushButton(Wt::WString::tr("Lms.cancel")); + container->bindWidget("cancel-btn", cancelBtn); cancelBtn->clicked().connect(dialog, &Wt::WDialog::reject); // Populate data @@ -140,10 +140,10 @@ Filters::showDialog() Filters::Filters(Wt::WContainerWidget *parent) : Wt::WContainerWidget(parent) { - auto container = new Wt::WTemplate(Wt::WString::tr("template-filters"), this); + auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.filters"), this); // Filters - Wt::WPushButton *addFilterBtn = new Wt::WPushButton(Wt::WText::tr("msg-filter-add")); + Wt::WPushButton *addFilterBtn = new Wt::WPushButton(Wt::WText::tr("Lms.Explore.add-filter")); container->bindWidget("add-filter", addFilterBtn); _filters = new Wt::WContainerWidget(); diff --git a/src/ui/Filters.hpp b/src/ui/explore/Filters.hpp similarity index 100% rename from src/ui/Filters.hpp rename to src/ui/explore/Filters.hpp diff --git a/src/ui/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp similarity index 86% rename from src/ui/ReleaseView.cpp rename to src/ui/explore/ReleaseView.cpp index 123b7eea..37c2487a 100644 --- a/src/ui/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -72,7 +72,7 @@ Release::refresh() return; } - auto t = new Wt::WTemplate(Wt::WString::tr("template-release"), this); + auto t = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Release.template"), this); t->addFunction("tr", &Wt::WTemplate::Functions::tr); t->bindString("name", Wt::WString::fromUTF8(release->getName()), Wt::PlainText); @@ -95,7 +95,7 @@ Release::refresh() auto artists = release->getArtists(); if (artists.size() > 1) { - t->bindString("artist-name", Wt::WString::tr("msg-various-artists")); + t->bindString("artist-name", Wt::WString::tr("Lms.Explore.various-artists")); } else { @@ -118,14 +118,14 @@ Release::refresh() for (auto cluster : clusters) { - auto entry = new Wt::WTemplate(Wt::WString::tr("template-release-cluster-entry"), clusterContainers); + auto entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Release.template.cluster-entry"), clusterContainers); entry->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::PlainText); } } { - auto playBtn = new Wt::WText(Wt::WString::tr("btn-release-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Release.play"), Wt::XHTMLText); t->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] { @@ -134,7 +134,7 @@ Release::refresh() } { - auto addBtn = new Wt::WText(Wt::WString::tr("btn-release-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Release.add"), Wt::XHTMLText); t->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] { @@ -154,7 +154,7 @@ Release::refresh() { auto trackId = track.id(); - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-release-entry"), tracksContainer); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Release.template.entry"), tracksContainer); entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); @@ -182,14 +182,14 @@ Release::refresh() entry->bindInt("disc-number", *discNumber); } - auto playBtn = new Wt::WText(Wt::WString::tr("btn-release-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Release.play"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] { trackPlay.emit(trackId); })); - auto addBtn = new Wt::WText(Wt::WString::tr("btn-release-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Release.add"), Wt::XHTMLText); entry->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] { diff --git a/src/ui/ReleaseView.hpp b/src/ui/explore/ReleaseView.hpp similarity index 100% rename from src/ui/ReleaseView.hpp rename to src/ui/explore/ReleaseView.hpp diff --git a/src/ui/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp similarity index 84% rename from src/ui/ReleasesView.cpp rename to src/ui/explore/ReleasesView.cpp index 1cb5a00a..6bf9dddf 100644 --- a/src/ui/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -40,18 +40,18 @@ Releases::Releases(Filters* filters, Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent), _filters(filters) { - auto container = new Wt::WTemplate(Wt::WString::tr("template-releases"), this); + auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Releases.template"), this); container->addFunction("tr", &Wt::WTemplate::Functions::tr); _search = new Wt::WLineEdit(); container->bindWidget("search", _search); - _search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); + _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); _search->textInput().connect(this, &Releases::refresh); _releasesContainer = new Wt::WContainerWidget(); container->bindWidget("releases", _releasesContainer); - _showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more")); + _showMore = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); container->bindWidget("show-more", _showMore); @@ -88,7 +88,7 @@ Releases::addSome() { auto releaseId = release.id(); - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-releases-entry"), _releasesContainer); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Releases.template.entry"), _releasesContainer); entry->addFunction("tr", Wt::WTemplate::Functions::tr); Wt::WAnchor* coverAnchor = LmsApplication::createReleaseAnchor(releaseId); @@ -109,7 +109,7 @@ Releases::addSome() auto artists = release->getArtists(); if (artists.size() > 1) { - entry->bindString("artist-name", Wt::WString::tr("msg-various-artists")); + entry->bindString("artist-name", Wt::WString::tr("Lms.Explore.various-artists")); } else { @@ -119,14 +119,14 @@ Releases::addSome() entry->bindWidget("artist-name", artistAnchor); } - auto playBtn = new Wt::WText(Wt::WString::tr("btn-releases-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Releases.play"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] { releasePlay.emit(releaseId); })); - auto addBtn = new Wt::WText(Wt::WString::tr("btn-releases-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Releases.add"), Wt::XHTMLText); entry->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] { @@ -134,8 +134,6 @@ Releases::addSome() })); } - std::cerr << "if-show-more = " << moreResults << "\n"; - _showMore->setHidden(!moreResults); } diff --git a/src/ui/ReleasesView.hpp b/src/ui/explore/ReleasesView.hpp similarity index 100% rename from src/ui/ReleasesView.hpp rename to src/ui/explore/ReleasesView.hpp diff --git a/src/ui/TracksView.cpp b/src/ui/explore/TracksView.cpp similarity index 85% rename from src/ui/TracksView.cpp rename to src/ui/explore/TracksView.cpp index 81341975..4875e597 100644 --- a/src/ui/TracksView.cpp +++ b/src/ui/explore/TracksView.cpp @@ -39,15 +39,15 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent), _filters(filters) { - auto container = new Wt::WTemplate(Wt::WString::tr("template-tracks"), this); + auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Tracks.template"), this); container->addFunction("tr", &Wt::WTemplate::Functions::tr); _search = new Wt::WLineEdit(); container->bindWidget("search", _search); - _search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); + _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); _search->textInput().connect(this, &Tracks::refresh); - auto playBtn = new Wt::WText(Wt::WString::tr("btn-tracks-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Tracks.play"), Wt::XHTMLText); container->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] { @@ -55,7 +55,7 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) tracksPlay.emit(getTracks()); })); - auto addBtn = new Wt::WText(Wt::WString::tr("btn-tracks-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Tracks.add"), Wt::XHTMLText); container->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] { @@ -66,7 +66,7 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) _tracksContainer = new Wt::WContainerWidget(); container->bindWidget("tracks", _tracksContainer); - _showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more")); + _showMore = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); container->bindWidget("show-more", _showMore); @@ -116,7 +116,7 @@ Tracks::addSome() for (auto track : tracks) { auto trackId = track.id(); - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-tracks-entry"), _tracksContainer); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Tracks.template.entry"), _tracksContainer); entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); @@ -146,14 +146,14 @@ Tracks::addSome() cover->setWidth(64); entry->bindWidget("cover", cover); - auto playBtn = new Wt::WText(Wt::WString::tr("btn-tracks-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Tracks.play"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] { trackPlay.emit(trackId); })); - auto addBtn = new Wt::WText(Wt::WString::tr("btn-tracks-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Tracks.add"), Wt::XHTMLText); entry->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] { diff --git a/src/ui/TracksView.hpp b/src/ui/explore/TracksView.hpp similarity index 100% rename from src/ui/TracksView.hpp rename to src/ui/explore/TracksView.hpp From 1e6ea42f65c5ff5a5c33ce92b593bdede21e7f1f Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 16 Mar 2018 14:00:03 +0100 Subject: [PATCH 076/195] Added Settings view --- Makefile.am | 1 + approot/messages.xml | 15 +- approot/settings.xml | 65 ++++++ src/Makefile.am | 21 +- src/database/User.cpp | 9 - src/database/User.hpp | 1 - src/ui/LmsApplication.cpp | 10 +- src/ui/SettingsView.cpp | 304 ++++++++++++++++++++++++++ src/ui/SettingsView.hpp | 34 +++ src/ui/admin/AdminWizardView.cpp | 2 +- src/ui/admin/DatabaseSettingsView.cpp | 4 +- 11 files changed, 438 insertions(+), 28 deletions(-) create mode 100644 approot/settings.xml create mode 100644 src/ui/SettingsView.cpp create mode 100644 src/ui/SettingsView.hpp diff --git a/Makefile.am b/Makefile.am index 9b4a576f..0c4a11d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,6 +29,7 @@ lms_approot_DATA = \ approot/playqueue.xml \ approot/release.xml \ approot/releases.xml \ + approot/settings.xml \ approot/templates.xml \ approot/tracks.xml diff --git a/approot/messages.xml b/approot/messages.xml index 6d8f9fb0..9d2fe7bf 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -13,9 +13,9 @@ Not a directory Password Confirm password +Passwords don't match Play Queue Are you sure? -Settings Daily @@ -54,9 +54,16 @@ Value Various artists - - - +Account +Audio +Auto +Bitrate +Encoding +MP3 +OGA +Settings +WEBMA +New settings saved! diff --git a/approot/settings.xml b/approot/settings.xml new file mode 100644 index 00000000..32e87bfe --- /dev/null +++ b/approot/settings.xml @@ -0,0 +1,65 @@ + + + + + + + ${tr:Lms.Settings.audio} +
+
+ +
+ ${bitrate} +
+
+ ${bitrate-info} +
+
+
+ +
+ ${encoding} +
+
+ ${encoding-info} +
+
+
+ ${tr:Lms.Settings.account} +
+
+ +
+ ${password} +
+
+ ${password-info} +
+
+
+ +
+ ${password-confirm} +
+
+ ${password-confirm-info} +
+
+ +
+
+ ${apply-btn class="btn-primary"} ${discard-btn} +
+
+
+ + + diff --git a/src/Makefile.am b/src/Makefile.am index 6289feca..66a1efd3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,6 +21,17 @@ lms_SOURCES = \ $(srcdir)/metadata/AvFormat.cpp \ $(srcdir)/metadata/TagLibParser.cpp \ $(srcdir)/scanner/MediaScanner.cpp \ + $(srcdir)/ui/Auth.cpp \ + $(srcdir)/ui/HomeView.cpp \ + $(srcdir)/ui/LmsApplication.cpp \ + $(srcdir)/ui/MediaPlayer.cpp \ + $(srcdir)/ui/PlayQueueView.cpp \ + $(srcdir)/ui/SettingsView.cpp \ + $(srcdir)/ui/admin/DatabaseSettingsView.cpp \ + $(srcdir)/ui/admin/AdminWizardView.cpp \ + $(srcdir)/ui/common/InputRange.cpp \ + $(srcdir)/ui/common/LineEdit.cpp \ + $(srcdir)/ui/common/Validators.cpp \ $(srcdir)/ui/explore/ArtistView.cpp \ $(srcdir)/ui/explore/ArtistsView.cpp \ $(srcdir)/ui/explore/Explore.cpp \ @@ -28,16 +39,6 @@ lms_SOURCES = \ $(srcdir)/ui/explore/ReleasesView.cpp \ $(srcdir)/ui/explore/ReleaseView.cpp \ $(srcdir)/ui/explore/TracksView.cpp \ - $(srcdir)/ui/Auth.cpp \ - $(srcdir)/ui/HomeView.cpp \ - $(srcdir)/ui/LmsApplication.cpp \ - $(srcdir)/ui/MediaPlayer.cpp \ - $(srcdir)/ui/PlayQueueView.cpp \ - $(srcdir)/ui/admin/DatabaseSettingsView.cpp \ - $(srcdir)/ui/admin/AdminWizardView.cpp \ - $(srcdir)/ui/common/InputRange.cpp \ - $(srcdir)/ui/common/LineEdit.cpp \ - $(srcdir)/ui/common/Validators.cpp \ $(srcdir)/ui/resource/AvConvTranscodeStreamResource.cpp \ $(srcdir)/ui/resource/ImageResource.cpp \ $(srcdir)/ui/resource/TranscodeResource.cpp \ diff --git a/src/database/User.cpp b/src/database/User.cpp index bd1dfa2c..2919d0a2 100644 --- a/src/database/User.cpp +++ b/src/database/User.cpp @@ -31,15 +31,6 @@ User::audioBitrates = 320000, }; -const std::vector -User::audioEncodings = -{ - AudioEncoding::AUTO, - AudioEncoding::MP3, - AudioEncoding::OGA, - AudioEncoding::WEBMA, -}; - User::User() : _maxAudioBitrate(maxAudioBitrate), _isAdmin(false), diff --git a/src/database/User.hpp b/src/database/User.hpp index a422c369..582fb964 100644 --- a/src/database/User.hpp +++ b/src/database/User.hpp @@ -52,7 +52,6 @@ class User // list of audio parameters static const std::vector audioBitrates; - static const std::vector audioEncodings; User(); diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 7fff12f9..19115578 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -35,6 +35,7 @@ #include "HomeView.hpp" #include "MediaPlayer.hpp" #include "PlayQueueView.hpp" +#include "SettingsView.hpp" #include "admin/DatabaseSettingsView.hpp" #include "admin/AdminWizardView.hpp" @@ -93,6 +94,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti messageResourceBundle().use(appRoot() + "playqueue"); messageResourceBundle().use(appRoot() + "release"); messageResourceBundle().use(appRoot() + "releases"); + messageResourceBundle().use(appRoot() + "settings"); messageResourceBundle().use(appRoot() + "tracks"); messageResourceBundle().use(appRoot() + "templates"); @@ -185,6 +187,7 @@ enum IdxRoot IdxHome = 0, IdxExplore, IdxPlayQueue, + IdxSettings, IdxAdminDatabase, }; @@ -200,6 +203,7 @@ handlePathChange(Wt::WStackedWidget* stack) { "/release", IdxExplore }, { "/tracks", IdxExplore }, { "/playqueue", IdxPlayQueue }, + { "/settings", IdxSettings }, { "/admin/database", IdxAdminDatabase }, }; @@ -288,7 +292,7 @@ LmsApplication::handleAuthEvent(void) } { - auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.settings")); + auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.Settings.settings")); menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/settings")); menuItem->setSelectable(false); } @@ -315,6 +319,10 @@ LmsApplication::handleAuthEvent(void) auto playqueue = new PlayQueue(); mainStack->addWidget(playqueue); + auto settings = new SettingsView(); + mainStack->addWidget(settings); + + // Admin stuff auto databaseSettings = new DatabaseSettingsView(); mainStack->addWidget(databaseSettings); diff --git a/src/ui/SettingsView.cpp b/src/ui/SettingsView.cpp new file mode 100644 index 00000000..7b1ba7c4 --- /dev/null +++ b/src/ui/SettingsView.cpp @@ -0,0 +1,304 @@ +/* + * 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 . + */ + +#include +#include +#include +#include + +#include +#include + +#include "common/Validators.hpp" + +#include "utils/Logger.hpp" +#include "LmsApplication.hpp" + +#include "SettingsView.hpp" + +namespace UserInterface { + +using namespace Database; + +class SettingsModel : public Wt::WFormModel +{ + public: + // Associate each field with a unique string literal. + static const Field BitrateField; + static const Field EncodingField; + static const Field PasswordField; + static const Field PasswordConfirmField; + + SettingsModel(Wt::WObject *parent = 0) + : Wt::WFormModel(parent) + { + initializeModels(); + + addField(BitrateField); + addField(EncodingField); + addField(PasswordField); + addField(PasswordConfirmField); + + setValidator(BitrateField, createMandatoryValidator()); + setValidator(EncodingField, createMandatoryValidator()); + + loadData(); + } + + Wt::WAbstractItemModel *bitrateModel() { return _bitrateModel; } + Wt::WAbstractItemModel *encodingModel() { return _encodingModel; } + + void loadData() + { + Wt::Dbo::Transaction transaction(DboSession()); + + auto bitrate = getBitrateRow(CurrentUser()->getAudioBitrate()); + if (bitrate) + setValue(BitrateField, bitrateString(*bitrate)); + + auto encodingRow = getEncodingRow(CurrentUser()->getAudioEncoding()); + if (encodingRow) + setValue(EncodingField, encodingString(*encodingRow)); + + } + + void saveData() + { + Wt::Dbo::Transaction transaction(DboSession()); + + auto bitrateRow = getBitrateRow(Wt::asString(value(BitrateField))); + assert(bitrateRow); + CurrentUser().modify()->setAudioBitrate(bitrate(*bitrateRow)); + + auto encodingRow = getEncodingRow(Wt::asString(value(EncodingField))); + CurrentUser().modify()->setAudioEncoding(encoding(*encodingRow)); + + if (!valueText(PasswordField).empty()) + { + Database::Handler::getPasswordService().updatePassword(CurrentAuthUser(), valueText(PasswordField)); + } + } + + bool validateField(Field field) + { + Wt::WString error; + + if (field == PasswordField) + { + if (!valueText(PasswordField).empty()) + { + // Evaluate the strength of the password + auto res = Database::Handler::getPasswordService().strengthValidator()->evaluateStrength(valueText(PasswordField), + CurrentAuthUser().identity(Wt::Auth::Identity::LoginName), ""); + + if (!res.isValid()) + error = res.message(); + } + else + return Wt::WFormModel::validateField(field); + } + else if (field == PasswordConfirmField) + { + if (validation(PasswordField).state() == Wt::WValidator::Valid) + { + if (valueText(PasswordField) != valueText(PasswordConfirmField)) + error = Wt::WString::tr("Lms.passwords-dont-match"); + } + } + else + { + return Wt::WFormModel::validateField(field); + } + + setValidation(field, Wt::WValidator::Result( error.empty() ? Wt::WValidator::Valid : Wt::WValidator::Invalid, error)); + + return (validation(field).state() == Wt::WValidator::Valid); + } + + boost::optional getBitrateRow(Wt::WString value) + { + for (int i = 0; i < _bitrateModel->rowCount(); ++i) + { + if (bitrateString(i) == value) + return i; + } + + return boost::none; + } + + boost::optional getBitrateRow(std::size_t value) + { + for (int i = 0; i < _bitrateModel->rowCount(); ++i) + { + if (bitrate(i) == value) + return i; + } + + return boost::none; + } + + std::size_t bitrate(int row) + { + return boost::any_cast + (_bitrateModel->data(_encodingModel->index(row, 0), Wt::UserRole)); + } + + Wt::WString bitrateString(int row) + { + return boost::any_cast + (_bitrateModel->data(_encodingModel->index(row, 0), Wt::DisplayRole)); + } + + boost::optional getEncodingRow(Wt::WString value) + { + for (int i = 0; i < _encodingModel->rowCount(); ++i) + { + if (encodingString(i) == value) + return i; + } + + return boost::none; + } + + boost::optional getEncodingRow(Database::AudioEncoding enc) + { + for (int i = 0; i < _encodingModel->rowCount(); ++i) + { + if (encoding(i) == enc) + return i; + } + + return boost::none; + } + + Database::AudioEncoding encoding(int row) + { + return boost::any_cast + (_encodingModel->data(_encodingModel->index(row, 0), Wt::UserRole)); + } + + Wt::WString encodingString(int row) + { + return boost::any_cast + (_encodingModel->data(_encodingModel->index(row, 0), Wt::DisplayRole)); + } + + + private: + + void initializeModels() + { + + _bitrateModel = new Wt::WStringListModel(this); + + std::size_t id = 0; + for (auto bitrate : Database::User::audioBitrates) + { + _bitrateModel->addString( Wt::WString::fromUTF8(std::to_string(bitrate / 1000)) ); + _bitrateModel->setData( id++, 0, bitrate, Wt::UserRole); + } + + _encodingModel = new Wt::WStringListModel(this); + + _encodingModel->addString(Wt::WString::tr("Lms.Settings.auto")); + _encodingModel->setData(0, 0, Database::AudioEncoding::AUTO, Wt::UserRole); + + _encodingModel->addString(Wt::WString::tr("Lms.Settings.mp3")); + _encodingModel->setData(1, 0, Database::AudioEncoding::MP3, Wt::UserRole); + + _encodingModel->addString(Wt::WString::tr("Lms.Settings.oga")); + _encodingModel->setData(2, 0, Database::AudioEncoding::OGA, Wt::UserRole); + + _encodingModel->addString(Wt::WString::tr("Lms.Settings.webma")); + _encodingModel->setData(3, 0, Database::AudioEncoding::WEBMA, Wt::UserRole); + } + + Wt::WStringListModel* _bitrateModel; + Wt::WStringListModel* _encodingModel; + +}; + +const Wt::WFormModel::Field SettingsModel::BitrateField = "bitrate"; +const Wt::WFormModel::Field SettingsModel::EncodingField = "encoding"; +const Wt::WFormModel::Field SettingsModel::PasswordField = "password"; +const Wt::WFormModel::Field SettingsModel::PasswordConfirmField = "password-confirm"; + +SettingsView::SettingsView(Wt::WContainerWidget *parent) +: Wt::WTemplateFormView(parent) +{ + auto model = new SettingsModel(this); + + setTemplateText(tr("Lms.Settings.template")); + addFunction("tr", &WTemplate::Functions::tr); + addFunction("id", &WTemplate::Functions::id); + + // Password + Wt::WLineEdit *password = new Wt::WLineEdit(); + setFormWidget(SettingsModel::PasswordField, password); + password->setEchoMode(Wt::WLineEdit::Password); + + // Password confirm + Wt::WLineEdit *passwordConfirm = new Wt::WLineEdit(); + setFormWidget(SettingsModel::PasswordConfirmField, passwordConfirm); + passwordConfirm->setEchoMode(Wt::WLineEdit::Password); + + // Bitrate + Wt::WComboBox *bitrate = new Wt::WComboBox(); + setFormWidget(SettingsModel::BitrateField, bitrate); + bitrate->setModel(model->bitrateModel()); + + // Encoding + Wt::WComboBox *encoding = new Wt::WComboBox(); + setFormWidget(SettingsModel::EncodingField, encoding); + encoding->setModel(model->encodingModel()); + + // Buttons + Wt::WPushButton *saveBtn = new Wt::WPushButton(Wt::WString::tr("Lms.apply")); + bindWidget("apply-btn", saveBtn); + + Wt::WPushButton *discardBtn = new Wt::WPushButton(Wt::WString::tr("Lms.discard")); + bindWidget("discard-btn", discardBtn); + + saveBtn->clicked().connect(std::bind([=] () + { + updateModel(model); + + if (model->validate()) + { + model->saveData(); + LmsApp->notify(Wt::WString::tr("Lms.Settings.settings-saved")); + } + + // Udate the view: Delete any validation message in the view, etc. + updateView(model); + })); + + discardBtn->clicked().connect(std::bind([=] () + { + model->loadData(); + model->validate(); + updateView(model); + })); + + updateView(model); +} + +} // namespace UserInterface + + diff --git a/src/ui/SettingsView.hpp b/src/ui/SettingsView.hpp new file mode 100644 index 00000000..95708107 --- /dev/null +++ b/src/ui/SettingsView.hpp @@ -0,0 +1,34 @@ +/* + * 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 . + */ + +#pragma once + +#include +#include + +namespace UserInterface { + +class SettingsView : public Wt::WTemplateFormView +{ + public: + SettingsView(Wt::WContainerWidget *parent = 0); +}; + +} // namespace UserInterface + diff --git a/src/ui/admin/AdminWizardView.cpp b/src/ui/admin/AdminWizardView.cpp index 44cc6e76..b0768c3c 100644 --- a/src/ui/admin/AdminWizardView.cpp +++ b/src/ui/admin/AdminWizardView.cpp @@ -97,7 +97,7 @@ class AdminWizardModel : public Wt::WFormModel if (validation(PasswordField).state() == Wt::WValidator::Valid) { if (valueText(PasswordField) != valueText(PasswordConfirmField)) - error = Wt::WString::tr("Wt.Auth.passwords-dont-match"); + error = Wt::WString::tr("Lms.passwords-dont-match"); } } else diff --git a/src/ui/admin/DatabaseSettingsView.cpp b/src/ui/admin/DatabaseSettingsView.cpp index 6db7b934..b5b0b507 100644 --- a/src/ui/admin/DatabaseSettingsView.cpp +++ b/src/ui/admin/DatabaseSettingsView.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include @@ -177,7 +176,8 @@ class DatabaseSettingsModel : public Wt::WFormModel private: - void initializeModels() { + void initializeModels() + { _updatePeriodModel = new Wt::WStringListModel(this); From aee33156765229c2f9bec05cb4e249dd27538a30 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 17 Mar 2018 17:24:45 +0100 Subject: [PATCH 077/195] Added kbps span into bitrate edit --- approot/settings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/approot/settings.xml b/approot/settings.xml index 32e87bfe..8770bd6e 100644 --- a/approot/settings.xml +++ b/approot/settings.xml @@ -11,7 +11,10 @@ ${tr:Lms.Settings.bitrate}
- ${bitrate} +
+ ${bitrate} + kbps +
${bitrate-info} From 74e0576d3151e0416886cecd10a16aea02de9123 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 17 Mar 2018 17:36:03 +0100 Subject: [PATCH 078/195] Updated playqueue to use the new tr message layout --- approot/messages.xml | 4 +++- approot/playqueue.xml | 19 ++++++++++--------- src/ui/LmsApplication.cpp | 2 +- src/ui/PlayQueueView.cpp | 21 ++++++++++----------- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/approot/messages.xml b/approot/messages.xml index 9d2fe7bf..a8fdd8e5 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -14,7 +14,6 @@ Password Confirm password Passwords don't match -Play Queue Are you sure? @@ -54,6 +53,9 @@ Value Various artists + +Play Queue + Account Audio diff --git a/approot/playqueue.xml b/approot/playqueue.xml index 8e8ff74d..496a2468 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -2,37 +2,38 @@ - + - + - + - +
-

${tr:Lms.playqueue}

+

${tr:Lms.PlayQueue.playqueue}

${save-btn} ${load-btn} ${clear-btn}
${entries} ${show-more} - + - + - - ${pos} ${name} ${}${release-name}${} ${}${artist-name}${} ${play-btn} ${del-btn} + + ${play-btn} ${del-btn} + ${name} ${}${release-name}${} ${}${artist-name}${} diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 19115578..812d0828 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -265,7 +265,7 @@ LmsApplication::handleAuthEvent(void) menuItem->setSelectable(false); } { - auto menuItem = menu->insertItem(3, Wt::WString::tr("Lms.playqueue")); + auto menuItem = menu->insertItem(3, Wt::WString::tr("Lms.PlayQueue.playqueue")); menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/playqueue")); menuItem->setSelectable(false); } diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index db265b9a..754e2c67 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -33,22 +33,22 @@ static const std::string currentPlayQueueName = "__current__playqueue__"; PlayQueue::PlayQueue(Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent) { - auto container = new Wt::WTemplate(Wt::WString::tr("template-playqueue"), this); + auto container = new Wt::WTemplate(Wt::WString::tr("Lms.PlayQueue.template"), this); container->addFunction("tr", &Wt::WTemplate::Functions::tr); - auto saveBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-save-btn"), Wt::XHTMLText); + auto saveBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.save-to-playlist"), Wt::XHTMLText); container->bindWidget("save-btn", saveBtn); - auto loadBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-load-btn"), Wt::XHTMLText); + auto loadBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.load-from-playlist"), Wt::XHTMLText); container->bindWidget("load-btn", loadBtn); - auto clearBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-clear-btn"), Wt::XHTMLText); + auto clearBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.clear"), Wt::XHTMLText); container->bindWidget("clear-btn", clearBtn); _entriesContainer = new Wt::WContainerWidget(); container->bindWidget("entries", _entriesContainer); - _showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more")); + _showMore = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); _showMore->setHidden(true); container->bindWidget("show-more", _showMore); @@ -123,16 +123,15 @@ PlayQueue::addSome() auto tracks = playlist->getTracks(_entriesContainer->count(), 50, moreResults); for (auto track : tracks) { - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-playqueue-entry"), _entriesContainer); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.PlayQueue.template.entry"), _entriesContainer); - entry->bindString("pos", std::to_string(_entriesContainer->count())); entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); auto artist = track->getArtist(); if (artist) { entry->setCondition("if-has-artist", true); - Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(track->getArtist().id()))); + Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(track->getArtist().id()); Wt::WText *artistText = new Wt::WText(artistAnchor); artistText->setText(Wt::WString::fromUTF8(artist->getName(), Wt::PlainText)); entry->bindWidget("artist-name", artistAnchor); @@ -141,17 +140,17 @@ PlayQueue::addSome() if (release) { entry->setCondition("if-has-release", true); - Wt::WAnchor *releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(track->getRelease().id()))); + Wt::WAnchor *releaseAnchor = LmsApplication::createReleaseAnchor(track->getRelease().id()); Wt::WText *releaseText = new Wt::WText(releaseAnchor); releaseText->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); entry->bindWidget("release-name", releaseAnchor); } - auto playBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-entry-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.play"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); // TODO - auto addBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-entry-del-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.delete"), Wt::XHTMLText); entry->bindWidget("del-btn", addBtn); // TODO } From 7b0231da106cd8f99c9294e3a0b592b54f8d4b38 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 17 Mar 2018 18:22:10 +0100 Subject: [PATCH 079/195] Made the delete button work in the play queue --- src/database/Playlist.cpp | 29 ++++++++++++++------------ src/database/Playlist.hpp | 17 ++++++++------- src/ui/PlayQueueView.cpp | 44 ++++++++++++++++++++++++++------------- 3 files changed, 54 insertions(+), 36 deletions(-) diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index c5b2e125..d22e3ff2 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -42,9 +42,13 @@ Playlist::create(Wt::Dbo::Session& session, std::string name, bool isPublic, Wt: } PlaylistEntry::PlaylistEntry() -: _pos(0) { +} +PlaylistEntry::pointer +PlaylistEntry::getById(Wt::Dbo::Session& session, PlaylistEntry::id_type id) +{ + return session.find().where("id = ?").bind(id); } Playlist::pointer @@ -61,36 +65,35 @@ Playlist::getAll(Wt::Dbo::Session& session, Wt::Dbo::ptr user) return std::vector(res.begin(), res.end()); } -PlaylistEntry::PlaylistEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr playlist, int pos) -: _pos(pos), - _track(track), +PlaylistEntry::PlaylistEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr playlist) +: _track(track), _playlist(playlist) { } PlaylistEntry::pointer -PlaylistEntry::create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr playlist, int pos) +PlaylistEntry::create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr playlist) { - return session.add( new PlaylistEntry( track, playlist, pos) ); + return session.add( new PlaylistEntry( track, playlist) ); } -std::vector> -Playlist::getTracks(int offset, int size, bool& moreResults) const +std::vector> +Playlist::getEntries(int offset, int size, bool& moreResults) const { assert(session()); moreResults = false; - Wt::Dbo::collection> entries - = session()->find() + Wt::Dbo::collection> entries = + session()->find() .where("playlist_id = ?").bind(self().id()) - .orderBy("pos") + .orderBy("id") .limit(size != -1 ? size + 1 : -1) .offset(offset); - std::vector> res; + std::vector> res; for (auto entry : entries) { @@ -100,7 +103,7 @@ Playlist::getTracks(int offset, int size, bool& moreResults) const break; } - res.push_back(entry->getTrack()); + res.push_back(entry); } return res; diff --git a/src/database/Playlist.hpp b/src/database/Playlist.hpp index 0acc41b8..1c43cde8 100644 --- a/src/database/Playlist.hpp +++ b/src/database/Playlist.hpp @@ -33,7 +33,7 @@ class Track; class Playlist : public Wt::Dbo::Dbo { public: - typedef Wt::Dbo::ptr pointer; + using pointer = Wt::Dbo::ptr; Playlist(); Playlist(std::string name, bool isPublic, Wt::Dbo::ptr user); @@ -54,7 +54,7 @@ class Playlist : public Wt::Dbo::Dbo // Get tracks, ordered by position std::size_t getCount() const; - std::vector> getTracks(int offset, int size, bool& moreResults) const; + std::vector> getEntries(int offset, int size, bool& moreResults) const; template void persist(Action& a) @@ -78,28 +78,29 @@ class PlaylistEntry { public: - typedef Wt::Dbo::ptr pointer; + using pointer = Wt::Dbo::ptr; + using id_type = Wt::Dbo::dbo_traits::IdType; PlaylistEntry(); - PlaylistEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr playlist, int position); + PlaylistEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr playlist); + + static pointer getById(Wt::Dbo::Session& session, id_type id); // Create utility - static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr playlist, int position); + static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr playlist); - // Accesors + // Accessors Wt::Dbo::ptr getTrack() const { return _track; } template void persist(Action& a) { - Wt::Dbo::field(a, _pos, "pos"); Wt::Dbo::belongsTo(a, _track, "track", Wt::Dbo::OnDeleteCascade); Wt::Dbo::belongsTo(a, _playlist, "playlist", Wt::Dbo::OnDeleteCascade); } private: - int _pos; Wt::Dbo::ptr _track; Wt::Dbo::ptr _playlist; }; diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index 754e2c67..9991b056 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -53,12 +53,21 @@ PlayQueue::PlayQueue(Wt::WContainerWidget* parent) _showMore->setHidden(true); container->bindWidget("show-more", _showMore); + { + Wt::Dbo::Transaction transaction (DboSession()); + + auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); + if (!playlist) + playlist = Database::Playlist::create(DboSession(), currentPlayQueueName, false, CurrentUser()); + } + _showMore->clicked().connect(std::bind([=] { addSome(); })); refresh(); + } void @@ -70,16 +79,9 @@ PlayQueue::addTracks(const std::vector& tracks) LMS_LOG(UI, DEBUG) << "Adding tracks to the current queue"; auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); - if (!playlist) - { - playlist = Database::Playlist::create(DboSession(), currentPlayQueueName, false, CurrentUser()); - } - std::size_t pos = playlist->getCount(); for (auto track : tracks) - { - Database::PlaylistEntry::create(DboSession(), track, playlist, pos++); - } + Database::PlaylistEntry::create(DboSession(), track, playlist); addSome(); } @@ -116,13 +118,14 @@ PlayQueue::addSome() Wt::Dbo::Transaction transaction (DboSession()); auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); - if (!playlist) - return; bool moreResults; - auto tracks = playlist->getTracks(_entriesContainer->count(), 50, moreResults); - for (auto track : tracks) + auto playlistEntries = playlist->getEntries(_entriesContainer->count(), 50, moreResults); + for (auto playlistEntry : playlistEntries) { + auto playlistEntryId = playlistEntry.id(); + auto track = playlistEntry->getTrack(); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.PlayQueue.template.entry"), _entriesContainer); entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); @@ -150,9 +153,20 @@ PlayQueue::addSome() entry->bindWidget("play-btn", playBtn); // TODO - auto addBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.delete"), Wt::XHTMLText); - entry->bindWidget("del-btn", addBtn); - // TODO + auto delBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.delete"), Wt::XHTMLText); + entry->bindWidget("del-btn", delBtn); + delBtn->clicked().connect(std::bind([=] + { + // Remove the entry n both the widget tree and the playqueue + { + Wt::Dbo::Transaction transaction (DboSession()); + + auto entryToRemove = Database::PlaylistEntry::getById(DboSession(), playlistEntryId); + entryToRemove.remove(); + } + + _entriesContainer->removeWidget(entry); + })); } _showMore->setHidden(!moreResults); From 1d6a2bde4ae54e2a182f63470091f5fd623e0566 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 17 Mar 2018 18:46:19 +0100 Subject: [PATCH 080/195] Made the clear button work in the play queue, added a track number infox --- approot/messages.xml | 1 + approot/playqueue.xml | 3 ++- src/ui/PlayQueueView.cpp | 40 ++++++++++++++++++++++++++++++---------- src/ui/PlayQueueView.hpp | 4 +++- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/approot/messages.xml b/approot/messages.xml index a8fdd8e5..27112c53 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -55,6 +55,7 @@ Play Queue +{1} tracks Account diff --git a/approot/playqueue.xml b/approot/playqueue.xml index 496a2468..7c08fed1 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -17,7 +17,8 @@

${tr:Lms.PlayQueue.playqueue}

- ${save-btn} ${load-btn} ${clear-btn} + ${nb-tracks} + ${save-btn} ${load-btn} ${clear-btn}
${entries} ${show-more} diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index 9991b056..27926ec0 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -44,6 +44,19 @@ PlayQueue::PlayQueue(Wt::WContainerWidget* parent) auto clearBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.clear"), Wt::XHTMLText); container->bindWidget("clear-btn", clearBtn); + clearBtn->clicked().connect(std::bind([=] + { + { + Wt::Dbo::Transaction transaction(DboSession()); + + auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); + playlist.modify()->clear(); + _showMore->setHidden(true); + } + + _entriesContainer->clear(); + updateInfo(); + })); _entriesContainer = new Wt::WContainerWidget(); container->bindWidget("entries", _entriesContainer); @@ -53,6 +66,9 @@ PlayQueue::PlayQueue(Wt::WContainerWidget* parent) _showMore->setHidden(true); container->bindWidget("show-more", _showMore); + _nbTracks = new Wt::WText(); + container->bindWidget("nb-tracks", _nbTracks); + { Wt::Dbo::Transaction transaction (DboSession()); @@ -66,8 +82,17 @@ PlayQueue::PlayQueue(Wt::WContainerWidget* parent) addSome(); })); - refresh(); + updateInfo(); + addSome(); +} +void +PlayQueue::updateInfo() +{ + Wt::Dbo::Transaction transaction(DboSession()); + + auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); + _nbTracks->setText(Wt::WString::tr("Lms.PlayQueue.nb-tracks").arg(playlist->getCount())); } void @@ -83,6 +108,7 @@ PlayQueue::addTracks(const std::vector& tracks) for (auto track : tracks) Database::PlaylistEntry::create(DboSession(), track, playlist); + updateInfo(); addSome(); } @@ -94,8 +120,7 @@ PlayQueue::playTracks(const std::vector& tracks) Wt::Dbo::Transaction transaction(DboSession()); auto playqueue = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); - if (playqueue) - playqueue.modify()->clear(); + playqueue.modify()->clear(); _entriesContainer->clear(); @@ -105,13 +130,6 @@ PlayQueue::playTracks(const std::vector& tracks) } -void -PlayQueue::refresh() -{ - _entriesContainer->clear(); - addSome(); -} - void PlayQueue::addSome() { @@ -166,6 +184,8 @@ PlayQueue::addSome() } _entriesContainer->removeWidget(entry); + + updateInfo(); })); } diff --git a/src/ui/PlayQueueView.hpp b/src/ui/PlayQueueView.hpp index 9f8e932a..6975a0df 100644 --- a/src/ui/PlayQueueView.hpp +++ b/src/ui/PlayQueueView.hpp @@ -21,6 +21,7 @@ #include #include +#include #include "database/Types.hpp" @@ -35,11 +36,12 @@ class PlayQueue : public Wt::WContainerWidget void playTracks(const std::vector& tracks); private: - void refresh(); void addSome(); + void updateInfo(); Wt::WContainerWidget* _entriesContainer; Wt::WTemplate* _showMore; + Wt::WText* _nbTracks; }; } // namespace UserInterface From 50036c89181e6b5aa74e479e2892ac9032b7d895 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 18 Mar 2018 16:21:49 +0100 Subject: [PATCH 081/195] Notify scan updates only for administrators --- src/ui/LmsApplication.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 812d0828..4c9032e8 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -341,24 +341,24 @@ LmsApplication::handleAuthEvent(void) main->bindWidget("player", player); // Events from MediaScanner - // TODO: only if admin - enableUpdates(true); - std::string sessionId = this->sessionId(); - _scanner.scanComplete().connect(std::bind([=] (Scanner::MediaScanner::Stats stats) + if (CurrentUser()->isAdmin()) { - Wt::WServer::instance()->post(sessionId, [=] + enableUpdates(true); + std::string sessionId = this->sessionId(); + _scanner.scanComplete().connect(std::bind([=] (Scanner::MediaScanner::Stats stats) { - notify(Wt::WString::tr("Lms.Admin.Database.scan-complete") + Wt::WServer::instance()->post(sessionId, [=] + { + notify(Wt::WString::tr("Lms.Admin.Database.scan-complete") .arg(stats.nbFiles()) .arg(stats.additions) .arg(stats.deletions) .arg(stats.nbDuplicates()) .arg(stats.nbErrors())); - triggerUpdate(); - }); -// notify("TEST"); - }, std::placeholders::_1)); - + triggerUpdate(); + }); + }, std::placeholders::_1)); + } internalPathChanged().connect(std::bind([=] { From 5006a82ce646f5bf6ec8cf2b945e147009fb453f Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 19 Mar 2018 13:45:09 +0100 Subject: [PATCH 082/195] Added some logic in the playqueue (play next / play previous handling) --- docroot/css/lms.css | 188 +------------------------------------- src/database/Playlist.cpp | 13 +++ src/database/Playlist.hpp | 1 + src/ui/LmsApplication.cpp | 17 ++++ src/ui/MediaPlayer.cpp | 15 +++ src/ui/MediaPlayer.hpp | 11 +++ src/ui/PlayQueueView.cpp | 89 +++++++++++++++++- src/ui/PlayQueueView.hpp | 17 ++++ 8 files changed, 163 insertions(+), 188 deletions(-) diff --git a/docroot/css/lms.css b/docroot/css/lms.css index 9c47a5dc..47303070 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -1,191 +1,5 @@ -.main-nav { - margin-bottom: 0px; -} -.playqueue { - background-color: #EEE; - border-radius: 10px; - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4); -} - -.playqueue-playing { +.Lms-playqueue-selected { font-weight: bold; } -.playqueue-track { - font-size: 120%; - margin-top: 12px; - line-height: normal; -} - -.playqueue-artist { - line-height: normal; - font-style: italic; -} - -.playqueue-cover { - width: 64px; - height: 64px; -} - -.mediaplayer-track { - font-weight: bold; - font-size: 120%; -} - -.mediaplayer-artist { - font-style: italic; -} - -.mediaplayer { - background-color: #CCC; - border-radius: 10px; - display: flex; - justify-content: space-between; - align-items: center; - height: 72px; - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4); -} - -.mediaplayer-cover { - margin: 8px; - width: 64px; - min-width: 64px; - height: 64px; - min-height: 64px; - display: flex; - justify-content: space-between; - align-items: center; -} - -.mediaplayer-cover img { - border-radius: 8px; - border-radius: 8px; - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4); -} - -.mediaplayer-btn { - margin: 8px; -} - -.mediaplayer-btn i { - cursor: pointer; - text-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4); -} - -.mediaplayer-btn-active { - color: #428bca; -} - -.mediaplayer-info-container { - width: 100%; - min-width: 100px; - margin: 8px; -} - -.mediaplayer-track-info { - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; -} - -.mediaplayer-progress-container { - display: flex; - align-items: center; -} - -.mediaplayer-badge { - min-width: initial; -} - -.mediaplayer-current-duration { - margin-right: 8px; -} -.mediaplayer-total-duration { - margin-left: 8px; -} - -.mediaplayer-seekbar { -} - -.mediaplayer-volume-container { - width: 24px; - height: 64px; - margin: 8px; -} - -.mediaplayer-volume { - height: 64px; - -webkit-appearance: slider-vertical; - writing-mode: bt-lr; -} - -.mobile-btn { - margin: 8px; -} - -.mobile-btn-active { - color: #428bca; -} - -.mobile-btn i { - cursor: pointer; - text-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4); -} - -.mobile-search-title { - font-weight: bold; - height: 32px; - line-height: 32px; - background-color: grey; - color: white; - text-align: center; -} - -.mobile-search-entry { - min-height: 64px; - border-bottom: 1px solid lightgray; - overflow: hidden; - text-overflow: ellipsis; -} - -.mobile-search-entry:active { - background-color: lightgrey; -} - -.mobile-search-more { - height: 64px; - border-bottom: 1px solid lightgray; -} - -.mobile-search-more:active { - background-color: lightgrey; -} - -.mobile-track { - font-weight: bold; -} - -.mobile-artist { - font-style: italic; -} - -.vertical-align { - display: flex; - align-items: center; -} - -.mobile-audio-footer { - background-color: #f5f5f5; - height: 60px; -} - -.mobile-audio-player-cover { - width: 48px; - height: 48px; -} - -.release_res_shadow { - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.5) -} - diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index d22e3ff2..f29e4927 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -109,6 +109,19 @@ Playlist::getEntries(int offset, int size, bool& moreResults) const return res; } +Wt::Dbo::ptr +Playlist::getEntry(std::size_t pos) const +{ + Wt::Dbo::ptr res; + + bool moreResults; + auto entries = getEntries(pos, 1, moreResults); + if (!entries.empty()) + res = entries.front(); + + return res; +} + std::size_t Playlist::getCount() const { diff --git a/src/database/Playlist.hpp b/src/database/Playlist.hpp index 1c43cde8..4e2b1f04 100644 --- a/src/database/Playlist.hpp +++ b/src/database/Playlist.hpp @@ -54,6 +54,7 @@ class Playlist : public Wt::Dbo::Dbo // Get tracks, ordered by position std::size_t getCount() const; + Wt::Dbo::ptr getEntry(std::size_t pos) const; std::vector> getEntries(int offset, int size, bool& moreResults) const; template diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 4c9032e8..1c95261c 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -340,6 +340,23 @@ LmsApplication::handleAuthEvent(void) auto player = new MediaPlayer(); main->bindWidget("player", player); + // Events from MediaPlayer + player->playNext.connect(std::bind([=] + { + playqueue->playNext(); + })); + player->playPrevious.connect(std::bind([=] + { + playqueue->playPrevious(); + })); + player->playbackEnded.connect(std::bind([=] + { + playqueue->playNext(); + })); + + // Events from the PlayQueue + playqueue->playTrack.connect(player, &MediaPlayer::playTrack); + // Events from MediaScanner if (CurrentUser()->isAdmin()) { diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp index 23d603c6..f891e04b 100644 --- a/src/ui/MediaPlayer.cpp +++ b/src/ui/MediaPlayer.cpp @@ -21,6 +21,8 @@ #include #include +#include "utils/Logger.hpp" + #include "MediaPlayer.hpp" namespace UserInterface { @@ -35,9 +37,17 @@ MediaPlayer::MediaPlayer(Wt::WContainerWidget* parent) auto prevBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-prev"), Wt::XHTMLText); player->bindWidget("previous", prevBtn); + prevBtn->clicked().connect(std::bind([=] + { + playPrevious.emit(); + })); auto nextBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-next"), Wt::XHTMLText); player->bindWidget("next", nextBtn); + nextBtn->clicked().connect(std::bind([=] + { + playNext.emit(); + })); auto shuffleBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-shuffle"), Wt::XHTMLText); player->bindWidget("shuffle", shuffleBtn); @@ -53,7 +63,12 @@ MediaPlayer::MediaPlayer(Wt::WContainerWidget* parent) auto trackName = new Wt::WText("---"); player->bindWidget("track-name", trackName); +} +void +MediaPlayer::playTrack(Database::Track::id_type id) +{ + LMS_LOG(UI, DEBUG) << "Playing track ID = " << id; } } // namespace UserInterface diff --git a/src/ui/MediaPlayer.hpp b/src/ui/MediaPlayer.hpp index 69615b68..8cb013d6 100644 --- a/src/ui/MediaPlayer.hpp +++ b/src/ui/MediaPlayer.hpp @@ -19,14 +19,25 @@ #pragma once +#include #include +#include "database/Types.hpp" + namespace UserInterface { class MediaPlayer : public Wt::WContainerWidget { public: MediaPlayer(Wt::WContainerWidget* parent = 0); + + void playTrack(Database::Track::id_type); + + // Signals + Wt::Signal playbackEnded; + Wt::Signal playPrevious; + Wt::Signal playNext; + }; } // namespace UserInterface diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index 27926ec0..857ba4f8 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -75,6 +75,8 @@ PlayQueue::PlayQueue(Wt::WContainerWidget* parent) auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); if (!playlist) playlist = Database::Playlist::create(DboSession(), currentPlayQueueName, false, CurrentUser()); + + _trackPos = CurrentUser()->getCurPlayingTrackPos(); } _showMore->clicked().connect(std::bind([=] @@ -86,6 +88,63 @@ PlayQueue::PlayQueue(Wt::WContainerWidget* parent) addSome(); } +void +PlayQueue::stop() +{ + updateCurrentTrack(false); + _trackPos.reset(); +} + +void +PlayQueue::play(std::size_t pos) +{ + updateCurrentTrack(false); + + Database::Track::id_type trackId; + { + Wt::Dbo::Transaction transaction(DboSession()); + + auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); + + // If out of range, stop playing + if (pos >= playlist->getCount()) + { + stop(); + return; + } + + _trackPos = pos; + trackId = playlist->getEntry(*_trackPos)->getTrack().id(); + updateCurrentTrack(true); + } + + playTrack.emit(trackId); +} + +void +PlayQueue::playPrevious() +{ + if (!_trackPos) + return; + + if (*_trackPos == 0) + stop(); + else + play(*_trackPos - 1); +} + +void +PlayQueue::playNext() +{ + if (!_trackPos) + { + play(0); + return; + } + + play(*_trackPos + 1); +} + void PlayQueue::updateInfo() { @@ -95,6 +154,22 @@ PlayQueue::updateInfo() _nbTracks->setText(Wt::WString::tr("Lms.PlayQueue.nb-tracks").arg(playlist->getCount())); } +void +PlayQueue::updateCurrentTrack(bool selected) +{ + if (!_trackPos || *_trackPos >= static_cast(_entriesContainer->count())) + return; + + auto track = _entriesContainer->widget(*_trackPos); + if (track) + { + if (selected) + track->addStyleClass("Lms-playqueue-selected"); + else + track->removeStyleClass("Lms-playqueue-selected"); + } +} + void PlayQueue::addTracks(const std::vector& tracks) { @@ -169,7 +244,12 @@ PlayQueue::addSome() auto playBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.play"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); - // TODO + playBtn->clicked().connect(std::bind([=] + { + auto pos = _entriesContainer->indexOf(entry); + if (pos >= 0) + play(pos); + })); auto delBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.delete"), Wt::XHTMLText); entry->bindWidget("del-btn", delBtn); @@ -183,6 +263,13 @@ PlayQueue::addSome() entryToRemove.remove(); } + if (_trackPos) + { + auto pos = _entriesContainer->indexOf(entry); + if (pos > 0 && *_trackPos >= static_cast(pos)) + (*_trackPos)--; + } + _entriesContainer->removeWidget(entry); updateInfo(); diff --git a/src/ui/PlayQueueView.hpp b/src/ui/PlayQueueView.hpp index 6975a0df..13628cd9 100644 --- a/src/ui/PlayQueueView.hpp +++ b/src/ui/PlayQueueView.hpp @@ -20,9 +20,12 @@ #pragma once #include +#include #include #include +#include + #include "database/Types.hpp" namespace UserInterface { @@ -35,13 +38,27 @@ class PlayQueue : public Wt::WContainerWidget void addTracks(const std::vector& tracks); void playTracks(const std::vector& tracks); + // play the next track in the queue + void playNext(); + + // play the previous track in the queue + void playPrevious(); + + // Signal emitted when a track is to be played + Wt::Signal playTrack; + private: void addSome(); void updateInfo(); + void updateCurrentTrack(bool selected); + + void play(std::size_t pos); + void stop(); Wt::WContainerWidget* _entriesContainer; Wt::WTemplate* _showMore; Wt::WText* _nbTracks; + boost::optional _trackPos; // current track position, if set }; } // namespace UserInterface From d87731c09edefd45e77b656674f7d74cb9c310b6 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 19 Mar 2018 13:48:25 +0100 Subject: [PATCH 083/195] Auto play when playing something found while exploring the collection --- src/ui/PlayQueueView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index 857ba4f8..a839b993 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -201,7 +201,7 @@ PlayQueue::playTracks(const std::vector& tracks) addTracks(tracks); - // TODO Immediate play + play(0); } From 4683a9ef1e24f0aec9c7482e6b5a015b4cb0106d Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 21 Mar 2018 22:26:57 +0100 Subject: [PATCH 084/195] Made the player work, first WIP version --- approot/templates.xml | 2 +- docroot/css/lms.css | 4 + src/Makefile.am | 1 - src/av/AvInfo.cpp | 6 +- src/av/AvInfo.hpp | 3 +- src/av/AvTranscoder.cpp | 71 ++---- src/av/AvTranscoder.hpp | 35 +-- src/ui/LmsApplication.cpp | 4 + src/ui/LmsApplication.hpp | 5 +- src/ui/MediaPlayer.cpp | 45 +++- src/ui/MediaPlayer.hpp | 4 + src/ui/PlayQueueView.cpp | 1 + src/ui/PlayQueueView.hpp | 3 + src/ui/explore/ArtistView.cpp | 2 + src/ui/explore/ReleaseView.cpp | 2 + src/ui/explore/ReleasesView.cpp | 2 + src/ui/explore/TracksView.cpp | 2 + .../AvConvTranscodeStreamResource.cpp | 101 --------- .../AvConvTranscodeStreamResource.hpp | 51 ----- src/ui/resource/TranscodeResource.cpp | 214 ++++++++---------- src/ui/resource/TranscodeResource.hpp | 4 +- 21 files changed, 200 insertions(+), 362 deletions(-) delete mode 100644 src/ui/resource/AvConvTranscodeStreamResource.cpp delete mode 100644 src/ui/resource/AvConvTranscodeStreamResource.hpp diff --git a/approot/templates.xml b/approot/templates.xml index 76e1f019..c2e348de 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -4,7 +4,7 @@ ${navbar-top class="main-nav"} ${contents class="container"} - ${player} + ${player class="Lms-player"} diff --git a/docroot/css/lms.css b/docroot/css/lms.css index 47303070..b259d5a1 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -3,3 +3,7 @@ font-weight: bold; } +.Lms-player { + background-color: grey; +} + diff --git a/src/Makefile.am b/src/Makefile.am index 66a1efd3..b5c510a8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,7 +39,6 @@ lms_SOURCES = \ $(srcdir)/ui/explore/ReleasesView.cpp \ $(srcdir)/ui/explore/ReleaseView.cpp \ $(srcdir)/ui/explore/TracksView.cpp \ - $(srcdir)/ui/resource/AvConvTranscodeStreamResource.cpp \ $(srcdir)/ui/resource/ImageResource.cpp \ $(srcdir)/ui/resource/TranscodeResource.cpp \ $(srcdir)/utils/Config.cpp \ diff --git a/src/av/AvInfo.cpp b/src/av/AvInfo.cpp index 90aa10d4..43f2332f 100644 --- a/src/av/AvInfo.cpp +++ b/src/av/AvInfo.cpp @@ -201,7 +201,7 @@ MediaFile::getStreams(Stream::Type type) const return res; } -int +boost::optional MediaFile::getBestStreamId(Stream::Type type) const { if (_context == nullptr) @@ -215,7 +215,7 @@ MediaFile::getBestStreamId(Stream::Type type) const case Stream::Type::Video: avMediaType = AVMEDIA_TYPE_VIDEO; break; case Stream::Type::Subtitle: avMediaType = AVMEDIA_TYPE_SUBTITLE; break; default: - return -1; + return boost::none; } int res = av_find_best_stream(_context, @@ -227,7 +227,7 @@ MediaFile::getBestStreamId(Stream::Type type) const if (res < 0) { LMS_LOG(AV, ERROR) << "Cannot find best stream for type " << streamType_to_string(type); - return -1; + return boost::none; } return res; diff --git a/src/av/AvInfo.hpp b/src/av/AvInfo.hpp index 377fd6fd..1bb92e1b 100644 --- a/src/av/AvInfo.hpp +++ b/src/av/AvInfo.hpp @@ -35,6 +35,7 @@ extern "C" #include #include +#include #include #include //no i/o just types @@ -84,7 +85,7 @@ class MediaFile std::map getMetaData(void); std::vector getStreams(Stream::Type type) const; - int getBestStreamId(Stream::Type type) const; // -1 if failure/unknown + boost::optional getBestStreamId(Stream::Type type) const; // none if failure/unknown bool hasAttachedPictures(void) const; std::vector getAttachedPictures(std::size_t nbMaxPictures) const; diff --git a/src/av/AvTranscoder.cpp b/src/av/AvTranscoder.cpp index 3a82fcf8..44c7c33f 100644 --- a/src/av/AvTranscoder.cpp +++ b/src/av/AvTranscoder.cpp @@ -39,11 +39,8 @@ static std::vector encodingInfos = { {Encoding::MP3, "audio/mp3", 0}, {Encoding::OGA, "audio/ogg", 1}, - {Encoding::OGV, "video/ogg", 2}, {Encoding::WEBMA, "audio/webm", 3}, - {Encoding::WEBMV, "video/webm", 4}, {Encoding::M4A, "audio/mp4", 5}, - {Encoding::M4V, "video/mp4", 6}, }; std::string encoding_to_mimetype(Encoding encoding) @@ -139,10 +136,10 @@ Transcoder::start() args.push_back("-nostdin"); // input Offset - if (_parameters.getOffset().total_seconds() > 0) + if (_parameters.offset.total_seconds() > 0) { args.push_back("-ss"); - args.push_back(std::to_string(_parameters.getOffset().total_seconds())); + args.push_back(std::to_string(_parameters.offset.total_seconds())); } // Input file @@ -151,20 +148,24 @@ Transcoder::start() // Output bitrates args.push_back("-b:a"); - args.push_back(std::to_string(_parameters.getBitrate(Stream::Type::Audio))); -// if (_parameters.getOutputFormat().getType() == Format::Video) -// oss << " -b:v " << _parameters.getOutputBitrate(Stream::Video); + args.push_back(std::to_string(_parameters.bitrate)); - // Stream mapping - for (int streamId : _parameters.getSelectedStreamIds()) + // Stream mapping, if set + if (_parameters.stream) { - // 0 means the first input file args.push_back("-map"); - args.push_back("0:" + std::to_string(streamId)); + args.push_back("0:" + std::to_string(*_parameters.stream)); } + // Strip metadata + args.push_back("-map_metadata"); + args.push_back("-1"); + + // Skip video flows (including covers) + args.push_back("-vn"); + // Codecs and formats - switch( _parameters.getEncoding()) + switch( _parameters.encoding) { case Encoding::MP3: args.push_back("-f"); @@ -178,20 +179,6 @@ Transcoder::start() args.push_back("ogg"); break; - case Encoding::OGV: - args.push_back("-acodec"); - args.push_back("libvorbis"); - args.push_back("-ac"); - args.push_back("2"); - args.push_back("-ar"); - args.push_back("44100"); - args.push_back("-vcodec"); - args.push_back("libtheora"); - args.push_back("-threads"); - args.push_back("4"); - args.push_back("-f"); - args.push_back("ogg"); - break; case Encoding::WEBMA: args.push_back("-codec:a"); args.push_back("libvorbis"); @@ -199,21 +186,6 @@ Transcoder::start() args.push_back("webm"); break; - case Encoding::WEBMV: - args.push_back("-acodec"); - args.push_back("libvorbis"); - args.push_back("-ac"); - args.push_back("2"); - args.push_back("-ar"); - args.push_back("44100"); - args.push_back("-vcodec"); - args.push_back("libvpx"); - args.push_back("-threads"); - args.push_back("4"); - args.push_back("-f"); - args.push_back("webm"); - break; - case Encoding::M4A: args.push_back("-acodec"); args.push_back("aac"); @@ -223,21 +195,6 @@ Transcoder::start() args.push_back("experimental"); break; - case Encoding::M4V: - args.push_back("-acodec"); - args.push_back("aac"); - args.push_back("-strict"); - args.push_back("experimental"); - args.push_back("-ac"); - args.push_back("2"); - args.push_back("-ar"); - args.push_back("-44100"); - args.push_back("-vcodec"); - args.push_back("libx264"); - args.push_back("-f"); - args.push_back("m4v"); - break; - default: return false; } diff --git a/src/av/AvTranscoder.hpp b/src/av/AvTranscoder.hpp index cf958fd3..73e10ec5 100644 --- a/src/av/AvTranscoder.hpp +++ b/src/av/AvTranscoder.hpp @@ -25,8 +25,8 @@ #include #include //no i/o just types -#include #include +#include #include "AvInfo.hpp" @@ -39,42 +39,23 @@ enum class Encoding OGV, MP3, WEBMA, - WEBMV, M4A, - M4V, }; std::string encoding_to_mimetype(Encoding encoding); int encoding_to_int(Encoding encoding); Encoding encoding_from_int(int encoding); -class TranscodeParameters +struct TranscodeParameters { - public: + Encoding encoding = Encoding::MP3; + boost::optional stream = boost::none; // Id of the stream to be transcoded (auto detect by default) + std::size_t bitrate = 128000; + boost::posix_time::time_duration offset = boost::posix_time::seconds(0); - // Setters - void setEncoding(Encoding encoding) { _encoding = encoding; } - void setOffset(boost::posix_time::time_duration offset) {_offset = offset; } - void setBitrate(Stream::Type type, std::size_t bitrate) { _outputBitrate[type] = bitrate; } - - // Manually add the streams to be transcoded - // If no stream is added, input streams are selected automatically - void addStream(int inputStreamId) { _selectedStreams.insert(inputStreamId); } - - // Getters - Encoding getEncoding(void) const { return _encoding; } - boost::posix_time::time_duration getOffset(void) const { return _offset; } - std::set getSelectedStreamIds(void) const { return _selectedStreams; } - std::size_t getBitrate(Stream::Type type) { return _outputBitrate[type]; } - - private: - Encoding _encoding = Encoding::MP3; - boost::posix_time::time_duration _offset = boost::posix_time::seconds(0); - std::set _selectedStreams; - std::map _outputBitrate = { {Stream::Type::Audio, 0}, { Stream::Type::Video, 0}, { Stream::Type::Subtitle, 0} }; + TranscodeParameters() {} }; - class Transcoder { public: @@ -89,7 +70,7 @@ class Transcoder bool start(); void process(std::vector& output, std::size_t maxSize); - bool isComplete(void) { return _isComplete; } + bool isComplete(void) const { return _isComplete; } const TranscodeParameters& getParameters() const { return _parameters; } diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 1c95261c..5b28bcee 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -40,6 +40,9 @@ #include "admin/DatabaseSettingsView.hpp" #include "admin/AdminWizardView.hpp" +#include "resource/ImageResource.hpp" +#include "resource/TranscodeResource.hpp" + #include "LmsApplication.hpp" namespace UserInterface { @@ -356,6 +359,7 @@ LmsApplication::handleAuthEvent(void) // Events from the PlayQueue playqueue->playTrack.connect(player, &MediaPlayer::playTrack); + playqueue->playbackStop.connect(player, &MediaPlayer::stop); // Events from MediaScanner if (CurrentUser()->isAdmin()) diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index 59f0875a..5b7d336a 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -26,12 +26,13 @@ #include "database/DatabaseHandler.hpp" #include "scanner/MediaScanner.hpp" -#include "resource/ImageResource.hpp" -#include "resource/TranscodeResource.hpp" #include "Auth.hpp" namespace UserInterface { +class TranscodeResource; +class ImageResource; + class LmsApplication : public Wt::WApplication { public: diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp index f891e04b..849ee478 100644 --- a/src/ui/MediaPlayer.cpp +++ b/src/ui/MediaPlayer.cpp @@ -21,15 +21,29 @@ #include #include +#include "av/AvInfo.hpp" #include "utils/Logger.hpp" +#include "resource/TranscodeResource.hpp" + +#include "LmsApplication.hpp" #include "MediaPlayer.hpp" + namespace UserInterface { MediaPlayer::MediaPlayer(Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent) { + _audio = new Wt::WAudio(this); + _audio->setOptions(Wt::WAudio::Autoplay); + _audio->setPreloadMode(Wt::WAudio::PreloadNone); + + _audio->ended().connect(std::bind([=] () + { + playbackEnded.emit(); + })); + auto player = new Wt::WTemplate(Wt::WString::tr("template-mediaplayer"), this); auto playPauseBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-play"), Wt::XHTMLText); @@ -66,9 +80,36 @@ MediaPlayer::MediaPlayer(Wt::WContainerWidget* parent) } void -MediaPlayer::playTrack(Database::Track::id_type id) +MediaPlayer::playTrack(Database::Track::id_type trackId) { - LMS_LOG(UI, DEBUG) << "Playing track ID = " << id; + LMS_LOG(UI, DEBUG) << "Playing track ID = " << trackId; + + Wt::Dbo::Transaction transaction(DboSession()); + auto track = Database::Track::getById(DboSession(), trackId); + transaction.commit(); + + // Analyse track, select the best media stream + Av::MediaFile mediaFile(track->getPath()); + + if (!mediaFile.open() || !mediaFile.scan()) + { + LMS_LOG(UI, ERROR) << "Cannot open file '" << track->getPath(); + return; + } + + auto streamId = mediaFile.getBestStreamId(Av::Stream::Type::Audio); + + _audio->pause(); + _audio->clearSources(); + _audio->addSource(LmsApp->getTranscodeResource()->getUrl(trackId, Av::Encoding::MP3, boost::posix_time::seconds(0), streamId)); + _audio->setPreloadMode(Wt::WAudio::PreloadNone); + _audio->play(); +} + +void +MediaPlayer::stop() +{ + _audio->pause(); } } // namespace UserInterface diff --git a/src/ui/MediaPlayer.hpp b/src/ui/MediaPlayer.hpp index 8cb013d6..8b36d8eb 100644 --- a/src/ui/MediaPlayer.hpp +++ b/src/ui/MediaPlayer.hpp @@ -20,6 +20,7 @@ #pragma once #include +#include #include #include "database/Types.hpp" @@ -31,6 +32,7 @@ class MediaPlayer : public Wt::WContainerWidget public: MediaPlayer(Wt::WContainerWidget* parent = 0); + void stop(); void playTrack(Database::Track::id_type); // Signals @@ -38,6 +40,8 @@ class MediaPlayer : public Wt::WContainerWidget Wt::Signal playPrevious; Wt::Signal playNext; + private: + Wt::WAudio* _audio; }; } // namespace UserInterface diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index a839b993..e5bce0b4 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -93,6 +93,7 @@ PlayQueue::stop() { updateCurrentTrack(false); _trackPos.reset(); + playbackStop.emit(); } void diff --git a/src/ui/PlayQueueView.hpp b/src/ui/PlayQueueView.hpp index 13628cd9..18a0de34 100644 --- a/src/ui/PlayQueueView.hpp +++ b/src/ui/PlayQueueView.hpp @@ -47,6 +47,9 @@ class PlayQueue : public Wt::WContainerWidget // Signal emitted when a track is to be played Wt::Signal playTrack; + // Signal emitted when play has to be stopped + Wt::Signal playbackStop; + private: void addSome(); void updateInfo(); diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index 1f443339..ec21c004 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -28,6 +28,8 @@ #include "utils/Logger.hpp" #include "utils/Utils.hpp" +#include "resource/ImageResource.hpp" + #include "LmsApplication.hpp" #include "Filters.hpp" #include "ArtistView.hpp" diff --git a/src/ui/explore/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp index 37c2487a..47018e67 100644 --- a/src/ui/explore/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -28,6 +28,8 @@ #include "utils/Logger.hpp" #include "utils/Utils.hpp" +#include "resource/ImageResource.hpp" + #include "LmsApplication.hpp" #include "Filters.hpp" #include "ReleaseView.hpp" diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index 6bf9dddf..3fceee00 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -28,6 +28,8 @@ #include "utils/Logger.hpp" #include "utils/Utils.hpp" +#include "resource/ImageResource.hpp" + #include "LmsApplication.hpp" #include "Filters.hpp" #include "ReleasesView.hpp" diff --git a/src/ui/explore/TracksView.cpp b/src/ui/explore/TracksView.cpp index 4875e597..531623e7 100644 --- a/src/ui/explore/TracksView.cpp +++ b/src/ui/explore/TracksView.cpp @@ -27,6 +27,8 @@ #include "utils/Logger.hpp" #include "utils/Utils.hpp" +#include "resource/ImageResource.hpp" + #include "LmsApplication.hpp" #include "Filters.hpp" #include "TracksView.hpp" diff --git a/src/ui/resource/AvConvTranscodeStreamResource.cpp b/src/ui/resource/AvConvTranscodeStreamResource.cpp deleted file mode 100644 index 528d9cba..00000000 --- a/src/ui/resource/AvConvTranscodeStreamResource.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - - -#include -#include - -#include "utils/Logger.hpp" - -#include "AvConvTranscodeStreamResource.hpp" - -namespace UserInterface { - -AvConvTranscodeStreamResource::AvConvTranscodeStreamResource(boost::filesystem::path p, Av::TranscodeParameters parameters, Wt::WObject *parent) -: Wt::WResource(parent), -_filePath(p), -_parameters( parameters ) -{ - LMS_LOG(UI, DEBUG) << "CONSTRUCTING RESOURCE"; -} - -AvConvTranscodeStreamResource::~AvConvTranscodeStreamResource() -{ - LMS_LOG(UI, DEBUG) << "DESTRUCTING RESOURCE"; - beingDeleted(); -} - -void -AvConvTranscodeStreamResource::handleRequest(const Wt::Http::Request& request, - Wt::Http::Response& response) -{ - LMS_LOG(UI, DEBUG) << "Handling new request..."; - - // see if this request is for a continuation: - Wt::Http::ResponseContinuation *continuation = request.continuation(); - - LMS_LOG(UI, DEBUG) << "Handling new request. Continuation = " << continuation; - - std::shared_ptr transcoder; - if (continuation) - transcoder = boost::any_cast >(continuation->data()); - - if (!transcoder) - { - LMS_LOG(UI, DEBUG) << "Launching transcoder"; - transcoder = std::make_shared( _filePath, _parameters); - - LMS_LOG(UI, DEBUG) << "Mime type set to '" << Av::encoding_to_mimetype(_parameters.getEncoding()); - response.setMimeType( Av::encoding_to_mimetype(_parameters.getEncoding()) ); - - if (!transcoder->start()) - { - LMS_LOG(UI, ERROR) << "Cannot start transcoder"; - return; - } - } - - if (!transcoder->isComplete()) - { - std::vector data; - data.reserve(_bufferSize); - - transcoder->process(data, _bufferSize); - - // Give the client all the output data - response.out().write(reinterpret_cast(&data[0]), data.size()); - - LMS_LOG(UI, DEBUG) << "Written " << data.size() << " bytes! complete = " << std::boolalpha << transcoder->isComplete(); - - if (!response.out()) - LMS_LOG(UI, ERROR) << "Write failed!"; - } - - if (!transcoder->isComplete() && response.out()) { - continuation = response.createContinuation(); - continuation->setData(transcoder); - LMS_LOG(UI, DEBUG) << "Continuation set to " << continuation; - } - else - LMS_LOG(UI, DEBUG) << "No more data!"; -} - -} // namespace UserInterface - - diff --git a/src/ui/resource/AvConvTranscodeStreamResource.hpp b/src/ui/resource/AvConvTranscodeStreamResource.hpp deleted file mode 100644 index b6fbbb94..00000000 --- a/src/ui/resource/AvConvTranscodeStreamResource.hpp +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#ifndef AVCONV_TRANSCODE_STREAM_RESOURCE_HPP -#define AVCONV_TRANSCODE_STREAM_RESOURCE_HPP - -#include -#include - -#include - -#include "av/AvTranscoder.hpp" - -namespace UserInterface { - -class AvConvTranscodeStreamResource : public Wt::WResource -{ - public: - AvConvTranscodeStreamResource(boost::filesystem::path p, Av::TranscodeParameters parameters, Wt::WObject *parent = 0); - ~AvConvTranscodeStreamResource(); - - void handleRequest(const Wt::Http::Request& request, - Wt::Http::Response& response); - - private: - boost::filesystem::path _filePath; - Av::TranscodeParameters _parameters; - - static const std::size_t _bufferSize = 8192; -}; - -} // namespace UserInterface - -#endif - diff --git a/src/ui/resource/TranscodeResource.cpp b/src/ui/resource/TranscodeResource.cpp index f12c6fad..428a68d2 100644 --- a/src/ui/resource/TranscodeResource.cpp +++ b/src/ui/resource/TranscodeResource.cpp @@ -41,15 +41,13 @@ TranscodeResource:: ~TranscodeResource() } std::string -TranscodeResource::getUrl(Database::Track::id_type trackId, Av::Encoding encoding, std::size_t offset, std::vector streamIds) const +TranscodeResource::getUrl(Database::Track::id_type trackId, Av::Encoding encoding, boost::posix_time::time_duration offset, boost::optional streamId) const { std::string res = url()+ "&trackid=" + std::to_string(trackId) + "&encoding=" + std::to_string(Av::encoding_to_int(encoding)); - if (!streamIds.empty()) - { - for (std::size_t streamId : streamIds) - res += "&stream=" + std::to_string(streamId); - } - res += "&offset=" + std::to_string(offset); + if (streamId) + res += "&stream=" + std::to_string(*streamId); + res += "&offset=" + std::to_string(offset.seconds()); + return res; } @@ -57,121 +55,107 @@ void TranscodeResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response) { - // Retrieve parameters - const std::string *trackIdStr = request.getParameter("trackid"); - const std::string *offsetStr = request.getParameter("offset"); - const std::string *encodingStr = request.getParameter("encoding"); - std::vector streams = request.getParameterValues ("stream"); + std::shared_ptr transcoder; LMS_LOG(UI, DEBUG) << "Handling new request..."; - try + // First, see if this request is for a continuation + Wt::Http::ResponseContinuation *continuation = request.continuation(); + if (continuation) { - std::shared_ptr transcoder; - - // First, see if this request is for a continuation - Wt::Http::ResponseContinuation *continuation = request.continuation(); - if (continuation) - { - LMS_LOG(UI, DEBUG) << "Continuation! " << continuation ; - transcoder = boost::any_cast >(continuation->data()); - if (!transcoder) - { - LMS_LOG(UI, ERROR) << "No transcoder set -> abort!"; - return; - } - } - else - { - LMS_LOG(UI, DEBUG) << "No continuation yet"; - - if (!trackIdStr - || !offsetStr - || !encodingStr) - { - LMS_LOG(UI, ERROR) << "Missing transcode parameter"; - return; - } - - Database::Track::id_type trackId = std::stol(*trackIdStr); - - // transactions are not thread safe - { - Wt::WApplication::UpdateLock lock(LmsApplication::instance()); - - Wt::Dbo::Transaction transaction(_db.getSession()); - - Database::User::pointer user = _db.getCurrentUser(); - Database::Track::pointer track = Database::Track::getById(_db.getSession(), trackId); - - if (!track) - { - LMS_LOG(UI, ERROR) << "Missing track"; - return; - } - - if (!user) - { - LMS_LOG(UI, ERROR) << "Missing user"; - return; - } - - Av::TranscodeParameters parameters; - - parameters.setOffset(boost::posix_time::seconds(std::stol(*offsetStr))); - parameters.setEncoding(Av::encoding_from_int(std::stol(*encodingStr))); - parameters.setBitrate(Av::Stream::Type::Audio, user->getAudioBitrate() ); - for (std::string strStream: streams) - { - LMS_LOG(UI, DEBUG) << "Added stream " << std::stol(strStream); - parameters.addStream(std::stol(strStream)); - } - - LMS_LOG(UI, DEBUG) << "Offset set to " << parameters.getOffset(); - transcoder = std::make_shared(track->getPath(), parameters); - } - - std::string mimeType = Av::encoding_to_mimetype(transcoder->getParameters().getEncoding()); - - LMS_LOG(UI, DEBUG) << "Mime type set to '" << mimeType << "'"; - response.setMimeType(mimeType); - - if (!transcoder->start()) - { - LMS_LOG(UI, ERROR) << "Cannot start transcoder"; - return; - } - - LMS_LOG(UI, DEBUG) << "Transcoder started"; - } - - if (!transcoder->isComplete()) - { - std::vector data; - data.reserve(_chunkSize); - - transcoder->process(data, _chunkSize); - - response.out().write(reinterpret_cast(&data[0]), data.size()); - LMS_LOG(UI, DEBUG) << "Written " << data.size() << " bytes! complete = " << std::boolalpha << transcoder->isComplete(); - - if (!response.out()) - { - LMS_LOG(UI, ERROR) << "Write failed!"; - } - } - - if (!transcoder->isComplete() && response.out()) { - continuation = response.createContinuation(); - continuation->setData(transcoder); - } - else - LMS_LOG(UI, DEBUG) << "No more data!"; + LMS_LOG(UI, DEBUG) << "Continuation! " << continuation ; + transcoder = boost::any_cast>(continuation->data()); } - catch (std::invalid_argument& e) + else { - LMS_LOG(UI, ERROR) << "Invalid argument: " << e.what(); + Database::Track::id_type trackId; + Av::TranscodeParameters parameters; + + LMS_LOG(UI, DEBUG) << "No continuation yet"; + try + { + auto trackIdStr = request.getParameter("trackid"); + if (!trackIdStr) + { + LMS_LOG(UI, ERROR) << "Missing trackid transcode parameter!"; + return; + } + trackId = std::stol(*request.getParameter("trackid")); + + auto offsetStr = request.getParameter("offset"); + if (offsetStr) + parameters.offset = boost::posix_time::seconds(std::stol(*offsetStr)); + + auto encodingStr = request.getParameter("encoding"); + if (encodingStr) + parameters.encoding = Av::encoding_from_int(std::stol(*encodingStr)); + + auto streamStr = request.getParameter("stream"); + if (streamStr) + parameters.stream = std::stol(*streamStr); + } + catch (std::exception &e) + { + LMS_LOG(UI, ERROR) << "Exception while handling URL parameters: " << e.what(); + return; + } + + // transactions are not thread safe + { + Wt::WApplication::UpdateLock lock(LmsApplication::instance()); + + Wt::Dbo::Transaction transaction(_db.getSession()); + + Database::User::pointer user = _db.getCurrentUser(); + Database::Track::pointer track = Database::Track::getById(_db.getSession(), trackId); + + if (!track) + { + LMS_LOG(UI, ERROR) << "Missing track"; + return; + } + + parameters.bitrate = user->getAudioBitrate(); + transcoder = std::make_shared(track->getPath(), parameters); + } + + std::string mimeType = Av::encoding_to_mimetype(transcoder->getParameters().encoding); + + LMS_LOG(UI, DEBUG) << "Mime type set to '" << mimeType << "'"; + response.setMimeType(mimeType); + + if (!transcoder->start()) + { + LMS_LOG(UI, ERROR) << "Cannot start transcoder"; + return; + } + + LMS_LOG(UI, DEBUG) << "Transcoder started"; } + + if (!transcoder->isComplete()) + { + std::vector data; + data.reserve(_chunkSize); + + transcoder->process(data, _chunkSize); + + response.out().write(reinterpret_cast(&data[0]), data.size()); + LMS_LOG(UI, DEBUG) << "Written " << data.size() << " bytes! complete = " << std::boolalpha << transcoder->isComplete(); + + if (!response.out()) + { + LMS_LOG(UI, ERROR) << "Write failed!"; + } + } + + if (!transcoder->isComplete() && response.out()) + { + continuation = response.createContinuation(); + continuation->setData(transcoder); + } + else + LMS_LOG(UI, DEBUG) << "No more data!"; } } // namespace UserInterface diff --git a/src/ui/resource/TranscodeResource.hpp b/src/ui/resource/TranscodeResource.hpp index 4ed7b4c5..a13f4e9b 100644 --- a/src/ui/resource/TranscodeResource.hpp +++ b/src/ui/resource/TranscodeResource.hpp @@ -21,6 +21,8 @@ #include +#include + #include #include "av/AvTranscoder.hpp" @@ -35,7 +37,7 @@ class TranscodeResource : public Wt::WResource TranscodeResource(Database::Handler& db, Wt::WObject *parent); ~TranscodeResource(); - std::string getUrl(Database::Track::id_type trackId, Av::Encoding encoding = Av::Encoding::OGA, size_t offset_secs = 0, std::vector streamIds = {}) const; + std::string getUrl(Database::Track::id_type trackId, Av::Encoding encoding, boost::posix_time::time_duration offset, boost::optional stream = boost::none) const; void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response); From 937729f8ffd3ffc53ea87ef82c98902c63396bef Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 21 Mar 2018 23:12:14 +0100 Subject: [PATCH 085/195] Simplified a bit the AvInfo part --- src/av/AvInfo.cpp | 138 +++++---------------- src/av/AvInfo.hpp | 37 +++--- src/cover/CoverArtGrabber.cpp | 14 ++- src/metadata/AvFormat.cpp | 219 +++++++++++++++++----------------- src/metadata/MetaData.hpp | 2 +- src/metadata/TagLibParser.cpp | 2 +- src/ui/MediaPlayer.cpp | 28 +++-- src/utils/Exception.hpp | 30 +++++ 8 files changed, 211 insertions(+), 259 deletions(-) create mode 100644 src/utils/Exception.hpp diff --git a/src/av/AvInfo.cpp b/src/av/AvInfo.cpp index 43f2332f..8ba4551c 100644 --- a/src/av/AvInfo.cpp +++ b/src/av/AvInfo.cpp @@ -25,18 +25,6 @@ namespace Av { -static std::string streamType_to_string(Stream::Type type) -{ - switch (type) - { - case Stream::Type::Audio: return "audio"; - case Stream::Type::Video: return "video"; - case Stream::Type::Subtitle: return "subtitle"; - } - - return "unknown"; -} - static std::string averror_to_string(int error) { std::array buf = {0}; @@ -47,6 +35,10 @@ static std::string averror_to_string(int error) return "Unknown error"; } +MediaFileException::MediaFileException(int avError) +: LmsException("MediaFileException: " + averror_to_string(avError)) +{ +} void AvInit() { @@ -62,52 +54,30 @@ void AvInit() MediaFile::MediaFile(const boost::filesystem::path& p) : _p(p), _context(nullptr) { + int error = avformat_open_input(&_context, _p.string().c_str(), nullptr, nullptr); + if (error < 0) + { + LMS_LOG(AV, ERROR) << "Cannot open " << _p << ": " << averror_to_string(error); + throw MediaFileException(error); + } + + error = avformat_find_stream_info(_context, nullptr); + if (error < 0) + { + LMS_LOG(AV, ERROR) << "Cannot find stream information on " << _p << ": " << averror_to_string(error); + avformat_close_input(&_context); + throw MediaFileException(error); + } } MediaFile::~MediaFile() { - if (_context != nullptr) - avformat_close_input(&_context); -} - -bool -MediaFile::open(void) -{ - if (_context != nullptr) - throw std::logic_error("inputfile '" + _p.string() + "' already open"); - - int error = avformat_open_input(&_context, _p.string().c_str(), nullptr, nullptr); - if (error < 0) - { - LMS_LOG(AV, ERROR) << "Cannot open '" << _p.string() << "': " << averror_to_string(error); - return false; - } - - return true; -} - -bool -MediaFile::scan(void) -{ - if (_context == nullptr) - throw std::logic_error("inputfile '" + _p.string() + "' not open"); - - int error = avformat_find_stream_info(_context, nullptr); - if (error < 0) - { - LMS_LOG(AV, ERROR) << "Cannot find stream information on '" << _p.string() << "': " << averror_to_string(error); - return false; - } - - return true; + avformat_close_input(&_context); } boost::posix_time::time_duration MediaFile::getDuration() const { - if (_context == nullptr) - throw std::logic_error("inputfile '" + _p.string() + "' not open"); - if (static_cast(_context->duration) != AV_NOPTS_VALUE ) return boost::posix_time::seconds(_context->duration / AV_TIME_BASE); else @@ -130,9 +100,6 @@ getMetaDataFromDictionnary(AVDictionary* dictionnary, std::map MediaFile::getMetaData(void) { - if (_context == nullptr) - throw std::logic_error("inputfile '" + _p.string() + "' not open"); - std::map res; getMetaDataFromDictionnary(_context->metadata, res); @@ -153,13 +120,10 @@ MediaFile::getMetaData(void) return res; } -std::vector -MediaFile::getStreams(Stream::Type type) const +std::vector +MediaFile::getStreamInfo() const { - if (_context == nullptr) - throw std::logic_error("inputfile '" + _p.string() + "' not open"); - - std::vector res; + std::vector res; for (std::size_t i = 0; i < _context->nb_streams; ++i) { @@ -169,66 +133,33 @@ MediaFile::getStreams(Stream::Type type) const if (avstream->disposition & AV_DISPOSITION_ATTACHED_PIC) continue; - if (avstream->codec == nullptr) + if (!avstream->codecpar) { - LMS_LOG(AV, ERROR) << "Skipping stream " << i << " since no codec is set"; + LMS_LOG(AV, ERROR) << "Skipping stream " << i << " since no codecpar is set"; continue; } - if (type == Stream::Type::Audio && avstream->codec->codec_type != AVMEDIA_TYPE_AUDIO) - continue; - else if (type == Stream::Type::Video && avstream->codec->codec_type != AVMEDIA_TYPE_VIDEO) - continue; - else if (type == Stream::Type::Subtitle && avstream->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) + if (avstream->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) continue; - Stream stream; - - stream.id = i; // or use stream->id ? - stream.type = type; - stream.bitrate = avstream->codec->bit_rate; - - { - std::array buf = {0}; - avcodec_string(buf.data(), buf.size(), avstream->codec, 0); - - stream.desc = buf.data(); - } - - res.push_back(stream); + res.push_back( {.id = i, .bitrate = static_cast(avstream->codecpar->bit_rate)} ); } return res; } boost::optional -MediaFile::getBestStreamId(Stream::Type type) const +MediaFile::getBestStream() const { - if (_context == nullptr) - throw std::logic_error("inputfile '" + _p.string() + "' not open"); - - enum AVMediaType avMediaType; - - switch (type) - { - case Stream::Type::Audio: avMediaType = AVMEDIA_TYPE_AUDIO; break; - case Stream::Type::Video: avMediaType = AVMEDIA_TYPE_VIDEO; break; - case Stream::Type::Subtitle: avMediaType = AVMEDIA_TYPE_SUBTITLE; break; - default: - return boost::none; - } - int res = av_find_best_stream(_context, - avMediaType, + AVMEDIA_TYPE_AUDIO, -1, // Auto -1, // Auto NULL, 0); + if (res < 0) - { - LMS_LOG(AV, ERROR) << "Cannot find best stream for type " << streamType_to_string(type); return boost::none; - } return res; } @@ -248,9 +179,6 @@ MediaFile::hasAttachedPictures(void) const std::vector MediaFile::getAttachedPictures(std::size_t nbMaxPictures) const { - if (_context == nullptr) - throw std::logic_error("inputfile '" + _p.string() + "' not open"); - static const std::map codecMimeMap = { { AV_CODEC_ID_BMP, "image/x-bmp" }, @@ -271,15 +199,15 @@ MediaFile::getAttachedPictures(std::size_t nbMaxPictures) const if (!(avstream->disposition & AV_DISPOSITION_ATTACHED_PIC)) continue; - if (avstream->codec == nullptr) + if (avstream->codecpar == nullptr) { - LMS_LOG(AV, ERROR) << "Skipping stream " << i << " since no codec is set"; + LMS_LOG(AV, ERROR) << "Skipping stream " << i << " since no codecpar is set"; continue; } Picture picture; - auto itMime = codecMimeMap.find(avstream->codec->codec_id); + auto itMime = codecMimeMap.find(avstream->codecpar->codec_id); if (itMime != codecMimeMap.end()) { picture.mimeType = itMime->second; @@ -287,7 +215,7 @@ MediaFile::getAttachedPictures(std::size_t nbMaxPictures) const else { picture.mimeType = "application/octet-stream"; - LMS_LOG(AV, ERROR) << "CODEC ID " << avstream->codec->codec_id << " not handled in mime type conversion"; + LMS_LOG(AV, ERROR) << "CODEC ID " << avstream->codecpar->codec_id << " not handled in mime type conversion"; } AVPacket pkt = avstream->attached_pic; diff --git a/src/av/AvInfo.hpp b/src/av/AvInfo.hpp index 1bb92e1b..45e44f45 100644 --- a/src/av/AvInfo.hpp +++ b/src/av/AvInfo.hpp @@ -19,8 +19,7 @@ /* This file contains some classes in order to get info from file using the libavconv */ -#ifndef AV_INFO_HPP -#define AV_INFO_HPP +#pragma once extern "C" { @@ -39,6 +38,8 @@ extern "C" #include #include //no i/o just types +#include "utils/Exception.hpp" + namespace Av { @@ -50,25 +51,21 @@ struct Picture std::vector data; }; -struct Stream +struct StreamInfo { - enum class Type - { - Audio, - Video, - Subtitle, - }; - - int id; - Type type; + size_t id; std::size_t bitrate; - std::string desc; // Description of the stream +}; + +class MediaFileException : public LmsException +{ + public: + MediaFileException(int avError); }; class MediaFile { public: - MediaFile(const boost::filesystem::path& p); ~MediaFile(); @@ -76,16 +73,13 @@ class MediaFile MediaFile(const MediaFile&) = delete; MediaFile& operator=(const MediaFile&) = delete; - boost::filesystem::path getPath() const {return _p;}; - - bool open(void); - bool scan(void); + const boost::filesystem::path& getPath() const {return _p;}; boost::posix_time::time_duration getDuration() const; std::map getMetaData(void); - std::vector getStreams(Stream::Type type) const; - boost::optional getBestStreamId(Stream::Type type) const; // none if failure/unknown + std::vector getStreamInfo() const; + boost::optional getBestStream() const; // none if failure/unknown bool hasAttachedPictures(void) const; std::vector getAttachedPictures(std::size_t nbMaxPictures) const; @@ -96,8 +90,5 @@ class MediaFile AVFormatContext* _context; }; - } // namespace Av -#endif - diff --git a/src/cover/CoverArtGrabber.cpp b/src/cover/CoverArtGrabber.cpp index 56967cda..49546400 100644 --- a/src/cover/CoverArtGrabber.cpp +++ b/src/cover/CoverArtGrabber.cpp @@ -130,12 +130,18 @@ Grabber::getCoverPaths(const boost::filesystem::path& directoryPath, std::size_t std::vector Grabber::getFromTrack(const boost::filesystem::path& p, std::size_t nbMaxCovers) const { - Av::MediaFile input(p); + try + { + Av::MediaFile input(p); - if (input.open()) return getFromAvMediaFile(input, nbMaxCovers); - else - return std::vector(); + } + catch (Av::MediaFileException& e) + { + LMS_LOG(COVER, ERROR) << "Cannot get covers from track " << p << ": " << e.what(); + } + + return std::vector(); } std::vector diff --git a/src/metadata/AvFormat.cpp b/src/metadata/AvFormat.cpp index 9b13a731..e2a9c080 100644 --- a/src/metadata/AvFormat.cpp +++ b/src/metadata/AvFormat.cpp @@ -40,145 +40,140 @@ AvFormat::parse(const boost::filesystem::path& p) { Items items; - Av::MediaFile mediaFile(p); - - if (!mediaFile.open()) - return boost::none; - - if (!mediaFile.scan()) - return boost::none; - - // Stream info + try { - std::vector audioStreams; + Av::MediaFile mediaFile(p); - std::vector streams = mediaFile.getStreams(Av::Stream::Type::Audio); - - for (Av::Stream& stream : streams) + // Stream info { - AudioStream audioStream; - audioStream.desc = stream.desc; - audioStream.bitRate = stream.bitrate; + std::vector audioStreams; - audioStreams.push_back(audioStream); + auto streams = mediaFile.getStreamInfo(); + + for (auto stream : streams) + audioStreams.push_back( {.bitRate = stream.bitrate } ); + + if (!audioStreams.empty()) + items.insert( std::make_pair(MetaData::Type::AudioStreams, audioStreams)); } - if (!audioStreams.empty()) - items.insert( std::make_pair(MetaData::Type::AudioStreams, audioStreams)); - } + // Duration + items.insert( std::make_pair(MetaData::Type::Duration, mediaFile.getDuration() )); - // Duration - items.insert( std::make_pair(MetaData::Type::Duration, mediaFile.getDuration() )); + // Cover + items.insert( std::make_pair(MetaData::Type::HasCover, mediaFile.hasAttachedPictures())); - // Cover - items.insert( std::make_pair(MetaData::Type::HasCover, mediaFile.hasAttachedPictures())); + // Embedded MetaData + // Make sure to convert strings into UTF-8 - // Embedded MetaData - // Make sure to convert strings into UTF-8 + MetaData::Clusters clusters; - MetaData::Clusters clusters; - - std::map metadataMap = mediaFile.getMetaData(); - for (auto metadata : metadataMap) - { - const std::string tag = boost::to_upper_copy(metadata.first); - const std::string value = metadata.second; + std::map metadataMap = mediaFile.getMetaData(); + for (auto metadata : metadataMap) + { + const std::string tag = boost::to_upper_copy(metadata.first); + const std::string value = metadata.second; #if 0 - std::cout << "TAG = " << tag << ", VAL = " << value << std::endl; + std::cout << "TAG = " << tag << ", VAL = " << value << std::endl; #endif - if (tag == "ARTIST") - items.insert( std::make_pair(MetaData::Type::Artist, stringTrim( stringToUTF8(value)) )); - else if (tag == "ALBUM") - items.insert( std::make_pair(MetaData::Type::Album, stringTrim( stringToUTF8(value)) )); - else if (tag == "TITLE") - items.insert( std::make_pair(MetaData::Type::Title, stringTrim( stringToUTF8(value)) )); - else if (tag == "TRACK") - { - // Expecting 'Number/Total' - auto strings = splitString(value, "/"); - - if (strings.size() > 0) + if (tag == "ARTIST") + items.insert( std::make_pair(MetaData::Type::Artist, stringTrim( stringToUTF8(value)) )); + else if (tag == "ALBUM") + items.insert( std::make_pair(MetaData::Type::Album, stringTrim( stringToUTF8(value)) )); + else if (tag == "TITLE") + items.insert( std::make_pair(MetaData::Type::Title, stringTrim( stringToUTF8(value)) )); + else if (tag == "TRACK") { - std::size_t number; - if (readAs(strings[0], number)) - items.insert( std::make_pair(MetaData::Type::TrackNumber, number )); + // Expecting 'Number/Total' + auto strings = splitString(value, "/"); - if (strings.size() > 1) + if (strings.size() > 0) { - std::size_t totalNumber; - if (readAs(strings[1], totalNumber)) - items.insert( std::make_pair(MetaData::Type::TotalTrack, totalNumber )); + std::size_t number; + if (readAs(strings[0], number)) + items.insert( std::make_pair(MetaData::Type::TrackNumber, number )); + + if (strings.size() > 1) + { + std::size_t totalNumber; + if (readAs(strings[1], totalNumber)) + items.insert( std::make_pair(MetaData::Type::TotalTrack, totalNumber )); + } } } - } - else if (tag == "DISC") - { - // Expecting 'Number/Total' - auto strings = splitString(value, "/"); - - if (strings.size() > 0) + else if (tag == "DISC") { - std::size_t number; - if (readAs(strings[0], number)) - items.insert( std::make_pair(MetaData::Type::DiscNumber, number )); + // Expecting 'Number/Total' + auto strings = splitString(value, "/"); - if (strings.size() > 1) + if (strings.size() > 0) { - std::size_t totalNumber; - if (readAs(strings[1], totalNumber)) - items.insert( std::make_pair(MetaData::Type::TotalDisc, totalNumber )); + std::size_t number; + if (readAs(strings[0], number)) + items.insert( std::make_pair(MetaData::Type::DiscNumber, number )); + + if (strings.size() > 1) + { + std::size_t totalNumber; + if (readAs(strings[1], totalNumber)) + items.insert( std::make_pair(MetaData::Type::TotalDisc, totalNumber )); + } } } - } - else if (tag == "DATE" - || tag == "YEAR" - || tag == "WM/Year") - { - boost::posix_time::ptime p; - if (readAsPosixTime(value, p)) - items.insert( std::make_pair(MetaData::Type::Date, p)); - } - else if (tag == "TDOR" // Original release time (ID3v2 2.4) - || tag == "TORY") // Original release year - { - boost::posix_time::ptime p; - if (readAsPosixTime(value, p)) - items.insert( std::make_pair(MetaData::Type::OriginalDate, p)); - } - else if (tag == "MUSICBRAINZ ARTIST ID" - || tag == "MUSICBRAINZ_ARTISTID") - { - items.insert( std::make_pair(MetaData::Type::MusicBrainzArtistID, stringTrim( stringToUTF8(value)) )); - } - else if (tag == "MUSICBRAINZ ALBUM ID" - || tag == "MUSICBRAINZ_ALBUMID") - { - items.insert( std::make_pair(MetaData::Type::MusicBrainzAlbumID, stringTrim( stringToUTF8(value)) )); - } - else if (tag == "MUSICBRAINZ RELEASE TRACK ID" - || tag == "MUSICBRAINZ_RELEASETRACKID" - || tag == "MUSICBRAINZ_TRACKID") - { - items.insert( std::make_pair(MetaData::Type::MusicBrainzTrackID, stringTrim( stringToUTF8(value)) )); - } - else if (tag == "ACOUSTID ID") - { - items.insert( std::make_pair(MetaData::Type::AcoustID, stringTrim( stringToUTF8(value)) )); - } - else if (_clusterMap.find(tag) != _clusterMap.end()) - { - std::vector clusterNames = splitString(value, ";,\\"); - - if (!clusterNames.empty()) + else if (tag == "DATE" + || tag == "YEAR" + || tag == "WM/Year") { - clusters[_clusterMap[tag]] = std::set(clusterNames.begin(), clusterNames.end()); + boost::posix_time::ptime p; + if (readAsPosixTime(value, p)) + items.insert( std::make_pair(MetaData::Type::Date, p)); } + else if (tag == "TDOR" // Original release time (ID3v2 2.4) + || tag == "TORY") // Original release year + { + boost::posix_time::ptime p; + if (readAsPosixTime(value, p)) + items.insert( std::make_pair(MetaData::Type::OriginalDate, p)); + } + else if (tag == "MUSICBRAINZ ARTIST ID" + || tag == "MUSICBRAINZ_ARTISTID") + { + items.insert( std::make_pair(MetaData::Type::MusicBrainzArtistID, stringTrim( stringToUTF8(value)) )); + } + else if (tag == "MUSICBRAINZ ALBUM ID" + || tag == "MUSICBRAINZ_ALBUMID") + { + items.insert( std::make_pair(MetaData::Type::MusicBrainzAlbumID, stringTrim( stringToUTF8(value)) )); + } + else if (tag == "MUSICBRAINZ RELEASE TRACK ID" + || tag == "MUSICBRAINZ_RELEASETRACKID" + || tag == "MUSICBRAINZ_TRACKID") + { + items.insert( std::make_pair(MetaData::Type::MusicBrainzTrackID, stringTrim( stringToUTF8(value)) )); + } + else if (tag == "ACOUSTID ID") + { + items.insert( std::make_pair(MetaData::Type::AcoustID, stringTrim( stringToUTF8(value)) )); + } + else if (_clusterMap.find(tag) != _clusterMap.end()) + { + std::vector clusterNames = splitString(value, ";,\\"); + + if (!clusterNames.empty()) + { + clusters[_clusterMap[tag]] = std::set(clusterNames.begin(), clusterNames.end()); + } + } + } + if (!clusters.empty()) + items.insert( std::make_pair(MetaData::Type::Clusters, clusters) ); + } + catch(Av::MediaFileException& e) + { + return items; } - - if (!clusters.empty()) - items.insert( std::make_pair(MetaData::Type::Clusters, clusters) ); return items; } diff --git a/src/metadata/MetaData.hpp b/src/metadata/MetaData.hpp index 6bbea293..c14caed9 100644 --- a/src/metadata/MetaData.hpp +++ b/src/metadata/MetaData.hpp @@ -56,7 +56,7 @@ namespace MetaData // Used by Streams struct AudioStream { - std::string desc; + // TODO codec? std::size_t bitRate; }; diff --git a/src/metadata/TagLibParser.cpp b/src/metadata/TagLibParser.cpp index 5508ef46..27cb2e54 100644 --- a/src/metadata/TagLibParser.cpp +++ b/src/metadata/TagLibParser.cpp @@ -59,7 +59,7 @@ TagLibParser::parse(const boost::filesystem::path& p) items.insert( std::make_pair(MetaData::Type::Duration, duration) ); - MetaData::AudioStream audioStream = { .desc = "", .bitRate = static_cast(properties->bitrate() * 1000) }; + MetaData::AudioStream audioStream = { .bitRate = static_cast(properties->bitrate() * 1000) }; items.insert( std::make_pair(MetaData::Type::AudioStreams, std::vector(1, audioStream ) )); } diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp index 849ee478..fa9a2003 100644 --- a/src/ui/MediaPlayer.cpp +++ b/src/ui/MediaPlayer.cpp @@ -89,21 +89,23 @@ MediaPlayer::playTrack(Database::Track::id_type trackId) transaction.commit(); // Analyse track, select the best media stream - Av::MediaFile mediaFile(track->getPath()); - - if (!mediaFile.open() || !mediaFile.scan()) + try { - LMS_LOG(UI, ERROR) << "Cannot open file '" << track->getPath(); - return; + Av::MediaFile mediaFile(track->getPath()); + + auto streamId = mediaFile.getBestStream(); + + _audio->pause(); + _audio->clearSources(); + _audio->addSource(LmsApp->getTranscodeResource()->getUrl(trackId, Av::Encoding::MP3, boost::posix_time::seconds(0), streamId)); + _audio->setPreloadMode(Wt::WAudio::PreloadNone); + _audio->play(); + } + catch (Av::MediaFileException& e) + { + LMS_LOG(UI, ERROR) << "MediaFileException: " << e.what(); + stop(); } - - auto streamId = mediaFile.getBestStreamId(Av::Stream::Type::Audio); - - _audio->pause(); - _audio->clearSources(); - _audio->addSource(LmsApp->getTranscodeResource()->getUrl(trackId, Av::Encoding::MP3, boost::posix_time::seconds(0), streamId)); - _audio->setPreloadMode(Wt::WAudio::PreloadNone); - _audio->play(); } void diff --git a/src/utils/Exception.hpp b/src/utils/Exception.hpp new file mode 100644 index 00000000..eda418d9 --- /dev/null +++ b/src/utils/Exception.hpp @@ -0,0 +1,30 @@ +/* + * 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 . + */ + +#pragma once + +#include +#include + +class LmsException : public std::runtime_error +{ + public: + LmsException(const std::string& error) : std::runtime_error(error) {} +}; + From f2491d84089705de5d693b0d7f4e36a64e5fc83f Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 22 Mar 2018 12:48:29 +0100 Subject: [PATCH 086/195] Fix regression, a track does not always have an artist --- src/scanner/MediaScanner.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 492ad6f4..b3252c6a 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -527,7 +527,6 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) release = getRelease(file, releaseName, releaseMusicBrainzID); } - assert(release); // If file already exist, update data // Otherwise, create it @@ -780,14 +779,14 @@ MediaScanner::checkDuplicatedAudioFiles(Stats& stats) std::vector tracks = Database::Track::getMBIDDuplicates(_db.getSession()); for (Track::pointer track : tracks) { - LMS_LOG(DBUPDATER, INFO) << "Found duplicated MBID [" << track->getMBID() << "], file: " << track->getPath() << " - " << track->getArtist()->getName() << " - " << track->getName(); + LMS_LOG(DBUPDATER, INFO) << "Found duplicated MBID [" << track->getMBID() << "], file: " << track->getPath() << " - " << track->getName(); stats.duplicateMBID++; } tracks = Database::Track::getChecksumDuplicates(_db.getSession()); for (Track::pointer track : tracks) { - LMS_LOG(DBUPDATER, INFO) << "Found duplicated checksum [" << bufferToString(track->getChecksum()) << "], file: " << track->getPath() << " - " << track->getArtist()->getName() << " - " << track->getName(); + LMS_LOG(DBUPDATER, INFO) << "Found duplicated checksum [" << bufferToString(track->getChecksum()) << "], file: " << track->getPath() << " - " << track->getName(); stats.duplicateHashes++; } From 145244102b9319e2369d65c54536cf44aa990f96 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 24 Mar 2018 15:17:34 +0100 Subject: [PATCH 087/195] Adding mediaplayer.js skeleton --- Makefile.am | 10 +++++++--- conf/lms.conf | 2 +- docroot/js/mediaplayer.js | 1 + src/ui/LmsApplication.cpp | 2 ++ 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 docroot/js/mediaplayer.js diff --git a/Makefile.am b/Makefile.am index 0c4a11d0..ded64f2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,13 +8,17 @@ lms_approotdir=$(pkgdatadir)/approot lms_cssdir=$(lms_docrootdir)/css lms_imagesdir=$(lms_docrootdir)/images +lms_jsdir=$(lms_docrootdir)/js lms_css_DATA = \ - docroot/css/lms.css + docroot/css/lms.css lms_images_DATA = \ - docroot/images/unknown-cover.jpg \ - docroot/images/unknown-artist.jpg + docroot/images/unknown-cover.jpg \ + docroot/images/unknown-artist.jpg + +lms_js_DATA = \ + docroot/js/mediaplayer.js lms_approot_DATA = \ approot/admin-database.xml \ diff --git a/conf/lms.conf b/conf/lms.conf index e457c84a..722d25c3 100644 --- a/conf/lms.conf +++ b/conf/lms.conf @@ -16,7 +16,7 @@ tls-key = "/var/lms/privkey.pem"; tls-dh = "/var/lms/dh2048.pem"; # Path to the resources used by the web interface -docroot = "/usr/share/lms/docroot/;/resources,/css,/images,/favicon.ico"; +docroot = "/usr/share/lms/docroot/;/resources,/css,/images,/js,/favicon.ico"; approot = "/usr/share/lms/approot"; diff --git a/docroot/js/mediaplayer.js b/docroot/js/mediaplayer.js new file mode 100644 index 00000000..8a2ab650 --- /dev/null +++ b/docroot/js/mediaplayer.js @@ -0,0 +1 @@ +/* TEST */ diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 5b28bcee..f5985f6d 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -237,6 +237,8 @@ LmsApplication::handleAuthEvent(void) LMS_LOG(UI, INFO) << "User '" << CurrentAuthUser().identity(Wt::Auth::Identity::LoginName) << "' logged in from '" << Wt::WApplication::instance()->environment().clientAddress() << "', user agent = " << Wt::WApplication::instance()->environment().agent() << ", session = " << Wt::WApplication::instance()->sessionId(); + require("/js/mediaplayer.js"); + _imageResource = new ImageResource(_db, root()); _transcodeResource = new TranscodeResource(_db, root()); From b03622f6776e5faaaf9da9f76acbe868d4a4e2d6 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 25 Mar 2018 22:47:53 +0200 Subject: [PATCH 088/195] Fixed ReleasesView when displaying a release with no artist --- approot/releases.xml | 2 +- src/ui/explore/ReleasesView.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/approot/releases.xml b/approot/releases.xml index 5c784d39..e0eb02ca 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -31,7 +31,7 @@

${release-name}

- ${artist-name} + ${}${artist-name}${}
${play-btn}${add-btn}
diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index 3fceee00..9e925316 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -107,14 +107,15 @@ Releases::addSome() entry->bindWidget("release-name", releaseAnchor); } - auto artists = release->getArtists(); if (artists.size() > 1) { + entry->setCondition("if-has-artist", true); entry->bindString("artist-name", Wt::WString::tr("Lms.Explore.various-artists")); } - else + else if (artists.size() == 1) { + entry->setCondition("if-has-artist", true); Wt::WAnchor* artistAnchor = LmsApplication::createArtistAnchor(artists.front().id()); Wt::WText* artist = new Wt::WText(artistAnchor); artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText)); From 7eb250fdff1e4ec6cc79dade808c2140a8b0704a Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 25 Mar 2018 22:53:59 +0200 Subject: [PATCH 089/195] Fixed ReleaseView when displaying a release with no artist --- approot/release.xml | 2 +- src/ui/explore/ReleaseView.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/approot/release.xml b/approot/release.xml index b42206a2..0a110c52 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -14,7 +14,7 @@ ${cover}

${name}

-

${artist-name}

+ ${}

${artist-name}

${}

${}${year}${}${} (${orig-year})${}

${clusters} ${play-btn}${add-btn} diff --git a/src/ui/explore/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp index 47018e67..be145adb 100644 --- a/src/ui/explore/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -97,10 +97,12 @@ Release::refresh() auto artists = release->getArtists(); if (artists.size() > 1) { + t->setCondition("if-has-artist", true); t->bindString("artist-name", Wt::WString::tr("Lms.Explore.various-artists")); } - else + else if (artists.size() == 1) { + t->setCondition("if-has-artist", true); Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(artists.front().id()); Wt::WText *artist = new Wt::WText(artistAnchor); artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText)); From f272394992dc8795cc52a61b1ecf16aa35baeb73 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 26 Mar 2018 23:35:51 +0200 Subject: [PATCH 090/195] JS implementation of the player --- approot/mediaplayer.xml | 41 ++++---------- docroot/js/mediaplayer.js | 82 ++++++++++++++++++++++++++- src/ui/MediaPlayer.cpp | 81 +++++++++----------------- src/ui/MediaPlayer.hpp | 15 +++-- src/ui/resource/TranscodeResource.cpp | 4 +- src/ui/resource/TranscodeResource.hpp | 4 +- 6 files changed, 127 insertions(+), 100 deletions(-) diff --git a/approot/mediaplayer.xml b/approot/mediaplayer.xml index 0d445ca6..15ab6bb4 100644 --- a/approot/mediaplayer.xml +++ b/approot/mediaplayer.xml @@ -2,37 +2,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - ${previous} ${play-pause} ${next} - ${cover} - ${current-time} ${total-time} ${shuffle} ${repeat} - ${}${artist-name}${} - ${}${release-name}${} - ${track-name} + +
+ +
...
+
+
+
00:00
+
00:00
+
+
+
diff --git a/docroot/js/mediaplayer.js b/docroot/js/mediaplayer.js index 8a2ab650..69570ad8 100644 --- a/docroot/js/mediaplayer.js +++ b/docroot/js/mediaplayer.js @@ -1 +1,81 @@ -/* TEST */ +// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later + +var LMS = LMS || {}; + +LMS.mediaplayer = function () { + + var _root = {}; + var _elems = {}; + + var _updateControls = function() { + if (_elems.audio.paused) { + _elems.play.style.display = "block"; + _elems.pause.style.display = "none"; + } + else { + _elems.pause.style.display = "block"; + _elems.play.style.display = "none"; + } + } + + var init = function(root) { + _root = root; + + _elems.audio = document.getElementById("lms-mp-audio"); + _elems.play = document.getElementById("lms-mp-play"); + _elems.pause = document.getElementById("lms-mp-pause"); + _elems.previous = document.getElementById("lms-mp-previous"); + _elems.next = document.getElementById("lms-mp-next"); + _elems.title = document.getElementById("lms-mp-title"); + _elems.artist = document.getElementById("lms-mp-artist"); + _elems.release = document.getElementById("lms-mp-release"); + _elems.duration = document.getElementById("lms-mp-duration"); + + _elems.play.addEventListener("click", function() { + _elems.audio.play(); + }); + _elems.pause.addEventListener("click", function() { + _elems.audio.pause(); + }); + + _elems.previous.addEventListener("click", function() { + Wt.emit(_root, "playPrevious"); + }); + _elems.next.addEventListener("click", function() { + Wt.emit(_root, "playNext"); + }); + + _elems.audio.addEventListener("play", _updateControls); + _elems.audio.addEventListener("playing", _updateControls); + _elems.audio.addEventListener("pause", _updateControls); + + _elems.audio.addEventListener("ended", function() { + Wt.emit(_root, "playbackEnded"); + }); + } + + var loadTrack = function(params, autoplay) { + console.log("Loading track '" + params.name + "', release = '" + params.release + "', artist = '" + params.artist + "', resource = '" + params.resource + "', imgResource = '" + params.imgResource); + + _elems.title.innerHTML = params.name; + _elems.artist.innerHTML = params.artist; + _elems.release.innerHTML = params.release; + _elems.audio.src = params.resource; + _elems.duration.innerHTML = params.duration; + + if (autoplay) + _elems.audio.play(); + } + + var stop = function() { + _elems.audio.pause(); + } + + return { + init: init, + loadTrack: loadTrack, + stop: stop, + }; +}(); + +// @license-end diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp index fa9a2003..62423135 100644 --- a/src/ui/MediaPlayer.cpp +++ b/src/ui/MediaPlayer.cpp @@ -16,10 +16,7 @@ * You should have received a copy of the GNU General Public License * along with LMS. If not, see . */ -#include -#include -#include -#include +#include #include "av/AvInfo.hpp" #include "utils/Logger.hpp" @@ -33,50 +30,17 @@ namespace UserInterface { MediaPlayer::MediaPlayer(Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent) +: Wt::WTemplate(Wt::WString::tr("template-mediaplayer"), parent), + playbackEnded(this, "playbackEnded"), + playPrevious(this, "playPrevious"), + playNext(this, "playNext") { - _audio = new Wt::WAudio(this); - _audio->setOptions(Wt::WAudio::Autoplay); - _audio->setPreloadMode(Wt::WAudio::PreloadNone); + wApp->doJavaScript("LMS.mediaplayer.init(" + jsRef() + ")"); +} - _audio->ended().connect(std::bind([=] () - { - playbackEnded.emit(); - })); - - auto player = new Wt::WTemplate(Wt::WString::tr("template-mediaplayer"), this); - - auto playPauseBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-play"), Wt::XHTMLText); - player->bindWidget("play-pause", playPauseBtn); - - auto prevBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-prev"), Wt::XHTMLText); - player->bindWidget("previous", prevBtn); - prevBtn->clicked().connect(std::bind([=] - { - playPrevious.emit(); - })); - - auto nextBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-next"), Wt::XHTMLText); - player->bindWidget("next", nextBtn); - nextBtn->clicked().connect(std::bind([=] - { - playNext.emit(); - })); - - auto shuffleBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-shuffle"), Wt::XHTMLText); - player->bindWidget("shuffle", shuffleBtn); - - auto repeatBtn = new Wt::WText(Wt::WString::tr("btn-mediaplayer-repeat"), Wt::XHTMLText); - player->bindWidget("repeat", repeatBtn); - - player->bindString("current-time", "00:00"); - player->bindString("total-time", "00:00"); - - auto cover = new Wt::WImage(); - player->bindWidget("cover", cover); - - auto trackName = new Wt::WText("---"); - player->bindWidget("track-name", trackName); +static std::string escape(const std::string& str) +{ + return boost::replace_all_copy(str, "\"", "\\\""); } void @@ -86,32 +50,39 @@ MediaPlayer::playTrack(Database::Track::id_type trackId) Wt::Dbo::Transaction transaction(DboSession()); auto track = Database::Track::getById(DboSession(), trackId); - transaction.commit(); // Analyse track, select the best media stream try { Av::MediaFile mediaFile(track->getPath()); - auto streamId = mediaFile.getBestStream(); + auto resource = LmsApp->getTranscodeResource()->getUrl(trackId, Av::Encoding::MP3, boost::posix_time::seconds(0)); - _audio->pause(); - _audio->clearSources(); - _audio->addSource(LmsApp->getTranscodeResource()->getUrl(trackId, Av::Encoding::MP3, boost::posix_time::seconds(0), streamId)); - _audio->setPreloadMode(Wt::WAudio::PreloadNone); - _audio->play(); + std::ostringstream oss; + oss + << "var params = {" + << " name: \"" << escape(track->getName()) + "\"," + << " release: " << (track->getRelease() ? "\"" + escape(track->getRelease()->getName()) + "\"" : "undefined" ) << "," + << " artist: " << (track->getArtist() ? "\"" + escape(track->getArtist()->getName()) + "\"" : "undefined" ) << "," + << " resource: \"" << resource << "\"," + << " duration: " << track->getDuration().total_seconds() << "," + << "};"; + oss << "LMS.mediaplayer.loadTrack(params, true)"; // true to autoplay + + LMS_LOG(UI, DEBUG) << "Runing js = '" << oss.str() << "'"; + + wApp->doJavaScript(oss.str()); } catch (Av::MediaFileException& e) { LMS_LOG(UI, ERROR) << "MediaFileException: " << e.what(); - stop(); } } void MediaPlayer::stop() { - _audio->pause(); + wApp->doJavaScript("LMS.mediaplayer.stop()"); } } // namespace UserInterface diff --git a/src/ui/MediaPlayer.hpp b/src/ui/MediaPlayer.hpp index 8b36d8eb..80d7d74d 100644 --- a/src/ui/MediaPlayer.hpp +++ b/src/ui/MediaPlayer.hpp @@ -19,15 +19,14 @@ #pragma once -#include -#include -#include +#include +#include #include "database/Types.hpp" namespace UserInterface { -class MediaPlayer : public Wt::WContainerWidget +class MediaPlayer : public Wt::WTemplate { public: MediaPlayer(Wt::WContainerWidget* parent = 0); @@ -36,12 +35,12 @@ class MediaPlayer : public Wt::WContainerWidget void playTrack(Database::Track::id_type); // Signals - Wt::Signal playbackEnded; - Wt::Signal playPrevious; - Wt::Signal playNext; + Wt::JSignal playbackEnded; + Wt::JSignal playPrevious; + Wt::JSignal playNext; private: - Wt::WAudio* _audio; + }; } // namespace UserInterface diff --git a/src/ui/resource/TranscodeResource.cpp b/src/ui/resource/TranscodeResource.cpp index 428a68d2..6d9203f9 100644 --- a/src/ui/resource/TranscodeResource.cpp +++ b/src/ui/resource/TranscodeResource.cpp @@ -41,11 +41,9 @@ TranscodeResource:: ~TranscodeResource() } std::string -TranscodeResource::getUrl(Database::Track::id_type trackId, Av::Encoding encoding, boost::posix_time::time_duration offset, boost::optional streamId) const +TranscodeResource::getUrl(Database::Track::id_type trackId, Av::Encoding encoding, boost::posix_time::time_duration offset) const { std::string res = url()+ "&trackid=" + std::to_string(trackId) + "&encoding=" + std::to_string(Av::encoding_to_int(encoding)); - if (streamId) - res += "&stream=" + std::to_string(*streamId); res += "&offset=" + std::to_string(offset.seconds()); return res; diff --git a/src/ui/resource/TranscodeResource.hpp b/src/ui/resource/TranscodeResource.hpp index a13f4e9b..51f8ecc8 100644 --- a/src/ui/resource/TranscodeResource.hpp +++ b/src/ui/resource/TranscodeResource.hpp @@ -21,8 +21,6 @@ #include -#include - #include #include "av/AvTranscoder.hpp" @@ -37,7 +35,7 @@ class TranscodeResource : public Wt::WResource TranscodeResource(Database::Handler& db, Wt::WObject *parent); ~TranscodeResource(); - std::string getUrl(Database::Track::id_type trackId, Av::Encoding encoding, boost::posix_time::time_duration offset, boost::optional stream = boost::none) const; + std::string getUrl(Database::Track::id_type trackId, Av::Encoding encoding, boost::posix_time::time_duration offset) const; void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response); From 9fb5c4e8ee37522c71575bb8d71c776524330fc8 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 27 Mar 2018 13:22:09 +0200 Subject: [PATCH 091/195] Adding duration/total time in player --- docroot/js/mediaplayer.js | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/docroot/js/mediaplayer.js b/docroot/js/mediaplayer.js index 69570ad8..9cc250e6 100644 --- a/docroot/js/mediaplayer.js +++ b/docroot/js/mediaplayer.js @@ -6,6 +6,8 @@ LMS.mediaplayer = function () { var _root = {}; var _elems = {}; + var _offset = 0; + var _duration = 0; var _updateControls = function() { if (_elems.audio.paused) { @@ -18,6 +20,22 @@ LMS.mediaplayer = function () { } } + var _durationToString = function (duration, displayHours) { + var hours = parseInt(duration / 3600, 10) % 24; + var minutes = parseInt(duration / 60, 10) % 60; + var seconds = parseInt(duration, 10) % 60; + + var res = ""; + + if (displayHours) + res += (hours < 10 ? "0" + hours : hours) + ":"; + + res += (minutes < 10 ? "0" + minutes : minutes) + ":"; + res += (seconds < 10 ? "0" + seconds : seconds); + + return res; + } + var init = function(root) { _root = root; @@ -30,6 +48,7 @@ LMS.mediaplayer = function () { _elems.artist = document.getElementById("lms-mp-artist"); _elems.release = document.getElementById("lms-mp-release"); _elems.duration = document.getElementById("lms-mp-duration"); + _elems.time = document.getElementById("lms-mp-time"); _elems.play.addEventListener("click", function() { _elems.audio.play(); @@ -49,6 +68,10 @@ LMS.mediaplayer = function () { _elems.audio.addEventListener("playing", _updateControls); _elems.audio.addEventListener("pause", _updateControls); + _elems.audio.addEventListener("timeupdate", function() { + _elems.time.innerHTML = _durationToString(_offset + _elems.audio.currentTime, _duration > 3600) + }); + _elems.audio.addEventListener("ended", function() { Wt.emit(_root, "playbackEnded"); }); @@ -57,11 +80,15 @@ LMS.mediaplayer = function () { var loadTrack = function(params, autoplay) { console.log("Loading track '" + params.name + "', release = '" + params.release + "', artist = '" + params.artist + "', resource = '" + params.resource + "', imgResource = '" + params.imgResource); + _offset = 0; + _duration = params.duration; + _elems.title.innerHTML = params.name; _elems.artist.innerHTML = params.artist; _elems.release.innerHTML = params.release; _elems.audio.src = params.resource; - _elems.duration.innerHTML = params.duration; + _elems.duration.innerHTML = _durationToString(_duration, _duration > 3600); + _elems.time.innerHTML = _durationToString(0, _duration > 3600) if (autoplay) _elems.audio.play(); From f011f0a7e518d6bba735a96e5645ac043e02b3c0 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 27 Mar 2018 13:55:04 +0200 Subject: [PATCH 092/195] Adding cover in player --- docroot/js/mediaplayer.js | 5 +++++ src/ui/MediaPlayer.cpp | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docroot/js/mediaplayer.js b/docroot/js/mediaplayer.js index 9cc250e6..be11d707 100644 --- a/docroot/js/mediaplayer.js +++ b/docroot/js/mediaplayer.js @@ -49,6 +49,10 @@ LMS.mediaplayer = function () { _elems.release = document.getElementById("lms-mp-release"); _elems.duration = document.getElementById("lms-mp-duration"); _elems.time = document.getElementById("lms-mp-time"); + // Hack cannot add a img element into the template + // since a /img is considered missing! + _elems.cover = document.createElement("img"); + root.appendChild(_elems.cover); _elems.play.addEventListener("click", function() { _elems.audio.play(); @@ -89,6 +93,7 @@ LMS.mediaplayer = function () { _elems.audio.src = params.resource; _elems.duration.innerHTML = _durationToString(_duration, _duration > 3600); _elems.time.innerHTML = _durationToString(0, _duration > 3600) + _elems.cover.src = params.imgResource; if (autoplay) _elems.audio.play(); diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp index 62423135..7c9921e8 100644 --- a/src/ui/MediaPlayer.cpp +++ b/src/ui/MediaPlayer.cpp @@ -21,6 +21,7 @@ #include "av/AvInfo.hpp" #include "utils/Logger.hpp" +#include "resource/ImageResource.hpp" #include "resource/TranscodeResource.hpp" #include "LmsApplication.hpp" @@ -51,12 +52,12 @@ MediaPlayer::playTrack(Database::Track::id_type trackId) Wt::Dbo::Transaction transaction(DboSession()); auto track = Database::Track::getById(DboSession(), trackId); - // Analyse track, select the best media stream try { Av::MediaFile mediaFile(track->getPath()); auto resource = LmsApp->getTranscodeResource()->getUrl(trackId, Av::Encoding::MP3, boost::posix_time::seconds(0)); + auto imgResource = LmsApp->getImageResource()->getTrackUrl(trackId, 64); std::ostringstream oss; oss @@ -66,6 +67,7 @@ MediaPlayer::playTrack(Database::Track::id_type trackId) << " artist: " << (track->getArtist() ? "\"" + escape(track->getArtist()->getName()) + "\"" : "undefined" ) << "," << " resource: \"" << resource << "\"," << " duration: " << track->getDuration().total_seconds() << "," + << " imgResource: \"" << imgResource << "\"," << "};"; oss << "LMS.mediaplayer.loadTrack(params, true)"; // true to autoplay From 6e8737aabb3f6d1c9aef1edfeace62777f0b1dd5 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 27 Mar 2018 22:20:10 +0200 Subject: [PATCH 093/195] Corrected cover display in mediaplay --- approot/mediaplayer.xml | 2 +- docroot/js/mediaplayer.js | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/approot/mediaplayer.xml b/approot/mediaplayer.xml index 15ab6bb4..949cefd3 100644 --- a/approot/mediaplayer.xml +++ b/approot/mediaplayer.xml @@ -11,9 +11,9 @@
00:00
00:00
-
+ diff --git a/docroot/js/mediaplayer.js b/docroot/js/mediaplayer.js index be11d707..71e1ec46 100644 --- a/docroot/js/mediaplayer.js +++ b/docroot/js/mediaplayer.js @@ -49,10 +49,7 @@ LMS.mediaplayer = function () { _elems.release = document.getElementById("lms-mp-release"); _elems.duration = document.getElementById("lms-mp-duration"); _elems.time = document.getElementById("lms-mp-time"); - // Hack cannot add a img element into the template - // since a /img is considered missing! - _elems.cover = document.createElement("img"); - root.appendChild(_elems.cover); + _elems.cover = document.getElementById("lms-mp-cover"); _elems.play.addEventListener("click", function() { _elems.audio.play(); @@ -82,7 +79,7 @@ LMS.mediaplayer = function () { } var loadTrack = function(params, autoplay) { - console.log("Loading track '" + params.name + "', release = '" + params.release + "', artist = '" + params.artist + "', resource = '" + params.resource + "', imgResource = '" + params.imgResource); + console.log("Loading track '" + params.name + "', release = '" + params.release + "', artist = '" + params.artist + "', resource = '" + params.resource + "', imgResource = '" + params.imgResource + "'"); _offset = 0; _duration = params.duration; From 3aa006c92149aad062bbe10d20b4fccf35d975c7 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 27 Mar 2018 23:06:51 +0200 Subject: [PATCH 094/195] Now really display artist/release names as plain text --- src/ui/LmsApplication.cpp | 24 ++++++++++++++++++++---- src/ui/LmsApplication.hpp | 4 ++-- src/ui/PlayQueueView.cpp | 8 ++------ src/ui/explore/ArtistView.cpp | 6 ++---- src/ui/explore/ArtistsView.cpp | 5 +---- src/ui/explore/ReleaseView.cpp | 8 ++------ src/ui/explore/ReleasesView.cpp | 10 +++------- src/ui/explore/TracksView.cpp | 8 ++------ 8 files changed, 34 insertions(+), 39 deletions(-) diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index f5985f6d..531f07c5 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -161,15 +161,31 @@ Scanner::MediaScanner& MediaScanner() } Wt::WAnchor* -LmsApplication::createArtistAnchor(Database::id_type id) +LmsApplication::createArtistAnchor(Database::Artist::pointer artist, bool addText) { - return new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(id))); + auto res = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(artist.id()))); + + if (addText) + { + res->setTextFormat(Wt::PlainText); + res->setText(Wt::WString::fromUTF8(artist->getName())); + } + + return res; } Wt::WAnchor* -LmsApplication::createReleaseAnchor(Database::id_type id) +LmsApplication::createReleaseAnchor(Database::Release::pointer release, bool addText) { - return new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(id))); + auto res = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); + + if (addText) + { + res->setTextFormat(Wt::PlainText); + res->setText(Wt::WString::fromUTF8(release->getName())); + } + + return res; } void diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index 5b7d336a..098f6856 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -51,8 +51,8 @@ class LmsApplication : public Wt::WApplication void quit(); void notify(const Wt::WString& message); - static Wt::WAnchor* createArtistAnchor(Database::id_type id); - static Wt::WAnchor* createReleaseAnchor(Database::id_type id); + static Wt::WAnchor* createArtistAnchor(Database::Artist::pointer artist, bool addText = true); + static Wt::WAnchor* createReleaseAnchor(Database::Release::pointer release, bool addText = true); private: diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index e5bce0b4..ae329179 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -228,18 +228,14 @@ PlayQueue::addSome() if (artist) { entry->setCondition("if-has-artist", true); - Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(track->getArtist().id()); - Wt::WText *artistText = new Wt::WText(artistAnchor); - artistText->setText(Wt::WString::fromUTF8(artist->getName(), Wt::PlainText)); + Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(track->getArtist()); entry->bindWidget("artist-name", artistAnchor); } auto release = track->getRelease(); if (release) { entry->setCondition("if-has-release", true); - Wt::WAnchor *releaseAnchor = LmsApplication::createReleaseAnchor(track->getRelease().id()); - Wt::WText *releaseText = new Wt::WText(releaseAnchor); - releaseText->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); + Wt::WAnchor *releaseAnchor = LmsApplication::createReleaseAnchor(track->getRelease()); entry->bindWidget("release-name", releaseAnchor); } diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index ec21c004..96caffca 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -123,7 +123,7 @@ Artist::refresh() entry->addFunction("tr", Wt::WTemplate::Functions::tr); { - Wt::WAnchor* coverAnchor = LmsApplication::createReleaseAnchor(releaseId); + Wt::WAnchor* coverAnchor = LmsApplication::createReleaseAnchor(release, false); Wt::WImage* cover = new Wt::WImage(coverAnchor); cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); // Some images may not be square @@ -132,9 +132,7 @@ Artist::refresh() } { - Wt::WAnchor* releaseAnchor = LmsApplication::createReleaseAnchor(releaseId); - Wt::WText* releaseName = new Wt::WText(releaseAnchor); - releaseName->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); + Wt::WAnchor* releaseAnchor = LmsApplication::createReleaseAnchor(release); entry->bindWidget("name", releaseAnchor); } diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index b48ce1b6..cd1ff5ab 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -18,7 +18,6 @@ */ #include -#include #include #include @@ -93,9 +92,7 @@ Artists::addSome() entry->bindInt("nb-release", artist->getReleases(clusterIds).size()); { - Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(artist.id()); - Wt::WText *artistText = new Wt::WText(artistAnchor); - artistText->setText(Wt::WString::fromUTF8(artist->getName(), Wt::PlainText)); + Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(artist); entry->bindWidget("name", artistAnchor); } } diff --git a/src/ui/explore/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp index be145adb..602f1d6f 100644 --- a/src/ui/explore/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -103,9 +103,7 @@ Release::refresh() else if (artists.size() == 1) { t->setCondition("if-has-artist", true); - Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(artists.front().id()); - Wt::WText *artist = new Wt::WText(artistAnchor); - artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText)); + Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(artists.front()); t->bindWidget("artist-name", artistAnchor); } } @@ -165,9 +163,7 @@ Release::refresh() if (variousArtists && track->getArtist()) { entry->setCondition("if-has-artist", true); - Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(track->getArtist().id()); - Wt::WText *artistText = new Wt::WText(artistAnchor); - artistText->setText(Wt::WString::fromUTF8(track->getArtist()->getName(), Wt::PlainText)); + Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(track->getArtist()); entry->bindWidget("artist-name", artistAnchor); } diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index 9e925316..5fcf654f 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -93,7 +93,7 @@ Releases::addSome() Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Releases.template.entry"), _releasesContainer); entry->addFunction("tr", Wt::WTemplate::Functions::tr); - Wt::WAnchor* coverAnchor = LmsApplication::createReleaseAnchor(releaseId); + Wt::WAnchor* coverAnchor = LmsApplication::createReleaseAnchor(release, false); Wt::WImage* cover = new Wt::WImage(coverAnchor); cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(releaseId, 128)); // Some images may not be square @@ -101,9 +101,7 @@ Releases::addSome() entry->bindWidget("cover", coverAnchor); { - Wt::WAnchor* releaseAnchor = LmsApplication::createReleaseAnchor(releaseId); - Wt::WText* releaseName = new Wt::WText(releaseAnchor); - releaseName->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); + Wt::WAnchor* releaseAnchor = LmsApplication::createReleaseAnchor(release); entry->bindWidget("release-name", releaseAnchor); } @@ -116,9 +114,7 @@ Releases::addSome() else if (artists.size() == 1) { entry->setCondition("if-has-artist", true); - Wt::WAnchor* artistAnchor = LmsApplication::createArtistAnchor(artists.front().id()); - Wt::WText* artist = new Wt::WText(artistAnchor); - artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText)); + Wt::WAnchor* artistAnchor = LmsApplication::createArtistAnchor(artists.front()); entry->bindWidget("artist-name", artistAnchor); } diff --git a/src/ui/explore/TracksView.cpp b/src/ui/explore/TracksView.cpp index 531623e7..a646c1bb 100644 --- a/src/ui/explore/TracksView.cpp +++ b/src/ui/explore/TracksView.cpp @@ -126,9 +126,7 @@ Tracks::addSome() if (artist) { entry->setCondition("if-has-artist", true); - Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(track->getArtist().id()); - Wt::WText *artistText = new Wt::WText(artistAnchor); - artistText->setText(Wt::WString::fromUTF8(artist->getName(), Wt::PlainText)); + Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(track->getArtist()); entry->bindWidget("artist-name", artistAnchor); } @@ -136,9 +134,7 @@ Tracks::addSome() if (release) { entry->setCondition("if-has-release", true); - Wt::WAnchor *releaseAnchor = LmsApplication::createReleaseAnchor(track->getRelease().id()); - Wt::WText *releaseText = new Wt::WText(releaseAnchor); - releaseText->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText)); + Wt::WAnchor *releaseAnchor = LmsApplication::createReleaseAnchor(track->getRelease()); entry->bindWidget("release-name", releaseAnchor); } From 05fd8a47d8cb4f8baf7908b9a1c0844c2cb9e28c Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 29 Mar 2018 14:00:49 +0200 Subject: [PATCH 095/195] First version of the Users view (read only) --- Makefile.am | 3 +- ...{admin-wizard.xml => admin-initwizard.xml} | 3 +- approot/admin-users.xml | 18 ++++ approot/messages.xml | 11 ++- src/Makefile.am | 3 +- src/database/User.cpp | 7 -- src/database/User.hpp | 1 - src/ui/LmsApplication.cpp | 87 ++++++++++++------- src/ui/LmsApplication.hpp | 1 + ...AdminWizardView.cpp => InitWizardView.cpp} | 26 +++--- ...AdminWizardView.hpp => InitWizardView.hpp} | 4 +- src/ui/admin/UsersView.cpp | 83 ++++++++++++++++++ src/ui/admin/UsersView.hpp | 39 +++++++++ src/ui/explore/ArtistsView.cpp | 2 +- 14 files changed, 225 insertions(+), 63 deletions(-) rename approot/{admin-wizard.xml => admin-initwizard.xml} (96%) create mode 100644 approot/admin-users.xml rename src/ui/admin/{AdminWizardView.cpp => InitWizardView.cpp} (83%) rename src/ui/admin/{AdminWizardView.hpp => InitWizardView.hpp} (88%) create mode 100644 src/ui/admin/UsersView.cpp create mode 100644 src/ui/admin/UsersView.hpp diff --git a/Makefile.am b/Makefile.am index ded64f2e..00bf7d3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,8 @@ lms_js_DATA = \ lms_approot_DATA = \ approot/admin-database.xml \ - approot/admin-wizard.xml \ + approot/admin-users.xml \ + approot/admin-initwizard.xml \ approot/artist.xml \ approot/artists.xml \ approot/explore.xml \ diff --git a/approot/admin-wizard.xml b/approot/admin-initwizard.xml similarity index 96% rename from approot/admin-wizard.xml rename to approot/admin-initwizard.xml index c2af28e8..175cb54d 100644 --- a/approot/admin-wizard.xml +++ b/approot/admin-initwizard.xml @@ -1,9 +1,8 @@ - - +

${tr:Lms.AdminWizard.header}

diff --git a/approot/admin-users.xml b/approot/admin-users.xml new file mode 100644 index 00000000..be2e36d9 --- /dev/null +++ b/approot/admin-users.xml @@ -0,0 +1,18 @@ + + + + +
+

${tr:Lms.Admin.Users.users}

+
+ ${users class="list-group"} + ${add-btn class="btn-primary"} + + + +
+ ${name} ${}${edit-btn} ${del-btn class="btn-danger"}${} +
+ + + diff --git a/approot/messages.xml b/approot/messages.xml index 27112c53..b1027651 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -30,10 +30,15 @@ Update start time Weekly + +New user +Delete +Edit +Users - -Administration account created. Please refresh to continue! -Create administrator account + +Administration account created. Please refresh to continue! +Create administrator account Remember me diff --git a/src/Makefile.am b/src/Makefile.am index b5c510a8..bbd38809 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,8 @@ lms_SOURCES = \ $(srcdir)/ui/PlayQueueView.cpp \ $(srcdir)/ui/SettingsView.cpp \ $(srcdir)/ui/admin/DatabaseSettingsView.cpp \ - $(srcdir)/ui/admin/AdminWizardView.cpp \ + $(srcdir)/ui/admin/InitWizardView.cpp \ + $(srcdir)/ui/admin/UsersView.cpp \ $(srcdir)/ui/common/InputRange.cpp \ $(srcdir)/ui/common/LineEdit.cpp \ $(srcdir)/ui/common/Validators.cpp \ diff --git a/src/database/User.cpp b/src/database/User.cpp index 2919d0a2..c299afde 100644 --- a/src/database/User.cpp +++ b/src/database/User.cpp @@ -60,13 +60,6 @@ User::getById(Wt::Dbo::Session& session, id_type id) return session.find().where("id = ?").bind( id ); } -std::string -User::getId( pointer user) -{ - std::ostringstream oss; oss << user.id(); - return oss.str(); -} - void User::setAudioBitrate(std::size_t bitrate) { diff --git a/src/database/User.hpp b/src/database/User.hpp index 582fb964..35ce625e 100644 --- a/src/database/User.hpp +++ b/src/database/User.hpp @@ -61,7 +61,6 @@ class User // accessors static pointer getById(Wt::Dbo::Session& session, id_type id); static std::vector getAll(Wt::Dbo::Session& session); - static std::string getId(pointer user); // write void setAdmin(bool admin) { _isAdmin = admin; } diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 531f07c5..87b4220e 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -37,8 +37,9 @@ #include "PlayQueueView.hpp" #include "SettingsView.hpp" +#include "admin/InitWizardView.hpp" #include "admin/DatabaseSettingsView.hpp" -#include "admin/AdminWizardView.hpp" +#include "admin/UsersView.hpp" #include "resource/ImageResource.hpp" #include "resource/TranscodeResource.hpp" @@ -86,6 +87,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti // Add a resource bundle messageResourceBundle().use(appRoot() + "admin-database"); + messageResourceBundle().use(appRoot() + "admin-users"); messageResourceBundle().use(appRoot() + "admin-wizard"); messageResourceBundle().use(appRoot() + "artist"); messageResourceBundle().use(appRoot() + "artists"); @@ -115,7 +117,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti if (firstConnection) { - root()->addWidget(new AdminWizardView()); + root()->addWidget(new InitWizardView()); } else { @@ -208,31 +210,41 @@ enum IdxRoot IdxPlayQueue, IdxSettings, IdxAdminDatabase, + IdxAdminUsers, }; static void -handlePathChange(Wt::WStackedWidget* stack) +handlePathChange(Wt::WStackedWidget* stack, bool isAdmin) { - static const std::map indexes = + static const struct { - { "/home", IdxHome }, - { "/artists", IdxExplore }, - { "/artist", IdxExplore }, - { "/releases", IdxExplore }, - { "/release", IdxExplore }, - { "/tracks", IdxExplore }, - { "/playqueue", IdxPlayQueue }, - { "/settings", IdxSettings }, - { "/admin/database", IdxAdminDatabase }, + std::string path; + int index; + bool admin; + } views[] = + { + { "/home", IdxHome, false }, + { "/artists", IdxExplore, false }, + { "/artist", IdxExplore, false }, + { "/releases", IdxExplore, false }, + { "/release", IdxExplore, false }, + { "/tracks", IdxExplore, false }, + { "/playqueue", IdxPlayQueue, false }, + { "/settings", IdxSettings, false }, + { "/admin/database", IdxAdminDatabase, true }, + { "/admin/users", IdxAdminUsers, true }, }; LMS_LOG(UI, DEBUG) << "Internal path changed to '" << wApp->internalPath() << "'"; - for (auto index : indexes) + for (auto& view : views) { - if (wApp->internalPathMatches(index.first)) + if (wApp->internalPathMatches(view.path)) { - stack->setCurrentIndex(index.second); + if (view.admin && !isAdmin) + break; + + stack->setCurrentIndex(view.index); return; } } @@ -253,6 +265,11 @@ LmsApplication::handleAuthEvent(void) LMS_LOG(UI, INFO) << "User '" << CurrentAuthUser().identity(Wt::Auth::Identity::LoginName) << "' logged in from '" << Wt::WApplication::instance()->environment().clientAddress() << "', user agent = " << Wt::WApplication::instance()->environment().agent() << ", session = " << Wt::WApplication::instance()->sessionId(); + { + Wt::Dbo::Transaction transaction (DboSession()); + _isAdmin = CurrentUser()->isAdmin(); + } + require("/js/mediaplayer.js"); _imageResource = new ImageResource(_db, root()); @@ -295,21 +312,21 @@ LmsApplication::handleAuthEvent(void) auto rightMenu = new Wt::WMenu(); std::size_t itemCounter = 0; + if (_isAdmin) { - Wt::Dbo::Transaction transaction (DboSession()); + auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.administration")); + menuItem->setSelectable(false); - if (CurrentUser()->isAdmin()) - { - auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.administration")); - menuItem->setSelectable(false); + Wt::WPopupMenu *admin = new Wt::WPopupMenu(); + auto dbSettings = admin->insertItem(0, Wt::WString::tr("Lms.Admin.Database.database")); + dbSettings->setLink(Wt::WLink(Wt::WLink::InternalPath, "/admin/database")); + dbSettings->setSelectable(false); - Wt::WPopupMenu *admin = new Wt::WPopupMenu(); - auto dbSettings = admin->insertItem(0, Wt::WString::tr("Lms.Admin.Database.database")); - dbSettings->setLink(Wt::WLink(Wt::WLink::InternalPath, "/admin/database")); - dbSettings->setSelectable(false); + auto usersSettings = admin->insertItem(1, Wt::WString::tr("Lms.Admin.Users.users")); + usersSettings->setLink(Wt::WLink(Wt::WLink::InternalPath, "/admin/users")); + usersSettings->setSelectable(false); - menuItem->setMenu(admin); - } + menuItem->setMenu(admin); } { @@ -344,8 +361,14 @@ LmsApplication::handleAuthEvent(void) mainStack->addWidget(settings); // Admin stuff - auto databaseSettings = new DatabaseSettingsView(); - mainStack->addWidget(databaseSettings); + if (_isAdmin) + { + auto databaseSettings = new DatabaseSettingsView(); + mainStack->addWidget(databaseSettings); + + auto users = new UsersView(); + mainStack->addWidget(users); + } explore->tracksAdd.connect(std::bind([=] (std::vector tracks) { @@ -380,7 +403,7 @@ LmsApplication::handleAuthEvent(void) playqueue->playbackStop.connect(player, &MediaPlayer::stop); // Events from MediaScanner - if (CurrentUser()->isAdmin()) + if (_isAdmin) { enableUpdates(true); std::string sessionId = this->sessionId(); @@ -401,10 +424,10 @@ LmsApplication::handleAuthEvent(void) internalPathChanged().connect(std::bind([=] { - handlePathChange(mainStack); + handlePathChange(mainStack, _isAdmin); })); - handlePathChange(mainStack); + handlePathChange(mainStack, _isAdmin); } void diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index 098f6856..8ff8adbc 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -65,6 +65,7 @@ class LmsApplication : public Wt::WApplication Scanner::MediaScanner& _scanner; ImageResource* _imageResource; TranscodeResource* _transcodeResource; + bool _isAdmin = false; }; // Helpers to get session data diff --git a/src/ui/admin/AdminWizardView.cpp b/src/ui/admin/InitWizardView.cpp similarity index 83% rename from src/ui/admin/AdminWizardView.cpp rename to src/ui/admin/InitWizardView.cpp index b0768c3c..4acb3965 100644 --- a/src/ui/admin/AdminWizardView.cpp +++ b/src/ui/admin/InitWizardView.cpp @@ -27,11 +27,11 @@ #include "common/Validators.hpp" #include "LmsApplication.hpp" -#include "AdminWizardView.hpp" +#include "InitWizardView.hpp" namespace UserInterface { -class AdminWizardModel : public Wt::WFormModel +class InitWizardModel : public Wt::WFormModel { public: @@ -40,7 +40,7 @@ class AdminWizardModel : public Wt::WFormModel static const Field PasswordField; static const Field PasswordConfirmField; - AdminWizardModel(Wt::WObject *parent = 0) + InitWizardModel(Wt::WObject *parent = 0) : Wt::WFormModel(parent) { addField(AdminLoginField); @@ -112,31 +112,31 @@ class AdminWizardModel : public Wt::WFormModel }; -const Wt::WFormModel::Field AdminWizardModel::AdminLoginField = "admin-login"; -const Wt::WFormModel::Field AdminWizardModel::PasswordField = "password"; -const Wt::WFormModel::Field AdminWizardModel::PasswordConfirmField = "password-confirm"; +const Wt::WFormModel::Field InitWizardModel::AdminLoginField = "admin-login"; +const Wt::WFormModel::Field InitWizardModel::PasswordField = "password"; +const Wt::WFormModel::Field InitWizardModel::PasswordConfirmField = "password-confirm"; -AdminWizardView::AdminWizardView(Wt::WContainerWidget *parent) +InitWizardView::InitWizardView(Wt::WContainerWidget *parent) : Wt::WTemplateFormView(parent) { - auto model = new AdminWizardModel(this); + auto model = new InitWizardModel(this); - setTemplateText(Wt::WString::tr("Lms.AdminWizard.template")); + setTemplateText(Wt::WString::tr("Lms.Admin.InitWizard.template")); addFunction("tr", &WTemplate::Functions::tr); addFunction("id", &WTemplate::Functions::id); // AdminLogin Wt::WLineEdit* accountEdit = new Wt::WLineEdit(); - setFormWidget(AdminWizardModel::AdminLoginField, accountEdit); + setFormWidget(InitWizardModel::AdminLoginField, accountEdit); // Password Wt::WLineEdit* passwordEdit = new Wt::WLineEdit(); - setFormWidget(AdminWizardModel::PasswordField, passwordEdit ); + setFormWidget(InitWizardModel::PasswordField, passwordEdit ); passwordEdit->setEchoMode(Wt::WLineEdit::Password); // Password confirmation Wt::WLineEdit* passwordConfirmEdit = new Wt::WLineEdit(); - setFormWidget(AdminWizardModel::PasswordConfirmField, passwordConfirmEdit); + setFormWidget(InitWizardModel::PasswordConfirmField, passwordConfirmEdit); passwordConfirmEdit->setEchoMode(Wt::WLineEdit::Password); auto saveButton = new Wt::WPushButton(Wt::WString::tr("Lms.create")); @@ -148,7 +148,7 @@ AdminWizardView::AdminWizardView(Wt::WContainerWidget *parent) if (model->validate()) { model->saveData(); - LmsApp->notify(Wt::WString::tr("Lms.AdminWizard.done")); + LmsApp->notify(Wt::WString::tr("Lms.Admin.InitWizard.done")); saveButton->setEnabled(false); } diff --git a/src/ui/admin/AdminWizardView.hpp b/src/ui/admin/InitWizardView.hpp similarity index 88% rename from src/ui/admin/AdminWizardView.hpp rename to src/ui/admin/InitWizardView.hpp index ecf486ea..d294fe58 100644 --- a/src/ui/admin/AdminWizardView.hpp +++ b/src/ui/admin/InitWizardView.hpp @@ -24,10 +24,10 @@ namespace UserInterface { -class AdminWizardView : public Wt::WTemplateFormView +class InitWizardView : public Wt::WTemplateFormView { public: - AdminWizardView(Wt::WContainerWidget *parent = 0); + InitWizardView(Wt::WContainerWidget *parent = 0); }; diff --git a/src/ui/admin/UsersView.cpp b/src/ui/admin/UsersView.cpp new file mode 100644 index 00000000..c5ecb4fc --- /dev/null +++ b/src/ui/admin/UsersView.cpp @@ -0,0 +1,83 @@ +/* + * 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 . + */ + +#include +#include + +#include "database/Types.hpp" +#include "utils/Logger.hpp" + +#include "LmsApplication.hpp" +#include "UsersView.hpp" + +namespace UserInterface { + +UsersView::UsersView(Wt::WContainerWidget *parent) + : Wt::WContainerWidget(parent) +{ + LMS_LOG(UI, DEBUG) << "TEST"; + auto t = new Wt::WTemplate(Wt::WString::tr("Lms.Admin.Users.template"), this); + t->addFunction("tr", &Wt::WTemplate::Functions::tr); + + _container = new Wt::WContainerWidget(); + t->bindWidget("users", _container); + + auto addBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.add")); + t->bindWidget("add-btn", addBtn); + + refresh(); +} + +void +UsersView::refresh() +{ + _container->clear(); + + Wt::Dbo::Transaction transaction(DboSession()); + + auto users = Database::User::getAll(DboSession()); + for (auto user : users) + { + auto entry = new Wt::WTemplate(Wt::WString::tr("Lms.Admin.Users.template.entry"), _container); + + Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId(std::to_string(user.id())); + + if (!authUser.isValid()) { + LMS_LOG(UI, ERROR) << "Skipping invalid userId = " << user.id(); + continue; + } + + entry->bindString("name", authUser.identity(Wt::Auth::Identity::LoginName), Wt::PlainText); + + // Don't edit ourself this way + if (CurrentUser() != user) + { + entry->setCondition("if-edit", true); + auto editBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.edit")); + entry->bindWidget("edit-btn", editBtn); + + auto delBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.del")); + entry->bindWidget("del-btn", delBtn); + } + } +} + +} // namespace UserInterface + + diff --git a/src/ui/admin/UsersView.hpp b/src/ui/admin/UsersView.hpp new file mode 100644 index 00000000..a642ef10 --- /dev/null +++ b/src/ui/admin/UsersView.hpp @@ -0,0 +1,39 @@ +/* + * 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 . + */ + +#pragma once + +#include + +namespace UserInterface { + +class UsersView : public Wt::WContainerWidget +{ + public: + UsersView(Wt::WContainerWidget *parent = 0); + + private: + void refresh(); + + Wt::WContainerWidget* _container; +}; + +} // namespace UserInterface + + diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index cd1ff5ab..c6044b3d 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -87,7 +87,7 @@ Artists::addSome() for (auto artist : artists) { - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template.entry"), _artistsContainer); + auto entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template.entry"), _artistsContainer); entry->bindInt("nb-release", artist->getReleases(clusterIds).size()); From 2f7697d278b2e04eda457ea005436452746ff74e Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 10 Apr 2018 13:24:14 +0200 Subject: [PATCH 096/195] Adding User edit/create view --- Makefile.am | 1 + approot/admin-user.xml | 57 ++++++ approot/messages.xml | 6 + src/Makefile.am | 1 + src/database/DatabaseHandler.cpp | 17 +- src/database/DatabaseHandler.hpp | 3 +- src/database/User.cpp | 18 +- src/database/User.hpp | 7 +- src/main/main.cpp | 2 - src/ui/Auth.cpp | 27 ++- src/ui/Auth.hpp | 2 + src/ui/LmsApplication.cpp | 49 ++++- src/ui/LmsApplication.hpp | 3 +- src/ui/SettingsView.cpp | 15 +- src/ui/admin/DatabaseSettingsView.cpp | 4 +- src/ui/admin/InitWizardView.cpp | 2 +- src/ui/admin/UserView.cpp | 258 ++++++++++++++++++++++++++ src/ui/admin/UserView.hpp | 37 ++++ src/ui/admin/UsersView.cpp | 47 ++++- src/utils/Utils.cpp | 13 ++ src/utils/Utils.hpp | 5 + 21 files changed, 510 insertions(+), 64 deletions(-) create mode 100644 approot/admin-user.xml create mode 100644 src/ui/admin/UserView.cpp create mode 100644 src/ui/admin/UserView.hpp diff --git a/Makefile.am b/Makefile.am index 00bf7d3d..446387c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,7 @@ lms_js_DATA = \ lms_approot_DATA = \ approot/admin-database.xml \ + approot/admin-user.xml \ approot/admin-users.xml \ approot/admin-initwizard.xml \ approot/artist.xml \ diff --git a/approot/admin-user.xml b/approot/admin-user.xml new file mode 100644 index 00000000..f3a9ebc9 --- /dev/null +++ b/approot/admin-user.xml @@ -0,0 +1,57 @@ + + + + +
+

${title}

+
+
+ ${} +
+ +
+ ${login} +
+
+ ${login-info} +
+
+ ${} +
+ +
+ ${password} +
+
+ ${password-info} +
+
+ +
+ +
+
+ ${audio-bitrate-limit} + kbps +
+
+
+ ${audio-bitrate-limit-info} +
+
+ +
+
+ ${save-btn class="btn-primary"} +
+
+
+ + + diff --git a/approot/messages.xml b/approot/messages.xml index b1027651..b7e05584 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -15,6 +15,7 @@ Confirm password Passwords don't match Are you sure? +Save Daily @@ -36,6 +37,11 @@ Edit Users +New user +New user created! +Edit user {1} +User updated! + Administration account created. Please refresh to continue! Create administrator account diff --git a/src/Makefile.am b/src/Makefile.am index bbd38809..d6e43294 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,6 +29,7 @@ lms_SOURCES = \ $(srcdir)/ui/SettingsView.cpp \ $(srcdir)/ui/admin/DatabaseSettingsView.cpp \ $(srcdir)/ui/admin/InitWizardView.cpp \ + $(srcdir)/ui/admin/UserView.cpp \ $(srcdir)/ui/admin/UsersView.cpp \ $(srcdir)/ui/common/InputRange.cpp \ $(srcdir)/ui/common/LineEdit.cpp \ diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index 862d6034..2186d2c7 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -164,7 +164,6 @@ Handler::getCurrentUser() User::pointer Handler::getUser(const Wt::Auth::User& authUser) { - if (!authUser.isValid()) { LMS_LOG(DB, ERROR) << "Handler::getUser: invalid authUser"; return User::pointer(); @@ -172,13 +171,21 @@ Handler::getUser(const Wt::Auth::User& authUser) Wt::Dbo::ptr authInfo = _users->find(authUser); - User::pointer user = authInfo->user(); + return authInfo->user(); +} - if (!user) { - user = _session.add(new User()); - authInfo.modify()->setUser(user); +User::pointer +Handler::createUser(const Wt::Auth::User& authUser) +{ + if (!authUser.isValid()) { + LMS_LOG(DB, ERROR) << "Handler::getUser: invalid authUser"; + return User::pointer(); } + User::pointer user = _session.add(new User()); + Wt::Dbo::ptr authInfo = _users->find(authUser); + authInfo.modify()->setUser(user); + return user; } diff --git a/src/database/DatabaseHandler.hpp b/src/database/DatabaseHandler.hpp index 28f5600a..f99aa870 100644 --- a/src/database/DatabaseHandler.hpp +++ b/src/database/DatabaseHandler.hpp @@ -48,7 +48,8 @@ class Handler Wt::Dbo::Session& getSession() { return _session; } Wt::Dbo::ptr getCurrentUser(); // get the current user, may return empty - Wt::Dbo::ptr getUser(const Wt::Auth::User& authUser); // Get or create the given user + Wt::Dbo::ptr getUser(const Wt::Auth::User& authUser); + Wt::Dbo::ptr createUser(const Wt::Auth::User& authUser); Wt::Auth::AbstractUserDatabase& getUserDatabase(); Wt::Auth::Login& getLogin() { return _login; } diff --git a/src/database/User.cpp b/src/database/User.cpp index c299afde..61584657 100644 --- a/src/database/User.cpp +++ b/src/database/User.cpp @@ -32,7 +32,7 @@ User::audioBitrates = }; User::User() -: _maxAudioBitrate(maxAudioBitrate), +: _maxAudioBitrate(audioBitrates.back()), _isAdmin(false), _audioBitrate(defaultAudioBitrate), _audioEncoding(AudioEncoding::AUTO), @@ -63,31 +63,27 @@ User::getById(Wt::Dbo::Session& session, id_type id) void User::setAudioBitrate(std::size_t bitrate) { - _audioBitrate = std::min(bitrate, std::min(static_cast(_maxAudioBitrate), audioBitrates.back())); + _audioBitrate = std::min(bitrate, static_cast(_maxAudioBitrate)); } void User::setMaxAudioBitrate(std::size_t bitrate) { - _maxAudioBitrate = std::min(bitrate, static_cast(_maxAudioBitrate)); + _maxAudioBitrate = std::min(bitrate, audioBitrates.back()); + if (_audioBitrate > _maxAudioBitrate) + _audioBitrate = _maxAudioBitrate; } std::size_t User::getAudioBitrate(void) const { - if (!isAdmin()) - return std::min(static_cast(_audioBitrate), std::min(static_cast(_maxAudioBitrate), audioBitrates.back())); - else - return std::min(static_cast(_audioBitrate), audioBitrates.back()); + return _audioBitrate; } std::size_t User::getMaxAudioBitrate(void) const { - if (!isAdmin()) - return std::min(static_cast(_maxAudioBitrate), audioBitrates.back()); - else - return audioBitrates.back(); + return _maxAudioBitrate; } } // namespace Database diff --git a/src/database/User.hpp b/src/database/User.hpp index 35ce625e..d9c1923e 100644 --- a/src/database/User.hpp +++ b/src/database/User.hpp @@ -41,7 +41,7 @@ enum class AudioEncoding WEBMA, }; -class User +class User : public Wt::Dbo::Dbo { public: typedef Wt::Dbo::dbo_traits::IdType id_type; @@ -70,9 +70,9 @@ class User void setCurPlayingTrackPos(std::size_t pos) { _curPlayingTrackPos = pos; } // read - bool isAdmin() const {return _isAdmin;} + bool isAdmin() const { return _isAdmin; } std::size_t getAudioBitrate() const; - AudioEncoding getAudioEncoding() const { return _audioEncoding;} + AudioEncoding getAudioEncoding() const { return _audioEncoding; } std::size_t getMaxAudioBitrate() const; std::size_t getCurPlayingTrackPos() const { return _curPlayingTrackPos; } @@ -90,7 +90,6 @@ class User private: - static const std::size_t maxAudioBitrate = 320000; static const std::size_t defaultAudioBitrate = 128000; // Admin defined settings diff --git a/src/main/main.cpp b/src/main/main.cpp index 4715640c..0abbc96c 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -30,8 +30,6 @@ #include "feature/FeatureExtractor.hpp" #include "scanner/MediaScanner.hpp" -//#include "database/updater/DatabaseFeatureExtractor.hpp" -//#include "database/updater/DatabaseHighLevelCluster.hpp" #include "ui/LmsApplication.hpp" diff --git a/src/ui/Auth.cpp b/src/ui/Auth.cpp index bf242a64..5713d065 100644 --- a/src/ui/Auth.cpp +++ b/src/ui/Auth.cpp @@ -57,20 +57,8 @@ Auth::Auth(Wt::WContainerWidget *parent) auto loginBtn = new Wt::WPushButton(Wt::WString::tr("Lms.login")); bindWidget("login-btn", loginBtn); - loginBtn->clicked().connect(std::bind([=] - { - updateModel(_model); - - if (_model->validate()) - _model->login(DbHandler().getLogin()); - else - updateView(_model); - })); - - password->enterPressed().connect(std::bind([=] - { - loginBtn->clicked().emit(Wt::WMouseEvent()); - })); + loginBtn->clicked().connect(this, &Auth::processAuth); + password->enterPressed().connect(this, &Auth::processAuth); DbHandler().getLogin().changed().connect(std::bind([=] { @@ -84,6 +72,17 @@ Auth::Auth(Wt::WContainerWidget *parent) updateView(_model); } +void +Auth::processAuth() +{ + updateModel(_model); + + if (_model->validate()) + _model->login(DbHandler().getLogin()); + else + updateView(_model); +} + void Auth::logout() { diff --git a/src/ui/Auth.hpp b/src/ui/Auth.hpp index 37e09eff..65eec670 100644 --- a/src/ui/Auth.hpp +++ b/src/ui/Auth.hpp @@ -34,6 +34,8 @@ class Auth : public Wt::WTemplateFormView void logout(); private: + void processAuth(); + Wt::Auth::AuthModel* _model; }; diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 87b4220e..7eec6f1d 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -39,6 +39,7 @@ #include "admin/InitWizardView.hpp" #include "admin/DatabaseSettingsView.hpp" +#include "admin/UserView.hpp" #include "admin/UsersView.hpp" #include "resource/ImageResource.hpp" @@ -87,6 +88,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti // Add a resource bundle messageResourceBundle().use(appRoot() + "admin-database"); + messageResourceBundle().use(appRoot() + "admin-user"); messageResourceBundle().use(appRoot() + "admin-users"); messageResourceBundle().use(appRoot() + "admin-wizard"); messageResourceBundle().use(appRoot() + "artist"); @@ -103,6 +105,9 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti messageResourceBundle().use(appRoot() + "tracks"); messageResourceBundle().use(appRoot() + "templates"); + // Require js here to avoid async problems + require("/js/mediaplayer.js"); + setTitle("LMS"); // If here is no account in the database, launch the first connection wizard @@ -121,7 +126,18 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti } else { - DbHandler().getLogin().changed().connect(this, &LmsApplication::handleAuthEvent); + DbHandler().getLogin().changed().connect(std::bind([=] + { + try + { + handleAuthEvent(); + } + catch (std::exception& e) + { + LMS_LOG(UI, ERROR) << "Error while handling auth event: " << e.what(); + throw std::runtime_error("Internal error"); + } + })); _auth = new Auth(); root()->addWidget(_auth); @@ -199,6 +215,7 @@ LmsApplication::goHome() void LmsApplication::quit() { + setConfirmCloseMessage(""); WApplication::quit(""); redirect("/"); } @@ -211,6 +228,7 @@ enum IdxRoot IdxSettings, IdxAdminDatabase, IdxAdminUsers, + IdxAdminUser, }; static void @@ -233,6 +251,7 @@ handlePathChange(Wt::WStackedWidget* stack, bool isAdmin) { "/settings", IdxSettings, false }, { "/admin/database", IdxAdminDatabase, true }, { "/admin/users", IdxAdminUsers, true }, + { "/admin/user", IdxAdminUser, true }, }; LMS_LOG(UI, DEBUG) << "Internal path changed to '" << wApp->internalPath() << "'"; @@ -270,8 +289,6 @@ LmsApplication::handleAuthEvent(void) _isAdmin = CurrentUser()->isAdmin(); } - require("/js/mediaplayer.js"); - _imageResource = new ImageResource(_db, root()); _transcodeResource = new TranscodeResource(_db, root()); @@ -368,6 +385,9 @@ LmsApplication::handleAuthEvent(void) auto users = new UsersView(); mainStack->addWidget(users); + + auto user = new UserView(); + mainStack->addWidget(user); } explore->tracksAdd.connect(std::bind([=] (std::vector tracks) @@ -411,7 +431,7 @@ LmsApplication::handleAuthEvent(void) { Wt::WServer::instance()->post(sessionId, [=] { - notify(Wt::WString::tr("Lms.Admin.Database.scan-complete") + notifyMsg(Wt::WString::tr("Lms.Admin.Database.scan-complete") .arg(stats.nbFiles()) .arg(stats.additions) .arg(stats.deletions) @@ -431,17 +451,26 @@ LmsApplication::handleAuthEvent(void) } void -LmsApplication::notify(const Wt::WString& message) +LmsApplication::notify(const Wt::WEvent& event) +{ + try + { + WApplication::notify(event); + } + catch (std::exception& e) + { + LMS_LOG(UI, ERROR) << "Caught exception: " << e.what(); + throw std::runtime_error("Internal error"); + } +} + +void +LmsApplication::notifyMsg(const Wt::WString& message) { LMS_LOG(UI, INFO) << "Notifying message '" << message.toUTF8() << "'"; root()->addWidget(new Wt::WText(message)); } -void notify(const Wt::WString& message) -{ - LmsApplication::instance()->notify(message); -} - } // namespace UserInterface diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index 8ff8adbc..b59ef635 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -49,7 +49,7 @@ class LmsApplication : public Wt::WApplication // Utils void goHome(); void quit(); - void notify(const Wt::WString& message); + void notifyMsg(const Wt::WString& message); static Wt::WAnchor* createArtistAnchor(Database::Artist::pointer artist, bool addText = true); static Wt::WAnchor* createReleaseAnchor(Database::Release::pointer release, bool addText = true); @@ -59,6 +59,7 @@ class LmsApplication : public Wt::WApplication LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner); void handleAuthEvent(void); + void notify(const Wt::WEvent& event) override; Database::Handler _db; Auth* _auth; diff --git a/src/ui/SettingsView.cpp b/src/ui/SettingsView.cpp index 7b1ba7c4..0daa1295 100644 --- a/src/ui/SettingsView.cpp +++ b/src/ui/SettingsView.cpp @@ -156,13 +156,13 @@ class SettingsModel : public Wt::WFormModel std::size_t bitrate(int row) { return boost::any_cast - (_bitrateModel->data(_encodingModel->index(row, 0), Wt::UserRole)); + (_bitrateModel->data(_bitrateModel->index(row, 0), Wt::UserRole)); } Wt::WString bitrateString(int row) { return boost::any_cast - (_bitrateModel->data(_encodingModel->index(row, 0), Wt::DisplayRole)); + (_bitrateModel->data(_bitrateModel->index(row, 0), Wt::DisplayRole)); } boost::optional getEncodingRow(Wt::WString value) @@ -207,9 +207,18 @@ class SettingsModel : public Wt::WFormModel _bitrateModel = new Wt::WStringListModel(this); + std::size_t maxAudioBitrate; + { + Wt::Dbo::Transaction transaction(DboSession()); + maxAudioBitrate = CurrentUser()->getMaxAudioBitrate(); + } + std::size_t id = 0; for (auto bitrate : Database::User::audioBitrates) { + if (bitrate > maxAudioBitrate) + break; + _bitrateModel->addString( Wt::WString::fromUTF8(std::to_string(bitrate / 1000)) ); _bitrateModel->setData( id++, 0, bitrate, Wt::UserRole); } @@ -282,7 +291,7 @@ SettingsView::SettingsView(Wt::WContainerWidget *parent) if (model->validate()) { model->saveData(); - LmsApp->notify(Wt::WString::tr("Lms.Settings.settings-saved")); + LmsApp->notifyMsg(Wt::WString::tr("Lms.Settings.settings-saved")); } // Udate the view: Delete any validation message in the view, etc. diff --git a/src/ui/admin/DatabaseSettingsView.cpp b/src/ui/admin/DatabaseSettingsView.cpp index b5b0b507..9373dd59 100644 --- a/src/ui/admin/DatabaseSettingsView.cpp +++ b/src/ui/admin/DatabaseSettingsView.cpp @@ -267,7 +267,7 @@ DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) model->saveData(); LmsApp->getMediaScanner().reschedule(); - LmsApp->notify(Wt::WString::tr("Lms.Admin.Database.settings-saved")); + LmsApp->notifyMsg(Wt::WString::tr("Lms.Admin.Database.settings-saved")); } // Udate the view: Delete any validation message in the view, etc. @@ -284,7 +284,7 @@ DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) immScanBtn->clicked().connect(std::bind([=] () { LmsApp->getMediaScanner().scheduleImmediateScan(); - LmsApp->notify(Wt::WString::tr("Lms.Admin.Database.scan-launched")); + LmsApp->notifyMsg(Wt::WString::tr("Lms.Admin.Database.scan-launched")); })); updateView(model); diff --git a/src/ui/admin/InitWizardView.cpp b/src/ui/admin/InitWizardView.cpp index 4acb3965..79608064 100644 --- a/src/ui/admin/InitWizardView.cpp +++ b/src/ui/admin/InitWizardView.cpp @@ -148,7 +148,7 @@ InitWizardView::InitWizardView(Wt::WContainerWidget *parent) if (model->validate()) { model->saveData(); - LmsApp->notify(Wt::WString::tr("Lms.Admin.InitWizard.done")); + LmsApp->notifyMsg(Wt::WString::tr("Lms.Admin.InitWizard.done")); saveButton->setEnabled(false); } diff --git a/src/ui/admin/UserView.cpp b/src/ui/admin/UserView.cpp new file mode 100644 index 00000000..3d466b5e --- /dev/null +++ b/src/ui/admin/UserView.cpp @@ -0,0 +1,258 @@ +/* + * 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 . + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "common/Validators.hpp" +#include "utils/Utils.hpp" +#include "utils/Logger.hpp" + +#include "LmsApplication.hpp" +#include "UserView.hpp" + +namespace UserInterface { + + +class UserModel : public Wt::WFormModel +{ + public: + static const Field LoginField; + static const Field PasswordField; + static const Field BitrateLimitField; + + UserModel(boost::optional userId, Wt::WObject *parent = 0) + : Wt::WFormModel(parent), + _userId(userId) + { + if (!_userId) + { + addField(LoginField); + setValidator(LoginField, createNameValidator()); + } + + addField(PasswordField); + addField(BitrateLimitField); + + + if (!_userId) + setValidator(PasswordField, createMandatoryValidator()); + + initializeModels(); + + // populate the model with initial data + loadData(); + } + + void loadData() + { + if (!_userId) + return; + + Wt::Dbo::Transaction transaction(DboSession()); + + Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId( std::to_string(*_userId) ); + Database::User::pointer user = DbHandler().getUser(authUser); + + if (user == CurrentUser()) + throw std::runtime_error("Cannot edit ourselves"); + + auto bitrate = getBitrateLimitRow(user->getMaxAudioBitrate()); + if (bitrate) + setValue(BitrateLimitField, bitrateLimitString(*bitrate)); + } + + void saveData() + { + Wt::Dbo::Transaction transaction(DboSession()); + + if (_userId) + { + // Update user + Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId( std::to_string(*_userId) ); + Database::User::pointer user = DbHandler().getUser( authUser ); + + // Account + if (!valueText(PasswordField).empty()) + Database::Handler::getPasswordService().updatePassword(authUser, valueText(PasswordField)); + + auto bitrateLimitRow = getBitrateLimitRow(Wt::asString(value(BitrateLimitField))); + user.modify()->setMaxAudioBitrate(bitrateLimit(*bitrateLimitRow)); + LMS_LOG(UI, DEBUG) << "Max audio bitrate set to " << bitrateLimit(*bitrateLimitRow); + } + else + { + // Create user + Wt::Auth::User authUser = DbHandler().getUserDatabase().registerNew(); + Database::User::pointer user = DbHandler().createUser(authUser); + + // Account + authUser.setIdentity(Wt::Auth::Identity::LoginName, valueText(LoginField)); + Database::Handler::getPasswordService().updatePassword(authUser, valueText(PasswordField)); + + auto bitrateLimitRow = getBitrateLimitRow(Wt::asString(value(BitrateLimitField))); + user.modify()->setMaxAudioBitrate(bitrateLimit(*bitrateLimitRow)); + } + } + + boost::optional getBitrateLimitRow(Wt::WString value) + { + for (int i = 0; i < _bitrateModel->rowCount(); ++i) + { + if (bitrateLimitString(i) == value) + return i; + } + + return boost::none; + } + + boost::optional getBitrateLimitRow(std::size_t value) + { + for (int i = 0; i < _bitrateModel->rowCount(); ++i) + { + if (bitrateLimit(i) == value) + return i; + } + + return boost::none; + } + + std::size_t bitrateLimit(int row) + { + return boost::any_cast + (_bitrateModel->data(_bitrateModel->index(row, 0), Wt::UserRole)); + } + + Wt::WString bitrateLimitString(int row) + { + return boost::any_cast + (_bitrateModel->data(_bitrateModel->index(row, 0), Wt::DisplayRole)); + } + + Wt::WAbstractItemModel *bitrateModel() { return _bitrateModel; } + + private: + + void initializeModels() + { + _bitrateModel = new Wt::WStringListModel(this); + + std::size_t id = 0; + for (auto bitrate : Database::User::audioBitrates) + { + _bitrateModel->addString( Wt::WString::fromUTF8(std::to_string(bitrate / 1000)) ); + _bitrateModel->setData( id++, 0, bitrate, Wt::UserRole); + } + + + } + + Wt::WStringListModel* _bitrateModel; + boost::optional _userId; +}; + +const Wt::WFormModel::Field UserModel::LoginField = "login"; +const Wt::WFormModel::Field UserModel::PasswordField = "password"; +const Wt::WFormModel::Field UserModel::BitrateLimitField = "audio-bitrate-limit"; + +UserView::UserView(Wt::WContainerWidget* parent) +: Wt::WContainerWidget(parent) +{ + wApp->internalPathChanged().connect(std::bind([=] + { + refresh(); + })); + + refresh(); +} + +void +UserView::refresh() +{ + if (!wApp->internalPathMatches("/admin/user")) + return; + + auto userId = readLong(wApp->internalPathNextPart("/admin/user/")); + + clear(); + + auto t = new Wt::WTemplateFormView(Wt::WString::tr("Lms.Admin.User.template"), this); + + t->addFunction("tr", &Wt::WTemplate::Functions::tr); + t->addFunction("id", &Wt::WTemplate::Functions::id); + + auto model = new UserModel(userId ? boost::make_optional(*userId) : boost::none, this); + + if (userId) + { + auto authUser = DbHandler().getUserDatabase().findWithId( std::to_string(*userId) ); + auto name = authUser.identity(Wt::Auth::Identity::LoginName); + t->bindString("title", Wt::WString::tr("Lms.Admin.User.user-edit").arg(name), Wt::PlainText); + } + else + { + // Login + t->setCondition("if-has-login", true); + t->setFormWidget(UserModel::LoginField, new Wt::WLineEdit()); + t->bindString("title", Wt::WString::tr("Lms.Admin.User.user-create")); + } + + + // Password + Wt::WLineEdit* passwordEdit = new Wt::WLineEdit(); + t->setFormWidget(UserModel::PasswordField, passwordEdit ); + passwordEdit->setEchoMode(Wt::WLineEdit::Password); + + // AudioBitrate + Wt::WComboBox *bitrateCB = new Wt::WComboBox(); + t->setFormWidget(UserModel::BitrateLimitField, bitrateCB); + bitrateCB->setModel(model->bitrateModel()); + + auto saveBtn = new Wt::WPushButton(Wt::WString::tr(userId ? "Lms.save" : "Lms.create")); + t->bindWidget("save-btn", saveBtn); + saveBtn->clicked().connect(std::bind([=] + { + t->updateModel(model); + + if (model->validate()) + { + model->saveData(); + LmsApp->notifyMsg(Wt::WString::tr(userId ? "Lms.Admin.User.user-updated" : "Lms.Admin.User.user-created")); + LmsApp->setInternalPath("/admin/users", true); + } + else + { + t->updateView(model); + } + })); + + t->updateView(model); + +} + +} // namespace UserInterface + + diff --git a/src/ui/admin/UserView.hpp b/src/ui/admin/UserView.hpp new file mode 100644 index 00000000..723c0f13 --- /dev/null +++ b/src/ui/admin/UserView.hpp @@ -0,0 +1,37 @@ +/* + * 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 . + */ + +#pragma once + +#include + +namespace UserInterface { + +class UserView : public Wt::WContainerWidget +{ + public: + UserView(Wt::WContainerWidget *parent = 0); + + private: + void refresh(); +}; + +} // namespace UserInterface + + diff --git a/src/ui/admin/UsersView.cpp b/src/ui/admin/UsersView.cpp index c5ecb4fc..6c0a4153 100644 --- a/src/ui/admin/UsersView.cpp +++ b/src/ui/admin/UsersView.cpp @@ -31,7 +31,6 @@ namespace UserInterface { UsersView::UsersView(Wt::WContainerWidget *parent) : Wt::WContainerWidget(parent) { - LMS_LOG(UI, DEBUG) << "TEST"; auto t = new Wt::WTemplate(Wt::WString::tr("Lms.Admin.Users.template"), this); t->addFunction("tr", &Wt::WTemplate::Functions::tr); @@ -41,12 +40,25 @@ UsersView::UsersView(Wt::WContainerWidget *parent) auto addBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.add")); t->bindWidget("add-btn", addBtn); + addBtn->clicked().connect(std::bind([=] + { + LmsApp->setInternalPath("/admin/user", true); + })); + + wApp->internalPathChanged().connect(std::bind([=] + { + refresh(); + })); + refresh(); } void UsersView::refresh() { + if (!wApp->internalPathMatches("/admin/users")) + return; + _container->clear(); Wt::Dbo::Transaction transaction(DboSession()); @@ -54,9 +66,10 @@ UsersView::refresh() auto users = Database::User::getAll(DboSession()); for (auto user : users) { + auto userId = std::to_string(user.id()); auto entry = new Wt::WTemplate(Wt::WString::tr("Lms.Admin.Users.template.entry"), _container); - Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId(std::to_string(user.id())); + Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId(userId); if (!authUser.isValid()) { LMS_LOG(UI, ERROR) << "Skipping invalid userId = " << user.id(); @@ -66,15 +79,29 @@ UsersView::refresh() entry->bindString("name", authUser.identity(Wt::Auth::Identity::LoginName), Wt::PlainText); // Don't edit ourself this way - if (CurrentUser() != user) - { - entry->setCondition("if-edit", true); - auto editBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.edit")); - entry->bindWidget("edit-btn", editBtn); + if (CurrentUser() == user) + continue; - auto delBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.del")); - entry->bindWidget("del-btn", delBtn); - } + entry->setCondition("if-edit", true); + auto editBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.edit")); + entry->bindWidget("edit-btn", editBtn); + editBtn->clicked().connect(std::bind([=] + { + LmsApp->setInternalPath("/admin/user/" + std::to_string(user.id()), true); + })); + + auto delBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.del")); + entry->bindWidget("del-btn", delBtn); + delBtn->clicked().connect(std::bind([=] + { + Wt::Dbo::Transaction transaction(DboSession()); + + auto authUser = DbHandler().getUserDatabase().findWithId(userId); + auto user = DbHandler().getUser(authUser); + DbHandler().getUserDatabase().deleteUser( authUser ); + user.remove(); + _container->removeWidget(entry); + })); } } diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp index 8b71586a..67117b20 100644 --- a/src/utils/Utils.cpp +++ b/src/utils/Utils.cpp @@ -27,6 +27,19 @@ #include "Utils.hpp" +boost::optional +readLong(const std::string& str) +{ + try + { + return std::stol(str); + } + catch (std::exception& e) + { + return boost::none; + } +} + bool readAsPosixTime(const std::string& str, boost::posix_time::ptime& time) { const std::locale formats[] = { diff --git a/src/utils/Utils.hpp b/src/utils/Utils.hpp index a7e89054..905297c4 100644 --- a/src/utils/Utils.hpp +++ b/src/utils/Utils.hpp @@ -24,8 +24,13 @@ #include #include +#include #include + +boost::optional +readLong(const std::string& str); + bool readAsPosixTime(const std::string& str, boost::posix_time::ptime& time); From f604541812d357ef76dc0d5217c8ddba72d74e71 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 10 Apr 2018 13:45:56 +0200 Subject: [PATCH 097/195] Renamed refresh to refreshView to avoid base class overrides --- src/ui/admin/UserView.cpp | 6 +++--- src/ui/admin/UserView.hpp | 2 +- src/ui/admin/UsersView.cpp | 6 +++--- src/ui/admin/UsersView.hpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ui/admin/UserView.cpp b/src/ui/admin/UserView.cpp index 3d466b5e..e2d54c58 100644 --- a/src/ui/admin/UserView.cpp +++ b/src/ui/admin/UserView.cpp @@ -183,14 +183,14 @@ UserView::UserView(Wt::WContainerWidget* parent) { wApp->internalPathChanged().connect(std::bind([=] { - refresh(); + refreshView(); })); - refresh(); + refreshView(); } void -UserView::refresh() +UserView::refreshView() { if (!wApp->internalPathMatches("/admin/user")) return; diff --git a/src/ui/admin/UserView.hpp b/src/ui/admin/UserView.hpp index 723c0f13..b081d745 100644 --- a/src/ui/admin/UserView.hpp +++ b/src/ui/admin/UserView.hpp @@ -29,7 +29,7 @@ class UserView : public Wt::WContainerWidget UserView(Wt::WContainerWidget *parent = 0); private: - void refresh(); + void refreshView(); }; } // namespace UserInterface diff --git a/src/ui/admin/UsersView.cpp b/src/ui/admin/UsersView.cpp index 6c0a4153..bdba16b5 100644 --- a/src/ui/admin/UsersView.cpp +++ b/src/ui/admin/UsersView.cpp @@ -47,14 +47,14 @@ UsersView::UsersView(Wt::WContainerWidget *parent) wApp->internalPathChanged().connect(std::bind([=] { - refresh(); + refreshView(); })); - refresh(); + refreshView(); } void -UsersView::refresh() +UsersView::refreshView() { if (!wApp->internalPathMatches("/admin/users")) return; diff --git a/src/ui/admin/UsersView.hpp b/src/ui/admin/UsersView.hpp index a642ef10..45717f34 100644 --- a/src/ui/admin/UsersView.hpp +++ b/src/ui/admin/UsersView.hpp @@ -29,7 +29,7 @@ class UsersView : public Wt::WContainerWidget UsersView(Wt::WContainerWidget *parent = 0); private: - void refresh(); + void refreshView(); Wt::WContainerWidget* _container; }; From b743127076981b4d51de7334e93880e89b58421c Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 10 Apr 2018 13:50:51 +0200 Subject: [PATCH 098/195] Renamed quit to goHomeAndQuit to avoid base class overrides --- src/ui/LmsApplication.cpp | 4 ++-- src/ui/LmsApplication.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 7eec6f1d..7b0dacbb 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -213,7 +213,7 @@ LmsApplication::goHome() } void -LmsApplication::quit() +LmsApplication::goHomeAndQuit() { setConfirmCloseMessage(""); WApplication::quit(""); @@ -278,7 +278,7 @@ LmsApplication::handleAuthEvent(void) { LMS_LOG(UI, INFO) << "User logged out, session = " << Wt::WApplication::instance()->sessionId(); - quit(); + goHomeAndQuit(); return; } diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index b59ef635..062872cc 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -48,7 +48,7 @@ class LmsApplication : public Wt::WApplication // Utils void goHome(); - void quit(); + void goHomeAndQuit(); void notifyMsg(const Wt::WString& message); static Wt::WAnchor* createArtistAnchor(Database::Artist::pointer artist, bool addText = true); From 9cb4918f4416f5e890da0e2975c4012b08e95809 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 16 Apr 2018 16:56:51 +0200 Subject: [PATCH 099/195] Upgrade from Wt3 to Wt4 --- README.md | 32 ++-- TODO | 1 - approot/admin-initwizard.xml | 2 +- configure.ac | 32 +--- src/Makefile.am | 7 +- src/av/AvInfo.cpp | 14 +- src/av/AvInfo.hpp | 4 +- src/av/AvTranscoder.cpp | 4 +- src/cover/CoverArtGrabber.cpp | 8 +- src/database/DatabaseHandler.cpp | 58 +++---- src/database/DatabaseHandler.hpp | 12 +- src/database/DbArtist.cpp | 4 +- src/database/DbArtist.hpp | 6 +- src/database/MediaDirectory.cpp | 2 +- src/database/MediaDirectory.hpp | 5 +- src/database/Playlist.cpp | 4 +- src/database/Playlist.hpp | 2 +- src/database/Release.cpp | 15 +- src/database/Release.hpp | 6 +- src/database/SearchFilter.cpp | 40 ----- src/database/SearchFilter.hpp | 68 -------- src/database/Setting.cpp | 31 +--- src/database/Setting.hpp | 18 +-- src/database/Track.cpp | 48 +----- src/database/Track.hpp | 50 +++--- src/database/User.cpp | 2 +- src/database/User.hpp | 4 +- src/feature/FeatureExtractor.cpp | 216 -------------------------- src/feature/FeatureExtractor.hpp | 43 ----- src/feature/FeatureStore.cpp | 126 --------------- src/feature/FeatureStore.hpp | 47 ------ src/image/Image.cpp | 2 +- src/main/main.cpp | 15 +- src/metadata/AvFormat.cpp | 50 +++--- src/metadata/MetaData.hpp | 6 +- src/metadata/TagLibParser.cpp | 45 +++--- src/scanner/MediaScanner.cpp | 137 ++++++++-------- src/scanner/MediaScanner.hpp | 18 ++- src/ui/Auth.cpp | 47 +++--- src/ui/Auth.hpp | 10 +- src/ui/HomeView.cpp | 9 +- src/ui/HomeView.hpp | 4 +- src/ui/LmsApplication.cpp | 170 +++++++------------- src/ui/LmsApplication.hpp | 37 +++-- src/ui/MediaPlayer.cpp | 10 +- src/ui/MediaPlayer.hpp | 12 +- src/ui/PlayQueueView.cpp | 105 ++++++------- src/ui/PlayQueueView.hpp | 14 +- src/ui/SettingsView.cpp | 129 ++++++++------- src/ui/SettingsView.hpp | 5 +- src/ui/admin/DatabaseSettingsView.cpp | 138 +++++++--------- src/ui/admin/DatabaseSettingsView.hpp | 5 +- src/ui/admin/InitWizardView.cpp | 59 ++++--- src/ui/admin/InitWizardView.hpp | 5 +- src/ui/admin/UserView.cpp | 99 ++++++------ src/ui/admin/UserView.hpp | 4 +- src/ui/admin/UsersView.cpp | 45 +++--- src/ui/admin/UsersView.hpp | 6 +- src/ui/common/InputRange.cpp | 56 ------- src/ui/common/InputRange.hpp | 51 ------ src/ui/common/LineEdit.cpp | 55 ------- src/ui/common/LineEdit.hpp | 44 ------ src/ui/common/Validators.cpp | 21 +-- src/ui/common/Validators.hpp | 8 +- src/ui/explore/ArtistView.cpp | 68 ++++---- src/ui/explore/ArtistView.hpp | 6 +- src/ui/explore/ArtistsView.cpp | 34 ++-- src/ui/explore/ArtistsView.hpp | 11 +- src/ui/explore/Explore.cpp | 68 ++++---- src/ui/explore/Explore.hpp | 18 +-- src/ui/explore/Filters.cpp | 69 +++----- src/ui/explore/Filters.hpp | 13 +- src/ui/explore/ReleaseView.cpp | 71 ++++----- src/ui/explore/ReleaseView.hpp | 4 +- src/ui/explore/ReleasesView.cpp | 59 +++---- src/ui/explore/ReleasesView.hpp | 11 +- src/ui/explore/TracksView.cpp | 63 +++----- src/ui/explore/TracksView.hpp | 10 +- src/ui/resource/ImageResource.cpp | 39 ++--- src/ui/resource/ImageResource.hpp | 4 +- src/ui/resource/TranscodeResource.cpp | 7 +- src/ui/resource/TranscodeResource.hpp | 4 +- src/utils/Logger.hpp | 6 +- src/utils/Path.cpp | 2 +- src/utils/Utils.cpp | 61 +++----- src/utils/Utils.hpp | 37 ++--- test/TestAvMetadata.cpp | 14 +- 87 files changed, 954 insertions(+), 2057 deletions(-) delete mode 100644 src/database/SearchFilter.cpp delete mode 100644 src/database/SearchFilter.hpp delete mode 100644 src/feature/FeatureExtractor.cpp delete mode 100644 src/feature/FeatureExtractor.hpp delete mode 100644 src/feature/FeatureStore.cpp delete mode 100644 src/feature/FeatureStore.hpp delete mode 100644 src/ui/common/InputRange.cpp delete mode 100644 src/ui/common/InputRange.hpp delete mode 100644 src/ui/common/LineEdit.cpp delete mode 100644 src/ui/common/LineEdit.hpp diff --git a/README.md b/README.md index 923266e5..510eb624 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,13 @@ # LMS - Lightweight Media Server LMS is a self-hosted media streaming software, released under the GPLv3 license. -It allows you to access your music and your videos using an http(s) web interface. +It allows you to access your music using an http(s) web interface. ## Features - Audio transcode for maximum interoperability and low bandwith requirements - - User management - - Playlist support - MusicBrainzID support to handle duplicated artist and release names - -Tags are automatically created to facilitate music searching, using: - - Multi genre information from metadata - - High-level information from AcousticBrainz + - Filter by genre and/or group + - User management LMS is written entirely in C++. Therefore, it is suitable to run on embedded devices, where space and memory are limited. @@ -19,29 +15,29 @@ LMS is written entirely in C++. Therefore, it is suitable to run on embedded dev ### Debian ```sh -$ apt-get install g++ autoconf automake libboost-dev libboost-locale-dev libboost-iostreams-dev libavcodec-dev libavutil-dev libavformat-dev libav-tools libwtdbosqlite-dev libwthttp-dev libwtdbo-dev libwt-dev libmagick++-dev libpstreams-dev libcurlpp-dev libconfig++-dev libpstreams-dev ffmpeg libtag1-dev +apt-get install g++ autoconf automake libboost-filesystem-dev libboost-system-dev libavcodec-dev libavutil-dev libavformat-dev libav-tools libwtdbosqlite-dev libwthttp-dev libwtdbo-dev libwt-dev libmagick++-dev libpstreams-dev libconfig++-dev libpstreams-dev ffmpeg libtag1-dev ``` ## Build ```sh -$ git clone https://github.com/epoupon/lms.git lms -$ cd lms -$ autoreconf -vfi -$ mkdir build -$ cd build -$ ../configure --prefix=/usr --sysconfdir=/etc +git clone https://github.com/epoupon/lms.git lms +cd lms +autoreconf -vfi +mkdir build +cd build +../configure --prefix=/usr --sysconfdir=/etc ``` configure will complain if a mandatory library is missing. ```sh -$ make -j 4 +make ``` ## Install ```sh -$ make install +make install ``` This command requires root privileges @@ -49,13 +45,13 @@ This command requires root privileges LMS uses a configuration file, installed in '/etc/lms.conf' It is recommended to edit this file and change the relevant settings (working directory, listen port, etc.) -Other settings are set using the web interface. +All other settings are set using the web interface. It is highly recommended to run LMS as a non root user. Therefore make sure the user has write permissions on the working directory. ## Running ```sh -$ lms [config_file] +lms [config_file] ``` Logs are output in the working directory, in the file 'lms.log' diff --git a/TODO b/TODO index bcdc9f75..d498857e 100644 --- a/TODO +++ b/TODO @@ -37,7 +37,6 @@ - Display only the most popular cluster of each cluster type? [Settings] - - Add a audio settings: format + bitrate to be used - Add a user management view - Add multi root directories support - Add a first connection wizard diff --git a/approot/admin-initwizard.xml b/approot/admin-initwizard.xml index 175cb54d..5eb94e27 100644 --- a/approot/admin-initwizard.xml +++ b/approot/admin-initwizard.xml @@ -5,7 +5,7 @@
-

${tr:Lms.AdminWizard.header}

+

${tr:Lms.Admin.InitWizard.header}

diff --git a/configure.ac b/configure.ac index 41173572..9b81e6c6 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ fi AC_SUBST(MAGICKXX_CFLAGS) AC_SUBST(MAGICKXX_LIBS) -AC_CHECK_HEADERS([Wt/WApplication pstreams/pstream.h], +AC_CHECK_HEADERS([Wt/WApplication.h pstreams/pstream.h], [], [AC_MSG_ERROR([Header not found or unusable !])]) @@ -66,36 +66,6 @@ AC_CHECK_LIB( [boost_filesystem], , [AC_MSG_ERROR([libboost_filesystem not found!])]) -AC_CHECK_LIB( [boost_locale], - [main], - , - [AC_MSG_ERROR([libboost_locale not found!])]) - -AC_CHECK_LIB( [boost_date_time], - [main], - , - [AC_MSG_ERROR([libboost_date_time not found!])]) - -AC_CHECK_LIB( [boost_iostreams], - [main], - , - [AC_MSG_ERROR([libboost_iostreams not found!])]) - -AC_CHECK_LIB( [boost_thread], - [main], - , - [AC_MSG_ERROR([libboost_thread not found!])]) - -AC_CHECK_LIB( [curlpp], - [main], - , - [AC_MSG_ERROR([libcurlpp not found!])]) - -AC_CHECK_LIB( [curl], - [curl_easy_cleanup], - , - [AC_MSG_ERROR([libcurl not found!])]) - AC_CHECK_LIB( [tag], [main], , diff --git a/src/Makefile.am b/src/Makefile.am index d6e43294..88626589 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,13 +10,10 @@ lms_SOURCES = \ $(srcdir)/database/MediaDirectory.cpp \ $(srcdir)/database/Playlist.cpp \ $(srcdir)/database/Release.cpp \ - $(srcdir)/database/SearchFilter.cpp \ $(srcdir)/database/Setting.cpp \ $(srcdir)/database/SqlQuery.cpp \ $(srcdir)/database/Track.cpp \ $(srcdir)/database/User.cpp \ - $(srcdir)/feature/FeatureExtractor.cpp \ - $(srcdir)/feature/FeatureStore.cpp \ $(srcdir)/image/Image.cpp \ $(srcdir)/metadata/AvFormat.cpp \ $(srcdir)/metadata/TagLibParser.cpp \ @@ -31,8 +28,6 @@ lms_SOURCES = \ $(srcdir)/ui/admin/InitWizardView.cpp \ $(srcdir)/ui/admin/UserView.cpp \ $(srcdir)/ui/admin/UsersView.cpp \ - $(srcdir)/ui/common/InputRange.cpp \ - $(srcdir)/ui/common/LineEdit.cpp \ $(srcdir)/ui/common/Validators.cpp \ $(srcdir)/ui/explore/ArtistView.cpp \ $(srcdir)/ui/explore/ArtistsView.cpp \ @@ -48,6 +43,6 @@ lms_SOURCES = \ $(srcdir)/utils/Path.cpp \ $(srcdir)/utils/Utils.cpp -lms_CXXFLAGS=-std=c++11 -Wall -I$(srcdir)/third-party -I$(srcdir)/ui $(MAGICKXX_CFLAGS) -D_REENTRANT -DBOOST_SPIRIT_THREADSAFE +lms_CXXFLAGS=-std=c++14 -Wall -I$(srcdir)/third-party -I$(srcdir)/ui $(MAGICKXX_CFLAGS) -D_REENTRANT lms_LDADD=$(MAGICKXX_LIBS) diff --git a/src/av/AvInfo.cpp b/src/av/AvInfo.cpp index 8ba4551c..d433fd43 100644 --- a/src/av/AvInfo.cpp +++ b/src/av/AvInfo.cpp @@ -57,14 +57,14 @@ MediaFile::MediaFile(const boost::filesystem::path& p) int error = avformat_open_input(&_context, _p.string().c_str(), nullptr, nullptr); if (error < 0) { - LMS_LOG(AV, ERROR) << "Cannot open " << _p << ": " << averror_to_string(error); + LMS_LOG(AV, ERROR) << "Cannot open " << _p.string() << ": " << averror_to_string(error); throw MediaFileException(error); } error = avformat_find_stream_info(_context, nullptr); if (error < 0) { - LMS_LOG(AV, ERROR) << "Cannot find stream information on " << _p << ": " << averror_to_string(error); + LMS_LOG(AV, ERROR) << "Cannot find stream information on " << _p.string() << ": " << averror_to_string(error); avformat_close_input(&_context); throw MediaFileException(error); } @@ -75,13 +75,13 @@ MediaFile::~MediaFile() avformat_close_input(&_context); } -boost::posix_time::time_duration +std::chrono::milliseconds MediaFile::getDuration() const { - if (static_cast(_context->duration) != AV_NOPTS_VALUE ) - return boost::posix_time::seconds(_context->duration / AV_TIME_BASE); - else - return boost::posix_time::seconds(0); // TODO, do something better? + if (_context->duration == AV_NOPTS_VALUE) + return std::chrono::milliseconds(0); // TODO estimate + + return std::chrono::milliseconds(_context->duration / AV_TIME_BASE * 1000); } void diff --git a/src/av/AvInfo.hpp b/src/av/AvInfo.hpp index 45e44f45..f3a4ee53 100644 --- a/src/av/AvInfo.hpp +++ b/src/av/AvInfo.hpp @@ -33,10 +33,10 @@ extern "C" #include #include #include +#include #include #include -#include //no i/o just types #include "utils/Exception.hpp" @@ -75,7 +75,7 @@ class MediaFile const boost::filesystem::path& getPath() const {return _p;}; - boost::posix_time::time_duration getDuration() const; + std::chrono::milliseconds getDuration() const; std::map getMetaData(void); std::vector getStreamInfo() const; diff --git a/src/av/AvTranscoder.cpp b/src/av/AvTranscoder.cpp index 44c7c33f..4d02191c 100644 --- a/src/av/AvTranscoder.cpp +++ b/src/av/AvTranscoder.cpp @@ -101,7 +101,7 @@ Transcoder::init() } if (!avConvPath.empty()) - LMS_LOG(TRANSCODE, INFO) << "Using transcoder " << avConvPath; + LMS_LOG(TRANSCODE, INFO) << "Using transcoder " << avConvPath.string(); else throw std::runtime_error("Cannot find any transcoder binary!"); } @@ -123,7 +123,7 @@ Transcoder::start() else if (!boost::filesystem::is_regular( _filePath) ) return false; - LMS_LOG_TRANSCODE(INFO) << "Transcoding file '" << _filePath << "'"; + LMS_LOG_TRANSCODE(INFO) << "Transcoding file '" << _filePath.string() << "'"; std::vector args; diff --git a/src/cover/CoverArtGrabber.cpp b/src/cover/CoverArtGrabber.cpp index 49546400..f720e7c2 100644 --- a/src/cover/CoverArtGrabber.cpp +++ b/src/cover/CoverArtGrabber.cpp @@ -65,7 +65,7 @@ getFromAvMediaFile(const Av::MediaFile& input, std::size_t nbMaxCovers) if (image.load(picture.data)) res.push_back( image ); else - LMS_LOG(COVER, ERROR) << "Cannot load embedded cover file in '" << input.getPath() << "'"; + LMS_LOG(COVER, ERROR) << "Cannot load embedded cover file in '" << input.getPath().string() << "'"; } return res; @@ -87,7 +87,7 @@ Grabber::getFromDirectory(const boost::filesystem::path& p, std::size_t nbMaxCov if (image.load(coverPath)) res.push_back(image); else - LMS_LOG(COVER, ERROR) << "Cannot load image in file '" << coverPath << "'"; + LMS_LOG(COVER, ERROR) << "Cannot load image in file '" << coverPath.string() << "'"; } return res; @@ -116,7 +116,7 @@ Grabber::getCoverPaths(const boost::filesystem::path& directoryPath, std::size_t if (boost::filesystem::file_size(path) > _maxFileSize) { - LMS_LOG(COVER, INFO) << "Cover file '" << path << " is too big (" << boost::filesystem::file_size(path) << "), limit is " << _maxFileSize; + LMS_LOG(COVER, INFO) << "Cover file '" << path.string() << " is too big (" << boost::filesystem::file_size(path) << "), limit is " << _maxFileSize; continue; } @@ -138,7 +138,7 @@ Grabber::getFromTrack(const boost::filesystem::path& p, std::size_t nbMaxCovers) } catch (Av::MediaFileException& e) { - LMS_LOG(COVER, ERROR) << "Cannot get covers from track " << p << ": " << e.what(); + LMS_LOG(COVER, ERROR) << "Cannot get covers from track " << p.string() << ": " << e.what(); } return std::vector(); diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index 2186d2c7..d4267fed 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -19,17 +19,17 @@ #include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Setting.hpp" @@ -51,24 +51,24 @@ Handler::configureAuth(void) { authService.setEmailVerificationEnabled(false); authService.setAuthTokensEnabled(true, "lmsauth"); - authService.setIdentityPolicy(Wt::Auth::LoginNameIdentity); + authService.setIdentityPolicy(Wt::Auth::IdentityPolicy::LoginName); authService.setRandomTokenLength(32); authService.setTokenHashFunction(new Wt::Auth::BCryptHashFunction(8)); - Wt::Auth::PasswordVerifier *verifier = new Wt::Auth::PasswordVerifier(); - verifier->addHashFunction(new Wt::Auth::BCryptHashFunction(8)); - passwordService.setVerifier(verifier); + auto verifier = std::make_unique(); + verifier->addHashFunction(std::make_unique(8)); + passwordService.setVerifier(std::move(verifier)); passwordService.setAttemptThrottlingEnabled(true); - Wt::Auth::PasswordStrengthValidator* strengthValidator = new Wt::Auth::PasswordStrengthValidator(); + auto strengthValidator = std::make_unique(); // Reduce some constraints... - strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::PassPhrase, 4); - strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::OneCharClass, 4); - strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::TwoCharClass, 4); - strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::ThreeCharClass, 4 ); - strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::FourCharClass, 4 ); + strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthType::PassPhrase, 4); + strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthType::OneCharClass, 4); + strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthType::TwoCharClass, 4); + strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthType::ThreeCharClass, 4 ); + strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthType::FourCharClass, 4 ); - passwordService.setStrengthValidator(strengthValidator); + passwordService.setStrengthValidator(std::move(strengthValidator)); } const Wt::Auth::AuthService& @@ -182,24 +182,26 @@ Handler::createUser(const Wt::Auth::User& authUser) return User::pointer(); } - User::pointer user = _session.add(new User()); + User::pointer user = _session.add(std::make_unique()); Wt::Dbo::ptr authInfo = _users->find(authUser); authInfo.modify()->setUser(user); return user; } -Wt::Dbo::SqlConnectionPool* +std::unique_ptr Handler::createConnectionPool(boost::filesystem::path p) { - LMS_LOG(DB, INFO) << "Creating connection pool on file " << p; - - Wt::Dbo::backend::Sqlite3 *connection = new Wt::Dbo::backend::Sqlite3(p.string()); + LMS_LOG(DB, INFO) << "Creating connection pool on file " << p.string(); + auto connection = std::make_unique(p.string()); connection->executeSql("pragma journal_mode=WAL"); - connection->setProperty("show-queries", "true"); - return new Wt::Dbo::FixedSqlConnectionPool(connection, 1); + + auto pool = std::make_unique(std::move(connection), 1); + pool->setTimeout(std::chrono::seconds(1)); + + return pool; } diff --git a/src/database/DatabaseHandler.hpp b/src/database/DatabaseHandler.hpp index f99aa870..1a1a8006 100644 --- a/src/database/DatabaseHandler.hpp +++ b/src/database/DatabaseHandler.hpp @@ -23,12 +23,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include "Types.hpp" @@ -60,7 +60,7 @@ class Handler static const Wt::Auth::AuthService& getAuthService(); static const Wt::Auth::PasswordService& getPasswordService(); - static Wt::Dbo::SqlConnectionPool* createConnectionPool(boost::filesystem::path db); + static std::unique_ptr createConnectionPool(boost::filesystem::path db); private: diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp index ec08bc52..ac332472 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/DbArtist.cpp @@ -54,7 +54,7 @@ Artist::getById(Wt::Dbo::Session& session, Artist::id_type id) Artist::pointer Artist::create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID) { - return session.add(new Artist(name, MBID)); + return session.add(std::make_unique(name, MBID)); } std::vector @@ -75,7 +75,7 @@ Artist::getAllOrphans(Wt::Dbo::Session& session) static Wt::Dbo::Query getQuery(Wt::Dbo::Session& session, - const std::set& clusterIds, + const std::set& clusterIds, const std::vector& keywords) { WhereClause where; diff --git a/src/database/DbArtist.hpp b/src/database/DbArtist.hpp index 6ee5b283..89c9a92b 100644 --- a/src/database/DbArtist.hpp +++ b/src/database/DbArtist.hpp @@ -23,10 +23,8 @@ #include #include -#include -#include - -#include "SearchFilter.hpp" +#include +#include namespace Database { diff --git a/src/database/MediaDirectory.cpp b/src/database/MediaDirectory.cpp index 88b30e88..d9801689 100644 --- a/src/database/MediaDirectory.cpp +++ b/src/database/MediaDirectory.cpp @@ -31,7 +31,7 @@ MediaDirectory::MediaDirectory(boost::filesystem::path p) MediaDirectory::pointer MediaDirectory::create(Wt::Dbo::Session& session, boost::filesystem::path p) { - return session.add( new MediaDirectory(p) ); + return session.add( std::make_unique(p) ); } void diff --git a/src/database/MediaDirectory.hpp b/src/database/MediaDirectory.hpp index 3bc2e497..434e78a3 100644 --- a/src/database/MediaDirectory.hpp +++ b/src/database/MediaDirectory.hpp @@ -24,8 +24,9 @@ #include -#include -#include +#include +#include + namespace Database { class MediaDirectory diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index f29e4927..8676ffda 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -38,7 +38,7 @@ Playlist::Playlist(std::string name, bool isPublic, Wt::Dbo::ptr user) Playlist::pointer Playlist::create(Wt::Dbo::Session& session, std::string name, bool isPublic, Wt::Dbo::ptr user) { - return session.add( new Playlist(name, isPublic, user) ); + return session.add( std::make_unique(name, isPublic, user) ); } PlaylistEntry::PlaylistEntry() @@ -75,7 +75,7 @@ PlaylistEntry::PlaylistEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr p PlaylistEntry::pointer PlaylistEntry::create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr playlist) { - return session.add( new PlaylistEntry( track, playlist) ); + return session.add( std::make_unique( track, playlist) ); } diff --git a/src/database/Playlist.hpp b/src/database/Playlist.hpp index 4e2b1f04..beddbfa7 100644 --- a/src/database/Playlist.hpp +++ b/src/database/Playlist.hpp @@ -20,7 +20,7 @@ #ifndef DATABASE_PLAYLIST_HPP #define DATABASE_PLAYLIST_HPP -#include +#include #include diff --git a/src/database/Release.cpp b/src/database/Release.cpp index 73c65bdf..ad372248 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -18,7 +18,6 @@ */ #include "Types.hpp" -#include "SearchFilter.hpp" #include "SqlQuery.hpp" namespace Database @@ -53,7 +52,7 @@ Release::getById(Wt::Dbo::Session& session, Release::id_type id) Release::pointer Release::create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID) { - return session.add(new Release(name, MBID)); + return session.add(std::make_unique(name, MBID)); } std::vector @@ -74,7 +73,7 @@ Release::getAllOrphans(Wt::Dbo::Session& session) static Wt::Dbo::Query getQuery(Wt::Dbo::Session& session, - const std::set& clusterIds, + const std::set& clusterIds, const std::vector keywords) { WhereClause where; @@ -140,22 +139,22 @@ Release::getReleaseYear(bool original) const { assert(session()); - Wt::Dbo::collection times = session()->query( + Wt::Dbo::collection dates = session()->query( std::string("SELECT ") + (original ? "t.original_date" : "t.date") + " FROM track t INNER JOIN release r ON r.id = t.release_id") .where("r.id = ?") .groupBy("t.date") .bind(this->id()); /* various dates, no date */ - if (times.empty() || times.size() > 1) + if (dates.empty() || dates.size() > 1) return boost::none; - boost::gregorian::date date = times.front().date(); + auto date = dates.front(); - if (date.is_special()) + if (!date.isValid()) return boost::none; - return boost::make_optional(date.year()); + return date.year(); } std::vector> diff --git a/src/database/Release.hpp b/src/database/Release.hpp index 7e46795e..1e143e29 100644 --- a/src/database/Release.hpp +++ b/src/database/Release.hpp @@ -21,9 +21,7 @@ #include -#include - -#include "SearchFilter.hpp" +#include namespace Database { @@ -68,7 +66,7 @@ class Release : public Wt::Dbo::Dbo // Accessors std::string getName() const { return _name; } std::string getMBID() const { return _MBID; } - boost::posix_time::time_duration getDuration(void) const; + std::chrono::seconds getDuration(void) const; // Get the artists of this release std::vector > getArtists() const; diff --git a/src/database/SearchFilter.cpp b/src/database/SearchFilter.cpp deleted file mode 100644 index 5fb23e94..00000000 --- a/src/database/SearchFilter.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include "utils/Logger.hpp" - -#include "SearchFilter.hpp" - -namespace Database -{ - -void -SearchFilter::operator+=(const SearchFilter& filter) -{ -} - -SqlQuery -SearchFilter::generatePartialQuery() -{ - SqlQuery sqlQuery; - return sqlQuery; -} - -} // namespace Database - diff --git a/src/database/SearchFilter.hpp b/src/database/SearchFilter.hpp deleted file mode 100644 index 01bbcb06..00000000 --- a/src/database/SearchFilter.hpp +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#ifndef _DB_SEARCH_FILTER_HPP_ -#define _DB_SEARCH_FILTER_HPP_ - -#include -#include -#include - -#include - -#include "SqlQuery.hpp" - -namespace Database -{ - -typedef Wt::Dbo::dbo_default_traits::IdType id_type; - -class SearchFilter -{ - public: - - typedef int id_type; - - SearchFilter() {} - - static SearchFilter Artist(std::string name) {return SearchFilter();} - static SearchFilter Artist(id_type id) {return SearchFilter();} - - static SearchFilter Release(std::string name) {return SearchFilter();} - static SearchFilter Release(id_type id) {return SearchFilter();} - - static SearchFilter Track(std::string name) {return SearchFilter();} - - static SearchFilter Cluster(id_type id) {return SearchFilter();} - - // Combine search filters by add operation - // Caution: multiple filters on different artist/release/track - // values may lead to empty results - void operator+=(const SearchFilter& filter); - - SqlQuery generatePartialQuery(); - - private: - -}; - - -} // namespace Database - -#endif // _DB_SEARCH_FILTER_HPP_ diff --git a/src/database/Setting.cpp b/src/database/Setting.cpp index c5dc5200..e987d111 100644 --- a/src/database/Setting.cpp +++ b/src/database/Setting.cpp @@ -52,8 +52,8 @@ Setting::getBool(Wt::Dbo::Session& session, std::string setting, bool defaultVal return (res->_value == "true"); } -boost::posix_time::time_duration -Setting::getDuration(Wt::Dbo::Session& session, std::string setting, boost::posix_time::time_duration defaultValue) +Wt::WTime +Setting::getTime(Wt::Dbo::Session& session, std::string setting, Wt::WTime defaultValue) { Wt::Dbo::Transaction transaction(session); @@ -61,19 +61,7 @@ Setting::getDuration(Wt::Dbo::Session& session, std::string setting, boost::posi if (!res) return defaultValue; - return boost::posix_time::duration_from_string(res->_value); -} - -boost::posix_time::ptime -Setting::getTime(Wt::Dbo::Session& session, std::string setting, boost::posix_time::ptime defaultValue) -{ - Wt::Dbo::Transaction transaction(session); - - pointer res = getByName(session, setting); - if (!res) - return defaultValue; - - return boost::posix_time::time_from_string(res->_value); + return Wt::WTime::fromString(res->_value); } int @@ -93,7 +81,7 @@ Setting::getInt(Wt::Dbo::Session& session, std::string setting, int defaultValue Setting::pointer Setting::create(Wt::Dbo::Session& session, std::string name) { - return session.add(new Setting(name)); + return session.add(std::make_unique(name)); } Setting::pointer @@ -127,17 +115,10 @@ Setting::setBool(Wt::Dbo::Session& session, std::string setting, bool value) } void -Setting::setDuration(Wt::Dbo::Session& session, std::string setting, boost::posix_time::time_duration value) +Setting::setTime(Wt::Dbo::Session& session, std::string setting, Wt::WTime value) { Wt::Dbo::Transaction transaction(session); - getOrCreateByName(session, setting).modify()->_value = boost::posix_time::to_simple_string(value); -} - -void -Setting::setTime(Wt::Dbo::Session& session, std::string setting, boost::posix_time::ptime value) -{ - Wt::Dbo::Transaction transaction(session); - getOrCreateByName(session, setting).modify()->_value = boost::posix_time::to_simple_string(value); + getOrCreateByName(session, setting).modify()->_value = value.toString().toUTF8(); } void diff --git a/src/database/Setting.hpp b/src/database/Setting.hpp index 394fc7bc..808a0902 100644 --- a/src/database/Setting.hpp +++ b/src/database/Setting.hpp @@ -19,9 +19,8 @@ #pragma once -#include - -#include +#include +#include namespace Database { @@ -29,7 +28,10 @@ namespace Database { class Setting { public: + using pointer = Wt::Dbo::ptr; + Setting() {} + Setting(std::string name) : _name(name) {} // check if a setting exists or not static bool exists(Wt::Dbo::Session& session, std::string setting); @@ -38,16 +40,14 @@ class Setting // Nested transactions static std::string getString(Wt::Dbo::Session& session, std::string setting, std::string defaultValue = ""); static bool getBool(Wt::Dbo::Session& session, std::string setting, bool defaultValue = false); - static boost::posix_time::time_duration getDuration(Wt::Dbo::Session& session, std::string setting, boost::posix_time::time_duration defaultDuration = boost::posix_time::seconds(0) ); - static boost::posix_time::ptime getTime(Wt::Dbo::Session& session, std::string setting, boost::posix_time::ptime defaultTime = boost::posix_time::ptime()); + static Wt::WTime getTime(Wt::Dbo::Session& session, std::string setting, Wt::WTime defaultValue = Wt::WTime()); static int getInt(Wt::Dbo::Session& session, std::string setting, int defaultValue = 0); // Setters // Nested transactions static void setString(Wt::Dbo::Session& session, std::string setting, std::string value); static void setBool(Wt::Dbo::Session& session, std::string setting, bool value); - static void setDuration(Wt::Dbo::Session& session, std::string setting, boost::posix_time::time_duration value); - static void setTime(Wt::Dbo::Session& session, std::string setting, boost::posix_time::ptime time); + static void setTime(Wt::Dbo::Session& session, std::string setting, Wt::WTime value); static void setInt(Wt::Dbo::Session& session, std::string setting, int value); template @@ -58,10 +58,6 @@ class Setting } private: - Setting(std::string name) : _name(name) {} - - typedef Wt::Dbo::ptr pointer; - static pointer getByName(Wt::Dbo::Session& session, std::string name); static pointer create(Wt::Dbo::Session& session, std::string name); static pointer getOrCreateByName(Wt::Dbo::Session& session, std::string name); diff --git a/src/database/Track.cpp b/src/database/Track.cpp index a222e77a..6054a367 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -17,10 +17,6 @@ * along with LMS. If not, see . */ -#include - -#include - #include "utils/Logger.hpp" #include "SqlQuery.hpp" @@ -75,7 +71,7 @@ Track::getByMBID(Wt::Dbo::Session& session, const std::string& mbid) Track::pointer Track::create(Wt::Dbo::Session& session, const boost::filesystem::path& p) { - return session.add(new Track(p) ); + return session.add(std::make_unique(p)); } std::vector @@ -111,7 +107,7 @@ Track::getClusters(void) const static Wt::Dbo::Query< Track::pointer > getQuery(Wt::Dbo::Session& session, - const std::set& clusterIds, + const std::set& clusterIds, const std::vector keywords) { WhereClause where; @@ -149,20 +145,6 @@ getQuery(Wt::Dbo::Session& session, return query; } -Track::StatsQueryResult -Track::getStats(Wt::Dbo::Session& session, SearchFilter filter) -{ - SqlQuery sqlQuery = filter.generatePartialQuery(); - - Wt::Dbo::Query query = session.query( "SELECT COUNT(\"id\"), SUM(\"dur\") FROM (SELECT t.id as \"id\", t.duration as \"dur\" FROM track t INNER JOIN artist a ON t.artist_id = a.id INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN release r ON r.id = t.release_id " + sqlQuery.where().get() + " GROUP BY t.id)"); - - for (const std::string& bindArg : sqlQuery.where().getBindArgs()) - query.bind(bindArg); - - return query; -} - - std::vector Track::getByFilter(Wt::Dbo::Session& session, const std::set& clusterIds, @@ -233,7 +215,7 @@ Cluster::Cluster(Wt::Dbo::ptr type, std::string name) Cluster::pointer Cluster::create(Wt::Dbo::Session& session, Wt::Dbo::ptr type, std::string name) { - return session.add(new Cluster(type, name)); + return session.add(std::make_unique(type, name)); } std::vector @@ -244,28 +226,6 @@ Cluster::getAll(Wt::Dbo::Session& session) return std::vector(res.begin(), res.end()); } -Wt::Dbo::Query -Cluster::getQuery(Wt::Dbo::Session& session, SearchFilter filter) -{ - SqlQuery sqlQuery = filter.generatePartialQuery(); - - Wt::Dbo::Query query - = session.query( "SELECT g FROM cluster c INNER JOIN track_cluster t_c ON t_c.cluster_id = c.id INNER JOIN artist a ON t.artist_id = a.id INNER JOIN release r ON r.id = t.release_id INNER JOIN track t ON t.id = t_c.track_id " + sqlQuery.where().get()).groupBy("c.name").orderBy("c.name"); - - for (const std::string& bindArg : sqlQuery.where().getBindArgs()) - query.bind(bindArg); - - return query; -} - -std::vector -Cluster::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size) -{ - Wt::Dbo::collection res = getQuery(session, filter).limit(size).offset(offset); - - return std::vector(res.begin(), res.end()); -} - ClusterType::ClusterType(std::string name) : _name(name) { @@ -297,7 +257,7 @@ ClusterType::getAll(Wt::Dbo::Session& session) ClusterType::pointer ClusterType::create(Wt::Dbo::Session& session, std::string name) { - return session.add(new ClusterType(name)); + return session.add(std::make_unique(name)); } Cluster::pointer diff --git a/src/database/Track.hpp b/src/database/Track.hpp index 3bec8ee9..1f2ef635 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -21,17 +21,15 @@ #include #include +#include #include -#include #include -#include -#include +#include +#include -#include - -#include "SearchFilter.hpp" +#include namespace Database { @@ -52,7 +50,6 @@ class Cluster : public Wt::Dbo::Dbo Cluster(Wt::Dbo::ptr type, std::string name); // Find utility - static std::vector getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1); static std::vector getAll(Wt::Dbo::Session& session); // Create utility @@ -75,7 +72,6 @@ class Cluster : public Wt::Dbo::Dbo } private: - static Wt::Dbo::Query getQuery(Wt::Dbo::Session& session, SearchFilter filter); static const std::size_t _maxNameLength = 128; @@ -159,14 +155,6 @@ class Track static std::vector getMBIDDuplicates(Wt::Dbo::Session& session); static std::vector getChecksumDuplicates(Wt::Dbo::Session& session); - // Utility fonctions - // Stats for a given search filter - typedef boost::tuple< - int, // Total tracks - boost::posix_time::time_duration // Total duration - > StatsQueryResult; - static StatsQueryResult getStats(Wt::Dbo::Session& session, SearchFilter filter); - // Create utility static pointer create(Wt::Dbo::Session& session, const boost::filesystem::path& p); @@ -179,12 +167,12 @@ class Track void setDiscNumber(int num) { _discNumber = num; } void setTotalDiscNumber(int num) { _totalDiscNumber = num; } void setName(const std::string& name) { _name = std::string(name, 0, _maxNameLength); } - void setDuration(boost::posix_time::time_duration duration) { _duration = duration; } - void setLastWriteTime(boost::posix_time::ptime time) { _fileLastWrite = time; } - void setAddedTime(boost::posix_time::ptime time) { _fileAdded = time; } + void setDuration(std::chrono::milliseconds duration) { _duration = duration; } + void setLastWriteTime(Wt::WDateTime time) { _fileLastWrite = time; } + void setAddedTime(Wt::WDateTime time) { _fileAdded = time; } void setChecksum(const std::vector& checksum) { _fileChecksum = checksum; } - void setDate(const boost::posix_time::ptime& date) { _date = date; } - void setOriginalDate(const boost::posix_time::ptime& date) { _originalDate = date; } + void setDate(Wt::WDate date) { _date = date; } + void setOriginalDate(Wt::WDate date) { _originalDate = date; } void setGenres(const std::string& genreList) { _genreList = genreList; } void setCoverType(CoverType coverType) { _coverType = coverType; } void setMBID(const std::string& MBID) { _MBID = MBID; } @@ -197,11 +185,11 @@ class Track boost::optional getTotalDiscNumber(void) const; std::string getName(void) const { return _name; } boost::filesystem::path getPath(void) const { return _filePath; } - boost::posix_time::time_duration getDuration(void) const { return _duration; } - boost::posix_time::ptime getDate(void) const { return _date; } - boost::posix_time::ptime getOriginalDate(void) const { return _originalDate; } - boost::posix_time::ptime getLastWriteTime(void) const { return _fileLastWrite; } - boost::posix_time::ptime getAddedTime(void) const { return _fileAdded; } + std::chrono::milliseconds getDuration(void) const { return _duration; } + Wt::WDate getDate(void) const { return _date; } + Wt::WDate getOriginalDate(void) const { return _originalDate; } + Wt::WDateTime getLastWriteTime(void) const { return _fileLastWrite; } + Wt::WDateTime getAddedTime(void) const { return _fileAdded; } const std::vector& getChecksum(void) const { return _fileChecksum; } CoverType getCoverType(void) const { return _coverType; } const std::string& getMBID(void) const { return _MBID; } @@ -244,14 +232,14 @@ class Track std::string _name; std::string _artistName; std::string _releaseName; - boost::posix_time::time_duration _duration; - boost::posix_time::ptime _date; - boost::posix_time::ptime _originalDate; // original date time + std::chrono::duration _duration; + Wt::WDate _date; + Wt::WDate _originalDate; // original date time std::string _genreList; std::string _filePath; std::vector _fileChecksum; - boost::posix_time::ptime _fileLastWrite; - boost::posix_time::ptime _fileAdded; + Wt::WDateTime _fileLastWrite; + Wt::WDateTime _fileAdded; CoverType _coverType; std::string _MBID; // Musicbrainz Identifier diff --git a/src/database/User.cpp b/src/database/User.cpp index 61584657..9cc52dfd 100644 --- a/src/database/User.cpp +++ b/src/database/User.cpp @@ -51,7 +51,7 @@ User::getAll(Wt::Dbo::Session& session) User::pointer User::create(Wt::Dbo::Session& session) { - return session.add(new User()); + return session.add(std::make_unique()); } User::pointer diff --git a/src/database/User.hpp b/src/database/User.hpp index d9c1923e..28127150 100644 --- a/src/database/User.hpp +++ b/src/database/User.hpp @@ -22,8 +22,8 @@ #include -#include -#include +#include +#include namespace Database { diff --git a/src/feature/FeatureExtractor.cpp b/src/feature/FeatureExtractor.cpp deleted file mode 100644 index 48a0a888..00000000 --- a/src/feature/FeatureExtractor.cpp +++ /dev/null @@ -1,216 +0,0 @@ - -/* - * Copyright (C) 2016 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 . - */ - -#include -#include - -#include - -#include - -#include "utils/Logger.hpp" -#include "utils/Path.hpp" - -#include "FeatureExtractor.hpp" - -namespace Feature { - -static boost::filesystem::path extractorPath = boost::filesystem::path(); - -bool -Extractor::init(void) -{ - static const std::string execName = "streaming_extractor_music"; - extractorPath = searchExecPath(execName); - - if (extractorPath.empty()) - { - LMS_LOG(FEATURE, ERROR) << "Failed to find path to " << execName; - return false; - } - - return true; -} - -Extractor::Extractor() -{ } - - - -static bool fetchJSONData(boost::property_tree::ptree& pt, std::string url) -{ - try - { - curlpp::Cleanup myCleanup; - - std::ostringstream os; - os << curlpp::options::Url(url); - - std::istringstream iss(os.str()); - boost::property_tree::ptree res; - boost::property_tree::json_parser::read_json(iss, res); - - pt = res; - } - catch( curlpp::RuntimeError &e ) - { - LMS_LOG(FEATURE, ERROR) << "curlpp error: " << e.what(); - return false; - } - catch( curlpp::LogicError &e ) - { - LMS_LOG(FEATURE, ERROR) << "curlpp error: " << e.what(); - return false; - } - catch ( boost::property_tree::ptree_error& e) - { - LMS_LOG(FEATURE, ERROR) << "JSON paring failed: " << e.what(); - return false; - } - - return true; -} - - -bool -Extractor::getLowLevel(boost::property_tree::ptree& pt, std::string mbid) -{ - LMS_LOG(FEATURE, DEBUG) << "Trying to fetch low level metadata for track '" << mbid << "' on AcousticBrainz"; - - boost::property_tree::ptree res; - if (!fetchJSONData(res, "https://acousticbrainz.org/" + mbid + "/low-level")) - return false; - - auto message = res.get_child_optional("message"); - if (message) - { - LMS_LOG(FEATURE, ERROR) << "Track '" << mbid << "': cannot get data on AcousticBrainz: " << message->data(); - return false; - } - - auto lowlevel = res.get_child_optional("lowlevel"); - if (!lowlevel) - { - LMS_LOG(FEATURE, ERROR) << "Track '" << mbid << "': low level data not found!"; - return false; - } - - // Keep metadata to ease debugging -// res.erase("metadata"); - - pt = res; - - return true; -} - -bool -Extractor::getHighLevel(boost::property_tree::ptree& pt, std::string mbid) -{ - LMS_LOG(FEATURE, DEBUG) << "Trying to fetch high level metadata for track '" << mbid << "' on AcousticBrainz"; - - // TODO check MBID - if (mbid.empty()) - return false; - - boost::property_tree::ptree res; - if (!fetchJSONData(res, "https://acousticbrainz.org/" + mbid + "/high-level")) - return false; - - auto message = res.get_child_optional("message"); - if (message) - { - LMS_LOG(FEATURE, ERROR) << "Track '" << mbid << "': cannot get data on AcousticBrainz: " << message->data(); - return false; - } - - auto lowlevel = res.get_child_optional("highlevel"); - if (!lowlevel) - { - LMS_LOG(FEATURE, ERROR) << "Track '" << mbid << "': high level data not found!"; - return false; - } - - res.erase("metadata"); - - pt = res; - - return true; -} - - -bool -Extractor::getLowLevel(boost::property_tree::ptree& pt, boost::filesystem::path path) -{ - LMS_LOG(FEATURE, DEBUG) << "Extracting low level data from '" << path << "'"; - - if (extractorPath.empty()) - return false; - - std::vector args; - - args.push_back(extractorPath.string()); - args.push_back(path.string()); - args.push_back("-"); // output to stdout - - std::string jsonData; - { - redi::ipstream in; - in.open(extractorPath.string(), args); - if (!in.is_open()) - { - LMS_LOG(FEATURE, ERROR) << "Exec failed!"; - return false; - } - - bool firstLineHit = false; - - std::string line; - while(std::getline(in, line)) - { - if (!firstLineHit) - { - if (line != "{") - continue; - - firstLineHit = true; - } - jsonData += line; - jsonData += '\n'; - } - } - - try - { - std::istringstream iss(jsonData); - boost::property_tree::json_parser::read_json(iss, pt); - - pt.erase("metadata"); - } - catch ( boost::property_tree::ptree_error& e) - { - LMS_LOG(FEATURE, ERROR) << "JSON parsing failed: " << e.what(); - return false; - } - - return true; -} - -} // namespace Feature - diff --git a/src/feature/FeatureExtractor.hpp b/src/feature/FeatureExtractor.hpp deleted file mode 100644 index ed7169c2..00000000 --- a/src/feature/FeatureExtractor.hpp +++ /dev/null @@ -1,43 +0,0 @@ - -/* - * Copyright (C) 2016 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 . - */ - -#include -#include - -#pragma once - -namespace Feature { - -class Extractor -{ - public: - static bool init(void); - - static bool getLowLevel(boost::property_tree::ptree& pt, boost::filesystem::path path); - static bool getLowLevel(boost::property_tree::ptree& pt, std::string mbid); - - static bool getHighLevel(boost::property_tree::ptree& pt, std::string mbid); - - private: - Extractor(); -}; - -} // namespace Feature - diff --git a/src/feature/FeatureStore.cpp b/src/feature/FeatureStore.cpp deleted file mode 100644 index 2f52eff8..00000000 --- a/src/feature/FeatureStore.cpp +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ - -#include - -#include "utils/Config.hpp" -#include "utils/Logger.hpp" -#include "utils/Path.hpp" - -#include "FeatureStore.hpp" - -namespace Feature { - -Store::Store() -{ -} - -Store& -Store::instance(void) -{ - static Store instance; - return instance; -} - -static boost::filesystem::path -getPath(std::string mbid, std::string type) -{ - return Config::instance().getPath("working-dir") / "features" / (mbid + "_" + type); -} - -bool -Store::exists(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type) -{ - Wt::Dbo::Transaction transaction(session); - - auto track = Database::Track::getById(session, trackId); - std::string mbid = track->getMBID(); - - transaction.commit(); - - if (mbid.empty()) - return false; - - boost::filesystem::path path = getPath(mbid, type); - return boost::filesystem::exists(path); -} - -bool -Store::get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, boost::property_tree::ptree& feature) -{ - Wt::Dbo::Transaction transaction(session); - - auto track = Database::Track::getById(session, trackId); - std::string mbid = track->getMBID(); - - transaction.commit(); - - if (mbid.empty()) - return false; - - boost::filesystem::path path = getPath(mbid, type); - if (!boost::filesystem::exists(path)) - return false; - - try - { - std::ifstream iss(path.string().c_str(), std::ios::in); - boost::property_tree::json_parser::read_json(iss, feature); - } - catch (boost::property_tree::ptree_error& e) - { - LMS_LOG(FEATURE, ERROR) << "JSON parsing failed: " << e.what(); - return false; - } - - return true; -} - - -bool -Store::set(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, const boost::property_tree::ptree& feature) -{ - Wt::Dbo::Transaction transaction(session); - - auto track = Database::Track::getById(session, trackId); - std::string mbid = track->getMBID(); - - transaction.commit(); - - if (mbid.empty()) - return false; - - boost::filesystem::path path = getPath(mbid, type); - - try - { - std::ofstream oss(path.string().c_str(), std::ios::out); - boost::property_tree::json_parser::write_json(oss, feature); - } - catch (boost::property_tree::ptree_error& e) - { - LMS_LOG(FEATURE, ERROR) << "JSON writing failed: " << e.what(); - return false; - } - - return true; -} - -} // namespace CoverArt - diff --git a/src/feature/FeatureStore.hpp b/src/feature/FeatureStore.hpp deleted file mode 100644 index a02e1400..00000000 --- a/src/feature/FeatureStore.hpp +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ - -#pragma once - -#include -#include - -#include "database/Types.hpp" - -namespace Feature { - -class Store -{ - public: - Store(const Store&) = delete; - Store& operator=(const Store&) = delete; - - static Store& instance(); - - bool exists(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type); - bool get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, boost::property_tree::ptree& feature); - - bool set(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, const boost::property_tree::ptree& feature); - - private: - Store(); -}; - -} // namespace CoverArt - diff --git a/src/image/Image.cpp b/src/image/Image.cpp index 4ba865f2..03fea576 100644 --- a/src/image/Image.cpp +++ b/src/image/Image.cpp @@ -79,7 +79,7 @@ Image::load(boost::filesystem::path p) } catch (Magick::Exception& e) { - LMS_LOG(COVER, ERROR) << "Caught Magick exception while loading image from file '" << p << "': " << e.what(); + LMS_LOG(COVER, ERROR) << "Caught Magick exception while loading image from file '" << p.string() << "': " << e.what(); return false; } } diff --git a/src/main/main.cpp b/src/main/main.cpp index 0abbc96c..4f6aa932 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -20,14 +20,14 @@ #include #include -#include +#include +#include #include "utils/Config.hpp" #include "utils/Logger.hpp" #include "av/AvInfo.hpp" #include "av/AvTranscoder.hpp" #include "image/Image.hpp" -#include "feature/FeatureExtractor.hpp" #include "scanner/MediaScanner.hpp" @@ -117,17 +117,16 @@ int main(int argc, char* argv[]) Av::AvInit(); Av::Transcoder::init(); Database::Handler::configureAuth(); - Feature::Extractor::init(); // Initializing a connection pool to the database that will be shared along services - std::unique_ptr - connectionPool( Database::Handler::createConnectionPool(Config::instance().getPath("working-dir") / "lms.db")); + auto connectionPool = Database::Handler::createConnectionPool(Config::instance().getPath("working-dir") / "lms.db"); Scanner::MediaScanner scanner(*connectionPool); // bind entry point - server.addEntryPoint(Wt::Application, boost::bind(UserInterface::LmsApplication::create, - _1, boost::ref(*connectionPool), boost::ref(scanner))); + server.addEntryPoint(Wt::EntryPointType::Application, + std::bind(UserInterface::LmsApplication::create, + std::placeholders::_1, std::ref(*connectionPool), std::ref(scanner))); // Start LMS_LOG(MAIN, INFO) << "Starting Media scanner..."; @@ -138,7 +137,7 @@ int main(int argc, char* argv[]) // Wait LMS_LOG(MAIN, INFO) << "Now running..."; - Wt::WServer::waitForShutdown(argv[0]); + Wt::WServer::waitForShutdown(); // Stop LMS_LOG(MAIN, INFO) << "Stopping server..."; diff --git a/src/metadata/AvFormat.cpp b/src/metadata/AvFormat.cpp index e2a9c080..50f89e7e 100644 --- a/src/metadata/AvFormat.cpp +++ b/src/metadata/AvFormat.cpp @@ -77,11 +77,11 @@ AvFormat::parse(const boost::filesystem::path& p) std::cout << "TAG = " << tag << ", VAL = " << value << std::endl; #endif if (tag == "ARTIST") - items.insert( std::make_pair(MetaData::Type::Artist, stringTrim( stringToUTF8(value)) )); + items.insert( std::make_pair(MetaData::Type::Artist, stringTrim( value) )); else if (tag == "ALBUM") - items.insert( std::make_pair(MetaData::Type::Album, stringTrim( stringToUTF8(value)) )); + items.insert( std::make_pair(MetaData::Type::Album, stringTrim( value) )); else if (tag == "TITLE") - items.insert( std::make_pair(MetaData::Type::Title, stringTrim( stringToUTF8(value)) )); + items.insert( std::make_pair(MetaData::Type::Title, stringTrim( value) )); else if (tag == "TRACK") { // Expecting 'Number/Total' @@ -89,15 +89,15 @@ AvFormat::parse(const boost::filesystem::path& p) if (strings.size() > 0) { - std::size_t number; - if (readAs(strings[0], number)) - items.insert( std::make_pair(MetaData::Type::TrackNumber, number )); + auto number = readAs(strings[0]); + if (number) + items.insert( std::make_pair(MetaData::Type::TrackNumber, *number )); if (strings.size() > 1) { - std::size_t totalNumber; - if (readAs(strings[1], totalNumber)) - items.insert( std::make_pair(MetaData::Type::TotalTrack, totalNumber )); + auto totalNumber = readAs(strings[1]); + if (totalNumber) + items.insert( std::make_pair(MetaData::Type::TotalTrack, *totalNumber )); } } } @@ -108,15 +108,15 @@ AvFormat::parse(const boost::filesystem::path& p) if (strings.size() > 0) { - std::size_t number; - if (readAs(strings[0], number)) - items.insert( std::make_pair(MetaData::Type::DiscNumber, number )); + auto number = readAs(strings[0]); + if (number) + items.insert( std::make_pair(MetaData::Type::DiscNumber, *number )); if (strings.size() > 1) { - std::size_t totalNumber; - if (readAs(strings[1], totalNumber)) - items.insert( std::make_pair(MetaData::Type::TotalDisc, totalNumber )); + auto totalNumber = readAs(strings[1]); + if (totalNumber) + items.insert( std::make_pair(MetaData::Type::TotalDisc, *totalNumber )); } } } @@ -124,36 +124,36 @@ AvFormat::parse(const boost::filesystem::path& p) || tag == "YEAR" || tag == "WM/Year") { - boost::posix_time::ptime p; - if (readAsPosixTime(value, p)) - items.insert( std::make_pair(MetaData::Type::Date, p)); + auto date = readAs(value); + if (date) + items.insert( std::make_pair(MetaData::Type::Date, *date)); } else if (tag == "TDOR" // Original release time (ID3v2 2.4) || tag == "TORY") // Original release year { - boost::posix_time::ptime p; - if (readAsPosixTime(value, p)) - items.insert( std::make_pair(MetaData::Type::OriginalDate, p)); + auto date = readAs(value); + if (date) + items.insert( std::make_pair(MetaData::Type::OriginalDate, *date)); } else if (tag == "MUSICBRAINZ ARTIST ID" || tag == "MUSICBRAINZ_ARTISTID") { - items.insert( std::make_pair(MetaData::Type::MusicBrainzArtistID, stringTrim( stringToUTF8(value)) )); + items.insert( std::make_pair(MetaData::Type::MusicBrainzArtistID, stringTrim(value)) ); } else if (tag == "MUSICBRAINZ ALBUM ID" || tag == "MUSICBRAINZ_ALBUMID") { - items.insert( std::make_pair(MetaData::Type::MusicBrainzAlbumID, stringTrim( stringToUTF8(value)) )); + items.insert( std::make_pair(MetaData::Type::MusicBrainzAlbumID, stringTrim(value)) ); } else if (tag == "MUSICBRAINZ RELEASE TRACK ID" || tag == "MUSICBRAINZ_RELEASETRACKID" || tag == "MUSICBRAINZ_TRACKID") { - items.insert( std::make_pair(MetaData::Type::MusicBrainzTrackID, stringTrim( stringToUTF8(value)) )); + items.insert( std::make_pair(MetaData::Type::MusicBrainzTrackID, stringTrim(value)) ); } else if (tag == "ACOUSTID ID") { - items.insert( std::make_pair(MetaData::Type::AcoustID, stringTrim( stringToUTF8(value)) )); + items.insert( std::make_pair(MetaData::Type::AcoustID, stringTrim(value)) ); } else if (_clusterMap.find(tag) != _clusterMap.end()) { diff --git a/src/metadata/MetaData.hpp b/src/metadata/MetaData.hpp index c14caed9..a9ebc0c6 100644 --- a/src/metadata/MetaData.hpp +++ b/src/metadata/MetaData.hpp @@ -37,13 +37,13 @@ namespace MetaData Title, // string Album, // string Clusters, // Clusters, ex: { "genre", {"death metal", "brutal death"} }, { "albumgrouping", {"metal"} } - Duration, // boost::posix_time::time_duration + Duration, // std::chrono::milliseconds TrackNumber, // size_t DiscNumber, // size_t TotalTrack, // size_t TotalDisc, // size_t - Date, // boost::posix_time::ptime - OriginalDate, // boost::posix_time::ptime + Date, // Wt::WDate + OriginalDate, // Wt::WDate HasCover, // bool AudioStreams, // vector MusicBrainzArtistID, // string diff --git a/src/metadata/TagLibParser.cpp b/src/metadata/TagLibParser.cpp index 27cb2e54..a5a48be1 100644 --- a/src/metadata/TagLibParser.cpp +++ b/src/metadata/TagLibParser.cpp @@ -55,8 +55,7 @@ TagLibParser::parse(const boost::filesystem::path& p) { TagLib::AudioProperties *properties = f.audioProperties(); - boost::posix_time::time_duration duration = boost::posix_time::seconds(properties->length()); - + std::chrono::milliseconds duration(properties->length() * 1000); items.insert( std::make_pair(MetaData::Type::Duration, duration) ); MetaData::AudioStream audioStream = { .bitRate = static_cast(properties->bitrate() * 1000) }; @@ -124,15 +123,15 @@ TagLibParser::parse(const boost::filesystem::path& p) if (!strings.empty()) { - std::size_t number; - if (readAs(strings[0], number)) - items.insert( std::make_pair(MetaData::Type::TrackNumber, number )); + auto number = readAs(strings[0]); + if (number) + items.insert( std::make_pair(MetaData::Type::TrackNumber, *number )); if (strings.size() > 1) { - std::size_t totalNumber; - if (readAs(strings[1], totalNumber)) - items.insert( std::make_pair(MetaData::Type::TotalTrack, totalNumber )); + auto totalNumber = readAs(strings[1]); + if (totalNumber) + items.insert( std::make_pair(MetaData::Type::TotalTrack, *totalNumber )); } } } @@ -143,32 +142,32 @@ TagLibParser::parse(const boost::filesystem::path& p) if (!strings.empty()) { - std::size_t number; - if (readAs(strings[0], number)) - items.insert( std::make_pair(MetaData::Type::DiscNumber, number )); + auto number = readAs(strings[0]); + if (number) + items.insert( std::make_pair(MetaData::Type::DiscNumber, *number)); if (strings.size() > 1) { - std::size_t totalNumber; - if (readAs(strings[1], totalNumber)) - items.insert( std::make_pair(MetaData::Type::TotalDisc, totalNumber )); + auto totalNumber = readAs(strings[1]); + if (totalNumber) + items.insert( std::make_pair(MetaData::Type::TotalDisc, *totalNumber )); } } } else if (tag == "DATE") { - boost::posix_time::ptime p; - if (readAsPosixTime(values.front().to8Bit(), p)) - items.insert( std::make_pair(MetaData::Type::Date, p)); + auto timePoint = readAs(values.front().to8Bit()); + if (timePoint) + items.insert( std::make_pair(MetaData::Type::Date, *timePoint)); } else if (tag == "ORIGINALDATE") { - boost::posix_time::ptime p; - if (readAsPosixTime(values.front().to8Bit(), p)) + auto timePoint = readAs(values.front().to8Bit()); + if (timePoint) { // Take priority on original year items.erase( MetaData::Type::OriginalDate ); - items.insert( std::make_pair(MetaData::Type::OriginalDate, p)); + items.insert( std::make_pair(MetaData::Type::OriginalDate, *timePoint)); } } else if (tag == "ORIGINALYEAR") @@ -176,9 +175,9 @@ TagLibParser::parse(const boost::filesystem::path& p) // lower priority than original date if (items.find(MetaData::Type::OriginalDate) == items.end()) { - boost::posix_time::ptime p; - if (readAsPosixTime(values.front().to8Bit(), p)) - items.insert( std::make_pair(MetaData::Type::OriginalDate, p)); + auto timePoint = readAs(values.front().to8Bit()); + if (timePoint) + items.insert( std::make_pair(MetaData::Type::OriginalDate, *timePoint)); } } else if (tag == "METADATA_BLOCK_PICTURE") diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index b3252c6a..41e0985c 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -20,9 +20,10 @@ #include #include -#include #include +#include + #include "cover/CoverArtGrabber.hpp" #include "database/Setting.hpp" @@ -36,40 +37,28 @@ namespace { -boost::gregorian::date -getNextDay(const boost::gregorian::date& current) +Wt::WDate +getNextMonday(Wt::WDate current) { - boost::gregorian::day_iterator it(current); - return *(++it); + do + { + current.addDays(1); + } while (current.dayOfWeek() != 1); + + return current; } -boost::gregorian::date -getNextMonday(const boost::gregorian::date& current) +Wt::WDate +getNextFirstOfMonth(Wt::WDate current) { - boost::gregorian::day_iterator it(current); + do + { + current.addDays(1); + } while (current.day() != 1); - ++it; - // While it's not monday - while( it->day_of_week() != 1 ) - ++it; - - return *(it); + return current; } -boost::gregorian::date -getNextFirstOfMonth(const boost::gregorian::date& current) -{ - boost::gregorian::day_iterator it(current); - - ++it; - // While it's not the 1st of the month - while( it->day() != 1 ) - ++it; - - return (*it); -} - - bool isFileSupported(const boost::filesystem::path& file, const std::vector extensions) { @@ -119,14 +108,14 @@ setUpdatePeriod(Wt::Dbo::Session& session, UpdatePeriod updatePeriod) Setting::setInt(session, "update_period", static_cast(updatePeriod)); } -boost::posix_time::time_duration getUpdateStartTime(Wt::Dbo::Session& session) +Wt::WTime getUpdateStartTime(Wt::Dbo::Session& session) { - return Setting::getDuration(session, "update_start_time"); + return Setting::getTime(session, "update_start_time"); } -void setUpdateStartTime(Wt::Dbo::Session& session, boost::posix_time::time_duration startTime) +void setUpdateStartTime(Wt::Dbo::Session& session, Wt::WTime startTime) { - Setting::setDuration(session, "update_start_time", startTime); + Setting::setTime(session, "update_start_time", startTime); } MediaScanner::MediaScanner(Wt::Dbo::SqlConnectionPool& connectionPool) @@ -176,7 +165,7 @@ MediaScanner::scheduleImmediateScan() _ioService.post([=]() { LMS_LOG(DBUPDATER, INFO) << "Schedule immediate scan"; - scheduleScan( boost::posix_time::seconds(0) ); + scheduleScan(std::chrono::seconds(0)); }); } @@ -193,29 +182,31 @@ MediaScanner::reschedule() void MediaScanner::scheduleScan() { - boost::posix_time::ptime now = boost::posix_time::second_clock::local_time(); - boost::posix_time::time_duration startTime = getUpdateStartTime(_db.getSession()); + using namespace std::chrono_literals; - boost::gregorian::date nextScanDate; + Wt::WTime startTime = getUpdateStartTime(_db.getSession()); + Wt::WDateTime now = Wt::WLocalDateTime::currentServerDateTime().toUTC(); + + Wt::WDate nextScanDate; switch ( getUpdatePeriod(_db.getSession()) ) { case UpdatePeriod::Daily: - if (now.time_of_day() < startTime) + if (now.time() < startTime) nextScanDate = now.date(); else - nextScanDate = getNextDay(now.date()); + nextScanDate = now.date().addDays(1); break; case UpdatePeriod::Weekly: - if (now.time_of_day() < startTime && now.date().day_of_week() == 1) + if (now.time() < startTime && now.date().dayOfWeek() == 1) nextScanDate = now.date(); else nextScanDate = getNextMonday(now.date()); break; case UpdatePeriod::Monthly: - if (now.time_of_day() < startTime && now.date().day() == 1) + if (now.time() < startTime && now.date().day() == 1) nextScanDate = now.date(); else nextScanDate = getNextFirstOfMonth(now.date()); @@ -226,24 +217,25 @@ MediaScanner::scheduleScan() break; } - if (!nextScanDate.is_special()) - scheduleScan( boost::posix_time::ptime (nextScanDate, startTime) ); + if (nextScanDate.isValid()) + scheduleScan( Wt::WDateTime(nextScanDate, startTime).toTimePoint() ); } void -MediaScanner::scheduleScan( boost::posix_time::time_duration duration) +MediaScanner::scheduleScan(std::chrono::seconds duration) { - LMS_LOG(DBUPDATER, INFO) << "Scheduling next scan in " << duration; - _scheduleTimer.expires_from_now(duration); - _scheduleTimer.async_wait( boost::bind( &MediaScanner::scan, this, boost::asio::placeholders::error) ); + LMS_LOG(DBUPDATER, INFO) << "Scheduling next scan in " << duration.count() << " seconds"; + _scheduleTimer.expires_from_now(std::chrono::seconds(5)); //duration); + _scheduleTimer.async_wait( std::bind( &MediaScanner::scan, this, std::placeholders::_1) ); } void -MediaScanner::scheduleScan( boost::posix_time::ptime time) +MediaScanner::scheduleScan(std::chrono::system_clock::time_point timePoint) { - LMS_LOG(DBUPDATER, INFO) << "Scheduling next scan at " << time; - _scheduleTimer.expires_at(time); - _scheduleTimer.async_wait( boost::bind( &MediaScanner::scan, this, boost::asio::placeholders::error) ); + std::time_t t = std::chrono::system_clock::to_time_t(timePoint); + LMS_LOG(DBUPDATER, INFO) << "Scheduling next scan at " << std::string(std::ctime(&t)); + _scheduleTimer.expires_at(timePoint); + _scheduleTimer.async_wait(std::bind(&MediaScanner::scan, this, std::placeholders::_1)); } void @@ -263,9 +255,9 @@ MediaScanner::scan(boost::system::error_code err) if (!_running) break; - LMS_LOG(DBUPDATER, INFO) << "scaning root directory '" << rootDirectory << "'..."; + LMS_LOG(DBUPDATER, INFO) << "scaning root directory '" << rootDirectory.string() << "'..."; scanRootDirectory(rootDirectory, stats); - LMS_LOG(DBUPDATER, INFO) << "scaning root directory '" << rootDirectory << "' DONE"; + LMS_LOG(DBUPDATER, INFO) << "scaning root directory '" << rootDirectory.string() << "' DONE"; } if (_running) @@ -273,16 +265,9 @@ MediaScanner::scan(boost::system::error_code err) LMS_LOG(DBUPDATER, INFO) << "Scan " << (_running ? "complete" : "aborted") << ". Changes = " << stats.nbChanges() << " (added = " << stats.additions << ", removed = " << stats.deletions << ", updated = " << stats.updates << "), Not changed = " << stats.skips << ", Scanned = " << stats.scans << " (errors = " << stats.scanErrors << ", not imported = " << stats.incompleteScans << "), duplicates = " << stats.nbDuplicates() << " (hash = " << stats.duplicateHashes << ", mbid = " << stats.duplicateMBID << ")"; - // Update database stats - boost::posix_time::ptime now = boost::posix_time::second_clock::local_time(); - if (stats.nbChanges() > 0) - Setting::setTime(_db.getSession(), "last_update", now); - // Save the last scan only if it has been completed if (_running) { - Setting::setTime(_db.getSession(), "last_scan", now); - scheduleScan(); scanComplete().emit(stats); @@ -408,7 +393,7 @@ MediaScanner::getClusters( const MetaData::Clusters& clustersNames) void MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) { - boost::posix_time::ptime lastWriteTime (boost::posix_time::from_time_t( boost::filesystem::last_write_time( file ) ) ); + auto lastWriteTime = Wt::WDateTime::fromTime_t(boost::filesystem::last_write_time(file)); // Skip file if last write is the same { @@ -445,7 +430,7 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) if ((*items).find(MetaData::Type::AudioStreams) == (*items).end() || boost::any_cast> ((*items)[MetaData::Type::AudioStreams]).empty()) { - LMS_LOG(DBUPDATER, INFO) << "Skipped '" << file << "' (no audio stream found)"; + LMS_LOG(DBUPDATER, INFO) << "Skipped '" << file.string() << "' (no audio stream found)"; // If Track exists here, delete it! if (track) @@ -457,9 +442,9 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) return; } if ((*items).find(MetaData::Type::Duration) == (*items).end() - || boost::any_cast((*items)[MetaData::Type::Duration]).total_seconds() <= 0) + || boost::any_cast((*items)[MetaData::Type::Duration]).count() <= 0) { - LMS_LOG(DBUPDATER, INFO) << "Skipped '" << file << "' (no duration or duration <= 0)"; + LMS_LOG(DBUPDATER, INFO) << "Skipped '" << file.string() << "' (no duration or duration <= 0)"; // If Track exists here, delete it! if (track) @@ -534,12 +519,12 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) { // Create a new song track = Track::create(_db.getSession(), file); - LMS_LOG(DBUPDATER, INFO) << "Adding '" << file << "'"; + LMS_LOG(DBUPDATER, INFO) << "Adding '" << file.string() << "'"; stats.additions++; } else { - LMS_LOG(DBUPDATER, INFO) << "Updating '" << file << "'"; + LMS_LOG(DBUPDATER, INFO) << "Updating '" << file.string() << "'"; // Remove the songs from its clusters for (auto cluster : track->getClusters()) @@ -555,8 +540,8 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) track.modify()->setRelease(release); track.modify()->setLastWriteTime(lastWriteTime); track.modify()->setName(title); - track.modify()->setDuration( boost::any_cast((*items)[MetaData::Type::Duration]) ); - track.modify()->setAddedTime( boost::posix_time::second_clock::local_time() ); + track.modify()->setDuration( boost::any_cast((*items)[MetaData::Type::Duration]) ); + track.modify()->setAddedTime( Wt::WLocalDateTime::currentServerDateTime().toUTC() ); { std::string trackClusterList; @@ -586,15 +571,15 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) track.modify()->setTotalDiscNumber( boost::any_cast((*items)[MetaData::Type::TotalDisc]) ); if ((*items).find(MetaData::Type::Date) != (*items).end()) - track.modify()->setDate( boost::any_cast((*items)[MetaData::Type::Date]) ); + track.modify()->setDate( boost::any_cast((*items)[MetaData::Type::Date]) ); if ((*items).find(MetaData::Type::OriginalDate) != (*items).end()) { - track.modify()->setOriginalDate( boost::any_cast((*items)[MetaData::Type::OriginalDate]) ); + track.modify()->setOriginalDate( boost::any_cast((*items)[MetaData::Type::OriginalDate]) ); // If a file has an OriginalDate but no date, set the date to ease filtering if ((*items).find(MetaData::Type::Date) == (*items).end()) - track.modify()->setDate( boost::any_cast((*items)[MetaData::Type::OriginalDate]) ); + track.modify()->setDate( boost::any_cast((*items)[MetaData::Type::OriginalDate]) ); } if ((*items).find(MetaData::Type::MusicBrainzRecordingID) != (*items).end()) @@ -652,7 +637,7 @@ checkFile(const boost::filesystem::path& p, const std::vector tracks = Database::Track::getMBIDDuplicates(_db.getSession()); for (Track::pointer track : tracks) { - LMS_LOG(DBUPDATER, INFO) << "Found duplicated MBID [" << track->getMBID() << "], file: " << track->getPath() << " - " << track->getName(); + LMS_LOG(DBUPDATER, INFO) << "Found duplicated MBID [" << track->getMBID() << "], file: " << track->getPath().string() << " - " << track->getName(); stats.duplicateMBID++; } tracks = Database::Track::getChecksumDuplicates(_db.getSession()); for (Track::pointer track : tracks) { - LMS_LOG(DBUPDATER, INFO) << "Found duplicated checksum [" << bufferToString(track->getChecksum()) << "], file: " << track->getPath() << " - " << track->getName(); + LMS_LOG(DBUPDATER, INFO) << "Found duplicated checksum [" << bufferToString(track->getChecksum()) << "], file: " << track->getPath().string() << " - " << track->getName(); stats.duplicateHashes++; } diff --git a/src/scanner/MediaScanner.hpp b/src/scanner/MediaScanner.hpp index cb011c1b..79c200d5 100644 --- a/src/scanner/MediaScanner.hpp +++ b/src/scanner/MediaScanner.hpp @@ -19,10 +19,12 @@ #pragma once -#include +#include -#include -#include +#include +#include + +#include #include "metadata/TagLibParser.hpp" @@ -40,8 +42,8 @@ enum class UpdatePeriod { UpdatePeriod getUpdatePeriod(Wt::Dbo::Session& session); void setUpdatePeriod(Wt::Dbo::Session& session, UpdatePeriod updatePeriod); -boost::posix_time::time_duration getUpdateStartTime(Wt::Dbo::Session& session); -void setUpdateStartTime(Wt::Dbo::Session& session, boost::posix_time::time_duration); +Wt::WTime getUpdateStartTime(Wt::Dbo::Session& session); +void setUpdateStartTime(Wt::Dbo::Session& session, Wt::WTime time); class MediaScanner { @@ -92,8 +94,8 @@ class MediaScanner // Job handling void scheduleScan(); - void scheduleScan(boost::posix_time::time_duration duration); - void scheduleScan(boost::posix_time::ptime time); + void scheduleScan(std::chrono::seconds duration); + void scheduleScan(std::chrono::system_clock::time_point time); // Update database (scheduled callback) void scan(boost::system::error_code ec); @@ -119,7 +121,7 @@ class MediaScanner Wt::Signal _sigAddedTrack; Wt::Signal _sigRemovedTrack; - boost::asio::deadline_timer _scheduleTimer; + boost::asio::system_timer _scheduleTimer; Database::Handler _db; diff --git a/src/ui/Auth.cpp b/src/ui/Auth.cpp index 5713d065..d4fbc093 100644 --- a/src/ui/Auth.cpp +++ b/src/ui/Auth.cpp @@ -17,10 +17,10 @@ * along with LMS. If not, see . */ -#include -#include -#include -#include +#include +#include +#include +#include #include "utils/Logger.hpp" @@ -31,10 +31,10 @@ namespace UserInterface { -Auth::Auth(Wt::WContainerWidget *parent) -: Wt::WTemplateFormView(parent) +Auth::Auth() +: Wt::WTemplateFormView() { - _model = new Wt::Auth::AuthModel(DbHandler().getAuthService(), DbHandler().getUserDatabase()); + _model = std::make_shared(LmsApp->getDb().getAuthService(), LmsApp->getDb().getUserDatabase()); _model->addPasswordAuth(&Database::Handler::getPasswordService()); @@ -43,50 +43,47 @@ Auth::Auth(Wt::WContainerWidget *parent) addFunction("id", &WTemplate::Functions::id); // LoginName - auto loginName = new Wt::WLineEdit(); - setFormWidget(Wt::Auth::AuthModel::LoginNameField, loginName); + setFormWidget(Wt::Auth::AuthModel::LoginNameField, std::make_unique()); // Password - auto password = new Wt::WLineEdit(); - setFormWidget(Wt::Auth::AuthModel::PasswordField, password); - password->setEchoMode(Wt::WLineEdit::Password); + auto password = std::make_unique(); + password->setEchoMode(Wt::EchoMode::Password); + password->enterPressed().connect(this, &Auth::processAuth); + setFormWidget(Wt::Auth::AuthModel::PasswordField, std::move(password)); // Remember Me - auto rememberMe = new Wt::WCheckBox(); - setFormWidget(Wt::Auth::AuthModel::RememberMeField, rememberMe); + setFormWidget(Wt::Auth::AuthModel::RememberMeField, std::make_unique()); - auto loginBtn = new Wt::WPushButton(Wt::WString::tr("Lms.login")); - bindWidget("login-btn", loginBtn); + Wt::WPushButton* loginBtn = bindNew("login-btn", Wt::WString::tr("Lms.login")); loginBtn->clicked().connect(this, &Auth::processAuth); - password->enterPressed().connect(this, &Auth::processAuth); - DbHandler().getLogin().changed().connect(std::bind([=] + LmsApp->getDb().getLogin().changed().connect(std::bind([=] { - if (DbHandler().getLogin().loggedIn()) + if (LmsApp->getDb().getLogin().loggedIn()) this->setHidden(true); })); Wt::Auth::User user = _model->processAuthToken(); - _model->loginUser(DbHandler().getLogin(), user, Wt::Auth::WeakLogin); + _model->loginUser(LmsApp->getDb().getLogin(), user, Wt::Auth::LoginState::Weak); - updateView(_model); + updateView(_model.get()); } void Auth::processAuth() { - updateModel(_model); + updateModel(_model.get()); if (_model->validate()) - _model->login(DbHandler().getLogin()); + _model->login(LmsApp->getDb().getLogin()); else - updateView(_model); + updateView(_model.get()); } void Auth::logout() { - _model->logout(DbHandler().getLogin()); + _model->logout(LmsApp->getDb().getLogin()); } } // namespace UserInterface diff --git a/src/ui/Auth.hpp b/src/ui/Auth.hpp index 65eec670..07df5557 100644 --- a/src/ui/Auth.hpp +++ b/src/ui/Auth.hpp @@ -19,24 +19,22 @@ #pragma once -#include -#include -#include -#include +#include +#include namespace UserInterface { class Auth : public Wt::WTemplateFormView { public: - Auth(Wt::WContainerWidget *parent = 0); + Auth(); void logout(); private: void processAuth(); - Wt::Auth::AuthModel* _model; + std::shared_ptr _model; }; diff --git a/src/ui/HomeView.cpp b/src/ui/HomeView.cpp index 9d857b4c..f5309e70 100644 --- a/src/ui/HomeView.cpp +++ b/src/ui/HomeView.cpp @@ -17,7 +17,7 @@ * along with LMS. If not, see . */ -#include +#include #include "utils/Logger.hpp" @@ -28,12 +28,13 @@ namespace UserInterface { -Home::Home(Wt::WContainerWidget *parent) -: Wt::WContainerWidget(parent) +Home::Home() +: Wt::WContainerWidget() { - auto t = new Wt::WTemplate(Wt::WString::tr("Lms.Home.template"), this); + auto t = std::make_unique(Wt::WString::tr("Lms.Home.template")); t->addFunction("tr", &Wt::WTemplate::Functions::tr); + this->addWidget(std::move(t)); } } // namespace UserInterface diff --git a/src/ui/HomeView.hpp b/src/ui/HomeView.hpp index 33f65d5e..8406bc58 100644 --- a/src/ui/HomeView.hpp +++ b/src/ui/HomeView.hpp @@ -19,14 +19,14 @@ #pragma once -#include +#include namespace UserInterface { class Home : public Wt::WContainerWidget { public: - Home(Wt::WContainerWidget *parent = 0); + Home(); private: diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 7b0dacbb..6a0b76c4 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -17,15 +17,16 @@ * along with LMS. If not, see . */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "config/config.h" #include "utils/Logger.hpp" @@ -49,14 +50,14 @@ namespace UserInterface { -Wt::WApplication* +std::unique_ptr LmsApplication::create(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner) { /* * You could read information from the environment to decide whether * the user has permission to start a new application */ - return new LmsApplication(env, connectionPool, scanner); + return std::make_unique(env, connectionPool, scanner); } LmsApplication* @@ -78,10 +79,10 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti _imageResource(nullptr), _transcodeResource(nullptr) { - Wt::WBootstrapTheme *bootstrapTheme = new Wt::WBootstrapTheme(this); - bootstrapTheme->setVersion(Wt::WBootstrapTheme::Version3); + auto bootstrapTheme = std::make_unique(); + bootstrapTheme->setVersion(Wt::BootstrapVersion::v3); bootstrapTheme->setResponsive(true); - setTheme(bootstrapTheme); + setTheme(std::move(bootstrapTheme)); useStyleSheet("css/lms.css"); useStyleSheet("resources/font-awesome/css/font-awesome.min.css"); @@ -90,7 +91,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti messageResourceBundle().use(appRoot() + "admin-database"); messageResourceBundle().use(appRoot() + "admin-user"); messageResourceBundle().use(appRoot() + "admin-users"); - messageResourceBundle().use(appRoot() + "admin-wizard"); + messageResourceBundle().use(appRoot() + "admin-initwizard"); messageResourceBundle().use(appRoot() + "artist"); messageResourceBundle().use(appRoot() + "artists"); messageResourceBundle().use(appRoot() + "home"); @@ -113,20 +114,22 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti // If here is no account in the database, launch the first connection wizard bool firstConnection; { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - firstConnection = (Database::User::getAll(DboSession()).size() == 0); + firstConnection = (Database::User::getAll(LmsApp->getDboSession()).size() == 0); } LMS_LOG(UI, DEBUG) << "Creating root widget. First connection = " << std::boolalpha << firstConnection; if (firstConnection) { - root()->addWidget(new InitWizardView()); + root()->addWidget(std::make_unique()); } else { - DbHandler().getLogin().changed().connect(std::bind([=] + _auth = root()->addNew(); + + LmsApp->getDb().getLogin().changed().connect(std::bind([=] { try { @@ -138,68 +141,31 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti throw std::runtime_error("Internal error"); } })); - - _auth = new Auth(); - root()->addWidget(_auth); } } -Database::Handler& DbHandler() -{ - return LmsApplication::instance()->getDbHandler(); -} -Wt::Dbo::Session& DboSession() -{ - return DbHandler().getSession(); -} - -const Wt::Auth::User& CurrentAuthUser() -{ - return DbHandler().getLogin().user(); -} - -Database::User::pointer CurrentUser() -{ - return DbHandler().getCurrentUser(); -} - -ImageResource* SessionImageResource() -{ - return LmsApplication::instance()->getImageResource(); -} - -TranscodeResource* SessionTranscodeResource() -{ - return LmsApplication::instance()->getTranscodeResource(); -} - -Scanner::MediaScanner& MediaScanner() -{ - return LmsApplication::instance()->getMediaScanner(); -} - -Wt::WAnchor* +std::unique_ptr LmsApplication::createArtistAnchor(Database::Artist::pointer artist, bool addText) { - auto res = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(artist.id()))); + auto res = std::make_unique(Wt::WLink(Wt::LinkType::InternalPath, "/artist/" + std::to_string(artist.id()))); if (addText) { - res->setTextFormat(Wt::PlainText); + res->setTextFormat(Wt::TextFormat::Plain); res->setText(Wt::WString::fromUTF8(artist->getName())); } return res; } -Wt::WAnchor* +std::unique_ptr LmsApplication::createReleaseAnchor(Database::Release::pointer release, bool addText) { - auto res = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id()))); + auto res = std::make_unique(Wt::WLink(Wt::LinkType::InternalPath, "/release/" + std::to_string(release.id()))); if (addText) { - res->setTextFormat(Wt::PlainText); + res->setTextFormat(Wt::TextFormat::Plain); res->setText(Wt::WString::fromUTF8(release->getName())); } @@ -274,7 +240,7 @@ handlePathChange(Wt::WStackedWidget* stack, bool isAdmin) void LmsApplication::handleAuthEvent(void) { - if (!DbHandler().getLogin().loggedIn()) + if (!LmsApp->getDb().getLogin().loggedIn()) { LMS_LOG(UI, INFO) << "User logged out, session = " << Wt::WApplication::instance()->sessionId(); @@ -282,73 +248,69 @@ LmsApplication::handleAuthEvent(void) return; } - LMS_LOG(UI, INFO) << "User '" << CurrentAuthUser().identity(Wt::Auth::Identity::LoginName) << "' logged in from '" << Wt::WApplication::instance()->environment().clientAddress() << "', user agent = " << Wt::WApplication::instance()->environment().agent() << ", session = " << Wt::WApplication::instance()->sessionId(); + LMS_LOG(UI, INFO) << "User '" << LmsApp->getCurrentAuthUser().identity(Wt::Auth::Identity::LoginName) << "' logged in from '" << Wt::WApplication::instance()->environment().clientAddress() << "', user agent = " << Wt::WApplication::instance()->environment().userAgent() << ", session = " << Wt::WApplication::instance()->sessionId(); { - Wt::Dbo::Transaction transaction (DboSession()); - _isAdmin = CurrentUser()->isAdmin(); + Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); + _isAdmin = LmsApp->getCurrentUser()->isAdmin(); } - _imageResource = new ImageResource(_db, root()); - _transcodeResource = new TranscodeResource(_db, root()); + _imageResource = std::make_shared(_db); + _transcodeResource = std::make_shared(_db); setConfirmCloseMessage(Wt::WString::tr("Lms.quit-confirm")); - auto main = new Wt::WTemplate(Wt::WString::tr("Lms.template"), root()); + Wt::WTemplate* main = root()->addWidget(std::make_unique(Wt::WString::tr("Lms.template"))); // Navbar - auto navbar = new Wt::WNavigationBar(); - navbar->setTitle("LMS", Wt::WLink(Wt::WLink::InternalPath, "/home")); + Wt::WNavigationBar* navbar = main->bindNew("navbar-top"); + navbar->setTitle("LMS", Wt::WLink(Wt::LinkType::InternalPath, "/home")); navbar->setResponsive(true); - main->bindWidget("navbar-top", navbar); - - auto menu = new Wt::WMenu(); + Wt::WMenu* menu = navbar->addMenu(std::make_unique()); { auto menuItem = menu->insertItem(0, Wt::WString::tr("Lms.Explore.artists")); - menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/artists")); + menuItem->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/artists")); menuItem->setSelectable(false); } { auto menuItem = menu->insertItem(1, Wt::WString::tr("Lms.Explore.releases")); - menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/releases")); + menuItem->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/releases")); menuItem->setSelectable(false); } { auto menuItem = menu->insertItem(2, Wt::WString::tr("Lms.Explore.tracks")); - menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/tracks")); + menuItem->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/tracks")); menuItem->setSelectable(false); } { auto menuItem = menu->insertItem(3, Wt::WString::tr("Lms.PlayQueue.playqueue")); - menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/playqueue")); + menuItem->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/playqueue")); menuItem->setSelectable(false); } - navbar->addMenu(menu); - auto rightMenu = new Wt::WMenu(); + Wt::WMenu* rightMenu = navbar->addMenu(std::make_unique(), Wt::AlignmentFlag::Right); std::size_t itemCounter = 0; - if (_isAdmin) { auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.administration")); menuItem->setSelectable(false); - Wt::WPopupMenu *admin = new Wt::WPopupMenu(); + auto admin = std::make_unique(); auto dbSettings = admin->insertItem(0, Wt::WString::tr("Lms.Admin.Database.database")); - dbSettings->setLink(Wt::WLink(Wt::WLink::InternalPath, "/admin/database")); + dbSettings->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/admin/database")); dbSettings->setSelectable(false); auto usersSettings = admin->insertItem(1, Wt::WString::tr("Lms.Admin.Users.users")); - usersSettings->setLink(Wt::WLink(Wt::WLink::InternalPath, "/admin/users")); + usersSettings->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/admin/users")); usersSettings->setSelectable(false); - menuItem->setMenu(admin); + menuItem->setMenu(std::move(admin)); } { auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.Settings.settings")); - menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/settings")); + menuItem->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/settings")); menuItem->setSelectable(false); } { @@ -360,34 +322,22 @@ LmsApplication::handleAuthEvent(void) _auth->logout(); })); } - navbar->addMenu(rightMenu, Wt::AlignRight); // Contents - Wt::WStackedWidget* mainStack = new Wt::WStackedWidget(); - main->bindWidget("contents", mainStack); + // Order is important in mainStack, see IdxRoot! + Wt::WStackedWidget* mainStack = main->bindNew("contents"); - mainStack->addWidget(new Home()); - - auto explore = new Explore(); - mainStack->addWidget(explore); - - auto playqueue = new PlayQueue(); - mainStack->addWidget(playqueue); - - auto settings = new SettingsView(); - mainStack->addWidget(settings); + mainStack->addNew(); + Explore* explore = mainStack->addNew(); + PlayQueue* playqueue = mainStack->addNew(); + mainStack->addNew(); // Admin stuff if (_isAdmin) { - auto databaseSettings = new DatabaseSettingsView(); - mainStack->addWidget(databaseSettings); - - auto users = new UsersView(); - mainStack->addWidget(users); - - auto user = new UserView(); - mainStack->addWidget(user); + mainStack->addNew(); + mainStack->addNew(); + mainStack->addNew(); } explore->tracksAdd.connect(std::bind([=] (std::vector tracks) @@ -400,9 +350,9 @@ LmsApplication::handleAuthEvent(void) playqueue->playTracks(tracks); }, std::placeholders::_1)); + // MediaPlayer - auto player = new MediaPlayer(); - main->bindWidget("player", player); + MediaPlayer* player = main->bindNew("player"); // Events from MediaPlayer player->playNext.connect(std::bind([=] @@ -468,7 +418,7 @@ void LmsApplication::notifyMsg(const Wt::WString& message) { LMS_LOG(UI, INFO) << "Notifying message '" << message.toUTF8() << "'"; - root()->addWidget(new Wt::WText(message)); + root()->addNew(message); } } // namespace UserInterface diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index 062872cc..b8ceda11 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -20,8 +20,8 @@ #ifndef LMS_APPLICATION_HPP #define LMS_APPLICATION_HPP -#include -#include +#include +#include #include "database/DatabaseHandler.hpp" #include "scanner/MediaScanner.hpp" @@ -36,13 +36,20 @@ class ImageResource; class LmsApplication : public Wt::WApplication { public: - static Wt::WApplication *create(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner); + LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner); + + static std::unique_ptr create(const Wt::WEnvironment& env, + Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner); static LmsApplication* instance(); // Session application data - ImageResource* getImageResource() { return _imageResource; } - TranscodeResource* getTranscodeResource() { return _transcodeResource; } - Database::Handler& getDbHandler() { return _db;} + std::shared_ptr getImageResource() { return _imageResource; } + std::shared_ptr getTranscodeResource() { return _transcodeResource; } + Database::Handler& getDb() { return _db;} + Wt::Dbo::Session& getDboSession() { return _db.getSession();} + + const Wt::Auth::User& getCurrentAuthUser() { return _db.getLogin().user(); } + Database::User::pointer getCurrentUser() { return _db.getCurrentUser(); } Scanner::MediaScanner& getMediaScanner() { return _scanner; } @@ -51,33 +58,25 @@ class LmsApplication : public Wt::WApplication void goHomeAndQuit(); void notifyMsg(const Wt::WString& message); - static Wt::WAnchor* createArtistAnchor(Database::Artist::pointer artist, bool addText = true); - static Wt::WAnchor* createReleaseAnchor(Database::Release::pointer release, bool addText = true); + static std::unique_ptr createArtistAnchor(Database::Artist::pointer artist, bool addText = true); + static std::unique_ptr createReleaseAnchor(Database::Release::pointer release, bool addText = true); private: - LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner); - void handleAuthEvent(void); void notify(const Wt::WEvent& event) override; Database::Handler _db; Auth* _auth; Scanner::MediaScanner& _scanner; - ImageResource* _imageResource; - TranscodeResource* _transcodeResource; + std::shared_ptr _imageResource; + std::shared_ptr _transcodeResource; bool _isAdmin = false; }; -// Helpers to get session data +// Helper to get session data #define LmsApp LmsApplication::instance() -Database::Handler& DbHandler(); -Wt::Dbo::Session& DboSession(); - -const Wt::Auth::User& CurrentAuthUser(); -Database::User::pointer CurrentUser(); - } // namespace UserInterface #endif diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp index 7c9921e8..b4fd2816 100644 --- a/src/ui/MediaPlayer.cpp +++ b/src/ui/MediaPlayer.cpp @@ -30,8 +30,8 @@ namespace UserInterface { -MediaPlayer::MediaPlayer(Wt::WContainerWidget* parent) -: Wt::WTemplate(Wt::WString::tr("template-mediaplayer"), parent), +MediaPlayer::MediaPlayer() +: Wt::WTemplate(Wt::WString::tr("template-mediaplayer")), playbackEnded(this, "playbackEnded"), playPrevious(this, "playPrevious"), playNext(this, "playNext") @@ -49,8 +49,8 @@ MediaPlayer::playTrack(Database::Track::id_type trackId) { LMS_LOG(UI, DEBUG) << "Playing track ID = " << trackId; - Wt::Dbo::Transaction transaction(DboSession()); - auto track = Database::Track::getById(DboSession(), trackId); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + auto track = Database::Track::getById(LmsApp->getDboSession(), trackId); try { @@ -66,7 +66,7 @@ MediaPlayer::playTrack(Database::Track::id_type trackId) << " release: " << (track->getRelease() ? "\"" + escape(track->getRelease()->getName()) + "\"" : "undefined" ) << "," << " artist: " << (track->getArtist() ? "\"" + escape(track->getArtist()->getName()) + "\"" : "undefined" ) << "," << " resource: \"" << resource << "\"," - << " duration: " << track->getDuration().total_seconds() << "," + << " duration: " << std::chrono::duration_cast(track->getDuration()).count() << "," << " imgResource: \"" << imgResource << "\"," << "};"; oss << "LMS.mediaplayer.loadTrack(params, true)"; // true to autoplay diff --git a/src/ui/MediaPlayer.hpp b/src/ui/MediaPlayer.hpp index 80d7d74d..55da4f42 100644 --- a/src/ui/MediaPlayer.hpp +++ b/src/ui/MediaPlayer.hpp @@ -19,8 +19,8 @@ #pragma once -#include -#include +#include +#include #include "database/Types.hpp" @@ -29,15 +29,15 @@ namespace UserInterface { class MediaPlayer : public Wt::WTemplate { public: - MediaPlayer(Wt::WContainerWidget* parent = 0); + MediaPlayer(); void stop(); void playTrack(Database::Track::id_type); // Signals - Wt::JSignal playbackEnded; - Wt::JSignal playPrevious; - Wt::JSignal playNext; + Wt::JSignal<> playbackEnded; + Wt::JSignal<> playPrevious; + Wt::JSignal<> playNext; private: diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index ae329179..5334f5e5 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -17,9 +17,9 @@ * along with LMS. If not, see . */ -#include -#include -#include +#include +#include +#include #include "utils/Logger.hpp" @@ -30,26 +30,39 @@ namespace UserInterface { static const std::string currentPlayQueueName = "__current__playqueue__"; -PlayQueue::PlayQueue(Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent) +PlayQueue::PlayQueue() +: Wt::WTemplate(Wt::WString::tr("Lms.PlayQueue.template")) { - auto container = new Wt::WTemplate(Wt::WString::tr("Lms.PlayQueue.template"), this); - container->addFunction("tr", &Wt::WTemplate::Functions::tr); + addFunction("tr", &Wt::WTemplate::Functions::tr); - auto saveBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.save-to-playlist"), Wt::XHTMLText); - container->bindWidget("save-btn", saveBtn); + bindNew("save-btn", Wt::WString::tr("Lms.PlayQueue.save-to-playlist"), Wt::TextFormat::XHTML); + bindNew("load-btn", Wt::WString::tr("Lms.PlayQueue.load-from-playlist"), Wt::TextFormat::XHTML); + Wt::WText* clearBtn = bindNew("clear-btn", Wt::WString::tr("Lms.PlayQueue.clear"), Wt::TextFormat::XHTML); - auto loadBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.load-from-playlist"), Wt::XHTMLText); - container->bindWidget("load-btn", loadBtn); + _entriesContainer = bindNew("entries"); + + _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.show-more")); + _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); + _showMore->setHidden(true); + + _nbTracks = bindNew("nb-tracks"); + + { + Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); + + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); + if (!playlist) + playlist = Database::Playlist::create(LmsApp->getDboSession(), currentPlayQueueName, false, LmsApp->getCurrentUser()); + + _trackPos = LmsApp->getCurrentUser()->getCurPlayingTrackPos(); + } - auto clearBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.clear"), Wt::XHTMLText); - container->bindWidget("clear-btn", clearBtn); clearBtn->clicked().connect(std::bind([=] { { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); playlist.modify()->clear(); _showMore->setHidden(true); } @@ -58,27 +71,6 @@ PlayQueue::PlayQueue(Wt::WContainerWidget* parent) updateInfo(); })); - _entriesContainer = new Wt::WContainerWidget(); - container->bindWidget("entries", _entriesContainer); - - _showMore = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.show-more")); - _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); - _showMore->setHidden(true); - container->bindWidget("show-more", _showMore); - - _nbTracks = new Wt::WText(); - container->bindWidget("nb-tracks", _nbTracks); - - { - Wt::Dbo::Transaction transaction (DboSession()); - - auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); - if (!playlist) - playlist = Database::Playlist::create(DboSession(), currentPlayQueueName, false, CurrentUser()); - - _trackPos = CurrentUser()->getCurPlayingTrackPos(); - } - _showMore->clicked().connect(std::bind([=] { addSome(); @@ -103,9 +95,9 @@ PlayQueue::play(std::size_t pos) Database::Track::id_type trackId; { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); // If out of range, stop playing if (pos >= playlist->getCount()) @@ -149,9 +141,9 @@ PlayQueue::playNext() void PlayQueue::updateInfo() { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); _nbTracks->setText(Wt::WString::tr("Lms.PlayQueue.nb-tracks").arg(playlist->getCount())); } @@ -179,10 +171,10 @@ PlayQueue::addTracks(const std::vector& tracks) LMS_LOG(UI, DEBUG) << "Adding tracks to the current queue"; - auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); for (auto track : tracks) - Database::PlaylistEntry::create(DboSession(), track, playlist); + Database::PlaylistEntry::create(LmsApp->getDboSession(), track, playlist); updateInfo(); addSome(); @@ -193,9 +185,9 @@ PlayQueue::playTracks(const std::vector& tracks) { LMS_LOG(UI, DEBUG) << "Emptying current queue to play new tracks"; - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playqueue = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); + auto playqueue = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); playqueue.modify()->clear(); _entriesContainer->clear(); @@ -209,9 +201,9 @@ PlayQueue::playTracks(const std::vector& tracks) void PlayQueue::addSome() { - Wt::Dbo::Transaction transaction (DboSession()); + Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(DboSession(), currentPlayQueueName, CurrentUser()); + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); bool moreResults; auto playlistEntries = playlist->getEntries(_entriesContainer->count(), 50, moreResults); @@ -220,27 +212,24 @@ PlayQueue::addSome() auto playlistEntryId = playlistEntry.id(); auto track = playlistEntry->getTrack(); - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.PlayQueue.template.entry"), _entriesContainer); + Wt::WTemplate* entry = _entriesContainer->addNew(Wt::WString::tr("Lms.PlayQueue.template.entry")); - entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); + entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain); auto artist = track->getArtist(); if (artist) { entry->setCondition("if-has-artist", true); - Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(track->getArtist()); - entry->bindWidget("artist-name", artistAnchor); + entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(track->getArtist())); } auto release = track->getRelease(); if (release) { entry->setCondition("if-has-release", true); - Wt::WAnchor *releaseAnchor = LmsApplication::createReleaseAnchor(track->getRelease()); - entry->bindWidget("release-name", releaseAnchor); + entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(track->getRelease())); } - auto playBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.play"), Wt::XHTMLText); - entry->bindWidget("play-btn", playBtn); + Wt::WText* playBtn = entry->bindNew("play-btn", Wt::WString::tr("Lms.PlayQueue.play"), Wt::TextFormat::XHTML); playBtn->clicked().connect(std::bind([=] { auto pos = _entriesContainer->indexOf(entry); @@ -248,15 +237,14 @@ PlayQueue::addSome() play(pos); })); - auto delBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.delete"), Wt::XHTMLText); - entry->bindWidget("del-btn", delBtn); + Wt::WText* delBtn = entry->bindNew("del-btn", Wt::WString::tr("Lms.PlayQueue.delete"), Wt::TextFormat::XHTML); delBtn->clicked().connect(std::bind([=] { // Remove the entry n both the widget tree and the playqueue { - Wt::Dbo::Transaction transaction (DboSession()); + Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); - auto entryToRemove = Database::PlaylistEntry::getById(DboSession(), playlistEntryId); + auto entryToRemove = Database::PlaylistEntry::getById(LmsApp->getDboSession(), playlistEntryId); entryToRemove.remove(); } @@ -271,6 +259,7 @@ PlayQueue::addSome() updateInfo(); })); + } _showMore->setHidden(!moreResults); diff --git a/src/ui/PlayQueueView.hpp b/src/ui/PlayQueueView.hpp index 18a0de34..0d65d2a0 100644 --- a/src/ui/PlayQueueView.hpp +++ b/src/ui/PlayQueueView.hpp @@ -19,10 +19,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -30,10 +30,10 @@ namespace UserInterface { -class PlayQueue : public Wt::WContainerWidget +class PlayQueue : public Wt::WTemplate { public: - PlayQueue(Wt::WContainerWidget* parent = 0); + PlayQueue(); void addTracks(const std::vector& tracks); void playTracks(const std::vector& tracks); @@ -48,7 +48,7 @@ class PlayQueue : public Wt::WContainerWidget Wt::Signal playTrack; // Signal emitted when play has to be stopped - Wt::Signal playbackStop; + Wt::Signal<> playbackStop; private: void addSome(); diff --git a/src/ui/SettingsView.cpp b/src/ui/SettingsView.cpp index 0daa1295..aa3b962e 100644 --- a/src/ui/SettingsView.cpp +++ b/src/ui/SettingsView.cpp @@ -17,13 +17,13 @@ * along with LMS. If not, see . */ -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include #include "common/Validators.hpp" @@ -45,8 +45,8 @@ class SettingsModel : public Wt::WFormModel static const Field PasswordField; static const Field PasswordConfirmField; - SettingsModel(Wt::WObject *parent = 0) - : Wt::WFormModel(parent) + SettingsModel() + : Wt::WFormModel() { initializeModels(); @@ -61,18 +61,18 @@ class SettingsModel : public Wt::WFormModel loadData(); } - Wt::WAbstractItemModel *bitrateModel() { return _bitrateModel; } - Wt::WAbstractItemModel *encodingModel() { return _encodingModel; } + std::shared_ptr bitrateModel() { return _bitrateModel; } + std::shared_ptr encodingModel() { return _encodingModel; } void loadData() { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto bitrate = getBitrateRow(CurrentUser()->getAudioBitrate()); + auto bitrate = getBitrateRow(LmsApp->getCurrentUser()->getAudioBitrate()); if (bitrate) setValue(BitrateField, bitrateString(*bitrate)); - auto encodingRow = getEncodingRow(CurrentUser()->getAudioEncoding()); + auto encodingRow = getEncodingRow(LmsApp->getCurrentUser()->getAudioEncoding()); if (encodingRow) setValue(EncodingField, encodingString(*encodingRow)); @@ -80,18 +80,18 @@ class SettingsModel : public Wt::WFormModel void saveData() { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); auto bitrateRow = getBitrateRow(Wt::asString(value(BitrateField))); assert(bitrateRow); - CurrentUser().modify()->setAudioBitrate(bitrate(*bitrateRow)); + LmsApp->getCurrentUser().modify()->setAudioBitrate(bitrate(*bitrateRow)); auto encodingRow = getEncodingRow(Wt::asString(value(EncodingField))); - CurrentUser().modify()->setAudioEncoding(encoding(*encodingRow)); + LmsApp->getCurrentUser().modify()->setAudioEncoding(encoding(*encodingRow)); if (!valueText(PasswordField).empty()) { - Database::Handler::getPasswordService().updatePassword(CurrentAuthUser(), valueText(PasswordField)); + Database::Handler::getPasswordService().updatePassword(LmsApp->getCurrentAuthUser(), valueText(PasswordField)); } } @@ -105,7 +105,7 @@ class SettingsModel : public Wt::WFormModel { // Evaluate the strength of the password auto res = Database::Handler::getPasswordService().strengthValidator()->evaluateStrength(valueText(PasswordField), - CurrentAuthUser().identity(Wt::Auth::Identity::LoginName), ""); + LmsApp->getCurrentAuthUser().identity(Wt::Auth::Identity::LoginName), ""); if (!res.isValid()) error = res.message(); @@ -115,7 +115,7 @@ class SettingsModel : public Wt::WFormModel } else if (field == PasswordConfirmField) { - if (validation(PasswordField).state() == Wt::WValidator::Valid) + if (validation(PasswordField).state() == Wt::ValidationState::Valid) { if (valueText(PasswordField) != valueText(PasswordConfirmField)) error = Wt::WString::tr("Lms.passwords-dont-match"); @@ -126,9 +126,9 @@ class SettingsModel : public Wt::WFormModel return Wt::WFormModel::validateField(field); } - setValidation(field, Wt::WValidator::Result( error.empty() ? Wt::WValidator::Valid : Wt::WValidator::Invalid, error)); + setValidation(field, Wt::WValidator::Result( error.empty() ? Wt::ValidationState::Valid : Wt::ValidationState::Invalid, error)); - return (validation(field).state() == Wt::WValidator::Valid); + return (validation(field).state() == Wt::ValidationState::Valid); } boost::optional getBitrateRow(Wt::WString value) @@ -155,14 +155,14 @@ class SettingsModel : public Wt::WFormModel std::size_t bitrate(int row) { - return boost::any_cast - (_bitrateModel->data(_bitrateModel->index(row, 0), Wt::UserRole)); + return Wt::cpp17::any_cast + (_bitrateModel->data(_bitrateModel->index(row, 0), Wt::ItemDataRole::User)); } Wt::WString bitrateString(int row) { - return boost::any_cast - (_bitrateModel->data(_bitrateModel->index(row, 0), Wt::DisplayRole)); + return Wt::cpp17::any_cast + (_bitrateModel->data(_bitrateModel->index(row, 0), Wt::ItemDataRole::Display)); } boost::optional getEncodingRow(Wt::WString value) @@ -189,14 +189,14 @@ class SettingsModel : public Wt::WFormModel Database::AudioEncoding encoding(int row) { - return boost::any_cast - (_encodingModel->data(_encodingModel->index(row, 0), Wt::UserRole)); + return Wt::cpp17::any_cast + (_encodingModel->data(_encodingModel->index(row, 0), Wt::ItemDataRole::User)); } Wt::WString encodingString(int row) { - return boost::any_cast - (_encodingModel->data(_encodingModel->index(row, 0), Wt::DisplayRole)); + return Wt::cpp17::any_cast + (_encodingModel->data(_encodingModel->index(row, 0), Wt::ItemDataRole::Display)); } @@ -204,42 +204,42 @@ class SettingsModel : public Wt::WFormModel void initializeModels() { - - _bitrateModel = new Wt::WStringListModel(this); + _bitrateModel = std::make_shared(); std::size_t maxAudioBitrate; { - Wt::Dbo::Transaction transaction(DboSession()); - maxAudioBitrate = CurrentUser()->getMaxAudioBitrate(); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + maxAudioBitrate = LmsApp->getCurrentUser()->getMaxAudioBitrate(); } std::size_t id = 0; - for (auto bitrate : Database::User::audioBitrates) + for (std::size_t bitrate : Database::User::audioBitrates) { if (bitrate > maxAudioBitrate) break; _bitrateModel->addString( Wt::WString::fromUTF8(std::to_string(bitrate / 1000)) ); - _bitrateModel->setData( id++, 0, bitrate, Wt::UserRole); + _bitrateModel->setData( id, 0, bitrate, Wt::ItemDataRole::User); + id++; } - _encodingModel = new Wt::WStringListModel(this); + _encodingModel = std::make_shared(); _encodingModel->addString(Wt::WString::tr("Lms.Settings.auto")); - _encodingModel->setData(0, 0, Database::AudioEncoding::AUTO, Wt::UserRole); + _encodingModel->setData(0, 0, Database::AudioEncoding::AUTO, Wt::ItemDataRole::User); _encodingModel->addString(Wt::WString::tr("Lms.Settings.mp3")); - _encodingModel->setData(1, 0, Database::AudioEncoding::MP3, Wt::UserRole); + _encodingModel->setData(1, 0, Database::AudioEncoding::MP3, Wt::ItemDataRole::User); _encodingModel->addString(Wt::WString::tr("Lms.Settings.oga")); - _encodingModel->setData(2, 0, Database::AudioEncoding::OGA, Wt::UserRole); + _encodingModel->setData(2, 0, Database::AudioEncoding::OGA, Wt::ItemDataRole::User); _encodingModel->addString(Wt::WString::tr("Lms.Settings.webma")); - _encodingModel->setData(3, 0, Database::AudioEncoding::WEBMA, Wt::UserRole); + _encodingModel->setData(3, 0, Database::AudioEncoding::WEBMA, Wt::ItemDataRole::User); } - Wt::WStringListModel* _bitrateModel; - Wt::WStringListModel* _encodingModel; + std::shared_ptr _bitrateModel; + std::shared_ptr _encodingModel; }; @@ -248,45 +248,38 @@ const Wt::WFormModel::Field SettingsModel::EncodingField = "encoding"; const Wt::WFormModel::Field SettingsModel::PasswordField = "password"; const Wt::WFormModel::Field SettingsModel::PasswordConfirmField = "password-confirm"; -SettingsView::SettingsView(Wt::WContainerWidget *parent) -: Wt::WTemplateFormView(parent) +SettingsView::SettingsView() +: Wt::WTemplateFormView(Wt::WString::tr("Lms.Settings.template")) { - auto model = new SettingsModel(this); - - setTemplateText(tr("Lms.Settings.template")); - addFunction("tr", &WTemplate::Functions::tr); - addFunction("id", &WTemplate::Functions::id); + auto model = std::make_shared(); // Password - Wt::WLineEdit *password = new Wt::WLineEdit(); - setFormWidget(SettingsModel::PasswordField, password); - password->setEchoMode(Wt::WLineEdit::Password); + auto password = std::make_unique(); + password->setEchoMode(Wt::EchoMode::Password); + setFormWidget(SettingsModel::PasswordField, std::move(password)); // Password confirm - Wt::WLineEdit *passwordConfirm = new Wt::WLineEdit(); - setFormWidget(SettingsModel::PasswordConfirmField, passwordConfirm); - passwordConfirm->setEchoMode(Wt::WLineEdit::Password); + auto passwordConfirm = std::make_unique(); + passwordConfirm->setEchoMode(Wt::EchoMode::Password); + setFormWidget(SettingsModel::PasswordConfirmField, std::move(passwordConfirm)); // Bitrate - Wt::WComboBox *bitrate = new Wt::WComboBox(); - setFormWidget(SettingsModel::BitrateField, bitrate); + auto bitrate = std::make_unique(); bitrate->setModel(model->bitrateModel()); + setFormWidget(SettingsModel::BitrateField, std::move(bitrate)); // Encoding - Wt::WComboBox *encoding = new Wt::WComboBox(); - setFormWidget(SettingsModel::EncodingField, encoding); + auto encoding = std::make_unique(); encoding->setModel(model->encodingModel()); + setFormWidget(SettingsModel::EncodingField, std::move(encoding)); // Buttons - Wt::WPushButton *saveBtn = new Wt::WPushButton(Wt::WString::tr("Lms.apply")); - bindWidget("apply-btn", saveBtn); - - Wt::WPushButton *discardBtn = new Wt::WPushButton(Wt::WString::tr("Lms.discard")); - bindWidget("discard-btn", discardBtn); + Wt::WPushButton *saveBtn = bindWidget("apply-btn", std::make_unique(Wt::WString::tr("Lms.apply"))); + Wt::WPushButton *discardBtn = bindWidget("discard-btn", std::make_unique(Wt::WString::tr("Lms.discard"))); saveBtn->clicked().connect(std::bind([=] () { - updateModel(model); + updateModel(model.get()); if (model->validate()) { @@ -295,17 +288,17 @@ SettingsView::SettingsView(Wt::WContainerWidget *parent) } // Udate the view: Delete any validation message in the view, etc. - updateView(model); + updateView(model.get()); })); discardBtn->clicked().connect(std::bind([=] () { model->loadData(); model->validate(); - updateView(model); + updateView(model.get()); })); - updateView(model); + updateView(model.get()); } } // namespace UserInterface diff --git a/src/ui/SettingsView.hpp b/src/ui/SettingsView.hpp index 95708107..ac51a133 100644 --- a/src/ui/SettingsView.hpp +++ b/src/ui/SettingsView.hpp @@ -19,15 +19,14 @@ #pragma once -#include -#include +#include namespace UserInterface { class SettingsView : public Wt::WTemplateFormView { public: - SettingsView(Wt::WContainerWidget *parent = 0); + SettingsView(); }; } // namespace UserInterface diff --git a/src/ui/admin/DatabaseSettingsView.cpp b/src/ui/admin/DatabaseSettingsView.cpp index 9373dd59..8b1c6764 100644 --- a/src/ui/admin/DatabaseSettingsView.cpp +++ b/src/ui/admin/DatabaseSettingsView.cpp @@ -17,13 +17,13 @@ * along with LMS. If not, see . */ -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include #include "common/Validators.hpp" #include "database/MediaDirectory.hpp" @@ -46,8 +46,8 @@ class DatabaseSettingsModel : public Wt::WFormModel static const Field UpdatePeriodField; static const Field UpdateStartTimeField; - DatabaseSettingsModel(Wt::WObject *parent = 0) - : Wt::WFormModel(parent) + DatabaseSettingsModel() + : Wt::WFormModel() { initializeModels(); @@ -55,7 +55,7 @@ class DatabaseSettingsModel : public Wt::WFormModel addField(UpdatePeriodField); addField(UpdateStartTimeField); - DirectoryValidator* dirValidator = new DirectoryValidator(); + auto dirValidator = std::make_shared(); dirValidator->setMandatory(true); setValidator(MediaDirectoryField, dirValidator); @@ -66,42 +66,42 @@ class DatabaseSettingsModel : public Wt::WFormModel loadData(); } - Wt::WAbstractItemModel *updatePeriodModel() { return _updatePeriodModel; } - Wt::WAbstractItemModel *updateStartTimeModel() { return _updateStartTimeModel; } + std::shared_ptr updatePeriodModel() { return _updatePeriodModel; } + std::shared_ptr updateStartTimeModel() { return _updateStartTimeModel; } void loadData() { using namespace Database; - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - std::vector mediaDirectories = MediaDirectory::getAll(DboSession()); + std::vector mediaDirectories = MediaDirectory::getAll(LmsApp->getDboSession()); if (!mediaDirectories.empty()) setValue(MediaDirectoryField, mediaDirectories.front()->getPath().string()); - auto periodRow = getUpdatePeriodModelRow( Scanner::getUpdatePeriod(DboSession()) ); + auto periodRow = getUpdatePeriodModelRow( Scanner::getUpdatePeriod(LmsApp->getDboSession()) ); if (periodRow) setValue(UpdatePeriodField, updatePeriodString(*periodRow)); - auto startTimeRow = getUpdateStartTimeModelRow( Scanner::getUpdateStartTime(DboSession()) ); + auto startTimeRow = getUpdateStartTimeModelRow( Scanner::getUpdateStartTime(LmsApp->getDboSession()) ); if (startTimeRow) setValue(UpdateStartTimeField, updateStartTimeString(*startTimeRow) ); } void saveData() { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - MediaDirectory::eraseAll(DboSession()); - MediaDirectory::create(DboSession(), boost::any_cast(value(MediaDirectoryField)).toUTF8()); + MediaDirectory::eraseAll(LmsApp->getDboSession()); + MediaDirectory::create(LmsApp->getDboSession(), Wt::cpp17::any_cast(value(MediaDirectoryField)).toUTF8()); - auto updatePeriodRow = getUpdatePeriodModelRow( boost::any_cast(value(UpdatePeriodField))); + auto updatePeriodRow = getUpdatePeriodModelRow( Wt::cpp17::any_cast(value(UpdatePeriodField))); assert(updatePeriodRow); - Scanner::setUpdatePeriod(DboSession(), updatePeriod(*updatePeriodRow)); + Scanner::setUpdatePeriod(LmsApp->getDboSession(), updatePeriod(*updatePeriodRow)); - auto startTimeRow = getUpdateStartTimeModelRow( boost::any_cast(value(UpdateStartTimeField))); + auto startTimeRow = getUpdateStartTimeModelRow( Wt::cpp17::any_cast(value(UpdateStartTimeField))); assert(startTimeRow); - Scanner::setUpdateStartTime(DboSession(), updateStartTime(*startTimeRow)); + Scanner::setUpdateStartTime(LmsApp->getDboSession(), updateStartTime(*startTimeRow)); } boost::optional getUpdatePeriodModelRow(Wt::WString value) @@ -128,14 +128,14 @@ class DatabaseSettingsModel : public Wt::WFormModel Scanner::UpdatePeriod updatePeriod(int row) { - return boost::any_cast - (_updatePeriodModel->data(_updatePeriodModel->index(row, 0), Wt::UserRole)); + return Wt::cpp17::any_cast + (_updatePeriodModel->data(_updatePeriodModel->index(row, 0), Wt::ItemDataRole::User)); } Wt::WString updatePeriodString(int row) { - return boost::any_cast - (_updatePeriodModel->data(_updatePeriodModel->index(row, 0), Wt::DisplayRole)); + return Wt::cpp17::any_cast + (_updatePeriodModel->data(_updatePeriodModel->index(row, 0), Wt::ItemDataRole::Display)); } @@ -150,7 +150,7 @@ class DatabaseSettingsModel : public Wt::WFormModel return boost::none; } - boost::optional getUpdateStartTimeModelRow(boost::posix_time::time_duration startTime) + boost::optional getUpdateStartTimeModelRow(Wt::WTime startTime) { for (int i = 0; i < _updateStartTimeModel->rowCount(); ++i) { @@ -161,16 +161,16 @@ class DatabaseSettingsModel : public Wt::WFormModel return boost::none; } - boost::posix_time::time_duration updateStartTime(int row) + Wt::WTime updateStartTime(int row) { - return boost::any_cast - (_updateStartTimeModel->data(_updateStartTimeModel->index(row, 0), Wt::UserRole)); + return Wt::cpp17::any_cast + (_updateStartTimeModel->data(_updateStartTimeModel->index(row, 0), Wt::ItemDataRole::User)); } Wt::WString updateStartTimeString(int row) { - return boost::any_cast - (_updateStartTimeModel->data(_updateStartTimeModel->index(row, 0), Wt::DisplayRole)); + return Wt::cpp17::any_cast + (_updateStartTimeModel->data(_updateStartTimeModel->index(row, 0), Wt::ItemDataRole::Display)); } @@ -179,43 +179,35 @@ class DatabaseSettingsModel : public Wt::WFormModel void initializeModels() { - _updatePeriodModel = new Wt::WStringListModel(this); + _updatePeriodModel = std::make_shared(); _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.never")); - _updatePeriodModel->setData(0, 0, Scanner::UpdatePeriod::Never, Wt::UserRole); + _updatePeriodModel->setData(0, 0, Scanner::UpdatePeriod::Never, Wt::ItemDataRole::User); _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.daily")); - _updatePeriodModel->setData(1, 0, Scanner::UpdatePeriod::Daily, Wt::UserRole); + _updatePeriodModel->setData(1, 0, Scanner::UpdatePeriod::Daily, Wt::ItemDataRole::User); _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.weekly")); - _updatePeriodModel->setData(2, 0, Scanner::UpdatePeriod::Weekly, Wt::UserRole); + _updatePeriodModel->setData(2, 0, Scanner::UpdatePeriod::Weekly, Wt::ItemDataRole::User); _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.monthly")); - _updatePeriodModel->setData(3, 0, Scanner::UpdatePeriod::Monthly, Wt::UserRole); + _updatePeriodModel->setData(3, 0, Scanner::UpdatePeriod::Monthly, Wt::ItemDataRole::User); - _updateStartTimeModel = new Wt::WStringListModel(this); + _updateStartTimeModel = std::make_shared(); for (std::size_t i = 0; i < 24; ++i) { - boost::posix_time::time_duration dur = boost::posix_time::hours(i); + Wt::WTime time(i, 0); - boost::posix_time::time_facet* facet = new boost::posix_time::time_facet("%H:%M"); - facet->time_duration_format("%H:%M"); - - std::ostringstream oss; - oss.imbue(std::locale(oss.getloc(), facet)); - - oss << dur; - - _updateStartTimeModel->addString( oss.str() ); - _updateStartTimeModel->setData(i, 0, dur, Wt::UserRole); + _updateStartTimeModel->addString( time.toString() ); + _updateStartTimeModel->setData(i, 0, time, Wt::ItemDataRole::User); } } - Wt::WStringListModel* _updatePeriodModel; - Wt::WStringListModel* _updateStartTimeModel; + std::shared_ptr _updatePeriodModel; + std::shared_ptr _updateStartTimeModel; }; @@ -224,43 +216,33 @@ const Wt::WFormModel::Field DatabaseSettingsModel::UpdatePeriodField = "update- const Wt::WFormModel::Field DatabaseSettingsModel::UpdateStartTimeField = "update-start-time"; -DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) -: Wt::WTemplateFormView(parent) +DatabaseSettingsView::DatabaseSettingsView() +: Wt::WTemplateFormView(Wt::WString::tr("Lms.Admin.Database.template")) { - auto model = new DatabaseSettingsModel(this); - - setTemplateText(tr("Lms.Admin.Database.template")); - addFunction("tr", &WTemplate::Functions::tr); - addFunction("id", &WTemplate::Functions::id); + auto model = std::make_shared(); // Media Directory - Wt::WLineEdit *mediaDirectoryEdit = new Wt::WLineEdit(); - setFormWidget(DatabaseSettingsModel::MediaDirectoryField, mediaDirectoryEdit); + setFormWidget(DatabaseSettingsModel::MediaDirectoryField, std::make_unique()); // Update Period - Wt::WComboBox *updatePeriodCB = new Wt::WComboBox(); - setFormWidget(DatabaseSettingsModel::UpdatePeriodField, updatePeriodCB); - updatePeriodCB->setModel(model->updatePeriodModel()); + auto updatePeriod = std::make_unique(); + updatePeriod->setModel(model->updatePeriodModel()); + setFormWidget(DatabaseSettingsModel::UpdatePeriodField, std::move(updatePeriod)); // Update Start Time - Wt::WComboBox *updateStartTimeCB = new Wt::WComboBox(); - setFormWidget(DatabaseSettingsModel::UpdateStartTimeField, updateStartTimeCB); - updateStartTimeCB->setModel(model->updateStartTimeModel()); + auto updateStartTime = std::make_unique(); + updateStartTime->setModel(model->updateStartTimeModel()); + setFormWidget(DatabaseSettingsModel::UpdateStartTimeField, std::move(updateStartTime)); // Buttons - Wt::WPushButton *saveBtn = new Wt::WPushButton(Wt::WString::tr("Lms.apply")); - bindWidget("apply-btn", saveBtn); - - Wt::WPushButton *discardBtn = new Wt::WPushButton(Wt::WString::tr("Lms.discard")); - bindWidget("discard-btn", discardBtn); - - Wt::WPushButton *immScanBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Database.immediate-scan")); - bindWidget("immediate-scan-btn", immScanBtn); + Wt::WPushButton *saveBtn = bindWidget("apply-btn", std::make_unique(Wt::WString::tr("Lms.apply"))); + Wt::WPushButton *discardBtn = bindWidget("discard-btn", std::make_unique(Wt::WString::tr("Lms.discard"))); + Wt::WPushButton *immScanBtn = bindWidget("immediate-scan-btn", std::make_unique(Wt::WString::tr("Lms.Admin.Database.immediate-scan"))); saveBtn->clicked().connect(std::bind([=] () { - updateModel(model); + updateModel(model.get()); if (model->validate()) { @@ -271,14 +253,14 @@ DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) } // Udate the view: Delete any validation message in the view, etc. - updateView(model); + updateView(model.get()); })); discardBtn->clicked().connect(std::bind([=] () { model->loadData(); model->validate(); - updateView(model); + updateView(model.get()); })); immScanBtn->clicked().connect(std::bind([=] () @@ -287,7 +269,7 @@ DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) LmsApp->notifyMsg(Wt::WString::tr("Lms.Admin.Database.scan-launched")); })); - updateView(model); + updateView(model.get()); } } // namespace UserInterface diff --git a/src/ui/admin/DatabaseSettingsView.hpp b/src/ui/admin/DatabaseSettingsView.hpp index 2ae471db..99653c9f 100644 --- a/src/ui/admin/DatabaseSettingsView.hpp +++ b/src/ui/admin/DatabaseSettingsView.hpp @@ -19,15 +19,14 @@ #pragma once -#include -#include +#include namespace UserInterface { class DatabaseSettingsView : public Wt::WTemplateFormView { public: - DatabaseSettingsView(Wt::WContainerWidget *parent = 0); + DatabaseSettingsView(); }; diff --git a/src/ui/admin/InitWizardView.cpp b/src/ui/admin/InitWizardView.cpp index 79608064..f1b2d6d9 100644 --- a/src/ui/admin/InitWizardView.cpp +++ b/src/ui/admin/InitWizardView.cpp @@ -17,10 +17,10 @@ * along with LMS. If not, see . */ -#include -#include -#include -#include +#include +#include +#include +#include #include "utils/Logger.hpp" @@ -40,8 +40,7 @@ class InitWizardModel : public Wt::WFormModel static const Field PasswordField; static const Field PasswordConfirmField; - InitWizardModel(Wt::WObject *parent = 0) - : Wt::WFormModel(parent) + InitWizardModel() : Wt::WFormModel() { addField(AdminLoginField); addField(PasswordField); @@ -54,16 +53,16 @@ class InitWizardModel : public Wt::WFormModel void saveData() { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); // Check if a user already exist // If it's the case, just do nothing - if (!Database::User::getAll(DboSession()).empty()) + if (!Database::User::getAll(LmsApp->getDboSession()).empty()) throw std::runtime_error("Admin user already created"); // Create user - Wt::Auth::User authUser = DbHandler().getUserDatabase().registerNew(); - Database::User::pointer user = DbHandler().getUser(authUser); + Wt::Auth::User authUser = LmsApp->getDb().getUserDatabase().registerNew(); + Database::User::pointer user = LmsApp->getDb().createUser(authUser); // Account authUser.setIdentity(Wt::Auth::Identity::LoginName, valueText(AdminLoginField)); @@ -94,7 +93,7 @@ class InitWizardModel : public Wt::WFormModel } else if (field == PasswordConfirmField) { - if (validation(PasswordField).state() == Wt::WValidator::Valid) + if (validation(PasswordField).state() == Wt::ValidationState::Valid) { if (valueText(PasswordField) != valueText(PasswordConfirmField)) error = Wt::WString::tr("Lms.passwords-dont-match"); @@ -105,9 +104,9 @@ class InitWizardModel : public Wt::WFormModel return Wt::WFormModel::validateField(field); } - setValidation(field, Wt::WValidator::Result( error.empty() ? Wt::WValidator::Valid : Wt::WValidator::Invalid, error)); + setValidation(field, Wt::WValidator::Result( error.empty() ? Wt::ValidationState::Valid : Wt::ValidationState::Invalid, error)); - return (validation(field).state() == Wt::WValidator::Valid); + return (validation(field).state() == Wt::ValidationState::Valid); } }; @@ -116,34 +115,28 @@ const Wt::WFormModel::Field InitWizardModel::AdminLoginField = "admin-login"; const Wt::WFormModel::Field InitWizardModel::PasswordField = "password"; const Wt::WFormModel::Field InitWizardModel::PasswordConfirmField = "password-confirm"; -InitWizardView::InitWizardView(Wt::WContainerWidget *parent) -: Wt::WTemplateFormView(parent) +InitWizardView::InitWizardView() +: Wt::WTemplateFormView(Wt::WString::tr("Lms.Admin.InitWizard.template")) { - auto model = new InitWizardModel(this); - - setTemplateText(Wt::WString::tr("Lms.Admin.InitWizard.template")); - addFunction("tr", &WTemplate::Functions::tr); - addFunction("id", &WTemplate::Functions::id); + auto model = std::make_shared(); // AdminLogin - Wt::WLineEdit* accountEdit = new Wt::WLineEdit(); - setFormWidget(InitWizardModel::AdminLoginField, accountEdit); + setFormWidget(InitWizardModel::AdminLoginField, std::make_unique()); // Password - Wt::WLineEdit* passwordEdit = new Wt::WLineEdit(); - setFormWidget(InitWizardModel::PasswordField, passwordEdit ); - passwordEdit->setEchoMode(Wt::WLineEdit::Password); + auto passwordEdit = std::make_unique(); + passwordEdit->setEchoMode(Wt::EchoMode::Password); + setFormWidget(InitWizardModel::PasswordField, std::move(passwordEdit) ); // Password confirmation - Wt::WLineEdit* passwordConfirmEdit = new Wt::WLineEdit(); - setFormWidget(InitWizardModel::PasswordConfirmField, passwordConfirmEdit); - passwordConfirmEdit->setEchoMode(Wt::WLineEdit::Password); + auto passwordConfirmEdit = std::make_unique(); + passwordConfirmEdit->setEchoMode(Wt::EchoMode::Password); + setFormWidget(InitWizardModel::PasswordConfirmField, std::move(passwordConfirmEdit)); - auto saveButton = new Wt::WPushButton(Wt::WString::tr("Lms.create")); - bindWidget("create-btn", saveButton); + Wt::WPushButton* saveButton = bindNew("create-btn", Wt::WString::tr("Lms.create")); saveButton->clicked().connect(std::bind([=] { - updateModel(model); + updateModel(model.get()); if (model->validate()) { @@ -152,10 +145,10 @@ InitWizardView::InitWizardView(Wt::WContainerWidget *parent) saveButton->setEnabled(false); } - updateView(model); + updateView(model.get()); })); - updateView(model); + updateView(model.get()); } } // namespace UserInterface diff --git a/src/ui/admin/InitWizardView.hpp b/src/ui/admin/InitWizardView.hpp index d294fe58..260dd9bf 100644 --- a/src/ui/admin/InitWizardView.hpp +++ b/src/ui/admin/InitWizardView.hpp @@ -19,15 +19,14 @@ #pragma once -#include -#include +#include namespace UserInterface { class InitWizardView : public Wt::WTemplateFormView { public: - InitWizardView(Wt::WContainerWidget *parent = 0); + InitWizardView(); }; diff --git a/src/ui/admin/UserView.cpp b/src/ui/admin/UserView.cpp index e2d54c58..3975299d 100644 --- a/src/ui/admin/UserView.cpp +++ b/src/ui/admin/UserView.cpp @@ -17,15 +17,15 @@ * along with LMS. If not, see . */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include "common/Validators.hpp" #include "utils/Utils.hpp" @@ -44,8 +44,8 @@ class UserModel : public Wt::WFormModel static const Field PasswordField; static const Field BitrateLimitField; - UserModel(boost::optional userId, Wt::WObject *parent = 0) - : Wt::WFormModel(parent), + UserModel(boost::optional userId) + : Wt::WFormModel(), _userId(userId) { if (!_userId) @@ -72,12 +72,12 @@ class UserModel : public Wt::WFormModel if (!_userId) return; - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId( std::to_string(*_userId) ); - Database::User::pointer user = DbHandler().getUser(authUser); + Wt::Auth::User authUser = LmsApp->getDb().getUserDatabase().findWithId( std::to_string(*_userId) ); + Database::User::pointer user = LmsApp->getDb().getUser(authUser); - if (user == CurrentUser()) + if (user == LmsApp->getCurrentUser()) throw std::runtime_error("Cannot edit ourselves"); auto bitrate = getBitrateLimitRow(user->getMaxAudioBitrate()); @@ -87,13 +87,13 @@ class UserModel : public Wt::WFormModel void saveData() { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); if (_userId) { // Update user - Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId( std::to_string(*_userId) ); - Database::User::pointer user = DbHandler().getUser( authUser ); + Wt::Auth::User authUser = LmsApp->getDb().getUserDatabase().findWithId( std::to_string(*_userId) ); + Database::User::pointer user = LmsApp->getDb().getUser( authUser ); // Account if (!valueText(PasswordField).empty()) @@ -106,8 +106,8 @@ class UserModel : public Wt::WFormModel else { // Create user - Wt::Auth::User authUser = DbHandler().getUserDatabase().registerNew(); - Database::User::pointer user = DbHandler().createUser(authUser); + Wt::Auth::User authUser = LmsApp->getDb().getUserDatabase().registerNew(); + Database::User::pointer user = LmsApp->getDb().createUser(authUser); // Account authUser.setIdentity(Wt::Auth::Identity::LoginName, valueText(LoginField)); @@ -142,35 +142,35 @@ class UserModel : public Wt::WFormModel std::size_t bitrateLimit(int row) { - return boost::any_cast - (_bitrateModel->data(_bitrateModel->index(row, 0), Wt::UserRole)); + return Wt::cpp17::any_cast + (_bitrateModel->data(_bitrateModel->index(row, 0), Wt::ItemDataRole::User)); } Wt::WString bitrateLimitString(int row) { - return boost::any_cast - (_bitrateModel->data(_bitrateModel->index(row, 0), Wt::DisplayRole)); + return Wt::cpp17::any_cast + (_bitrateModel->data(_bitrateModel->index(row, 0), Wt::ItemDataRole::Display)); } - Wt::WAbstractItemModel *bitrateModel() { return _bitrateModel; } + std::shared_ptr bitrateModel() { return _bitrateModel; } private: void initializeModels() { - _bitrateModel = new Wt::WStringListModel(this); + _bitrateModel = std::make_shared(); std::size_t id = 0; for (auto bitrate : Database::User::audioBitrates) { _bitrateModel->addString( Wt::WString::fromUTF8(std::to_string(bitrate / 1000)) ); - _bitrateModel->setData( id++, 0, bitrate, Wt::UserRole); + _bitrateModel->setData( id++, 0, bitrate, Wt::ItemDataRole::User); } } - Wt::WStringListModel* _bitrateModel; + std::shared_ptr _bitrateModel; boost::optional _userId; }; @@ -178,8 +178,7 @@ const Wt::WFormModel::Field UserModel::LoginField = "login"; const Wt::WFormModel::Field UserModel::PasswordField = "password"; const Wt::WFormModel::Field UserModel::BitrateLimitField = "audio-bitrate-limit"; -UserView::UserView(Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent) +UserView::UserView() { wApp->internalPathChanged().connect(std::bind([=] { @@ -195,47 +194,44 @@ UserView::refreshView() if (!wApp->internalPathMatches("/admin/user")) return; - auto userId = readLong(wApp->internalPathNextPart("/admin/user/")); + auto userId = readAs(wApp->internalPathNextPart("/admin/user/")); + + LMS_LOG(UI, DEBUG) << "userId = " << (userId ? std::to_string(*userId) : "none"); clear(); - auto t = new Wt::WTemplateFormView(Wt::WString::tr("Lms.Admin.User.template"), this); + Wt::WTemplateFormView* t = addNew(Wt::WString::tr("Lms.Admin.User.template")); - t->addFunction("tr", &Wt::WTemplate::Functions::tr); - t->addFunction("id", &Wt::WTemplate::Functions::id); - - auto model = new UserModel(userId ? boost::make_optional(*userId) : boost::none, this); + auto model = std::make_shared(userId); if (userId) { - auto authUser = DbHandler().getUserDatabase().findWithId( std::to_string(*userId) ); + auto authUser = LmsApp->getDb().getUserDatabase().findWithId( std::to_string(*userId) ); auto name = authUser.identity(Wt::Auth::Identity::LoginName); - t->bindString("title", Wt::WString::tr("Lms.Admin.User.user-edit").arg(name), Wt::PlainText); + t->bindString("title", Wt::WString::tr("Lms.Admin.User.user-edit").arg(name), Wt::TextFormat::Plain); } else { // Login t->setCondition("if-has-login", true); - t->setFormWidget(UserModel::LoginField, new Wt::WLineEdit()); + t->setFormWidget(UserModel::LoginField, std::make_unique()); t->bindString("title", Wt::WString::tr("Lms.Admin.User.user-create")); } - // Password - Wt::WLineEdit* passwordEdit = new Wt::WLineEdit(); - t->setFormWidget(UserModel::PasswordField, passwordEdit ); - passwordEdit->setEchoMode(Wt::WLineEdit::Password); + auto passwordEdit = std::make_unique(); + passwordEdit->setEchoMode(Wt::EchoMode::Password); + t->setFormWidget(UserModel::PasswordField, std::move(passwordEdit)); - // AudioBitrate - Wt::WComboBox *bitrateCB = new Wt::WComboBox(); - t->setFormWidget(UserModel::BitrateLimitField, bitrateCB); - bitrateCB->setModel(model->bitrateModel()); + // Bitrate + auto bitrate = std::make_unique(); + bitrate->setModel(model->bitrateModel()); + t->setFormWidget(UserModel::BitrateLimitField, std::move(bitrate)); - auto saveBtn = new Wt::WPushButton(Wt::WString::tr(userId ? "Lms.save" : "Lms.create")); - t->bindWidget("save-btn", saveBtn); + Wt::WPushButton* saveBtn = t->bindNew("save-btn", Wt::WString::tr(userId ? "Lms.save" : "Lms.create")); saveBtn->clicked().connect(std::bind([=] { - t->updateModel(model); + t->updateModel(model.get()); if (model->validate()) { @@ -245,12 +241,11 @@ UserView::refreshView() } else { - t->updateView(model); + t->updateView(model.get()); } })); - t->updateView(model); - + t->updateView(model.get()); } } // namespace UserInterface diff --git a/src/ui/admin/UserView.hpp b/src/ui/admin/UserView.hpp index b081d745..a4950f13 100644 --- a/src/ui/admin/UserView.hpp +++ b/src/ui/admin/UserView.hpp @@ -19,14 +19,14 @@ #pragma once -#include +#include namespace UserInterface { class UserView : public Wt::WContainerWidget { public: - UserView(Wt::WContainerWidget *parent = 0); + UserView(); private: void refreshView(); diff --git a/src/ui/admin/UsersView.cpp b/src/ui/admin/UsersView.cpp index bdba16b5..97709a1f 100644 --- a/src/ui/admin/UsersView.cpp +++ b/src/ui/admin/UsersView.cpp @@ -17,8 +17,8 @@ * along with LMS. If not, see . */ -#include -#include +#include +#include #include "database/Types.hpp" #include "utils/Logger.hpp" @@ -28,18 +28,14 @@ namespace UserInterface { -UsersView::UsersView(Wt::WContainerWidget *parent) - : Wt::WContainerWidget(parent) +UsersView::UsersView() + : Wt::WTemplate(Wt::WString::tr("Lms.Admin.Users.template")) { - auto t = new Wt::WTemplate(Wt::WString::tr("Lms.Admin.Users.template"), this); - t->addFunction("tr", &Wt::WTemplate::Functions::tr); + addFunction("tr", &Wt::WTemplate::Functions::tr); - _container = new Wt::WContainerWidget(); - t->bindWidget("users", _container); - - auto addBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.add")); - t->bindWidget("add-btn", addBtn); + _container = bindNew("users"); + Wt::WPushButton* addBtn = bindNew("add-btn", Wt::WString::tr("Lms.Admin.Users.add")); addBtn->clicked().connect(std::bind([=] { LmsApp->setInternalPath("/admin/user", true); @@ -61,44 +57,41 @@ UsersView::refreshView() _container->clear(); - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto users = Database::User::getAll(DboSession()); + auto users = Database::User::getAll(LmsApp->getDboSession()); for (auto user : users) { auto userId = std::to_string(user.id()); - auto entry = new Wt::WTemplate(Wt::WString::tr("Lms.Admin.Users.template.entry"), _container); - - Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId(userId); + Wt::WTemplate* entry = _container->addNew(Wt::WString::tr("Lms.Admin.Users.template.entry")); + Wt::Auth::User authUser = LmsApp->getDb().getUserDatabase().findWithId(userId); if (!authUser.isValid()) { LMS_LOG(UI, ERROR) << "Skipping invalid userId = " << user.id(); continue; } - entry->bindString("name", authUser.identity(Wt::Auth::Identity::LoginName), Wt::PlainText); + entry->bindString("name", authUser.identity(Wt::Auth::Identity::LoginName), Wt::TextFormat::Plain); // Don't edit ourself this way - if (CurrentUser() == user) + if (LmsApp->getCurrentUser() == user) continue; entry->setCondition("if-edit", true); - auto editBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.edit")); - entry->bindWidget("edit-btn", editBtn); + Wt::WPushButton* editBtn = entry->bindNew("edit-btn", Wt::WString::tr("Lms.Admin.Users.edit")); editBtn->clicked().connect(std::bind([=] { LmsApp->setInternalPath("/admin/user/" + std::to_string(user.id()), true); })); - auto delBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.del")); - entry->bindWidget("del-btn", delBtn); + Wt::WPushButton* delBtn = entry->bindNew("del-btn", Wt::WString::tr("Lms.Admin.Users.del")); delBtn->clicked().connect(std::bind([=] { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto authUser = DbHandler().getUserDatabase().findWithId(userId); - auto user = DbHandler().getUser(authUser); - DbHandler().getUserDatabase().deleteUser( authUser ); + auto authUser = LmsApp->getDb().getUserDatabase().findWithId(userId); + auto user = LmsApp->getDb().getUser(authUser); + LmsApp->getDb().getUserDatabase().deleteUser( authUser ); user.remove(); _container->removeWidget(entry); })); diff --git a/src/ui/admin/UsersView.hpp b/src/ui/admin/UsersView.hpp index 45717f34..aba8fbca 100644 --- a/src/ui/admin/UsersView.hpp +++ b/src/ui/admin/UsersView.hpp @@ -19,14 +19,14 @@ #pragma once -#include +#include namespace UserInterface { -class UsersView : public Wt::WContainerWidget +class UsersView : public Wt::WTemplate { public: - UsersView(Wt::WContainerWidget *parent = 0); + UsersView(); private: void refreshView(); diff --git a/src/ui/common/InputRange.cpp b/src/ui/common/InputRange.cpp deleted file mode 100644 index cb1ce054..00000000 --- a/src/ui/common/InputRange.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include - -#if WT_VERSION < 0X03030500 -#include -#include -#endif - -#include "InputRange.hpp" - -#if WT_VERSION >= 0X03030500 -InputRange::InputRange(Wt::WContainerWidget *parent) -: Wt::WWebWidget(parent) -{ - setHtmlTagName("input"); - setAttributeValue("type", "range"); -} - -std::string -InputRange::jsRef(void) const -{ - return Wt::WWebWidget::jsRef(); -} - -#else -InputRange::InputRange(Wt::WContainerWidget *parent) -: Wt::WContainerWidget(parent) -{ - addWidget(new Wt::WTemplate("")); -} - -std::string -InputRange::jsRef(void) const -{ - return Wt::WWebWidget::jsRef() + ".getElementsByTagName(\"input\")[0]"; -} -#endif - diff --git a/src/ui/common/InputRange.hpp b/src/ui/common/InputRange.hpp deleted file mode 100644 index 9ccb8fa8..00000000 --- a/src/ui/common/InputRange.hpp +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#pragma once - -#include -#include - -#include -#if WT_VERSION >= 0X03030500 -class InputRange : public Wt::WWebWidget -{ - public: - InputRange(Wt::WContainerWidget *parent = 0); - Wt::DomElementType domElementType() const - { - return Wt::DomElement_INPUT; - } - - std::string jsRef() const; -}; - -#else - -class InputRange : public Wt::WContainerWidget -{ - public: - InputRange(Wt::WContainerWidget *parent = 0); - - std::string jsRef() const; -}; - -#endif - - diff --git a/src/ui/common/LineEdit.cpp b/src/ui/common/LineEdit.cpp deleted file mode 100644 index d5f21fda..00000000 --- a/src/ui/common/LineEdit.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include - -#include "LineEdit.hpp" - -namespace UserInterface { - - -LineEdit::LineEdit(std::size_t ms, Wt::WContainerWidget* parent) -: Wt::WLineEdit(parent) -{ - - Wt::WTimer *timer = new Wt::WTimer(this); - timer->setSingleShot(true); - timer->setInterval(ms); - - this->keyWentUp().connect(std::bind([=] (Wt::WKeyEvent keyEvent) - { - if (timer->isActive()) - timer->stop(); - - if (keyEvent.key() == Wt::Key_Enter) - _sigTimedChanged.emit(this->text()); - else - timer->start(); - }, std::placeholders::_1)); - - timer->timeout().connect(std::bind([=] () - { - _sigTimedChanged.emit(this->text()); - })); -} - - -} // namespace UserInterface - - diff --git a/src/ui/common/LineEdit.hpp b/src/ui/common/LineEdit.hpp deleted file mode 100644 index 9d27c43a..00000000 --- a/src/ui/common/LineEdit.hpp +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#ifndef UI_LINE_EDIT_HPP -#define UI_LINE_EDIT_HPP - -#include -#include -#include - -namespace UserInterface { - -class LineEdit : public Wt::WLineEdit -{ - public: - LineEdit(std::size_t ms, Wt::WContainerWidget* parent = 0); - - Wt::Signal& timedChanged() { return _sigTimedChanged; } - - private: - - Wt::Signal _sigTimedChanged; -}; - -} // namespace UserInterface - -#endif - diff --git a/src/ui/common/Validators.cpp b/src/ui/common/Validators.cpp index 39308989..72b7258e 100644 --- a/src/ui/common/Validators.cpp +++ b/src/ui/common/Validators.cpp @@ -19,28 +19,31 @@ #include +#include + #include "Validators.hpp" namespace UserInterface { -Wt::WValidator* createNameValidator() +std::shared_ptr +createNameValidator() { - Wt::WLengthValidator *v = new Wt::WLengthValidator(); + auto v = std::make_shared(); v->setMandatory(true); v->setMinimumLength(::Database::User::MinNameLength); v->setMaximumLength(::Database::User::MaxNameLength); return v; } -Wt::WValidator* createMandatoryValidator() +std::shared_ptr +createMandatoryValidator() { - auto v = new Wt::WValidator(); + auto v = std::make_shared(); v->setMandatory(true); return v; } -DirectoryValidator::DirectoryValidator(Wt::WObject *parent) -: Wt::WValidator(parent) +DirectoryValidator::DirectoryValidator() : Wt::WValidator() { } @@ -56,11 +59,11 @@ DirectoryValidator::validate(const Wt::WString& input) const // TODO check rights bool res = boost::filesystem::is_directory(p, ec); if (ec) - return Wt::WValidator::Result(Wt::WValidator::Invalid, ec.message()); // TODO translate common errors + return Wt::WValidator::Result(Wt::ValidationState::Invalid, ec.message()); // TODO translate common errors else if (res) - return Wt::WValidator::Result(Wt::WValidator::Valid); + return Wt::WValidator::Result(Wt::ValidationState::Valid); else - return Wt::WValidator::Result(Wt::WValidator::Invalid, Wt::WString::tr("Lms.not-a-directory")); + return Wt::WValidator::Result(Wt::ValidationState::Invalid, Wt::WString::tr("Lms.not-a-directory")); } diff --git a/src/ui/common/Validators.hpp b/src/ui/common/Validators.hpp index 45f5fd99..11f9d502 100644 --- a/src/ui/common/Validators.hpp +++ b/src/ui/common/Validators.hpp @@ -19,19 +19,19 @@ #pragma once -#include +#include #include "database/User.hpp" namespace UserInterface { -Wt::WValidator* createNameValidator(); -Wt::WValidator* createMandatoryValidator(); +std::shared_ptr createNameValidator(); +std::shared_ptr createMandatoryValidator(); class DirectoryValidator : public Wt::WValidator { public: - DirectoryValidator(Wt::WObject *parent = 0); + DirectoryValidator(); Wt::WValidator::Result validate(const Wt::WString& input) const override; diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index 96caffca..c11a66d0 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -17,11 +17,10 @@ * along with LMS. If not, see . */ -#include -#include -#include -#include -#include +#include +#include +#include +#include #include "database/Types.hpp" @@ -36,9 +35,8 @@ namespace UserInterface { -Artist::Artist(Filters* filters, Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent), - _filters(filters) +Artist::Artist(Filters* filters) +: _filters(filters) { wApp->internalPathChanged().connect(std::bind([=] { @@ -60,81 +58,73 @@ Artist::refresh() clear(); - Database::Artist::id_type artistId; - if (!readAs(wApp->internalPathNextPart("/artist/"), artistId)) + auto artistId = readAs(wApp->internalPathNextPart("/artist/")); + if (!artistId) return; - Wt::Dbo::Transaction transaction(DboSession()); - auto artist = Database::Artist::getById(DboSession(), artistId); - + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + auto artist = Database::Artist::getById(LmsApp->getDboSession(), *artistId); if (!artist) { LmsApp->goHome(); return; } - auto t = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artist.template"), this); + Wt::WTemplate* t = addNew(Wt::WString::tr("Lms.Explore.Artist.template")); t->addFunction("tr", &Wt::WTemplate::Functions::tr); - auto clusterContainers = new Wt::WContainerWidget(); - t->bindWidget("clusters", clusterContainers); + Wt::WContainerWidget* clusterContainers = t->bindNew("clusters"); { auto clusters = artist->getClusters(3); for (auto cluster : clusters) { - auto entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artist.template.cluster-entry"), clusterContainers); - - entry->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::PlainText); + Wt::WTemplate* entry = clusterContainers->addNew(Wt::WString::tr("Lms.Explore.Artist.template.cluster-entry")); + entry->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::TextFormat::Plain); } } - t->bindString("name", Wt::WString::fromUTF8(artist->getName()), Wt::PlainText); + t->bindString("name", Wt::WString::fromUTF8(artist->getName()), Wt::TextFormat::Plain); { - auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Artist.play"), Wt::XHTMLText); - t->bindWidget("play-btn", playBtn); + Wt::WText* playBtn = t->bindNew("play-btn", Wt::WString::tr("Lms.Explore.Artist.play"), Wt::TextFormat::XHTML); playBtn->clicked().connect(std::bind([=] { - artistPlay.emit(artistId); + artistPlay.emit(*artistId); })); } { - auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Artist.add"), Wt::XHTMLText); - t->bindWidget("add-btn", addBtn); + Wt::WText* addBtn = t->bindNew("add-btn", Wt::WString::tr("Lms.Explore.Artist.add"), Wt::TextFormat::XHTML); addBtn->clicked().connect(std::bind([=] { - artistAdd.emit(artistId); + artistAdd.emit(*artistId); })); } - auto releasesContainer = new Wt::WContainerWidget(); - t->bindWidget("releases", releasesContainer); + Wt::WContainerWidget* releasesContainer = t->bindNew("releases"); auto releases = artist->getReleases(_filters->getClusterIds()); for (auto release : releases) { auto releaseId = release.id(); - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artist.template.entry"), releasesContainer); + Wt::WTemplate* entry = releasesContainer->addNew(Wt::WString::tr("Lms.Explore.Artist.template.entry")); entry->addFunction("tr", Wt::WTemplate::Functions::tr); { - Wt::WAnchor* coverAnchor = LmsApplication::createReleaseAnchor(release, false); - Wt::WImage* cover = new Wt::WImage(coverAnchor); + Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); + + auto cover = std::make_unique(); cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); // Some images may not be square cover->setWidth(128); - entry->bindWidget("cover", coverAnchor); + anchor->setImage(std::move(cover)); } - { - Wt::WAnchor* releaseAnchor = LmsApplication::createReleaseAnchor(release); - entry->bindWidget("name", releaseAnchor); - } + entry->bindWidget("name", LmsApplication::createReleaseAnchor(release)); if (release->hasVariousArtists()) entry->setCondition("if-has-various-artists", true); @@ -153,15 +143,13 @@ Artist::refresh() } } - auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Artist.play"), Wt::XHTMLText); - entry->bindWidget("play-btn", playBtn); + Wt::WText* playBtn = entry->bindNew("play-btn", Wt::WString::tr("Lms.Explore.Artist.play"), Wt::TextFormat::XHTML); playBtn->clicked().connect(std::bind([=] { releasePlay.emit(releaseId); })); - auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Artist.add"), Wt::XHTMLText); - entry->bindWidget("add-btn", addBtn); + Wt::WText* addBtn = entry->bindNew("add-btn", Wt::WString::tr("Lms.Explore.Artist.add"), Wt::TextFormat::XHTML); addBtn->clicked().connect(std::bind([=] { releaseAdd.emit(releaseId); diff --git a/src/ui/explore/ArtistView.hpp b/src/ui/explore/ArtistView.hpp index b6f7d78e..b4bb329f 100644 --- a/src/ui/explore/ArtistView.hpp +++ b/src/ui/explore/ArtistView.hpp @@ -19,8 +19,8 @@ #pragma once -#include -#include +#include +#include namespace UserInterface { @@ -29,7 +29,7 @@ class Filters; class Artist : public Wt::WContainerWidget { public: - Artist(Filters* filters, Wt::WContainerWidget* parent = 0); + Artist(Filters* filters); Wt::Signal artistAdd; Wt::Signal artistPlay; diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index c6044b3d..45ccfce1 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -17,9 +17,9 @@ * along with LMS. If not, see . */ -#include -#include -#include +#include +#include +#include #include "database/Types.hpp" @@ -34,24 +34,20 @@ namespace UserInterface { using namespace Database; -Artists::Artists(Filters* filters, Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent), +Artists::Artists(Filters* filters) +: Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template")), _filters(filters) { - auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template"), this); - container->addFunction("tr", &Wt::WTemplate::Functions::tr); + addFunction("tr", &Wt::WTemplate::Functions::tr); - _search = new Wt::WLineEdit(); - container->bindWidget("search", _search); + _search = bindNew("search"); _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); _search->textInput().connect(this, &Artists::refresh); - _artistsContainer = new Wt::WContainerWidget(); - container->bindWidget("artists", _artistsContainer); + _artistsContainer = bindNew("artists"); - _showMore = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.show-more")); + _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.template.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); - container->bindWidget("show-more", _showMore); _showMore->clicked().connect(std::bind([=] { @@ -77,24 +73,20 @@ Artists::addSome() auto clusterIds = _filters->getClusterIds(); - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); bool moreResults; - auto artists = Artist::getByFilter(DboSession(), + auto artists = Artist::getByFilter(LmsApp->getDboSession(), clusterIds, searchKeywords, _artistsContainer->count(), 20, moreResults); for (auto artist : artists) { - auto entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template.entry"), _artistsContainer); + Wt::WTemplate* entry = _artistsContainer->addNew(Wt::WString::tr("Lms.Explore.Artists.template.entry")); entry->bindInt("nb-release", artist->getReleases(clusterIds).size()); - - { - Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(artist); - entry->bindWidget("name", artistAnchor); - } + entry->bindWidget("name", LmsApplication::createArtistAnchor(artist)); } _showMore->setHidden(!moreResults); diff --git a/src/ui/explore/ArtistsView.hpp b/src/ui/explore/ArtistsView.hpp index f51c8706..bfb643f6 100644 --- a/src/ui/explore/ArtistsView.hpp +++ b/src/ui/explore/ArtistsView.hpp @@ -19,18 +19,19 @@ #pragma once -#include -#include -#include +#include +#include +#include +#include namespace UserInterface { class Filters; -class Artists : public Wt::WContainerWidget +class Artists : public Wt::WTemplate { public: - Artists(Filters* filters, Wt::WContainerWidget* parent = 0); + Artists(Filters* filters); Wt::Signal artistAdd; Wt::Signal artistPlay; diff --git a/src/ui/explore/Explore.cpp b/src/ui/explore/Explore.cpp index 42be7b49..99da8f63 100644 --- a/src/ui/explore/Explore.cpp +++ b/src/ui/explore/Explore.cpp @@ -17,9 +17,9 @@ * along with LMS. If not, see . */ -#include -#include -#include +#include +#include +#include #include "utils/Logger.hpp" @@ -70,54 +70,44 @@ handlePathChange(Wt::WStackedWidget* stack) } } -Explore::Explore(Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent) +Explore::Explore() +: Wt::WTemplate(Wt::WString::tr("Lms.Explore.template")) { - auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template"), this); - - _filters = new Filters(); - container->bindWidget("filters", _filters); + _filters = bindNew("filters"); // Contents - Wt::WStackedWidget* stack = new Wt::WStackedWidget(); - container->bindWidget("contents", stack); - - auto artists = new Artists(_filters); - stack->addWidget(artists); + Wt::WStackedWidget* stack = bindNew("contents"); + auto artists = std::make_unique(_filters); artists->artistAdd.connect(this, &Explore::handleArtistAdd); artists->artistPlay.connect(this, &Explore::handleArtistPlay); + stack->addWidget(std::move(artists)); - auto artist = new Artist(_filters); - stack->addWidget(artist); - + auto artist = std::make_unique(_filters); artist->artistAdd.connect(this, &Explore::handleArtistAdd); artist->artistPlay.connect(this, &Explore::handleArtistPlay); artist->releaseAdd.connect(this, &Explore::handleReleaseAdd); artist->releasePlay.connect(this, &Explore::handleReleasePlay); + stack->addWidget(std::move(artist)); - auto releases = new Releases(_filters); - stack->addWidget(releases); - + auto releases = std::make_unique(_filters); releases->releaseAdd.connect(this, &Explore::handleReleaseAdd); releases->releasePlay.connect(this, &Explore::handleReleasePlay); + stack->addWidget(std::move(releases)); - auto release = new Release(_filters); - stack->addWidget(release); - + auto release = std::make_unique(_filters); release->releaseAdd.connect(this, &Explore::handleReleaseAdd); release->releasePlay.connect(this, &Explore::handleReleasePlay); release->trackAdd.connect(this, &Explore::handleTrackAdd); release->trackPlay.connect(this, &Explore::handleTrackPlay); + stack->addWidget(std::move(release)); - auto tracks = new Tracks(_filters); - stack->addWidget(tracks); - + auto tracks = std::make_unique(_filters); tracks->trackAdd.connect(this, &Explore::handleTrackAdd); tracks->trackPlay.connect(this, &Explore::handleTrackPlay); tracks->tracksAdd.connect(this, &Explore::handleTracksAdd); tracks->tracksPlay.connect(this, &Explore::handleTracksPlay); - + stack->addWidget(std::move(tracks)); wApp->internalPathChanged().connect(std::bind([=] { @@ -175,49 +165,49 @@ static std::vector getTrack(Wt::Dbo::Session& session, void Explore::handleArtistAdd(Database::id_type id) { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - tracksAdd.emit(getArtistTracks(DboSession(), id, _filters->getClusterIds())); + tracksAdd.emit(getArtistTracks(LmsApp->getDboSession(), id, _filters->getClusterIds())); } void Explore::handleArtistPlay(Database::id_type id) { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - tracksPlay.emit(getArtistTracks(DboSession(), id, _filters->getClusterIds())); + tracksPlay.emit(getArtistTracks(LmsApp->getDboSession(), id, _filters->getClusterIds())); } void Explore::handleReleaseAdd(Database::id_type id) { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - tracksAdd.emit(getReleaseTracks(DboSession(), id, _filters->getClusterIds())); + tracksAdd.emit(getReleaseTracks(LmsApp->getDboSession(), id, _filters->getClusterIds())); } void Explore::handleReleasePlay(Database::id_type id) { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - tracksPlay.emit(getReleaseTracks(DboSession(), id, _filters->getClusterIds())); + tracksPlay.emit(getReleaseTracks(LmsApp->getDboSession(), id, _filters->getClusterIds())); } void Explore::handleTrackAdd(Database::id_type id) { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - tracksAdd.emit(getTrack(DboSession(), id)); + tracksAdd.emit(getTrack(LmsApp->getDboSession(), id)); } void Explore::handleTrackPlay(Database::id_type id) { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - tracksPlay.emit(getTrack(DboSession(), id)); + tracksPlay.emit(getTrack(LmsApp->getDboSession(), id)); } void diff --git a/src/ui/explore/Explore.hpp b/src/ui/explore/Explore.hpp index 3c0dd136..75302f6e 100644 --- a/src/ui/explore/Explore.hpp +++ b/src/ui/explore/Explore.hpp @@ -19,7 +19,7 @@ #pragma once -#include +#include #include "database/Types.hpp" @@ -27,22 +27,22 @@ namespace UserInterface { class Filters; -class Explore : public Wt::WContainerWidget +class Explore : public Wt::WTemplate { public: - Explore(Wt::WContainerWidget *parent = 0); + Explore(); Wt::Signal> tracksAdd; Wt::Signal> tracksPlay; private: - void handleArtistAdd(Database::id_type id); - void handleArtistPlay(Database::id_type id); - void handleReleaseAdd(Database::id_type id); - void handleReleasePlay(Database::id_type id); - void handleTrackAdd(Database::id_type id); - void handleTrackPlay(Database::id_type id); + void handleArtistAdd(Database::Artist::id_type id); + void handleArtistPlay(Database::Artist::id_type id); + void handleReleaseAdd(Database::Release::id_type id); + void handleReleasePlay(Database::Release::id_type id); + void handleTrackAdd(Database::Track::id_type id); + void handleTrackPlay(Database::Track::id_type id); void handleTracksAdd(std::vector tracks); void handleTracksPlay(std::vector tracks); diff --git a/src/ui/explore/Filters.cpp b/src/ui/explore/Filters.cpp index 719e5444..59619d08 100644 --- a/src/ui/explore/Filters.cpp +++ b/src/ui/explore/Filters.cpp @@ -17,10 +17,10 @@ * along with LMS. If not, see . */ -#include -#include -#include -#include +#include +#include +#include +#include #include "Filters.hpp" @@ -31,32 +31,25 @@ namespace UserInterface { void Filters::showDialog() { - auto dialog = new Wt::WDialog(Wt::WString::tr("Lms.Explore.add-filter")); + auto dialog = std::make_shared(Wt::WString::tr("Lms.Explore.add-filter")); - auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.add-filter")); + Wt::WTemplate* container = dialog->contents()->addNew(Wt::WString::tr("Lms.Explore.template.add-filter")); container->addFunction("tr", &Wt::WTemplate::Functions::tr); - dialog->contents()->addWidget(container); + Wt::WComboBox* typeCombo = container->bindNew("type"); + Wt::WComboBox* valueCombo = container->bindNew("value"); - auto typeCombo = new Wt::WComboBox(); - container->bindWidget("type", typeCombo); + Wt::WPushButton* addBtn = container->bindNew("add-btn", Wt::WString::tr("Lms.add")); + addBtn->clicked().connect(dialog.get(), &Wt::WDialog::accept); - auto valueCombo = new Wt::WComboBox(); - container->bindWidget("value", valueCombo); - - auto addBtn = new Wt::WPushButton(Wt::WString::tr("Lms.add")); - container->bindWidget("add-btn", addBtn); - addBtn->clicked().connect(dialog, &Wt::WDialog::accept); - - auto cancelBtn = new Wt::WPushButton(Wt::WString::tr("Lms.cancel")); - container->bindWidget("cancel-btn", cancelBtn); - cancelBtn->clicked().connect(dialog, &Wt::WDialog::reject); + Wt::WPushButton* cancelBtn = container->bindNew("cancel-btn", Wt::WString::tr("Lms.cancel")); + cancelBtn->clicked().connect(dialog.get(), &Wt::WDialog::reject); // Populate data { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto types = Database::ClusterType::getAll(DboSession()); + auto types = Database::ClusterType::getAll(LmsApp->getDboSession()); for (auto type : types) typeCombo->addItem(Wt::WString::fromUTF8(type->getName())); @@ -81,9 +74,9 @@ Filters::showDialog() valueCombo->clear(); - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto clusterType = Database::ClusterType::getByName(DboSession(), name); + auto clusterType = Database::ClusterType::getByName(LmsApp->getDboSession(), name); auto values = clusterType->getClusters(); for (auto value : values) @@ -94,24 +87,22 @@ Filters::showDialog() })); dialog->setModal(true); -#if WT_VERSION >= 0x03030700 dialog->setMovable(false); -#endif dialog->setResizable(false); dialog->setClosable(false); dialog->finished().connect(std::bind([=] { - if (dialog->result() != Wt::WDialog::Accepted) + if (dialog->result() != Wt::DialogCode::Accepted) return; auto type = typeCombo->valueText().toUTF8(); auto value = valueCombo->valueText().toUTF8(); - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto clusterType = Database::ClusterType::getByName(DboSession(), type); + auto clusterType = Database::ClusterType::getByName(LmsApp->getDboSession(), type); if (!clusterType) return; @@ -123,8 +114,7 @@ Filters::showDialog() _filterIds.insert(clusterId); _sigUpdated.emit(); - auto filterBtn = new Wt::WPushButton(Wt::WString::fromUTF8(value)); - _filters->addWidget(filterBtn); + Wt::WPushButton* filterBtn = _filters->addNew(Wt::WString::fromUTF8(value), Wt::TextFormat::Plain); filterBtn->clicked().connect(std::bind([=] { @@ -137,23 +127,14 @@ Filters::showDialog() dialog->show(); } -Filters::Filters(Wt::WContainerWidget *parent) -: Wt::WContainerWidget(parent) +Filters::Filters() +: Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.filters")) { - auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.filters"), this); - // Filters - Wt::WPushButton *addFilterBtn = new Wt::WPushButton(Wt::WText::tr("Lms.Explore.add-filter")); - container->bindWidget("add-filter", addFilterBtn); - - _filters = new Wt::WContainerWidget(); - container->bindWidget("filters", _filters); - - addFilterBtn->clicked().connect(std::bind([this] - { - showDialog(); - })); + Wt::WPushButton *addFilterBtn = bindNew("add-filter", Wt::WText::tr("Lms.Explore.add-filter")); + addFilterBtn->clicked().connect(this, &Filters::showDialog); + _filters = bindNew("filters"); } diff --git a/src/ui/explore/Filters.hpp b/src/ui/explore/Filters.hpp index d0753915..aa3d30ce 100644 --- a/src/ui/explore/Filters.hpp +++ b/src/ui/explore/Filters.hpp @@ -19,8 +19,9 @@ #pragma once -#include -#include +#include +#include +#include #include "database/Types.hpp" @@ -28,21 +29,21 @@ namespace UserInterface { -class Filters : public Wt::WContainerWidget +class Filters : public Wt::WTemplate { public: - Filters(Wt::WContainerWidget *parent = 0); + Filters(); std::set getClusterIds() const { return _filterIds; } - Wt::Signal& updated() { return _sigUpdated; } + Wt::Signal<>& updated() { return _sigUpdated; } private: void showDialog(); Wt::WContainerWidget *_filters; - Wt::Signal _sigUpdated; + Wt::Signal<> _sigUpdated; std::set _filterIds; }; diff --git a/src/ui/explore/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp index 602f1d6f..809e8998 100644 --- a/src/ui/explore/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -17,11 +17,11 @@ * along with LMS. If not, see . */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "database/Types.hpp" @@ -36,9 +36,8 @@ namespace UserInterface { -Release::Release(Filters* filters, Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent), - _filters(filters) +Release::Release(Filters* filters) +: _filters(filters) { wApp->internalPathChanged().connect(std::bind([=] { @@ -60,24 +59,23 @@ Release::refresh() clear(); - Database::Release::id_type releaseId; - - if (!readAs(wApp->internalPathNextPart("/release/"), releaseId)) + auto releaseId = readAs(wApp->internalPathNextPart("/release/")); + if (!releaseId) return; - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto release = Database::Release::getById(DboSession(), releaseId); + auto release = Database::Release::getById(LmsApp->getDboSession(), *releaseId); if (!release) { LmsApp->goHome(); return; } - auto t = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Release.template"), this); + Wt::WTemplate* t = addNew(Wt::WString::tr("Lms.Explore.Release.template")); t->addFunction("tr", &Wt::WTemplate::Functions::tr); - t->bindString("name", Wt::WString::fromUTF8(release->getName()), Wt::PlainText); + t->bindString("name", Wt::WString::fromUTF8(release->getName()), Wt::TextFormat::Plain); boost::optional year = release->getReleaseYear(); if (year) @@ -103,49 +101,40 @@ Release::refresh() else if (artists.size() == 1) { t->setCondition("if-has-artist", true); - Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(artists.front()); - t->bindWidget("artist-name", artistAnchor); + t->bindWidget("artist-name", LmsApplication::createArtistAnchor(artists.front())); } } - Wt::WImage *cover = new Wt::WImage(); - cover->setImageLink(Wt::WLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 512))); - t->bindWidget("cover", cover); - - auto clusterContainers = new Wt::WContainerWidget(); - t->bindWidget("clusters", clusterContainers); + t->bindNew("cover", Wt::WLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 512))); + Wt::WContainerWidget* clusterContainers = t->bindNew("clusters"); { auto clusters = release->getClusters(3); for (auto cluster : clusters) { - auto entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Release.template.cluster-entry"), clusterContainers); - - entry->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::PlainText); + Wt::WTemplate* entry = clusterContainers->addNew(Wt::WString::tr("Lms.Explore.Release.template.cluster-entry")); + entry->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::TextFormat::Plain); } } { - auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Release.play"), Wt::XHTMLText); - t->bindWidget("play-btn", playBtn); + Wt::WText* playBtn = t->bindNew("play-btn", Wt::WString::tr("Lms.Explore.Release.play"), Wt::TextFormat::XHTML); playBtn->clicked().connect(std::bind([=] { - releasePlay.emit(releaseId); + releasePlay.emit(*releaseId); })); } { - auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Release.add"), Wt::XHTMLText); - t->bindWidget("add-btn", addBtn); + Wt::WText* addBtn = t->bindNew("add-btn", Wt::WString::tr("Lms.Explore.Release.add"), Wt::TextFormat::XHTML); addBtn->clicked().connect(std::bind([=] { - releaseAdd.emit(releaseId); + releaseAdd.emit(*releaseId); })); } - auto tracksContainer = new Wt::WContainerWidget(); - t->bindWidget("tracks", tracksContainer); + Wt::WContainerWidget* tracksContainer = t->bindNew("tracks"); auto clusterIds = _filters->getClusterIds(); auto tracks = release->getTracks(clusterIds); @@ -156,15 +145,13 @@ Release::refresh() { auto trackId = track.id(); - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Release.template.entry"), tracksContainer); - - entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); + Wt::WTemplate* entry = tracksContainer->addNew(Wt::WString::tr("Lms.Explore.Release.template.entry")); + entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain); if (variousArtists && track->getArtist()) { entry->setCondition("if-has-artist", true); - Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(track->getArtist()); - entry->bindWidget("artist-name", artistAnchor); + entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(track->getArtist())); } auto trackNumber = track->getTrackNumber(); @@ -182,15 +169,13 @@ Release::refresh() entry->bindInt("disc-number", *discNumber); } - auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Release.play"), Wt::XHTMLText); - entry->bindWidget("play-btn", playBtn); + Wt::WText* playBtn = entry->bindNew("play-btn", Wt::WString::tr("Lms.Explore.Release.play"), Wt::TextFormat::XHTML); playBtn->clicked().connect(std::bind([=] { trackPlay.emit(trackId); })); - auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Release.add"), Wt::XHTMLText); - entry->bindWidget("add-btn", addBtn); + Wt::WText* addBtn = entry->bindNew("add-btn", Wt::WString::tr("Lms.Explore.Release.add"), Wt::TextFormat::XHTML); addBtn->clicked().connect(std::bind([=] { trackAdd.emit(trackId); diff --git a/src/ui/explore/ReleaseView.hpp b/src/ui/explore/ReleaseView.hpp index a11be0c2..12bde073 100644 --- a/src/ui/explore/ReleaseView.hpp +++ b/src/ui/explore/ReleaseView.hpp @@ -19,7 +19,7 @@ #pragma once -#include +#include namespace UserInterface { @@ -27,7 +27,7 @@ class Filters; class Release : public Wt::WContainerWidget { public: - Release(Filters* filters, Wt::WContainerWidget* parent = 0); + Release(Filters* filters); Wt::Signal releaseAdd; Wt::Signal releasePlay; diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index 5fcf654f..7151f6d3 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -17,11 +17,11 @@ * along with LMS. If not, see . */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "database/Types.hpp" @@ -38,25 +38,20 @@ namespace UserInterface { using namespace Database; -Releases::Releases(Filters* filters, Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent), - _filters(filters) +Releases::Releases(Filters* filters) +: Wt::WTemplate(Wt::WString::tr("Lms.Explore.Releases.template")), +_filters(filters) { - auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Releases.template"), this); - container->addFunction("tr", &Wt::WTemplate::Functions::tr); + addFunction("tr", &Wt::WTemplate::Functions::tr); - _search = new Wt::WLineEdit(); - container->bindWidget("search", _search); + _search = bindNew("search"); _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); _search->textInput().connect(this, &Releases::refresh); - _releasesContainer = new Wt::WContainerWidget(); - container->bindWidget("releases", _releasesContainer); + _releasesContainer = bindNew("releases"); - _showMore = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.show-more")); + _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); - container->bindWidget("show-more", _showMore); - _showMore->clicked().connect(std::bind([=] { addSome(); @@ -81,29 +76,24 @@ Releases::addSome() auto clusterIds = _filters->getClusterIds(); - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); bool moreResults; - auto releases = Release::getByFilter(DboSession(), clusterIds, searchKeywords, _releasesContainer->count(), 20, moreResults); + auto releases = Release::getByFilter(LmsApp->getDboSession(), clusterIds, searchKeywords, _releasesContainer->count(), 20, moreResults); for (auto release : releases) { auto releaseId = release.id(); - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Releases.template.entry"), _releasesContainer); + Wt::WTemplate* entry = _releasesContainer->addNew(Wt::WString::tr("Lms.Explore.Releases.template.entry")); entry->addFunction("tr", Wt::WTemplate::Functions::tr); - Wt::WAnchor* coverAnchor = LmsApplication::createReleaseAnchor(release, false); - Wt::WImage* cover = new Wt::WImage(coverAnchor); - cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(releaseId, 128)); - // Some images may not be square - cover->setWidth(128); - entry->bindWidget("cover", coverAnchor); + Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); + auto cover = std::make_unique(); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); + anchor->setImage(std::move(cover)); - { - Wt::WAnchor* releaseAnchor = LmsApplication::createReleaseAnchor(release); - entry->bindWidget("release-name", releaseAnchor); - } + entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(release)); auto artists = release->getArtists(); if (artists.size() > 1) @@ -114,19 +104,16 @@ Releases::addSome() else if (artists.size() == 1) { entry->setCondition("if-has-artist", true); - Wt::WAnchor* artistAnchor = LmsApplication::createArtistAnchor(artists.front()); - entry->bindWidget("artist-name", artistAnchor); + entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(artists.front())); } - auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Releases.play"), Wt::XHTMLText); - entry->bindWidget("play-btn", playBtn); + Wt::WText* playBtn = entry->bindNew("play-btn", Wt::WString::tr("Lms.Explore.Releases.play"), Wt::TextFormat::XHTML); playBtn->clicked().connect(std::bind([=] { releasePlay.emit(releaseId); })); - auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Releases.add"), Wt::XHTMLText); - entry->bindWidget("add-btn", addBtn); + Wt::WText* addBtn = entry->bindNew("add-btn", Wt::WString::tr("Lms.Explore.Releases.add"), Wt::TextFormat::XHTML); addBtn->clicked().connect(std::bind([=] { releaseAdd.emit(releaseId); diff --git a/src/ui/explore/ReleasesView.hpp b/src/ui/explore/ReleasesView.hpp index 6626656b..9797da51 100644 --- a/src/ui/explore/ReleasesView.hpp +++ b/src/ui/explore/ReleasesView.hpp @@ -19,18 +19,19 @@ #pragma once -#include -#include -#include +#include +#include +#include +#include namespace UserInterface { class Filters; -class Releases : public Wt::WContainerWidget +class Releases : public Wt::WTemplate { public: - Releases(Filters* filters, Wt::WContainerWidget* parent = 0); + Releases(Filters* filters); Wt::Signal releaseAdd; Wt::Signal releasePlay; diff --git a/src/ui/explore/TracksView.cpp b/src/ui/explore/TracksView.cpp index a646c1bb..19544136 100644 --- a/src/ui/explore/TracksView.cpp +++ b/src/ui/explore/TracksView.cpp @@ -17,10 +17,10 @@ * along with LMS. If not, see . */ -#include -#include -#include -#include +#include +#include +#include +#include #include "database/Types.hpp" @@ -37,41 +37,34 @@ namespace UserInterface { using namespace Database; -Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) -: Wt::WContainerWidget(parent), - _filters(filters) +Tracks::Tracks(Filters* filters) +: Wt::WTemplate(Wt::WString::tr("Lms.Explore.Tracks.template")), +_filters(filters) { - auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Tracks.template"), this); - container->addFunction("tr", &Wt::WTemplate::Functions::tr); + addFunction("tr", &Wt::WTemplate::Functions::tr); - _search = new Wt::WLineEdit(); - container->bindWidget("search", _search); + _search = bindNew("search"); _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); _search->textInput().connect(this, &Tracks::refresh); - auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Tracks.play"), Wt::XHTMLText); - container->bindWidget("play-btn", playBtn); + Wt::WText* playBtn = bindNew("play-btn", Wt::WString::tr("Lms.Explore.Tracks.play"), Wt::TextFormat::XHTML); playBtn->clicked().connect(std::bind([=] { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); tracksPlay.emit(getTracks()); })); - auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Tracks.add"), Wt::XHTMLText); - container->bindWidget("add-btn", addBtn); + Wt::WText* addBtn = bindNew("add-btn", Wt::WString::tr("Lms.Explore.Tracks.add"), Wt::TextFormat::XHTML); addBtn->clicked().connect(std::bind([=] { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); tracksAdd.emit(getTracks()); })); - _tracksContainer = new Wt::WContainerWidget(); - container->bindWidget("tracks", _tracksContainer); + _tracksContainer = bindNew("tracks"); - _showMore = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.show-more")); + _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.template.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); - container->bindWidget("show-more", _showMore); - _showMore->clicked().connect(std::bind([=] { addSome(); @@ -88,9 +81,9 @@ Tracks::getTracks(int offset, int size, bool& moreResults) auto searchKeywords = splitString(_search->text().toUTF8(), " "); auto clusterIds = _filters->getClusterIds(); - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - return Track::getByFilter(DboSession(), clusterIds, searchKeywords, offset, size, moreResults); + return Track::getByFilter(LmsApp->getDboSession(), clusterIds, searchKeywords, offset, size, moreResults); } std::vector @@ -110,7 +103,7 @@ Tracks::refresh() void Tracks::addSome() { - Wt::Dbo::Transaction transaction(DboSession()); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); bool moreResults; auto tracks = getTracks(_tracksContainer->count(), 20, moreResults); @@ -118,41 +111,35 @@ Tracks::addSome() for (auto track : tracks) { auto trackId = track.id(); - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Tracks.template.entry"), _tracksContainer); + Wt::WTemplate* entry = _tracksContainer->addNew(Wt::WString::tr("Lms.Explore.Tracks.template.entry")); - entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); + entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain); auto artist = track->getArtist(); if (artist) { entry->setCondition("if-has-artist", true); - Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(track->getArtist()); - entry->bindWidget("artist-name", artistAnchor); + entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(track->getArtist())); } auto release = track->getRelease(); if (release) { entry->setCondition("if-has-release", true); - Wt::WAnchor *releaseAnchor = LmsApplication::createReleaseAnchor(track->getRelease()); - entry->bindWidget("release-name", releaseAnchor); + entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(track->getRelease())); } - Wt::WImage *cover = new Wt::WImage(); - cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(track.id(), 64)); + Wt::WImage* cover = entry->bindNew("cover", LmsApp->getImageResource()->getTrackUrl(track.id(), 64)); // Some images may not be square cover->setWidth(64); - entry->bindWidget("cover", cover); - auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Tracks.play"), Wt::XHTMLText); - entry->bindWidget("play-btn", playBtn); + Wt::WText* playBtn = entry->bindNew("play-btn", Wt::WString::tr("Lms.Explore.Tracks.play"), Wt::TextFormat::XHTML); playBtn->clicked().connect(std::bind([=] { trackPlay.emit(trackId); })); - auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Tracks.add"), Wt::XHTMLText); - entry->bindWidget("add-btn", addBtn); + Wt::WText* addBtn = entry->bindNew("add-btn", Wt::WString::tr("Lms.Explore.Tracks.add"), Wt::TextFormat::XHTML); addBtn->clicked().connect(std::bind([=] { trackAdd.emit(trackId); diff --git a/src/ui/explore/TracksView.hpp b/src/ui/explore/TracksView.hpp index 9b7e1c5c..2b46be07 100644 --- a/src/ui/explore/TracksView.hpp +++ b/src/ui/explore/TracksView.hpp @@ -19,17 +19,17 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace UserInterface { class Filters; -class Tracks : public Wt::WContainerWidget +class Tracks : public Wt::WTemplate { public: - Tracks(Filters* filters, Wt::WContainerWidget* parent = 0); + Tracks(Filters* filters); Wt::Signal trackAdd; Wt::Signal trackPlay; diff --git a/src/ui/resource/ImageResource.cpp b/src/ui/resource/ImageResource.cpp index 9b56846a..b64b0529 100644 --- a/src/ui/resource/ImageResource.cpp +++ b/src/ui/resource/ImageResource.cpp @@ -17,8 +17,8 @@ * along with LMS. If not, see . */ -#include -#include +#include +#include #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -34,9 +34,8 @@ namespace UserInterface { static const std::string unknownCoverPath = "/images/unknown-cover.jpg"; static const std::string unknownArtistImagePath = "/images/unknown-artist.jpg"; -ImageResource::ImageResource(Database::Handler& db, Wt::WObject *parent) -: Wt::WResource(parent), -_db(db) +ImageResource::ImageResource(Database::Handler& db) +: _db(db) { } @@ -154,14 +153,14 @@ ImageResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons if (!sizeStr) return; - std::size_t size; - if (!readAs(*sizeStr, size) || size > maxSize) + auto size = readAs(*sizeStr); + if (!size || *size > maxSize) return; if (trackIdStr) { - Database::Track::id_type trackId; - if (!readAs(*trackIdStr, trackId)) + auto trackId = readAs(*trackIdStr); + if (!trackId) return; boost::filesystem::path path; @@ -172,7 +171,7 @@ ImageResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons Wt::Dbo::Transaction transaction(_db.getSession()); - Database::Track::pointer track = Database::Track::getById(_db.getSession(), trackId); + Database::Track::pointer track = Database::Track::getById(_db.getSession(), *trackId); if (track) { coverType = track->getCoverType(); @@ -195,17 +194,16 @@ ImageResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons break; } - putCover(response, covers, size); + putCover(response, covers, *size); return; } - putImage(response, getDefaultCover(size)); - return; + putImage(response, getDefaultCover(*size)); } else if (releaseIdStr) { - Database::Release::id_type releaseId; - if (!readAs(*releaseIdStr, releaseId)) + auto releaseId = readAs(*releaseIdStr); + if (!releaseId) return; std::vector covers; @@ -213,21 +211,18 @@ ImageResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons // transactions are not thread safe { Wt::WApplication::UpdateLock lock(LmsApplication::instance()); - covers = CoverArt::Grabber::instance().getFromRelease(_db.getSession(), releaseId); + covers = CoverArt::Grabber::instance().getFromRelease(_db.getSession(), *releaseId); } - putCover(response, covers, size); - return; + putCover(response, covers, *size); } else if (artistIdStr) { - putImage(response, getDefaultArtistImage(size)); - return; + putImage(response, getDefaultArtistImage(*size)); } else { - putImage(response, getDefaultCover(size)); - return; + putImage(response, getDefaultCover(*size)); } } diff --git a/src/ui/resource/ImageResource.hpp b/src/ui/resource/ImageResource.hpp index 187d4dd2..3629b468 100644 --- a/src/ui/resource/ImageResource.hpp +++ b/src/ui/resource/ImageResource.hpp @@ -22,7 +22,7 @@ #include -#include +#include #include "database/DatabaseHandler.hpp" #include "image/Image.hpp" @@ -35,7 +35,7 @@ class ImageResource : public Wt::WResource public: static const std::size_t maxSize = 512; - ImageResource(Database::Handler& db, Wt::WObject *parent = 0); + ImageResource(Database::Handler& db); ~ImageResource(); std::string getReleaseUrl(Database::Release::id_type releaseId, size_t size) const; diff --git a/src/ui/resource/TranscodeResource.cpp b/src/ui/resource/TranscodeResource.cpp index 6d9203f9..f1b0755d 100644 --- a/src/ui/resource/TranscodeResource.cpp +++ b/src/ui/resource/TranscodeResource.cpp @@ -17,7 +17,7 @@ * along with LMS. If not, see . */ -#include +#include #include "utils/Logger.hpp" @@ -27,9 +27,8 @@ namespace UserInterface { -TranscodeResource::TranscodeResource(Database::Handler& db, Wt::WObject *parent) -: Wt::WResource(parent), -_db(db) +TranscodeResource::TranscodeResource(Database::Handler& db) +: _db(db) { LMS_LOG(UI, DEBUG) << "CONSTRUCTING RESOURCE"; } diff --git a/src/ui/resource/TranscodeResource.hpp b/src/ui/resource/TranscodeResource.hpp index 51f8ecc8..02847e53 100644 --- a/src/ui/resource/TranscodeResource.hpp +++ b/src/ui/resource/TranscodeResource.hpp @@ -21,7 +21,7 @@ #include -#include +#include #include "av/AvTranscoder.hpp" @@ -32,7 +32,7 @@ namespace UserInterface { class TranscodeResource : public Wt::WResource { public: - TranscodeResource(Database::Handler& db, Wt::WObject *parent); + TranscodeResource(Database::Handler& db); ~TranscodeResource(); std::string getUrl(Database::Track::id_type trackId, Av::Encoding encoding, boost::posix_time::time_duration offset) const; diff --git a/src/utils/Logger.hpp b/src/utils/Logger.hpp index b44a7d64..dc2dd11f 100644 --- a/src/utils/Logger.hpp +++ b/src/utils/Logger.hpp @@ -19,12 +19,10 @@ #pragma once -#include -#include -#include - #include +#include +#include enum class Severity { diff --git a/src/utils/Path.cpp b/src/utils/Path.cpp index dfc49ba4..8f6a6ede 100644 --- a/src/utils/Path.cpp +++ b/src/utils/Path.cpp @@ -73,7 +73,7 @@ void computeCrc(const boost::filesystem::path& p, std::vector& cr } else { - LMS_LOG(DBUPDATER, ERROR) << "Failed to open file '" << p << "'"; + LMS_LOG(DBUPDATER, ERROR) << "Failed to open file '" << p.string() << "'"; throw std::runtime_error("Failed to open file '" + p.string() + "'" ); } diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp index 67117b20..f65287b5 100644 --- a/src/utils/Utils.cpp +++ b/src/utils/Utils.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -26,42 +27,28 @@ #include "Utils.hpp" - -boost::optional -readLong(const std::string& str) +template<> +boost::optional readAs(const std::string& str) { - try - { - return std::stol(str); - } - catch (std::exception& e) - { - return boost::none; - } -} - -bool readAsPosixTime(const std::string& str, boost::posix_time::ptime& time) -{ - const std::locale formats[] = { - std::locale(std::locale::classic(), new boost::posix_time::time_input_facet("%Y-%m-%d")), - std::locale(std::locale::classic(), new boost::posix_time::time_input_facet("%Y-%b-%d")), - std::locale(std::locale::classic(), new boost::posix_time::time_input_facet("%Y-%B-%d")), - std::locale(std::locale::classic(), new boost::posix_time::time_input_facet("%Y/%m/%d")), - std::locale(std::locale::classic(), new boost::posix_time::time_input_facet("%d.%m.%Y")), - std::locale(std::locale::classic(), new boost::posix_time::time_input_facet("%Y-%m")), - std::locale(std::locale::classic(), new boost::posix_time::time_input_facet("%Y/%m")), - std::locale(std::locale::classic(), new boost::posix_time::time_input_facet("%Y.%m")), - std::locale(std::locale::classic(), new boost::posix_time::time_input_facet("%Y")), + const std::vector formats = { + "yyyy-MM-dd", + "yyyy/MM/dd", + "yyyy-MM", + "yyyy/MM", + "yyyy" }; - for(size_t i=0; i < sizeof(formats)/sizeof(formats[0]); ++i) + + for (auto format : formats) { - std::istringstream iss(str); - iss.imbue(formats[i]); - if (iss >> time) - return true; + auto date = Wt::WDate::fromString(str, format); + + if (!date.isValid()) + continue; + + return date; } - return false; + return boost::none; } bool readList(const std::string& str, const std::string& separators, std::list& results) @@ -72,7 +59,7 @@ bool readList(const std::string& str, const std::string& separators, std::list(str, "UTF-8"); -} - std::string bufferToString(const std::vector& data) { diff --git a/src/utils/Utils.hpp b/src/utils/Utils.hpp index 905297c4..61674756 100644 --- a/src/utils/Utils.hpp +++ b/src/utils/Utils.hpp @@ -19,26 +19,21 @@ #pragma once -#include -#include +#include #include +#include +#include +#include -#include #include -#include - -boost::optional -readLong(const std::string& str); - -bool -readAsPosixTime(const std::string& str, boost::posix_time::ptime& time); +#include bool readList(const std::string& str, const std::string& separators, std::list& results); -std::string -durationToString(boost::posix_time::time_duration duration, std::string format); +//std::string +//durationToString(boost::posix_time::time_duration duration, std::string format); std::vector splitString(std::string string, std::string separators); @@ -49,17 +44,23 @@ stringTrim(const std::string& str, const std::string& whitespaces = " \t"); std::string stringTrimEnd(const std::string& str, const std::string& whitespaces = " \t"); -std::string -stringToUTF8(const std::string& str); - std::string bufferToString(const std::vector& data); template -static inline bool readAs(const std::string& str, T& data) +boost::optional readAs(const std::string& str) { + T res; + std::istringstream iss ( str ); - iss >> data; - return !iss.fail(); + iss >> res; + if (iss.fail()) + return boost::none; + + return res; } +template<> +boost::optional readAs(const std::string& str); + + diff --git a/test/TestAvMetadata.cpp b/test/TestAvMetadata.cpp index c91d0ea3..8109a82e 100644 --- a/test/TestAvMetadata.cpp +++ b/test/TestAvMetadata.cpp @@ -1,11 +1,11 @@ #include - -#include -#include +#include #include #include +#include + #include "av/AvInfo.hpp" #include "metadata/AvFormat.hpp" #include "metadata/TagLibParser.hpp" @@ -67,7 +67,7 @@ int main(int argc, char *argv[]) break; case MetaData::Type::Duration: - std::cout << "Duration: " << boost::posix_time::to_simple_string(boost::any_cast(item.second)) << std::endl; + std::cout << "Duration: " << boost::any_cast(item.second).count() / 1000 << "s" << std::endl; break; case MetaData::Type::TrackNumber: @@ -87,11 +87,11 @@ int main(int argc, char *argv[]) break; case MetaData::Type::Date: - std::cout << "Date: " << boost::posix_time::to_simple_string(boost::any_cast(item.second)) << std::endl; + std::cout << "Date: " << boost::any_cast(item.second).toString() << std::endl; break; case MetaData::Type::OriginalDate: - std::cout << "Original date: " << boost::posix_time::to_simple_string(boost::any_cast(item.second)) << std::endl; + std::cout << "Original date: " << boost::any_cast(item.second).toString() << std::endl; break; case MetaData::Type::HasCover: @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) case MetaData::Type::AudioStreams: for (auto& audioStream : boost::any_cast >(item.second)) - std::cout << "Audio stream '" << audioStream.desc << "' - " << audioStream.bitRate << " bps" << std::endl; + std::cout << "Audio stream: " << audioStream.bitRate << " bps" << std::endl; break; case MetaData::Type::MusicBrainzArtistID: From 7721f6e87483cc4d50ef325bc01853143b76dd45 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 16 Apr 2018 21:01:42 +0200 Subject: [PATCH 100/195] Get rid of boost posix_time --- src/av/AvTranscoder.cpp | 10 +++++----- src/av/AvTranscoder.hpp | 11 +++++------ src/ui/MediaPlayer.cpp | 2 +- src/ui/resource/TranscodeResource.cpp | 11 +++++------ src/ui/resource/TranscodeResource.hpp | 2 +- src/utils/Utils.cpp | 13 ------------- src/utils/Utils.hpp | 3 --- 7 files changed, 17 insertions(+), 35 deletions(-) diff --git a/src/av/AvTranscoder.cpp b/src/av/AvTranscoder.cpp index 4d02191c..35ea8162 100644 --- a/src/av/AvTranscoder.cpp +++ b/src/av/AvTranscoder.cpp @@ -43,7 +43,7 @@ static std::vector encodingInfos = {Encoding::M4A, "audio/mp4", 5}, }; -std::string encoding_to_mimetype(Encoding encoding) +std::string encodingToMimetype(Encoding encoding) { for (auto encodingInfo : encodingInfos) { @@ -54,7 +54,7 @@ std::string encoding_to_mimetype(Encoding encoding) throw std::logic_error("encoding_to_mimetype failed!"); } -int encoding_to_int(Encoding encoding) +int encodingToInt(Encoding encoding) { for (auto encodingInfo : encodingInfos) { @@ -65,7 +65,7 @@ int encoding_to_int(Encoding encoding) throw std::logic_error("encoding_to_int failed!"); } -Encoding encoding_from_int(int encodingId) +Encoding encodingFromInt(int encodingId) { for (auto encodingInfo : encodingInfos) { @@ -136,10 +136,10 @@ Transcoder::start() args.push_back("-nostdin"); // input Offset - if (_parameters.offset.total_seconds() > 0) + if (_parameters.offset) { args.push_back("-ss"); - args.push_back(std::to_string(_parameters.offset.total_seconds())); + args.push_back(std::to_string((*_parameters.offset).count())); } // Input file diff --git a/src/av/AvTranscoder.hpp b/src/av/AvTranscoder.hpp index 73e10ec5..144ea5d6 100644 --- a/src/av/AvTranscoder.hpp +++ b/src/av/AvTranscoder.hpp @@ -24,7 +24,6 @@ #include -#include //no i/o just types #include #include @@ -42,16 +41,16 @@ enum class Encoding M4A, }; -std::string encoding_to_mimetype(Encoding encoding); -int encoding_to_int(Encoding encoding); -Encoding encoding_from_int(int encoding); +std::string encodingToMimetype(Encoding encoding); +int encodingToInt(Encoding encoding); +Encoding encodingFromInt(int encoding); struct TranscodeParameters { Encoding encoding = Encoding::MP3; - boost::optional stream = boost::none; // Id of the stream to be transcoded (auto detect by default) std::size_t bitrate = 128000; - boost::posix_time::time_duration offset = boost::posix_time::seconds(0); + boost::optional stream = boost::none; // Id of the stream to be transcoded (auto detect by default) + boost::optional offset; TranscodeParameters() {} }; diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp index b4fd2816..f2fbe015 100644 --- a/src/ui/MediaPlayer.cpp +++ b/src/ui/MediaPlayer.cpp @@ -56,7 +56,7 @@ MediaPlayer::playTrack(Database::Track::id_type trackId) { Av::MediaFile mediaFile(track->getPath()); - auto resource = LmsApp->getTranscodeResource()->getUrl(trackId, Av::Encoding::MP3, boost::posix_time::seconds(0)); + auto resource = LmsApp->getTranscodeResource()->getUrl(trackId, Av::Encoding::MP3); auto imgResource = LmsApp->getImageResource()->getTrackUrl(trackId, 64); std::ostringstream oss; diff --git a/src/ui/resource/TranscodeResource.cpp b/src/ui/resource/TranscodeResource.cpp index f1b0755d..926dd040 100644 --- a/src/ui/resource/TranscodeResource.cpp +++ b/src/ui/resource/TranscodeResource.cpp @@ -40,10 +40,9 @@ TranscodeResource:: ~TranscodeResource() } std::string -TranscodeResource::getUrl(Database::Track::id_type trackId, Av::Encoding encoding, boost::posix_time::time_duration offset) const +TranscodeResource::getUrl(Database::Track::id_type trackId, Av::Encoding encoding) const { - std::string res = url()+ "&trackid=" + std::to_string(trackId) + "&encoding=" + std::to_string(Av::encoding_to_int(encoding)); - res += "&offset=" + std::to_string(offset.seconds()); + std::string res = url()+ "&trackid=" + std::to_string(trackId) + "&encoding=" + std::to_string(Av::encodingToInt(encoding)); return res; } @@ -81,11 +80,11 @@ TranscodeResource::handleRequest(const Wt::Http::Request& request, auto offsetStr = request.getParameter("offset"); if (offsetStr) - parameters.offset = boost::posix_time::seconds(std::stol(*offsetStr)); + parameters.offset = std::chrono::seconds(std::stol(*offsetStr)); auto encodingStr = request.getParameter("encoding"); if (encodingStr) - parameters.encoding = Av::encoding_from_int(std::stol(*encodingStr)); + parameters.encoding = Av::encodingFromInt(std::stol(*encodingStr)); auto streamStr = request.getParameter("stream"); if (streamStr) @@ -116,7 +115,7 @@ TranscodeResource::handleRequest(const Wt::Http::Request& request, transcoder = std::make_shared(track->getPath(), parameters); } - std::string mimeType = Av::encoding_to_mimetype(transcoder->getParameters().encoding); + std::string mimeType = Av::encodingToMimetype(transcoder->getParameters().encoding); LMS_LOG(UI, DEBUG) << "Mime type set to '" << mimeType << "'"; response.setMimeType(mimeType); diff --git a/src/ui/resource/TranscodeResource.hpp b/src/ui/resource/TranscodeResource.hpp index 02847e53..b3842541 100644 --- a/src/ui/resource/TranscodeResource.hpp +++ b/src/ui/resource/TranscodeResource.hpp @@ -35,7 +35,7 @@ class TranscodeResource : public Wt::WResource TranscodeResource(Database::Handler& db); ~TranscodeResource(); - std::string getUrl(Database::Track::id_type trackId, Av::Encoding encoding, boost::posix_time::time_duration offset) const; + std::string getUrl(Database::Track::id_type trackId, Av::Encoding encoding) const; void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response); diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp index f65287b5..07700578 100644 --- a/src/utils/Utils.cpp +++ b/src/utils/Utils.cpp @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -77,18 +76,6 @@ bool readList(const std::string& str, const std::string& separators, std::listtime_duration_format(format.c_str()); - std::ostringstream oss; - oss.imbue(std::locale(oss.getloc(), facet)); - oss << duration; - - return oss.str(); -} - std::vector splitString(std::string string, std::string separators) { diff --git a/src/utils/Utils.hpp b/src/utils/Utils.hpp index 61674756..497eac91 100644 --- a/src/utils/Utils.hpp +++ b/src/utils/Utils.hpp @@ -32,9 +32,6 @@ bool readList(const std::string& str, const std::string& separators, std::list& results); -//std::string -//durationToString(boost::posix_time::time_duration duration, std::string format); - std::vector splitString(std::string string, std::string separators); From 7b6f446543565fafaca44cfc6e3072245bccf13d Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 16 Apr 2018 22:25:12 +0200 Subject: [PATCH 101/195] Fixed regression on the transcoder --- src/ui/resource/TranscodeResource.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/resource/TranscodeResource.cpp b/src/ui/resource/TranscodeResource.cpp index 926dd040..5665ea2e 100644 --- a/src/ui/resource/TranscodeResource.cpp +++ b/src/ui/resource/TranscodeResource.cpp @@ -60,7 +60,7 @@ TranscodeResource::handleRequest(const Wt::Http::Request& request, if (continuation) { LMS_LOG(UI, DEBUG) << "Continuation! " << continuation ; - transcoder = boost::any_cast>(continuation->data()); + transcoder = Wt::cpp17::any_cast>(continuation->data()); } else { From f804bacbd6abf43bf0cb98d864e2985a27e3d11a Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 16 Apr 2018 22:48:05 +0200 Subject: [PATCH 102/195] Deactive the remember me function as it does not work anymore --- src/ui/Auth.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/ui/Auth.cpp b/src/ui/Auth.cpp index d4fbc093..961d2fb4 100644 --- a/src/ui/Auth.cpp +++ b/src/ui/Auth.cpp @@ -32,16 +32,11 @@ namespace UserInterface { Auth::Auth() -: Wt::WTemplateFormView() +: Wt::WTemplateFormView(Wt::WString::tr("Lms.Auth.template")) { _model = std::make_shared(LmsApp->getDb().getAuthService(), LmsApp->getDb().getUserDatabase()); - _model->addPasswordAuth(&Database::Handler::getPasswordService()); - setTemplateText(Wt::WString::tr("Lms.Auth.template")); - addFunction("tr", &WTemplate::Functions::tr); - addFunction("id", &WTemplate::Functions::id); - // LoginName setFormWidget(Wt::Auth::AuthModel::LoginNameField, std::make_unique()); @@ -63,8 +58,9 @@ Auth::Auth() this->setHidden(true); })); - Wt::Auth::User user = _model->processAuthToken(); - _model->loginUser(LmsApp->getDb().getLogin(), user, Wt::Auth::LoginState::Weak); +// Wt::Auth::User user = _model->processAuthToken(); +// if (user.isValid()) +// _model->loginUser(LmsApp->getDb().getLogin(), user, Wt::Auth::LoginState::Weak); updateView(_model.get()); } From 7c841f6b46cfa4bebbf2ab2254ea29bb75158372 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 18 Apr 2018 13:23:13 +0200 Subject: [PATCH 103/195] Fix build on wt 4.0.3 --- configure.ac | 2 +- src/database/DatabaseHandler.cpp | 7 +++++-- src/utils/Path.cpp | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 9b81e6c6..a5074afe 100644 --- a/configure.ac +++ b/configure.ac @@ -74,7 +74,7 @@ AC_CHECK_LIB( [tag], AC_CHECK_LIB( [config++], [main], , - [AC_MSG_ERROR([libtag not found!])]) + [AC_MSG_ERROR([libconfig++ not found!])]) AC_CONFIG_FILES([Makefile src/Makefile diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index d4267fed..02803607 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -17,8 +17,6 @@ * along with LMS. If not, see . */ -#include - #include #include @@ -53,7 +51,12 @@ Handler::configureAuth(void) authService.setAuthTokensEnabled(true, "lmsauth"); authService.setIdentityPolicy(Wt::Auth::IdentityPolicy::LoginName); authService.setRandomTokenLength(32); + +#if WT_VERSION < 0X04000300 authService.setTokenHashFunction(new Wt::Auth::BCryptHashFunction(8)); +#else + authService.setTokenHashFunction(std::make_unique(8)); +#endif auto verifier = std::make_unique(); verifier->addHashFunction(std::make_unique(8)); diff --git a/src/utils/Path.cpp b/src/utils/Path.cpp index 8f6a6ede..2f937ce2 100644 --- a/src/utils/Path.cpp +++ b/src/utils/Path.cpp @@ -17,6 +17,7 @@ * along with LMS. If not, see . */ +#include #include #include From df0bd4ad0ef2e705cf6009d1b4d52b5244d81dab Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 18 Apr 2018 13:23:44 +0200 Subject: [PATCH 104/195] Prevent duplicate user creation --- src/ui/admin/InitWizardView.cpp | 4 +-- src/ui/admin/UserView.cpp | 46 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/src/ui/admin/InitWizardView.cpp b/src/ui/admin/InitWizardView.cpp index f1b2d6d9..253ce0f1 100644 --- a/src/ui/admin/InitWizardView.cpp +++ b/src/ui/admin/InitWizardView.cpp @@ -77,12 +77,10 @@ class InitWizardModel : public Wt::WFormModel if (field == PasswordField) { - // Password is mandatory if we create the user if (!valueText(PasswordField).empty()) { // Evaluate the strength of the password - Wt::Auth::AbstractPasswordService::StrengthValidatorResult res - = Database::Handler::getPasswordService().strengthValidator()->evaluateStrength(valueText(PasswordField), + auto res = Database::Handler::getPasswordService().strengthValidator()->evaluateStrength(valueText(PasswordField), valueText(AdminLoginField), ""); if (!res.isValid()) diff --git a/src/ui/admin/UserView.cpp b/src/ui/admin/UserView.cpp index 3975299d..62dfe1d1 100644 --- a/src/ui/admin/UserView.cpp +++ b/src/ui/admin/UserView.cpp @@ -118,6 +118,52 @@ class UserModel : public Wt::WFormModel } } + Wt::WString getLogin() const + { + if (_userId) + { + auto authUser = LmsApp->getDb().getUserDatabase().findWithId( std::to_string(*_userId) ); + return authUser.identity(Wt::Auth::Identity::LoginName); + } + else + return valueText(LoginField); + } + + bool validateField(Field field) + { + Wt::WString error; + + if (field == LoginField) + { + auto user = LmsApp->getDb().getUserDatabase().findWithIdentity(Wt::Auth::Identity::LoginName, valueText(LoginField)); + if (user.isValid()) + error = Wt::WString::tr("Lms.Admin.User.user-already-exists"); + else + return Wt::WFormModel::validateField(field); + } + else if (field == PasswordField) + { + if (!valueText(PasswordField).empty()) + { + // Evaluate the strength of the password + auto res = Database::Handler::getPasswordService().strengthValidator()->evaluateStrength(valueText(PasswordField), getLogin(), ""); + + if (!res.isValid()) + error = res.message(); + } + else + return Wt::WFormModel::validateField(field); + } + else + { + return Wt::WFormModel::validateField(field); + } + + setValidation(field, Wt::WValidator::Result( error.empty() ? Wt::ValidationState::Valid : Wt::ValidationState::Invalid, error)); + + return (validation(field).state() == Wt::ValidationState::Valid); + } + boost::optional getBitrateLimitRow(Wt::WString value) { for (int i = 0; i < _bitrateModel->rowCount(); ++i) From ef03195a37fa0b5e94297a7d027681b94e364085 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 18 Apr 2018 13:35:54 +0200 Subject: [PATCH 105/195] Prevent duplicate user creation. Adding locale --- approot/messages.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/approot/messages.xml b/approot/messages.xml index b7e05584..e0f60060 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -37,6 +37,7 @@ Edit Users +User already exists! New user New user created! Edit user {1} From 3b83b37c38d86b9992a4859c4ae2c325993c39b8 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 18 Apr 2018 13:36:32 +0200 Subject: [PATCH 106/195] Fix build where std::size_t is unsigned long --- src/ui/LmsApplication.cpp | 10 +++++----- src/ui/PlayQueueView.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 6a0b76c4..ed59d298 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -382,11 +382,11 @@ LmsApplication::handleAuthEvent(void) Wt::WServer::instance()->post(sessionId, [=] { notifyMsg(Wt::WString::tr("Lms.Admin.Database.scan-complete") - .arg(stats.nbFiles()) - .arg(stats.additions) - .arg(stats.deletions) - .arg(stats.nbDuplicates()) - .arg(stats.nbErrors())); + .arg(static_cast(stats.nbFiles())) + .arg(static_cast(stats.additions)) + .arg(static_cast(stats.deletions)) + .arg(static_cast(stats.nbDuplicates())) + .arg(static_cast(stats.nbErrors()))); triggerUpdate(); }); }, std::placeholders::_1)); diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index 5334f5e5..b4e45453 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -144,7 +144,7 @@ PlayQueue::updateInfo() Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); - _nbTracks->setText(Wt::WString::tr("Lms.PlayQueue.nb-tracks").arg(playlist->getCount())); + _nbTracks->setText(Wt::WString::tr("Lms.PlayQueue.nb-tracks").arg(static_cast(playlist->getCount()))); } void From a30938a7f93ba6d6bbe0fc860c61e77ed2f156dd Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 19 Apr 2018 13:47:45 +0200 Subject: [PATCH 107/195] Make the remember-me feature make again --- src/ui/Auth.cpp | 11 +++++++---- src/ui/LmsApplication.cpp | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/ui/Auth.cpp b/src/ui/Auth.cpp index 961d2fb4..ff1d39da 100644 --- a/src/ui/Auth.cpp +++ b/src/ui/Auth.cpp @@ -58,11 +58,14 @@ Auth::Auth() this->setHidden(true); })); -// Wt::Auth::User user = _model->processAuthToken(); -// if (user.isValid()) -// _model->loginUser(LmsApp->getDb().getLogin(), user, Wt::Auth::LoginState::Weak); - updateView(_model.get()); + + Wt::Auth::User user = _model->processAuthToken(); + if (user.isValid()) + { + LMS_LOG(UI, DEBUG) << "Valid user found from auth token (id = " << user.id() << ")"; + _model->loginUser(LmsApp->getDb().getLogin(), user, Wt::Auth::LoginState::Weak); + } } void diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index ed59d298..f2d302e3 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -119,7 +119,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti firstConnection = (Database::User::getAll(LmsApp->getDboSession()).size() == 0); } - LMS_LOG(UI, DEBUG) << "Creating root widget. First connection = " << std::boolalpha << firstConnection; + LMS_LOG(UI, DEBUG) << "Creating root widget. First connection = " << firstConnection; if (firstConnection) { @@ -127,8 +127,6 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti } else { - _auth = root()->addNew(); - LmsApp->getDb().getLogin().changed().connect(std::bind([=] { try @@ -141,6 +139,8 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti throw std::runtime_error("Internal error"); } })); + + _auth = root()->addNew(); } } From cdf7863cde1a0fbec4e0f34d972522363899b922 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 19 Apr 2018 20:28:32 +0200 Subject: [PATCH 108/195] Remove unused 3rd party library --- .../knnl/basic_activation_function.hpp | 89 ---- src/third-party/knnl/basic_neuron.hpp | 174 ------- .../knnl/basic_neuron_fun_spec.hpp | 169 ------- .../knnl/basic_weak_distance_function.hpp | 114 ----- src/third-party/knnl/data_parser.hpp | 157 ------ src/third-party/knnl/debugger.hpp | 114 ----- .../knnl/euclidean_distance_function.hpp | 157 ------ src/third-party/knnl/functors.hpp | 366 -------------- .../knnl/generalized_training_weight.hpp | 454 ------------------ src/third-party/knnl/kohonen_network.hpp | 146 ------ src/third-party/knnl/max_type.hpp | 134 ------ src/third-party/knnl/neural_net_headers.hpp | 80 --- src/third-party/knnl/numeric_iterator.hpp | 162 ------- src/third-party/knnl/operators.hpp | 440 ----------------- src/third-party/knnl/print_network.hpp | 156 ------ src/third-party/knnl/randomize_policy.hpp | 108 ----- src/third-party/knnl/ranges.hpp | 156 ------ .../knnl/rectangular_container.hpp | 146 ------ src/third-party/knnl/std_headers.hpp | 68 --- src/third-party/knnl/training_functional.hpp | 357 -------------- src/third-party/knnl/value_type.hpp | 98 ---- .../weighted_euclidean_distance_function.hpp | 231 --------- .../knnl/wta_training_algorithm.hpp | 278 ----------- src/third-party/knnl/wtm_topology.hpp | 288 ----------- .../knnl/wtm_training_algorithm.hpp | 293 ----------- 25 files changed, 4935 deletions(-) delete mode 100755 src/third-party/knnl/basic_activation_function.hpp delete mode 100755 src/third-party/knnl/basic_neuron.hpp delete mode 100755 src/third-party/knnl/basic_neuron_fun_spec.hpp delete mode 100755 src/third-party/knnl/basic_weak_distance_function.hpp delete mode 100755 src/third-party/knnl/data_parser.hpp delete mode 100755 src/third-party/knnl/debugger.hpp delete mode 100755 src/third-party/knnl/euclidean_distance_function.hpp delete mode 100755 src/third-party/knnl/functors.hpp delete mode 100755 src/third-party/knnl/generalized_training_weight.hpp delete mode 100755 src/third-party/knnl/kohonen_network.hpp delete mode 100755 src/third-party/knnl/max_type.hpp delete mode 100755 src/third-party/knnl/neural_net_headers.hpp delete mode 100755 src/third-party/knnl/numeric_iterator.hpp delete mode 100755 src/third-party/knnl/operators.hpp delete mode 100755 src/third-party/knnl/print_network.hpp delete mode 100755 src/third-party/knnl/randomize_policy.hpp delete mode 100755 src/third-party/knnl/ranges.hpp delete mode 100755 src/third-party/knnl/rectangular_container.hpp delete mode 100755 src/third-party/knnl/std_headers.hpp delete mode 100755 src/third-party/knnl/training_functional.hpp delete mode 100755 src/third-party/knnl/value_type.hpp delete mode 100755 src/third-party/knnl/weighted_euclidean_distance_function.hpp delete mode 100755 src/third-party/knnl/wta_training_algorithm.hpp delete mode 100755 src/third-party/knnl/wtm_topology.hpp delete mode 100755 src/third-party/knnl/wtm_training_algorithm.hpp diff --git a/src/third-party/knnl/basic_activation_function.hpp b/src/third-party/knnl/basic_activation_function.hpp deleted file mode 100755 index 43629846..00000000 --- a/src/third-party/knnl/basic_activation_function.hpp +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Tue 11 Apr 2006 17:47:44 CEST - * Last modified: Mon 22 May 2006 13:28:47 CEST - */ - -#ifndef BASIC_ACTIVATION_FUNCTION_HPP_INCLUDED -#define BASIC_ACTIVATION_FUNCTION_HPP_INCLUDED - -/** - * \file basic_activation_function.hpp - * \brief File contains template class Basic_activation_function. - * \ingroup neural_net - */ - -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - - /** - * Basic_activation_function template class. - * \param Parameters_type is type of parameters. - * \param Value_type is a type of values. - * \param Result_type is a type of results. - */ - template - < - typename Parameters_type, - typename Value_type, - typename Result_type - > - class Basic_activation_function - { - public: - /** Result type. */ - typedef Result_type result_type; - - /** Value type. */ - typedef Value_type value_type; - - /** Parameters type. */ - typedef Parameters_type parameters_type; - }; - /*\@}*/ - -} // namespace neural_net - -#endif // BASIC_ACTIVATION_FUNCTION_HPP_INCLUDED diff --git a/src/third-party/knnl/basic_neuron.hpp b/src/third-party/knnl/basic_neuron.hpp deleted file mode 100755 index 8f303ecc..00000000 --- a/src/third-party/knnl/basic_neuron.hpp +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Tue 11 Apr 2006 15:01:26 CEST - * Last modified: Sun 26 Nov 2006 09:28:46 CET - */ - -#ifndef BASIC_NEURON_HPP_INCLUDED -#define BASIC_NEURON_HPP_INCLUDED - -/** - * \file basic_neuron.hpp - * \brief File contains template class Basic_neuron. - * \ingroup neural_net - */ - -/** - * \defgroup neural_net Neural network - */ - -/** - * \namespace neural_net - * \brief Neural network namespace - * \ingroup neural_net - */ - -/** - * \addtogroup neural_net - */ -/*\@{*/ -namespace neural_net -{ - /** - * \class Basic_neuron - * \brief Basic_neuron template class. - * \param Activation_function_type - * is a functor type of activation function. - * \param Binary_operation_type - * is a type of binary operation used in neuron values. - * \param Weigths_type is type of weights. - */ - template - < - typename Activation_function_type, - typename Binary_operation_type - > - class Basic_neuron - { - public: - - /** Weights type. */ - typedef typename Binary_operation_type::value_type weights_type; - - /** Activation function type. */ - typedef Activation_function_type activation_function_type; - - /** Binary operation type. */ - typedef Binary_operation_type binary_operation_type; - typedef typename Binary_operation_type::value_type value_type; - typedef typename Activation_function_type::result_type result_type; - - /** Activation function functor. */ - Activation_function_type activation_function; - - /** Weak and generalized distance function. */ - Binary_operation_type binary_operation; - - /** Weights. */ - weights_type weights; - - /** - * Constructor. - * \param weights_ are weights of the neuron. - * \param activation_function_ is an activation - * function of the neuron. - * \param binary_operation_ is an operation calculated - * on weights and data, before - * activation function. - */ - Basic_neuron - ( - weights_type const & weights_, - Activation_function_type const & activation_function_, - Binary_operation_type const & binary_operation_ - ) - : activation_function ( activation_function_ ), - binary_operation ( binary_operation_ ), - weights ( weights_ ) - {} - - /** - * Calculation function. - * \param x input value for the neuron. - * \return output from neuron. - * \f[ - * y = f ( g ( w,x ) ) - * \f] - * where: f is activation function, g is binary operation, - * w is weight and x is input value. - */ - typename Activation_function_type::result_type - operator() ( value_type const & x ) const - { - // calculate output of the neuron as activation fuction - // working on results from binary operation on weights and value - // composition of activation and distance function - return activation_function ( binary_operation ( weights, x ) ); - } - - /** Copy constructor. */ - template - < - typename Activation_function_type_2, - typename Binary_operation_type_2 - > - Basic_neuron - ( - Basic_neuron - < - Activation_function_type_2, - Binary_operation_type_2 - > - const & neuron_ - ) - { - activation_function = neuron_.activation_function; - binary_operation = neuron_.binary_operation; - weights = neuron_.weights; - } - - protected: - Basic_neuron(); - }; -} // namespace neural_net -/*\@}*/ - -#endif // BASIC_NEURON_HPP_INCLUDED diff --git a/src/third-party/knnl/basic_neuron_fun_spec.hpp b/src/third-party/knnl/basic_neuron_fun_spec.hpp deleted file mode 100755 index e60883db..00000000 --- a/src/third-party/knnl/basic_neuron_fun_spec.hpp +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Tue 11 Apr 2006 15:01:26 CEST - * Last modified: Wed 08 Aug 2007 18:27:41 CEST - */ - -#ifndef BASIC_NEURON_FUN_SPEC_HPP_INCLUDED -#define BASIC_NEURON_FUN_SPEC_HPP_INCLUDED - -#include -#include "basic_neuron.hpp" - -/** - * \file basic_neuron_fun_spec.hpp - * \brief File contains specialization of template class Basic_neuron. - * using boost::function. - * \ingroup neural_net - */ - -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - - /** - * Basic_neuron template class specialization for the functions instead - * of functors. - * \param Activation_function_type is a function of activation. - * \param Binary_operation_type is a type of binary operation e.g. distance function. - */ - template - < - typename Activation_function_type, - typename Binary_operation_type - > - class Basic_neuron - < - Activation_function_type ( typename Binary_operation_type::result_type ), - Binary_operation_type ( Value_type, Value_type ) - > - { - public: - - /** Weights type. */ - typedef typename Binary_operation_type::value_type weights_type; - - /** Activation function type. */ - typedef Activation_function_type activation_function_type; - - /** Binary operation type. */ - typedef Binary_operation_type binary_operation_type; - typedef typename Binary_operation_type::value_type value_type; - - /** Activation function. */ - ::boost::function < - Activation_function_type ( typename Binary_operation_type::result_type ) - > activation_function; - - /** Weak and generalized distance function. */ - ::boost::function < - Binary_operation_type ( value_type, value_type ) - > binary_operation; - - /** Weights. */ - weights_type weights; - - /** - * Constructor. - * \param weights_ are weights of the neuron. - * \param activation_function_ is an activation - * function of the neuron. - * \param binary_operation_ is an operation calculated - * on weights and data, before - * activation function. - */ - Basic_neuron ( - weights_type const & weights_, - - ::boost::function < - Activation_function_type ( typename Binary_operation_type::result_type ) - > - const & activation_function_, - - ::boost::function < - Binary_operation_type ( value_type, value_type ) - > - const & binary_operation_ - ) - : activation_function ( activation_function_ ), - binary_operation ( binary_operation_ ), - weights ( weights_ ) - {} - - /** - * Calculation function. - * \param x input value for the neuron. - * \return output from neuron. - * \f[ - * y = f ( g ( w,x ) ) - * \f] - * where: f is activation function, g is binary operation, - * w is weight and x is input value. - */ - typename Activation_function_type::result_type - operator() ( value_type const & x ) const - { - // calculate output of the neuron as activation fuction - // working on results from binary operation on weights and value - // composition of activation and distance function - return activation_function ( binary_operation ( weights, x ) ); - } - - /** Copy constructor. */ - template < - typename Activation_function_type_2, - typename Binary_operation_type_2 - > Basic_neuron ( - const Basic_neuron < - Activation_function_type_2 ( typename Binary_operation_type_2::result_type ), - Binary_operation_type_2 ( value_type, value_type ) - > & neuron_ - ) - {} - }; - /*\@}*/ - -} // namespace neural_net - -#endif // BASIC_NEURON_FUN_SPEC_HPP_INCLUDED diff --git a/src/third-party/knnl/basic_weak_distance_function.hpp b/src/third-party/knnl/basic_weak_distance_function.hpp deleted file mode 100755 index dac949c2..00000000 --- a/src/third-party/knnl/basic_weak_distance_function.hpp +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Thu 13 Apr 2006 08:30:20 CEST - * Last modified: Sun 26 Nov 2006 08:32:48 CET - */ - -#ifndef BASIC_WEAK_DISTANCE_FUNCTION_HPP_INCLUDED -#define BASIC_WEAK_DISTANCE_FUNCTION_HPP_INCLUDED - -/** - * \defgroup distance Generalized distance - */ - -/** - * \file basic_weak_distance_function.hpp - * \brief File contains template class Basic_weak_distance_function. - * \ingroup distance - */ - -/** - * \namespace distance - * \brief namespace contains functors for distance calculation in the data. - * \ingroup distance - */ -namespace distance -{ - /** - * \addtogroup distance - */ - /*\@{*/ - - /** - * Basic_weak_distance_function template class. - * \param Value_type is a type of values. - * \param Parameters_type ia a type of parameters. - */ - template - < - typename Value_type, - typename Result_type - > - class Basic_weak_distance_function - { - public: - - typedef Value_type value_type; - typedef Result_type result_type; - - /** - * Constructor. - */ - Basic_weak_distance_function() - {} - - /** Copy constructor. */ - template - < - typename Value_type_2, - typename Result_type_2 - > - Basic_weak_distance_function - ( - Basic_weak_distance_function - < - Value_type_2, - Result_type_2 - > - const & weak_distance_function_ - ) - {} - }; - /*\@}*/ - -} // namespace distance - -#endif // BASIC_WEAK_DISTANCE_FUNCTION_HPP_INCLUDED diff --git a/src/third-party/knnl/data_parser.hpp b/src/third-party/knnl/data_parser.hpp deleted file mode 100755 index e2867de2..00000000 --- a/src/third-party/knnl/data_parser.hpp +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Sat 29 Apr 2006 19:10:50 CEST - * Last modified: Wed 08 Aug 2007 17:15:45 CEST - */ - -#ifndef DATA_PARSER_HPP_INCLUDED -#define DATA_PARSER_HPP_INCLUDED - -#include -#include -#include -#include -#include - -/** - * \defgroup data_parser Data parser - */ - -/** - * \file data_parser.hpp - * \brief File contains template class Data_parser. - * \ingroup data_parser - */ - -/** - * \addtogroup data_parser - */ -/*\@{*/ - -/** - * \namespace data_parser - * \brief Data parser namespace includes functionality to parsing and storing data into containers. - * \ingroup data_parser - */ -namespace data_parser -{ - /** - * Class for parsing data stream. - * \param Data_container is a container type. - */ - template < typename Data_container > - class Data_parser - { - public: - /** Constructor. */ - Data_parser() - {} - - /** - * Function that parse stream and store data in container. - * \param is is a reference to the stream. - * \param data_container is a reference to the container. - * \return modified container. - * \throw ::std::runtime_error when after parsing size of data_container is still zero. - */ - Data_container & operator() ( ::std::istream & is, Data_container & data_container ) const - { - ::std::string tmp_string; - ::boost::int32_t counter = 0; - - typename Data_container::value_type tmp_sub_container; - - // get line of data from stream - while ( ::std::getline ( is, tmp_string ) ) - { - // count data - ++counter; - - // parse data and push data back into the container - data_container.push_back ( parse_string ( tmp_sub_container, tmp_string ) ); - - // reset temporal container - tmp_sub_container.clear(); - } - - // if data container is empty after all procedure throw exception - if ( data_container.size() == 0 ) - { - throw ::std::runtime_error ( "Data file corupted." ); - } - - // return data container of containers - return data_container; - } - - private: - /** - * This function is for parsing string. - * \param container is a reference to the data conatiner. - * \param str is a reference to the string. - * \return container of the values stored in one string. - */ - typename Data_container::value_type parse_string - ( - typename Data_container::value_type & container, - ::std::string & str - ) const - { - ::std::stringstream tmp_sstr ( str ); - - typedef typename Data_container::value_type::value_type internal_type; - - // parse data as sequence of fixed type data and store them into the container. - ::std::copy - ( - ::std::istream_iterator < internal_type > ( tmp_sstr ), - ::std::istream_iterator < internal_type >(), - ::std::back_inserter ( container ) - ); - - return container; - } - - }; -} // namespace data_parser -/*\@}*/ - -#endif // DATA_PARSER_HPP_INCLUDED diff --git a/src/third-party/knnl/debugger.hpp b/src/third-party/knnl/debugger.hpp deleted file mode 100755 index ec50fb23..00000000 --- a/src/third-party/knnl/debugger.hpp +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2005, Seweryn Habdank-Wojewodzki - * - * All rights reserved. - * - * Permission to copy, use, modify, sell and distribute this software - * is granted provided this copyright notice appears in all copies. - * This software is provided "as is" without express or implied - * warranty, and with no claim as to its suitability for any purpose. - * This software has generative abilities, but does not claim any rights - * nor guarantees with regard to the generated code. - */ - -/* - * e-mail: habdank{AT}gmail{dot}com - * - * File created: Sat 05 Nov 2005 14:20:28 CET - * Last modified: Wed 08 Aug 2007 17:16:20 CEST - */ - -/** - * \defgroup trivial_debugger Trivial Debugger - */ - -/** - * \file debugger.hpp - * \ingroup trivial_debugger - * \brief Defines macro for Trivial Debugger. - * When compiler send to program one of flags: TDEBUG, ETDEBUG or FTDEBUG debugger functionality is set. - */ - -/** - * \def D - * \brief Macro D will send to proper stream value of the variable. - * Stream depends on set flag. Information which is send looks like: - * - * __FILE__ [__LINE__] : variable name = variable value - * - * \param name is name of debugged variable. - * \par Usage: - * - * In the main file e.g. main.cpp in global scope should be placed: - * - * #ifdef FTDEBUG - * ::std::auto_ptr < ::std::ofstream > DEBUGGER_STREAM; - * #endif //FTDEGUG - * - * And at the very beginnig of the main function should be placed: - * - * #ifdef FTDEBUG - * DEBUGGER_STREAM = - * ::std::auto_ptr < ::std::ofstream > - * ( new ::std::ofstream ( "_debugger.out" ) ); - * #endif //FTDEBUG - * - * if we suppose to use file to make logs. - * - * And in the application we have to include this header and just use macro: - * - * Available for all cases including compilation - * without any flag: - * - * D ( my_variable_name ); or D ( "I am here." ); - * - * If are sure that debugger will work by default any of flag TDEBUG, ETDEBUG and FTDEBUG is set: - * - * D ( ) << "Send other information to the stream." << ::std::endl; - * - * Or just work on if we are sure about existence of the log file FTDEBUG is set: - * - * *DEBUGGER_STREAM << any_function_that_returns_reference_to_ostream ( ) << ::std::endl; - * - * \par Remark: - * Remember to put semicolon at the end! - * - * \par Flags: - * - * - TDEBUG - Trivial Debugger sends debugging information to the stdout. - * - * - ETDEBUG - Trivial Debugger sends debugging information to the stderr. - * - * - FTDEBUG - Trivial Debugger sends debugging information to the file - * (generally declared and defined in main() function of the program). - */ - -#ifndef DEBUGGER_HPP_INCLUDED -#define DEBUGGER_HPP_INCLUDED - -#ifdef FTDEBUG - - #include - #include - - #define D(name) *DEBUGGER_STREAM << __FILE__ << " [" << __LINE__ << "] : " << #name << " = " << (name) << ::std::endl - extern ::std::auto_ptr < ::std::ofstream > DEBUGGER_STREAM; - -#elif defined(TDEBUG) - - #include - #define D(name) ::std::cout << __FILE__ << " [" << __LINE__ << "] : " << #name << " = " << (name) << ::std::endl - -#elif defined(ETDEBUG) - - #include - #define D(name) ::std::cerr << __FILE__ << " [" << __LINE__ << "] : " << #name << " = " << (name) << ::std::endl - -#else - - #define D(name) {} - -#endif // ..TDEBUG - -#endif // DEBUGGER_HPP_INCLUDED - diff --git a/src/third-party/knnl/euclidean_distance_function.hpp b/src/third-party/knnl/euclidean_distance_function.hpp deleted file mode 100755 index 2eddf8c8..00000000 --- a/src/third-party/knnl/euclidean_distance_function.hpp +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Fri 14 Apr 2006 22:42:31 CEST - * Last modified: Wed 08 Aug 2007 18:21:06 CEST - */ - -#ifndef EUCLIDEAN_DISTANCE_FUNCTION_HPP_INCLUDED -#define EUCLIDEAN_DISTANCE_FUNCTION_HPP_INCLUDED - -#include - -#include "operators.hpp" -#include "basic_weak_distance_function.hpp" -#include "value_type.hpp" - -/** - * \file euclidean_distance_function.hpp - * \brief File contains template class Euclidean_distance_function. - * \ingroup distance - */ - -namespace distance -{ - /** - * \addtogroup distance - */ - /*\@{*/ - - /** - * Euclidean_distance_function template class. - * \param Value_type is a type of values. - * \f[ - * d (x,y) = \sum\limits_{i=0}^{N} cdot (x_i-y_i)^2 - * \f] - */ - template - < - typename Value_type - > - class Euclidean_distance_function - : public Basic_weak_distance_function - < - Value_type, - Value_type - > - { - public: - /** - * Constructor. - */ - Euclidean_distance_function() - {} - - /** - * Calculation function. - * \param x first input value for the function. - * \param y second input value for the function. - * \return square of the Euclidean distance function. - * \f[ - * d (x,y) = \sum\limits_{i=0}^{N} cdot (x_i-y_i)^2 - * \f] - */ - typename Value_type::value_type operator() - ( - Value_type const & x, - Value_type const & y - ) const - { - return - ( - euclidean_distance_square - ( - x.begin(), - x.end(), - y.begin(), - static_cast < typename Value_type::value_type const & > ( 0 ) - ) - ); - } - - private: - typedef typename Value_type::value_type inner_type; - - /** - * Function calculates Euclidean distance between two containers. - * \param begin_1 is a begin iterator for the first container. - * \param end_1 is an end iterator for the first container. - * \param begin_2 is an begin iterator for the second container. - * \param init is an initial value. - * \result sqare of Euclidean distance. - */ - inner_type euclidean_distance_square - ( - typename Value_type::const_iterator begin_1, - typename Value_type::const_iterator end_1, - typename Value_type::const_iterator begin_2, - inner_type const & init - ) const - { - return ::std::inner_product - ( - begin_1, end_1, begin_2, - static_cast < inner_type > ( init ), - ::std::plus < inner_type >(), - ::operators::compose_f_gxy_gxy - ( - ::std::multiplies < inner_type >(), - ::std::minus < inner_type >() - ) - ); - } - - }; - /*\@}*/ - -} // namespace distance - -#endif // EUCLIDEAN_DISTANCE_FUNCTION_HPP_INCLUDED - diff --git a/src/third-party/knnl/functors.hpp b/src/third-party/knnl/functors.hpp deleted file mode 100755 index 7fa79fc5..00000000 --- a/src/third-party/knnl/functors.hpp +++ /dev/null @@ -1,366 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Wed 10 May 2006 11:16:03 CEST - * Last modified: Wed 08 Aug 2007 18:21:33 CEST - */ - -#ifndef FUNCTORS_HPP_INCLUDED -#define FUNCTORS_HPP_INCLUDED - -#include - -#include "basic_activation_function.hpp" -#include "operators.hpp" -#include "training_functional.hpp" -/** - * \file functors.hpp - * \brief File contains template class Basic_function and some other classes derived form that one. - * \ingroup neural_net - */ - -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - - /** - * \class Basic_function - * \brief Basic class for defining functions. - * \param Value_type is a type of values. - */ - template < typename Value_type > - struct Basic_function - { - typedef Value_type value_type; - }; - - /** - * \class Gauss_function - * \brief Functor that compute Gauss hat function. - * \param Value_type is a type of values. - * \param Scalar_type is a type of scaling factor which multiplies values. - * \param Exponent_type is a type of exponential factor. - * \f[ - * y = e ^{-\frac{1}{2}\left (\frac{v}{\sigma}\right)^p} - * \f] - */ - template - < - typename Value_type, - typename Scalar_type, - typename Exponent_type - > - class Gauss_function - : public Basic_function < Value_type >, - public Basic_activation_function - < - typename ::operators::Max_type < Scalar_type, Exponent_type >::type, - Value_type, - typename ::operators::Max_type - < - typename ::operators::Max_type - < - typename ::operators::Max_type < Scalar_type, Exponent_type >::type, - Value_type - >::type, - double - >::type - > - { - public: - - typedef Scalar_type scalar_type; - typedef Exponent_type exponent_type; - typedef Value_type value_type; - - typedef typename ::operators::Max_type - < - typename ::operators::Max_type - < - typename ::operators::Max_type < Scalar_type, Exponent_type >::type, - Value_type - >::type, - double - >::type result_type; - - /** Sigma coafficient in the function. */ - Scalar_type sigma; - - /** Exponential factor. */ - Exponent_type exponent; - - /** - * Constructor. - * \param sigma_ is sigma coefficient in Gauss hat function. - * \param exp_ is exponential factor in Gauss hat function. - */ - Gauss_function ( Scalar_type const & sigma_, Exponent_type const & exp_ ) - : sigma ( sigma_ ), exponent ( exp_ ) - {} - - /** - * Result of the functor. - * \param value is a value. - * \return calcutaled result. - * \f[ - * y = e ^{-\frac{1}{2}\left (\frac{v}{\sigma}\right)^p} - * \f] - * where: v is value. - */ - result_type operator() ( Value_type const & value ) const - { - ::operators::power < result_type, Exponent_type > power_v; - - // calculate result - return - ( - ::std::exp - ( - - ::operators::inverse ( static_cast < Scalar_type > ( 2 ) ) - * (power_v) - ( - ::operators::inverse ( sigma ) * value, - exponent - ) - ) - ); - } - - /** Copy constructor. */ - template - < - typename Value_type_2, - typename Scalar_type_2, - typename Exponent_type_2 - > - Gauss_function - ( - Gauss_function - < - Value_type_2, - Scalar_type_2, - Exponent_type_2 - > - const & gauss_function - ) - : sigma ( gauss_function.sigma ), exponent ( gauss_function.exponent ) - {} - }; - - /** - * \class Cauchy_function - * \brief Functor that computes Cauchy hat function. - * \param Value_type is a type of value. - * \param Scalar_type is a type of scalar which will multiplies values. - * \param Power_type is a type of exponential factor. - * \f[ - * y=\frac{1}{1 + (\frac{x}{\sigma})^p} - * \f] - */ - template - < - typename Value_type, - typename Scalar_type, - typename Exponent_type - > - class Cauchy_function - : public Basic_function < Value_type >, - public Basic_activation_function - < - typename ::operators::Max_type < Scalar_type, Exponent_type >::type, - Value_type, - typename ::operators::Max_type - < - typename ::operators::Max_type < Scalar_type, Exponent_type >::type, - Value_type - >::type - > - { - public: - - typedef Scalar_type scalar_type; - typedef Exponent_type exponent_type; - typedef Value_type value_type; - - typedef typename ::operators::Max_type - < - typename ::operators::Max_type < Scalar_type, Exponent_type >::type, - Value_type - >::type result_type; - - /** Sigma scaling coefficient. */ - Scalar_type sigma; - - /** Exponential factor. */ - Exponent_type exponent; - - /** - * Constuctor. - * \param sigma_ is scailing coefficient. - * \param exp_ is exponential factor. - */ - Cauchy_function ( Scalar_type const & sigma_, Exponent_type const & exp_ ) - : sigma ( sigma_ ), exponent ( exp_ ) - {} - - /** - * Function calculates values of the Cauchy hat function. - * \param value is a value. - * \return value of the function. - * \f[ - * y=\frac{1}{1 + (\frac{x}{\sigma})^p} - * \f] - * where: x is value. - */ - result_type operator() ( Value_type const & value ) const - { - ::operators::power < result_type, Exponent_type > power_v; - - // calculate result - return - ( - ::operators::inverse - ( - (power_v) - ( - ::operators::inverse ( sigma ) * value, - exponent - ) + 1 - ) - ); - } - - /**constructor. */ - template - < - typename Value_type_2, - typename Scalar_type_2, - typename Exponent_type_2 - > - Cauchy_function - ( - Cauchy_function - < - Value_type_2, - Scalar_type_2, - Exponent_type_2 - > - const & cauchy_function - ) - : sigma ( cauchy_function.sigma ), exponent ( cauchy_function.exponent ) - {} - }; - - /** - * \class Constant_function - * \brief Functor that computes constant function. - * \param Value_type is a type of value. - * \param Scalar_type is a type of constant value. - * \f[ - * y=c - * \f] - */ - template - < - typename Value_type, - typename Scalar_type - > - class Constant_function - : public Basic_function < Value_type > - { - public: - - typedef Scalar_type scalar_type; - typedef Scalar_type result_type; - - /** Sigma constant value, but not const. */ - Scalar_type sigma; - - /** - * Constuctor. - * \param sigma_ is constant value. - */ - Constant_function ( const Scalar_type & sigma_ ) - : sigma ( sigma_ ) - {} - - /** Copy constructor. */ - template - < - typename Value_type_2, - typename Scalar_type_2 - > - Constant_function - ( - Constant_function - < - Value_type_2, - Scalar_type_2 - > - const & constant_function - ) - : sigma ( constant_function.sigma ) - {} - - /** - * Constant function. - * \param value is a value. - * \return constant value. - * \f[ - * y=c - * \f] - * where: x is value. - */ - result_type operator() ( Value_type const & //value - ) const - { - // result - return ( sigma ); - } - }; - /*\@}*/ - -} // namespace neural_net - -#endif // FUNCTORS_HPP_INCLUDED - diff --git a/src/third-party/knnl/generalized_training_weight.hpp b/src/third-party/knnl/generalized_training_weight.hpp deleted file mode 100755 index ab3341af..00000000 --- a/src/third-party/knnl/generalized_training_weight.hpp +++ /dev/null @@ -1,454 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Sun 07 May 2006 13:51:04 CEST - * Last modified: Wed 08 Aug 2007 18:21:59 CEST - */ - -#ifndef GENERALIZED_TRAINING_WEIGHT_HPP_INCLUDED -#define GENERALIZED_TRAINING_WEIGHT_HPP_INCLUDED - -#include "operators.hpp" -#include "training_functional.hpp" - -/** - * \file generalized_training_weight.hpp - * \brief File contains template class Basic_generalized_training_weight and some other classes derived form that one. - * \ingroup neural_net - */ - -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - - /** - * \class Basic_generalized_training_weight - * \brief Template class for the generalized training functions. - * \param Value_type is a type of values. - * \param Iteration_type is a type of interation counter. - * \param Network_function_type is a type of function that will return proper value - * based on network topology. - * \param Space_funtion_type is a type of function that will return proper value - * based on space topology. - * \param Network_topology is a type of function that computes distances between - * neurons based on network topology. - * \param Space_topology is a type of function that computes distance between - * value and weight in proper topology. - * \param Index_type is a type of index in the neural network container. - */ - template - < - typename Value_type, - typename Iteration_type, - typename Network_function_type, - typename Space_function_type, - typename Network_topology, - typename Space_topology, - typename Index_type - > - struct Basic_generalized_training_weight - { - typedef Network_function_type network_function_type; - typedef Space_function_type space_function_type; - typedef Value_type value_type; - typedef Iteration_type iteration_type; - typedef Index_type index_type; - typedef Network_topology network_topology; - typedef Space_topology space_topology; - }; - - /** - * \class Classic_training_weight - * \brief Template class for the generalize training functions that calculates - * generalized weight classical way. - * \param Value_type is a type of values. - * \param Iteration_type is a type of interation counter. - * \param Network_function_type is a type of function that will return proper value - * based on network topology. - * \param Space_funtion_type is a type of function that will return proper value - * based on space topology. - * \param Network_topology is a type of function that computes distances between - * neurons based on network topology. - * \param Space_topology is a type of function that computes distance between - * value and weight in proper topology. - * \param Index_type is a type of index in the neural network container. - * \f[ - * y=n_f (n_t (c_1,c_2,v_1,v_2)) \cdot s_f (s_t (x,w)) - * \f] - */ - template - < - typename Value_type, - typename Iteration_type, - typename Network_function_type, - typename Space_function_type, - typename Network_topology, - typename Space_topology, - typename Index_type - > - class Classic_training_weight - : public Basic_generalized_training_weight - < - Value_type, - Iteration_type, - Network_function_type, - Space_function_type, - Network_topology, - Space_topology, - Index_type - > - { - public: - - /** Functor computes weight based on the result from network topology. */ - Network_function_type network_function; - - /** Functor computes weight based on the result from space topology. */ - Space_function_type space_function; - - /** Functor computes generalized distance in network. */ - Network_topology network_topology; - - /** Functor computes generalized distance in data space. */ - Space_topology space_topology; - - /** - * Function computes generalized weight for training proces. - * This weight is not the same as weights in neural network. - * \param weight is a weight from neural network. - * \param value is a input value (value that trains network). - * \param iteration is a number of training steps could be - * number of training data sample. - * \param c_1 is a row number (position) in the network of the central neuron. - * \param c_2 is a column number (position) in the network of the central neuron. - * \param v_1 is a row number (position) in the network of the trained neuron. - * \param v_2 is a column number (position) in the network of the trained neuron. - * \f[ - * y=n_f (n_t (c_1,c_2,v_1,v_2)) \cdot s_f (s_t (x,w)) - * \f] - * where x is value and w is neuron weight. - */ - typename Space_function_type::value_type operator() - ( - Value_type const & weight, - Value_type const & value, - Iteration_type const & //iteration - , - Index_type const & c_1, - Index_type const & c_2, - Index_type const & v_1, - Index_type const & v_2 - ) - { - // calculate result - return - ( - (network_function) ( (network_topology) ( c_1, c_2, v_1, v_2 ) ) - * (space_function) ( (space_topology) ( value, weight ) ) - ); - } - - /** - * Constructor. - * \param n_f is a network functor. - * \param s_f is a data space functor. - * \param n_t is a network topology functor. - * \param s_t is a space topology functor. - */ - Classic_training_weight - ( - Network_function_type const & n_f, - Space_function_type const & s_f, - Network_topology const & n_t, - Space_topology const & s_t - ) - : Basic_generalized_training_weight - < - Value_type, - Iteration_type, - Network_function_type, - Space_function_type, - Network_topology, - Space_topology, - Index_type - >(), - network_function ( n_f ), - space_function ( s_f ), - network_topology ( n_t ), - space_topology ( s_t ) - {} - - /** Copy constructor */ - template - < - typename Value_type_2, - typename Iteration_type_2, - typename Network_function_type_2, - typename Space_function_type_2, - typename Network_topology_2, - typename Space_topology_2, - typename Index_type_2 - > - Classic_training_weight - ( - const Classic_training_weight - < - Value_type_2, - Iteration_type_2, - Network_function_type_2, - Space_function_type_2, - Network_topology_2, - Space_topology_2, - Index_type_2 - > - & classic_training_weight - ) - : Basic_generalized_training_weight - < - Value_type_2, - Iteration_type_2, - Network_function_type_2, - Space_function_type_2, - Network_topology_2, - Space_topology_2, - Index_type_2 - >(), - network_function ( classic_training_weight.network_function ), - space_function ( classic_training_weight.space_function ), - network_topology ( classic_training_weight.network_topology ), - space_topology ( classic_training_weight.space_topology ) - {} - - }; - - /** - * \class Experimental_training_weight - * \brief Template class for the generalize training functions that calculates - * generalizeg weight in experimental way. - * \param Value_type is a type of values. - * \param Iteration_type is a type of interation counter. - * \param Network_function_type is a type of function that will return proper value - * based on network topology. - * \param Space_funtion_type is a type of function that will return proper value - * based on space topology. - * \param Network_topology is a type of function that computes distances between - * neurons based on network topology. - * \param Space_topology is a type of function that computes distance between - * value and weight in proper topology. - * \param Index_type is a type of index in the neural network container. - * \param Parameters_type is a type of the parameters for experimenntal training. - * \param n_power is a power q_N - * \param s_power is a power q_S - * \f[ - * y= ( p_1 \cdot n_f (n_t (c_1,c_2,v_1,v_2)) - p_0 )^q_N \cdot s_f (s_t (x,w))^q_S - * \f] - */ - template - < - typename Value_type, - typename Iteration_type, - typename Network_function_type, - typename Space_function_type, - typename Network_topology, - typename Space_topology, - typename Index_type, - typename Parameter_type, - ::boost::int32_t n_power = 1, - ::boost::int32_t s_power = 1 - > - class Experimental_training_weight - : public Basic_generalized_training_weight - < - Value_type, - Iteration_type, - Network_function_type, - Space_function_type, - Network_topology, - Space_topology, - Index_type - > - { - public: - - //::boost::int32_t const s_power; - //::boost::int32_t const n_power; - - /** Scaling parameter. */ - Parameter_type parameter_1; - - /** Shifting parameter. */ - Parameter_type parameter_0; - - - /** Functor computes weight based on the result from network topology. */ - Network_function_type network_function; - - /** Functor computes weight based on the result from space topology. */ - Space_function_type space_function; - - /** Functor computes generalized distance in network. */ - Network_topology network_topology; - - /** Functor computes generalized distance in data space. */ - Space_topology space_topology; - - /** - * Constructor. - * \param n_f is a network functor. - * \param s_f is a data space functor. - * \param n_t is a network topology functor. - * \param s_t is a space topology functor. - * \param parameter_0_ is a scailing parameter. - * \param parameter_1_ is a shifting parameter. - */ - Experimental_training_weight - ( - Network_function_type const & n_f, - Space_function_type const & s_f, - Network_topology const & n_t, - Space_topology const & s_t, - Parameter_type const & parameter_0_, - Parameter_type const & parameter_1_//, -// ::boost::int32_t const s_power_ = 1, -// ::boost::int32_t const n_power_ = 1 - ) - : //s_power ( s_power_ ), - //n_power ( n_power_ ), - parameter_1 ( parameter_1_), - parameter_0 ( parameter_0_), - network_function ( n_f ), - space_function ( s_f ), - network_topology ( n_t ), - space_topology ( s_t ) - {} - - /** Copy constructor. */ - template - < - typename Value_type_2, - typename Iteration_type_2, - typename Network_function_type_2, - typename Space_function_type_2, - typename Network_topology_2, - typename Space_topology_2, - typename Index_type_2, - typename Parameter_type_2 - > - Experimental_training_weight - ( - const Experimental_training_weight - < - Value_type_2, - Iteration_type_2, - Network_function_type_2, - Space_function_type_2, - Network_topology_2, - Space_topology_2, - Index_type_2, - Parameter_type_2 - > - & experimental_training_weight - ) - : Basic_generalized_training_weight - < - Value_type_2, - Iteration_type_2, - Network_function_type_2, - Space_function_type_2, - Network_topology_2, - Space_topology_2, - Index_type_2 - >(), - parameter_1 ( experimental_training_weight.parameter_1_), - parameter_0 ( experimental_training_weight.parameter_0_), - network_function ( experimental_training_weight.n_f ), - space_function ( experimental_training_weight.s_f ), - network_topology ( experimental_training_weight.n_t ), - space_topology ( experimental_training_weight.s_t ) - {} - - /** - * Function computes generalized weight for training proces. - * This weight is not the same as weights in neural network. - * \param weight is a weight from neural network. - * \param value is a input value (value that trains network). - * \param iteration is a number of training steps could be - * number of training data sample. - * \param c_1 is a row number (position) in the network of the central neuron. - * \param c_2 is a column number (position) in the network of the central neuron. - * \param v_1 is a row number (position) in the network of the trained neuron. - * \param v_2 is a column number (position) in the network of the trained neuron. - * \f[ - * y= ( p_1 \cdot n_f (n_t (c_1,c_2,v_1,v_2)) - p_0 ) \cdot s_f (s_t (x,w)) - * \f] - * where x is value, w is neuron weight, \f$p_1\f$ is scaling parameter, \f$p_0\f$ is shifting parameter. - */ - typename Space_function_type::value_type operator() - ( - Value_type & weight, - Value_type const & value, - Iteration_type const & //iteration - , - Index_type const & c_1, - Index_type const & c_2, - Index_type const & v_1, - Index_type const & v_2 - ) const - { - //::operators::power < typename Space_function_type::value_type, ::boost::int32_t > power_v; - // calculate result - return - ( - // power_v( parameter_1 * (network_function) ( (network_topology) ( c_1, c_2, v_1, v_2 ) ) - parameter_0, n_power ) - // * power_v( (space_function) ( (space_topology) ( value, weight ) ), s_power ) - ::operators::static_power( parameter_1 * (network_function) ( (network_topology) ( c_1, c_2, v_1, v_2 ) ) - parameter_0 ) - * ::operators::static_power( (space_function) ( (space_topology) ( value, weight ) ) ) - ); - } - }; - /*\@}*/ - -} // namespace neural_net - -#endif // GENERALIZED_TRAINING_WEIGHT_HPP_INCLUDED - diff --git a/src/third-party/knnl/kohonen_network.hpp b/src/third-party/knnl/kohonen_network.hpp deleted file mode 100755 index ec2f3b9a..00000000 --- a/src/third-party/knnl/kohonen_network.hpp +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Tue 18 Apr 2006 19:25:15 CEST - * Last modified: Wed 08 Aug 2007 17:23:33 CEST - */ - -#ifndef KOHONEN_NETWORK_HPP_INCLUDED -#define KOHONEN_NETWORK_HPP_INCLUDED - -#include "ranges.hpp" - -#include -#include -#include - -/** - * \file kohonen_network.hpp - * \brief File contains template functions for preparing - * Kohonen neural networks. - * \ingroup neural_net - */ - -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - - /** - * Function generates randomly distributed weights for neural network. - * Distribution is uniform and weights are generated based on - * multidimensional ranges of training data. - * \param no_rows is a number of rows that will be created in neural network. - * \param no_columns is a number of columns that will be created in neural network. - * \param activation_function is activation function that will be set. - * \param binary_operation is a function tat will be set under activation function. - * \param data is a reference to data container. - * \param kohonen_network is a reference to the network. - * \param randomize_policy is a policy class for setting up random number generator. - * \todo TODO: When Rectangular_container will be changed then this class should be repaired too. - */ - template - < - typename Data_container_type, - typename Kohonen_network_type, - typename Randomize_policy - > - void generate_kohonen_network - ( - typename Kohonen_network_type::row_type::size_type const & no_rows, - typename Kohonen_network_type::column_type::size_type const & no_columns, - typename Kohonen_network_type::value_type::activation_function_type const & activation_function, - typename Kohonen_network_type::value_type::binary_operation_type const & binary_operation, - Data_container_type & data, - Kohonen_network_type & kohonen_network, - Randomize_policy const & randomize_policy - ) - { - randomize_policy(); - - typedef typename Kohonen_network_type::value_type Neuron_type; - typedef typename Kohonen_network_type::row_type::size_type row_size_t; - typedef typename Kohonen_network_type::column_type::size_type col_size_t; - typedef typename Neuron_type::weights_type weights_t; - typedef typename weights_t::size_type w_size_t; - - ::std::vector < Neuron_type > tmp_neuron_vector; - tmp_neuron_vector.reserve ( no_columns ); - - const w_size_t K = data.begin()->size(); - weights_t weights ( K ); - - Ranges < Data_container_type > data_ranges ( *data.begin() ); - data_ranges ( data ); - - for ( row_size_t i = 0; i < no_rows; ++i ) - { - for ( col_size_t j = 0; j < no_columns; ++j ) - { - for ( w_size_t k = 0; k < K; ++k ) - { - weights[k] = ( - static_cast < typename Data_container_type::value_type::value_type > - ( ( data_ranges.get_max().at ( k ) - - data_ranges.get_min().at ( k ) ) - * ( rand() / ( 1.0 + RAND_MAX ) ) - + data_ranges.get_min().at ( k ) ) ); - } - - Neuron_type local_neuron - ( - weights, - activation_function, - binary_operation - ); - tmp_neuron_vector.push_back ( local_neuron ); - } - kohonen_network.objects.push_back ( tmp_neuron_vector ); - tmp_neuron_vector.clear(); - } - } - /*\@}*/ - -} // namespace neural_net - -#endif // KOHONEN_NETWORK_HPP_INCLUDED - diff --git a/src/third-party/knnl/max_type.hpp b/src/third-party/knnl/max_type.hpp deleted file mode 100755 index a7c3ffc1..00000000 --- a/src/third-party/knnl/max_type.hpp +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Tue 23 May 2006 23:53:14 CEST - * Last modified: Wed 08 Aug 2007 17:25:27 CEST - */ - -#ifndef MAX_TYPE_HPP_INCLUDED -#define MAX_TYPE_HPP_INCLUDED - -#include -#include - -/** - * \file max_type.hpp - * \brief File contains template Max_type class. - * \ingroup operators - */ - -/** \addtogroup operators */ -/*\@{*/ -namespace operators -{ - template < typename S, typename T > - struct Max_type_private - {}; - - template < typename T > - struct Max_type_private < T, T > - { - typedef T type; - }; - - // just some examples to set up results for Max_type - // if anyone would like to add his/her types they just have to use - // macro MAX_TYPE_3( argument_1_type, argument_2_type, result_type ) - #define MAX_TYPE_3(T1,T2,T3) template <>\ - struct Max_type_private < T1, T2 >\ - { typedef T3 type; }; - - MAX_TYPE_3(::boost::int32_t,double,double) - MAX_TYPE_3(short,::boost::int32_t,::boost::int32_t) - MAX_TYPE_3(int,long,long) - MAX_TYPE_3(short,double,double) - MAX_TYPE_3(unsigned char,double,double) - MAX_TYPE_3(unsigned int,double,double) - MAX_TYPE_3(unsigned long,double,double) - MAX_TYPE_3(unsigned short,double,double) - // and example where we can explicitly use three different types - // MAX_TYPE(::std::complex < int >, double, ::std::complex < double >) - - // macro below assumes that bigger type is the first one - // macro MAX_TYPE_2( argument_1_type, argument_2_type ) - // simulate that result_type = argument_1_type - #define MAX_TYPE_2(T1,T2) template <>\ - struct Max_type_private < T1, T2 >\ - { typedef T1 type; }; - - MAX_TYPE_2(double,::boost::int32_t) - MAX_TYPE_2(long,int) - MAX_TYPE_2(long,short) - MAX_TYPE_2(double,short) - MAX_TYPE_2(double,unsigned char) - MAX_TYPE_2(double,unsigned int) - MAX_TYPE_2(double,unsigned long) - MAX_TYPE_2(double,unsigned short) - - /** - * \class Max_type - * \brief Template that estimates maximal of the mathematical types. - * \param T_1 first type. - * \param T_2 second type. - * \return type e.g. typeid (typename Max_type ::type) == typeid (double), - * typeid (typename Max_type <::std::complex<::boost::int32_t>,double>::type) == typeid (::std::complex). - */ - template - < - typename T_1, - typename T_2 - > - class Max_type - { - private: - typedef typename ::boost::remove_all_extents < T_1 >::type T_1_t; - typedef typename ::boost::remove_all_extents < T_2 >::type T_2_t; - - public: - typedef typename Max_type_private < T_1_t, T_2_t >::type type; - }; - - //#undef MAX_TYPE_2 - //#undef MAX_TYPE_3 - -} // namespace operators -/*\@}*/ -#endif // MAX_TYPE_HPP_INCLUDED - diff --git a/src/third-party/knnl/neural_net_headers.hpp b/src/third-party/knnl/neural_net_headers.hpp deleted file mode 100755 index 5993c42a..00000000 --- a/src/third-party/knnl/neural_net_headers.hpp +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Fri 12 May 2006 14:39:01 CEST - * Last modified: Sat 16 Dec 2006 16:06:28 CET - */ - -#ifndef NEURAL_NET_HEADERS_HPP_INCLUDED -#define NEURAL_NET_HEADERS_HPP_INCLUDED - -/** \mainpage Kohonen Neural Network Library - * - * \section intro_sec Introduction - * - * KNNL is header based library for developing Kohonen Neural Networks. - * - */ - - -/** - * \file neural_net_headers.hpp - * \brief All headers for kohonen neural network. - * \ingroup neural_net - */ - -#include "basic_neuron.hpp" -#include "euclidean_distance_function.hpp" -#include "functors.hpp" -#include "generalized_training_weight.hpp" -#include "kohonen_network.hpp" -#include "print_network.hpp" -#include "randomize_policy.hpp" -#include "ranges.hpp" -#include "rectangular_container.hpp" -#include "training_functional.hpp" -#include "weighted_euclidean_distance_function.hpp" -#include "wta_training_algorithm.hpp" -#include "wtm_topology.hpp" -#include "wtm_training_algorithm.hpp" - - -#endif // NEURAL_NET_HEADERS_HPP_INCLUDED - diff --git a/src/third-party/knnl/numeric_iterator.hpp b/src/third-party/knnl/numeric_iterator.hpp deleted file mode 100755 index cb787c35..00000000 --- a/src/third-party/knnl/numeric_iterator.hpp +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Sun 18 Jun 2006 13:22:04 CEST - * Last modified: Sun 26 Nov 2006 08:54:24 CET - */ - -#ifndef NUMERIC_ITERATOR_HPP_INCLUDED -#define NUMERIC_ITERATOR_HPP_INCLUDED - -#include - -/** - * \file numeric_iterator.hpp - * \brief File contains template classes for preparing numeric iterators. - * \ingroup neural_net - */ - -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - - /** - * \class Numeric_iterator - * \brief Class that defines bahavior of the numeric iterator. - * \param Value_type is a type of value. - */ - template < typename Value_type > - struct Numeric_iterator - { - typedef Value_type value_type; - value_type state; - - /** - * Constructor. - * \param state_ is a state in the beginning of the work of iterator - */ - Numeric_iterator ( Value_type state_ ) - : state ( state_ ) - {} - }; - - /** - * \class Linear_numeric_iterator - * \brief Class that defines bahavior of the linear numeric iterator. - * It begins with given value and iterate using given step. - * \param Value_type is a type of value. - */ - template < typename Value_type > - class Linear_numeric_iterator - : public Numeric_iterator < Value_type > - { - public: - /** - * Constructor. - * \param state_ is a begin value. - * \param step_ is a step value. - */ - Linear_numeric_iterator ( - Value_type state_ = static_cast < Value_type > ( 0 ), - Value_type step_ = static_cast < Value_type > ( 1 ) - ) - : Numeric_iterator < Value_type > ( state_ ), step ( step_ ) - {} - - /** - * Reset state. - * \param state_ is a new state. - */ - void reset ( Value_type const & state_ = static_cast < Value_type > ( 0 ) ) - { - Numeric_iterator < Value_type >::state = state_; - return; - } - - /** - * Method returns state. - */ - inline Value_type operator() ( void ) const - { - return ( Numeric_iterator < Value_type >::state ); - } - - /** - * Preincrementation. - */ - inline Linear_numeric_iterator < Value_type > & - operator++() - { - Numeric_iterator < Value_type >::state += step; - return *this; - } - - /** - * Postincrementation. - */ - inline Linear_numeric_iterator < Value_type > - operator++ ( int ) - { - typedef Numeric_iterator < Value_type > Value_numeric_iterator; - Value_type tmp ( Value_numeric_iterator::state ); - Numeric_iterator < Value_type >::state += step; - return tmp; - } - - ///\todo TODO: try to prepare conversion on Value_type - /*inline const Value_type operator Value_type ( void ) const - { - return Numeric_iterator::state; - }*/ - - protected: - Value_type step; - }; - - typedef Linear_numeric_iterator < ::boost::int32_t > linear_numeric_iterator; - /*\@}*/ - -} // namespace neural_net - -#endif // NUMERIC_ITERATOR_HPP_INCLUDED - diff --git a/src/third-party/knnl/operators.hpp b/src/third-party/knnl/operators.hpp deleted file mode 100755 index bbf198ff..00000000 --- a/src/third-party/knnl/operators.hpp +++ /dev/null @@ -1,440 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Tue 11 Apr 2006 17:47:44 CEST - * Last modified: Wed 08 Aug 2007 18:29:02 CEST - */ - -#ifndef OPERATORS_HPP_INCLUDED -#define OPERATORS_HPP_INCLUDED - -#include -#include -#include - -#include - -#include "max_type.hpp" - -/** - * \defgroup operators Operators - */ - -/** - * \file operators.hpp - * \brief File contains template operators. - * \ingroup operators - */ - -/** - * \namespace operators - * \brief Operators. - * \ingroup operators - */ - -/** \addtogroup operators */ -/*\@{*/ -namespace operators -{ - /** - * Absolute function. - * \param value is value. - * \return absolute value. - */ - template < typename T > - inline T abs ( T const & value ) - { - return ( value > 0 ? value : -value ); - } - - /** - * \class compose_f_gxy_gxy_t - * \brief Adaptator class compose_f_gxy_gxy_t. - * \param OP1 is a type of first operator f. - * \param OP2 is a type of second operator g. - * \f[ - * y=f (g (x,y),g (x,y)) - * \f] - */ - template < typename OP1, typename OP2 > - class compose_f_gxy_gxy_t - : public ::std::binary_function - < - typename OP2::first_argument_type, - typename OP2::second_argument_type, - typename OP1::result_type - > - { - public: - /** - * Constructor. - * \param o1 is a reference to the f operator. - * \param o2 is a reference to the g operator. - */ - compose_f_gxy_gxy_t - ( - OP1 const & o1, - OP2 const & o2 - ) - : op1 ( o1 ), op2 ( o2 ) - {} - - /** - * Function calculate results. - * \param x is first argument. - * \param y is second argument. - * \f[ - * y=f (g (x,y),g (x,y)) - * \f] - * where: f is OP1 type, g is OP2 type - */ - typename OP1::result_type - operator() - ( - typename OP2::first_argument_type const & x, - typename OP2::second_argument_type const & y - ) const - { - return op1 ( op2 ( x, y ),op2 ( x, y ) ); - } - - private: - /** First operator f. */ - OP1 op1; // calculate: op1 (op2 (x,y),op2 (x,y)) - - /** Secong operator g. */ - OP2 op2; - }; - - /** - * Useful function for creating adaptator compose_f_gxy_gxy. - * \param o1 is first operator. - * \param o2 is send operator. - * \return composition of the operators. - */ - template < class OP1, class OP2 > - inline compose_f_gxy_gxy_t < OP1, OP2 > - compose_f_gxy_gxy - ( - OP1 const & o1, - OP2 const & o2 - ) - { - return compose_f_gxy_gxy_t < OP1, OP2 > ( o1, o2 ); - } - - /** - * Overloading operator+ for containers. - * \param lhs is a reference to container x. - * \param rhs is a reference to container y. - * \return container. - * \f[ - * v_i = x_i + y_i - * \f] - * where: x is lhs and y is rhs. - */ - template - < - typename T, - template < typename > class Alloc_type, - template < typename, typename > class CONT - > - CONT < T, Alloc_type > - operator+ - ( - CONT < T, Alloc_type > const & lhs, - CONT < T, Alloc_type > const & rhs - ) - { - CONT < T, Alloc_type > result ( lhs ); - - ::std::transform - ( - result.begin(), - result.end(), - rhs.begin(), - result.begin(), - ::std::plus < typename CONT < T, Alloc_type >::value_type >() - ); - - return result; - } - - /** - * Overloading operator- for containers. - * \param lhs is a reference to container x. - * \param rhs is a reference to container y. - * \return container. - * \f[ - * v_i = x_i - y_i - * \f] - * where: x is lhs and y is rhs. - */ - template - < - typename T, - template < typename > class Alloc_type, - template < typename, typename > class CONT - > - CONT < T, Alloc_type > - operator- - ( - CONT < T, Alloc_type > const & lhs, - CONT < T, Alloc_type > const & rhs - ) - { - CONT < T , Alloc_type > result ( lhs ); - - ::std::transform - ( - result.begin(), - result.end(), - rhs.begin(), - result.begin(), - ::std::minus < typename CONT < T , Alloc_type >::value_type >() - ); - - return result; - } - - /** - * Overloading operator* for container as product of the scalar value and container. - * \param a is a reference to container x. - * \param rhs is a reference to container y. - * \return container. - * \f[ - * v_i = a * y_i - * \f] - * where: a is scaling coefficient and y is rhs. - */ - template - < - typename K, - typename T, - template < typename > class Alloc_type, - template < typename, typename > class CONT - > - CONT < T, Alloc_type > - operator* - ( - K const & a, - CONT < T, Alloc_type > const & rhs - ) - { - CONT < T , Alloc_type > result ( rhs ); - - ::std::transform - ( - result.begin(), - result.end(), - result.begin(), - ::std::bind2nd - ( - ::std::multiplies < typename CONT < T , Alloc_type >::value_type >(), - a - ) - ); - - return result; - } - - /** - * Template function calculates inverse of the value. - * It could be overloaded/specialized for matrix - * and other complicated types. - * \param x is a value to be inversed. - */ - template < typename Value_type > - inline typename Max_type < double, Value_type >::type - inverse ( Value_type const & x ) - { - typedef typename Max_type < double, Value_type >::type internal_type; - - return - ( - static_cast < internal_type > ( 1 ) - / static_cast < internal_type > ( x ) - ); - } - - /** - * \class power - * \brief Helper class for calculating power. - * \param T is value type. - * \param E is exponent type. - */ - template - < - typename T, - typename E, - bool ISINTEGRAL = ::boost::is_integral::value - > - class power; - - /** - * Specialization for the integral exponents. - * \param T is value type. - * \param E is exponent type. - * \f[ - * y=v^e - * \f] - */ - template < typename T, typename E > - class power < T, E, true > - { - public: - typedef typename Max_type < T, E >::type result_type; - - result_type operator() ( T const & value_, E const & exp_ ) const - { - if ( exp_ == 0 ) - { - return static_cast < result_type > ( 1 ); - } - - if ( exp_ < 0 ) - { - return power_int ( value_, -exp_ ); - } - else - { - return power_int ( value_, exp_ ); - } - } - - private: - /** - * Fast power algorithm. - * \param value_ value. - * \param exp_ exponent factor. - * \return value of power - * \f[ - * z=x^y - * \f] - * where: x is value_, y is exp_. - */ - result_type power_int ( T const & value_, E const & exp_ ) const - { - T z = value_; - result_type y; - E m = exp_; - - while ( ! ( m & 1 ) ) - { - m = m / 2; - z = z * z; - } - y = z; - - while ( m > 1 ) - { - m = m / 2; - z = z * z; - if ( m & 1 ) - { - y = y * z; - } - } - return y; - } - }; - - /** - * Specialization for the real exponents. - * \param T is value type. - * \param E is exponent type. - * \f[ - * y=v^e - * \f] - */ - template < typename T, typename E > - class power < T, E, false > - { - public: - typedef typename Max_type < T, E >::type result_type; - - /** - * Fast power algorithm. - * \param value_ value. - * \param exp_ exponent factor. - * \return value of power - * \f[ - * z=x^y - * \f] - * where: x is value_, y is exp_. - */ - result_type operator() ( T const & value_, E const & exp_ ) const - { - return ::std::pow ( static_cast < result_type > ( value_ ), exp_ ); - } - }; - - template < typename T, ::boost::int32_t N > - struct static_power_t; - - template < typename T > - struct static_power_t - { - T operator()(T const) - { - return static_cast(1); - } - }; - - template < typename T, ::boost::int32_t N > - struct static_power_t - { - T operator()( T const x ) - { - //static_power_t sp; - return x * static_power_t()(x); - } - }; - - template < typename T, ::boost::int32_t N > - T static_power ( T const x ) - { - return static_power_t()(x); - } - -} // namespace operators -/*\@}*/ -#endif // OPERATORS_HPP_INCLUDED - diff --git a/src/third-party/knnl/print_network.hpp b/src/third-party/knnl/print_network.hpp deleted file mode 100755 index fb027251..00000000 --- a/src/third-party/knnl/print_network.hpp +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Fri 21 Apr 2006 19:30:09 CEST - * Last modified: Wed 08 Aug 2007 17:26:34 CEST - */ - -#ifndef PRINT_NETWORK_HPP_INCLUDED -#define PRINT_NETWORK_HPP_INCLUDED - -#include -#include -#include - -/** - * \file print_network.hpp - * \brief File contains template function to print network. - * \ingroup neural_net - */ - -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - - /** - * Function prints weight of the neural network. - * \param os is output stream. - * \param network is a reference to network. - * \return modified stream. - */ - template < typename T > - ::std::ostream & print_network_weights - ( ::std::ostream & os, T const & network, char const * sep = "\t" ) - { - const typename T::row_size_t M = network.objects.size(); - const typename T::col_size_t N = network.objects[0].size(); - - for ( typename T::row_size_t i = 0; i < M; ++i ) - { - for ( typename T::col_size_t j = 0; j < N; ++j ) - { - ::std::copy - ( - network.objects[i][j].weights.begin(), - network.objects[i][j].weights.end(), - ::std::ostream_iterator - < - typename T::value_type::weights_type::value_type - > ( os, sep ) - ); - os << ::std::endl; - } - } - return os; - } - - /** - * Function puts container of any values to the stream. - * \param os is a output stream. - * \param value is a value. - * \return modified stream. - */ - template < typename T > - inline ::std::ostream & container_to_ostream ( ::std::ostream & os, T const & container ) - { - typedef typename T::value_type Value; - ::std::copy ( container.begin(), container.end(), ::std::ostream_iterator < Value > ( os, " " ) ); - return os; - } - - /** - * Function prints structure and results of the neural network. - * \param os is output stream. - * \param network is a reference to network. - * \param value is a value that network will calculate results. - * \return modified stream. - */ - template < typename T, typename U > - ::std::ostream & print_network ( ::std::ostream & os, T const & network, U const & value ) - { - const typename T::row_size_t M = network.objects.size(); - const typename T::col_size_t N = network.objects[0].size(); - - for ( typename T::row_size_t i = 0; i < M; ++i ) - { - for ( typename T::col_size_t j = 0; j < N; ++j ) - { - os << "weights[" << i <<"][" << j << "] = "; - ::std::copy - ( - network.objects[i][j].weights.begin(), - network.objects[i][j].weights.end(), - ::std::ostream_iterator - < - typename T::value_type::weights_type::value_type - > ( os, "\t" ) - ); - os << " ( "; - - container_to_ostream ( os, value ); - - os << " ) == "; - //os << network.objects[i][j] ( value ); - //os << " == "; - os << network.objects [ i ][ j ]( value ); - os << ::std::endl; - } - os << ::std::endl; - } - return os; - } - /*\@}*/ -}// namespace neural_net - -#endif // PRINT_NETWORK_HPP_INCLUDED - diff --git a/src/third-party/knnl/randomize_policy.hpp b/src/third-party/knnl/randomize_policy.hpp deleted file mode 100755 index 80f473a5..00000000 --- a/src/third-party/knnl/randomize_policy.hpp +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Mon 22 May 2006 20:03:59 CEST - * Last modified: Wed 08 Aug 2007 17:27:14 CEST - */ - -#ifndef RANDOMIZE_POLICY_HPP_INCLUDED -#define RANDOMIZE_POLICY_HPP_INCLUDED - -#include -#include - -/** - * \file randomize_policy.hpp - * \brief File contains policy classes to set randomize functionality - * in to network generation process. - * \ingroup neural_net - */ - -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - class Randomize_policy - { - typedef Randomize_policy this_type; - }; - - /** - * \class External_randomize - * \brief This class force not to use srand() in generation proces, - * therefore srand function is initialized externally. - */ - struct External_randomize - : public Randomize_policy - { - typedef External_randomize this_type; - - /** Do nothing :-). */ - void operator() ( void ) const - { - return; - } - }; - - /** - * \class Internal_randomize - * \brief This class force to use srand() in generation proces, - * therefore srand function is NOT initialized. - */ - struct Internal_randomize - : public Randomize_policy - { - typedef Internal_randomize this_type; - - /** Initialize random number generator using srand(). */ - void operator() ( void ) const - { - ::std::srand (static_cast (::std::time (NULL))); - return; - } - }; - /*\@}*/ - -} // namespace neural_net - -#endif // RANDOMIZE_POLICY_HPP_INCLUDED - diff --git a/src/third-party/knnl/ranges.hpp b/src/third-party/knnl/ranges.hpp deleted file mode 100755 index ce084f4c..00000000 --- a/src/third-party/knnl/ranges.hpp +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Mon 24 Apr 2006 12:11:38 CEST - * Last modified: Wed 08 Aug 2007 17:27:38 CEST - */ - -#ifndef RANGES_HPP_INCLUDED -#define RANGES_HPP_INCLUDED - -#include -#include - -/** - * \file ranges.hpp - * \brief File contains template class Ranges. - * \ingroup neural_net - */ - -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - - /** - * \class Ranges - * \brief Class creates and claculates ranges of data. - * \param Container_type is a type of container. - */ - template < typename Container_type > - class Ranges - { - public: - /** - * Constructor. - * \param value_ is a value that will be set at he begining. - */ - explicit Ranges ( typename Container_type::value_type const & value_ ) - :ranges ( value_, value_ ) - {} - - /** Copy constructor. */ - template < typename Container_type_2 > - Ranges ( Ranges < Container_type_2 > const & ranges_ ) - : ranges ( ranges_.ranges ) - {} - - /** - * Function that is going through the all container. - * \param value is a reference to the container. - */ - void operator() ( Container_type const & value ) - { - typename Container_type::const_iterator pos; - - typename Container_type::value_type::const_iterator pos_range; - typename Container_type::value_type::iterator pos_min_range; - typename Container_type::value_type::iterator pos_max_range; - - // go through the all data in container and ... - for ( pos = value.begin(); pos != value.end(); ++pos ) - { - // look for the highest and lowest values to set ranges. - // iterate through position of the container and ranges type to compare - // proper values and set ranges. - for - ( - pos_min_range = ranges.first.begin(), - pos_max_range = ranges.second.begin(), - pos_range = pos->begin(); - pos_min_range != ranges.first.end(); - ++pos_min_range, ++pos_max_range, ++pos_range - ) - { - *pos_min_range = ::std::min ( *pos_min_range, *pos_range ); - *pos_max_range = ::std::max ( *pos_max_range, *pos_range ); - } - } - } - - /** - * Function returns supremum value of the data in the container. - * This value could not exests in container, because is created from - * all maximums of data e.g. { (1,2), (2,1) } -> (2,2) - */ - typename Container_type::value_type const & get_max() const - { - return ranges.second; - } - - /** - * Function returns infimum of the data in the container. - * This value could not exests in container, because is created from - * all minimums of data e.g. { (1,2), (2,1) } -> (1,1) - */ - typename Container_type::value_type const & get_min() const - { - return ranges.first; - } - - protected: - Ranges(); - - private: - ::std::pair - < - typename Container_type::value_type, - typename Container_type::value_type - > ranges; - - }; - /*\@}*/ - -} // namespace neural_net - -#endif // RANGES_HPP_INCLUDED - diff --git a/src/third-party/knnl/rectangular_container.hpp b/src/third-party/knnl/rectangular_container.hpp deleted file mode 100755 index 9edbd366..00000000 --- a/src/third-party/knnl/rectangular_container.hpp +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Fri 14 Apr 2006 22:37:57 CEST - * Last modified: Wed 08 Aug 2007 18:29:17 CEST - */ - -#ifndef RECTANGULAR_CONTAINER_HPP_INCLUDED -#define RECTANGULAR_CONTAINER_HPP_INCLUDED - -#include - -/** - * \file rectangular_container.hpp - * \brief File contains class Rectangular_container - * \ingroup neural_net - */ - -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - - /** - * Rectangular_grid_container template class. - * \param Object_type is type of stored objects. - * \todo TODO: Rectangular_container class should be rewritten - * using new version of ::boost::matrix. - */ - template - < - typename Object_type - > - class Rectangular_container - { - public: - - typedef Object_type value_type; - typedef typename ::std::vector < Object_type > column_type; - typedef typename ::std::vector < column_type > row_type; - - typedef typename row_type::iterator row_iterator; - typedef typename column_type::iterator column_iterator; - - typedef typename row_type::size_type row_size_t; - typedef typename column_type::size_type col_size_t; - - /** - * Stores size of container. - */ - typedef ::std::pair < row_size_t, col_size_t > Matrix_index; - - /** Objects. */ - row_type objects; - - /** - * Get object. - * \param i is the row number. - * \param j is the column number. - * \return const reference to the (i,j)-th object. - */ - Object_type const & operator() ( row_size_t i, col_size_t j ) - { - return objects[i][j]; - } - - /** - * Constructor. - */ - Rectangular_container() - {} - - /** Copy constructor. */ - template < typename Object_type_2 > - Rectangular_container - ( - Rectangular_container < Object_type_2 > const & rectangular_container - ) - : objects ( rectangular_container.objects ) - {} - - inline col_size_t get_no_columns() const - { - return objects.begin()->size(); - } - - inline row_size_t get_no_rows() const - { - return objects.size(); - } - - inline Matrix_index get_size() const - { - Matrix_index idx; - idx.first = objects.size(); - idx.second = objects.begin()->size(); - - return idx; - } - - }; - /*\@}*/ - -} // namespace neural_net - -#endif // RECTANGULAR_CONTAINER_HPP_INCLUDED - diff --git a/src/third-party/knnl/std_headers.hpp b/src/third-party/knnl/std_headers.hpp deleted file mode 100755 index 3c4f82b5..00000000 --- a/src/third-party/knnl/std_headers.hpp +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Fri 12 May 2006 14:39:01 CEST - * Last modified: Sun 18 Jun 2006 09:44:28 CEST - */ - -#ifndef STD_HEADERS_HPP_INCLUDED -#define STD_HEADERS_HPP_INCLUDED - -/** - * \file std_headers.hpp - * \brief Contains all important standard headers. - * \ingroup neural_net - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif // STD_HEADERS_HPP_INCLUDED - diff --git a/src/third-party/knnl/training_functional.hpp b/src/third-party/knnl/training_functional.hpp deleted file mode 100755 index 1bbca798..00000000 --- a/src/third-party/knnl/training_functional.hpp +++ /dev/null @@ -1,357 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Wed 26 Apr 2006 14:55:28 CEST - * Last modified: Wed 08 Aug 2007 18:25:18 CEST - */ - -#ifndef TRAINING_FUNCTIONAL_HPP_INCLUDED -#define TRAINING_FUNCTIONAL_HPP_INCLUDED - -/** - * \file training_functional.hpp - * \brief File contains template classes that support - * training proces of the network. - * \ingroup neural_net - */ - -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - - /** - * \class Basic_training_functional - * \brief Basic trainng functional. - */ - class Basic_training_functional - {}; - - /** - * \class Basic_wta_training_functional - * \brief Class that is basic for Winner Takes All (WTA) algorithms. - * \param Value_type is a type of values. - * \param Parameters_type is a type of parameters of training functional. - */ - template - < - typename Value_type, - typename Parametres_type - > - class Basic_wta_training_functional - : public Basic_training_functional - { - public: - typedef Value_type value_type; - typedef Parametres_type parameters_type; - }; - - /** - * \class Basic_wtm_training_functional - * \brief Class that is basic for Winner Takes Most (WTM) algorithms. - * \param Value_type is a type of values. - * \param Parameters_type is a type of parameters of training functional. - * \param Iteration_type is a type of step counter value. - * \param Index_type is a type of index used in network. - * \param Topology_type is a type of topology that should be used - * for measuring distance in network. - */ - template - < - typename Value_type, - typename Parameters_type, - typename Iteration_type, - typename Index_type, - typename Topology_type - > - class Basic_wtm_training_functional - : public Basic_wta_training_functional - < Value_type, Parameters_type > - { - public: - typedef Iteration_type iteration_type; - typedef Index_type index_type; - typedef Topology_type topology_type; - }; - - /** - * \class Wta_proportional_training_functional - * \brief Class that certain kind of WTA algorithm. - * \param Value_type is a type of values. - * \param Parameters_type is a type of parameters of training functional. - * \param Iteration_type is a type of step counter value. - * Algorithm in the time of training for single data set could change - * weight in training function. - * \f[ - * w_{i,j} (t+1)=w_{i,j} (t) + ( p_0 + p_1 * s ) * ( x (t) - w_{i,j} (t) ) - * \f] - */ - template - < - typename Value_type, - typename Parameters_type, - typename Iteration_type - > - class Wta_proportional_training_functional - : public Basic_wta_training_functional - < - Value_type, - Parameters_type - > - { - public: - - typedef Iteration_type iteration_type; - - /** Shifting parameter for linear function */ - Parameters_type parameter_0; - - /** Scaling parameter for linear function */ - Parameters_type parameter_1; - - /** - * Constructor. - * \param parameter_0_ is a shifting parameter for linear function - * used for training. - * \param parameter_1_ is a scaling parameter for linear function - * used for training. - */ - Wta_proportional_training_functional - ( - Parameters_type const & parameter_0_, - Parameters_type const & parameter_1_ - ) - : parameter_0 ( parameter_0_ ), parameter_1 ( parameter_1_ ) - {} - - /** Copy constructor. */ - template - < - typename Value_type_2, - typename Parameters_type_2, - typename Iteration_type_2 - > - Wta_proportional_training_functional - ( - Wta_proportional_training_functional - < - Value_type_2, - Parameters_type_2, - Iteration_type_2 - > - const & training_functional_ - ) - : Basic_wta_training_functional < Value_type, Parameters_type >(), - parameter_0 ( training_functional_.parameter_0 ), - parameter_1 ( training_functional_.parameter_1 ) - {} - - /** - * Training function. - * \param weight is weight of the neuron. - * \param value is value that trains winner neuron. - * \param s is step number. - * \return modified weight. - * \f[ - * w_{i,j} (t+1)=w_{i,j} (t) + ( p_0 + p_1 * s ) * ( x (t) - w_{i,j} (t) ) - * \f] - * where: x is value, w is weight and s is step number. - */ - Value_type & operator() - ( - Value_type & weight, - Value_type const & value, - iteration_type const & s - ) const - { - using namespace ::operators; - return - ( - weight - = weight - + ( parameter_0 + parameter_1 * s ) - * ( value - weight ) - ); - } - }; - - /** - * \class Wtm_classical_training_functional - * \brief Class that is basic for Winner Takes Most (WTM) algorithms. - * \param Value_type is a type of values. - * \param Parameters_type is a type of parameters of training functional. - * \param Iteration_type is a type of step counter value. - * \param Index_type is a type of index used in network. - * \param Generalized_training_weight_type is a type of functor that will - * be used for set up training weight. - */ - template - < - typename Value_type, - typename Parameters_type, - typename Iteration_type, - typename Index_type, - typename Generalized_training_weight_type - > - class Wtm_classical_training_functional - : public Basic_wtm_training_functional - < - Value_type, - Parameters_type, - Iteration_type, - Index_type, - Generalized_training_weight_type - > - { - public: - - /** Final scaling of the function. */ - Parameters_type parameter; - - /** Functor calculates training weight. */ - Generalized_training_weight_type generalized_training_weight; - - /** - * Constructor. - * \param generalized_weight is a reference to the functor. - * \param parameter_ is a reference to scaling parameter. - */ - Wtm_classical_training_functional - ( - Generalized_training_weight_type const & generalized_weight, - Parameters_type const & parameter_ - ) - : Basic_wtm_training_functional - < - Value_type, - Parameters_type, - Iteration_type, - Index_type, - Generalized_training_weight_type - >(), - parameter ( parameter_ ), - generalized_training_weight ( generalized_weight ) - {} - - /** Copy constructor. */ - template - < - typename Value_type_2, - typename Parameters_type_2, - typename Iteration_type_2, - typename Index_type_2, - typename Generalized_training_weight_type_2 - > - Wtm_classical_training_functional - ( - const Wtm_classical_training_functional - < - Value_type_2, - Parameters_type_2, - Iteration_type_2, - Index_type_2, - Generalized_training_weight_type_2 - > - & training_functional_ - ) - : Basic_wtm_training_functional - < - Value_type, - Parameters_type, - Iteration_type, - Index_type, - Generalized_training_weight_type - >(), - parameter ( training_functional_.parameter ), - generalized_training_weight ( training_functional_.generalized_training_weight ) - {} - - /** - * Function calculates new value of the neuron weight. - * \param weight is a reference to the trained neuron weight. - * \param value is a reference to the value that trains neuron. - * \param s is step number. - * \param center_i is a first index of the central neuron (row number). - * \param center_j is a second index of the central neuron (column number). - * \param i_ is a first index of a trained neuron (row number). - * \param j_ is a second index of a trained neuron (column number). - * \return modified neuron weight. - * \f[ - * w_{i,j} (t+1) = w_{i,j} (t) + G ( w_{i,j} (t), x (t), s, c_i, c_j, i, j ) * ( x (t) - w_{i,j} (t) ) - * \f] - */ - Value_type & operator() - ( - Value_type & weight, - Value_type const & value, - Iteration_type const & s, - Index_type const & center_i, - Index_type const & center_j, - Index_type const & i_, - Index_type const & j_ - ) - { - using namespace ::operators; - - return - ( - weight - = weight - + parameter - * (generalized_training_weight) - ( - weight, - value, - s, - center_i, center_j, - i_, j_ - ) - * ( value - weight ) - ); - } - }; - /*\@}*/ - -} // namespace neural_net - -#endif // TRAINING_FUNCTIONAL_HPP_INCLUDED - diff --git a/src/third-party/knnl/value_type.hpp b/src/third-party/knnl/value_type.hpp deleted file mode 100755 index d9949c6d..00000000 --- a/src/third-party/knnl/value_type.hpp +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT megapolis DOT pl - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Thu 08 Jun 2006 18:12:00 CEST - * Last modified: Thu 08 Jun 2006 18:18:00 CEST - */ - -#ifndef VALUE_TYPE_HPP_INCLUDED -#define VALUE_TYPE_HPP_INCLUDED - -#include - -/** - * \file value_type.hpp - * \brief File contains template to recognize type of value. - * \ingroup operators - */ - -namespace operators -{ - /** - * \addtogroup operators - */ - /*\@{*/ - - template < typename T > - struct Value_type - { - typedef typename T::value_type type; - }; - - template <> - struct Value_type < double > - { - typedef double type; - }; - - template <> - struct Value_type < unsigned int > - { - typedef double type; - }; - - template <> - struct Value_type < ::boost::int32_t > - { - typedef double type; - }; - - template <> - struct Value_type < unsigned long > - { - typedef double type; - }; - - /*\@}*/ - -} // namespace operators - -#endif // VALUE_TYPE_HPP_INCLUDED - diff --git a/src/third-party/knnl/weighted_euclidean_distance_function.hpp b/src/third-party/knnl/weighted_euclidean_distance_function.hpp deleted file mode 100755 index 791d8d2d..00000000 --- a/src/third-party/knnl/weighted_euclidean_distance_function.hpp +++ /dev/null @@ -1,231 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Mon 17 Apr 2006 23:54:20 CEST - * Last modified: Sun 26 Nov 2006 09:33:07 CET - */ - -#ifndef WEIGHTED_EUCLIDEAN_DISTANCE_FUNCTION_HPP_INCLUDED -#define WEIGHTED_EUCLIDEAN_DISTANCE_FUNCTION_HPP_INCLUDED - -#include "operators.hpp" -#include "basic_weak_distance_function.hpp" -#include - -#include "value_type.hpp" - -/** - * \file weighted_euclidean_distance_function.hpp - * \brief File contains template class Weighted_euclidean_distance_function. - * \ingroup distance - */ - -namespace distance -{ - /** - * \addtogroup distance - */ - /*\@{*/ - - /** - * Weighted_euclidean_distance_function template class. - * \param Value_type is a type of values. - * \param Parameters_type is a type of parameters (weights) used in weighted Euclidean distance. - * \f[ - * d (x,y,w) = \sum\limits_{i=0}^{N} w_i\cdot (x_i-y_i)^2 - * \f] - */ - template - < - typename Parameters_type, - typename Value_type - > - class Weighted_euclidean_distance_function - : public Basic_weak_distance_function - < - Value_type, - Value_type - > - { - private: - typedef typename Value_type::value_type inner_type; - - /** Parameters. */ - Parameters_type const * parameters; - - /** Parameters size. */ - ::boost::int32_t parameters_size; - - public: - typedef Parameters_type parameters_type; - - /** - * Constructor. - */ - explicit Weighted_euclidean_distance_function ( Parameters_type const * weights ) - : parameters ( weights ) - { - assert ( parameters != static_cast < Parameters_type * > ( 0 ) ); - parameters_size = parameters->size(); - } - - /** - * Calculation function. - * \param x input value for the function. - * \param y input value for the function. - * \return square of the weighted Euclidean distance function. - * \f[ - * d (x,y,w) = \sum\limits_{i=0}^{N} w_i\cdot (x_i-y_i)^2 - * \f] - * where: w are parameters given in constructor. - */ - inner_type operator() - ( - Value_type const & x, - Value_type const & y - ) const - { - return - ( - weighted_euclidean_distance_square - ( - x.begin(), - x.end(), - y.begin(), - parameters->begin(), - static_cast < inner_type const & > (0) - ) - ); - } - - /** Copy constructor */ - template - < - typename Parameters_type_2, - typename Value_type_2 - > - Weighted_euclidean_distance_function - ( - Weighted_euclidean_distance_function - < - Parameters_type_2, - Value_type_2 - > - const & weighted_euclidean_distance - ) - : parameters ( weighted_euclidean_distance.parameters ) - {} - - /** Operator= */ - template - < - typename Parameters_type_2, - typename Value_type_2 - > - Weighted_euclidean_distance_function - < - Parameters_type, - Value_type - > & - operator= - ( - Weighted_euclidean_distance_function - < - Parameters_type_2, - Value_type_2 - > - const & weighted_euclidean_distance - ) - { - // Handle self-assignment: - if ( this == &weighted_euclidean_distance ) - { - return *this; - } - - parameters = weighted_euclidean_distance.parameters; - parameters_size = weighted_euclidean_distance.parameters_size; - - return *this; - } - - private: - /** - * Function calculates weighted Euclidean distance between two containers. - * \param begin_1 is a begin iterator for the first container. - * \param end_1 is an end iterator for the first container. - * \param begin_2 is a begin iterator for the second container. - * \param begin_3 is a bagin iterator for the parameters. - * \param init is an initial value. - * \result sqare of weighted Euclidean distance. - * \f[ - * d (x,y,w) = d_0 + \sum\limits_{i=0}^{N} w_i\cdot (x_i-y_i)^2 - * \f] - * where: x is given by range of Input_iterator_1, - * y is given through Input_iterator_2, - * w is given through Input_iterator_3, - * \f$d_0\f$ is initial value (init). - */ - inner_type weighted_euclidean_distance_square - ( - typename Value_type::const_iterator begin_1, - typename Value_type::const_iterator end_1, - typename Value_type::const_iterator begin_2, - typename Parameters_type::const_iterator begin_3, - inner_type const & init - ) const - { - inner_type tmp_val; - inner_type result = init; - - for ( ; begin_1 != end_1 ; ++begin_1, ++begin_2, ++begin_3 ) - { - tmp_val = *begin_1 - *begin_2; - result = result + *begin_3 * ( tmp_val * tmp_val ); - } - return result; - } - }; - /*\@}*/ - -} // namespace distance - -#endif // WEIGHTED_EUCLIDEAN_DISTANCE_FUNCTION_HPP_INCLUDED - diff --git a/src/third-party/knnl/wta_training_algorithm.hpp b/src/third-party/knnl/wta_training_algorithm.hpp deleted file mode 100755 index ffe964ab..00000000 --- a/src/third-party/knnl/wta_training_algorithm.hpp +++ /dev/null @@ -1,278 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Fri 21 Apr 2006 17:33:34 CEST - * Last modified: Wed 08 Aug 2007 18:29:31 CEST - */ - -#ifndef WTA_TRAINING_ALGORITM_HPP_INCLUDED -#define WTA_TRAINING_ALGORITM_HPP_INCLUDED - -#include -#include -#include -#include - -#include - -#include "training_functional.hpp" -#include "numeric_iterator.hpp" - -/** - * \file wta_training_algorithm.hpp - * \brief File contains template class Wta_training_algoritm. - * \ingroup neural_net - */ - -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - - /** - * \class Wta_training_algorithm - * \brief Class contains functionality for training - * kohonen network using WTA method. - * \param Network_type is a network type. - * \param Value_type is a type os single data - * in mathematical meanning, so it could be ::std::vector, too. - * \param Data_iterator_type is is iterator for container - * with training data. - * \param Training_functional_type is a type of functional. - * \param Numeric_iterator_type is a type of numeric iterator. - */ - template - < - typename Network_type, - typename Value_type, - typename Data_iterator_type, - typename Training_functional_type, - typename Numeric_iterator_type - = Linear_numeric_iterator < - typename Training_functional_type::iteration_type - > - > - class Wta_training_algorithm - { - public: - - typedef typename Training_functional_type::iteration_type iteration_type; - typedef Numeric_iterator_type numeric_iterator_type; - typedef Network_type network_type; - typedef Value_type value_type; - typedef Data_iterator_type data_iterator_type; - typedef Training_functional_type training_functional_type; - - /** Training functional. */ - Training_functional_type training_functional; - - /** - * Constructor. - * \param training_functional_ is a training functor. - * \param numeric_iterator_ is a numeric iterator. - */ - Wta_training_algorithm - ( - Training_functional_type const & training_functional_, - Numeric_iterator_type numeric_iterator_ = linear_numeric_iterator() - ) - : training_functional ( training_functional_ ), - numeric_iterator ( numeric_iterator_ ) - { - network = static_cast < Network_type * > ( 0 ); - } - - /** - * Copy constructor. - * It makes flat copy of neural network, so it copies only pointer not structure. - */ - template - < - typename Network_type_2, - typename Value_type_2, - typename Data_iterator_type_2, - typename Training_functional_type_2, - typename Numeric_iterator_type_2 - > - Wta_training_algorithm - ( - Wta_training_algorithm - < - Network_type_2, - Value_type_2, - Data_iterator_type_2, - Training_functional_type_2, - Numeric_iterator_type_2 - > - const & wta_training_alg_ - ) - : training_functional ( wta_training_alg_.training_functional ), - numeric_iterator ( wta_training_alg_.numeric_iterator ), - iteration ( wta_training_alg_.iteration ) - { - network = wta_training_alg_.network; - } - - /** - * Function that starts training proces. - * \param network_ is a pointer to the existing kohonen neural network. - * \param data_begin is a begin iterator, it could be revers. - * \param data_end is end iterator. - * \return error code. - */ - ::boost::int32_t operator() - ( - Data_iterator_type data_begin, - Data_iterator_type data_end, - Network_type * network_ - ) - { - network = network_; - - // check if pointer is not null - assert ( network != static_cast < Network_type * > ( 0 ) ); - - // for each data train neural network - ::std::for_each - ( - data_begin, data_end, - ::boost::bind - ( - & Wta_training_algorithm - < - Network_type, - Value_type, - Data_iterator_type, - Training_functional_type, - Numeric_iterator_type - >::train, - this, - _1 - ) - ); - - return 0; - } - - protected: - /** Pointer to the network. */ - Network_type * network; - - iteration_type iteration; - - Numeric_iterator_type numeric_iterator; - - /** - * Function trains neural network using single value. - * \param value is a value. - * As is set in WTA algoritm method is looking for the best neuron, - * and train it to have better results with actual data in the future. - */ - void train ( Value_type const & value ) - { - typename Network_type::row_size_t index_1 = 0; - typename Network_type::col_size_t index_2 = 0; - - typename Network_type::value_type::result_type tmp_result; - - // reset max_result - typename Network_type::value_type::result_type max_result - = ::std::numeric_limits - < - typename Network_type::value_type::result_type - >::min(); - - typename Network_type::row_iterator r_iter; - typename Network_type::column_iterator c_iter; - - // set ranges for iteration procedure - typename Network_type::row_size_t r_counter = 0; - typename Network_type::col_size_t c_counter = 0; - - for ( r_iter = network->objects.begin(); - r_iter != network->objects.end(); - ++r_iter - ) - { - for ( c_iter = r_iter->begin(); - c_iter != r_iter->end(); - ++c_iter - ) - { - tmp_result = ( *c_iter ) ( value ); - if ( tmp_result > max_result ) - { - index_1 = r_counter; - index_2 = c_counter; - max_result = tmp_result; - } - ++c_counter; - } - ++r_counter; - c_counter = 0; - } - - r_iter = network->objects.begin(); - ::std::advance ( r_iter, index_1 ); - - c_iter = r_iter->begin(); - ::std::advance ( c_iter, index_2 ); - - // train the winning neuron - (training_functional) - ( - c_iter->weights, - value, - this->iteration - ); - - // increase iteration - ++numeric_iterator; - iteration = numeric_iterator(); - } - }; - /*\@}*/ - -} // namespace neural_net - -#endif // WTA_TRAINING_ALGORITM_HPP_INCLUDED - diff --git a/src/third-party/knnl/wtm_topology.hpp b/src/third-party/knnl/wtm_topology.hpp deleted file mode 100755 index 3fad0512..00000000 --- a/src/third-party/knnl/wtm_topology.hpp +++ /dev/null @@ -1,288 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Wed 03 May 2006 13:18:41 CEST - * Last modified: Wed 08 Aug 2007 18:22:48 CEST - */ - -#ifndef WTM_TOPOLOGY_HPP_INCLUDED -#define WTM_TOPOLOGY_HPP_INCLUDED - -#include - -#include "operators.hpp" - -/** - * \file wtm_topology.hpp - * \brief File contains template classes for setting up topology in the network. - * \ingroup neural_net - */ -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - - /** - * \class Basic_topology - * \brief Basic class for topologies. - * \param Result_type type of result of the topology as a functor - * that calculates didtance between two points - * in particular case two neurons. - * \param Index_type is a type is index that is used in neural network. - */ - template - < - typename Result_type, - typename Index_type - > - class Basic_topology - { - public: - typedef Result_type result_type; - typedef Index_type value_type; - }; - - /** - * \class City_topology - * \brief Topology for neural network that calculates distance between two neurons. - * \param Index_type is a type of index. - * \f[ - * d (n,m) = |n_1-m_1| + |n_2-m_2| - * \f] - */ - template < typename Index_type > - class City_topology - : public Basic_topology < Index_type, Index_type > - { - public: - - /** - * Function claculates distance. - * \param index_1_1 is first index of first neuron. - * \param index_1_2 is second index of first neuron. - * \param index_2_1 is first index of second neuron. - * \param index_2_2 is second index of second neuron. - * \f[ - * d (n,m) = |n_1-m_1| + |n_2-m_2| - * \f] - * where: n is first neuron, m is second neuron. - */ - inline Index_type operator() - ( - Index_type const & index_1_1, - Index_type const & index_1_2, - Index_type const & index_2_1, - Index_type const & index_2_2 - ) const - { - return - ( - ::operators::abs ( index_1_1 - index_2_1 ) - + ::operators::abs ( index_1_2 - index_2_2 ) - ); - } - }; - - /** - * \class Max_topology - * \brief Topology for neural network that calculates distance between two neurons. - * \param Index_type is a type of index. - * \f[ - * d (n,m) = \max ( |n_1-m_1|, |n_2-m_2| ) - * \f] - */ - template < typename Index_type > - class Max_topology - : public Basic_topology < Index_type, Index_type > - { - public: - - /** - * Function claculates distance. - * \param index_1_1 is first index of first neuron. - * \param index_1_2 is second index of first neuron. - * \param index_2_1 is first index of second neuron. - * \param index_2_2 is second index of second neuron. - * \f[ - * d (n,m) = \max ( |n_1-m_1|, |n_2-m_2| ) - * \f] - * where: n is first neuron, m is second neuron. - */ - inline Index_type operator() - ( - Index_type const & index_1_1, - Index_type const & index_1_2, - Index_type const & index_2_1, - Index_type const & index_2_2 - ) const - { - return - ( - ::std::max - ( - ::operators::abs ( index_1_1 - index_2_1 ), - ::operators::abs ( index_1_2 - index_2_2 ) - ) - ); - } - }; - - /** - * \class Hexagonal_topology - * \brief Topology for neural network that calculates distance between two neurons. - * \param Index_type is a type of index. - * \f{eqnarray*} - * h_1 (x) & = & \frac{ x_1 + 1 }{2} + x_2\\ - * h_2 (x) & = & \frac{h_{off}}{2} + x_2 - x_1 / 2;\\ - * t_1 & = & \max ( h_1 (n), h_1 (m) ) - \min ( h_1 (n), h_1 (m) )\\ - * t_2 & = & \max ( h_2 (n), h_2 (m) ) - \min ( h_2 (n), h_2 (m) )\\ - * d (n,m) & = & \left\{ - * \begin{array}{ll} - * \max (|t_1|,|t_2|) & if \; sign \; of \; t_1 \; and \; t_2 \; is \; the \; same\\ - * |t_1|+|t_2| & otherwise - * \end{array} \right. - * \f} - */ - template < typename Index_type > - class Hexagonal_topology - : public Basic_topology < Index_type, Index_type > - { - public: - /** - * Constructor. - * \param hex_offset_ is an offset of the hexagonal topology. - * This value have to be not less than number of rows in neuron - * container counted from 0. - */ - inline explicit Hexagonal_topology ( Index_type const & hex_offset_ ) - : hex_offset ( hex_offset_ ) - {} - - /** Copy constructor. */ - template < typename Index_type_2 > - inline Hexagonal_topology ( Hexagonal_topology < Index_type_2 > const & hex_topology ) - : Basic_topology < Index_type_2, Index_type_2 >(), - hex_offset ( hex_topology.hex_offset ) - {} - - /** - * Function calculates distance. - * \param index_1_1 is first index of first neuron. - * \param index_1_2 is second index of first neuron. - * \param index_2_1 is first index of second neuron. - * \param index_2_2 is second index of second neuron. - * \f{eqnarray*} - * h_1 (x) & = & \frac{ x_1 + 1 }{2} + x_2\\ - * h_2 (x) & = & \frac{h_{off}}{2} + x_2 - x_1 / 2;\\ - * t_1 & = & \max ( h_1 (n), h_1 (m) ) - \min ( h_1 (n), h_1 (m) )\\ - * t_2 & = & \max ( h_2 (n), h_2 (m) ) - \min ( h_2 (n), h_2 (m) )\\ - * d (n,m) & = & \left\{ - * \begin{array}{ll} - * \max (|t_1|,|t_2|) & if \; sign \; of \; t_1 \; and \; t_2 \; is \; the \; same\\ - * |t_1|+|t_2| & otherwise - * \end{array} \right. - * \f} - * where: n is firs neuron, m is second. - */ - Index_type operator() - ( - Index_type const & index_1_1, - Index_type const & index_1_2, - Index_type const & index_2_1, - Index_type const & index_2_2 - ) const - { - Index_type hex_index_1_1; - Index_type hex_index_1_2; - Index_type hex_index_2_1; - Index_type hex_index_2_2; - - Index_type tmp_hex_index_1; - Index_type tmp_hex_index_2; - - // recalculate indexes to the better indexes used in hexagonal space - hex_index_1_1 = ( index_1_1 + 1 ) / 2 + index_1_2; - hex_index_1_2 = ( hex_offset / 2 + index_1_2 ) - index_1_1 / 2; - - hex_index_2_1 = ( index_2_1 + 1 ) / 2 + index_2_2; - hex_index_2_2 = ( hex_offset / 2 + index_2_2 ) - index_2_1 / 2; - - // calculate difference between points in hexagonal space - tmp_hex_index_1 = ::std::max ( hex_index_1_1, hex_index_2_1 ) - - ::std::min ( hex_index_1_1, hex_index_2_1 ); - tmp_hex_index_2 = ::std::max ( hex_index_1_2, hex_index_2_2 ) - - ::std::min ( hex_index_1_2, hex_index_2_2 ); - - // here we have special algebra to calculate distance, - // bacause of special basis in this space: - // ( 1, 1 ); ( -1, -1 ) have distance 1 the same as - // ( -1, 0 ); ( 0, -1 ); ( 1, 0 ); ( 0, 1 ). - if ( tmp_hex_index_1 == 0 && tmp_hex_index_2 == 0 ) - { - return static_cast < Index_type > ( 0 ); - } - - // check if values have the same direction if yes it means that we have to use - // reasoning based on assumption that ( -1, -1 ) and ( 1, 1 ) have distance 1. - if ( ( ( hex_index_1_1 > hex_index_2_1 ) && ( hex_index_1_2 > hex_index_2_2 ) ) - || ( ( hex_index_1_1 < hex_index_2_1 ) && ( hex_index_1_2 < hex_index_2_2 ) ) - ) - { - return ::std::max ( tmp_hex_index_1, tmp_hex_index_2 ); - } - else - { - return ::operators::abs ( tmp_hex_index_1 ) + ::operators::abs ( tmp_hex_index_2 ); - } - - return static_cast < Index_type > ( 0 ); - } - - protected: - Index_type hex_offset; - }; - /*\@}*/ - -} // namespace neural_net - -#endif // WTM_TOPOLOGY_HPP_INCLUDED - diff --git a/src/third-party/knnl/wtm_training_algorithm.hpp b/src/third-party/knnl/wtm_training_algorithm.hpp deleted file mode 100755 index f98428e9..00000000 --- a/src/third-party/knnl/wtm_training_algorithm.hpp +++ /dev/null @@ -1,293 +0,0 @@ -/* - * Copyright (c) 2006, Seweryn Habdank-Wojewodzki - * Copyright (c) 2006, Janusz Rybarski - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS - * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * e-mail: habdank AT gmail DOT com - * e-mail: janusz.rybarski AT gmail DOT com - * - * File created: Tue 02 May 2006 11:39:22 CEST - * Last modified: Wed 08 Aug 2007 18:29:44 CEST - */ - -#ifndef WTM_TRAINING_ALGORITM_HPP_INCLUDED -#define WTM_TRAINING_ALGORITM_HPP_INCLUDED - -#include -#include -#include - -#include - -#include "training_functional.hpp" -#include "numeric_iterator.hpp" - -/** - * \file wtm_training_algorithm.hpp - * \brief File contains template class Wtm_training_algoritm. - * \ingroup neural_net - */ - -namespace neural_net -{ - /** - * \addtogroup neural_net - */ - /*\@{*/ - - /** - * \class Wtm_training_algorithm - * \brief Class contains functionality for training - * kohonen network using WTM method. - * \param Network_type is a network type. - * \param Value_type is a type os single data - * in mathematical meanning, so it could be ::std::vector, too. - * \param Data_iterator_type is is iterator for container - * with training data. - * \param Training_functional_type is a type of functional. - * \param Index_type is a type of index of neurons used in network. - */ - template - < - typename Network_type, - typename Value_type, - typename Data_iterator_type, - typename Training_functional_type, - typename Index_type, - typename Numeric_iterator_type - = Linear_numeric_iterator < - typename Training_functional_type::iteration_type - > - > - class Wtm_training_algorithm - { - public: - - typedef typename Training_functional_type::iteration_type iteration_type; - typedef Network_type network_type; - typedef Value_type value_type; - typedef Data_iterator_type data_iterator_type; - typedef Training_functional_type training_functional_type; - typedef Index_type index_type; - typedef Numeric_iterator_type numeric_iterator_type; - - /** Training functional. */ - Training_functional_type training_functional; - - /** - * Constructor. - * \param training_functional_ is a training functor. - * \param numeric_iterator_ is a numeric iterator. - */ - Wtm_training_algorithm - ( - Training_functional_type const & training_functional_, - Numeric_iterator_type numeric_iterator_ = linear_numeric_iterator() - ) - : training_functional ( training_functional_ ), - numeric_iterator ( numeric_iterator_ ) - { - network = static_cast < Network_type* > ( 0 ); - } - - /** - * Copy constructor. - * It makes flat copy of neural network, so it copies only pointer not structure. - */ - template - < - typename Network_type_2, - typename Value_type_2, - typename Data_iterator_type_2, - typename Training_functional_type_2, - typename Index_type_2, - typename Numeric_iterator_type_2 - > - inline Wtm_training_algorithm - ( - Wtm_training_algorithm - < - Network_type_2, - Value_type_2, - Data_iterator_type_2, - Training_functional_type_2, - Index_type_2, - Numeric_iterator_type_2 - > - const & wtm_training_alg_ - ) - : training_functional ( wtm_training_alg_.training_functional ), - numeric_iterator ( wtm_training_alg_.numeric_iterator ), - iteration ( wtm_training_alg_.iteration ) - { - network = wtm_training_alg_.network; - } - - /** - * Function that starts training proces. - * \param network_ is a pointer to the existing kohonen neural network. - * \param data_begin is a begin iterator, it could be revers. - * \param data_end is end iterator. - * \return error code. - */ - ::boost::int32_t operator() - ( - Data_iterator_type data_begin, - Data_iterator_type data_end, - Network_type * network_ - ) - { - network = network_; - - assert ( network != static_cast < Network_type * > ( 0 ) ); - - // for each data train network - ::std::for_each - ( - data_begin, data_end, - ::boost::bind - ( - & Wtm_training_algorithm - < - Network_type, - Value_type, - Data_iterator_type, - Training_functional_type, - Index_type, - Numeric_iterator_type - >::train, - this, - _1 - ) - ); - - return 0; - } - - protected: - /** Pointer to the network. */ - Network_type * network; - - iteration_type iteration; - - Numeric_iterator_type numeric_iterator; - - /** - * Function trains neural network using single value. - * \param value is a value. - * As is set in WTM algoritm method is looking for the best neuron, - * and train it to have better results with actual data in the future. - */ - void train ( Value_type const & value ) - { - Index_type index_1 = Index_type(); - Index_type index_2 = Index_type(); - - typename Network_type::value_type::result_type tmp_result; - - // reset max_result - typename Network_type::value_type::result_type max_result - = ::std::numeric_limits < - typename Network_type::value_type::result_type - >::min(); - - typename Network_type::row_iterator r_iter; - typename Network_type::column_iterator c_iter; - - // set ranges for iteration procedure - ::boost::int32_t r_counter = 0;//network->objects.size(); - ::boost::int32_t c_counter = 0;//network->objects[0].size(); - - for ( r_iter = network->objects.begin(); - r_iter != network->objects.end(); - ++r_iter - ) - { - for ( c_iter = r_iter->begin(); - c_iter != r_iter->end(); - ++c_iter - ) - { - tmp_result = ( *c_iter ) ( value ); - if ( tmp_result > max_result ) - { - index_1 = r_counter; - index_2 = c_counter; - max_result = tmp_result; - } - ++c_counter; - } - ++r_counter; - c_counter = 0; - } - - r_counter = 0; - c_counter = 0; - - // train all neurons in network with respect to the - // training functional - for ( r_iter = network->objects.begin(); - r_iter != network->objects.end(); - ++r_iter - ) - { - for ( c_iter = r_iter->begin(); - c_iter != r_iter->end(); - ++c_iter - ) - { - (training_functional) - ( - c_iter->weights, - value, - iteration, - index_1, index_2, r_counter, c_counter - ); - ++c_counter; - } - ++r_counter; - c_counter = 0; - } - - // increase iteration - ++numeric_iterator; - iteration = numeric_iterator(); - } - }; - /*\@}*/ -} // namespace neural_net - -#endif // WTM_TRAINING_ALGORITM_HPP_INCLUDED - From 7b5f443b44feaed4d429e97acac7d4c967e24edd Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 20 Apr 2018 20:11:09 +0200 Subject: [PATCH 109/195] Added an option to set wt's resources directory --- Makefile.am | 5 ----- README.md | 2 +- conf/lms.conf | 1 + src/main/main.cpp | 1 + 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 446387c4..5e13197f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,8 +42,3 @@ lms_approot_DATA = \ sysconf_DATA = \ $(top_srcdir)/conf/lms.conf -install-data-hook: - ln -s $(datadir)/Wt/resources $(lms_docrootdir)/resources || echo "Skipped symlink creation" - -uninstall-local: - cd $(lms_docrootdir) && rm -f -r $(lms_docrootdir)/resources diff --git a/README.md b/README.md index 510eb624..b8e9dfdd 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ lms [config_file] ``` Logs are output in the working directory, in the file 'lms.log' -To connect to LMS, just open your favorite browser and go to http://localhost:5081 +To connect to LMS, just open your favorite browser and go to http://localhost:5082 ## Credits diff --git a/conf/lms.conf b/conf/lms.conf index 722d25c3..3d9b06f5 100644 --- a/conf/lms.conf +++ b/conf/lms.conf @@ -16,6 +16,7 @@ tls-key = "/var/lms/privkey.pem"; tls-dh = "/var/lms/dh2048.pem"; # Path to the resources used by the web interface +wt-resources="/usr/share/Wt/resources"; docroot = "/usr/share/lms/docroot/;/resources,/css,/images,/js,/favicon.ico"; approot = "/usr/share/lms/approot"; diff --git a/src/main/main.cpp b/src/main/main.cpp index 4f6aa932..9a3820f4 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -44,6 +44,7 @@ std::vector generateWtConfig(std::string execPath) args.push_back("--config=" + wtConfigPath.string()); args.push_back("--docroot=" + Config::instance().getString("docroot")); args.push_back("--approot=" + Config::instance().getString("approot")); + args.push_back("--resources-dir=" + Config::instance().getString("wt-resources")); if (Config::instance().getBool("tls-enable", false)) { From c586be11e4ca952dbcd055393e1b7e47d645f774 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 23 Apr 2018 13:20:10 +0200 Subject: [PATCH 110/195] Rerender the database settings view when the internal path is updated --- src/ui/admin/DatabaseSettingsView.cpp | 40 +++++++++++++++++++-------- src/ui/admin/DatabaseSettingsView.hpp | 7 +++-- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/src/ui/admin/DatabaseSettingsView.cpp b/src/ui/admin/DatabaseSettingsView.cpp index 8b1c6764..6164a7f0 100644 --- a/src/ui/admin/DatabaseSettingsView.cpp +++ b/src/ui/admin/DatabaseSettingsView.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -217,32 +218,47 @@ const Wt::WFormModel::Field DatabaseSettingsModel::UpdateStartTimeField = "upda DatabaseSettingsView::DatabaseSettingsView() -: Wt::WTemplateFormView(Wt::WString::tr("Lms.Admin.Database.template")) { + wApp->internalPathChanged().connect(std::bind([=] + { + refreshView(); + })); + + refreshView(); +} + +void +DatabaseSettingsView::refreshView() +{ + if (!wApp->internalPathMatches("/admin/database")) + return; + + clear(); + + auto t = addNew(Wt::WString::tr("Lms.Admin.Database.template")); auto model = std::make_shared(); // Media Directory - setFormWidget(DatabaseSettingsModel::MediaDirectoryField, std::make_unique()); + t->setFormWidget(DatabaseSettingsModel::MediaDirectoryField, std::make_unique()); // Update Period auto updatePeriod = std::make_unique(); updatePeriod->setModel(model->updatePeriodModel()); - setFormWidget(DatabaseSettingsModel::UpdatePeriodField, std::move(updatePeriod)); + t->setFormWidget(DatabaseSettingsModel::UpdatePeriodField, std::move(updatePeriod)); // Update Start Time auto updateStartTime = std::make_unique(); updateStartTime->setModel(model->updateStartTimeModel()); - setFormWidget(DatabaseSettingsModel::UpdateStartTimeField, std::move(updateStartTime)); + t->setFormWidget(DatabaseSettingsModel::UpdateStartTimeField, std::move(updateStartTime)); // Buttons - - Wt::WPushButton *saveBtn = bindWidget("apply-btn", std::make_unique(Wt::WString::tr("Lms.apply"))); - Wt::WPushButton *discardBtn = bindWidget("discard-btn", std::make_unique(Wt::WString::tr("Lms.discard"))); - Wt::WPushButton *immScanBtn = bindWidget("immediate-scan-btn", std::make_unique(Wt::WString::tr("Lms.Admin.Database.immediate-scan"))); + Wt::WPushButton *saveBtn = t->bindWidget("apply-btn", std::make_unique(Wt::WString::tr("Lms.apply"))); + Wt::WPushButton *discardBtn = t->bindWidget("discard-btn", std::make_unique(Wt::WString::tr("Lms.discard"))); + Wt::WPushButton *immScanBtn = t->bindWidget("immediate-scan-btn", std::make_unique(Wt::WString::tr("Lms.Admin.Database.immediate-scan"))); saveBtn->clicked().connect(std::bind([=] () { - updateModel(model.get()); + t->updateModel(model.get()); if (model->validate()) { @@ -253,14 +269,14 @@ DatabaseSettingsView::DatabaseSettingsView() } // Udate the view: Delete any validation message in the view, etc. - updateView(model.get()); + t->updateView(model.get()); })); discardBtn->clicked().connect(std::bind([=] () { model->loadData(); model->validate(); - updateView(model.get()); + t->updateView(model.get()); })); immScanBtn->clicked().connect(std::bind([=] () @@ -269,7 +285,7 @@ DatabaseSettingsView::DatabaseSettingsView() LmsApp->notifyMsg(Wt::WString::tr("Lms.Admin.Database.scan-launched")); })); - updateView(model.get()); + t->updateView(model.get()); } } // namespace UserInterface diff --git a/src/ui/admin/DatabaseSettingsView.hpp b/src/ui/admin/DatabaseSettingsView.hpp index 99653c9f..116309aa 100644 --- a/src/ui/admin/DatabaseSettingsView.hpp +++ b/src/ui/admin/DatabaseSettingsView.hpp @@ -19,14 +19,17 @@ #pragma once -#include +#include namespace UserInterface { -class DatabaseSettingsView : public Wt::WTemplateFormView +class DatabaseSettingsView : public Wt::WContainerWidget { public: DatabaseSettingsView(); + + private: + void refreshView(); }; From 8a3e522d97cae59d67399aca8fa4db022afed8a2 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 23 Apr 2018 13:21:40 +0200 Subject: [PATCH 111/195] Removed unused buttons on play queue --- approot/playqueue.xml | 10 +--------- src/ui/PlayQueueView.cpp | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/approot/playqueue.xml b/approot/playqueue.xml index 7c08fed1..81bb710c 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -2,14 +2,6 @@ - - - - - - - - @@ -18,7 +10,7 @@

${tr:Lms.PlayQueue.playqueue}

${nb-tracks} - ${save-btn} ${load-btn} ${clear-btn} + ${clear-btn}
${entries} ${show-more} diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index b4e45453..b30b48f1 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -35,8 +35,6 @@ PlayQueue::PlayQueue() { addFunction("tr", &Wt::WTemplate::Functions::tr); - bindNew("save-btn", Wt::WString::tr("Lms.PlayQueue.save-to-playlist"), Wt::TextFormat::XHTML); - bindNew("load-btn", Wt::WString::tr("Lms.PlayQueue.load-from-playlist"), Wt::TextFormat::XHTML); Wt::WText* clearBtn = bindNew("clear-btn", Wt::WString::tr("Lms.PlayQueue.clear"), Wt::TextFormat::XHTML); _entriesContainer = bindNew("entries"); From 057ea3ab4e441ab9c3b218d1cf8ad2531c6436ce Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 25 Apr 2018 13:45:01 +0200 Subject: [PATCH 112/195] Better handling of date/year in tags --- src/database/DbArtist.cpp | 3 +-- src/database/Release.cpp | 14 ++++++++------ src/database/Track.cpp | 18 ++++++++++++------ src/database/Track.hpp | 28 ++++++++++++++-------------- src/metadata/AvFormat.cpp | 8 ++++---- src/metadata/MetaData.hpp | 4 ++-- src/metadata/TagLibParser.cpp | 25 +++++++++++++------------ src/scanner/MediaScanner.cpp | 14 +++++++------- src/utils/Utils.cpp | 26 +------------------------- src/utils/Utils.hpp | 4 ---- test/TestAvMetadata.cpp | 8 ++++---- 11 files changed, 66 insertions(+), 86 deletions(-) diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp index ac332472..0f2ebacc 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/DbArtist.cpp @@ -168,8 +168,7 @@ Artist::getReleases(const std::set& clusterIds) const if (!clusterIds.empty()) oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size(); - // TODO order - oss << " ORDER BY t.date,r.name"; + oss << " ORDER BY t.year,r.name"; Wt::Dbo::Query query = session()->query( oss.str() ); diff --git a/src/database/Release.cpp b/src/database/Release.cpp index ad372248..92be18e2 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -139,10 +139,12 @@ Release::getReleaseYear(bool original) const { assert(session()); - Wt::Dbo::collection dates = session()->query( - std::string("SELECT ") + (original ? "t.original_date" : "t.date") + " FROM track t INNER JOIN release r ON r.id = t.release_id") + std::string field = original ? "t.original_year" : "t.year"; + + Wt::Dbo::collection dates = session()->query( + std::string("SELECT ") + field + " FROM track t INNER JOIN release r ON r.id = t.release_id") .where("r.id = ?") - .groupBy("t.date") + .groupBy(field) .bind(this->id()); /* various dates, no date */ @@ -151,10 +153,10 @@ Release::getReleaseYear(bool original) const auto date = dates.front(); - if (!date.isValid()) + if (date > 0) + return date; + else return boost::none; - - return date.year(); } std::vector> diff --git a/src/database/Track.cpp b/src/database/Track.cpp index 6054a367..9ef6ce9f 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -27,12 +27,7 @@ namespace Database { Track::Track(const boost::filesystem::path& p) : -_trackNumber(0), -_totalTrackNumber(0), -_discNumber(0), -_totalDiscNumber(0), -_filePath( p.string() ), -_coverType(CoverType::None) +_filePath( p.string() ) { } @@ -201,6 +196,17 @@ Track::getTotalDiscNumber(void) const return (_totalDiscNumber > 0) ? boost::make_optional(_totalDiscNumber) : boost::none; } +boost::optional +Track::getYear() const +{ + return (_year > 0) ? boost::make_optional(_year) : boost::none; +} + +boost::optional +Track::getOriginalYear() const +{ + return (_originalYear > 0) ? boost::make_optional(_originalYear) : boost::none; +} Cluster::Cluster() { diff --git a/src/database/Track.hpp b/src/database/Track.hpp index 1f2ef635..50bdd42f 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -171,8 +171,8 @@ class Track void setLastWriteTime(Wt::WDateTime time) { _fileLastWrite = time; } void setAddedTime(Wt::WDateTime time) { _fileAdded = time; } void setChecksum(const std::vector& checksum) { _fileChecksum = checksum; } - void setDate(Wt::WDate date) { _date = date; } - void setOriginalDate(Wt::WDate date) { _originalDate = date; } + void setYear(int year) { _year = year; } + void setOriginalYear(int year) { _originalYear = year; } void setGenres(const std::string& genreList) { _genreList = genreList; } void setCoverType(CoverType coverType) { _coverType = coverType; } void setMBID(const std::string& MBID) { _MBID = MBID; } @@ -186,8 +186,8 @@ class Track std::string getName(void) const { return _name; } boost::filesystem::path getPath(void) const { return _filePath; } std::chrono::milliseconds getDuration(void) const { return _duration; } - Wt::WDate getDate(void) const { return _date; } - Wt::WDate getOriginalDate(void) const { return _originalDate; } + boost::optional getYear(void) const; + boost::optional getOriginalYear(void) const; Wt::WDateTime getLastWriteTime(void) const { return _fileLastWrite; } Wt::WDateTime getAddedTime(void) const { return _fileAdded; } const std::vector& getChecksum(void) const { return _fileChecksum; } @@ -206,8 +206,8 @@ class Track Wt::Dbo::field(a, _totalDiscNumber, "total_disc_number"); Wt::Dbo::field(a, _name, "name"); Wt::Dbo::field(a, _duration, "duration"); - Wt::Dbo::field(a, _date, "date"); - Wt::Dbo::field(a, _originalDate, "original_date"); + Wt::Dbo::field(a, _year, "year"); + Wt::Dbo::field(a, _originalYear, "original_year"); Wt::Dbo::field(a, _genreList, "genre_list"); Wt::Dbo::field(a, _filePath, "file_path"); Wt::Dbo::field(a, _fileLastWrite, "file_last_write"); @@ -225,23 +225,23 @@ class Track static const std::size_t _maxNameLength = 128; - int _trackNumber; - int _totalTrackNumber; - int _discNumber; - int _totalDiscNumber; + int _trackNumber = 0; + int _totalTrackNumber = 0; + int _discNumber = 0; + int _totalDiscNumber = 0; std::string _name; std::string _artistName; std::string _releaseName; std::chrono::duration _duration; - Wt::WDate _date; - Wt::WDate _originalDate; // original date time + int _year = 0; + int _originalYear = 0; std::string _genreList; std::string _filePath; std::vector _fileChecksum; Wt::WDateTime _fileLastWrite; Wt::WDateTime _fileAdded; - CoverType _coverType; - std::string _MBID; // Musicbrainz Identifier + CoverType _coverType = CoverType::None; + std::string _MBID = ""; // Musicbrainz Identifier Wt::Dbo::ptr _artist; Wt::Dbo::ptr _release; diff --git a/src/metadata/AvFormat.cpp b/src/metadata/AvFormat.cpp index 50f89e7e..bb6dad82 100644 --- a/src/metadata/AvFormat.cpp +++ b/src/metadata/AvFormat.cpp @@ -124,16 +124,16 @@ AvFormat::parse(const boost::filesystem::path& p) || tag == "YEAR" || tag == "WM/Year") { - auto date = readAs(value); + auto date = readAs(value); if (date) - items.insert( std::make_pair(MetaData::Type::Date, *date)); + items.insert(std::make_pair(MetaData::Type::Year, *date)); } else if (tag == "TDOR" // Original release time (ID3v2 2.4) || tag == "TORY") // Original release year { - auto date = readAs(value); + auto date = readAs(value); if (date) - items.insert( std::make_pair(MetaData::Type::OriginalDate, *date)); + items.insert(std::make_pair(MetaData::Type::OriginalYear, *date)); } else if (tag == "MUSICBRAINZ ARTIST ID" || tag == "MUSICBRAINZ_ARTISTID") diff --git a/src/metadata/MetaData.hpp b/src/metadata/MetaData.hpp index a9ebc0c6..b2237a9f 100644 --- a/src/metadata/MetaData.hpp +++ b/src/metadata/MetaData.hpp @@ -42,8 +42,8 @@ namespace MetaData DiscNumber, // size_t TotalTrack, // size_t TotalDisc, // size_t - Date, // Wt::WDate - OriginalDate, // Wt::WDate + Year, // int + OriginalYear, // int HasCover, // bool AudioStreams, // vector MusicBrainzArtistID, // string diff --git a/src/metadata/TagLibParser.cpp b/src/metadata/TagLibParser.cpp index a5a48be1..ad27e481 100644 --- a/src/metadata/TagLibParser.cpp +++ b/src/metadata/TagLibParser.cpp @@ -156,28 +156,29 @@ TagLibParser::parse(const boost::filesystem::path& p) } else if (tag == "DATE") { - auto timePoint = readAs(values.front().to8Bit()); + auto timePoint = readAs(values.front().to8Bit()); if (timePoint) - items.insert( std::make_pair(MetaData::Type::Date, *timePoint)); + items.insert( std::make_pair(MetaData::Type::Year, *timePoint)); } else if (tag == "ORIGINALDATE") { - auto timePoint = readAs(values.front().to8Bit()); - if (timePoint) + // lower priority than original year + if (items.find(MetaData::Type::OriginalYear) == items.end()) { - // Take priority on original year - items.erase( MetaData::Type::OriginalDate ); - items.insert( std::make_pair(MetaData::Type::OriginalDate, *timePoint)); + auto timePoint = readAs(values.front().to8Bit()); + if (timePoint) + items.insert( std::make_pair(MetaData::Type::OriginalYear, *timePoint)); } } else if (tag == "ORIGINALYEAR") { - // lower priority than original date - if (items.find(MetaData::Type::OriginalDate) == items.end()) + auto timePoint = readAs(values.front().to8Bit()); + if (timePoint) { - auto timePoint = readAs(values.front().to8Bit()); - if (timePoint) - items.insert( std::make_pair(MetaData::Type::OriginalDate, *timePoint)); + // Take priority on original year + items[MetaData::Type::OriginalYear] = *timePoint; +// items.erase( MetaData::Type::OriginalYear ); +// items.insert( std::make_pair(MetaData::Type::OriginalYear, *timePoint)); } } else if (tag == "METADATA_BLOCK_PICTURE") diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 41e0985c..9e3a7d56 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -570,16 +570,16 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) if ((*items).find(MetaData::Type::TotalDisc) != (*items).end()) track.modify()->setTotalDiscNumber( boost::any_cast((*items)[MetaData::Type::TotalDisc]) ); - if ((*items).find(MetaData::Type::Date) != (*items).end()) - track.modify()->setDate( boost::any_cast((*items)[MetaData::Type::Date]) ); + if ((*items).find(MetaData::Type::Year) != (*items).end()) + track.modify()->setYear( boost::any_cast((*items)[MetaData::Type::Year]) ); - if ((*items).find(MetaData::Type::OriginalDate) != (*items).end()) + if ((*items).find(MetaData::Type::OriginalYear) != (*items).end()) { - track.modify()->setOriginalDate( boost::any_cast((*items)[MetaData::Type::OriginalDate]) ); + track.modify()->setOriginalYear( boost::any_cast((*items)[MetaData::Type::OriginalYear]) ); - // If a file has an OriginalDate but no date, set the date to ease filtering - if ((*items).find(MetaData::Type::Date) == (*items).end()) - track.modify()->setDate( boost::any_cast((*items)[MetaData::Type::OriginalDate]) ); + // If a file has an OriginalYear but no Year, set it o ease filtering + if ((*items).find(MetaData::Type::Year) == (*items).end()) + track.modify()->setYear( boost::any_cast((*items)[MetaData::Type::OriginalYear]) ); } if ((*items).find(MetaData::Type::MusicBrainzRecordingID) != (*items).end()) diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp index 07700578..a027b6f8 100644 --- a/src/utils/Utils.cpp +++ b/src/utils/Utils.cpp @@ -23,33 +23,9 @@ #include #include - +#include #include "Utils.hpp" -template<> -boost::optional readAs(const std::string& str) -{ - const std::vector formats = { - "yyyy-MM-dd", - "yyyy/MM/dd", - "yyyy-MM", - "yyyy/MM", - "yyyy" - }; - - for (auto format : formats) - { - auto date = Wt::WDate::fromString(str, format); - - if (!date.isValid()) - continue; - - return date; - } - - return boost::none; -} - bool readList(const std::string& str, const std::string& separators, std::list& results) { std::string curStr; diff --git a/src/utils/Utils.hpp b/src/utils/Utils.hpp index 497eac91..d5ab7d63 100644 --- a/src/utils/Utils.hpp +++ b/src/utils/Utils.hpp @@ -57,7 +57,3 @@ boost::optional readAs(const std::string& str) return res; } -template<> -boost::optional readAs(const std::string& str); - - diff --git a/test/TestAvMetadata.cpp b/test/TestAvMetadata.cpp index 8109a82e..9dc0d4c5 100644 --- a/test/TestAvMetadata.cpp +++ b/test/TestAvMetadata.cpp @@ -86,12 +86,12 @@ int main(int argc, char *argv[]) std::cout << "TotalDisc: " << boost::any_cast(item.second) << std::endl; break; - case MetaData::Type::Date: - std::cout << "Date: " << boost::any_cast(item.second).toString() << std::endl; + case MetaData::Type::Year: + std::cout << "Year: " << std::to_string(boost::any_cast(item.second)) << std::endl; break; - case MetaData::Type::OriginalDate: - std::cout << "Original date: " << boost::any_cast(item.second).toString() << std::endl; + case MetaData::Type::OriginalYear: + std::cout << "Original year: " << std::to_string(boost::any_cast(item.second)) << std::endl; break; case MetaData::Type::HasCover: From aa19caffbd760cc2f848e42368f91e09cfede026 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 6 May 2018 16:09:09 +0200 Subject: [PATCH 113/195] Raise the timeout on SQL connection pool to prevent aborts --- src/database/DatabaseHandler.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index 02803607..ff6b5136 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -128,17 +128,7 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) _session.execute("CREATE INDEX IF NOT EXISTS track_release_idx ON track(release_id)"); _session.execute("CREATE INDEX IF NOT EXISTS cluster_name_idx ON cluster(name)"); _session.execute("CREATE INDEX IF NOT EXISTS cluster_type_name_idx ON cluster_type(name)"); - - // TODO move this - // Default values - if (!Setting::exists(_session, "tags_highlevel_acousticbrainz")) - Setting::setBool(_session, "tags_highlevel_acousticbrainz", true); - - if (!Setting::exists(_session, "tags_highlevel_acousticbrainz_min_probability")) - Setting::setInt(_session, "tags_highlevel_acousticbrainz_min_probability", 90); - - if (!Setting::exists(_session, "tags_similarity_acousticbrainz")) - Setting::setBool(_session, "tags_similarity_acousticbrain", false); + _session.execute("CREATE INDEX IF NOT EXISTS settings_name_idx ON setting(name)"); } _users = new UserDatabase(_session); @@ -202,7 +192,7 @@ Handler::createConnectionPool(boost::filesystem::path p) connection->setProperty("show-queries", "true"); auto pool = std::make_unique(std::move(connection), 1); - pool->setTimeout(std::chrono::seconds(1)); + pool->setTimeout(std::chrono::seconds(10)); return pool; } From a4969c134bc54f24375e62a9e30e959ad4f2d033 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 6 May 2018 16:09:29 +0200 Subject: [PATCH 114/195] Prepare the customization of the cluster types --- src/scanner/MediaScanner.cpp | 146 ++++++++++++++++++++++++++--------- src/scanner/MediaScanner.hpp | 7 +- src/utils/Utils.cpp | 10 ++- src/utils/Utils.hpp | 3 + 4 files changed, 125 insertions(+), 41 deletions(-) diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 9e3a7d56..1d3819f9 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -37,6 +37,35 @@ namespace { +const std::string updatePeriodSetting = "update_period"; +const std::string updateStartTimeSetting = "update_start_time"; +const std::string clustersSetting = "clusters"; +const std::string fileExtensionsSetting = "file_extensions"; + +const std::vector defaultFileExtensions = +{ + ".mp3", + ".ogg", + ".oga", + ".aac", + ".m4a", + ".flac", + ".wav", + ".wma", + ".aif", + ".aiff", + ".ape", + ".mpc", + ".shn", +}; + +// Caution current implementation prevents spaces with the names +const std::vector defaultClusters = +{ + "Genre", + "Group", +}; + Wt::WDate getNextMonday(Wt::WDate current) { @@ -99,23 +128,23 @@ using namespace Database; UpdatePeriod getUpdatePeriod(Wt::Dbo::Session& session) { - return static_cast(Setting::getInt(session, "update_period", static_cast(UpdatePeriod::Never))); + return static_cast(Setting::getInt(session, updatePeriodSetting, static_cast(UpdatePeriod::Never))); } void setUpdatePeriod(Wt::Dbo::Session& session, UpdatePeriod updatePeriod) { - Setting::setInt(session, "update_period", static_cast(updatePeriod)); + Setting::setInt(session, updatePeriodSetting, static_cast(updatePeriod)); } Wt::WTime getUpdateStartTime(Wt::Dbo::Session& session) { - return Setting::getTime(session, "update_start_time"); + return Setting::getTime(session, updateStartTimeSetting); } void setUpdateStartTime(Wt::Dbo::Session& session, Wt::WTime startTime) { - Setting::setTime(session, "update_start_time", startTime); + Setting::setTime(session, updateStartTimeSetting, startTime); } MediaScanner::MediaScanner(Wt::Dbo::SqlConnectionPool& connectionPool) @@ -127,8 +156,11 @@ _db(connectionPool) Wt::Dbo::Transaction transaction(_db.getSession()); - if (!Setting::exists(_db.getSession(), "file_extensions")) - Setting::setString(_db.getSession(), "file_extensions", ".mp3 .ogg .oga .aac .m4a .flac .wav .wma .aif .aiff .ape .mpc .shn" ); + if (!Setting::exists(_db.getSession(), fileExtensionsSetting)) + Setting::setString(_db.getSession(), fileExtensionsSetting, joinStrings(defaultFileExtensions, " ")); + + if (!Setting::exists(_db.getSession(), clustersSetting)) + Setting::setString(_db.getSession(), clustersSetting, joinStrings(defaultClusters, " ")); } void @@ -244,11 +276,17 @@ MediaScanner::scan(boost::system::error_code err) if (err) return; + LMS_LOG(UI, INFO) << "New scan started!"; + refreshScanSettings(); + bool forceScan = false; Stats stats; checkAudioFiles(stats); + forceScan = checkClusters(); + + LMS_LOG(UI, INFO) << "Checks complete, force scan = " << forceScan; for (auto rootDirectory : _rootDirectories) { @@ -256,7 +294,7 @@ MediaScanner::scan(boost::system::error_code err) break; LMS_LOG(DBUPDATER, INFO) << "scaning root directory '" << rootDirectory.string() << "'..."; - scanRootDirectory(rootDirectory, stats); + scanRootDirectory(rootDirectory, forceScan, stats); LMS_LOG(DBUPDATER, INFO) << "scaning root directory '" << rootDirectory.string() << "' DONE"; } @@ -280,12 +318,16 @@ MediaScanner::refreshScanSettings() Wt::Dbo::Transaction transaction(_db.getSession()); _fileExtensions.clear(); - for (auto extension : splitString(Setting::getString(_db.getSession(), "file_extensions"), " ")) + for (auto extension : splitString(Setting::getString(_db.getSession(), fileExtensionsSetting), " ")) _fileExtensions.push_back( extension ); _rootDirectories.clear(); for (auto rootDir : Database::MediaDirectory::getAll(_db.getSession())) _rootDirectories.push_back(rootDir->getPath()); + + _clusterTypes.clear(); + for (auto cluster : splitString(Setting::getString(_db.getSession(), clustersSetting), " ")) + _clusterTypes.push_back(cluster); } Artist::pointer @@ -369,17 +411,13 @@ MediaScanner::getClusters( const MetaData::Clusters& clustersNames) for (auto clusterNames : clustersNames) { - ClusterType::pointer clusterType = ClusterType::getByName(_db.getSession(), clusterNames.first); + auto clusterType = ClusterType::getByName(_db.getSession(), clusterNames.first); if (!clusterType) - { - clusterType = ClusterType::create(_db.getSession(), clusterNames.first); - _db.getSession().flush(); // Make sure the newly createdType has an id - } + continue; for (auto clusterName : clusterNames.second) { - Cluster::pointer cluster = clusterType->getCluster(clusterName); - + auto cluster = clusterType->getCluster(clusterName); if (!cluster) cluster = Cluster::create(_db.getSession(), clusterType, clusterName); @@ -391,20 +429,23 @@ MediaScanner::getClusters( const MetaData::Clusters& clustersNames) } void -MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) +MediaScanner::scanAudioFile(const boost::filesystem::path& file, bool forceScan, Stats& stats) { auto lastWriteTime = Wt::WDateTime::fromTime_t(boost::filesystem::last_write_time(file)); - // Skip file if last write is the same + if (!forceScan) { - Wt::Dbo::Transaction transaction(_db.getSession()); - - Wt::Dbo::ptr track = Track::getByPath(_db.getSession(), file); - - if (track && track->getLastWriteTime() == lastWriteTime) + // Skip file if last write is the same { - stats.skips++; - return; + Wt::Dbo::Transaction transaction(_db.getSession()); + + Wt::Dbo::ptr track = Track::getByPath(_db.getSession(), file); + + if (track && track->getLastWriteTime() == lastWriteTime) + { + stats.skips++; + return; + } } } @@ -601,7 +642,7 @@ MediaScanner::scanAudioFile( const boost::filesystem::path& file, Stats& stats) } void -MediaScanner::scanRootDirectory(boost::filesystem::path rootDirectory, Stats& stats) +MediaScanner::scanRootDirectory(boost::filesystem::path rootDirectory, bool forceScan, Stats& stats) { boost::system::error_code ec; @@ -619,7 +660,7 @@ MediaScanner::scanRootDirectory(boost::filesystem::path rootDirectory, Stats& st if (boost::filesystem::is_regular(path)) { if (isFileSupported(path, _fileExtensions)) - scanAudioFile(path, stats ); + scanAudioFile(path, forceScan, stats ); } } } @@ -702,7 +743,7 @@ MediaScanner::checkAudioFiles( Stats& stats ) } } - LMS_LOG(DBUPDATER, DEBUG) << "Checking Clusters..."; + LMS_LOG(DBUPDATER, DEBUG) << "Checking orphan clusters..."; { Wt::Dbo::Transaction transaction(_db.getSession()); @@ -717,17 +758,9 @@ MediaScanner::checkAudioFiles( Stats& stats ) cluster.remove(); } } - - // Now process orphan cluster types - auto clusterTypes = ClusterType::getAllOrphans(_db.getSession()); - for (auto clusterType : clusterTypes) - { - LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan cluster type '" << clusterType->getName() << "'"; - clusterType.remove(); - } } - LMS_LOG(DBUPDATER, DEBUG) << "Checking artists..."; + LMS_LOG(DBUPDATER, DEBUG) << "Checking orphan artists..."; { Wt::Dbo::Transaction transaction(_db.getSession()); @@ -739,7 +772,7 @@ MediaScanner::checkAudioFiles( Stats& stats ) } } - LMS_LOG(DBUPDATER, DEBUG) << "Checking releases..."; + LMS_LOG(DBUPDATER, DEBUG) << "Checking orphan releases..."; { Wt::Dbo::Transaction transaction(_db.getSession()); @@ -754,6 +787,45 @@ MediaScanner::checkAudioFiles( Stats& stats ) LMS_LOG(DBUPDATER, INFO) << "Check audio files done!"; } +bool +MediaScanner::checkClusters() +{ + bool hasChanges = false; + + LMS_LOG(DBUPDATER, INFO) << "Checking clusters"; + + Wt::Dbo::Transaction transaction(_db.getSession()); + auto clusterTypes = ClusterType::getAll(_db.getSession()); + + // Remove no longer desired clusters + for (auto clusterType : clusterTypes) + { + if (std::none_of(_clusterTypes.begin(), _clusterTypes.end(), + [&clusterType](std::string clusterTypeName) { return clusterTypeName == clusterType->getName(); })) + { + LMS_LOG(DBUPDATER, INFO) << "Removing cluster type " << clusterType->getName(); + clusterType.remove(); + hasChanges = true; + } + } + + // Add any missing clusters + for (auto clusterTypeName : _clusterTypes) + { + if (std::none_of(clusterTypes.begin(), clusterTypes.end(), + [&clusterTypeName](ClusterType::pointer clusterType) { return (clusterType->getName() == clusterTypeName); })) + { + LMS_LOG(DBUPDATER, INFO) << "Creating cluster type " << clusterTypeName; + ClusterType::create(_db.getSession(), clusterTypeName); + hasChanges = true; + } + } + + LMS_LOG(DBUPDATER, INFO) << "Checking clusters done!"; + + return hasChanges; +} + void MediaScanner::checkDuplicatedAudioFiles(Stats& stats) { diff --git a/src/scanner/MediaScanner.hpp b/src/scanner/MediaScanner.hpp index 79c200d5..9d8cfa3d 100644 --- a/src/scanner/MediaScanner.hpp +++ b/src/scanner/MediaScanner.hpp @@ -100,7 +100,7 @@ class MediaScanner // Update database (scheduled callback) void scan(boost::system::error_code ec); - void scanRootDirectory( boost::filesystem::path rootDirectory, Stats& stats); + void scanRootDirectory( boost::filesystem::path rootDirectory, bool forceScan, Stats& stats); // Helpers Database::Artist::pointer getArtist( const boost::filesystem::path& file, const std::string& name, const std::string& MBID); @@ -108,10 +108,10 @@ class MediaScanner std::vector getClusters( const MetaData::Clusters& names); void refreshScanSettings(); - // Audio void checkAudioFiles( Stats& stats ); + bool checkClusters(); void checkDuplicatedAudioFiles( Stats& stats ); - void scanAudioFile( const boost::filesystem::path& file, Stats& stats); + void scanAudioFile( const boost::filesystem::path& file, bool forceScan, Stats& stats); bool _running; Wt::WIOService _ioService; @@ -126,6 +126,7 @@ class MediaScanner Database::Handler _db; // Scan settings + std::vector _clusterTypes; std::vector _fileExtensions; std::vector _rootDirectories; diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp index a027b6f8..d1013209 100644 --- a/src/utils/Utils.cpp +++ b/src/utils/Utils.cpp @@ -20,10 +20,12 @@ #include #include #include +#include #include +#include #include -#include + #include "Utils.hpp" bool readList(const std::string& str, const std::string& separators, std::list& results) @@ -62,6 +64,12 @@ splitString(std::string string, std::string separators) return res; } +std::string +joinStrings(std::vector strings, std::string delimiter) +{ + return boost::algorithm::join(strings, delimiter); +} + std::string stringTrim(const std::string& str, const std::string& whitespace) { diff --git a/src/utils/Utils.hpp b/src/utils/Utils.hpp index d5ab7d63..cba5fe91 100644 --- a/src/utils/Utils.hpp +++ b/src/utils/Utils.hpp @@ -35,6 +35,9 @@ readList(const std::string& str, const std::string& separators, std::list splitString(std::string string, std::string separators); +std::string +joinStrings(std::vector strings, std::string delimiter); + std::string stringTrim(const std::string& str, const std::string& whitespaces = " \t"); From 57e745b460c8cf03897ec319875d785cec1df7fd Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 6 May 2018 17:14:15 +0200 Subject: [PATCH 115/195] Simplifiying the cluster types handling --- src/Makefile.am | 1 + src/metadata/AvFormat.cpp | 8 ++++---- src/metadata/AvFormat.hpp | 11 +---------- src/metadata/MetaData.hpp | 20 ++++++++++++++------ src/metadata/TagLibParser.cpp | 8 ++++---- src/metadata/TagLibParser.hpp | 11 +---------- src/scanner/MediaScanner.cpp | 25 ++++++++++++------------- src/scanner/MediaScanner.hpp | 1 - test/Makefile.am | 1 + 9 files changed, 38 insertions(+), 48 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 88626589..20275a2c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,6 +16,7 @@ lms_SOURCES = \ $(srcdir)/database/User.cpp \ $(srcdir)/image/Image.cpp \ $(srcdir)/metadata/AvFormat.cpp \ + $(srcdir)/metadata/MetaData.cpp \ $(srcdir)/metadata/TagLibParser.cpp \ $(srcdir)/scanner/MediaScanner.cpp \ $(srcdir)/ui/Auth.cpp \ diff --git a/src/metadata/AvFormat.cpp b/src/metadata/AvFormat.cpp index bb6dad82..deb9db2b 100644 --- a/src/metadata/AvFormat.cpp +++ b/src/metadata/AvFormat.cpp @@ -30,8 +30,8 @@ namespace MetaData { -AvFormat::AvFormat(const std::map& clusterMap) -: _clusterMap(clusterMap) +AvFormat::AvFormat(const ClusterTypes& clusterTypes) +: Parser(clusterTypes) { } @@ -155,13 +155,13 @@ AvFormat::parse(const boost::filesystem::path& p) { items.insert( std::make_pair(MetaData::Type::AcoustID, stringTrim(value)) ); } - else if (_clusterMap.find(tag) != _clusterMap.end()) + else if (_clusterTypes.find(tag) != _clusterTypes.end()) { std::vector clusterNames = splitString(value, ";,\\"); if (!clusterNames.empty()) { - clusters[_clusterMap[tag]] = std::set(clusterNames.begin(), clusterNames.end()); + clusters[tag] = std::set(clusterNames.begin(), clusterNames.end()); } } diff --git a/src/metadata/AvFormat.hpp b/src/metadata/AvFormat.hpp index 8c3c9504..aaec59fe 100644 --- a/src/metadata/AvFormat.hpp +++ b/src/metadata/AvFormat.hpp @@ -32,18 +32,9 @@ class AvFormat : public Parser { public: - AvFormat(const std::map& clusterMap - = { - {"GENRE", "Genre" }, - {"ALBUMGROUPING", "Group" } - }); - + AvFormat(const ClusterTypes& clusterTypes = defaultClusterTypes); boost::optional parse(const boost::filesystem::path& p); - - private: - - std::map _clusterMap; }; } // namespace MetaData diff --git a/src/metadata/MetaData.hpp b/src/metadata/MetaData.hpp index b2237a9f..11606b70 100644 --- a/src/metadata/MetaData.hpp +++ b/src/metadata/MetaData.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Emeric Poupon + * Copyright (C) 2018 Emeric Poupon * * This file is part of LMS. * @@ -17,8 +17,7 @@ * along with LMS. If not, see . */ -#ifndef METADATA_HPP -#define METADATA_HPP +#pragma once #include #include @@ -63,17 +62,26 @@ namespace MetaData // Type and associated data // See enum Type's comments using Items = std::map; - using Clusters = std::map>; + using Clusters = std::map /* names */>; + using ClusterTypes = std::set; class Parser { public: + static const ClusterTypes defaultClusterTypes; + + // Provide a map for tag name -> Cluster name + Parser(const ClusterTypes& clusterTypes) : _clusterTypes(clusterTypes) {} virtual boost::optional parse(const boost::filesystem::path& p) = 0; + void updateClusterTypes(const ClusterTypes& clusterTypes) { _clusterTypes = clusterTypes; } + const ClusterTypes& getClusterTypes() const { return _clusterTypes; } + bool isClusterTypeSupported(const std::string& clusterType) const { return _clusterTypes.find(clusterType) != _clusterTypes.end(); } + + protected: + ClusterTypes _clusterTypes; }; } // namespace MetaData -#endif - diff --git a/src/metadata/TagLibParser.cpp b/src/metadata/TagLibParser.cpp index ad27e481..acc12cc4 100644 --- a/src/metadata/TagLibParser.cpp +++ b/src/metadata/TagLibParser.cpp @@ -32,8 +32,8 @@ namespace MetaData { -TagLibParser::TagLibParser(const std::map& clusterMap) -: _clusterMap(clusterMap) +TagLibParser::TagLibParser(const ClusterTypes& clusterTypes) +: Parser(clusterTypes) { } @@ -188,14 +188,14 @@ TagLibParser::parse(const boost::filesystem::path& p) items.insert( std::make_pair(MetaData::Type::HasCover, true)); } // Check if a hit a cluster tag - else if (_clusterMap.find(tag) != _clusterMap.end()) + else if (_clusterTypes.find(tag) != _clusterTypes.end()) { std::set clusterNames; for (const auto& value : values) clusterNames.insert(value.to8Bit(true)); if (!clusterNames.empty()) - clusters[_clusterMap[tag]] = clusterNames; + clusters[tag] = clusterNames; } } diff --git a/src/metadata/TagLibParser.hpp b/src/metadata/TagLibParser.hpp index baefc112..1b85ed0d 100644 --- a/src/metadata/TagLibParser.hpp +++ b/src/metadata/TagLibParser.hpp @@ -32,18 +32,9 @@ class TagLibParser : public Parser { public: - // Provide a map for TagLib name -> Cluster name - TagLibParser(const std::map& clusterMap - = { - {"GENRE", "Genre" }, - {"ALBUMGROUPING", "Group" } - }); + TagLibParser(const ClusterTypes& clusterTypes = defaultClusterTypes); boost::optional parse(const boost::filesystem::path& p); - - private: - - std::map _clusterMap; }; } // namespace MetaData diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 1d3819f9..933adb25 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -59,13 +59,6 @@ const std::vector defaultFileExtensions = ".shn", }; -// Caution current implementation prevents spaces with the names -const std::vector defaultClusters = -{ - "Genre", - "Group", -}; - Wt::WDate getNextMonday(Wt::WDate current) { @@ -160,7 +153,12 @@ _db(connectionPool) Setting::setString(_db.getSession(), fileExtensionsSetting, joinStrings(defaultFileExtensions, " ")); if (!Setting::exists(_db.getSession(), clustersSetting)) - Setting::setString(_db.getSession(), clustersSetting, joinStrings(defaultClusters, " ")); + { + std::vector defaultClusterTypes(MetaData::Parser::defaultClusterTypes.begin(), MetaData::Parser::defaultClusterTypes.end()); + Setting::setString(_db.getSession(), clustersSetting, joinStrings(defaultClusterTypes, " ")); + } + + refreshScanSettings(); } void @@ -325,9 +323,11 @@ MediaScanner::refreshScanSettings() for (auto rootDir : Database::MediaDirectory::getAll(_db.getSession())) _rootDirectories.push_back(rootDir->getPath()); - _clusterTypes.clear(); + MetaData::ClusterTypes clusterTypes; for (auto cluster : splitString(Setting::getString(_db.getSession(), clustersSetting), " ")) - _clusterTypes.push_back(cluster); + clusterTypes.insert(cluster); + + _metadataParser.updateClusterTypes(clusterTypes); } Artist::pointer @@ -800,8 +800,7 @@ MediaScanner::checkClusters() // Remove no longer desired clusters for (auto clusterType : clusterTypes) { - if (std::none_of(_clusterTypes.begin(), _clusterTypes.end(), - [&clusterType](std::string clusterTypeName) { return clusterTypeName == clusterType->getName(); })) + if (!_metadataParser.isClusterTypeSupported(clusterType->getName())) { LMS_LOG(DBUPDATER, INFO) << "Removing cluster type " << clusterType->getName(); clusterType.remove(); @@ -810,7 +809,7 @@ MediaScanner::checkClusters() } // Add any missing clusters - for (auto clusterTypeName : _clusterTypes) + for (auto clusterTypeName : _metadataParser.getClusterTypes()) { if (std::none_of(clusterTypes.begin(), clusterTypes.end(), [&clusterTypeName](ClusterType::pointer clusterType) { return (clusterType->getName() == clusterTypeName); })) diff --git a/src/scanner/MediaScanner.hpp b/src/scanner/MediaScanner.hpp index 9d8cfa3d..a27b9a13 100644 --- a/src/scanner/MediaScanner.hpp +++ b/src/scanner/MediaScanner.hpp @@ -126,7 +126,6 @@ class MediaScanner Database::Handler _db; // Scan settings - std::vector _clusterTypes; std::vector _fileExtensions; std::vector _rootDirectories; diff --git a/test/Makefile.am b/test/Makefile.am index 411aef1a..deb16d46 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -92,6 +92,7 @@ test_avmetadata_SOURCES = TestAvMetadata.cpp \ $(top_srcdir)/src/utils/Utils.cpp \ $(top_srcdir)/src/metadata/AvFormat.cpp \ $(top_srcdir)/src/metadata/TagLibParser.cpp \ + $(top_srcdir)/src/metadata/MetaData.cpp \ $(top_srcdir)/src/av/AvInfo.cpp test_avmetadata_CXXFLAGS=-std=c++11 -Wall -Wextra -I$(top_srcdir)/src From 142ef53b6fc85589bedada4ca7af035d372ae0a9 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 6 May 2018 17:50:18 +0200 Subject: [PATCH 116/195] Added css style for each cluster type. Unified cluster handling in UI --- approot/artist.xml | 4 ---- approot/explore.xml | 6 +++++- approot/release.xml | 4 ---- src/ui/LmsApplication.cpp | 16 ++++++++++++++++ src/ui/LmsApplication.hpp | 1 + src/ui/explore/ArtistView.cpp | 5 +---- src/ui/explore/Filters.cpp | 10 ++++------ src/ui/explore/ReleaseView.cpp | 5 +---- 8 files changed, 28 insertions(+), 23 deletions(-) diff --git a/approot/artist.xml b/approot/artist.xml index d9946518..bc13da08 100644 --- a/approot/artist.xml +++ b/approot/artist.xml @@ -19,10 +19,6 @@ ${releases class="list-group"} - - ${name} - -
diff --git a/approot/explore.xml b/approot/explore.xml index f20c320b..9cb083b3 100644 --- a/approot/explore.xml +++ b/approot/explore.xml @@ -12,10 +12,14 @@
- ${add-filter}${filters} + ${add-filter}${clusters}
+ + ${}${} ${name} + +
diff --git a/approot/release.xml b/approot/release.xml index 0a110c52..e2932eaa 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -22,10 +22,6 @@ ${tracks} - - ${name} - - ${}${disc-number}-${}${}${track-number}. ${} ${}${artist-name} - ${} diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index f2d302e3..49528722 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -172,6 +172,22 @@ LmsApplication::createReleaseAnchor(Database::Release::pointer release, bool add return res; } +std::unique_ptr +LmsApplication::createCluster(Database::Cluster::pointer cluster, bool canDelete) +{ + LMS_LOG(UI, DEBUG) << " Creating cluster for name " << cluster->getName(); + auto res = std::make_unique(Wt::WString::tr("Lms.Explore.template.cluster-entry")); + res->addFunction("tr", &Wt::WTemplate::Functions::tr); + + res->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::TextFormat::Plain); + res->setCondition("if-can-delete", canDelete); + + std::string styleClass = "cluster-type-" + std::to_string(cluster->getType().id() % 10); + res->setStyleClass(styleClass); + + return res; +} + void LmsApplication::goHome() { diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index b8ceda11..e9499347 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -60,6 +60,7 @@ class LmsApplication : public Wt::WApplication static std::unique_ptr createArtistAnchor(Database::Artist::pointer artist, bool addText = true); static std::unique_ptr createReleaseAnchor(Database::Release::pointer release, bool addText = true); + static std::unique_ptr createCluster(Database::Cluster::pointer cluster, bool canDelete= false); private: diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index c11a66d0..2fac685e 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -79,10 +79,7 @@ Artist::refresh() auto clusters = artist->getClusters(3); for (auto cluster : clusters) - { - Wt::WTemplate* entry = clusterContainers->addNew(Wt::WString::tr("Lms.Explore.Artist.template.cluster-entry")); - entry->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::TextFormat::Plain); - } + clusterContainers->addWidget(LmsApp->createCluster(cluster)); } t->bindString("name", Wt::WString::fromUTF8(artist->getName()), Wt::TextFormat::Plain); diff --git a/src/ui/explore/Filters.cpp b/src/ui/explore/Filters.cpp index 59619d08..aa6b03ac 100644 --- a/src/ui/explore/Filters.cpp +++ b/src/ui/explore/Filters.cpp @@ -54,7 +54,6 @@ Filters::showDialog() for (auto type : types) typeCombo->addItem(Wt::WString::fromUTF8(type->getName())); - if (!types.empty()) { auto values = types.front()->getClusters(); @@ -114,11 +113,10 @@ Filters::showDialog() _filterIds.insert(clusterId); _sigUpdated.emit(); - Wt::WPushButton* filterBtn = _filters->addNew(Wt::WString::fromUTF8(value), Wt::TextFormat::Plain); - - filterBtn->clicked().connect(std::bind([=] + auto filter = _filters->addWidget(LmsApp->createCluster(cluster, true)); + filter->clicked().connect(std::bind([=] { - _filters->removeWidget(filterBtn); + _filters->removeWidget(filter); _filterIds.erase(clusterId); _sigUpdated.emit(); })); @@ -134,7 +132,7 @@ Filters::Filters() Wt::WPushButton *addFilterBtn = bindNew("add-filter", Wt::WText::tr("Lms.Explore.add-filter")); addFilterBtn->clicked().connect(this, &Filters::showDialog); - _filters = bindNew("filters"); + _filters = bindNew("clusters"); } diff --git a/src/ui/explore/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp index 809e8998..ea888001 100644 --- a/src/ui/explore/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -112,10 +112,7 @@ Release::refresh() auto clusters = release->getClusters(3); for (auto cluster : clusters) - { - Wt::WTemplate* entry = clusterContainers->addNew(Wt::WString::tr("Lms.Explore.Release.template.cluster-entry")); - entry->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::TextFormat::Plain); - } + clusterContainers->addWidget(LmsApp->createCluster(cluster)); } { From eedcb1c2b56de051bf3b16cce78f0af01281b45c Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 7 May 2018 13:20:49 +0200 Subject: [PATCH 117/195] Added actual colors to tags --- approot/explore.xml | 2 +- docroot/css/lms.css | 40 +++++++++++++++++++++++++++++++++++++++ src/ui/LmsApplication.cpp | 8 +++----- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/approot/explore.xml b/approot/explore.xml index 9cb083b3..446a3893 100644 --- a/approot/explore.xml +++ b/approot/explore.xml @@ -17,7 +17,7 @@ - ${}${} ${name} + ${}${} ${name} diff --git a/docroot/css/lms.css b/docroot/css/lms.css index b259d5a1..4ad03b9a 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -1,4 +1,44 @@ +.Lms-cluster-type-0 { + background-color: darkslategrey; +} + +.Lms-cluster-type-1 { + background-color: darkblue; +} + +.Lms-cluster-type-2 { + background-color: darkgrey; +} + +.Lms-cluster-type-3 { + background-color: darkorchid; +} + +.Lms-cluster-type-4 { + background-color: darkslateblue; +} + +.Lms-cluster-type-5 { + background-color: darkslateblue; +} + +.Lms-cluster-type-6 { + background-color: darkolivegreen; +} + +.Lms-cluster-type-7 { + background-color: darkred; +} + +.Lms-cluster-type-8 { + background-color: darkviolet; +} + +.Lms-cluster-type-9 { + background-color: darkturquoise; +} + .Lms-playqueue-selected { font-weight: bold; } diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 49528722..1dedd55f 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -175,16 +175,14 @@ LmsApplication::createReleaseAnchor(Database::Release::pointer release, bool add std::unique_ptr LmsApplication::createCluster(Database::Cluster::pointer cluster, bool canDelete) { - LMS_LOG(UI, DEBUG) << " Creating cluster for name " << cluster->getName(); - auto res = std::make_unique(Wt::WString::tr("Lms.Explore.template.cluster-entry")); + std::string styleClass = "Lms-cluster-type-" + std::to_string(cluster->getType().id() % 10); + + auto res = std::make_unique(Wt::WString::tr("Lms.Explore.template.cluster-entry").arg(styleClass)); res->addFunction("tr", &Wt::WTemplate::Functions::tr); res->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::TextFormat::Plain); res->setCondition("if-can-delete", canDelete); - std::string styleClass = "cluster-type-" + std::to_string(cluster->getType().id() % 10); - res->setStyleClass(styleClass); - return res; } From 87c2f2936f08ada4ba1ec69b18dc7a6c02be3287 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 7 May 2018 14:04:03 +0200 Subject: [PATCH 118/195] Added interactions for clusters/filters --- src/database/Track.cpp | 6 ++++++ src/database/Track.hpp | 1 + src/ui/explore/ArtistView.cpp | 9 ++++++++- src/ui/explore/Filters.cpp | 36 +++++++++++++++++++++++----------- src/ui/explore/Filters.hpp | 2 ++ src/ui/explore/ReleaseView.cpp | 9 ++++++++- 6 files changed, 50 insertions(+), 13 deletions(-) diff --git a/src/database/Track.cpp b/src/database/Track.cpp index 9ef6ce9f..6bad83fb 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -232,6 +232,12 @@ Cluster::getAll(Wt::Dbo::Session& session) return std::vector(res.begin(), res.end()); } +Cluster::pointer +Cluster::getById(Wt::Dbo::Session& session, id_type id) +{ + return session.find().where("id = ?").bind(id); +} + ClusterType::ClusterType(std::string name) : _name(name) { diff --git a/src/database/Track.hpp b/src/database/Track.hpp index 50bdd42f..88ae32b7 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -51,6 +51,7 @@ class Cluster : public Wt::Dbo::Dbo // Find utility static std::vector getAll(Wt::Dbo::Session& session); + static pointer getById(Wt::Dbo::Session& session, id_type id); // Create utility static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr type, std::string name); diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index 2fac685e..3de4130f 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -79,7 +79,14 @@ Artist::refresh() auto clusters = artist->getClusters(3); for (auto cluster : clusters) - clusterContainers->addWidget(LmsApp->createCluster(cluster)); + { + auto clusterId = cluster.id(); + auto entry = clusterContainers->addWidget(LmsApp->createCluster(cluster)); + entry->clicked().connect([=] + { + _filters->add(clusterId); + }); + } } t->bindString("name", Wt::WString::fromUTF8(artist->getName()), Wt::TextFormat::Plain); diff --git a/src/ui/explore/Filters.cpp b/src/ui/explore/Filters.cpp index aa6b03ac..02d51e46 100644 --- a/src/ui/explore/Filters.cpp +++ b/src/ui/explore/Filters.cpp @@ -109,22 +109,36 @@ Filters::showDialog() if (!cluster) return; - auto clusterId = cluster.id(); - _filterIds.insert(clusterId); - _sigUpdated.emit(); - - auto filter = _filters->addWidget(LmsApp->createCluster(cluster, true)); - filter->clicked().connect(std::bind([=] - { - _filters->removeWidget(filter); - _filterIds.erase(clusterId); - _sigUpdated.emit(); - })); + add(cluster.id()); })); dialog->show(); } +void +Filters::add(Database::Cluster::id_type clusterId) +{ + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + + auto cluster = Database::Cluster::getById(LmsApp->getDboSession(), clusterId); + if (!cluster) + return; + + auto res = _filterIds.insert(clusterId); + if (!res.second) + return; + + auto filter = _filters->addWidget(LmsApp->createCluster(cluster, true)); + filter->clicked().connect(std::bind([=] + { + _filters->removeWidget(filter); + _filterIds.erase(clusterId); + _sigUpdated.emit(); + })); + + _sigUpdated.emit(); +} + Filters::Filters() : Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.filters")) { diff --git a/src/ui/explore/Filters.hpp b/src/ui/explore/Filters.hpp index aa3d30ce..85b5606e 100644 --- a/src/ui/explore/Filters.hpp +++ b/src/ui/explore/Filters.hpp @@ -34,6 +34,8 @@ class Filters : public Wt::WTemplate public: Filters(); + void add(Database::Cluster::id_type clusterId); + std::set getClusterIds() const { return _filterIds; } Wt::Signal<>& updated() { return _sigUpdated; } diff --git a/src/ui/explore/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp index ea888001..4d24b1bb 100644 --- a/src/ui/explore/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -112,7 +112,14 @@ Release::refresh() auto clusters = release->getClusters(3); for (auto cluster : clusters) - clusterContainers->addWidget(LmsApp->createCluster(cluster)); + { + auto clusterId = cluster.id(); + auto entry = clusterContainers->addWidget(LmsApp->createCluster(cluster)); + entry->clicked().connect([=] + { + _filters->add(clusterId); + }); + } } { From 6a96af5d48b2ac92454fed6db6b03b0de6f25bc2 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 7 May 2018 14:04:11 +0200 Subject: [PATCH 119/195] Added missing file --- src/metadata/MetaData.cpp | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/metadata/MetaData.cpp diff --git a/src/metadata/MetaData.cpp b/src/metadata/MetaData.cpp new file mode 100644 index 00000000..fc22e27d --- /dev/null +++ b/src/metadata/MetaData.cpp @@ -0,0 +1,30 @@ +/* + * 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 . + */ + +#include "MetaData.hpp" + +namespace MetaData { + +const ClusterTypes Parser::defaultClusterTypes = +{ + {"GENRE"}, + {"ALBUMGROUPING"}, +}; + +} // namespace MetaData From 070d466380eaed0cf05575bd3aad4d874324e911 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 11 May 2018 13:42:25 +0200 Subject: [PATCH 120/195] Made the cluster types that are displayed configurable in the release and artist view --- docroot/css/lms.css | 4 +-- src/database/DbArtist.cpp | 45 ++++++++++++++++++++++------- src/database/DbArtist.hpp | 5 +++- src/database/Release.cpp | 45 ++++++++++++++++++++++------- src/database/Release.hpp | 5 +++- src/metadata/AvFormat.cpp | 9 +++--- src/metadata/AvFormat.hpp | 2 +- src/metadata/MetaData.cpp | 7 +++-- src/metadata/MetaData.hpp | 2 +- src/metadata/TagLibParser.cpp | 12 ++++---- src/metadata/TagLibParser.hpp | 2 +- src/scanner/MediaScanner.cpp | 8 ++--- src/ui/explore/ArtistView.cpp | 53 +++++++++++++++++++++++++++++----- src/ui/explore/ReleaseView.cpp | 51 +++++++++++++++++++++++++++----- test/TestAvMetadata.cpp | 2 +- 15 files changed, 194 insertions(+), 58 deletions(-) diff --git a/docroot/css/lms.css b/docroot/css/lms.css index 4ad03b9a..03d32c2b 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -16,11 +16,11 @@ } .Lms-cluster-type-4 { - background-color: darkslateblue; + background-color: darkgoldenrod; } .Lms-cluster-type-5 { - background-color: darkslateblue; + background-color: darkkhaki; } .Lms-cluster-type-6 { diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp index 0f2ebacc..823cf35c 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/DbArtist.cpp @@ -182,23 +182,48 @@ Artist::getReleases(const std::set& clusterIds) const return std::vector< Wt::Dbo::ptr > (res.begin(), res.end()); } -std::vector> -Artist::getClusters(int size) const +std::vector>> +Artist::getClusterGroups(std::vector clusterTypes, std::size_t size) const { assert(self()); assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); assert(session()); - Wt::Dbo::Query query = session()->query - ("select c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN artist a ON t.artist_id = a.id") - .where("a.id = ?").bind(self()->id()) - .groupBy("c.id") - .orderBy("COUNT(c.id) DESC") - .limit(size); + WhereClause where; - Wt::Dbo::collection res = query; + std::ostringstream oss; + oss << "SELECT c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN cluster_type c_type ON c.cluster_type_id = c_type.id INNER JOIN artist a ON t.artist_id = a.id"; - return std::vector(res.begin(), res.end()); + where.And(WhereClause("a.id = ?")).bind(std::to_string(self()->id())); + { + WhereClause clusterClause; + for (auto clusterType : clusterTypes) + clusterClause.Or(WhereClause("c_type.id = ?")).bind(std::to_string(clusterType.id())); + + where.And(clusterClause); + } + oss << " " << where.get(); + oss << "GROUP BY c.id ORDER BY COUNT(c.id) DESC"; + + Wt::Dbo::Query query = session()->query( oss.str() ); + + for (const std::string& bindArg : where.getBindArgs()) + query.bind(bindArg); + + Wt::Dbo::collection queryRes = query; + + std::map> clusters; + for (auto cluster : queryRes) + { + if (clusters[cluster->getType().id()].size() < size) + clusters[cluster->getType().id()].push_back(cluster); + } + + std::vector> res; + for (auto cluster_list : clusters) + res.push_back(cluster_list.second); + + return res; } } // namespace Database diff --git a/src/database/DbArtist.hpp b/src/database/DbArtist.hpp index 89c9a92b..1b5f6629 100644 --- a/src/database/DbArtist.hpp +++ b/src/database/DbArtist.hpp @@ -31,6 +31,7 @@ namespace Database class Track; class Cluster; +class ClusterType; class Release; class Artist : public Wt::Dbo::Dbo @@ -65,7 +66,9 @@ class Artist : public Wt::Dbo::Dbo std::vector> getReleases(const std::set& clusterIds = std::set()) const; // Get the cluster of the tracks made by this artist - std::vector> getClusters(int size) const; + // Each clusters are grouped by cluster type, sorted by the number of occurence + // size is the max number of cluster per cluster type + std::vector>> getClusterGroups(std::vector> clusterTypes, std::size_t size) const; void setMBID(std::string mbid) { _MBID = mbid; } diff --git a/src/database/Release.cpp b/src/database/Release.cpp index 92be18e2..0fe6ba65 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -226,23 +226,48 @@ Release::getTracks(const std::set& clusterIds) const return std::vector< Wt::Dbo::ptr > (res.begin(), res.end()); } -std::vector> -Release::getClusters(int size) const +std::vector>> +Release::getClusterGroups(std::vector clusterTypes, std::size_t size) const { assert(self()); assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); assert(session()); - Wt::Dbo::Query query = session()->query - ("select c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN release r ON t.release_id = r.id") - .where("r.id = ?").bind(self()->id()) - .groupBy("c.id") - .orderBy("COUNT(c.id) DESC") - .limit(size); + WhereClause where; - Wt::Dbo::collection res = query; + std::ostringstream oss; - return std::vector(res.begin(), res.end()); + oss << "SELECT c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN cluster_type c_type ON c.cluster_type_id = c_type.id INNER JOIN release r ON t.release_id = r.id"; + + where.And(WhereClause("r.id = ?")).bind(std::to_string(self()->id())); + { + WhereClause clusterClause; + for (auto clusterType : clusterTypes) + clusterClause.Or(WhereClause("c_type.id = ?")).bind(std::to_string(clusterType.id())); + where.And(clusterClause); + } + oss << " " << where.get(); + oss << "GROUP BY c.id ORDER BY COUNT(c.id) DESC"; + + Wt::Dbo::Query query = session()->query( oss.str() ); + + for (const std::string& bindArg : where.getBindArgs()) + query.bind(bindArg); + + Wt::Dbo::collection queryRes = query; + + std::map> clusters; + for (auto cluster : queryRes) + { + if (clusters[cluster->getType().id()].size() < size) + clusters[cluster->getType().id()].push_back(cluster); + } + + std::vector> res; + for (auto cluster_list : clusters) + res.push_back(cluster_list.second); + + return res; } } // namespace Database diff --git a/src/database/Release.hpp b/src/database/Release.hpp index 1e143e29..c7020556 100644 --- a/src/database/Release.hpp +++ b/src/database/Release.hpp @@ -55,7 +55,10 @@ class Release : public Wt::Dbo::Dbo bool& moreExpected); std::vector> getTracks(const std::set& clusters = std::set()) const; - std::vector> getClusters(int size) const; + // Get the cluster of the tracks that belong to this release + // Each clusters are grouped by cluster type, sorted by the number of occurence + // size is the max number of cluster per cluster type + std::vector>> getClusterGroups(std::vector> clusterTypes, std::size_t size) const; // Create static pointer create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID = ""); diff --git a/src/metadata/AvFormat.cpp b/src/metadata/AvFormat.cpp index deb9db2b..d2ba1788 100644 --- a/src/metadata/AvFormat.cpp +++ b/src/metadata/AvFormat.cpp @@ -36,7 +36,7 @@ AvFormat::AvFormat(const ClusterTypes& clusterTypes) } boost::optional -AvFormat::parse(const boost::filesystem::path& p) +AvFormat::parse(const boost::filesystem::path& p, bool debug) { Items items; @@ -73,9 +73,10 @@ AvFormat::parse(const boost::filesystem::path& p) { const std::string tag = boost::to_upper_copy(metadata.first); const std::string value = metadata.second; -#if 0 - std::cout << "TAG = " << tag << ", VAL = " << value << std::endl; -#endif + + if (debug) + std::cout << "TAG = " << tag << ", VAL = " << value << std::endl; + if (tag == "ARTIST") items.insert( std::make_pair(MetaData::Type::Artist, stringTrim( value) )); else if (tag == "ALBUM") diff --git a/src/metadata/AvFormat.hpp b/src/metadata/AvFormat.hpp index aaec59fe..9039c90a 100644 --- a/src/metadata/AvFormat.hpp +++ b/src/metadata/AvFormat.hpp @@ -34,7 +34,7 @@ class AvFormat : public Parser AvFormat(const ClusterTypes& clusterTypes = defaultClusterTypes); - boost::optional parse(const boost::filesystem::path& p); + boost::optional parse(const boost::filesystem::path& p, bool debug = false); }; } // namespace MetaData diff --git a/src/metadata/MetaData.cpp b/src/metadata/MetaData.cpp index fc22e27d..d949ef93 100644 --- a/src/metadata/MetaData.cpp +++ b/src/metadata/MetaData.cpp @@ -23,8 +23,11 @@ namespace MetaData { const ClusterTypes Parser::defaultClusterTypes = { - {"GENRE"}, - {"ALBUMGROUPING"}, + "GENRE", + "ALBUMGROUPING", + "MOOD", + "ALBUMMOOD", + "COMMENT:SONGS-DB_OCCASION", }; } // namespace MetaData diff --git a/src/metadata/MetaData.hpp b/src/metadata/MetaData.hpp index 11606b70..f09b1504 100644 --- a/src/metadata/MetaData.hpp +++ b/src/metadata/MetaData.hpp @@ -73,7 +73,7 @@ namespace MetaData // Provide a map for tag name -> Cluster name Parser(const ClusterTypes& clusterTypes) : _clusterTypes(clusterTypes) {} - virtual boost::optional parse(const boost::filesystem::path& p) = 0; + virtual boost::optional parse(const boost::filesystem::path& p, bool debug = false) = 0; void updateClusterTypes(const ClusterTypes& clusterTypes) { _clusterTypes = clusterTypes; } const ClusterTypes& getClusterTypes() const { return _clusterTypes; } diff --git a/src/metadata/TagLibParser.cpp b/src/metadata/TagLibParser.cpp index acc12cc4..373781e3 100644 --- a/src/metadata/TagLibParser.cpp +++ b/src/metadata/TagLibParser.cpp @@ -38,7 +38,7 @@ TagLibParser::TagLibParser(const ClusterTypes& clusterTypes) } boost::optional -TagLibParser::parse(const boost::filesystem::path& p) +TagLibParser::parse(const boost::filesystem::path& p, bool debug) { TagLib::FileRef f(p.string().c_str(), true, // read audio properties @@ -89,13 +89,13 @@ TagLibParser::parse(const boost::filesystem::path& p) // TODO validate MBID format -#if 0 - std::cout << "TAG = '" << tag << "'" << std::endl; - for (auto value : values) + if (debug) { - std::cout << "\t'" << value.to8Bit(true) << "'" << std::endl; + std::cout << "TAG = '" << tag << "', VALUES = "; + for (auto value : values) + std::cout << "'" << value.to8Bit(true) << "',"; + std::cout << std::endl; } -#endif if (tag == "ARTIST") items.insert( std::make_pair(MetaData::Type::Artist, stringTrim( values.front().to8Bit(true)))); diff --git a/src/metadata/TagLibParser.hpp b/src/metadata/TagLibParser.hpp index 1b85ed0d..2b6c7425 100644 --- a/src/metadata/TagLibParser.hpp +++ b/src/metadata/TagLibParser.hpp @@ -34,7 +34,7 @@ class TagLibParser : public Parser TagLibParser(const ClusterTypes& clusterTypes = defaultClusterTypes); - boost::optional parse(const boost::filesystem::path& p); + boost::optional parse(const boost::filesystem::path& p, bool debug = false); }; } // namespace MetaData diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 933adb25..06864e7c 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -39,7 +39,7 @@ namespace { const std::string updatePeriodSetting = "update_period"; const std::string updateStartTimeSetting = "update_start_time"; -const std::string clustersSetting = "clusters"; +const std::string clusterTypesSetting = "cluster_types"; const std::string fileExtensionsSetting = "file_extensions"; const std::vector defaultFileExtensions = @@ -152,10 +152,10 @@ _db(connectionPool) if (!Setting::exists(_db.getSession(), fileExtensionsSetting)) Setting::setString(_db.getSession(), fileExtensionsSetting, joinStrings(defaultFileExtensions, " ")); - if (!Setting::exists(_db.getSession(), clustersSetting)) + if (!Setting::exists(_db.getSession(), clusterTypesSetting)) { std::vector defaultClusterTypes(MetaData::Parser::defaultClusterTypes.begin(), MetaData::Parser::defaultClusterTypes.end()); - Setting::setString(_db.getSession(), clustersSetting, joinStrings(defaultClusterTypes, " ")); + Setting::setString(_db.getSession(), clusterTypesSetting, joinStrings(defaultClusterTypes, " ")); } refreshScanSettings(); @@ -324,7 +324,7 @@ MediaScanner::refreshScanSettings() _rootDirectories.push_back(rootDir->getPath()); MetaData::ClusterTypes clusterTypes; - for (auto cluster : splitString(Setting::getString(_db.getSession(), clustersSetting), " ")) + for (auto cluster : splitString(Setting::getString(_db.getSession(), clusterTypesSetting), " ")) clusterTypes.insert(cluster); _metadataParser.updateClusterTypes(clusterTypes); diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index 3de4130f..3bae5b00 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -23,6 +23,7 @@ #include #include "database/Types.hpp" +#include "database/Setting.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -33,11 +34,44 @@ #include "Filters.hpp" #include "ArtistView.hpp" +using namespace Database; + +namespace { + +const std::string artistClusterTypesSetting = "artist_cluster_types"; +const std::vector defaultArtistClusterTypes = +{ + "GENRE", + "ALBUMGROUPING", + "ALBUMMOOD", + "COMMENT:SONGS-DB_OCCASION", +}; + +std::vector getArtistClusterTypes(Wt::Dbo::Session& session) +{ + Wt::Dbo::Transaction transaction(session); + + std::vector 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 { Artist::Artist(Filters* filters) : _filters(filters) { + if (!Setting::exists(LmsApp->getDboSession(), artistClusterTypesSetting)) + Setting::setString(LmsApp->getDboSession(), artistClusterTypesSetting, joinStrings(defaultArtistClusterTypes, " ")); + wApp->internalPathChanged().connect(std::bind([=] { refresh(); @@ -64,6 +98,7 @@ Artist::refresh() Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); auto artist = Database::Artist::getById(LmsApp->getDboSession(), *artistId); + if (!artist) { LmsApp->goHome(); @@ -76,16 +111,20 @@ Artist::refresh() Wt::WContainerWidget* clusterContainers = t->bindNew("clusters"); { - auto clusters = artist->getClusters(3); + auto clusterTypes = getArtistClusterTypes(LmsApp->getDboSession()); + auto clusterGroups = artist->getClusterGroups(clusterTypes, 3); - for (auto cluster : clusters) + for (auto clusters : clusterGroups) { - auto clusterId = cluster.id(); - auto entry = clusterContainers->addWidget(LmsApp->createCluster(cluster)); - entry->clicked().connect([=] + for (auto cluster : clusters) { - _filters->add(clusterId); - }); + auto clusterId = cluster.id(); + auto entry = clusterContainers->addWidget(LmsApp->createCluster(cluster)); + entry->clicked().connect([=] + { + _filters->add(clusterId); + }); + } } } diff --git a/src/ui/explore/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp index 4d24b1bb..fe8744e4 100644 --- a/src/ui/explore/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -24,6 +24,7 @@ #include #include "database/Types.hpp" +#include "database/Setting.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -34,11 +35,43 @@ #include "Filters.hpp" #include "ReleaseView.hpp" +using namespace Database; + +namespace { + +const std::string releaseClusterTypesSetting = "release_cluster_types"; +const std::vector defaultReleaseClusterTypes = +{ + "GENRE", + "ALBUMGROUPING", + "ALBUMMOOD", + "COMMENT:SONGS-DB_OCCASION", +}; + +std::vector getReleaseClusterTypes(Wt::Dbo::Session& session) +{ + Wt::Dbo::Transaction transaction(session); + + std::vector 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 { Release::Release(Filters* filters) : _filters(filters) { + if (!Setting::exists(LmsApp->getDboSession(), releaseClusterTypesSetting)) + Setting::setString(LmsApp->getDboSession(), releaseClusterTypesSetting, joinStrings(defaultReleaseClusterTypes, " ")); + wApp->internalPathChanged().connect(std::bind([=] { refresh(); @@ -109,16 +142,20 @@ Release::refresh() Wt::WContainerWidget* clusterContainers = t->bindNew("clusters"); { - auto clusters = release->getClusters(3); + auto clusterTypes = getReleaseClusterTypes(LmsApp->getDboSession()); + auto clusterGroups = release->getClusterGroups(clusterTypes, 3); - for (auto cluster : clusters) + for (auto clusters : clusterGroups) { - auto clusterId = cluster.id(); - auto entry = clusterContainers->addWidget(LmsApp->createCluster(cluster)); - entry->clicked().connect([=] + for (auto cluster : clusters) { - _filters->add(clusterId); - }); + auto clusterId = cluster.id(); + auto entry = clusterContainers->addWidget(LmsApp->createCluster(cluster)); + entry->clicked().connect([=] + { + _filters->add(clusterId); + }); + } } } diff --git a/test/TestAvMetadata.cpp b/test/TestAvMetadata.cpp index 9dc0d4c5..93985aac 100644 --- a/test/TestAvMetadata.cpp +++ b/test/TestAvMetadata.cpp @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) for (auto& parser : parsers) { - boost::optional items = parser->parse(argv[1]); + boost::optional items = parser->parse(argv[1], true); if (!items) { From 868eca62c8f6c9071c2c3610461a94d9b5ef5afb Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 11 May 2018 13:57:28 +0200 Subject: [PATCH 121/195] Removed outdated checks + created a new tool dir with the metadata tool scanner --- Makefile.am | 2 +- configure.ac | 4 +- src/Makefile.am | 2 +- test/CheckDatabaseUser.cpp | 64 ------- test/CheckDbBasics.cpp | 233 ------------------------ test/CheckSqlQuery.cpp | 66 ------- test/DatabaseIntegrity.cpp | 60 ------ test/Makefile.am | 106 +---------- test/TestAvMetadata.cpp | 143 --------------- test/TestAvTranscoder.cpp | 55 ------ test/TestDatabase.cpp | 46 ----- test/TestDatabase.hpp | 27 --- test/TestWt.cpp | 166 ----------------- test/TestWtAudio.cpp | 322 --------------------------------- tools/Makefile.am | 2 + tools/metadata/LmsMetadata.cpp | 129 +++++++++++++ tools/metadata/Makefile.am | 11 ++ 17 files changed, 149 insertions(+), 1289 deletions(-) delete mode 100644 test/CheckDatabaseUser.cpp delete mode 100644 test/CheckDbBasics.cpp delete mode 100644 test/CheckSqlQuery.cpp delete mode 100644 test/DatabaseIntegrity.cpp delete mode 100644 test/TestAvMetadata.cpp delete mode 100644 test/TestAvTranscoder.cpp delete mode 100644 test/TestDatabase.cpp delete mode 100644 test/TestDatabase.hpp delete mode 100644 test/TestWt.cpp delete mode 100644 test/TestWtAudio.cpp create mode 100644 tools/Makefile.am create mode 100644 tools/metadata/LmsMetadata.cpp create mode 100644 tools/metadata/Makefile.am diff --git a/Makefile.am b/Makefile.am index 5e13197f..15ac8af4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip -SUBDIRS = test src +SUBDIRS = test tools src lms_docrootdir=$(pkgdatadir)/docroot lms_approotdir=$(pkgdatadir)/approot diff --git a/configure.ac b/configure.ac index a5074afe..1e00f7e1 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,9 @@ AC_CHECK_LIB( [config++], AC_CONFIG_FILES([Makefile src/Makefile - test/Makefile]) + test/Makefile + tools/Makefile + tools/metadata/Makefile]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 20275a2c..b049316e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,6 +44,6 @@ lms_SOURCES = \ $(srcdir)/utils/Path.cpp \ $(srcdir)/utils/Utils.cpp -lms_CXXFLAGS=-std=c++14 -Wall -I$(srcdir)/third-party -I$(srcdir)/ui $(MAGICKXX_CFLAGS) -D_REENTRANT +lms_CXXFLAGS=-std=c++14 -Wall -I$(srcdir)/ui $(MAGICKXX_CFLAGS) -D_REENTRANT lms_LDADD=$(MAGICKXX_LIBS) diff --git a/test/CheckDatabaseUser.cpp b/test/CheckDatabaseUser.cpp deleted file mode 100644 index 1c5a0ad3..00000000 --- a/test/CheckDatabaseUser.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include "database/DatabaseHandler.hpp" -#include - -int main(void) -{ - try - { - boost::filesystem::remove("test_user.db"); - - // Set up the database session - Database::Handler::configureAuth(); - - std::unique_ptr connectionPool( Database::Handler::createConnectionPool("test_user.db")); - - Database::Handler db(*connectionPool); - - Wt::Dbo::Transaction transaction(db.getSession()); - - Wt::Auth::Identity identity; - Wt::Auth::User user = db.getUserDatabase().registerNew(); - std::cout << "User is valid = " << std::boolalpha << user.isValid() << std::endl; - - user.setIdentity(identity.provider(), "toto"); - - std::cout << "User is valid = " << std::boolalpha << user.isValid() << std::endl; - - std::cout << "Updating password" << std::endl; - db.getPasswordService().updatePassword(user, "This is my password"); - -// db.getSession().add( user ); - - std::cout << "Committing" << std::endl; - - transaction.commit(); - - } - catch(std::exception& e) - { - std::cerr << "Caught exception " << e.what() << std::endl; - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} - diff --git a/test/CheckDbBasics.cpp b/test/CheckDbBasics.cpp deleted file mode 100644 index 716873a8..00000000 --- a/test/CheckDbBasics.cpp +++ /dev/null @@ -1,233 +0,0 @@ -/* - * Copyright (C) 2015 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 . - */ - -#include "database/DatabaseHandler.hpp" - -static const std::string trackMBID = "123e4567-e89b-12d3-a456-426655440000"; -static const std::string artistMBID = "xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx"; -static const std::string releaseMBID = "xxxxxxxx-xxxx-9877-Nxxx-xxxxxxxxxxxx"; - -int main(void) -{ - try - { - using namespace Database; - - boost::filesystem::remove("test.db"); - - std::unique_ptr connectionPool(Database::Handler::createConnectionPool( "test.db")); - - Handler db( *connectionPool ); - - // Create - { - Wt::Dbo::Transaction transaction(db.getSession()); - - Track::pointer track = Track::create(db.getSession(), "test.mp2"); - - track.modify()->setName("track01"); - track.modify()->setMBID(trackMBID); - - Artist::pointer artist = Artist::create(db.getSession(), "artist01", artistMBID); - Release::pointer release = Release::create(db.getSession(), "release01", releaseMBID); - Genre::pointer genre = Genre::create(db.getSession(), "genre01"); - - track.modify()->setArtist(artist); - track.modify()->setRelease(release); - track.modify()->setGenres( std::vector({ genre })); - } - - // Search - { - Wt::Dbo::Transaction transaction(db.getSession()); - - Track::pointer track = Track::getByMBID(db.getSession(), trackMBID); - assert(track); - assert(track->getArtist()->getMBID() == artistMBID); - - Track::pointer trackNotFound = Track::getByMBID(db.getSession(), "foobar"); - assert(!trackNotFound); - - Artist::pointer artist = Artist::getByMBID(db.getSession(), artistMBID); - assert(artist); - } - - // Search Filters - // Select track by track name - { - Wt::Dbo::Transaction transaction(db.getSession()); - - SearchFilter filter = SearchFilter::NameLikeMatch({{{SearchFilter::Field::Track, {"track"}}}}); - std::vector res = Track::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 1); - assert(res.front().id() == 1); - - filter = SearchFilter::NameLikeMatch({{{SearchFilter::Field::Track,{"not-found"}}}}); - res = Track::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 0 ); - } - - // Select track by artist name - { - Wt::Dbo::Transaction transaction(db.getSession()); - - SearchFilter filter = SearchFilter::NameLikeMatch({{{SearchFilter::Field::Artist, {"artist"}}}}); - std::vector res = Track::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 1); - assert(res.front().id() == 1); - } - - // Select track by artist id - { - Wt::Dbo::Transaction transaction(db.getSession()); - - SearchFilter filter = SearchFilter::IdMatch({{SearchFilter::Field::Artist, {1}}}); - std::vector res = Track::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 1); - assert(res.front().id() == 1); - } - - // Select track by track name + artist id - { - Wt::Dbo::Transaction transaction(db.getSession()); - - SearchFilter filter; - filter.idMatch[SearchFilter::Field::Artist] = { 1 }; - filter.nameLikeMatch = {{{ SearchFilter::Field::Track, {"track"} }}}; - std::vector res = Track::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 1); - assert(res.front().id() == 1); - assert(res.front()->getName() == "track01" ); - } - - // Select track by genre name - { - Wt::Dbo::Transaction transaction(db.getSession()); - - SearchFilter filter = SearchFilter::NameLikeMatch({{{SearchFilter::Field::Genre, {"genre"}}}}); - std::vector res = Track::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 1); - assert(res.front().id() == 1); - assert(res.front()->getName() == "track01" ); - } - - // Select artist by track name - { - Wt::Dbo::Transaction transaction(db.getSession()); - - SearchFilter filter = SearchFilter::NameLikeMatch({{{SearchFilter::Field::Track, { "track" } }}}); - std::vector res = Artist::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 1); - assert(res.front().id() == 1); - - filter = SearchFilter::NameLikeMatch({{{SearchFilter::Field::Track, {"badtrack"} }}}); - res = Artist::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 0); - } - - // Select artist by track id - { - Wt::Dbo::Transaction transaction(db.getSession()); - - SearchFilter filter = SearchFilter::IdMatch({{SearchFilter::Field::Track, {1} }}); - std::vector res = Artist::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 1); - assert(res.front().id() == 1); - } - - // Select Artist by name - { - Wt::Dbo::Transaction transaction(db.getSession()); - - SearchFilter filter = SearchFilter::NameLikeMatch({{{SearchFilter::Field::Artist, {"artist"}}}}); - std::vector res = Artist::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 1); - assert(res.front().id() == 1); - - // Make sure artist has a release - assert(res.front()->getReleases().size() == 1); - } - - // Select Release by name - { - Wt::Dbo::Transaction transaction(db.getSession()); - - SearchFilter filter = SearchFilter::NameLikeMatch({{{SearchFilter::Field::Release, {"release"} }}}); - - std::vector res = Release::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 1); - assert(res.front().id() == 1); - } - - // Select Release by track name - { - Wt::Dbo::Transaction transaction(db.getSession()); - - SearchFilter filter = SearchFilter::NameLikeMatch({{{SearchFilter::Field::Track, {"track"}}}}); - std::vector res = Release::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 1); - assert(res.front().id() == 1); - assert(res.front()->getName() == "release01"); - - } - - // Select genre by name - { - Wt::Dbo::Transaction transaction(db.getSession()); - - SearchFilter filter = SearchFilter::NameLikeMatch({{{SearchFilter::Field::Genre, {"genre"}}}}); - std::vector res = Genre::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 1); - assert(res.front().id() == 1); - assert(res.front()->getName() == "genre01"); - } - - // Select genre by track name - { - Wt::Dbo::Transaction transaction(db.getSession()); - - SearchFilter filter = SearchFilter::NameLikeMatch({{{SearchFilter::Field::Track, {"track"}}}}); - std::vector res = Genre::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 1); - assert(res.front().id() == 1); - assert(res.front()->getName() == "genre01"); - } - - // Select genre by track name and artist name - { - Wt::Dbo::Transaction transaction(db.getSession()); - - SearchFilter filter = SearchFilter::NameLikeMatch({{{SearchFilter::Field::Track, {"track"}}, - {SearchFilter::Field::Artist, {"artist"}}}}); - std::vector res = Genre::getByFilter(db.getSession(), filter, -1, -1); - assert(res.size() == 1); - assert(res.front().id() == 1); - assert(res.front()->getName() == "genre01"); - } - - } - catch(std::exception& e) - { - std::cerr << "Caught exception " << e.what() << std::endl; - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} - diff --git a/test/CheckSqlQuery.cpp b/test/CheckSqlQuery.cpp deleted file mode 100644 index e5ab3153..00000000 --- a/test/CheckSqlQuery.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - - -#include -#include -#include -#include - -#include "database/SqlQuery.hpp" - -int main(void) -{ - try { - SqlQuery query; - - - query.select("artist.name").And("track.name"); - query.from().And( FromClause("artist") ).And( FromClause("track")); - query.where().And( WhereClause("artist.id = track.artist_id") ); - - std::cout << "Query = '" << query.get() << "'" << std::endl; - - assert(query.get() == "SELECT artist.name,track.name FROM artist,track WHERE (artist.id = track.artist_id)"); - - { - WhereClause clause; - - clause.Or(WhereClause("artist.name = ?").bind("Sepultura1")); - clause.Or(WhereClause("artist.name = ?").bind("Sepultura2")); - clause.Or(WhereClause("artist.name = ?")).bind("Sepultura3"); - - query.where().And(clause); - - assert(query.get() == "SELECT artist.name,track.name FROM artist,track WHERE (artist.id = track.artist_id) AND ((artist.name = ?) OR (artist.name = ?) OR (artist.name = ?))"); - - assert(query.where().getBindArgs().size() == 3); - std::cout << "Query = '" << query.get() << "'" << std::endl; - } - - } - catch(std::exception& e) - { - std::cerr << "Caught exception " << e.what() << std::endl; - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} - diff --git a/test/DatabaseIntegrity.cpp b/test/DatabaseIntegrity.cpp deleted file mode 100644 index 4b3d97dc..00000000 --- a/test/DatabaseIntegrity.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include -#include -#include - -#include - -#include "database/DatabaseHandler.hpp" - -int main(void) -{ - - try { - std::cout << "Starting test!" << std::endl; - - // Set up the long living database session - std::unique_ptr connectionPool(Database::Handler::createConnectionPool( "test.db")); - - Database::Handler database(*connectionPool); - - Wt::Dbo::Transaction transaction(database.getSession()); - - Wt::Dbo::collection< Database::Track::pointer > tracks (Database::Track::getAll( database.getSession() )); - - std::cout << "Found " << tracks.size() << " tracks!" << std::endl; - - for (auto track : tracks) - { - assert( !track->getName().empty() ); - assert( !track->getGenres().empty() ); - assert( !track->getDuration().is_not_a_date_time() ); - } - - } - catch(std::exception& e) - { - std::cerr << "Caught exception " << e.what() << std::endl; - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} diff --git a/test/Makefile.am b/test/Makefile.am index deb16d46..8dbec7c5 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,109 +1,7 @@ -TESTS = sql-query database-user +TESTS = -check_PROGRAMS = test-avmetadata - -database_basics_SOURCES = \ - $(srcdir)/CheckDbBasics.cpp \ - $(top_srcdir)/src/logger/Logger.cpp \ - $(top_srcdir)/src/database/Artist.cpp \ - $(top_srcdir)/src/database/DatabaseHandler.cpp \ - $(top_srcdir)/src/database/MediaDirectory.cpp \ - $(top_srcdir)/src/database/Playlist.cpp \ - $(top_srcdir)/src/database/Release.cpp \ - $(top_srcdir)/src/database/SearchFilter.cpp \ - $(top_srcdir)/src/database/SqlQuery.cpp \ - $(top_srcdir)/src/database/Track.cpp \ - $(top_srcdir)/src/database/User.cpp \ - $(top_srcdir)/src/database/Video.cpp - -database_basics_CXXFLAGS=-std=c++11 -Wall -Wextra -I$(top_srcdir)/src - -database_user_SOURCES = \ - $(srcdir)/CheckDatabaseUser.cpp \ - $(top_srcdir)/src/logger/Logger.cpp \ - $(top_srcdir)/src/database/Artist.cpp \ - $(top_srcdir)/src/database/Playlist.cpp \ - $(top_srcdir)/src/database/Release.cpp \ - $(top_srcdir)/src/database/Track.cpp \ - $(top_srcdir)/src/database/DatabaseHandler.cpp \ - $(top_srcdir)/src/database/MediaDirectory.cpp \ - $(top_srcdir)/src/database/SearchFilter.cpp \ - $(top_srcdir)/src/database/SqlQuery.cpp \ - $(top_srcdir)/src/database/User.cpp \ - $(top_srcdir)/src/database/Video.cpp - -database_user_CXXFLAGS=-std=c++11 -Wall -Wextra -I$(top_srcdir)/src +check_PROGRAMS = -database_integrity_SOURCES = \ - $(srcdir)/DatabaseIntegrity.cpp \ - $(top_srcdir)/src/logger/Logger.cpp \ - $(top_srcdir)/src/database/Artist.cpp \ - $(top_srcdir)/src/database/Playlist.cpp \ - $(top_srcdir)/src/database/Track.cpp \ - $(top_srcdir)/src/database/DatabaseHandler.cpp \ - $(top_srcdir)/src/database/MediaDirectory.cpp \ - $(top_srcdir)/src/database/Release.cpp \ - $(top_srcdir)/src/database/SearchFilter.cpp \ - $(top_srcdir)/src/database/SqlQuery.cpp \ - $(top_srcdir)/src/database/User.cpp \ - $(top_srcdir)/src/database/Video.cpp - -database_integrity_CXXFLAGS=-std=c++11 -Wall -Wextra -I$(top_srcdir)/src - -sql_query_SOURCES = \ - $(srcdir)/CheckSqlQuery.cpp \ - $(top_srcdir)/src/database/SqlQuery.cpp - -sql_query_CXXFLAGS=-std=c++11 -Wall -Wextra -I$(top_srcdir)/src - - -test_wt_SOURCES = TestWt.cpp -test_wt_CXXFLAGS=-std=c++11 -Wall -Wextra - -test_wt_audio_SOURCES = TestWtAudio.cpp\ - $(top_srcdir)/src/logger/Logger.cpp \ - $(top_srcdir)/src/utils/Utils.cpp \ - $(top_srcdir)/src/metadata/AvFormat.cpp \ - $(top_srcdir)/src/av/AvInfo.cpp \ - $(top_srcdir)/src/av/AvTranscoder.cpp \ - $(top_srcdir)/src/cover/CoverArtGrabber.cpp \ - $(top_srcdir)/src/database/Artist.cpp \ - $(top_srcdir)/src/database/Playlist.cpp \ - $(top_srcdir)/src/database/Track.cpp \ - $(top_srcdir)/src/database/DatabaseHandler.cpp \ - $(top_srcdir)/src/database/MediaDirectory.cpp \ - $(top_srcdir)/src/database/Release.cpp \ - $(top_srcdir)/src/database/SearchFilter.cpp \ - $(top_srcdir)/src/database/SqlQuery.cpp \ - $(top_srcdir)/src/database/User.cpp \ - $(top_srcdir)/src/database/Video.cpp \ - $(top_srcdir)/src/image/Image.cpp \ - $(top_srcdir)/src/ui/resource/CoverResource.cpp \ - $(top_srcdir)/src/ui/resource/TranscodeResource.cpp - -test_wt_audio_CXXFLAGS=-std=c++11 -Wall -Wextra -I$(top_srcdir)/src -I$(top_srcdir)/src/ui $(MAGICKXX_CFLAGS) -test_wt_audio_LDADD=$(MAGICKXX_LIBS) - - -test_avmetadata_SOURCES = TestAvMetadata.cpp \ - $(top_srcdir)/src/utils/Logger.cpp \ - $(top_srcdir)/src/utils/Utils.cpp \ - $(top_srcdir)/src/metadata/AvFormat.cpp \ - $(top_srcdir)/src/metadata/TagLibParser.cpp \ - $(top_srcdir)/src/metadata/MetaData.cpp \ - $(top_srcdir)/src/av/AvInfo.cpp - -test_avmetadata_CXXFLAGS=-std=c++11 -Wall -Wextra -I$(top_srcdir)/src - - -test_avtranscoder_SOURCES = TestAvTranscoder.cpp \ - $(top_srcdir)/src/logger/Logger.cpp \ - $(top_srcdir)/src/utils/Utils.cpp \ - $(top_srcdir)/src/av/AvInfo.cpp \ - $(top_srcdir)/src/av/AvTranscoder.cpp - -test_avtranscoder_CXXFLAGS=-std=c++11 -Wall -Wextra -I$(top_srcdir)/src - diff --git a/test/TestAvMetadata.cpp b/test/TestAvMetadata.cpp deleted file mode 100644 index 93985aac..00000000 --- a/test/TestAvMetadata.cpp +++ /dev/null @@ -1,143 +0,0 @@ -#include -#include - -#include -#include - -#include - -#include "av/AvInfo.hpp" -#include "metadata/AvFormat.hpp" -#include "metadata/TagLibParser.hpp" - -int main(int argc, char *argv[]) -{ - if (argc != 2) - { - std::cerr << "Usage: " << std::endl; - return EXIT_FAILURE; - } - - try - { - Av::AvInit(); - - - MetaData::AvFormat avFormatParser; - MetaData::TagLibParser tagLibParser; - - std::vector parsers = {&avFormatParser, &tagLibParser }; - - for (auto& parser : parsers) - { - boost::optional items = parser->parse(argv[1], true); - - if (!items) - { - std::cout << "Parsing failed" << std::endl; - continue; - } - - std::cout << "Items:" << std::endl; - for (auto item : (*items)) - { - switch (item.first) - { - case MetaData::Type::Title: - std::cout << "Title: " << boost::any_cast(item.second) << std::endl; - break; - - case MetaData::Type::Artist: - std::cout << "Artist: " << boost::any_cast(item.second) << std::endl; - break; - - case MetaData::Type::Album: - std::cout << "Album: " << boost::any_cast(item.second) << std::endl; - break; - - case MetaData::Type::Clusters: - for (const auto& cluster : boost::any_cast(item.second)) - { - std::cout << "Cluster: " << cluster.first << std::endl; - for (const auto name : cluster.second) - { - std::cout << "\t" << name << std::endl; - } - } - break; - - case MetaData::Type::Duration: - std::cout << "Duration: " << boost::any_cast(item.second).count() / 1000 << "s" << std::endl; - break; - - case MetaData::Type::TrackNumber: - std::cout << "Track: " << boost::any_cast(item.second) << std::endl; - break; - - case MetaData::Type::TotalTrack: - std::cout << "TotalTrack: " << boost::any_cast(item.second) << std::endl; - break; - - case MetaData::Type::DiscNumber: - std::cout << "Disc: " << boost::any_cast(item.second) << std::endl; - break; - - case MetaData::Type::TotalDisc: - std::cout << "TotalDisc: " << boost::any_cast(item.second) << std::endl; - break; - - case MetaData::Type::Year: - std::cout << "Year: " << std::to_string(boost::any_cast(item.second)) << std::endl; - break; - - case MetaData::Type::OriginalYear: - std::cout << "Original year: " << std::to_string(boost::any_cast(item.second)) << std::endl; - break; - - case MetaData::Type::HasCover: - std::cout << "HasCover = " << std::boolalpha << boost::any_cast(item.second) << std::endl; - break; - - case MetaData::Type::AudioStreams: - for (auto& audioStream : boost::any_cast >(item.second)) - std::cout << "Audio stream: " << audioStream.bitRate << " bps" << std::endl; - break; - - case MetaData::Type::MusicBrainzArtistID: - std::cout << "MusicBrainzArtistID: " << boost::any_cast(item.second) << std::endl; - break; - - case MetaData::Type::MusicBrainzAlbumID: - std::cout << "MusicBrainzAlbumID: " << boost::any_cast(item.second) << std::endl; - break; - - case MetaData::Type::MusicBrainzTrackID: - std::cout << "MusicBrainzTrackID: " << boost::any_cast(item.second) << std::endl; - break; - - case MetaData::Type::MusicBrainzRecordingID: - std::cout << "MusicBrainzRecordingID: " << boost::any_cast(item.second) << std::endl; - break; - - case MetaData::Type::AcoustID: - std::cout << "AcoustID: " << boost::any_cast(item.second) << std::endl; - break; - - default: - break; - } - } - - std::cout << std::endl; - } - - return EXIT_SUCCESS; - } - catch (std::exception& e) - { - std::cerr << "Caught exception: " << e.what(); - return EXIT_FAILURE; - } - -} - diff --git a/test/TestAvTranscoder.cpp b/test/TestAvTranscoder.cpp deleted file mode 100644 index f5a7e932..00000000 --- a/test/TestAvTranscoder.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#include - -#include -#include - -#include "av/AvInfo.hpp" -#include "av/AvTranscoder.hpp" - -int main(int argc, char *argv[]) -{ - if (argc != 2) - { - std::cerr << "Usage: " << std::endl; - return EXIT_FAILURE; - } - - try - { - Av::AvInit(); - Av::Transcoder::init(); - - // Make pstream work with ffmpeg - close(STDIN_FILENO); - - Av::TranscodeParameters parameters; - parameters.setEncoding(Av::Encoding::MP3); - parameters.setOffset( boost::posix_time::seconds(0) ); - parameters.setBitrate( Av::Stream::Type::Audio, 160000 ); -// parameters.addStream(0); - - Av::Transcoder transcoder(argv[1], parameters); - - if (!transcoder.start()) - throw std::runtime_error("transcoder.start failed!"); - - while (!transcoder.isComplete()) - { - std::vector data; - std::cout << "Processing ..." << std::endl; - transcoder.process(data, 65536); - std::cout << "Processing done" << std::endl; - } - - std::cout << "Complete!" << std::endl; - - return EXIT_SUCCESS; - } - catch (std::exception& e) - { - std::cerr << "Caught exception: " << e.what(); - return EXIT_FAILURE; - } - -} - diff --git a/test/TestDatabase.cpp b/test/TestDatabase.cpp deleted file mode 100644 index 497894a4..00000000 --- a/test/TestDatabase.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - - -#include "TestDatabase.hpp" - -namespace TestDatabase { - - Database::Handler* create() -{ - - boost::filesystem::path p ("test_db"); - - // Remove previous db -// boost::filesystem::remove(p); - - Database::Handler* db = new Database::Handler(p); - - - // Populate DB - - // Add artist - - // Add - - - return db; -} - -} // namespace TestDatabase diff --git a/test/TestDatabase.hpp b/test/TestDatabase.hpp deleted file mode 100644 index f639c791..00000000 --- a/test/TestDatabase.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - - -#include "database/DatabaseHandler.hpp" - -namespace TestDatabase { - - Database::Handler* create(); - -} // namespace TestDatabase diff --git a/test/TestWt.cpp b/test/TestWt.cpp deleted file mode 100644 index f86d44c2..00000000 --- a/test/TestWt.cpp +++ /dev/null @@ -1,166 +0,0 @@ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - - -class ArtistView : public Wt::WContainerWidget -{ - public: - ArtistView(Wt::WContainerWidget *parent = 0) - : Wt::WContainerWidget(parent) - { - } - - void setId(int id) - { - clear(); - - Wt::WText *header = new Wt::WText("Artist view ID = " + std::to_string(id), this); - header->setInline(false); - - for (int i = id; i > 0; --i) - { - Wt::WAnchor *anchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(i)), this); - Wt::WText *text = new Wt::WText("Release " + std::to_string(i), anchor); - text->setInline(false); - } - } -}; - -class ReleaseView : public Wt::WContainerWidget -{ - public: - ReleaseView(Wt::WContainerWidget *parent = 0) - : Wt::WContainerWidget(parent) - { - } - - void setId(int id) - { - clear(); - Wt::WText *header = new Wt::WText("Release view ID = " + std::to_string(id), this); - header->setInline(false); - - for (int i = id; i > 0; --i) - { - Wt::WAnchor *anchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(i)), this); - Wt::WText *text = new Wt::WText("Artist " + std::to_string(i), anchor); - text->setInline(false); - } - } -}; - -class TestApplication : public Wt::WApplication -{ - public: - TestApplication(const Wt::WEnvironment& env) - : Wt::WApplication(env) - { - - enableInternalPaths(); - - Wt::WComboBox *combo = new Wt::WComboBox(root()); - combo->addItem("Artist"); - combo->addItem("Release"); - - Wt::WLineEdit *edit = new Wt::WLineEdit("Enter id", root()); - - edit->changed().connect(std::bind([=] - { - if (combo->currentText() == "Artist") - wApp->setInternalPath("/artist/" + edit->text().toUTF8(), true); - else if (combo->currentText() == "Release") - wApp->setInternalPath("/release/" + edit->text().toUTF8(), true); - })); - - Wt::WStackedWidget *stack = new Wt::WStackedWidget(root()); - - Wt::WContainerWidget *artistContainer = new Wt::WContainerWidget(); - Wt::WContainerWidget *releaseContainer = new Wt::WContainerWidget(); - - stack->addWidget(releaseContainer); - stack->addWidget(artistContainer); - - internalPathChanged().connect(std::bind([=] (std::string path) - { - wApp->log("info") << "Path set to '" << path << "'"; - - std::vector strings; - boost::algorithm::split(strings, path, boost::is_any_of("/"), boost::token_compress_on); - - if (strings.size() != 3) - return; - - std::string view = strings[1]; - int id; - try { - id = std::stol(strings[2]); - } - catch (std::exception& e) { - return; - } - - if (view == "release") - { - releaseContainer->clear(); - ReleaseView *releaseView = new ReleaseView(releaseContainer); - releaseView->setId(id); - - stack->setCurrentIndex(0); - } - else if (view == "artist") - { - artistContainer->clear(); - ArtistView *artistView = new ArtistView(artistContainer); - artistView->setId(id); - - stack->setCurrentIndex(1); - } - - }, std::placeholders::_1)); - - setInternalPath("/main"); - } - -}; - -static Wt::WApplication *createTestApplication(const Wt::WEnvironment& env) -{ - return new TestApplication(env); -} - -int main(int argc, char *argv[]) -{ - try - { - - Wt::WServer server(argv[0]); - server.setServerConfiguration (argc, argv); - - server.addEntryPoint(Wt::Application, createTestApplication); - - server.start(); - - Wt::WServer::waitForShutdown(argv[0]); - - server.stop(); - - return EXIT_SUCCESS; - } - catch (std::exception& e) - { - std::cerr << "Caught exception: " << e.what(); - return EXIT_FAILURE; - } - -} - diff --git a/test/TestWtAudio.cpp b/test/TestWtAudio.cpp deleted file mode 100644 index d53541c5..00000000 --- a/test/TestWtAudio.cpp +++ /dev/null @@ -1,322 +0,0 @@ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "database/DatabaseHandler.hpp" - -#include "ui/resource/TranscodeResource.hpp" -#include "ui/resource/CoverResource.hpp" - - -class InputRange : public Wt::WWebWidget -{ - public: - InputRange(Wt::WContainerWidget *parent = 0) - : Wt::WWebWidget(parent) - { - setHtmlTagName("input"); - setAttributeValue("type", "range"); - } - - Wt::DomElementType domElementType() const - { - return Wt::DomElement_INPUT; - } -}; - - -Wt::WString MyPlayerTemplate = "${shuffle} ${repeat} ${playlist} ${prev} ${play-pause} ${next} ${cover} ${artist} ${track} ${release} ${curtime} ${seekbar} ${duration} ${volume}"; - -class MyPlayer : public Wt::WContainerWidget -{ - public: - - void playbackComplete(void) - { - // Switch to the next track - } - - void loadTrack(Database::Track::id_type trackId) - { - Wt::Dbo::Transaction transaction(_db.getSession()); - - Database::Track::pointer track = Database::Track::getById(_db.getSession(), trackId); - if (!track) - { - std::cerr << "no track for this id!" << std::endl; - return; - } - - _trackName->setText(Wt::WString::fromUTF8(track->getName())); - _artistName->setText( Wt::WString::fromUTF8(track->getArtist()->getName())); - _releaseName->setText( Wt::WString::fromUTF8(track->getRelease()->getName())); - _cover->setImageLink(_coverResource->getTrackUrl(trackId, 64)); - _trackDuration->setText( boost::posix_time::to_simple_string( track->getDuration() )); - - // Analyse track, select the best media stream - Av::MediaFile mediaFile(track->getPath()); - - if (!mediaFile.open() || !mediaFile.scan()) - { - std::cerr << "cannot open file '" << track->getPath() << std::endl; - return; - } - - - int audioBestStreamId = mediaFile.getBestStreamId(Av::Stream::Type::Audio); - std::vector streams; - if (audioBestStreamId != -1) - streams.push_back(audioBestStreamId); - - this->doJavaScript("\ - document.lms.audio.state = \"loaded\";\ - document.lms.audio.seekbar.min = " + std::to_string(0) + ";\ - document.lms.audio.seekbar.max = " + std::to_string(track->getDuration().total_seconds()) + ";\ - document.lms.audio.seekbar.value = 0;\ - document.lms.audio.seekbar.disabled = false;\ - document.lms.audio.offset = 0;\ - document.lms.audio.curTime = 0;\ - "); - - _audio->pause(); - _audio->clearSources(); - _audio->addSource(_transcodeResource->getUrl(trackId, Av::Encoding::MP3, 0, streams)); - _audio->play(); - } - - - MyPlayer(Database::Handler &db, Wt::WContainerWidget *parent = 0) - : Wt::WContainerWidget(parent), - _db(db) - { - - _transcodeResource = new UserInterface::TranscodeResource(db, this); - _coverResource = new UserInterface::CoverResource(db, this); - - Wt::WTemplate *t = new Wt::WTemplate(MyPlayerTemplate, this); - - _audio = new Wt::WAudio(this); - - _cover = new Wt::WImage(); - t->bindWidget("cover", _cover); - _cover->setImageLink(_coverResource->getUnknownTrackUrl(64)); - - InputRange *seekbar = new InputRange(); - t->bindWidget("seekbar", seekbar); - - _trackName = new Wt::WText(); - t->bindWidget("track", _trackName); - - _artistName = new Wt::WText(); - t->bindWidget("artist", _artistName); - - _releaseName = new Wt::WText(); - t->bindWidget("release", _releaseName); - - InputRange *volumeSlider = new InputRange(); - t->bindWidget("volume", volumeSlider); - - Wt::WPushButton *playlistBtn = new Wt::WPushButton("", Wt::XHTMLText); - t->bindWidget("playlist", playlistBtn); - - Wt::WPushButton *repeatBtn = new Wt::WPushButton("", Wt::XHTMLText); - t->bindWidget("repeat", repeatBtn); - - Wt::WPushButton *shuffleBtn = new Wt::WPushButton("", Wt::XHTMLText); - t->bindWidget("shuffle", shuffleBtn); - - Wt::WPushButton *prevBtn = new Wt::WPushButton("", Wt::XHTMLText); - t->bindWidget("prev", prevBtn); - - Wt::WPushButton *nextBtn = new Wt::WPushButton("", Wt::XHTMLText); - t->bindWidget("next", nextBtn); - - Wt::WPushButton *playPauseBtn = new Wt::WPushButton("", Wt::XHTMLText); - t->bindWidget("play-pause", playPauseBtn); - - Wt::WText *trackCurrentTime = new Wt::WText("00:00"); - t->bindWidget("curtime", trackCurrentTime); - - _trackDuration = new Wt::WText("00:00"); - t->bindWidget("duration", _trackDuration); - - //Wt::WTemplate *_volumeSlider = new Wt::WTemplate(VolumeSliderTemplate, this); - - this->doJavaScript( -"\ - document.lms = {};\ - document.lms.audio = {};\ - document.lms.audio.audio = " + _audio->jsRef() + ";\ - document.lms.audio.seekbar = " + seekbar->jsRef() +";\ - document.lms.audio.volumeSlider = " + volumeSlider->jsRef() + ";\ - document.lms.audio.curTimeText = " + trackCurrentTime->jsRef() + ";\ - document.lms.audio.playPause = " + playPauseBtn->jsRef() + ";\ -\ - document.lms.audio.offset = 0;\ - document.lms.audio.curTime = 0;\ - document.lms.audio.state = \"init\";\ - document.lms.audio.volume = 1;\ -\ - document.lms.audio.seekbar.value = 0;\ - document.lms.audio.seekbar.disabled = true;\ -\ - document.lms.audio.volumeSlider.min = 0;\ - document.lms.audio.volumeSlider.max = 100;\ - document.lms.audio.volumeSlider.value = 100;\ -\ - function updateUI() {\ - document.lms.audio.curTimeText.innerHTML = document.lms.audio.curTime;\ - document.lms.audio.seekbar.value = document.lms.audio.curTime;\ - }\ -\ - var mouseDown = 0;\ - function seekMouseDown(e) {\ - ++mouseDown;\ - }\ - function seekMouseUp(e) {\ - --mouseDown;\ - }\ -\ - function seeking(e) {\ - if (document.lms.audio.state == \"init\")\ - return;\ -\ - document.lms.audio.curTimeText.innerHTML = document.lms.audio.seekbar.value;\ - }\ -\ - function seek(e) {\ - if (document.lms.audio.state == \"init\")\ - return;\ -\ - document.lms.audio.audio.pause(); \ - document.lms.audio.offset = parseInt(document.lms.audio.seekbar.value);\ - document.lms.audio.curTime = document.lms.audio.seekbar.value;\ - var audioSource = document.lms.audio.audio.getElementsByTagName(\"source\")[0];\ - var src = audioSource.src;\ - src = src.slice(0, src.lastIndexOf(\"=\") + 1);\ - audioSource.src = src + document.lms.audio.seekbar.value;\ - document.lms.audio.audio.load(); \ - document.lms.audio.audio.play(); \ - document.lms.audio.curTimeText.innerHTML = ~~document.lms.audio.curTime + \" \";\ - }\ -\ - function volumeChanged() {\ - document.lms.audio.audio.volume = document.lms.audio.volumeSlider.value / 100;\ - }\ -\ - function updateCurTime() {\ - document.lms.audio.curTime = document.lms.audio.offset + ~~document.lms.audio.audio.currentTime; \ - if (mouseDown == 0)\ - updateUI();\ - } \ -\ - function playPause() {\ - if (document.lms.audio.state == \"init\") \ - return;\ -\ - if (document.lms.audio.audio.paused)\ - document.lms.audio.audio.play();\ - else\ - document.lms.audio.audio.pause();\ -\ - }\ -\ - document.lms.audio.audio.addEventListener('timeupdate', updateCurTime); \ - document.lms.audio.seekbar.addEventListener('change', seek);\ - document.lms.audio.seekbar.addEventListener('input', seeking);\ - document.lms.audio.seekbar.addEventListener('mousedown', seekMouseDown);\ - document.lms.audio.seekbar.addEventListener('mouseup', seekMouseUp);\ - document.lms.audio.volumeSlider.addEventListener('input', volumeChanged);\ - document.lms.audio.playPause.addEventListener('click', playPause);\ -" -); - } - - UserInterface::TranscodeResource* _transcodeResource; - UserInterface::CoverResource* _coverResource; - Database::Handler& _db; - Wt::WAudio* _audio; - Wt::WText* _trackDuration; - Wt::WText* _trackName; - Wt::WText* _artistName; - Wt::WText* _releaseName; - Wt::WImage* _cover; -}; - -class TestApplication : public Wt::WApplication -{ - public: - TestApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool) - : Wt::WApplication(env) - , _db(connectionPool) - { - Wt::WBootstrapTheme *bootstrapTheme = new Wt::WBootstrapTheme(this); - bootstrapTheme->setVersion(Wt::WBootstrapTheme::Version3); - bootstrapTheme->setResponsive(true); - setTheme(bootstrapTheme); - - useStyleSheet("resources/font-awesome/css/font-awesome.min.css"); - - Wt::WLineEdit* trackSelector = new Wt::WLineEdit(); - MyPlayer* player = new MyPlayer(_db); - - trackSelector->changed().connect(std::bind([=] { - player->loadTrack(Wt::asNumber(trackSelector->valueText())); - })); - - root()->addWidget(trackSelector); - root()->addWidget(player); - } - - private: - Database::Handler _db; - -}; - -static Wt::WApplication *createTestApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool ) -{ - return new TestApplication(env, connectionPool); -} - -int main(int argc, char *argv[]) -{ - try - { - Av::AvInit(); - Av::Transcoder::init(); - - Wt::WServer server(argv[0]); - server.setServerConfiguration (argc, argv); - - // Make pstream work with ffmpeg - close(STDIN_FILENO); - - Database::Handler::configureAuth(); - std::unique_ptr connectionPool( Database::Handler::createConnectionPool("/var/lms/lms.db")); - - server.addEntryPoint(Wt::Application, boost::bind(createTestApplication, _1, boost::ref(*connectionPool))); - - server.start(); - - Wt::WServer::waitForShutdown(argv[0]); - - server.stop(); - - return EXIT_SUCCESS; - } - catch (std::exception& e) - { - std::cerr << "Caught exception: " << e.what(); - return EXIT_FAILURE; - } - -} - diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 00000000..085ca08c --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS = metadata + diff --git a/tools/metadata/LmsMetadata.cpp b/tools/metadata/LmsMetadata.cpp new file mode 100644 index 00000000..42fe5089 --- /dev/null +++ b/tools/metadata/LmsMetadata.cpp @@ -0,0 +1,129 @@ +#include +#include + +#include +#include + +#include + +#include "metadata/TagLibParser.hpp" + +int main(int argc, char *argv[]) +{ + if (argc != 2) + { + std::cerr << "Usage: " << std::endl; + return EXIT_FAILURE; + } + + try + { + MetaData::TagLibParser parser; + + boost::optional items = parser.parse(argv[1], true); + if (!items) + { + std::cerr << "Parsing failed" << std::endl; + return EXIT_FAILURE; + } + + std::cout << "Items:" << std::endl; + for (auto item : (*items)) + { + switch (item.first) + { + case MetaData::Type::Title: + std::cout << "Title: " << boost::any_cast(item.second) << std::endl; + break; + + case MetaData::Type::Artist: + std::cout << "Artist: " << boost::any_cast(item.second) << std::endl; + break; + + case MetaData::Type::Album: + std::cout << "Album: " << boost::any_cast(item.second) << std::endl; + break; + + case MetaData::Type::Clusters: + for (const auto& cluster : boost::any_cast(item.second)) + { + std::cout << "Cluster: " << cluster.first << std::endl; + for (const auto name : cluster.second) + { + std::cout << "\t" << name << std::endl; + } + } + break; + + case MetaData::Type::Duration: + std::cout << "Duration: " << boost::any_cast(item.second).count() / 1000 << "s" << std::endl; + break; + + case MetaData::Type::TrackNumber: + std::cout << "Track: " << boost::any_cast(item.second) << std::endl; + break; + + case MetaData::Type::TotalTrack: + std::cout << "TotalTrack: " << boost::any_cast(item.second) << std::endl; + break; + + case MetaData::Type::DiscNumber: + std::cout << "Disc: " << boost::any_cast(item.second) << std::endl; + break; + + case MetaData::Type::TotalDisc: + std::cout << "TotalDisc: " << boost::any_cast(item.second) << std::endl; + break; + + case MetaData::Type::Year: + std::cout << "Year: " << std::to_string(boost::any_cast(item.second)) << std::endl; + break; + + case MetaData::Type::OriginalYear: + std::cout << "Original year: " << std::to_string(boost::any_cast(item.second)) << std::endl; + break; + + case MetaData::Type::HasCover: + std::cout << "HasCover = " << std::boolalpha << boost::any_cast(item.second) << std::endl; + break; + + case MetaData::Type::AudioStreams: + for (auto& audioStream : boost::any_cast >(item.second)) + std::cout << "Audio stream: " << audioStream.bitRate << " bps" << std::endl; + break; + + case MetaData::Type::MusicBrainzArtistID: + std::cout << "MusicBrainzArtistID: " << boost::any_cast(item.second) << std::endl; + break; + + case MetaData::Type::MusicBrainzAlbumID: + std::cout << "MusicBrainzAlbumID: " << boost::any_cast(item.second) << std::endl; + break; + + case MetaData::Type::MusicBrainzTrackID: + std::cout << "MusicBrainzTrackID: " << boost::any_cast(item.second) << std::endl; + break; + + case MetaData::Type::MusicBrainzRecordingID: + std::cout << "MusicBrainzRecordingID: " << boost::any_cast(item.second) << std::endl; + break; + + case MetaData::Type::AcoustID: + std::cout << "AcoustID: " << boost::any_cast(item.second) << std::endl; + break; + + default: + break; + } + } + + std::cout << std::endl; + } + catch (std::exception& e) + { + std::cerr << "Caught exception: " << e.what(); + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; +} diff --git a/tools/metadata/Makefile.am b/tools/metadata/Makefile.am new file mode 100644 index 00000000..cded72b1 --- /dev/null +++ b/tools/metadata/Makefile.am @@ -0,0 +1,11 @@ +bin_PROGRAMS = lms-metadata + +lms_metadata_SOURCES = \ + $(srcdir)/LmsMetadata.cpp \ + $(top_srcdir)/src/utils/Logger.cpp \ + $(top_srcdir)/src/utils/Utils.cpp \ + $(top_srcdir)/src/metadata/TagLibParser.cpp \ + $(top_srcdir)/src/metadata/MetaData.cpp + +lms_metadata_CXXFLAGS=-std=c++14 -Wall -I$(top_srcdir)/src -D_REENTRANT + From dedb90c6a5912f44c6148a7d5d1c68b89171c6ae Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 14 May 2018 12:55:34 +0200 Subject: [PATCH 122/195] Better scan of total tracks/discks --- src/metadata/TagLibParser.cpp | 44 +++++++++++++++++++++------------- tools/metadata/LmsMetadata.cpp | 2 +- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/metadata/TagLibParser.cpp b/src/metadata/TagLibParser.cpp index 373781e3..d479824f 100644 --- a/src/metadata/TagLibParser.cpp +++ b/src/metadata/TagLibParser.cpp @@ -91,10 +91,11 @@ TagLibParser::parse(const boost::filesystem::path& p, bool debug) if (debug) { - std::cout << "TAG = '" << tag << "', VALUES = "; + std::vector strs; for (auto value : values) - std::cout << "'" << value.to8Bit(true) << "',"; - std::cout << std::endl; + strs.push_back(values.front().to8Bit(true)); + + std::cout << "[" << tag << "] = " << joinStrings(strs, ",") << std::endl; } if (tag == "ARTIST") @@ -116,6 +117,12 @@ TagLibParser::parse(const boost::filesystem::path& p, bool debug) items.insert( std::make_pair(MetaData::Type::MusicBrainzRecordingID, stringTrim( values.front().to8Bit(true)))); else if (tag == "ACOUSTID_ID") items.insert( std::make_pair(MetaData::Type::AcoustID, stringTrim( values.front().to8Bit(true)))); + else if (tag == "TRACKTOTAL") + { + auto totalTrack = readAs(values.front().to8Bit(true)); + if (totalTrack) + items[MetaData::Type::TotalTrack] = *totalTrack; + } else if (tag == "TRACKNUMBER") { // Expecting 'Number/Total' @@ -127,14 +134,21 @@ TagLibParser::parse(const boost::filesystem::path& p, bool debug) if (number) items.insert( std::make_pair(MetaData::Type::TrackNumber, *number )); - if (strings.size() > 1) + // Lower priority than TRACKTOTAL + if (strings.size() > 1 && items.find(MetaData::Type::TotalTrack) == items.end()) { - auto totalNumber = readAs(strings[1]); - if (totalNumber) - items.insert( std::make_pair(MetaData::Type::TotalTrack, *totalNumber )); + auto totalTrack = readAs(strings[1]); + if (totalTrack) + items[MetaData::Type::TotalTrack] = *totalTrack; } } } + else if (tag == "DISCTOTAL") + { + auto totalDisc = readAs(values.front().to8Bit(true)); + if (totalDisc) + items[MetaData::Type::TotalDisc] = *totalDisc; + } else if (tag == "DISCNUMBER") { // Expecting 'Number/Total' @@ -146,11 +160,12 @@ TagLibParser::parse(const boost::filesystem::path& p, bool debug) if (number) items.insert( std::make_pair(MetaData::Type::DiscNumber, *number)); - if (strings.size() > 1) + // Lower priority than DISCTOTAL + if (strings.size() > 1 && items.find(MetaData::Type::TotalDisc) == items.end()) { - auto totalNumber = readAs(strings[1]); - if (totalNumber) - items.insert( std::make_pair(MetaData::Type::TotalDisc, *totalNumber )); + auto totalDisc = readAs(strings[1]); + if (totalDisc) + items[MetaData::Type::TotalDisc] = *totalDisc; } } } @@ -162,12 +177,12 @@ TagLibParser::parse(const boost::filesystem::path& p, bool debug) } else if (tag == "ORIGINALDATE") { - // lower priority than original year + // Lower priority than original year if (items.find(MetaData::Type::OriginalYear) == items.end()) { auto timePoint = readAs(values.front().to8Bit()); if (timePoint) - items.insert( std::make_pair(MetaData::Type::OriginalYear, *timePoint)); + items[MetaData::Type::OriginalYear] = *timePoint; } } else if (tag == "ORIGINALYEAR") @@ -177,8 +192,6 @@ TagLibParser::parse(const boost::filesystem::path& p, bool debug) { // Take priority on original year items[MetaData::Type::OriginalYear] = *timePoint; -// items.erase( MetaData::Type::OriginalYear ); -// items.insert( std::make_pair(MetaData::Type::OriginalYear, *timePoint)); } } else if (tag == "METADATA_BLOCK_PICTURE") @@ -187,7 +200,6 @@ TagLibParser::parse(const boost::filesystem::path& p, bool debug) if (items.find(MetaData::Type::HasCover) == items.end()) items.insert( std::make_pair(MetaData::Type::HasCover, true)); } - // Check if a hit a cluster tag else if (_clusterTypes.find(tag) != _clusterTypes.end()) { std::set clusterNames; diff --git a/tools/metadata/LmsMetadata.cpp b/tools/metadata/LmsMetadata.cpp index 42fe5089..2bab33e2 100644 --- a/tools/metadata/LmsMetadata.cpp +++ b/tools/metadata/LmsMetadata.cpp @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) } catch (std::exception& e) { - std::cerr << "Caught exception: " << e.what(); + std::cerr << "Caught exception: " << e.what() << std::endl; return EXIT_FAILURE; } From a2ecaa71f5c0c55b62fb65cc5de0efa66f40db01 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 14 May 2018 13:14:16 +0200 Subject: [PATCH 123/195] Adding tags ni the artits view --- approot/artists.xml | 1 + docroot/css/lms.css | 3 ++ src/ui/LmsApplication.cpp | 2 ++ src/ui/explore/ArtistView.cpp | 2 +- src/ui/explore/ArtistsView.cpp | 55 ++++++++++++++++++++++++++++++++-- 5 files changed, 60 insertions(+), 3 deletions(-) diff --git a/approot/artists.xml b/approot/artists.xml index 368eb13f..43dcc37c 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -20,6 +20,7 @@
${nb-release} ${name} + ${clusters}
diff --git a/docroot/css/lms.css b/docroot/css/lms.css index 03d32c2b..35ec32de 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -1,4 +1,7 @@ +.Lms-cluster { +} + .Lms-cluster-type-0 { background-color: darkslategrey; } diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 1dedd55f..702f23b2 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -183,6 +183,8 @@ LmsApplication::createCluster(Database::Cluster::pointer cluster, bool canDelete res->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::TextFormat::Plain); res->setCondition("if-can-delete", canDelete); + res->setStyleClass("Lms-cluster"); + return res; } diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index 3bae5b00..025bc6f7 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -22,8 +22,8 @@ #include #include -#include "database/Types.hpp" #include "database/Setting.hpp" +#include "database/Types.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index 45ccfce1..8cd3ec77 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -21,6 +21,7 @@ #include #include +#include "database/Setting.hpp" #include "database/Types.hpp" #include "utils/Logger.hpp" @@ -30,14 +31,44 @@ #include "Filters.hpp" #include "ArtistsView.hpp" -namespace UserInterface { - using namespace Database; +namespace { + +const std::string artistsClusterTypesSetting = "artists_cluster_types"; +const std::vector defaultArtistsClusterTypes = +{ + "ALBUMGROUPING", + "GENRE", + "ALBUMMOOD", +}; + +std::vector getArtistsClusterTypes(Wt::Dbo::Session& session) +{ + Wt::Dbo::Transaction transaction(session); + + std::vector 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 { + Artists::Artists(Filters* filters) : Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template")), _filters(filters) { + if (!Setting::exists(LmsApp->getDboSession(), artistsClusterTypesSetting)) + Setting::setString(LmsApp->getDboSession(), artistsClusterTypesSetting, joinStrings(defaultArtistsClusterTypes, " ")); + addFunction("tr", &Wt::WTemplate::Functions::tr); _search = bindNew("search"); @@ -87,6 +118,26 @@ Artists::addSome() entry->bindInt("nb-release", artist->getReleases(clusterIds).size()); entry->bindWidget("name", LmsApplication::createArtistAnchor(artist)); + + + Wt::WContainerWidget* clusterContainers = entry->bindNew("clusters"); + { + auto clusterTypes = getArtistsClusterTypes(LmsApp->getDboSession()); + auto clusterGroups = artist->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); + }); + } + } + } } _showMore->setHidden(!moreResults); From c801a818c826cda1e915d8fec95a01d8ffcaa00c Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 15 May 2018 13:21:38 +0200 Subject: [PATCH 124/195] Remove unused sources --- .../updater/DatabaseFeatureExtractor.cpp | 83 ------- .../updater/DatabaseFeatureExtractor.hpp | 33 --- .../updater/DatabaseHighLevelCluster.cpp | 226 ------------------ .../updater/DatabaseHighLevelCluster.hpp | 33 --- 4 files changed, 375 deletions(-) delete mode 100644 src/database/updater/DatabaseFeatureExtractor.cpp delete mode 100644 src/database/updater/DatabaseFeatureExtractor.hpp delete mode 100644 src/database/updater/DatabaseHighLevelCluster.cpp delete mode 100644 src/database/updater/DatabaseHighLevelCluster.hpp diff --git a/src/database/updater/DatabaseFeatureExtractor.cpp b/src/database/updater/DatabaseFeatureExtractor.cpp deleted file mode 100644 index 1052c6cc..00000000 --- a/src/database/updater/DatabaseFeatureExtractor.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ - -#include "database/Setting.hpp" - -#include "feature/FeatureExtractor.hpp" -#include "feature/FeatureStore.hpp" - -#include "utils/Logger.hpp" - -#include "DatabaseFeatureExtractor.hpp" - -namespace Database { - -static std::string getMBID(Track::id_type trackId) -{ - Wt::Dbo::Transaction transaction(UpdaterDboSession()); - Track::pointer track = Track::getById(UpdaterDboSession(), trackId); - return track->getMBID(); -} - -void -FeatureExtractor::handleFilesUpdated(void) -{ - bool fetchHighLevel = Setting::getBool(UpdaterDboSession(), "tags_highlevel_acousticbrainz"); - bool fetchLowLevel = Setting::getBool(UpdaterDboSession(), "tags_similarity_acousticbrainz"); - - if (!fetchHighLevel && !fetchLowLevel) - { - LMS_LOG(DBUPDATER, INFO) << "No need to extract features"; - return; - } - - LMS_LOG(DBUPDATER, INFO) << "Processing tracks in order to extract features..."; - std::vector trackIds = Track::getAllIds(UpdaterDboSession()); - for (auto trackId : trackIds) - { - if (UpdaterQuitRequested()) - return; - - std::string mbid = getMBID(trackId); - if (mbid.empty()) - { - LMS_LOG(DBUPDATER, DEBUG) << "No MBID for track " << trackId << ", skipping"; - continue; - } - - if (fetchLowLevel && !Feature::Store::instance().exists(UpdaterDboSession(), trackId, "low_level")) - { - boost::property_tree::ptree feature; - if (::Feature::Extractor::getLowLevel(feature, mbid)) - Feature::Store::instance().set(UpdaterDboSession(), trackId, "low_level", feature); - } - - if (fetchHighLevel && !Feature::Store::instance().exists(UpdaterDboSession(), trackId, "high_level")) - { - boost::property_tree::ptree feature; - if (::Feature::Extractor::getHighLevel(feature, mbid)) - Feature::Store::instance().set(UpdaterDboSession(), trackId, "high_level", feature); - } - } - - LMS_LOG(DBUPDATER, INFO) << "Features have been extracted"; -} - -} // namespace Database - diff --git a/src/database/updater/DatabaseFeatureExtractor.hpp b/src/database/updater/DatabaseFeatureExtractor.hpp deleted file mode 100644 index c0ff092a..00000000 --- a/src/database/updater/DatabaseFeatureExtractor.hpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ - -#pragma once - -#include "DatabaseUpdater.hpp" - -namespace Database { - -class FeatureExtractor : public UpdaterEventHandler -{ - public: - void handleFilesUpdated(void); - -}; - -} // namespace Database diff --git a/src/database/updater/DatabaseHighLevelCluster.cpp b/src/database/updater/DatabaseHighLevelCluster.cpp deleted file mode 100644 index 5cc37607..00000000 --- a/src/database/updater/DatabaseHighLevelCluster.cpp +++ /dev/null @@ -1,226 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ - -#include "database/Setting.hpp" -#include "feature/FeatureStore.hpp" - -#include "utils/Logger.hpp" - -#include "DatabaseHighLevelCluster.hpp" - -namespace Database { - -static Cluster::pointer getCluster(std::string type, std::string name) -{ - ClusterType::pointer clusterType = ClusterType::getByName(UpdaterDboSession(), type); - if (!clusterType) - clusterType = ClusterType::create(UpdaterDboSession(), type); - - auto cluster = clusterType->getCluster(name); - if (!cluster) - cluster = Cluster::create(UpdaterDboSession(), clusterType, name); - - return cluster; -} - -static std::list getClustersFromFeature(boost::property_tree::ptree& feature, double minProb) -{ - struct HighLevelNodeDesc - { - std::string node; - std::map valueMapping; - }; - - static const std::vector nodes = - { - { - "highlevel.danceability", - { - {"not_danceable", "Not danceable"}, - {"danceable", "Danceable"}, - }, - }, - { - "highlevel.gender", - { - {"male", "Male"}, - {"female", "Female"}, - }, - }, - { - "highlevel.mood_acoustic", - { - {"not_acoustic", "Not acoustic"}, - {"acoustic", "Acoustic"}, - }, - }, - { - "highlevel.mood_happy", - { - {"not_happy", "Not happy"}, - {"happy", "Happy"}, - }, - }, - { - "highlevel.mood_aggressive", - { - {"not_aggressive", "Not aggressive"}, - {"aggressive", "Aggressive"}, - }, - }, - { - "highlevel.mood_electronic", - { - {"not_electronic", "Not electronic"}, - {"electronic", "Electronic"}, - }, - }, - { - "highlevel.mood_party", - { - {"not_party", "Not party"}, - {"party", "Party"}, - }, - }, - { - "highlevel.mood_relaxed", - { - {"not_relaxed", "Not relaxed"}, - {"relaxed", "Relaxed"}, - }, - }, - { - "highlevel.mood_sad", - { - {"not_sad", "Not sad"}, - {"sad", "Sad"}, - }, - }, - { - "highlevel.timbre", - { - {"bright", "Bright"}, - {"dark", "Dark"}, - }, - }, - { - "highlevel.tonal_atonal", - { - {"atonal", "Atonal"}, - {"tonal", "Tonal"}, - }, - }, - { - "highlevel.voice_instrumental", - { - {"instrumental", "Instrumental"}, - {"voice", "Voice"}, - }, - }, - }; - - - // Extract info and build clusters - std::list newClusterNames; - - for (auto node : nodes) - { - auto value = feature.get_child_optional(node.node + ".value"); - auto probability = feature.get_child_optional(node.node + ".probability"); - - if (!probability || !value) - { - LMS_LOG(DBUPDATER, ERROR) << "Missing " << node.node; - continue; - } - - if (std::stod(probability->data()) < minProb) - continue; - - if (node.valueMapping[value->data()] == "") - { - LMS_LOG(DBUPDATER, ERROR) << "Unknown value '" << value->data() << "'"; - continue; - } - - newClusterNames.push_back(node.valueMapping[value->data()]); - } - - return newClusterNames; -} - -void -HighLevelCluster::handleFilesUpdated(void) -{ - bool createTags = Setting::getBool(UpdaterDboSession(), "tags_highlevel_acousticbrainz", false); - double minProb = Setting::getInt(UpdaterDboSession(), "tags_highlevel_acousticbrainz_min_probability", false) / 100.; - - LMS_LOG(DBUPDATER, INFO) << "Creating high level based clusters..."; - - std::vector trackIds = Track::getAllIds(UpdaterDboSession()); - - LMS_LOG(DBUPDATER, DEBUG) << "Got " << trackIds.size() << " tracks"; - for (auto trackId : trackIds) - { - if (UpdaterQuitRequested()) - return; - - // Get current cluster names - std::list newClusterNames; - if (createTags) - { - boost::property_tree::ptree feature; - if (!Feature::Store::instance().get(UpdaterDboSession(), trackId, "high_level", feature)) - continue; - - newClusterNames = getClustersFromFeature(feature, minProb); - } - - Wt::Dbo::Transaction transaction(UpdaterDboSession()); - - auto track = Track::getById(UpdaterDboSession(), trackId); - - auto clusters = track->getClusters(); - for (auto cluster : clusters) - { - // Check if removed - if (cluster->getType()->getName() != "high_level") - continue; - - auto it = std::find(newClusterNames.begin(), newClusterNames.end(), cluster->getName()); - if (it == newClusterNames.end()) - cluster.remove(); - else - newClusterNames.erase(it); - - } - - // Add previsouly missing clusters - for (auto newName : newClusterNames) - { - auto cluster = getCluster("high_level", newName); - cluster.modify()->addTrack(track); - } - } - - LMS_LOG(DBUPDATER, INFO) << "High level based clusters processed"; -} - - -} // namespace Database diff --git a/src/database/updater/DatabaseHighLevelCluster.hpp b/src/database/updater/DatabaseHighLevelCluster.hpp deleted file mode 100644 index 20adb3a8..00000000 --- a/src/database/updater/DatabaseHighLevelCluster.hpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ - -#pragma once - -#include "DatabaseUpdater.hpp" - -namespace Database { - -class HighLevelCluster : public UpdaterEventHandler -{ - public: - void handleFilesUpdated(void); - -}; - -} // namespace Database From ca7a407eea6a188aa555ffc7b519c3bb4eeb5f03 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 15 May 2018 13:30:41 +0200 Subject: [PATCH 125/195] Rerender the Settings view each time the internal path changes --- src/ui/SettingsView.cpp | 39 ++++++++++++++++++++++++++++----------- src/ui/SettingsView.hpp | 7 +++++-- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/ui/SettingsView.cpp b/src/ui/SettingsView.cpp index aa3b962e..54db2359 100644 --- a/src/ui/SettingsView.cpp +++ b/src/ui/SettingsView.cpp @@ -249,37 +249,54 @@ const Wt::WFormModel::Field SettingsModel::PasswordField = "password"; const Wt::WFormModel::Field SettingsModel::PasswordConfirmField = "password-confirm"; SettingsView::SettingsView() -: Wt::WTemplateFormView(Wt::WString::tr("Lms.Settings.template")) { + wApp->internalPathChanged().connect(std::bind([=] + { + refreshView(); + })); + + refreshView(); +} + +void +SettingsView::refreshView() +{ + if (!wApp->internalPathMatches("/settings")) + return; + + clear(); + + auto t = addNew(Wt::WString::tr("Lms.Settings.template")); + auto model = std::make_shared(); // Password auto password = std::make_unique(); password->setEchoMode(Wt::EchoMode::Password); - setFormWidget(SettingsModel::PasswordField, std::move(password)); + t->setFormWidget(SettingsModel::PasswordField, std::move(password)); // Password confirm auto passwordConfirm = std::make_unique(); passwordConfirm->setEchoMode(Wt::EchoMode::Password); - setFormWidget(SettingsModel::PasswordConfirmField, std::move(passwordConfirm)); + t->setFormWidget(SettingsModel::PasswordConfirmField, std::move(passwordConfirm)); // Bitrate auto bitrate = std::make_unique(); bitrate->setModel(model->bitrateModel()); - setFormWidget(SettingsModel::BitrateField, std::move(bitrate)); + t->setFormWidget(SettingsModel::BitrateField, std::move(bitrate)); // Encoding auto encoding = std::make_unique(); encoding->setModel(model->encodingModel()); - setFormWidget(SettingsModel::EncodingField, std::move(encoding)); + t->setFormWidget(SettingsModel::EncodingField, std::move(encoding)); // Buttons - Wt::WPushButton *saveBtn = bindWidget("apply-btn", std::make_unique(Wt::WString::tr("Lms.apply"))); - Wt::WPushButton *discardBtn = bindWidget("discard-btn", std::make_unique(Wt::WString::tr("Lms.discard"))); + Wt::WPushButton *saveBtn = t->bindWidget("apply-btn", std::make_unique(Wt::WString::tr("Lms.apply"))); + Wt::WPushButton *discardBtn = t->bindWidget("discard-btn", std::make_unique(Wt::WString::tr("Lms.discard"))); saveBtn->clicked().connect(std::bind([=] () { - updateModel(model.get()); + t->updateModel(model.get()); if (model->validate()) { @@ -288,17 +305,17 @@ SettingsView::SettingsView() } // Udate the view: Delete any validation message in the view, etc. - updateView(model.get()); + t->updateView(model.get()); })); discardBtn->clicked().connect(std::bind([=] () { model->loadData(); model->validate(); - updateView(model.get()); + t->updateView(model.get()); })); - updateView(model.get()); + t->updateView(model.get()); } } // namespace UserInterface diff --git a/src/ui/SettingsView.hpp b/src/ui/SettingsView.hpp index ac51a133..ff632fcd 100644 --- a/src/ui/SettingsView.hpp +++ b/src/ui/SettingsView.hpp @@ -19,14 +19,17 @@ #pragma once -#include +#include namespace UserInterface { -class SettingsView : public Wt::WTemplateFormView +class SettingsView : public Wt::WContainerWidget { public: SettingsView(); + + private: + void refreshView(); }; } // namespace UserInterface From 7e6bf57e7554215312864801fe7e0ef3b13e8e35 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 16 May 2018 12:45:28 +0200 Subject: [PATCH 126/195] Add a web interface to control the tags to be scanned --- approot/admin-database.xml | 14 +++++++++++ approot/messages.xml | 2 ++ src/scanner/MediaScanner.cpp | 34 ++++++++++++++++++--------- src/scanner/MediaScanner.hpp | 3 +++ src/ui/admin/DatabaseSettingsView.cpp | 28 ++++++++++++++++++---- 5 files changed, 66 insertions(+), 15 deletions(-) diff --git a/approot/admin-database.xml b/approot/admin-database.xml index 839d7dac..77bf80e6 100644 --- a/approot/admin-database.xml +++ b/approot/admin-database.xml @@ -42,6 +42,20 @@ ${update-start-time-info}
+
+ ${tr:Lms.Admin.Database.scan-options} +
+
+ +
+ ${tags} +
+
+ ${tags-info} +
+
diff --git a/approot/messages.xml b/approot/messages.xml index e0f60060..2b203b94 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -26,7 +26,9 @@ Media root directory Scan complete: {1} total files, {2} additions, {3} deletions, {4} duplicates, {5} errors Scan launched! +Scan options New settings saved! +Tags Update period Update start time Weekly diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 06864e7c..2a66913a 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -130,16 +130,35 @@ setUpdatePeriod(Wt::Dbo::Session& session, UpdatePeriod updatePeriod) Setting::setInt(session, updatePeriodSetting, static_cast(updatePeriod)); } -Wt::WTime getUpdateStartTime(Wt::Dbo::Session& session) +Wt::WTime +getUpdateStartTime(Wt::Dbo::Session& session) { return Setting::getTime(session, updateStartTimeSetting); } -void setUpdateStartTime(Wt::Dbo::Session& session, Wt::WTime startTime) +void +setUpdateStartTime(Wt::Dbo::Session& session, Wt::WTime startTime) { Setting::setTime(session, updateStartTimeSetting, startTime); } +std::set +getClusterTypes(Wt::Dbo::Session& session) +{ + MetaData::ClusterTypes clusterTypes; + + for (auto cluster : splitString(Setting::getString(session, clusterTypesSetting), " ")) + clusterTypes.insert(cluster); + + return clusterTypes; +} + +void setClusterTypes(Wt::Dbo::Session& session, const std::set clusterTypes) +{ + std::vector vecClusterTypes(clusterTypes.begin(), clusterTypes.end()); + Setting::setString(session, clusterTypesSetting, joinStrings(vecClusterTypes, " ")); +} + MediaScanner::MediaScanner(Wt::Dbo::SqlConnectionPool& connectionPool) : _running(false), _scheduleTimer(_ioService), @@ -153,10 +172,7 @@ _db(connectionPool) Setting::setString(_db.getSession(), fileExtensionsSetting, joinStrings(defaultFileExtensions, " ")); if (!Setting::exists(_db.getSession(), clusterTypesSetting)) - { - std::vector defaultClusterTypes(MetaData::Parser::defaultClusterTypes.begin(), MetaData::Parser::defaultClusterTypes.end()); - Setting::setString(_db.getSession(), clusterTypesSetting, joinStrings(defaultClusterTypes, " ")); - } + setClusterTypes(_db.getSession(), MetaData::Parser::defaultClusterTypes); refreshScanSettings(); } @@ -323,11 +339,7 @@ MediaScanner::refreshScanSettings() for (auto rootDir : Database::MediaDirectory::getAll(_db.getSession())) _rootDirectories.push_back(rootDir->getPath()); - MetaData::ClusterTypes clusterTypes; - for (auto cluster : splitString(Setting::getString(_db.getSession(), clusterTypesSetting), " ")) - clusterTypes.insert(cluster); - - _metadataParser.updateClusterTypes(clusterTypes); + _metadataParser.updateClusterTypes(getClusterTypes(_db.getSession())); } Artist::pointer diff --git a/src/scanner/MediaScanner.hpp b/src/scanner/MediaScanner.hpp index a27b9a13..c3d052e5 100644 --- a/src/scanner/MediaScanner.hpp +++ b/src/scanner/MediaScanner.hpp @@ -45,6 +45,9 @@ void setUpdatePeriod(Wt::Dbo::Session& session, UpdatePeriod updatePeriod); Wt::WTime getUpdateStartTime(Wt::Dbo::Session& session); void setUpdateStartTime(Wt::Dbo::Session& session, Wt::WTime time); +std::set getClusterTypes(Wt::Dbo::Session& session); +void setClusterTypes(Wt::Dbo::Session& session, const std::set clusterTypes); + class MediaScanner { public: diff --git a/src/ui/admin/DatabaseSettingsView.cpp b/src/ui/admin/DatabaseSettingsView.cpp index 6164a7f0..2894050d 100644 --- a/src/ui/admin/DatabaseSettingsView.cpp +++ b/src/ui/admin/DatabaseSettingsView.cpp @@ -30,6 +30,7 @@ #include "database/MediaDirectory.hpp" #include "scanner/MediaScanner.hpp" #include "utils/Logger.hpp" +#include "utils/Utils.hpp" #include "LmsApplication.hpp" @@ -46,6 +47,7 @@ class DatabaseSettingsModel : public Wt::WFormModel static const Field MediaDirectoryField; static const Field UpdatePeriodField; static const Field UpdateStartTimeField; + static const Field TagsField; DatabaseSettingsModel() : Wt::WFormModel() @@ -55,6 +57,7 @@ class DatabaseSettingsModel : public Wt::WFormModel addField(MediaDirectoryField); addField(UpdatePeriodField); addField(UpdateStartTimeField); + addField(TagsField); auto dirValidator = std::make_shared(); dirValidator->setMandatory(true); @@ -62,6 +65,7 @@ class DatabaseSettingsModel : public Wt::WFormModel setValidator(UpdatePeriodField, createMandatoryValidator()); setValidator(UpdateStartTimeField, createMandatoryValidator()); + setValidator(TagsField, createTagsValidator()); // populate the model with initial data loadData(); @@ -87,6 +91,10 @@ class DatabaseSettingsModel : public Wt::WFormModel auto startTimeRow = getUpdateStartTimeModelRow( Scanner::getUpdateStartTime(LmsApp->getDboSession()) ); if (startTimeRow) setValue(UpdateStartTimeField, updateStartTimeString(*startTimeRow) ); + + auto clusterTypes = Scanner::getClusterTypes(LmsApp->getDboSession()); + if (!clusterTypes.empty()) + setValue(TagsField, joinStrings(std::vector(clusterTypes.begin(), clusterTypes.end()), " ")); } void saveData() @@ -94,15 +102,18 @@ class DatabaseSettingsModel : public Wt::WFormModel Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); MediaDirectory::eraseAll(LmsApp->getDboSession()); - MediaDirectory::create(LmsApp->getDboSession(), Wt::cpp17::any_cast(value(MediaDirectoryField)).toUTF8()); + MediaDirectory::create(LmsApp->getDboSession(), valueText(MediaDirectoryField).toUTF8()); - auto updatePeriodRow = getUpdatePeriodModelRow( Wt::cpp17::any_cast(value(UpdatePeriodField))); + auto updatePeriodRow = getUpdatePeriodModelRow( valueText(UpdatePeriodField)); assert(updatePeriodRow); Scanner::setUpdatePeriod(LmsApp->getDboSession(), updatePeriod(*updatePeriodRow)); - auto startTimeRow = getUpdateStartTimeModelRow( Wt::cpp17::any_cast(value(UpdateStartTimeField))); + auto startTimeRow = getUpdateStartTimeModelRow( valueText(UpdateStartTimeField)); assert(startTimeRow); Scanner::setUpdateStartTime(LmsApp->getDboSession(), updateStartTime(*startTimeRow)); + + auto clusterTypes = splitString(valueText(TagsField).toUTF8(), " "); + Scanner::setClusterTypes(LmsApp->getDboSession(), std::set(clusterTypes.begin(), clusterTypes.end())); } boost::optional getUpdatePeriodModelRow(Wt::WString value) @@ -177,6 +188,12 @@ class DatabaseSettingsModel : public Wt::WFormModel private: + static std::shared_ptr createTagsValidator() + { + auto v = std::make_shared(); + return v; + } + void initializeModels() { @@ -215,7 +232,7 @@ class DatabaseSettingsModel : public Wt::WFormModel const Wt::WFormModel::Field DatabaseSettingsModel::MediaDirectoryField = "media-directory"; const Wt::WFormModel::Field DatabaseSettingsModel::UpdatePeriodField = "update-period"; const Wt::WFormModel::Field DatabaseSettingsModel::UpdateStartTimeField = "update-start-time"; - +const Wt::WFormModel::Field DatabaseSettingsModel::TagsField = "tags"; DatabaseSettingsView::DatabaseSettingsView() { @@ -251,6 +268,9 @@ DatabaseSettingsView::refreshView() updateStartTime->setModel(model->updateStartTimeModel()); t->setFormWidget(DatabaseSettingsModel::UpdateStartTimeField, std::move(updateStartTime)); + // Tags + t->setFormWidget(DatabaseSettingsModel::TagsField, std::make_unique()); + // Buttons Wt::WPushButton *saveBtn = t->bindWidget("apply-btn", std::make_unique(Wt::WString::tr("Lms.apply"))); Wt::WPushButton *discardBtn = t->bindWidget("discard-btn", std::make_unique(Wt::WString::tr("Lms.discard"))); From 9a44fb838dd62eb3b979c3bd0a2f1eb904f5c41f Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 16 May 2018 13:47:00 +0200 Subject: [PATCH 127/195] Reduce database include dependencies --- src/cover/CoverArtGrabber.cpp | 9 +++++++-- src/cover/CoverArtGrabber.hpp | 4 ++-- src/database/DatabaseHandler.cpp | 6 ++++++ src/database/DatabaseHandler.hpp | 9 +++------ src/database/DbArtist.cpp | 15 ++++++++------ src/database/DbArtist.hpp | 13 ++++++------ src/database/MediaDirectory.cpp | 2 +- src/database/MediaDirectory.hpp | 5 +---- src/database/Playlist.cpp | 6 +++++- src/database/Playlist.hpp | 4 +--- src/database/Release.cpp | 16 +++++++++------ src/database/Release.hpp | 11 ++++++---- src/database/SqlQuery.hpp | 5 +---- src/database/Track.cpp | 29 ++++++++++++++++++--------- src/database/Track.hpp | 17 ++++++++-------- src/database/Types.hpp | 13 ++++++------ src/database/User.cpp | 2 +- src/database/User.hpp | 6 ++---- src/scanner/MediaScanner.cpp | 5 ++++- src/scanner/MediaScanner.hpp | 3 +++ src/ui/MediaPlayer.cpp | 2 +- src/ui/MediaPlayer.hpp | 2 +- src/ui/PlayQueueView.cpp | 4 +++- src/ui/PlayQueueView.hpp | 4 ++-- src/ui/admin/UsersView.cpp | 2 +- src/ui/explore/ArtistView.cpp | 4 ++-- src/ui/explore/ArtistView.hpp | 10 +++++---- src/ui/explore/ArtistsView.cpp | 2 +- src/ui/explore/ArtistsView.hpp | 6 ++++-- src/ui/explore/Explore.cpp | 18 ++++++++--------- src/ui/explore/Explore.hpp | 13 ++++++------ src/ui/explore/Filters.cpp | 2 +- src/ui/explore/Filters.hpp | 6 +++--- src/ui/explore/ReleaseView.cpp | 4 ++-- src/ui/explore/ReleaseView.hpp | 10 +++++---- src/ui/explore/ReleasesView.cpp | 2 +- src/ui/explore/ReleasesView.hpp | 6 ++++-- src/ui/explore/TracksView.cpp | 4 +++- src/ui/explore/TracksView.hpp | 7 +++++-- src/ui/resource/ImageResource.cpp | 10 ++++----- src/ui/resource/ImageResource.hpp | 8 +++++--- src/ui/resource/TranscodeResource.cpp | 4 ++-- src/ui/resource/TranscodeResource.hpp | 4 +++- 43 files changed, 179 insertions(+), 135 deletions(-) diff --git a/src/cover/CoverArtGrabber.cpp b/src/cover/CoverArtGrabber.cpp index f720e7c2..7a09bf72 100644 --- a/src/cover/CoverArtGrabber.cpp +++ b/src/cover/CoverArtGrabber.cpp @@ -17,8 +17,13 @@ * along with LMS. If not, see . */ +#include + #include "av/AvInfo.hpp" +#include "database/Release.hpp" +#include "database/Track.hpp" + #include "utils/Logger.hpp" #include "CoverArtGrabber.hpp" @@ -145,7 +150,7 @@ Grabber::getFromTrack(const boost::filesystem::path& p, std::size_t nbMaxCovers) } std::vector -Grabber::getFromTrack(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::size_t nbMaxCovers) const +Grabber::getFromTrack(Wt::Dbo::Session& session, Database::IdType trackId, std::size_t nbMaxCovers) const { using namespace Database; @@ -173,7 +178,7 @@ Grabber::getFromTrack(Wt::Dbo::Session& session, Database::Track::id_type trackI std::vector -Grabber::getFromRelease(Wt::Dbo::Session& session, Database::Release::id_type releaseId, std::size_t nbMaxCovers) const +Grabber::getFromRelease(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t nbMaxCovers) const { using namespace Database; diff --git a/src/cover/CoverArtGrabber.hpp b/src/cover/CoverArtGrabber.hpp index 18d53a5d..43753c4f 100644 --- a/src/cover/CoverArtGrabber.hpp +++ b/src/cover/CoverArtGrabber.hpp @@ -38,8 +38,8 @@ class Grabber std::vector getCoverPaths(const boost::filesystem::path& directoryPath, std::size_t nbMaxCovers = 1) const; std::vector getFromDirectory(const boost::filesystem::path& path, std::size_t nbMaxCovers = 1) const; std::vector getFromTrack(const boost::filesystem::path& path, std::size_t nbMaxCovers = 1) const; - std::vector getFromTrack(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::size_t nbMaxCovers = 1) const; - std::vector getFromRelease(Wt::Dbo::Session& session, Database::Release::id_type releaseId, std::size_t nbMaxCovers = 1) const; + std::vector getFromTrack(Wt::Dbo::Session& session, Database::IdType trackId, std::size_t nbMaxCovers = 1) const; + std::vector getFromRelease(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t nbMaxCovers = 1) const; private: Grabber(); diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index ff6b5136..dc915eb7 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -33,6 +33,12 @@ #include "utils/Logger.hpp" +#include "DbArtist.hpp" +#include "MediaDirectory.hpp" +#include "Playlist.hpp" +#include "Release.hpp" +#include "Track.hpp" + #include "DatabaseHandler.hpp" namespace Database { diff --git a/src/database/DatabaseHandler.hpp b/src/database/DatabaseHandler.hpp index 1a1a8006..f57a096d 100644 --- a/src/database/DatabaseHandler.hpp +++ b/src/database/DatabaseHandler.hpp @@ -17,8 +17,7 @@ * along with LMS. If not, see . */ -#ifndef DATABASE_HANDLER_HPP -#define DATABASE_HANDLER_HPP +#pragma once #include #include @@ -30,12 +29,11 @@ #include #include -#include "Types.hpp" +#include "User.hpp" namespace Database { -typedef Wt::Dbo::dbo_default_traits::IdType id_type; -typedef Wt::Auth::Dbo::UserDatabase UserDatabase; +using UserDatabase = Wt::Auth::Dbo::UserDatabase; // Session living class handling the database and the login class Handler @@ -72,5 +70,4 @@ class Handler } // namespace Database -#endif diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp index 823cf35c..416bdc26 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/DbArtist.cpp @@ -17,11 +17,14 @@ * along with LMS. If not, see . */ -#include "Types.hpp" #include "SqlQuery.hpp" #include "utils/Logger.hpp" +#include "Release.hpp" +#include "DbArtist.hpp" +#include "Track.hpp" + namespace Database { @@ -46,7 +49,7 @@ Artist::getByMBID(Wt::Dbo::Session& session, const std::string& mbid) } Artist::pointer -Artist::getById(Wt::Dbo::Session& session, Artist::id_type id) +Artist::getById(Wt::Dbo::Session& session, IdType id) { return session.find().where("id = ?").bind(id); } @@ -75,7 +78,7 @@ Artist::getAllOrphans(Wt::Dbo::Session& session) static Wt::Dbo::Query getQuery(Wt::Dbo::Session& session, - const std::set& clusterIds, + const std::set& clusterIds, const std::vector& keywords) { WhereClause where; @@ -116,7 +119,7 @@ getQuery(Wt::Dbo::Session& session, std::vector Artist::getByFilter(Wt::Dbo::Session& session, - const std::set& clusters, + const std::set& clusters, const std::vector keywords, int offset, int size, bool& moreResults) { @@ -138,7 +141,7 @@ Artist::getByFilter(Wt::Dbo::Session& session, } std::vector> -Artist::getReleases(const std::set& clusterIds) const +Artist::getReleases(const std::set& clusterIds) const { assert(self()); assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); @@ -212,7 +215,7 @@ Artist::getClusterGroups(std::vector clusterTypes, std::si Wt::Dbo::collection queryRes = query; - std::map> clusters; + std::map> clusters; for (auto cluster : queryRes) { if (clusters[cluster->getType().id()].size() < size) diff --git a/src/database/DbArtist.hpp b/src/database/DbArtist.hpp index 1b5f6629..9ff9c673 100644 --- a/src/database/DbArtist.hpp +++ b/src/database/DbArtist.hpp @@ -17,8 +17,7 @@ * along with LMS. If not, see . */ -#ifndef _DB_ARTIST_HPP_ -#define _DB_ARTIST_HPP_ +#pragma once #include #include @@ -26,6 +25,8 @@ #include #include +#include "Types.hpp" + namespace Database { @@ -39,17 +40,16 @@ class Artist : public Wt::Dbo::Dbo public: typedef Wt::Dbo::ptr pointer; - typedef Wt::Dbo::dbo_traits::IdType id_type; Artist() {} Artist(const std::string& name, const std::string& MBID = ""); // Accessors static pointer getByMBID(Wt::Dbo::Session& session, const std::string& MBID); - static pointer getById(Wt::Dbo::Session& session, id_type id); + static pointer getById(Wt::Dbo::Session& session, IdType id); static std::vector getByName(Wt::Dbo::Session& session, const std::string& name); static std::vector getByFilter(Wt::Dbo::Session& session, - const std::set& clusters, // at least one track that belongs to these clusters + const std::set& clusters, // at least one track that belongs to these clusters const std::vector keywords, // name must match all of these keywords int offset, int size, @@ -63,7 +63,7 @@ class Artist : public Wt::Dbo::Dbo std::string getMBID(void) const { return _MBID; } // Get the releases that have at least one track for this artist that belongs to optional cluster filters - std::vector> getReleases(const std::set& clusterIds = std::set()) const; + std::vector> getReleases(const std::set& clusterIds = std::set()) const; // Get the cluster of the tracks made by this artist // Each clusters are grouped by cluster type, sorted by the number of occurence @@ -97,4 +97,3 @@ class Artist : public Wt::Dbo::Dbo } // namespace Database -#endif diff --git a/src/database/MediaDirectory.cpp b/src/database/MediaDirectory.cpp index d9801689..edc4d7ef 100644 --- a/src/database/MediaDirectory.cpp +++ b/src/database/MediaDirectory.cpp @@ -19,7 +19,7 @@ #include "utils/Utils.hpp" -#include "Types.hpp" +#include "MediaDirectory.hpp" namespace Database { diff --git a/src/database/MediaDirectory.hpp b/src/database/MediaDirectory.hpp index 434e78a3..7b640967 100644 --- a/src/database/MediaDirectory.hpp +++ b/src/database/MediaDirectory.hpp @@ -17,8 +17,7 @@ * along with LMS. If not, see . */ -#ifndef DATABASE_MEDIA_DIRECTORY_HPP -#define DATABASE_MEDIA_DIRECTORY_HPP +#pragma once #include @@ -59,5 +58,3 @@ class MediaDirectory } // namespace Database -#endif - diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index 8676ffda..d1b5842b 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -16,8 +16,12 @@ * You should have received a copy of the GNU General Public License * along with LMS. If not, see . */ +#include -#include "Types.hpp" +#include "User.hpp" +#include "Track.hpp" + +#include "Playlist.hpp" namespace Database { diff --git a/src/database/Playlist.hpp b/src/database/Playlist.hpp index beddbfa7..b9840fc9 100644 --- a/src/database/Playlist.hpp +++ b/src/database/Playlist.hpp @@ -17,8 +17,7 @@ * along with LMS. If not, see . */ -#ifndef DATABASE_PLAYLIST_HPP -#define DATABASE_PLAYLIST_HPP +#pragma once #include @@ -108,4 +107,3 @@ class PlaylistEntry } // namespace Database -#endif diff --git a/src/database/Release.cpp b/src/database/Release.cpp index 0fe6ba65..cde23718 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -17,9 +17,13 @@ * along with LMS. If not, see . */ -#include "Types.hpp" #include "SqlQuery.hpp" +#include "DbArtist.hpp" +#include "Track.hpp" + +#include "Release.hpp" + namespace Database { @@ -44,7 +48,7 @@ Release::getByMBID(Wt::Dbo::Session& session, const std::string& mbid) } Release::pointer -Release::getById(Wt::Dbo::Session& session, Release::id_type id) +Release::getById(Wt::Dbo::Session& session, IdType id) { return session.find().where("id = ?").bind(id); } @@ -73,7 +77,7 @@ Release::getAllOrphans(Wt::Dbo::Session& session) static Wt::Dbo::Query getQuery(Wt::Dbo::Session& session, - const std::set& clusterIds, + const std::set& clusterIds, const std::vector keywords) { WhereClause where; @@ -113,7 +117,7 @@ getQuery(Wt::Dbo::Session& session, std::vector Release::getByFilter(Wt::Dbo::Session& session, - const std::set& clusterIds, + const std::set& clusterIds, const std::vector keywords, int offset, int size, bool& moreResults) { @@ -182,7 +186,7 @@ Release::hasVariousArtists() const } std::vector> -Release::getTracks(const std::set& clusterIds) const +Release::getTracks(const std::set& clusterIds) const { assert(self()); assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); @@ -256,7 +260,7 @@ Release::getClusterGroups(std::vector clusterTypes, std::s Wt::Dbo::collection queryRes = query; - std::map> clusters; + std::map> clusters; for (auto cluster : queryRes) { if (clusters[cluster->getType().id()].size() < size) diff --git a/src/database/Release.hpp b/src/database/Release.hpp index c7020556..32cd1f10 100644 --- a/src/database/Release.hpp +++ b/src/database/Release.hpp @@ -23,19 +23,22 @@ #include +#include "Types.hpp" + namespace Database { class Track; class Release; class Artist; +class Cluster; +class ClusterType; class Release : public Wt::Dbo::Dbo { public: typedef Wt::Dbo::ptr pointer; - typedef Wt::Dbo::dbo_traits::IdType id_type; Release() {} Release(const std::string& name, const std::string& MBID = ""); @@ -43,18 +46,18 @@ class Release : public Wt::Dbo::Dbo // Accessors static pointer getByMBID(Wt::Dbo::Session& session, const std::string& MBID); static std::vector getByName(Wt::Dbo::Session& session, const std::string& name); - static pointer getById(Wt::Dbo::Session& session, id_type id); + static pointer getById(Wt::Dbo::Session& session, IdType id); static std::vector getAllOrphans(Wt::Dbo::Session& session); // no track related static std::vector getAll(Wt::Dbo::Session& session, int offset, int size); static std::vector getByFilter(Wt::Dbo::Session& session, - const std::set& clusters, // at least one track that belongs to these clusters + const std::set& clusters, // at least one track that belongs to these clusters const std::vector keywords, // name must match all of these keywords int offset, int size, bool& moreExpected); - std::vector> getTracks(const std::set& clusters = std::set()) const; + std::vector> getTracks(const std::set& clusters = std::set()) const; // Get the cluster of the tracks that belong to this release // Each clusters are grouped by cluster type, sorted by the number of occurence // size is the max number of cluster per cluster type diff --git a/src/database/SqlQuery.hpp b/src/database/SqlQuery.hpp index 98ce0b4f..76e6487e 100644 --- a/src/database/SqlQuery.hpp +++ b/src/database/SqlQuery.hpp @@ -17,8 +17,7 @@ * along with LMS. If not, see . */ -#ifndef SQL_QUERY_HPP___ -#define SQL_QUERY_HPP___ +#pragma once #include #include @@ -134,5 +133,3 @@ class SqlQuery GroupByStatement _groupByStatement; // GROUP BY statement }; -#endif - diff --git a/src/database/Track.cpp b/src/database/Track.cpp index 6bad83fb..9283eef7 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -21,7 +21,10 @@ #include "SqlQuery.hpp" -#include "Types.hpp" +#include "DbArtist.hpp" +#include "Release.hpp" + +#include "Track.hpp" namespace Database { @@ -37,12 +40,12 @@ Track::getAll(Wt::Dbo::Session& session) return session.find(); } -std::vector +std::vector Track::getAllIds(Wt::Dbo::Session& session) { Wt::Dbo::Transaction transaction(session); - Wt::Dbo::collection res = session.query("SELECT id from track"); - return std::vector(res.begin(), res.end()); + Wt::Dbo::collection res = session.query("SELECT id from track"); + return std::vector(res.begin(), res.end()); } Track::pointer @@ -52,7 +55,7 @@ Track::getByPath(Wt::Dbo::Session& session, const boost::filesystem::path& p) } Track::pointer -Track::getById(Wt::Dbo::Session& session, id_type id) +Track::getById(Wt::Dbo::Session& session, IdType id) { return session.find().where("id = ?").bind(id); } @@ -102,7 +105,7 @@ Track::getClusters(void) const static Wt::Dbo::Query< Track::pointer > getQuery(Wt::Dbo::Session& session, - const std::set& clusterIds, + const std::set& clusterIds, const std::vector keywords) { WhereClause where; @@ -142,7 +145,7 @@ getQuery(Wt::Dbo::Session& session, std::vector Track::getByFilter(Wt::Dbo::Session& session, - const std::set& clusterIds, + const std::set& clusterIds, const std::vector keywords, int offset, int size, bool& moreResults) { @@ -165,7 +168,7 @@ Track::getByFilter(Wt::Dbo::Session& session, std::vector Track::getByFilter(Wt::Dbo::Session& session, - const std::set& clusters) + const std::set& clusters) { bool moreResults; @@ -233,7 +236,7 @@ Cluster::getAll(Wt::Dbo::Session& session) } Cluster::pointer -Cluster::getById(Wt::Dbo::Session& session, id_type id) +Cluster::getById(Wt::Dbo::Session& session, IdType id) { return session.find().where("id = ?").bind(id); } @@ -288,7 +291,7 @@ std::vector ClusterType::getClusters() const { assert(self()); - assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); assert(session()); Wt::Dbo::collection res = session()->find() @@ -298,5 +301,11 @@ ClusterType::getClusters() const return std::vector(res.begin(), res.end()); } +void +Cluster::addTrack(Wt::Dbo::ptr track) +{ + _tracks.insert(track); +} + } // namespace Database diff --git a/src/database/Track.hpp b/src/database/Track.hpp index 88ae32b7..d0c90081 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -31,6 +31,8 @@ #include +#include "Types.hpp" + namespace Database { @@ -44,14 +46,13 @@ class Cluster : public Wt::Dbo::Dbo { public: typedef Wt::Dbo::ptr pointer; - typedef Wt::Dbo::dbo_traits::IdType id_type; Cluster(); Cluster(Wt::Dbo::ptr type, std::string name); // Find utility static std::vector getAll(Wt::Dbo::Session& session); - static pointer getById(Wt::Dbo::Session& session, id_type id); + static pointer getById(Wt::Dbo::Session& session, IdType id); // Create utility static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr type, std::string name); @@ -61,7 +62,7 @@ class Cluster : public Wt::Dbo::Dbo Wt::Dbo::ptr getType() const { return _clusterType; } const Wt::Dbo::collection>& getTracks() const { return _tracks; } - void addTrack(Wt::Dbo::ptr track) { _tracks.insert(track); } + void addTrack(Wt::Dbo::ptr track); template void persist(Action& a) @@ -88,7 +89,6 @@ class ClusterType : public Wt::Dbo::Dbo public: using pointer = Wt::Dbo::ptr; - using id_type = Wt::Dbo::dbo_traits::IdType; ClusterType() {} ClusterType(std::string name); @@ -126,7 +126,6 @@ class Track public: typedef Wt::Dbo::ptr pointer; - typedef Wt::Dbo::dbo_traits::IdType id_type; Track() {} Track(const boost::filesystem::path& p); @@ -139,19 +138,19 @@ class Track // Find utility functions static pointer getByPath(Wt::Dbo::Session& session, const boost::filesystem::path& p); - static pointer getById(Wt::Dbo::Session& session, id_type id); + static pointer getById(Wt::Dbo::Session& session, IdType id); static pointer getByMBID(Wt::Dbo::Session& session, const std::string& MBID); static std::vector getByFilter(Wt::Dbo::Session& session, - const std::set& clusters); // tracks that belong to these clusters + const std::set& clusters); // tracks that belong to these clusters static std::vector getByFilter(Wt::Dbo::Session& session, - const std::set& clusters, // tracks that belong to these clusters + const std::set& clusters, // tracks that belong to these clusters const std::vector keywords, // name must match all of these keywords int offset, int size, bool& moreExpected); static Wt::Dbo::collection< pointer > getAll(Wt::Dbo::Session& session); - static std::vector getAllIds(Wt::Dbo::Session& session); // nested transaction + static std::vector getAllIds(Wt::Dbo::Session& session); // nested transaction static std::vector getAllPaths(Wt::Dbo::Session& session); // nested transaction static std::vector getMBIDDuplicates(Wt::Dbo::Session& session); static std::vector getChecksumDuplicates(Wt::Dbo::Session& session); diff --git a/src/database/Types.hpp b/src/database/Types.hpp index 0518cbe5..5aa1644f 100644 --- a/src/database/Types.hpp +++ b/src/database/Types.hpp @@ -17,12 +17,11 @@ * along with LMS. If not, see . */ -// header file aimed to ease database class declarations +#pragma once -#include "DbArtist.hpp" -#include "Track.hpp" -#include "Playlist.hpp" -#include "Release.hpp" -#include "MediaDirectory.hpp" -#include "User.hpp" +#include + +namespace Database { + using IdType = Wt::Dbo::dbo_default_traits::IdType; +} diff --git a/src/database/User.cpp b/src/database/User.cpp index 9cc52dfd..dd8ed1dd 100644 --- a/src/database/User.cpp +++ b/src/database/User.cpp @@ -17,7 +17,7 @@ * along with LMS. If not, see . */ -#include "Types.hpp" +#include "User.hpp" namespace Database { diff --git a/src/database/User.hpp b/src/database/User.hpp index 28127150..325b11a9 100644 --- a/src/database/User.hpp +++ b/src/database/User.hpp @@ -17,8 +17,7 @@ * along with LMS. If not, see . */ -#ifndef DATABASE_USER_HPP -#define DATABASE_USER_HPP +#pragma once #include @@ -28,7 +27,7 @@ namespace Database { class User; -typedef Wt::Auth::Dbo::AuthInfo AuthInfo; +using AuthInfo = Wt::Auth::Dbo::AuthInfo; class Playlist; @@ -109,4 +108,3 @@ class User : public Wt::Dbo::Dbo } // namespace Databas' -#endif diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 2a66913a..6ea38650 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -26,8 +26,11 @@ #include "cover/CoverArtGrabber.hpp" +#include "database/DbArtist.hpp" +#include "database/Release.hpp" +#include "database/MediaDirectory.hpp" +#include "database/Track.hpp" #include "database/Setting.hpp" -#include "database/Types.hpp" #include "utils/Logger.hpp" #include "utils/Path.hpp" diff --git a/src/scanner/MediaScanner.hpp b/src/scanner/MediaScanner.hpp index c3d052e5..cedf2922 100644 --- a/src/scanner/MediaScanner.hpp +++ b/src/scanner/MediaScanner.hpp @@ -29,6 +29,9 @@ #include "metadata/TagLibParser.hpp" #include "database/DatabaseHandler.hpp" +#include "database/Track.hpp" +#include "database/DbArtist.hpp" +#include "database/Release.hpp" namespace Scanner { diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp index f2fbe015..8fb21a14 100644 --- a/src/ui/MediaPlayer.cpp +++ b/src/ui/MediaPlayer.cpp @@ -45,7 +45,7 @@ static std::string escape(const std::string& str) } void -MediaPlayer::playTrack(Database::Track::id_type trackId) +MediaPlayer::playTrack(Database::IdType trackId) { LMS_LOG(UI, DEBUG) << "Playing track ID = " << trackId; diff --git a/src/ui/MediaPlayer.hpp b/src/ui/MediaPlayer.hpp index 55da4f42..eec209b7 100644 --- a/src/ui/MediaPlayer.hpp +++ b/src/ui/MediaPlayer.hpp @@ -32,7 +32,7 @@ class MediaPlayer : public Wt::WTemplate MediaPlayer(); void stop(); - void playTrack(Database::Track::id_type); + void playTrack(Database::IdType trackId); // Signals Wt::JSignal<> playbackEnded; diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index b30b48f1..321d9f63 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -23,6 +23,8 @@ #include "utils/Logger.hpp" +#include "database/Playlist.hpp" + #include "LmsApplication.hpp" #include "PlayQueueView.hpp" @@ -91,7 +93,7 @@ PlayQueue::play(std::size_t pos) { updateCurrentTrack(false); - Database::Track::id_type trackId; + Database::IdType trackId; { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); diff --git a/src/ui/PlayQueueView.hpp b/src/ui/PlayQueueView.hpp index 0d65d2a0..9249073d 100644 --- a/src/ui/PlayQueueView.hpp +++ b/src/ui/PlayQueueView.hpp @@ -26,7 +26,7 @@ #include -#include "database/Types.hpp" +#include "database/Track.hpp" namespace UserInterface { @@ -45,7 +45,7 @@ class PlayQueue : public Wt::WTemplate void playPrevious(); // Signal emitted when a track is to be played - Wt::Signal playTrack; + Wt::Signal playTrack; // Signal emitted when play has to be stopped Wt::Signal<> playbackStop; diff --git a/src/ui/admin/UsersView.cpp b/src/ui/admin/UsersView.cpp index 97709a1f..776d61f0 100644 --- a/src/ui/admin/UsersView.cpp +++ b/src/ui/admin/UsersView.cpp @@ -20,7 +20,7 @@ #include #include -#include "database/Types.hpp" +#include "database/User.hpp" #include "utils/Logger.hpp" #include "LmsApplication.hpp" diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index 025bc6f7..f883a7b4 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -22,8 +22,8 @@ #include #include +#include "database/DbArtist.hpp" #include "database/Setting.hpp" -#include "database/Types.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -92,7 +92,7 @@ Artist::refresh() clear(); - auto artistId = readAs(wApp->internalPathNextPart("/artist/")); + auto artistId = readAs(wApp->internalPathNextPart("/artist/")); if (!artistId) return; diff --git a/src/ui/explore/ArtistView.hpp b/src/ui/explore/ArtistView.hpp index b4bb329f..8c3aed93 100644 --- a/src/ui/explore/ArtistView.hpp +++ b/src/ui/explore/ArtistView.hpp @@ -22,6 +22,8 @@ #include #include +#include "database/Types.hpp" + namespace UserInterface { class Filters; @@ -31,11 +33,11 @@ class Artist : public Wt::WContainerWidget public: Artist(Filters* filters); - Wt::Signal artistAdd; - Wt::Signal artistPlay; + Wt::Signal artistAdd; + Wt::Signal artistPlay; - Wt::Signal releaseAdd; - Wt::Signal releasePlay; + Wt::Signal releaseAdd; + Wt::Signal releasePlay; private: void refresh(); diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index 8cd3ec77..aba01ab5 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -21,8 +21,8 @@ #include #include +#include "database/DbArtist.hpp" #include "database/Setting.hpp" -#include "database/Types.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" diff --git a/src/ui/explore/ArtistsView.hpp b/src/ui/explore/ArtistsView.hpp index bfb643f6..7aa9bb0c 100644 --- a/src/ui/explore/ArtistsView.hpp +++ b/src/ui/explore/ArtistsView.hpp @@ -24,6 +24,8 @@ #include #include +#include "database/Types.hpp" + namespace UserInterface { class Filters; @@ -33,8 +35,8 @@ class Artists : public Wt::WTemplate public: Artists(Filters* filters); - Wt::Signal artistAdd; - Wt::Signal artistPlay; + Wt::Signal artistAdd; + Wt::Signal artistPlay; private: void refresh(); diff --git a/src/ui/explore/Explore.cpp b/src/ui/explore/Explore.cpp index 99da8f63..d9596ace 100644 --- a/src/ui/explore/Explore.cpp +++ b/src/ui/explore/Explore.cpp @@ -118,7 +118,7 @@ Explore::Explore() } // TODO SQL this? -static std::vector getArtistTracks(Wt::Dbo::Session& session, Database::id_type artistId, std::set clusters) +static std::vector getArtistTracks(Wt::Dbo::Session& session, Database::IdType artistId, std::set clusters) { std::vector res; @@ -140,7 +140,7 @@ static std::vector getArtistTracks(Wt::Dbo::Session& s return res; } -static std::vector getReleaseTracks(Wt::Dbo::Session& session, Database::id_type releaseId, std::set clusters) +static std::vector getReleaseTracks(Wt::Dbo::Session& session, Database::IdType releaseId, std::set clusters) { std::vector res; @@ -151,7 +151,7 @@ static std::vector getReleaseTracks(Wt::Dbo::Session& return release->getTracks(clusters); } -static std::vector getTrack(Wt::Dbo::Session& session, Database::id_type trackId) +static std::vector getTrack(Wt::Dbo::Session& session, Database::IdType trackId) { std::vector res; @@ -163,7 +163,7 @@ static std::vector getTrack(Wt::Dbo::Session& session, } void -Explore::handleArtistAdd(Database::id_type id) +Explore::handleArtistAdd(Database::IdType id) { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); @@ -171,7 +171,7 @@ Explore::handleArtistAdd(Database::id_type id) } void -Explore::handleArtistPlay(Database::id_type id) +Explore::handleArtistPlay(Database::IdType id) { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); @@ -179,7 +179,7 @@ Explore::handleArtistPlay(Database::id_type id) } void -Explore::handleReleaseAdd(Database::id_type id) +Explore::handleReleaseAdd(Database::IdType id) { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); @@ -187,7 +187,7 @@ Explore::handleReleaseAdd(Database::id_type id) } void -Explore::handleReleasePlay(Database::id_type id) +Explore::handleReleasePlay(Database::IdType id) { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); @@ -195,7 +195,7 @@ Explore::handleReleasePlay(Database::id_type id) } void -Explore::handleTrackAdd(Database::id_type id) +Explore::handleTrackAdd(Database::IdType id) { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); @@ -203,7 +203,7 @@ Explore::handleTrackAdd(Database::id_type id) } void -Explore::handleTrackPlay(Database::id_type id) +Explore::handleTrackPlay(Database::IdType id) { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); diff --git a/src/ui/explore/Explore.hpp b/src/ui/explore/Explore.hpp index 75302f6e..ea538876 100644 --- a/src/ui/explore/Explore.hpp +++ b/src/ui/explore/Explore.hpp @@ -21,6 +21,7 @@ #include +#include "database/Track.hpp" #include "database/Types.hpp" namespace UserInterface { @@ -37,12 +38,12 @@ class Explore : public Wt::WTemplate private: - void handleArtistAdd(Database::Artist::id_type id); - void handleArtistPlay(Database::Artist::id_type id); - void handleReleaseAdd(Database::Release::id_type id); - void handleReleasePlay(Database::Release::id_type id); - void handleTrackAdd(Database::Track::id_type id); - void handleTrackPlay(Database::Track::id_type id); + void handleArtistAdd(Database::IdType id); + void handleArtistPlay(Database::IdType id); + void handleReleaseAdd(Database::IdType id); + void handleReleasePlay(Database::IdType id); + void handleTrackAdd(Database::IdType id); + void handleTrackPlay(Database::IdType id); void handleTracksAdd(std::vector tracks); void handleTracksPlay(std::vector tracks); diff --git a/src/ui/explore/Filters.cpp b/src/ui/explore/Filters.cpp index 02d51e46..6c63eed3 100644 --- a/src/ui/explore/Filters.cpp +++ b/src/ui/explore/Filters.cpp @@ -116,7 +116,7 @@ Filters::showDialog() } void -Filters::add(Database::Cluster::id_type clusterId) +Filters::add(Database::IdType clusterId) { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); diff --git a/src/ui/explore/Filters.hpp b/src/ui/explore/Filters.hpp index 85b5606e..845f0305 100644 --- a/src/ui/explore/Filters.hpp +++ b/src/ui/explore/Filters.hpp @@ -34,9 +34,9 @@ class Filters : public Wt::WTemplate public: Filters(); - void add(Database::Cluster::id_type clusterId); + void add(Database::IdType clusterId); - std::set getClusterIds() const { return _filterIds; } + std::set getClusterIds() const { return _filterIds; } Wt::Signal<>& updated() { return _sigUpdated; } @@ -46,7 +46,7 @@ class Filters : public Wt::WTemplate Wt::WContainerWidget *_filters; Wt::Signal<> _sigUpdated; - std::set _filterIds; + std::set _filterIds; }; } // namespace UserInterface diff --git a/src/ui/explore/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp index fe8744e4..9be21dfa 100644 --- a/src/ui/explore/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -23,7 +23,7 @@ #include #include -#include "database/Types.hpp" +#include "database/Release.hpp" #include "database/Setting.hpp" #include "utils/Logger.hpp" @@ -92,7 +92,7 @@ Release::refresh() clear(); - auto releaseId = readAs(wApp->internalPathNextPart("/release/")); + auto releaseId = readAs(wApp->internalPathNextPart("/release/")); if (!releaseId) return; diff --git a/src/ui/explore/ReleaseView.hpp b/src/ui/explore/ReleaseView.hpp index 12bde073..c0e628ca 100644 --- a/src/ui/explore/ReleaseView.hpp +++ b/src/ui/explore/ReleaseView.hpp @@ -21,6 +21,8 @@ #include +#include "database/Types.hpp" + namespace UserInterface { class Filters; @@ -29,11 +31,11 @@ class Release : public Wt::WContainerWidget public: Release(Filters* filters); - Wt::Signal releaseAdd; - Wt::Signal releasePlay; + Wt::Signal releaseAdd; + Wt::Signal releasePlay; - Wt::Signal trackAdd; - Wt::Signal trackPlay; + Wt::Signal trackAdd; + Wt::Signal trackPlay; private: void refresh(); diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index 7151f6d3..f634cd29 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -23,7 +23,7 @@ #include #include -#include "database/Types.hpp" +#include "database/Release.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" diff --git a/src/ui/explore/ReleasesView.hpp b/src/ui/explore/ReleasesView.hpp index 9797da51..eec4ec62 100644 --- a/src/ui/explore/ReleasesView.hpp +++ b/src/ui/explore/ReleasesView.hpp @@ -24,6 +24,8 @@ #include #include +#include "database/Types.hpp" + namespace UserInterface { class Filters; @@ -33,8 +35,8 @@ class Releases : public Wt::WTemplate public: Releases(Filters* filters); - Wt::Signal releaseAdd; - Wt::Signal releasePlay; + Wt::Signal releaseAdd; + Wt::Signal releasePlay; private: void refresh(); diff --git a/src/ui/explore/TracksView.cpp b/src/ui/explore/TracksView.cpp index 19544136..77962644 100644 --- a/src/ui/explore/TracksView.cpp +++ b/src/ui/explore/TracksView.cpp @@ -22,7 +22,9 @@ #include #include -#include "database/Types.hpp" +#include "database/DbArtist.hpp" +#include "database/Track.hpp" +#include "database/Release.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" diff --git a/src/ui/explore/TracksView.hpp b/src/ui/explore/TracksView.hpp index 2b46be07..f5b13d8c 100644 --- a/src/ui/explore/TracksView.hpp +++ b/src/ui/explore/TracksView.hpp @@ -23,6 +23,9 @@ #include #include +#include "database/Types.hpp" +#include "database/Track.hpp" + namespace UserInterface { class Filters; @@ -31,8 +34,8 @@ class Tracks : public Wt::WTemplate public: Tracks(Filters* filters); - Wt::Signal trackAdd; - Wt::Signal trackPlay; + Wt::Signal trackAdd; + Wt::Signal trackPlay; Wt::Signal> tracksAdd; Wt::Signal> tracksPlay; diff --git a/src/ui/resource/ImageResource.cpp b/src/ui/resource/ImageResource.cpp index b64b0529..af342972 100644 --- a/src/ui/resource/ImageResource.cpp +++ b/src/ui/resource/ImageResource.cpp @@ -90,19 +90,19 @@ ImageResource::getDefaultArtistImage(std::size_t size) } std::string -ImageResource::getReleaseUrl(Database::Release::id_type releaseId, std::size_t size) const +ImageResource::getReleaseUrl(Database::IdType releaseId, std::size_t size) const { return url() + "&releaseid=" + std::to_string(releaseId) + "&size=" + std::to_string(size); } std::string -ImageResource::getTrackUrl(Database::Track::id_type trackId, std::size_t size) const +ImageResource::getTrackUrl(Database::IdType trackId, std::size_t size) const { return url() + "&trackid=" + std::to_string(trackId) + "&size=" + std::to_string(size); } std::string -ImageResource::getArtistUrl(Database::Artist::id_type artistId, std::size_t size) const +ImageResource::getArtistUrl(Database::IdType artistId, std::size_t size) const { return url() + "&artistid=" + std::to_string(artistId) + "&size=" + std::to_string(size); } @@ -159,7 +159,7 @@ ImageResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons if (trackIdStr) { - auto trackId = readAs(*trackIdStr); + auto trackId = readAs(*trackIdStr); if (!trackId) return; @@ -202,7 +202,7 @@ ImageResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons } else if (releaseIdStr) { - auto releaseId = readAs(*releaseIdStr); + auto releaseId = readAs(*releaseIdStr); if (!releaseId) return; diff --git a/src/ui/resource/ImageResource.hpp b/src/ui/resource/ImageResource.hpp index 3629b468..aa01ce2c 100644 --- a/src/ui/resource/ImageResource.hpp +++ b/src/ui/resource/ImageResource.hpp @@ -25,6 +25,8 @@ #include #include "database/DatabaseHandler.hpp" +#include "database/Types.hpp" + #include "image/Image.hpp" namespace UserInterface { @@ -38,9 +40,9 @@ class ImageResource : public Wt::WResource ImageResource(Database::Handler& db); ~ImageResource(); - std::string getReleaseUrl(Database::Release::id_type releaseId, size_t size) const; - std::string getTrackUrl(Database::Track::id_type trackId, size_t size) const; - std::string getArtistUrl(Database::Artist::id_type artistId, size_t size) const; + std::string getReleaseUrl(Database::IdType releaseId, size_t size) const; + std::string getTrackUrl(Database::IdType trackId, size_t size) const; + std::string getArtistUrl(Database::IdType artistId, size_t size) const; std::string getUnknownTrackUrl(size_t size) const; void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response); diff --git a/src/ui/resource/TranscodeResource.cpp b/src/ui/resource/TranscodeResource.cpp index 5665ea2e..f6aa03f9 100644 --- a/src/ui/resource/TranscodeResource.cpp +++ b/src/ui/resource/TranscodeResource.cpp @@ -40,7 +40,7 @@ TranscodeResource:: ~TranscodeResource() } std::string -TranscodeResource::getUrl(Database::Track::id_type trackId, Av::Encoding encoding) const +TranscodeResource::getUrl(Database::IdType trackId, Av::Encoding encoding) const { std::string res = url()+ "&trackid=" + std::to_string(trackId) + "&encoding=" + std::to_string(Av::encodingToInt(encoding)); @@ -64,7 +64,7 @@ TranscodeResource::handleRequest(const Wt::Http::Request& request, } else { - Database::Track::id_type trackId; + Database::IdType trackId; Av::TranscodeParameters parameters; LMS_LOG(UI, DEBUG) << "No continuation yet"; diff --git a/src/ui/resource/TranscodeResource.hpp b/src/ui/resource/TranscodeResource.hpp index b3842541..ead39acc 100644 --- a/src/ui/resource/TranscodeResource.hpp +++ b/src/ui/resource/TranscodeResource.hpp @@ -26,6 +26,8 @@ #include "av/AvTranscoder.hpp" #include "database/DatabaseHandler.hpp" +#include "database/Types.hpp" + namespace UserInterface { @@ -35,7 +37,7 @@ class TranscodeResource : public Wt::WResource TranscodeResource(Database::Handler& db); ~TranscodeResource(); - std::string getUrl(Database::Track::id_type trackId, Av::Encoding encoding) const; + std::string getUrl(Database::IdType trackId, Av::Encoding encoding) const; void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response); From 1e7bfd14c22df2b25153f973a95b9f0cef06851c Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 16 May 2018 13:58:29 +0200 Subject: [PATCH 128/195] Include self header first to catch problems --- src/av/AvInfo.cpp | 4 ++-- src/av/AvTranscoder.cpp | 5 +++-- src/cover/CoverArtGrabber.cpp | 4 ++-- src/database/DatabaseHandler.cpp | 4 ++-- src/database/DbArtist.cpp | 5 ++--- src/database/MediaDirectory.cpp | 4 ++-- src/database/Playlist.cpp | 4 ++-- src/database/Release.cpp | 5 ++--- src/database/SqlQuery.cpp | 15 ++++++++------- src/database/Track.cpp | 7 +++---- src/image/Image.cpp | 3 +-- src/metadata/AvFormat.cpp | 5 ++--- src/metadata/TagLibParser.cpp | 5 ++--- src/scanner/MediaScanner.cpp | 4 ++-- src/ui/Auth.cpp | 4 ++-- src/ui/HomeView.cpp | 4 ++-- src/ui/LmsApplication.cpp | 4 ++-- src/ui/MediaPlayer.cpp | 5 +++-- src/ui/PlayQueueView.cpp | 3 ++- src/ui/SettingsView.cpp | 4 ++-- src/ui/admin/DatabaseSettingsView.cpp | 4 ++-- src/ui/admin/InitWizardView.cpp | 4 ++-- src/ui/admin/UserView.cpp | 3 ++- src/ui/admin/UsersView.cpp | 3 ++- src/ui/admin/UsersView.hpp | 1 + src/ui/common/Validators.cpp | 4 ++-- src/ui/explore/ArtistView.cpp | 3 ++- src/ui/explore/ArtistsView.cpp | 3 ++- src/ui/explore/Explore.cpp | 4 ++-- src/ui/explore/Filters.cpp | 4 ++-- src/ui/explore/ReleaseView.cpp | 3 ++- src/ui/explore/ReleaseView.hpp | 1 + src/ui/explore/ReleasesView.cpp | 3 ++- src/ui/explore/TracksView.cpp | 3 ++- src/ui/resource/ImageResource.cpp | 4 ++-- src/ui/resource/TranscodeResource.cpp | 4 ++-- src/utils/Config.cpp | 4 ++-- src/utils/Path.cpp | 4 ++-- src/utils/Utils.cpp | 4 ++-- 39 files changed, 84 insertions(+), 77 deletions(-) diff --git a/src/av/AvInfo.cpp b/src/av/AvInfo.cpp index d433fd43..186d41f6 100644 --- a/src/av/AvInfo.cpp +++ b/src/av/AvInfo.cpp @@ -17,12 +17,12 @@ * along with LMS. If not, see . */ +#include "AvInfo.hpp" + #include #include "utils/Logger.hpp" -#include "AvInfo.hpp" - namespace Av { static std::string averror_to_string(int error) diff --git a/src/av/AvTranscoder.cpp b/src/av/AvTranscoder.cpp index 35ea8162..479d50f6 100644 --- a/src/av/AvTranscoder.cpp +++ b/src/av/AvTranscoder.cpp @@ -16,14 +16,15 @@ * You should have received a copy of the GNU General Public License * along with LMS. If not, see . */ + +#include "AvTranscoder.hpp" + #include #include #include "utils/Path.hpp" #include "utils/Logger.hpp" -#include "AvTranscoder.hpp" - namespace Av { #define LMS_LOG_TRANSCODE(sev) LMS_LOG(TRANSCODE, INFO) << "[" << _id << "] - " diff --git a/src/cover/CoverArtGrabber.cpp b/src/cover/CoverArtGrabber.cpp index 7a09bf72..fee2167f 100644 --- a/src/cover/CoverArtGrabber.cpp +++ b/src/cover/CoverArtGrabber.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "CoverArtGrabber.hpp" + #include #include "av/AvInfo.hpp" @@ -26,8 +28,6 @@ #include "utils/Logger.hpp" -#include "CoverArtGrabber.hpp" - namespace { bool diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index dc915eb7..f6ed9e6b 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "DatabaseHandler.hpp" + #include #include @@ -39,8 +41,6 @@ #include "Release.hpp" #include "Track.hpp" -#include "DatabaseHandler.hpp" - namespace Database { diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp index 416bdc26..b9dfb1ed 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/DbArtist.cpp @@ -16,13 +16,12 @@ * You should have received a copy of the GNU General Public License * along with LMS. If not, see . */ - -#include "SqlQuery.hpp" +#include "DbArtist.hpp" #include "utils/Logger.hpp" #include "Release.hpp" -#include "DbArtist.hpp" +#include "SqlQuery.hpp" #include "Track.hpp" namespace Database diff --git a/src/database/MediaDirectory.cpp b/src/database/MediaDirectory.cpp index edc4d7ef..72dea4e7 100644 --- a/src/database/MediaDirectory.cpp +++ b/src/database/MediaDirectory.cpp @@ -17,10 +17,10 @@ * along with LMS. If not, see . */ -#include "utils/Utils.hpp" - #include "MediaDirectory.hpp" +#include "utils/Utils.hpp" + namespace Database { MediaDirectory::MediaDirectory(boost::filesystem::path p) diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index d1b5842b..0b52b86c 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with LMS. If not, see . */ +#include "Playlist.hpp" + #include #include "User.hpp" #include "Track.hpp" -#include "Playlist.hpp" - namespace Database { Playlist::Playlist() diff --git a/src/database/Release.cpp b/src/database/Release.cpp index cde23718..adc836b0 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -17,13 +17,12 @@ * along with LMS. If not, see . */ -#include "SqlQuery.hpp" +#include "Release.hpp" #include "DbArtist.hpp" +#include "SqlQuery.hpp" #include "Track.hpp" -#include "Release.hpp" - namespace Database { diff --git a/src/database/SqlQuery.cpp b/src/database/SqlQuery.cpp index 611e1c9e..6956d180 100644 --- a/src/database/SqlQuery.cpp +++ b/src/database/SqlQuery.cpp @@ -17,15 +17,13 @@ * along with LMS. If not, see . */ -#include +#include "SqlQuery.hpp" -#include +#include #include #include -#include "SqlQuery.hpp" - WhereClause& WhereClause::And(const WhereClause& otherClause) { @@ -35,7 +33,8 @@ WhereClause::And(const WhereClause& otherClause) _clause += "(" + otherClause._clause + ")"; // Add associated bind args - BOOST_FOREACH(const std::string& otherBindArg, otherClause._bindArgs) { + for (const std::string& otherBindArg : otherClause._bindArgs) + { _bindArgs.push_back(otherBindArg); } } @@ -51,7 +50,8 @@ WhereClause::Or(const WhereClause& otherClause) _clause += "(" + otherClause._clause + ")"; // Add associated bind args - BOOST_FOREACH(const std::string& otherBindArg, otherClause._bindArgs) { + for (const std::string& otherBindArg : otherClause._bindArgs) + { _bindArgs.push_back(otherBindArg); } } @@ -147,7 +147,8 @@ FromClause::FromClause(const std::string& clause) FromClause& FromClause::And(const FromClause& clause) { - BOOST_FOREACH(const std::string fromClause, clause._clause) { + for (const std::string fromClause : clause._clause) + { _clause.push_back(fromClause); } diff --git a/src/database/Track.cpp b/src/database/Track.cpp index 9283eef7..54307fb3 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -17,14 +17,13 @@ * along with LMS. If not, see . */ -#include "utils/Logger.hpp" +#include "Track.hpp" -#include "SqlQuery.hpp" +#include "utils/Logger.hpp" #include "DbArtist.hpp" #include "Release.hpp" - -#include "Track.hpp" +#include "SqlQuery.hpp" namespace Database { diff --git a/src/image/Image.cpp b/src/image/Image.cpp index 03fea576..11c63eda 100644 --- a/src/image/Image.cpp +++ b/src/image/Image.cpp @@ -17,10 +17,9 @@ * along with LMS. If not, see . */ -#include "utils/Logger.hpp" - #include "Image.hpp" +#include "utils/Logger.hpp" namespace Image { diff --git a/src/metadata/AvFormat.cpp b/src/metadata/AvFormat.cpp index d2ba1788..a4a2943d 100644 --- a/src/metadata/AvFormat.cpp +++ b/src/metadata/AvFormat.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "AvFormat.hpp" + #include #include "av/AvInfo.hpp" @@ -24,9 +26,6 @@ #include "utils/Logger.hpp" #include "utils/Utils.hpp" -#include "AvFormat.hpp" - - namespace MetaData { diff --git a/src/metadata/TagLibParser.cpp b/src/metadata/TagLibParser.cpp index d479824f..21800b35 100644 --- a/src/metadata/TagLibParser.cpp +++ b/src/metadata/TagLibParser.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "TagLibParser.hpp" + #include #include #include @@ -26,9 +28,6 @@ #include "utils/Logger.hpp" #include "utils/Utils.hpp" -#include "TagLibParser.hpp" - - namespace MetaData { diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 6ea38650..7b05e795 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "MediaScanner.hpp" + #include #include @@ -36,8 +38,6 @@ #include "utils/Path.hpp" #include "utils/Utils.hpp" -#include "MediaScanner.hpp" - namespace { const std::string updatePeriodSetting = "update_period"; diff --git a/src/ui/Auth.cpp b/src/ui/Auth.cpp index ff1d39da..c2837d2c 100644 --- a/src/ui/Auth.cpp +++ b/src/ui/Auth.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "Auth.hpp" + #include #include #include @@ -27,8 +29,6 @@ #include "common/Validators.hpp" #include "LmsApplication.hpp" -#include "Auth.hpp" - namespace UserInterface { Auth::Auth() diff --git a/src/ui/HomeView.cpp b/src/ui/HomeView.cpp index f5309e70..965d7da9 100644 --- a/src/ui/HomeView.cpp +++ b/src/ui/HomeView.cpp @@ -17,14 +17,14 @@ * along with LMS. If not, see . */ +#include "HomeView.hpp" + #include #include "utils/Logger.hpp" #include "LmsApplication.hpp" -#include "HomeView.hpp" - namespace UserInterface { diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 702f23b2..d847964b 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "LmsApplication.hpp" + #include #include #include @@ -46,8 +48,6 @@ #include "resource/ImageResource.hpp" #include "resource/TranscodeResource.hpp" -#include "LmsApplication.hpp" - namespace UserInterface { std::unique_ptr diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp index 8fb21a14..3c001c01 100644 --- a/src/ui/MediaPlayer.cpp +++ b/src/ui/MediaPlayer.cpp @@ -16,6 +16,9 @@ * You should have received a copy of the GNU General Public License * along with LMS. If not, see . */ + +#include "MediaPlayer.hpp" + #include #include "av/AvInfo.hpp" @@ -25,8 +28,6 @@ #include "resource/TranscodeResource.hpp" #include "LmsApplication.hpp" -#include "MediaPlayer.hpp" - namespace UserInterface { diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index 321d9f63..bc2f00fe 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "PlayQueueView.hpp" + #include #include #include @@ -26,7 +28,6 @@ #include "database/Playlist.hpp" #include "LmsApplication.hpp" -#include "PlayQueueView.hpp" namespace UserInterface { diff --git a/src/ui/SettingsView.cpp b/src/ui/SettingsView.cpp index 54db2359..89a99107 100644 --- a/src/ui/SettingsView.cpp +++ b/src/ui/SettingsView.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "SettingsView.hpp" + #include #include #include @@ -30,8 +32,6 @@ #include "utils/Logger.hpp" #include "LmsApplication.hpp" -#include "SettingsView.hpp" - namespace UserInterface { using namespace Database; diff --git a/src/ui/admin/DatabaseSettingsView.cpp b/src/ui/admin/DatabaseSettingsView.cpp index 2894050d..98a1e1c7 100644 --- a/src/ui/admin/DatabaseSettingsView.cpp +++ b/src/ui/admin/DatabaseSettingsView.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "DatabaseSettingsView.hpp" + #include #include #include @@ -34,8 +36,6 @@ #include "LmsApplication.hpp" -#include "DatabaseSettingsView.hpp" - namespace UserInterface { using namespace Database; diff --git a/src/ui/admin/InitWizardView.cpp b/src/ui/admin/InitWizardView.cpp index 253ce0f1..93f8faaf 100644 --- a/src/ui/admin/InitWizardView.cpp +++ b/src/ui/admin/InitWizardView.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "InitWizardView.hpp" + #include #include #include @@ -27,8 +29,6 @@ #include "common/Validators.hpp" #include "LmsApplication.hpp" -#include "InitWizardView.hpp" - namespace UserInterface { class InitWizardModel : public Wt::WFormModel diff --git a/src/ui/admin/UserView.cpp b/src/ui/admin/UserView.cpp index 62dfe1d1..43839835 100644 --- a/src/ui/admin/UserView.cpp +++ b/src/ui/admin/UserView.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "UserView.hpp" + #include #include #include @@ -32,7 +34,6 @@ #include "utils/Logger.hpp" #include "LmsApplication.hpp" -#include "UserView.hpp" namespace UserInterface { diff --git a/src/ui/admin/UsersView.cpp b/src/ui/admin/UsersView.cpp index 776d61f0..3a2c7940 100644 --- a/src/ui/admin/UsersView.cpp +++ b/src/ui/admin/UsersView.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "UsersView.hpp" + #include #include @@ -24,7 +26,6 @@ #include "utils/Logger.hpp" #include "LmsApplication.hpp" -#include "UsersView.hpp" namespace UserInterface { diff --git a/src/ui/admin/UsersView.hpp b/src/ui/admin/UsersView.hpp index aba8fbca..e5691146 100644 --- a/src/ui/admin/UsersView.hpp +++ b/src/ui/admin/UsersView.hpp @@ -20,6 +20,7 @@ #pragma once #include +#include namespace UserInterface { diff --git a/src/ui/common/Validators.cpp b/src/ui/common/Validators.cpp index 72b7258e..19b71b1f 100644 --- a/src/ui/common/Validators.cpp +++ b/src/ui/common/Validators.cpp @@ -17,12 +17,12 @@ * along with LMS. If not, see . */ +#include "Validators.hpp" + #include #include -#include "Validators.hpp" - namespace UserInterface { std::shared_ptr diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index f883a7b4..230776df 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "ArtistView.hpp" + #include #include #include @@ -32,7 +34,6 @@ #include "LmsApplication.hpp" #include "Filters.hpp" -#include "ArtistView.hpp" using namespace Database; diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index aba01ab5..249d8c93 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "ArtistsView.hpp" + #include #include #include @@ -29,7 +31,6 @@ #include "LmsApplication.hpp" #include "Filters.hpp" -#include "ArtistsView.hpp" using namespace Database; diff --git a/src/ui/explore/Explore.cpp b/src/ui/explore/Explore.cpp index d9596ace..4d376b86 100644 --- a/src/ui/explore/Explore.cpp +++ b/src/ui/explore/Explore.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "Explore.hpp" + #include #include #include @@ -32,8 +34,6 @@ #include "ReleaseView.hpp" #include "TracksView.hpp" -#include "Explore.hpp" - namespace UserInterface { diff --git a/src/ui/explore/Filters.cpp b/src/ui/explore/Filters.cpp index 6c63eed3..a460c3e9 100644 --- a/src/ui/explore/Filters.cpp +++ b/src/ui/explore/Filters.cpp @@ -17,13 +17,13 @@ * along with LMS. If not, see . */ +#include "Filters.hpp" + #include #include #include #include -#include "Filters.hpp" - #include "LmsApplication.hpp" namespace UserInterface { diff --git a/src/ui/explore/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp index 9be21dfa..f03ccaf2 100644 --- a/src/ui/explore/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "ReleaseView.hpp" + #include #include #include @@ -33,7 +35,6 @@ #include "LmsApplication.hpp" #include "Filters.hpp" -#include "ReleaseView.hpp" using namespace Database; diff --git a/src/ui/explore/ReleaseView.hpp b/src/ui/explore/ReleaseView.hpp index c0e628ca..6423ce3c 100644 --- a/src/ui/explore/ReleaseView.hpp +++ b/src/ui/explore/ReleaseView.hpp @@ -20,6 +20,7 @@ #pragma once #include +#include #include "database/Types.hpp" diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index f634cd29..cef56ac5 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "ReleasesView.hpp" + #include #include #include @@ -32,7 +34,6 @@ #include "LmsApplication.hpp" #include "Filters.hpp" -#include "ReleasesView.hpp" namespace UserInterface { diff --git a/src/ui/explore/TracksView.cpp b/src/ui/explore/TracksView.cpp index 77962644..53862e1c 100644 --- a/src/ui/explore/TracksView.cpp +++ b/src/ui/explore/TracksView.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "TracksView.hpp" + #include #include #include @@ -33,7 +35,6 @@ #include "LmsApplication.hpp" #include "Filters.hpp" -#include "TracksView.hpp" namespace UserInterface { diff --git a/src/ui/resource/ImageResource.cpp b/src/ui/resource/ImageResource.cpp index af342972..58ba6b0a 100644 --- a/src/ui/resource/ImageResource.cpp +++ b/src/ui/resource/ImageResource.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "ImageResource.hpp" + #include #include @@ -27,8 +29,6 @@ #include "cover/CoverArtGrabber.hpp" -#include "ImageResource.hpp" - namespace UserInterface { static const std::string unknownCoverPath = "/images/unknown-cover.jpg"; diff --git a/src/ui/resource/TranscodeResource.cpp b/src/ui/resource/TranscodeResource.cpp index f6aa03f9..7b70991f 100644 --- a/src/ui/resource/TranscodeResource.cpp +++ b/src/ui/resource/TranscodeResource.cpp @@ -17,14 +17,14 @@ * along with LMS. If not, see . */ +#include "TranscodeResource.hpp" + #include #include "utils/Logger.hpp" #include "LmsApplication.hpp" -#include "TranscodeResource.hpp" - namespace UserInterface { TranscodeResource::TranscodeResource(Database::Handler& db) diff --git a/src/utils/Config.cpp b/src/utils/Config.cpp index abc20d89..3c39b89f 100644 --- a/src/utils/Config.cpp +++ b/src/utils/Config.cpp @@ -17,10 +17,10 @@ * along with LMS. If not, see . */ -#include - #include "Config.hpp" +#include + namespace { } diff --git a/src/utils/Path.cpp b/src/utils/Path.cpp index 2f937ce2..b6511840 100644 --- a/src/utils/Path.cpp +++ b/src/utils/Path.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "Path.hpp" + #include #include #include @@ -26,8 +28,6 @@ #include "utils/Logger.hpp" -#include "Path.hpp" - boost::filesystem::path searchExecPath(std::string filename) { std::string path; diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp index d1013209..f7864cb1 100644 --- a/src/utils/Utils.cpp +++ b/src/utils/Utils.cpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#include "Utils.hpp" + #include #include #include @@ -26,8 +28,6 @@ #include #include -#include "Utils.hpp" - bool readList(const std::string& str, const std::string& separators, std::list& results) { std::string curStr; From 6685795b9cc74f3133e9dc57239c3be84e075ac8 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 17 May 2018 13:06:23 +0200 Subject: [PATCH 129/195] Adding tags in the releases view --- approot/releases.xml | 1 + src/database/Release.cpp | 4 +-- src/ui/explore/ReleasesView.cpp | 53 +++++++++++++++++++++++++++++++-- 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/approot/releases.xml b/approot/releases.xml index e0eb02ca..69f6864f 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -33,6 +33,7 @@

${release-name}

${}${artist-name}${}
+ ${clusters} ${play-btn}${add-btn}
diff --git a/src/database/Release.cpp b/src/database/Release.cpp index adc836b0..d1a302dc 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -240,7 +240,7 @@ Release::getClusterGroups(std::vector clusterTypes, std::s std::ostringstream oss; - oss << "SELECT c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN cluster_type c_type ON c.cluster_type_id = c_type.id INNER JOIN release r ON t.release_id = r.id"; + oss << "SELECT c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN cluster_type c_type ON c.cluster_type_id = c_type.id INNER JOIN release r ON t.release_id = r.id "; where.And(WhereClause("r.id = ?")).bind(std::to_string(self()->id())); { @@ -250,7 +250,7 @@ Release::getClusterGroups(std::vector clusterTypes, std::s where.And(clusterClause); } oss << " " << where.get(); - oss << "GROUP BY c.id ORDER BY COUNT(c.id) DESC"; + oss << " GROUP BY c.id ORDER BY COUNT(c.id) DESC"; Wt::Dbo::Query query = session()->query( oss.str() ); diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index cef56ac5..4812e2e3 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -26,6 +26,7 @@ #include #include "database/Release.hpp" +#include "database/Setting.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -35,14 +36,43 @@ #include "LmsApplication.hpp" #include "Filters.hpp" -namespace UserInterface { - using namespace Database; +namespace { + +const std::string releasesClusterTypesSetting = "releases_cluster_types"; +const std::vector defaultReleasesClusterTypes = +{ + "GENRE", + "ALBUMGROUPING", +}; + +std::vector getReleasesClusterTypes(Wt::Dbo::Session& session) +{ + Wt::Dbo::Transaction transaction(session); + + std::vector 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 { + Releases::Releases(Filters* filters) : Wt::WTemplate(Wt::WString::tr("Lms.Explore.Releases.template")), _filters(filters) { + if (!Setting::exists(LmsApp->getDboSession(), releasesClusterTypesSetting)) + Setting::setString(LmsApp->getDboSession(), releasesClusterTypesSetting, joinStrings(defaultReleasesClusterTypes, " ")); + addFunction("tr", &Wt::WTemplate::Functions::tr); _search = bindNew("search"); @@ -108,6 +138,25 @@ Releases::addSome() entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(artists.front())); } + Wt::WContainerWidget* clusterContainers = entry->bindNew("clusters"); + { + auto clusterTypes = getReleasesClusterTypes(LmsApp->getDboSession()); + 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("play-btn", Wt::WString::tr("Lms.Explore.Releases.play"), Wt::TextFormat::XHTML); playBtn->clicked().connect(std::bind([=] { From a4788320a6938a7dff9d8cc3bee3ddd632ae774e Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 17 May 2018 13:45:22 +0200 Subject: [PATCH 130/195] Adding tags in the tracks view --- approot/tracks.xml | 1 + src/Makefile.am | 1 + src/database/Track.cpp | 44 ++++++++++++++++++++++++++++ src/database/Track.hpp | 5 ++-- src/ui/explore/ArtistView.cpp | 22 +++----------- src/ui/explore/ArtistsView.cpp | 22 +++----------- src/ui/explore/ExploreUtils.cpp | 51 +++++++++++++++++++++++++++++++++ src/ui/explore/ExploreUtils.hpp | 29 +++++++++++++++++++ src/ui/explore/ReleaseView.cpp | 21 +++----------- src/ui/explore/ReleasesView.cpp | 22 +++----------- src/ui/explore/TracksView.cpp | 41 ++++++++++++++++++++++++-- 11 files changed, 184 insertions(+), 75 deletions(-) create mode 100644 src/ui/explore/ExploreUtils.cpp create mode 100644 src/ui/explore/ExploreUtils.hpp diff --git a/approot/tracks.xml b/approot/tracks.xml index 41f92006..b8dcf259 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -36,6 +36,7 @@
${}${release-name}${} ${}${artist-name}${} + ${clusters} ${play-btn}${add-btn}
diff --git a/src/Makefile.am b/src/Makefile.am index b049316e..8d0239b2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,6 +33,7 @@ lms_SOURCES = \ $(srcdir)/ui/explore/ArtistView.cpp \ $(srcdir)/ui/explore/ArtistsView.cpp \ $(srcdir)/ui/explore/Explore.cpp \ + $(srcdir)/ui/explore/ExploreUtils.cpp \ $(srcdir)/ui/explore/Filters.cpp \ $(srcdir)/ui/explore/ReleasesView.cpp \ $(srcdir)/ui/explore/ReleaseView.cpp \ diff --git a/src/database/Track.cpp b/src/database/Track.cpp index 54307fb3..6b553258 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -210,6 +210,50 @@ Track::getOriginalYear() const return (_originalYear > 0) ? boost::make_optional(_originalYear) : boost::none; } +std::vector> +Track::getClusterGroups(std::vector clusterTypes, std::size_t size) const +{ + assert(self()); + assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(session()); + + WhereClause where; + + std::ostringstream oss; + + oss << "SELECT c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN cluster_type c_type ON c.cluster_type_id = c_type.id"; + + where.And(WhereClause("t.id = ?")).bind(std::to_string(self()->id())); + { + WhereClause clusterClause; + for (auto clusterType : clusterTypes) + clusterClause.Or(WhereClause("c_type.id = ?")).bind(std::to_string(clusterType.id())); + where.And(clusterClause); + } + oss << " " << where.get(); + oss << " GROUP BY c.id ORDER BY COUNT(c.id) DESC"; + + Wt::Dbo::Query query = session()->query( oss.str() ); + + for (const std::string& bindArg : where.getBindArgs()) + query.bind(bindArg); + + Wt::Dbo::collection queryRes = query; + + std::map> clusters; + for (auto cluster : queryRes) + { + if (clusters[cluster->getType().id()].size() < size) + clusters[cluster->getType().id()].push_back(cluster); + } + + std::vector> res; + for (auto cluster_list : clusters) + res.push_back(cluster_list.second); + + return res; +} + Cluster::Cluster() { } diff --git a/src/database/Track.hpp b/src/database/Track.hpp index d0c90081..9fc4f3a8 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -120,8 +120,7 @@ class ClusterType : public Wt::Dbo::Dbo Wt::Dbo::collection< Wt::Dbo::ptr > _clusters; }; - -class Track +class Track : public Wt::Dbo::Dbo { public: @@ -197,6 +196,8 @@ class Track Wt::Dbo::ptr getRelease(void) const { return _release; } std::vector< Cluster::pointer > getClusters(void) const; + std::vector>> getClusterGroups(std::vector> clusterTypes, std::size_t size) const; + template void persist(Action& a) { diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index 230776df..91dcc3ab 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -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 defaultArtistClusterTypes = +const std::set defaultArtistClusterTypes = { "GENRE", "ALBUMGROUPING", @@ -48,21 +49,6 @@ const std::vector defaultArtistClusterTypes = "COMMENT:SONGS-DB_OCCASION", }; -std::vector getArtistClusterTypes(Wt::Dbo::Session& session) -{ - Wt::Dbo::Transaction transaction(session); - - std::vector 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("clusters"); { - auto clusterTypes = getArtistClusterTypes(LmsApp->getDboSession()); + auto clusterTypes = getClusterTypesFromSetting(artistClusterTypesSetting); auto clusterGroups = artist->getClusterGroups(clusterTypes, 3); for (auto clusters : clusterGroups) diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index 249d8c93..2c953754 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -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 defaultArtistsClusterTypes = +const std::set defaultArtistsClusterTypes = { "ALBUMGROUPING", "GENRE", "ALBUMMOOD", }; -std::vector getArtistsClusterTypes(Wt::Dbo::Session& session) -{ - Wt::Dbo::Transaction transaction(session); - - std::vector 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("clusters"); { - auto clusterTypes = getArtistsClusterTypes(LmsApp->getDboSession()); + auto clusterTypes = getClusterTypesFromSetting(artistsClusterTypesSetting); auto clusterGroups = artist->getClusterGroups(clusterTypes, 1); for (auto clusters : clusterGroups) diff --git a/src/ui/explore/ExploreUtils.cpp b/src/ui/explore/ExploreUtils.cpp new file mode 100644 index 00000000..6ecaeccc --- /dev/null +++ b/src/ui/explore/ExploreUtils.cpp @@ -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 . + */ + +#include "ExploreUtils.hpp" + +#include "utils/Utils.hpp" + +#include "database/Setting.hpp" + +#include "LmsApplication.hpp" + +namespace UserInterface { + +std::vector getClusterTypesFromSetting(std::string setting) +{ + std::vector 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& clusterTypes) +{ + std::vector vec(clusterTypes.begin(), clusterTypes.end()); + Database::Setting::setString(LmsApp->getDboSession(), setting, joinStrings(vec, " ")); +} + +} // namespace UserInterface + diff --git a/src/ui/explore/ExploreUtils.hpp b/src/ui/explore/ExploreUtils.hpp new file mode 100644 index 00000000..a46a2be9 --- /dev/null +++ b/src/ui/explore/ExploreUtils.hpp @@ -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 . + */ + +#include "database/Track.hpp" + +namespace UserInterface { + +std::vector getClusterTypesFromSetting(std::string setting); + +void setClusterTypesToSetting(std::string setting, const std::set& clusterTypes); + +} // namespace UserInterface diff --git a/src/ui/explore/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp index f03ccaf2..079d9ecb 100644 --- a/src/ui/explore/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -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 defaultReleaseClusterTypes = +const std::set defaultReleaseClusterTypes = { "GENRE", "ALBUMGROUPING", @@ -49,20 +50,6 @@ const std::vector defaultReleaseClusterTypes = "COMMENT:SONGS-DB_OCCASION", }; -std::vector getReleaseClusterTypes(Wt::Dbo::Session& session) -{ - Wt::Dbo::Transaction transaction(session); - - std::vector 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("clusters"); { - auto clusterTypes = getReleaseClusterTypes(LmsApp->getDboSession()); + auto clusterTypes = getClusterTypesFromSetting(releaseClusterTypesSetting); auto clusterGroups = release->getClusterGroups(clusterTypes, 3); for (auto clusters : clusterGroups) diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index 4812e2e3..81bddc25 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -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 defaultReleasesClusterTypes = +const std::set defaultReleasesClusterTypes = { "GENRE", "ALBUMGROUPING", }; -std::vector getReleasesClusterTypes(Wt::Dbo::Session& session) -{ - Wt::Dbo::Transaction transaction(session); - - std::vector 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("clusters"); { - auto clusterTypes = getReleasesClusterTypes(LmsApp->getDboSession()); + auto clusterTypes = getClusterTypesFromSetting(releasesClusterTypesSetting); auto clusterGroups = release->getClusterGroups(clusterTypes, 1); for (auto clusters : clusterGroups) diff --git a/src/ui/explore/TracksView.cpp b/src/ui/explore/TracksView.cpp index 53862e1c..5b7796e1 100644 --- a/src/ui/explore/TracksView.cpp +++ b/src/ui/explore/TracksView.cpp @@ -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 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("search"); @@ -136,6 +154,25 @@ Tracks::addSome() // Some images may not be square cover->setWidth(64); + Wt::WContainerWidget* clusterContainers = entry->bindNew("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("play-btn", Wt::WString::tr("Lms.Explore.Tracks.play"), Wt::TextFormat::XHTML); playBtn->clicked().connect(std::bind([=] { From 8f459e03a25002434ce2d6fcdb07e536cd03aff8 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 17 May 2018 23:40:52 +0200 Subject: [PATCH 131/195] Fix regression when displaying tags of a track --- src/database/DbArtist.cpp | 4 ++-- src/database/Playlist.cpp | 1 + src/database/Release.cpp | 2 +- src/database/Track.cpp | 6 +++--- src/database/Track.hpp | 2 +- src/database/Types.hpp | 5 +++++ src/ui/explore/TracksView.cpp | 8 +++----- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp index b9dfb1ed..87d90567 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/DbArtist.cpp @@ -143,7 +143,7 @@ std::vector> Artist::getReleases(const std::set& clusterIds) const { assert(self()); - assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(IdIsValid(self()->id())); assert(session()); WhereClause where; @@ -188,7 +188,7 @@ std::vector>> Artist::getClusterGroups(std::vector clusterTypes, std::size_t size) const { assert(self()); - assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(IdIsValid(self()->id())); assert(session()); WhereClause where; diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index 0b52b86c..ca5cccd1 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -87,6 +87,7 @@ std::vector> Playlist::getEntries(int offset, int size, bool& moreResults) const { assert(session()); + assert(IdIsValid(self()->id())); moreResults = false; diff --git a/src/database/Release.cpp b/src/database/Release.cpp index d1a302dc..c5f610e9 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -166,7 +166,7 @@ std::vector> Release::getArtists() const { assert(self()); - assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(IdIsValid(self()->id())); assert(session()); Wt::Dbo::collection> res = session()->query>( diff --git a/src/database/Track.cpp b/src/database/Track.cpp index 6b553258..aeedf327 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -214,7 +214,7 @@ std::vector> Track::getClusterGroups(std::vector clusterTypes, std::size_t size) const { assert(self()); - assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(IdIsValid(self()->id())); assert(session()); WhereClause where; @@ -322,7 +322,7 @@ Cluster::pointer ClusterType::getCluster(std::string name) const { assert(self()); - assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(IdIsValid(self()->id())); assert(session()); return session()->find() @@ -334,7 +334,7 @@ std::vector ClusterType::getClusters() const { assert(self()); - assert(self()->id() != Wt::Dbo::dbo_traits::invalidId() ); + assert(IdIsValid(self()->id())); assert(session()); Wt::Dbo::collection res = session()->find() diff --git a/src/database/Track.hpp b/src/database/Track.hpp index 9fc4f3a8..c367fc98 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -120,7 +120,7 @@ class ClusterType : public Wt::Dbo::Dbo Wt::Dbo::collection< Wt::Dbo::ptr > _clusters; }; -class Track : public Wt::Dbo::Dbo +class Track : public Wt::Dbo::Dbo { public: diff --git a/src/database/Types.hpp b/src/database/Types.hpp index 5aa1644f..2ff23abd 100644 --- a/src/database/Types.hpp +++ b/src/database/Types.hpp @@ -23,5 +23,10 @@ namespace Database { using IdType = Wt::Dbo::dbo_default_traits::IdType; + + static inline bool IdIsValid(IdType id) + { + return id != Wt::Dbo::dbo_default_traits::invalidId(); + } } diff --git a/src/ui/explore/TracksView.cpp b/src/ui/explore/TracksView.cpp index 5b7796e1..2d1d53ee 100644 --- a/src/ui/explore/TracksView.cpp +++ b/src/ui/explore/TracksView.cpp @@ -136,15 +136,13 @@ Tracks::addSome() entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain); - auto artist = track->getArtist(); - if (artist) + if (track->getArtist()) { entry->setCondition("if-has-artist", true); entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(track->getArtist())); } - auto release = track->getRelease(); - if (release) + if (track->getRelease()) { entry->setCondition("if-has-release", true); entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(track->getRelease())); @@ -157,7 +155,7 @@ Tracks::addSome() Wt::WContainerWidget* clusterContainers = entry->bindNew("clusters"); { auto clusterTypes = getClusterTypesFromSetting(trackClusterTypesSetting); - auto clusterGroups = release->getClusterGroups(clusterTypes, 1); + auto clusterGroups = track->getClusterGroups(clusterTypes, 1); for (auto clusters : clusterGroups) { From 97a630ce7f203e0d6af438746d2b597988975ad7 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 18 May 2018 13:50:05 +0200 Subject: [PATCH 132/195] Split Cluster and Track in order to reduce compile dependencies --- src/Makefile.am | 1 + src/database/Cluster.cpp | 126 +++++++++++++++ src/database/Cluster.hpp | 115 ++++++++++++++ src/database/DatabaseHandler.cpp | 1 + src/database/DbArtist.cpp | 1 + src/database/DbArtist.hpp | 1 - src/database/MediaDirectory.hpp | 1 - src/database/Release.cpp | 1 + src/database/Track.cpp | 101 +----------- src/database/Track.hpp | 84 +--------- src/scanner/MediaScanner.cpp | 212 +++++++++++++------------- src/scanner/MediaScanner.hpp | 19 --- src/ui/LmsApplication.hpp | 6 +- src/ui/MediaPlayer.cpp | 3 + src/ui/explore/ExploreUtils.hpp | 2 +- src/ui/explore/ReleaseView.cpp | 1 + src/ui/resource/ImageResource.cpp | 2 + src/ui/resource/TranscodeResource.cpp | 2 + 18 files changed, 369 insertions(+), 310 deletions(-) create mode 100644 src/database/Cluster.cpp create mode 100644 src/database/Cluster.hpp diff --git a/src/Makefile.am b/src/Makefile.am index 8d0239b2..1866457c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,6 +5,7 @@ lms_SOURCES = \ $(srcdir)/av/AvInfo.cpp \ $(srcdir)/av/AvTranscoder.cpp \ $(srcdir)/cover/CoverArtGrabber.cpp \ + $(srcdir)/database/Cluster.cpp \ $(srcdir)/database/DbArtist.cpp \ $(srcdir)/database/DatabaseHandler.cpp \ $(srcdir)/database/MediaDirectory.cpp \ diff --git a/src/database/Cluster.cpp b/src/database/Cluster.cpp new file mode 100644 index 00000000..b32ac64d --- /dev/null +++ b/src/database/Cluster.cpp @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2013-2016 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 . + */ + +#include "Cluster.hpp" + +#include "DbArtist.hpp" +#include "Release.hpp" +#include "SqlQuery.hpp" +#include "Track.hpp" + +namespace Database { + +Cluster::Cluster() +{ +} + +Cluster::Cluster(Wt::Dbo::ptr type, std::string name) + : _name(std::string(name, 0, _maxNameLength)), + _clusterType(type) +{ +} + +Cluster::pointer +Cluster::create(Wt::Dbo::Session& session, Wt::Dbo::ptr type, std::string name) +{ + return session.add(std::make_unique(type, name)); +} + +std::vector +Cluster::getAll(Wt::Dbo::Session& session) +{ + Wt::Dbo::collection res = session.find(); + + return std::vector(res.begin(), res.end()); +} + +Cluster::pointer +Cluster::getById(Wt::Dbo::Session& session, IdType id) +{ + return session.find().where("id = ?").bind(id); +} + +ClusterType::ClusterType(std::string name) + : _name(name) +{ +} + +std::vector +ClusterType::getAllOrphans(Wt::Dbo::Session& session) +{ + Wt::Dbo::collection res = session.query>("select c_t from cluster_type c_t LEFT OUTER JOIN cluster c ON c_t.id = c.cluster_type_id WHERE c.id IS NULL"); + + return std::vector(res.begin(), res.end()); +} + + +ClusterType::pointer +ClusterType::getByName(Wt::Dbo::Session& session, std::string name) +{ + return session.find().where("name = ?").bind(name); +} + +std::vector +ClusterType::getAll(Wt::Dbo::Session& session) +{ + Wt::Dbo::collection res = session.find(); + + return std::vector(res.begin(), res.end()); +} + +ClusterType::pointer +ClusterType::create(Wt::Dbo::Session& session, std::string name) +{ + return session.add(std::make_unique(name)); +} + +Cluster::pointer +ClusterType::getCluster(std::string name) const +{ + assert(self()); + assert(IdIsValid(self()->id())); + assert(session()); + + return session()->find() + .where("name = ?").bind(name) + .where("cluster_type_id = ?").bind(self()->id()); +} + +std::vector +ClusterType::getClusters() const +{ + assert(self()); + assert(IdIsValid(self()->id())); + assert(session()); + + Wt::Dbo::collection res = session()->find() + .where("cluster_type_id = ?").bind(self()->id()) + .orderBy("name"); + + return std::vector(res.begin(), res.end()); +} + +void +Cluster::addTrack(Wt::Dbo::ptr track) +{ + _tracks.insert(track); +} + +} // namespace Database + diff --git a/src/database/Cluster.hpp b/src/database/Cluster.hpp new file mode 100644 index 00000000..65abf978 --- /dev/null +++ b/src/database/Cluster.hpp @@ -0,0 +1,115 @@ +/* + * 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 . + */ + +#pragma once + +#include +#include + +#include + +#include + +#include "Types.hpp" + +namespace Database { + +class Track; +class ClusterType; + +class Cluster : public Wt::Dbo::Dbo +{ + public: + typedef Wt::Dbo::ptr pointer; + + Cluster(); + Cluster(Wt::Dbo::ptr type, std::string name); + + // Find utility + static std::vector getAll(Wt::Dbo::Session& session); + static pointer getById(Wt::Dbo::Session& session, IdType id); + + // Create utility + static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr type, std::string name); + + // Accessors + const std::string& getName(void) const { return _name; } + Wt::Dbo::ptr getType() const { return _clusterType; } + const Wt::Dbo::collection>& getTracks() const { return _tracks; } + + void addTrack(Wt::Dbo::ptr track); + + template + void persist(Action& a) + { + Wt::Dbo::field(a, _name, "name"); + + Wt::Dbo::belongsTo(a, _clusterType, "cluster_type", Wt::Dbo::OnDeleteCascade); + Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToMany, "track_cluster", "", Wt::Dbo::OnDeleteCascade); + } + + private: + + static const std::size_t _maxNameLength = 128; + + std::string _name; + + Wt::Dbo::ptr _clusterType; + Wt::Dbo::collection< Wt::Dbo::ptr > _tracks; +}; + + +class ClusterType : public Wt::Dbo::Dbo +{ + public: + + using pointer = Wt::Dbo::ptr; + + ClusterType() {} + ClusterType(std::string name); + + static std::vector getAllOrphans(Wt::Dbo::Session& session); + static pointer getByName(Wt::Dbo::Session& session, std::string name); + static std::vector getAll(Wt::Dbo::Session& session); + + static pointer create(Wt::Dbo::Session& session, std::string name); + static void remove(Wt::Dbo::Session& session, std::string name); + + // Accessors + const std::string& getName(void) const { return _name; } + std::vector getClusters() const; + Cluster::pointer getCluster(std::string name) const; + + template + void persist(Action& a) + { + Wt::Dbo::field(a, _name, "name"); + Wt::Dbo::hasMany(a, _clusters, Wt::Dbo::ManyToOne, "cluster_type"); + } + + private: + + static const std::size_t _maxNameLength = 128; + + std::string _name; + Wt::Dbo::collection< Wt::Dbo::ptr > _clusters; +}; + +} // namespace Database + diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index f6ed9e6b..2f34c468 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -36,6 +36,7 @@ #include "utils/Logger.hpp" #include "DbArtist.hpp" +#include "Cluster.hpp" #include "MediaDirectory.hpp" #include "Playlist.hpp" #include "Release.hpp" diff --git a/src/database/DbArtist.cpp b/src/database/DbArtist.cpp index 87d90567..f3aa714d 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/DbArtist.cpp @@ -20,6 +20,7 @@ #include "utils/Logger.hpp" +#include "Cluster.hpp" #include "Release.hpp" #include "SqlQuery.hpp" #include "Track.hpp" diff --git a/src/database/DbArtist.hpp b/src/database/DbArtist.hpp index 9ff9c673..1c814a0d 100644 --- a/src/database/DbArtist.hpp +++ b/src/database/DbArtist.hpp @@ -23,7 +23,6 @@ #include #include -#include #include "Types.hpp" diff --git a/src/database/MediaDirectory.hpp b/src/database/MediaDirectory.hpp index 7b640967..84201b1d 100644 --- a/src/database/MediaDirectory.hpp +++ b/src/database/MediaDirectory.hpp @@ -24,7 +24,6 @@ #include #include -#include namespace Database { diff --git a/src/database/Release.cpp b/src/database/Release.cpp index c5f610e9..5088f040 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -19,6 +19,7 @@ #include "Release.hpp" +#include "Cluster.hpp" #include "DbArtist.hpp" #include "SqlQuery.hpp" #include "Track.hpp" diff --git a/src/database/Track.cpp b/src/database/Track.cpp index aeedf327..1e509f7e 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -19,8 +19,11 @@ #include "Track.hpp" +#include + #include "utils/Logger.hpp" +#include "Cluster.hpp" #include "DbArtist.hpp" #include "Release.hpp" #include "SqlQuery.hpp" @@ -93,7 +96,7 @@ Track::getChecksumDuplicates(Wt::Dbo::Session& session) return std::vector(res.begin(), res.end()); } -std::vector< Cluster::pointer > +std::vector Track::getClusters(void) const { std::vector< Cluster::pointer > clusters; @@ -254,101 +257,5 @@ Track::getClusterGroups(std::vector clusterTypes, std::siz return res; } -Cluster::Cluster() -{ -} - -Cluster::Cluster(Wt::Dbo::ptr type, std::string name) - : _name(std::string(name, 0, _maxNameLength)), - _clusterType(type) -{ -} - -Cluster::pointer -Cluster::create(Wt::Dbo::Session& session, Wt::Dbo::ptr type, std::string name) -{ - return session.add(std::make_unique(type, name)); -} - -std::vector -Cluster::getAll(Wt::Dbo::Session& session) -{ - Wt::Dbo::collection res = session.find(); - - return std::vector(res.begin(), res.end()); -} - -Cluster::pointer -Cluster::getById(Wt::Dbo::Session& session, IdType id) -{ - return session.find().where("id = ?").bind(id); -} - -ClusterType::ClusterType(std::string name) - : _name(name) -{ -} - -std::vector -ClusterType::getAllOrphans(Wt::Dbo::Session& session) -{ - Wt::Dbo::collection res = session.query>("select c_t from cluster_type c_t LEFT OUTER JOIN cluster c ON c_t.id = c.cluster_type_id WHERE c.id IS NULL"); - - return std::vector(res.begin(), res.end()); -} - - -ClusterType::pointer -ClusterType::getByName(Wt::Dbo::Session& session, std::string name) -{ - return session.find().where("name = ?").bind(name); -} - -std::vector -ClusterType::getAll(Wt::Dbo::Session& session) -{ - Wt::Dbo::collection res = session.find(); - - return std::vector(res.begin(), res.end()); -} - -ClusterType::pointer -ClusterType::create(Wt::Dbo::Session& session, std::string name) -{ - return session.add(std::make_unique(name)); -} - -Cluster::pointer -ClusterType::getCluster(std::string name) const -{ - assert(self()); - assert(IdIsValid(self()->id())); - assert(session()); - - return session()->find() - .where("name = ?").bind(name) - .where("cluster_type_id = ?").bind(self()->id()); -} - -std::vector -ClusterType::getClusters() const -{ - assert(self()); - assert(IdIsValid(self()->id())); - assert(session()); - - Wt::Dbo::collection res = session()->find() - .where("cluster_type_id = ?").bind(self()->id()) - .orderBy("name"); - - return std::vector(res.begin(), res.end()); -} - -void -Cluster::addTrack(Wt::Dbo::ptr track) -{ - _tracks.insert(track); -} - } // namespace Database diff --git a/src/database/Track.hpp b/src/database/Track.hpp index c367fc98..cb619296 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -27,7 +27,6 @@ #include #include -#include #include @@ -35,91 +34,12 @@ namespace Database { - class Artist; class Release; -class Track; class PlaylistEntry; +class Cluster; class ClusterType; -class Cluster : public Wt::Dbo::Dbo -{ - public: - typedef Wt::Dbo::ptr pointer; - - Cluster(); - Cluster(Wt::Dbo::ptr type, std::string name); - - // Find utility - static std::vector getAll(Wt::Dbo::Session& session); - static pointer getById(Wt::Dbo::Session& session, IdType id); - - // Create utility - static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr type, std::string name); - - // Accessors - const std::string& getName(void) const { return _name; } - Wt::Dbo::ptr getType() const { return _clusterType; } - const Wt::Dbo::collection>& getTracks() const { return _tracks; } - - void addTrack(Wt::Dbo::ptr track); - - template - void persist(Action& a) - { - Wt::Dbo::field(a, _name, "name"); - - Wt::Dbo::belongsTo(a, _clusterType, "cluster_type", Wt::Dbo::OnDeleteCascade); - Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToMany, "track_cluster", "", Wt::Dbo::OnDeleteCascade); - } - - private: - - static const std::size_t _maxNameLength = 128; - - std::string _name; - - Wt::Dbo::ptr _clusterType; - Wt::Dbo::collection< Wt::Dbo::ptr > _tracks; -}; - - -class ClusterType : public Wt::Dbo::Dbo -{ - public: - - using pointer = Wt::Dbo::ptr; - - ClusterType() {} - ClusterType(std::string name); - - static std::vector getAllOrphans(Wt::Dbo::Session& session); - static pointer getByName(Wt::Dbo::Session& session, std::string name); - static std::vector getAll(Wt::Dbo::Session& session); - - static pointer create(Wt::Dbo::Session& session, std::string name); - static void remove(Wt::Dbo::Session& session, std::string name); - - // Accessors - const std::string& getName(void) const { return _name; } - std::vector getClusters() const; - Cluster::pointer getCluster(std::string name) const; - - template - void persist(Action& a) - { - Wt::Dbo::field(a, _name, "name"); - Wt::Dbo::hasMany(a, _clusters, Wt::Dbo::ManyToOne, "cluster_type"); - } - - private: - - static const std::size_t _maxNameLength = 128; - - std::string _name; - Wt::Dbo::collection< Wt::Dbo::ptr > _clusters; -}; - class Track : public Wt::Dbo::Dbo { public: @@ -194,7 +114,7 @@ class Track : public Wt::Dbo::Dbo const std::string& getMBID(void) const { return _MBID; } Wt::Dbo::ptr getArtist(void) const { return _artist; } Wt::Dbo::ptr getRelease(void) const { return _release; } - std::vector< Cluster::pointer > getClusters(void) const; + std::vector> getClusters(void) const; std::vector>> getClusterGroups(std::vector> clusterTypes, std::size_t size) const; diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 7b05e795..1235c89e 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -28,6 +28,7 @@ #include "cover/CoverArtGrabber.hpp" +#include "database/Cluster.hpp" #include "database/DbArtist.hpp" #include "database/Release.hpp" #include "database/MediaDirectory.hpp" @@ -38,6 +39,8 @@ #include "utils/Path.hpp" #include "utils/Utils.hpp" +using namespace Database; + namespace { const std::string updatePeriodSetting = "update_period"; @@ -114,13 +117,108 @@ isPathInParentPath(const boost::filesystem::path& path, const boost::filesystem: return false; } +Artist::pointer +getArtist(Wt::Dbo::Session& session, const std::string& name, const std::string& mbid) +{ + Artist::pointer artist; + + // First try to get by MBID + if (!mbid.empty()) + { + artist = Artist::getByMBID(session, mbid); + if (!artist) + artist = Artist::create(session, name, mbid); + + return artist; + } + + // Fall back on artist name (collisions may occur) + if (!name.empty()) + { + for (Artist::pointer sameNamedArtist : Artist::getByName(session, name)) + { + if (sameNamedArtist->getMBID().empty()) + { + artist = sameNamedArtist; + break; + } + } + + // No Artist found with the same name and without MBID -> creating + if (!artist) + artist = Artist::create(session, name); + + return artist; + } + + return Artist::pointer(); +} + +Release::pointer +getRelease(Wt::Dbo::Session& session, const std::string& name, const std::string& mbid) +{ + Release::pointer release; + + // First try to get by MBID + if (!mbid.empty()) + { + release = Release::getByMBID(session, mbid ); + if (!release) + release = Release::create(session, name, mbid); + + return release; + } + + // Fall back on release name (collisions may occur) + if (!name.empty()) + { + for (Release::pointer sameNamedRelease : Release::getByName(session, name)) + { + if (sameNamedRelease->getMBID().empty()) + { + release = sameNamedRelease; + break; + } + } + + // No release found with the same name and without MBID -> creating + if (!release) + release = Release::create(session, name); + + return release; + } + + return Release::pointer(); +} + +std::vector +getClusters(Wt::Dbo::Session& session, const MetaData::Clusters& clustersNames) +{ + std::vector< Cluster::pointer > clusters; + + for (auto clusterNames : clustersNames) + { + auto clusterType = ClusterType::getByName(session, clusterNames.first); + if (!clusterType) + continue; + + for (auto clusterName : clusterNames.second) + { + auto cluster = clusterType->getCluster(clusterName); + if (!cluster) + cluster = Cluster::create(session, clusterType, clusterName); + + clusters.push_back(cluster); + } + } + + return clusters; +} + } // namespace - namespace Scanner { -using namespace Database; - UpdatePeriod getUpdatePeriod(Wt::Dbo::Session& session) { @@ -345,104 +443,6 @@ MediaScanner::refreshScanSettings() _metadataParser.updateClusterTypes(getClusterTypes(_db.getSession())); } -Artist::pointer -MediaScanner::getArtist( const boost::filesystem::path& file, const std::string& name, const std::string& mbid) -{ - Artist::pointer artist; - - // First try to get by MBID - if (!mbid.empty()) - { - artist = Artist::getByMBID( _db.getSession(), mbid ); - if (!artist) - artist = Artist::create( _db.getSession(), name, mbid); - - return artist; - } - - // Fall back on artist name (collisions may occur) - if (!name.empty()) - { - for (Artist::pointer sameNamedArtist : Artist::getByName( _db.getSession(), name )) - { - if (sameNamedArtist->getMBID().empty()) - { - artist = sameNamedArtist; - break; - } - } - - // No Artist found with the same name and without MBID -> creating - if (!artist) - artist = Artist::create( _db.getSession(), name); - - return artist; - } - - return Artist::pointer(); -} - -Release::pointer -MediaScanner::getRelease( const boost::filesystem::path& file, const std::string& name, const std::string& mbid) -{ - Release::pointer release; - - // First try to get by MBID - if (!mbid.empty()) - { - release = Release::getByMBID( _db.getSession(), mbid ); - if (!release) - release = Release::create( _db.getSession(), name, mbid); - - return release; - } - - // Fall back on release name (collisions may occur) - if (!name.empty()) - { - for (Release::pointer sameNamedRelease : Release::getByName( _db.getSession(), name )) - { - if (sameNamedRelease->getMBID().empty()) - { - release = sameNamedRelease; - break; - } - } - - // No release found with the same name and without MBID -> creating - if (!release) - release = Release::create( _db.getSession(), name); - - return release; - } - - return Release::pointer(); -} - -std::vector -MediaScanner::getClusters( const MetaData::Clusters& clustersNames) -{ - std::vector< Cluster::pointer > clusters; - - for (auto clusterNames : clustersNames) - { - auto clusterType = ClusterType::getByName(_db.getSession(), clusterNames.first); - if (!clusterType) - continue; - - for (auto clusterName : clusterNames.second) - { - auto cluster = clusterType->getCluster(clusterName); - if (!cluster) - cluster = Cluster::create(_db.getSession(), clusterType, clusterName); - - clusters.push_back(cluster); - } - } - - return clusters; -} - void MediaScanner::scanAudioFile(const boost::filesystem::path& file, bool forceScan, Stats& stats) { @@ -535,8 +535,7 @@ MediaScanner::scanAudioFile(const boost::filesystem::path& file, bool forceScan, clusterNames = boost::any_cast ((*items)[MetaData::Type::Clusters]); } - // TODO rename - genres = getClusters( clusterNames ); + genres = getClusters(_db.getSession(), clusterNames); } // ***** Artist @@ -551,7 +550,7 @@ MediaScanner::scanAudioFile(const boost::filesystem::path& file, bool forceScan, if ((*items).find(MetaData::Type::Artist) != (*items).end()) artistName = boost::any_cast((*items)[MetaData::Type::Artist]); - artist = getArtist(file, artistName, artistMusicBrainzID); + artist = getArtist(_db.getSession(), artistName, artistMusicBrainzID); } // ***** Release @@ -566,7 +565,7 @@ MediaScanner::scanAudioFile(const boost::filesystem::path& file, bool forceScan, if ((*items).find(MetaData::Type::Album) != (*items).end()) releaseName = boost::any_cast((*items)[MetaData::Type::Album]); - release = getRelease(file, releaseName, releaseMusicBrainzID); + release = getRelease(_db.getSession(), releaseName, releaseMusicBrainzID); } // If file already exist, update data @@ -650,9 +649,6 @@ MediaScanner::scanAudioFile(const boost::filesystem::path& file, bool forceScan, track.modify()->setCoverType( hasCover ? Track::CoverType::Embedded : Track::CoverType::None ); } - // TODO check added/modified - _sigAddedTrack.emit(track); - transaction.commit(); } diff --git a/src/scanner/MediaScanner.hpp b/src/scanner/MediaScanner.hpp index cedf2922..a18d0153 100644 --- a/src/scanner/MediaScanner.hpp +++ b/src/scanner/MediaScanner.hpp @@ -29,9 +29,6 @@ #include "metadata/TagLibParser.hpp" #include "database/DatabaseHandler.hpp" -#include "database/Track.hpp" -#include "database/DbArtist.hpp" -#include "database/Release.hpp" namespace Scanner { @@ -83,16 +80,6 @@ class MediaScanner std::size_t nbDuplicates() const { return duplicateHashes + duplicateMBID; } }; - - // Called just after track addition - Wt::Signal& addedTrack() { return _sigAddedTrack; } - - // Called just before track removal - Wt::Signal& removedTrack() { return _sigRemovedTrack; } - - // Called just after track modification - Wt::Signal& modifiedTrack() { return _sigModifiedTrack; } - // Called just after scan complete Wt::Signal& scanComplete() { return _sigScanComplete; } @@ -109,9 +96,6 @@ class MediaScanner void scanRootDirectory( boost::filesystem::path rootDirectory, bool forceScan, Stats& stats); // Helpers - Database::Artist::pointer getArtist( const boost::filesystem::path& file, const std::string& name, const std::string& MBID); - Database::Release::pointer getRelease( const boost::filesystem::path& file, const std::string& name, const std::string& MBID); - std::vector getClusters( const MetaData::Clusters& names); void refreshScanSettings(); void checkAudioFiles( Stats& stats ); @@ -123,9 +107,6 @@ class MediaScanner Wt::WIOService _ioService; Wt::Signal _sigScanComplete; - Wt::Signal _sigModifiedTrack; - Wt::Signal _sigAddedTrack; - Wt::Signal _sigRemovedTrack; boost::asio::system_timer _scheduleTimer; diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index e9499347..5de87a0e 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -26,6 +26,10 @@ #include "database/DatabaseHandler.hpp" #include "scanner/MediaScanner.hpp" +#include "database/Cluster.hpp" +#include "database/DbArtist.hpp" +#include "database/Release.hpp" + #include "Auth.hpp" namespace UserInterface { @@ -60,7 +64,7 @@ class LmsApplication : public Wt::WApplication static std::unique_ptr createArtistAnchor(Database::Artist::pointer artist, bool addText = true); static std::unique_ptr createReleaseAnchor(Database::Release::pointer release, bool addText = true); - static std::unique_ptr createCluster(Database::Cluster::pointer cluster, bool canDelete= false); + static std::unique_ptr createCluster(Database::Cluster::pointer cluster, bool canDelete = false); private: diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp index 3c001c01..961d33d2 100644 --- a/src/ui/MediaPlayer.cpp +++ b/src/ui/MediaPlayer.cpp @@ -24,6 +24,9 @@ #include "av/AvInfo.hpp" #include "utils/Logger.hpp" +#include "database/Track.hpp" + + #include "resource/ImageResource.hpp" #include "resource/TranscodeResource.hpp" diff --git a/src/ui/explore/ExploreUtils.hpp b/src/ui/explore/ExploreUtils.hpp index a46a2be9..f805a480 100644 --- a/src/ui/explore/ExploreUtils.hpp +++ b/src/ui/explore/ExploreUtils.hpp @@ -18,7 +18,7 @@ * along with LMS. If not, see . */ -#include "database/Track.hpp" +#include "database/Cluster.hpp" namespace UserInterface { diff --git a/src/ui/explore/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp index 079d9ecb..8efc7560 100644 --- a/src/ui/explore/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -27,6 +27,7 @@ #include "database/Release.hpp" #include "database/Setting.hpp" +#include "database/Track.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" diff --git a/src/ui/resource/ImageResource.cpp b/src/ui/resource/ImageResource.cpp index 58ba6b0a..d78c2b46 100644 --- a/src/ui/resource/ImageResource.cpp +++ b/src/ui/resource/ImageResource.cpp @@ -25,6 +25,8 @@ #include "utils/Logger.hpp" #include "utils/Utils.hpp" +#include "database/Track.hpp" + #include "LmsApplication.hpp" #include "cover/CoverArtGrabber.hpp" diff --git a/src/ui/resource/TranscodeResource.cpp b/src/ui/resource/TranscodeResource.cpp index 7b70991f..c27e2355 100644 --- a/src/ui/resource/TranscodeResource.cpp +++ b/src/ui/resource/TranscodeResource.cpp @@ -23,6 +23,8 @@ #include "utils/Logger.hpp" +#include "database/Track.hpp" + #include "LmsApplication.hpp" namespace UserInterface { From 702e3098a46816bb63372e0d8224abcb120f7f80 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 19 May 2018 14:30:51 +0200 Subject: [PATCH 133/195] Renamed DbArtist to Artist to be more consistent --- src/Makefile.am | 2 +- src/database/{DbArtist.cpp => Artist.cpp} | 2 +- src/database/{DbArtist.hpp => Artist.hpp} | 0 src/database/Cluster.cpp | 2 +- src/database/DatabaseHandler.cpp | 5 +++-- src/database/Release.cpp | 2 +- src/database/Track.cpp | 2 +- src/scanner/MediaScanner.cpp | 2 +- src/ui/LmsApplication.hpp | 2 +- src/ui/explore/ArtistView.cpp | 2 +- src/ui/explore/ArtistsView.cpp | 2 +- src/ui/explore/TracksView.cpp | 4 ++-- 12 files changed, 14 insertions(+), 13 deletions(-) rename src/database/{DbArtist.cpp => Artist.cpp} (99%) rename src/database/{DbArtist.hpp => Artist.hpp} (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 1866457c..b364c52d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,8 +5,8 @@ lms_SOURCES = \ $(srcdir)/av/AvInfo.cpp \ $(srcdir)/av/AvTranscoder.cpp \ $(srcdir)/cover/CoverArtGrabber.cpp \ + $(srcdir)/database/Artist.cpp \ $(srcdir)/database/Cluster.cpp \ - $(srcdir)/database/DbArtist.cpp \ $(srcdir)/database/DatabaseHandler.cpp \ $(srcdir)/database/MediaDirectory.cpp \ $(srcdir)/database/Playlist.cpp \ diff --git a/src/database/DbArtist.cpp b/src/database/Artist.cpp similarity index 99% rename from src/database/DbArtist.cpp rename to src/database/Artist.cpp index f3aa714d..2da5adbf 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/Artist.cpp @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with LMS. If not, see . */ -#include "DbArtist.hpp" +#include "Artist.hpp" #include "utils/Logger.hpp" diff --git a/src/database/DbArtist.hpp b/src/database/Artist.hpp similarity index 100% rename from src/database/DbArtist.hpp rename to src/database/Artist.hpp diff --git a/src/database/Cluster.cpp b/src/database/Cluster.cpp index b32ac64d..12c7e947 100644 --- a/src/database/Cluster.cpp +++ b/src/database/Cluster.cpp @@ -19,7 +19,7 @@ #include "Cluster.hpp" -#include "DbArtist.hpp" +#include "Artist.hpp" #include "Release.hpp" #include "SqlQuery.hpp" #include "Track.hpp" diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index 2f34c468..4978703b 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -35,7 +35,7 @@ #include "utils/Logger.hpp" -#include "DbArtist.hpp" +#include "Artist.hpp" #include "Cluster.hpp" #include "MediaDirectory.hpp" #include "Playlist.hpp" @@ -120,7 +120,8 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) LMS_LOG(DB, INFO) << "Tables created"; } - catch(std::exception& e) { + catch (Wt::Dbo::Exception& e) + { LMS_LOG(DB, ERROR) << "Cannot create tables: " << e.what(); } diff --git a/src/database/Release.cpp b/src/database/Release.cpp index 5088f040..cc49954f 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -19,8 +19,8 @@ #include "Release.hpp" +#include "Artist.hpp" #include "Cluster.hpp" -#include "DbArtist.hpp" #include "SqlQuery.hpp" #include "Track.hpp" diff --git a/src/database/Track.cpp b/src/database/Track.cpp index 1e509f7e..6fdf6c49 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -23,8 +23,8 @@ #include "utils/Logger.hpp" +#include "Artist.hpp" #include "Cluster.hpp" -#include "DbArtist.hpp" #include "Release.hpp" #include "SqlQuery.hpp" diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 1235c89e..42709b6a 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -28,8 +28,8 @@ #include "cover/CoverArtGrabber.hpp" +#include "database/Artist.hpp" #include "database/Cluster.hpp" -#include "database/DbArtist.hpp" #include "database/Release.hpp" #include "database/MediaDirectory.hpp" #include "database/Track.hpp" diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index 5de87a0e..b03a66d5 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -26,8 +26,8 @@ #include "database/DatabaseHandler.hpp" #include "scanner/MediaScanner.hpp" +#include "database/Artist.hpp" #include "database/Cluster.hpp" -#include "database/DbArtist.hpp" #include "database/Release.hpp" #include "Auth.hpp" diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index 91dcc3ab..e308d009 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -24,7 +24,7 @@ #include #include -#include "database/DbArtist.hpp" +#include "database/Artist.hpp" #include "database/Setting.hpp" #include "utils/Logger.hpp" diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index 2c953754..4ca9a617 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -23,7 +23,7 @@ #include #include -#include "database/DbArtist.hpp" +#include "database/Artist.hpp" #include "database/Setting.hpp" #include "utils/Logger.hpp" diff --git a/src/ui/explore/TracksView.cpp b/src/ui/explore/TracksView.cpp index 2d1d53ee..7889499b 100644 --- a/src/ui/explore/TracksView.cpp +++ b/src/ui/explore/TracksView.cpp @@ -24,10 +24,10 @@ #include #include -#include "database/DbArtist.hpp" -#include "database/Track.hpp" +#include "database/Artist.hpp" #include "database/Release.hpp" #include "database/Setting.hpp" +#include "database/Track.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" From f1c12ebb4d5e008afbfea9069250a341122a32c5 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 20 May 2018 14:38:04 +0200 Subject: [PATCH 134/195] Centralized scan settings into a dedicated ScanSettings table --- src/Makefile.am | 3 +- src/database/Cluster.cpp | 1 + src/database/Cluster.hpp | 3 + src/database/DatabaseHandler.cpp | 29 ++-- src/database/MediaDirectory.cpp | 58 ------- src/database/MediaDirectory.hpp | 59 -------- src/database/ScanSettings.cpp | 111 ++++++++++++++ src/database/ScanSettings.hpp | 82 ++++++++++ src/metadata/AvFormat.cpp | 7 +- src/metadata/AvFormat.hpp | 5 +- src/metadata/MetaData.cpp | 33 ---- src/metadata/MetaData.hpp | 12 +- src/metadata/TagLibParser.cpp | 7 +- src/metadata/TagLibParser.hpp | 5 +- src/scanner/MediaScanner.cpp | 209 +++++--------------------- src/scanner/MediaScanner.hpp | 28 +--- src/ui/admin/DatabaseSettingsView.cpp | 45 +++--- tools/metadata/Makefile.am | 3 +- 18 files changed, 290 insertions(+), 410 deletions(-) delete mode 100644 src/database/MediaDirectory.cpp delete mode 100644 src/database/MediaDirectory.hpp create mode 100644 src/database/ScanSettings.cpp create mode 100644 src/database/ScanSettings.hpp delete mode 100644 src/metadata/MetaData.cpp diff --git a/src/Makefile.am b/src/Makefile.am index b364c52d..7c5889d0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,16 +8,15 @@ lms_SOURCES = \ $(srcdir)/database/Artist.cpp \ $(srcdir)/database/Cluster.cpp \ $(srcdir)/database/DatabaseHandler.cpp \ - $(srcdir)/database/MediaDirectory.cpp \ $(srcdir)/database/Playlist.cpp \ $(srcdir)/database/Release.cpp \ + $(srcdir)/database/ScanSettings.cpp \ $(srcdir)/database/Setting.cpp \ $(srcdir)/database/SqlQuery.cpp \ $(srcdir)/database/Track.cpp \ $(srcdir)/database/User.cpp \ $(srcdir)/image/Image.cpp \ $(srcdir)/metadata/AvFormat.cpp \ - $(srcdir)/metadata/MetaData.cpp \ $(srcdir)/metadata/TagLibParser.cpp \ $(srcdir)/scanner/MediaScanner.cpp \ $(srcdir)/ui/Auth.cpp \ diff --git a/src/database/Cluster.cpp b/src/database/Cluster.cpp index 12c7e947..5468cd46 100644 --- a/src/database/Cluster.cpp +++ b/src/database/Cluster.cpp @@ -21,6 +21,7 @@ #include "Artist.hpp" #include "Release.hpp" +#include "ScanSettings.hpp" #include "SqlQuery.hpp" #include "Track.hpp" diff --git a/src/database/Cluster.hpp b/src/database/Cluster.hpp index 65abf978..65c1d68f 100644 --- a/src/database/Cluster.hpp +++ b/src/database/Cluster.hpp @@ -32,6 +32,7 @@ namespace Database { class Track; class ClusterType; +class ScanSettings; class Cluster : public Wt::Dbo::Dbo { @@ -101,6 +102,7 @@ class ClusterType : public Wt::Dbo::Dbo { Wt::Dbo::field(a, _name, "name"); Wt::Dbo::hasMany(a, _clusters, Wt::Dbo::ManyToOne, "cluster_type"); + Wt::Dbo::belongsTo(a, _scanSettings, "scan_settings", Wt::Dbo::OnDeleteCascade); } private: @@ -109,6 +111,7 @@ class ClusterType : public Wt::Dbo::Dbo std::string _name; Wt::Dbo::collection< Wt::Dbo::ptr > _clusters; + Wt::Dbo::ptr _scanSettings; }; } // namespace Database diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index 4978703b..7d3eb8d5 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -37,9 +37,9 @@ #include "Artist.hpp" #include "Cluster.hpp" -#include "MediaDirectory.hpp" #include "Playlist.hpp" #include "Release.hpp" +#include "ScanSettings.hpp" #include "Track.hpp" namespace Database { @@ -98,20 +98,21 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) { _session.setConnectionPool(connectionPool); - _session.mapClass("artist"); - _session.mapClass("cluster"); - _session.mapClass("cluster_type"); - _session.mapClass("media_directory"); - _session.mapClass("playlist"); - _session.mapClass("playlist_entry"); - _session.mapClass("release"); - _session.mapClass("setting"); - _session.mapClass("track"); + _session.mapClass("artist"); + _session.mapClass("cluster"); + _session.mapClass("cluster_type"); + _session.mapClass("playlist"); + _session.mapClass("playlist_entry"); + _session.mapClass("release"); + _session.mapClass("setting"); + _session.mapClass("track"); - _session.mapClass("auth_info"); - _session.mapClass("auth_identity"); - _session.mapClass("auth_token"); - _session.mapClass("user"); + _session.mapClass("scan_settings"); + + _session.mapClass("auth_info"); + _session.mapClass("auth_identity"); + _session.mapClass("auth_token"); + _session.mapClass("user"); try { Wt::Dbo::Transaction transaction(_session); diff --git a/src/database/MediaDirectory.cpp b/src/database/MediaDirectory.cpp deleted file mode 100644 index 72dea4e7..00000000 --- a/src/database/MediaDirectory.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#include "MediaDirectory.hpp" - -#include "utils/Utils.hpp" - -namespace Database { - -MediaDirectory::MediaDirectory(boost::filesystem::path p) -: _path(stringTrimEnd(p.string(), "/\\")) -{ -} - -MediaDirectory::pointer -MediaDirectory::create(Wt::Dbo::Session& session, boost::filesystem::path p) -{ - return session.add( std::make_unique(p) ); -} - -void -MediaDirectory::eraseAll(Wt::Dbo::Session& session) -{ - for (auto dir : getAll(session)) - dir.remove(); -} - -std::vector -MediaDirectory::getAll(Wt::Dbo::Session& session) -{ - Wt::Dbo::collection< MediaDirectory::pointer > res = session.find(); - - return std::vector(res.begin(), res.end()); -} - -boost::filesystem::path -MediaDirectory::getPath(void) const -{ - return boost::filesystem::path(stringTrimEnd(_path, "/\\")); -} - -} // namespace Database diff --git a/src/database/MediaDirectory.hpp b/src/database/MediaDirectory.hpp deleted file mode 100644 index 84201b1d..00000000 --- a/src/database/MediaDirectory.hpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2013 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 . - */ - -#pragma once - -#include - -#include - -#include - -namespace Database { - -class MediaDirectory -{ - public: - typedef Wt::Dbo::ptr pointer; - - MediaDirectory() {} - MediaDirectory(boost::filesystem::path p); - - // Accessors - static pointer create(Wt::Dbo::Session& session, boost::filesystem::path p); - static std::vector getAll(Wt::Dbo::Session& session); - - static void eraseAll(Wt::Dbo::Session& session); - static void eraseByPath(Wt::Dbo::Session& session, boost::filesystem::path p); - - boost::filesystem::path getPath(void) const; - - template - void persist(Action& a) - { - Wt::Dbo::field(a, _path, "path"); - } - - private: - - std::string _path; -}; - -} // namespace Database - diff --git a/src/database/ScanSettings.cpp b/src/database/ScanSettings.cpp new file mode 100644 index 00000000..2e05e377 --- /dev/null +++ b/src/database/ScanSettings.cpp @@ -0,0 +1,111 @@ +/* + * 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 . + */ + +#include "ScanSettings.hpp" + +#include + +#include "utils/Logger.hpp" +#include "utils/Utils.hpp" + +#include "Cluster.hpp" + +namespace { + +std::set defaultClusterTypeNames = +{ + "GENRE", + "ALBUMGROUPING", + "MOOD", + "ALBUMMOOD", + "COMMENT:SONGS-DB_OCCASION", +}; + +} + +namespace Database { + + +ScanSettings::pointer +ScanSettings::get(Wt::Dbo::Session& session) +{ + ScanSettings::pointer settings = session.find(); + if (!settings) + { + settings = session.add(std::make_unique()); + settings.modify()->setClusterTypes(defaultClusterTypeNames); + } + + return settings; +} + +std::set +ScanSettings::getAudioFileExtensions() const +{ + auto extensions = splitString(_audioFileExtensions, " "); + return std::set(extensions.begin(), extensions.end()); +} + +std::vector +ScanSettings::getClusterTypes() const +{ + return std::vector(_clusterTypes.begin(), _clusterTypes.end()); +} + +void +ScanSettings::setMediaDirectory(boost::filesystem::path p) +{ + _mediaDirectory = stringTrimEnd(p.string(), "/\\"); +} + +void +ScanSettings::setClusterTypes(const std::set& clusterTypeNames) +{ + assert(session()); + + // Backup the old list + std::vector oldClusterTypes(_clusterTypes.begin(), _clusterTypes.end()); + + _clusterTypes.clear(); + // Create any missing cluster type + for (auto clusterTypeName : clusterTypeNames) + { + auto clusterType = ClusterType::getByName(*session(), clusterTypeName); + if (!clusterType) + { + LMS_LOG(DB, INFO) << "Creating cluster type " << clusterTypeName; + clusterType = ClusterType::create(*session(), clusterTypeName); + } + _clusterTypes.insert(clusterType); + } + + // Delete no longer existing cluster types + for (auto oldClusterType : oldClusterTypes) + { + if (std::none_of(clusterTypeNames.begin(), clusterTypeNames.end(), + [oldClusterType](const std::string& name) { return name == oldClusterType->getName(); })) + { + LMS_LOG(DB, INFO) << "Deleting cluster type " << oldClusterType->getName(); + oldClusterType.remove(); + } + } +} + +} // namespace Database + diff --git a/src/database/ScanSettings.hpp b/src/database/ScanSettings.hpp new file mode 100644 index 00000000..c478fa3f --- /dev/null +++ b/src/database/ScanSettings.hpp @@ -0,0 +1,82 @@ +/* + * 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 . + */ + +#pragma once + +#include + +#include +#include + +namespace Database { + +class ClusterType; +// class meant to store general settings +class ScanSettings : public Wt::Dbo::Dbo +{ + public: + using pointer = Wt::Dbo::ptr; + + enum class UpdatePeriod { + Never = 0, + Daily, + Weekly, + Monthly + }; + + ScanSettings() {} + + static pointer get(Wt::Dbo::Session& session); + + // Getters + boost::filesystem::path getMediaDirectory() const { return _mediaDirectory; } + Wt::WTime getUpdateStartTime() const { return _startTime; } + UpdatePeriod getUpdatePeriod() const { return _updatePeriod; } + std::vector> getClusterTypes() const; + std::set getAudioFileExtensions() const; + + // Setters + void setMediaDirectory(boost::filesystem::path p); + void setUpdateStartTime(Wt::WTime t) { _startTime = t; } + void setUpdatePeriod(UpdatePeriod p) { _updatePeriod = p; } + void setClusterTypes(const std::set& clusterTypeNames); + void setAudioFileExtensions(std::set fileExtensions); + + template + void persist(Action& a) + { + Wt::Dbo::field(a, _mediaDirectory, "media_directory"); + Wt::Dbo::field(a, _startTime, "start_time"); + Wt::Dbo::field(a, _updatePeriod, "update_period"); + Wt::Dbo::field(a, _audioFileExtensions, "audio_file_extensions"); + Wt::Dbo::hasMany(a, _clusterTypes, Wt::Dbo::ManyToOne, "scan_settings"); + } + + private: + + std::string _mediaDirectory = ""; + Wt::WTime _startTime = Wt::WTime(0,0,0); + UpdatePeriod _updatePeriod = UpdatePeriod::Never; + std::string _audioFileExtensions = ".mp3 .ogg .oga .aac .m4a .flac .wav .wma .aif .aiff .ape .mpc .shn"; + Wt::Dbo::collection> _clusterTypes; +}; + + +} // namespace Database + diff --git a/src/metadata/AvFormat.cpp b/src/metadata/AvFormat.cpp index a4a2943d..e23c8682 100644 --- a/src/metadata/AvFormat.cpp +++ b/src/metadata/AvFormat.cpp @@ -29,11 +29,6 @@ namespace MetaData { -AvFormat::AvFormat(const ClusterTypes& clusterTypes) -: Parser(clusterTypes) -{ -} - boost::optional AvFormat::parse(const boost::filesystem::path& p, bool debug) { @@ -155,7 +150,7 @@ AvFormat::parse(const boost::filesystem::path& p, bool debug) { items.insert( std::make_pair(MetaData::Type::AcoustID, stringTrim(value)) ); } - else if (_clusterTypes.find(tag) != _clusterTypes.end()) + else if (_clusterTypeNames.find(tag) != _clusterTypeNames.end()) { std::vector clusterNames = splitString(value, ";,\\"); diff --git a/src/metadata/AvFormat.hpp b/src/metadata/AvFormat.hpp index 9039c90a..9c29e3f6 100644 --- a/src/metadata/AvFormat.hpp +++ b/src/metadata/AvFormat.hpp @@ -31,10 +31,7 @@ namespace MetaData class AvFormat : public Parser { public: - - AvFormat(const ClusterTypes& clusterTypes = defaultClusterTypes); - - boost::optional parse(const boost::filesystem::path& p, bool debug = false); + boost::optional parse(const boost::filesystem::path& p, bool debug = false) override; }; } // namespace MetaData diff --git a/src/metadata/MetaData.cpp b/src/metadata/MetaData.cpp deleted file mode 100644 index d949ef93..00000000 --- a/src/metadata/MetaData.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 . - */ - -#include "MetaData.hpp" - -namespace MetaData { - -const ClusterTypes Parser::defaultClusterTypes = -{ - "GENRE", - "ALBUMGROUPING", - "MOOD", - "ALBUMMOOD", - "COMMENT:SONGS-DB_OCCASION", -}; - -} // namespace MetaData diff --git a/src/metadata/MetaData.hpp b/src/metadata/MetaData.hpp index f09b1504..9cef1e80 100644 --- a/src/metadata/MetaData.hpp +++ b/src/metadata/MetaData.hpp @@ -63,24 +63,16 @@ namespace MetaData // See enum Type's comments using Items = std::map; using Clusters = std::map /* names */>; - using ClusterTypes = std::set; class Parser { public: - static const ClusterTypes defaultClusterTypes; - - // Provide a map for tag name -> Cluster name - Parser(const ClusterTypes& clusterTypes) : _clusterTypes(clusterTypes) {} - virtual boost::optional parse(const boost::filesystem::path& p, bool debug = false) = 0; - void updateClusterTypes(const ClusterTypes& clusterTypes) { _clusterTypes = clusterTypes; } - const ClusterTypes& getClusterTypes() const { return _clusterTypes; } - bool isClusterTypeSupported(const std::string& clusterType) const { return _clusterTypes.find(clusterType) != _clusterTypes.end(); } + void setClusterTypeNames(const std::set& clusterTypeNames) { _clusterTypeNames = clusterTypeNames; } protected: - ClusterTypes _clusterTypes; + std::set _clusterTypeNames; }; } // namespace MetaData diff --git a/src/metadata/TagLibParser.cpp b/src/metadata/TagLibParser.cpp index 21800b35..47440e47 100644 --- a/src/metadata/TagLibParser.cpp +++ b/src/metadata/TagLibParser.cpp @@ -31,11 +31,6 @@ namespace MetaData { -TagLibParser::TagLibParser(const ClusterTypes& clusterTypes) -: Parser(clusterTypes) -{ -} - boost::optional TagLibParser::parse(const boost::filesystem::path& p, bool debug) { @@ -199,7 +194,7 @@ TagLibParser::parse(const boost::filesystem::path& p, bool debug) if (items.find(MetaData::Type::HasCover) == items.end()) items.insert( std::make_pair(MetaData::Type::HasCover, true)); } - else if (_clusterTypes.find(tag) != _clusterTypes.end()) + else if (_clusterTypeNames.find(tag) != _clusterTypeNames.end()) { std::set clusterNames; for (const auto& value : values) diff --git a/src/metadata/TagLibParser.hpp b/src/metadata/TagLibParser.hpp index 2b6c7425..0ecadbe5 100644 --- a/src/metadata/TagLibParser.hpp +++ b/src/metadata/TagLibParser.hpp @@ -31,10 +31,7 @@ namespace MetaData class TagLibParser : public Parser { public: - - TagLibParser(const ClusterTypes& clusterTypes = defaultClusterTypes); - - boost::optional parse(const boost::filesystem::path& p, bool debug = false); + boost::optional parse(const boost::filesystem::path& p, bool debug = false) override; }; } // namespace MetaData diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 42709b6a..d652f6af 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -31,9 +31,8 @@ #include "database/Artist.hpp" #include "database/Cluster.hpp" #include "database/Release.hpp" -#include "database/MediaDirectory.hpp" +#include "database/ScanSettings.hpp" #include "database/Track.hpp" -#include "database/Setting.hpp" #include "utils/Logger.hpp" #include "utils/Path.hpp" @@ -43,28 +42,6 @@ using namespace Database; namespace { -const std::string updatePeriodSetting = "update_period"; -const std::string updateStartTimeSetting = "update_start_time"; -const std::string clusterTypesSetting = "cluster_types"; -const std::string fileExtensionsSetting = "file_extensions"; - -const std::vector defaultFileExtensions = -{ - ".mp3", - ".ogg", - ".oga", - ".aac", - ".m4a", - ".flac", - ".wav", - ".wma", - ".aif", - ".aiff", - ".ape", - ".mpc", - ".shn", -}; - Wt::WDate getNextMonday(Wt::WDate current) { @@ -88,17 +65,9 @@ getNextFirstOfMonth(Wt::WDate current) } bool -isFileSupported(const boost::filesystem::path& file, const std::vector extensions) +isFileSupported(const boost::filesystem::path& file, const std::set& extensions) { - boost::filesystem::path fileExtension = file.extension(); - - for (auto& extension : extensions) - { - if (extension == fileExtension) - return true; - } - - return false; + return (extensions.find(file.extension()) != extensions.end()); } bool @@ -219,47 +188,6 @@ getClusters(Wt::Dbo::Session& session, const MetaData::Clusters& clustersNames) namespace Scanner { -UpdatePeriod -getUpdatePeriod(Wt::Dbo::Session& session) -{ - return static_cast(Setting::getInt(session, updatePeriodSetting, static_cast(UpdatePeriod::Never))); -} - -void -setUpdatePeriod(Wt::Dbo::Session& session, UpdatePeriod updatePeriod) -{ - Setting::setInt(session, updatePeriodSetting, static_cast(updatePeriod)); -} - -Wt::WTime -getUpdateStartTime(Wt::Dbo::Session& session) -{ - return Setting::getTime(session, updateStartTimeSetting); -} - -void -setUpdateStartTime(Wt::Dbo::Session& session, Wt::WTime startTime) -{ - Setting::setTime(session, updateStartTimeSetting, startTime); -} - -std::set -getClusterTypes(Wt::Dbo::Session& session) -{ - MetaData::ClusterTypes clusterTypes; - - for (auto cluster : splitString(Setting::getString(session, clusterTypesSetting), " ")) - clusterTypes.insert(cluster); - - return clusterTypes; -} - -void setClusterTypes(Wt::Dbo::Session& session, const std::set clusterTypes) -{ - std::vector vecClusterTypes(clusterTypes.begin(), clusterTypes.end()); - Setting::setString(session, clusterTypesSetting, joinStrings(vecClusterTypes, " ")); -} - MediaScanner::MediaScanner(Wt::Dbo::SqlConnectionPool& connectionPool) : _running(false), _scheduleTimer(_ioService), @@ -267,14 +195,6 @@ _db(connectionPool) { _ioService.setThreadCount(1); - Wt::Dbo::Transaction transaction(_db.getSession()); - - if (!Setting::exists(_db.getSession(), fileExtensionsSetting)) - Setting::setString(_db.getSession(), fileExtensionsSetting, joinStrings(defaultFileExtensions, " ")); - - if (!Setting::exists(_db.getSession(), clusterTypesSetting)) - setClusterTypes(_db.getSession(), MetaData::Parser::defaultClusterTypes); - refreshScanSettings(); } @@ -329,43 +249,41 @@ MediaScanner::reschedule() void MediaScanner::scheduleScan() { - using namespace std::chrono_literals; + refreshScanSettings(); - Wt::WTime startTime = getUpdateStartTime(_db.getSession()); Wt::WDateTime now = Wt::WLocalDateTime::currentServerDateTime().toUTC(); Wt::WDate nextScanDate; - - switch ( getUpdatePeriod(_db.getSession()) ) + switch (_updatePeriod) { - case UpdatePeriod::Daily: - if (now.time() < startTime) + case ScanSettings::UpdatePeriod::Daily: + if (now.time() < _startTime) nextScanDate = now.date(); else nextScanDate = now.date().addDays(1); break; - case UpdatePeriod::Weekly: - if (now.time() < startTime && now.date().dayOfWeek() == 1) + case ScanSettings::UpdatePeriod::Weekly: + if (now.time() < _startTime && now.date().dayOfWeek() == 1) nextScanDate = now.date(); else nextScanDate = getNextMonday(now.date()); break; - case UpdatePeriod::Monthly: - if (now.time() < startTime && now.date().day() == 1) + case ScanSettings::UpdatePeriod::Monthly: + if (now.time() < _startTime && now.date().day() == 1) nextScanDate = now.date(); else nextScanDate = getNextFirstOfMonth(now.date()); break; - case UpdatePeriod::Never: + case ScanSettings::UpdatePeriod::Never: LMS_LOG(DBUPDATER, INFO) << "Auto scan disabled!"; break; } if (nextScanDate.isValid()) - scheduleScan( Wt::WDateTime(nextScanDate, startTime).toTimePoint() ); + scheduleScan( Wt::WDateTime(nextScanDate, _startTime).toTimePoint() ); } void @@ -399,19 +317,12 @@ MediaScanner::scan(boost::system::error_code err) Stats stats; checkAudioFiles(stats); - forceScan = checkClusters(); LMS_LOG(UI, INFO) << "Checks complete, force scan = " << forceScan; - for (auto rootDirectory : _rootDirectories) - { - if (!_running) - break; - - LMS_LOG(DBUPDATER, INFO) << "scaning root directory '" << rootDirectory.string() << "'..."; - scanRootDirectory(rootDirectory, forceScan, stats); - LMS_LOG(DBUPDATER, INFO) << "scaning root directory '" << rootDirectory.string() << "' DONE"; - } + LMS_LOG(DBUPDATER, INFO) << "scaning media directory '" << _mediaDirectory.string() << "'..."; + scanMediaDirectory(_mediaDirectory, forceScan, stats); + LMS_LOG(DBUPDATER, INFO) << "scaning media directory '" << _mediaDirectory.string() << "' DONE"; if (_running) checkDuplicatedAudioFiles(stats); @@ -432,15 +343,22 @@ MediaScanner::refreshScanSettings() { Wt::Dbo::Transaction transaction(_db.getSession()); - _fileExtensions.clear(); - for (auto extension : splitString(Setting::getString(_db.getSession(), fileExtensionsSetting), " ")) - _fileExtensions.push_back( extension ); + auto scanSettings = ScanSettings::get(_db.getSession()); - _rootDirectories.clear(); - for (auto rootDir : Database::MediaDirectory::getAll(_db.getSession())) - _rootDirectories.push_back(rootDir->getPath()); + _startTime = scanSettings->getUpdateStartTime(); + _updatePeriod = scanSettings->getUpdatePeriod(); - _metadataParser.updateClusterTypes(getClusterTypes(_db.getSession())); + _fileExtensions = scanSettings->getAudioFileExtensions(); + _mediaDirectory = scanSettings->getMediaDirectory(); + + auto clusterTypes = scanSettings->getClusterTypes(); + std::set clusterTypeNames; + + std::transform(clusterTypes.begin(), clusterTypes.end(), + std::inserter(clusterTypeNames, clusterTypeNames.begin()), + [](ClusterType::pointer clusterType) -> std::string { return clusterType->getName(); }); + + _metadataParser.setClusterTypeNames(clusterTypeNames); } void @@ -653,11 +571,11 @@ MediaScanner::scanAudioFile(const boost::filesystem::path& file, bool forceScan, } void -MediaScanner::scanRootDirectory(boost::filesystem::path rootDirectory, bool forceScan, Stats& stats) +MediaScanner::scanMediaDirectory(boost::filesystem::path mediaDirectory, bool forceScan, Stats& stats) { boost::system::error_code ec; - boost::filesystem::recursive_directory_iterator itPath(rootDirectory, ec); + boost::filesystem::recursive_directory_iterator itPath(mediaDirectory, ec); boost::filesystem::recursive_directory_iterator itEnd; while (!ec && itPath != itEnd) @@ -676,38 +594,27 @@ MediaScanner::scanRootDirectory(boost::filesystem::path rootDirectory, bool forc } } -// Check if a file exists and is still in a root directory +// Check if a file exists and is still in a media directory static bool -checkFile(const boost::filesystem::path& p, const std::vector& rootDirs, const std::vector& extensions) +checkFile(const boost::filesystem::path& p, boost::filesystem::path mediaDirectory, const std::set& extensions) { try { bool status = true; // For each track, make sure the the file still exists - // and still belongs to a root directory + // and still belongs to a media directory if (!boost::filesystem::exists( p ) - || !boost::filesystem::is_regular( p ) ) + || !boost::filesystem::is_regular( p ) ) { LMS_LOG(DBUPDATER, INFO) << "Missing file '" << p.string() << "'"; status = false; } else { - - bool foundRoot = false; - for (auto& rootDir : rootDirs) + if (!isPathInParentPath(p, mediaDirectory)) { - if (isPathInParentPath(p, rootDir)) - { - foundRoot = true; - break; - } - } - - if (!foundRoot) - { - LMS_LOG(DBUPDATER, INFO) << "Out of root file '" << p.string() << "'"; + LMS_LOG(DBUPDATER, INFO) << "File '" << p.string() << "' is out of media directory '"; status = false; } else if (!isFileSupported(p, extensions)) @@ -741,7 +648,7 @@ MediaScanner::checkAudioFiles( Stats& stats ) if (!_running) return; - if (!checkFile(trackPath, _rootDirectories, _fileExtensions)) + if (!checkFile(trackPath, _mediaDirectory, _fileExtensions)) { Wt::Dbo::Transaction transaction(_db.getSession()); @@ -798,44 +705,6 @@ MediaScanner::checkAudioFiles( Stats& stats ) LMS_LOG(DBUPDATER, INFO) << "Check audio files done!"; } -bool -MediaScanner::checkClusters() -{ - bool hasChanges = false; - - LMS_LOG(DBUPDATER, INFO) << "Checking clusters"; - - Wt::Dbo::Transaction transaction(_db.getSession()); - auto clusterTypes = ClusterType::getAll(_db.getSession()); - - // Remove no longer desired clusters - for (auto clusterType : clusterTypes) - { - if (!_metadataParser.isClusterTypeSupported(clusterType->getName())) - { - LMS_LOG(DBUPDATER, INFO) << "Removing cluster type " << clusterType->getName(); - clusterType.remove(); - hasChanges = true; - } - } - - // Add any missing clusters - for (auto clusterTypeName : _metadataParser.getClusterTypes()) - { - if (std::none_of(clusterTypes.begin(), clusterTypes.end(), - [&clusterTypeName](ClusterType::pointer clusterType) { return (clusterType->getName() == clusterTypeName); })) - { - LMS_LOG(DBUPDATER, INFO) << "Creating cluster type " << clusterTypeName; - ClusterType::create(_db.getSession(), clusterTypeName); - hasChanges = true; - } - } - - LMS_LOG(DBUPDATER, INFO) << "Checking clusters done!"; - - return hasChanges; -} - void MediaScanner::checkDuplicatedAudioFiles(Stats& stats) { diff --git a/src/scanner/MediaScanner.hpp b/src/scanner/MediaScanner.hpp index a18d0153..9102574b 100644 --- a/src/scanner/MediaScanner.hpp +++ b/src/scanner/MediaScanner.hpp @@ -28,26 +28,11 @@ #include "metadata/TagLibParser.hpp" +#include "database/ScanSettings.hpp" #include "database/DatabaseHandler.hpp" namespace Scanner { -enum class UpdatePeriod { - Never = 0, - Daily, - Weekly, - Monthly -}; - -UpdatePeriod getUpdatePeriod(Wt::Dbo::Session& session); -void setUpdatePeriod(Wt::Dbo::Session& session, UpdatePeriod updatePeriod); - -Wt::WTime getUpdateStartTime(Wt::Dbo::Session& session); -void setUpdateStartTime(Wt::Dbo::Session& session, Wt::WTime time); - -std::set getClusterTypes(Wt::Dbo::Session& session); -void setClusterTypes(Wt::Dbo::Session& session, const std::set clusterTypes); - class MediaScanner { public: @@ -93,13 +78,12 @@ class MediaScanner // Update database (scheduled callback) void scan(boost::system::error_code ec); - void scanRootDirectory( boost::filesystem::path rootDirectory, bool forceScan, Stats& stats); + void scanMediaDirectory( boost::filesystem::path mediaDirectory, bool forceScan, Stats& stats); // Helpers void refreshScanSettings(); void checkAudioFiles( Stats& stats ); - bool checkClusters(); void checkDuplicatedAudioFiles( Stats& stats ); void scanAudioFile( const boost::filesystem::path& file, bool forceScan, Stats& stats); @@ -112,9 +96,11 @@ class MediaScanner Database::Handler _db; - // Scan settings - std::vector _fileExtensions; - std::vector _rootDirectories; + // Current scan settings + Wt::WTime _startTime; + Database::ScanSettings::UpdatePeriod _updatePeriod; + std::set _fileExtensions; + boost::filesystem::path _mediaDirectory; MetaData::TagLibParser _metadataParser; diff --git a/src/ui/admin/DatabaseSettingsView.cpp b/src/ui/admin/DatabaseSettingsView.cpp index 98a1e1c7..90890588 100644 --- a/src/ui/admin/DatabaseSettingsView.cpp +++ b/src/ui/admin/DatabaseSettingsView.cpp @@ -29,8 +29,6 @@ #include #include "common/Validators.hpp" -#include "database/MediaDirectory.hpp" -#include "scanner/MediaScanner.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -80,40 +78,45 @@ class DatabaseSettingsModel : public Wt::WFormModel Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - std::vector mediaDirectories = MediaDirectory::getAll(LmsApp->getDboSession()); - if (!mediaDirectories.empty()) - setValue(MediaDirectoryField, mediaDirectories.front()->getPath().string()); + auto scanSettings = ScanSettings::get(LmsApp->getDboSession()); - auto periodRow = getUpdatePeriodModelRow( Scanner::getUpdatePeriod(LmsApp->getDboSession()) ); + setValue(MediaDirectoryField, scanSettings->getMediaDirectory()); + + auto periodRow = getUpdatePeriodModelRow( scanSettings->getUpdatePeriod() ); if (periodRow) setValue(UpdatePeriodField, updatePeriodString(*periodRow)); - auto startTimeRow = getUpdateStartTimeModelRow( Scanner::getUpdateStartTime(LmsApp->getDboSession()) ); + auto startTimeRow = getUpdateStartTimeModelRow( scanSettings->getUpdateStartTime() ); if (startTimeRow) setValue(UpdateStartTimeField, updateStartTimeString(*startTimeRow) ); - auto clusterTypes = Scanner::getClusterTypes(LmsApp->getDboSession()); + auto clusterTypes = scanSettings->getClusterTypes(); if (!clusterTypes.empty()) - setValue(TagsField, joinStrings(std::vector(clusterTypes.begin(), clusterTypes.end()), " ")); + { + std::vector names; + std::transform(clusterTypes.begin(), clusterTypes.end(),std::back_inserter(names), [](auto clusterType) { return clusterType->getName(); }); + setValue(TagsField, joinStrings(names, " ")); + } } void saveData() { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - MediaDirectory::eraseAll(LmsApp->getDboSession()); - MediaDirectory::create(LmsApp->getDboSession(), valueText(MediaDirectoryField).toUTF8()); + auto scanSettings = ScanSettings::get(LmsApp->getDboSession()); + + scanSettings.modify()->setMediaDirectory(valueText(MediaDirectoryField).toUTF8()); auto updatePeriodRow = getUpdatePeriodModelRow( valueText(UpdatePeriodField)); assert(updatePeriodRow); - Scanner::setUpdatePeriod(LmsApp->getDboSession(), updatePeriod(*updatePeriodRow)); + scanSettings.modify()->setUpdatePeriod(updatePeriod(*updatePeriodRow)); auto startTimeRow = getUpdateStartTimeModelRow( valueText(UpdateStartTimeField)); assert(startTimeRow); - Scanner::setUpdateStartTime(LmsApp->getDboSession(), updateStartTime(*startTimeRow)); + scanSettings.modify()->setUpdateStartTime(updateStartTime(*startTimeRow)); auto clusterTypes = splitString(valueText(TagsField).toUTF8(), " "); - Scanner::setClusterTypes(LmsApp->getDboSession(), std::set(clusterTypes.begin(), clusterTypes.end())); + scanSettings.modify()->setClusterTypes(std::set(clusterTypes.begin(), clusterTypes.end())); } boost::optional getUpdatePeriodModelRow(Wt::WString value) @@ -127,7 +130,7 @@ class DatabaseSettingsModel : public Wt::WFormModel return boost::none; } - boost::optional getUpdatePeriodModelRow(Scanner::UpdatePeriod period) + boost::optional getUpdatePeriodModelRow(ScanSettings::UpdatePeriod period) { for (int i = 0; i < _updatePeriodModel->rowCount(); ++i) { @@ -138,9 +141,9 @@ class DatabaseSettingsModel : public Wt::WFormModel return boost::none; } - Scanner::UpdatePeriod updatePeriod(int row) + ScanSettings::UpdatePeriod updatePeriod(int row) { - return Wt::cpp17::any_cast + return Wt::cpp17::any_cast (_updatePeriodModel->data(_updatePeriodModel->index(row, 0), Wt::ItemDataRole::User)); } @@ -200,16 +203,16 @@ class DatabaseSettingsModel : public Wt::WFormModel _updatePeriodModel = std::make_shared(); _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.never")); - _updatePeriodModel->setData(0, 0, Scanner::UpdatePeriod::Never, Wt::ItemDataRole::User); + _updatePeriodModel->setData(0, 0, ScanSettings::UpdatePeriod::Never, Wt::ItemDataRole::User); _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.daily")); - _updatePeriodModel->setData(1, 0, Scanner::UpdatePeriod::Daily, Wt::ItemDataRole::User); + _updatePeriodModel->setData(1, 0, ScanSettings::UpdatePeriod::Daily, Wt::ItemDataRole::User); _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.weekly")); - _updatePeriodModel->setData(2, 0, Scanner::UpdatePeriod::Weekly, Wt::ItemDataRole::User); + _updatePeriodModel->setData(2, 0, ScanSettings::UpdatePeriod::Weekly, Wt::ItemDataRole::User); _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.monthly")); - _updatePeriodModel->setData(3, 0, Scanner::UpdatePeriod::Monthly, Wt::ItemDataRole::User); + _updatePeriodModel->setData(3, 0, ScanSettings::UpdatePeriod::Monthly, Wt::ItemDataRole::User); _updateStartTimeModel = std::make_shared(); diff --git a/tools/metadata/Makefile.am b/tools/metadata/Makefile.am index cded72b1..f61b517d 100644 --- a/tools/metadata/Makefile.am +++ b/tools/metadata/Makefile.am @@ -4,8 +4,7 @@ lms_metadata_SOURCES = \ $(srcdir)/LmsMetadata.cpp \ $(top_srcdir)/src/utils/Logger.cpp \ $(top_srcdir)/src/utils/Utils.cpp \ - $(top_srcdir)/src/metadata/TagLibParser.cpp \ - $(top_srcdir)/src/metadata/MetaData.cpp + $(top_srcdir)/src/metadata/TagLibParser.cpp lms_metadata_CXXFLAGS=-std=c++14 -Wall -I$(top_srcdir)/src -D_REENTRANT From db24d339c37b1e71df10dd11a16fa28a931bfdc0 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 24 May 2018 13:22:32 +0200 Subject: [PATCH 135/195] Remove the per view tags selection --- src/Makefile.am | 2 -- src/database/ScanSettings.hpp | 1 - src/ui/explore/ArtistView.cpp | 19 +----------- src/ui/explore/ArtistsView.cpp | 18 +----------- src/ui/explore/ExploreUtils.cpp | 51 --------------------------------- src/ui/explore/ExploreUtils.hpp | 29 ------------------- src/ui/explore/ReleaseView.cpp | 20 +------------ src/ui/explore/ReleasesView.cpp | 18 +----------- src/ui/explore/TracksView.cpp | 20 +------------ 9 files changed, 5 insertions(+), 173 deletions(-) delete mode 100644 src/ui/explore/ExploreUtils.cpp delete mode 100644 src/ui/explore/ExploreUtils.hpp diff --git a/src/Makefile.am b/src/Makefile.am index 7c5889d0..663e56cc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,6 @@ lms_SOURCES = \ $(srcdir)/database/Playlist.cpp \ $(srcdir)/database/Release.cpp \ $(srcdir)/database/ScanSettings.cpp \ - $(srcdir)/database/Setting.cpp \ $(srcdir)/database/SqlQuery.cpp \ $(srcdir)/database/Track.cpp \ $(srcdir)/database/User.cpp \ @@ -33,7 +32,6 @@ lms_SOURCES = \ $(srcdir)/ui/explore/ArtistView.cpp \ $(srcdir)/ui/explore/ArtistsView.cpp \ $(srcdir)/ui/explore/Explore.cpp \ - $(srcdir)/ui/explore/ExploreUtils.cpp \ $(srcdir)/ui/explore/Filters.cpp \ $(srcdir)/ui/explore/ReleasesView.cpp \ $(srcdir)/ui/explore/ReleaseView.cpp \ diff --git a/src/database/ScanSettings.hpp b/src/database/ScanSettings.hpp index c478fa3f..cdc1ef0e 100644 --- a/src/database/ScanSettings.hpp +++ b/src/database/ScanSettings.hpp @@ -27,7 +27,6 @@ namespace Database { class ClusterType; -// class meant to store general settings class ScanSettings : public Wt::Dbo::Dbo { public: diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index e308d009..665b98a6 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -34,31 +34,14 @@ #include "LmsApplication.hpp" #include "Filters.hpp" -#include "ExploreUtils.hpp" using namespace Database; -namespace { - -const std::string artistClusterTypesSetting = "artist_cluster_types"; -const std::set defaultArtistClusterTypes = -{ - "GENRE", - "ALBUMGROUPING", - "ALBUMMOOD", - "COMMENT:SONGS-DB_OCCASION", -}; - -} // namespace - namespace UserInterface { Artist::Artist(Filters* filters) : _filters(filters) { - if (!Setting::exists(LmsApp->getDboSession(), artistClusterTypesSetting)) - setClusterTypesToSetting(artistClusterTypesSetting, defaultArtistClusterTypes); - wApp->internalPathChanged().connect(std::bind([=] { refresh(); @@ -98,7 +81,7 @@ Artist::refresh() Wt::WContainerWidget* clusterContainers = t->bindNew("clusters"); { - auto clusterTypes = getClusterTypesFromSetting(artistClusterTypesSetting); + auto clusterTypes = ScanSettings::get(LmsApp->getDboSession())->getClusterTypes(); auto clusterGroups = artist->getClusterGroups(clusterTypes, 3); for (auto clusters : clusterGroups) diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index 4ca9a617..201cbc65 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -31,31 +31,15 @@ #include "LmsApplication.hpp" #include "Filters.hpp" -#include "ExploreUtils.hpp" using namespace Database; -namespace { - -const std::string artistsClusterTypesSetting = "artists_cluster_types"; -const std::set defaultArtistsClusterTypes = -{ - "ALBUMGROUPING", - "GENRE", - "ALBUMMOOD", -}; - -} - namespace UserInterface { Artists::Artists(Filters* filters) : Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template")), _filters(filters) { - if (!Setting::exists(LmsApp->getDboSession(), artistsClusterTypesSetting)) - setClusterTypesToSetting(artistsClusterTypesSetting, defaultArtistsClusterTypes); - addFunction("tr", &Wt::WTemplate::Functions::tr); _search = bindNew("search"); @@ -109,7 +93,7 @@ Artists::addSome() Wt::WContainerWidget* clusterContainers = entry->bindNew("clusters"); { - auto clusterTypes = getClusterTypesFromSetting(artistsClusterTypesSetting); + auto clusterTypes = ScanSettings::get(LmsApp->getDboSession())->getClusterTypes(); auto clusterGroups = artist->getClusterGroups(clusterTypes, 1); for (auto clusters : clusterGroups) diff --git a/src/ui/explore/ExploreUtils.cpp b/src/ui/explore/ExploreUtils.cpp deleted file mode 100644 index 6ecaeccc..00000000 --- a/src/ui/explore/ExploreUtils.cpp +++ /dev/null @@ -1,51 +0,0 @@ - -/* - * 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 . - */ - -#include "ExploreUtils.hpp" - -#include "utils/Utils.hpp" - -#include "database/Setting.hpp" - -#include "LmsApplication.hpp" - -namespace UserInterface { - -std::vector getClusterTypesFromSetting(std::string setting) -{ - std::vector 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& clusterTypes) -{ - std::vector vec(clusterTypes.begin(), clusterTypes.end()); - Database::Setting::setString(LmsApp->getDboSession(), setting, joinStrings(vec, " ")); -} - -} // namespace UserInterface - diff --git a/src/ui/explore/ExploreUtils.hpp b/src/ui/explore/ExploreUtils.hpp deleted file mode 100644 index f805a480..00000000 --- a/src/ui/explore/ExploreUtils.hpp +++ /dev/null @@ -1,29 +0,0 @@ - -/* - * 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 . - */ - -#include "database/Cluster.hpp" - -namespace UserInterface { - -std::vector getClusterTypesFromSetting(std::string setting); - -void setClusterTypesToSetting(std::string setting, const std::set& clusterTypes); - -} // namespace UserInterface diff --git a/src/ui/explore/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp index 8efc7560..04e41297 100644 --- a/src/ui/explore/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -26,7 +26,6 @@ #include #include "database/Release.hpp" -#include "database/Setting.hpp" #include "database/Track.hpp" #include "utils/Logger.hpp" @@ -36,31 +35,14 @@ #include "LmsApplication.hpp" #include "Filters.hpp" -#include "ExploreUtils.hpp" using namespace Database; -namespace { - -const std::string releaseClusterTypesSetting = "release_cluster_types"; -const std::set defaultReleaseClusterTypes = -{ - "GENRE", - "ALBUMGROUPING", - "ALBUMMOOD", - "COMMENT:SONGS-DB_OCCASION", -}; - -} // namespace - namespace UserInterface { Release::Release(Filters* filters) : _filters(filters) { - if (!Setting::exists(LmsApp->getDboSession(), releaseClusterTypesSetting)) - setClusterTypesToSetting(releaseClusterTypesSetting, defaultReleaseClusterTypes); - wApp->internalPathChanged().connect(std::bind([=] { refresh(); @@ -131,7 +113,7 @@ Release::refresh() Wt::WContainerWidget* clusterContainers = t->bindNew("clusters"); { - auto clusterTypes = getClusterTypesFromSetting(releaseClusterTypesSetting); + auto clusterTypes = ScanSettings::get(LmsApp->getDboSession())->getClusterTypes(); auto clusterGroups = release->getClusterGroups(clusterTypes, 3); for (auto clusters : clusterGroups) diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index 81bddc25..c823a79f 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -26,7 +26,6 @@ #include #include "database/Release.hpp" -#include "database/Setting.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -35,30 +34,15 @@ #include "LmsApplication.hpp" #include "Filters.hpp" -#include "ExploreUtils.hpp" using namespace Database; -namespace { - -const std::string releasesClusterTypesSetting = "releases_cluster_types"; -const std::set defaultReleasesClusterTypes = -{ - "GENRE", - "ALBUMGROUPING", -}; - -} // namespace - namespace UserInterface { Releases::Releases(Filters* filters) : Wt::WTemplate(Wt::WString::tr("Lms.Explore.Releases.template")), _filters(filters) { - if (!Setting::exists(LmsApp->getDboSession(), releasesClusterTypesSetting)) - setClusterTypesToSetting(releasesClusterTypesSetting, defaultReleasesClusterTypes); - addFunction("tr", &Wt::WTemplate::Functions::tr); _search = bindNew("search"); @@ -126,7 +110,7 @@ Releases::addSome() Wt::WContainerWidget* clusterContainers = entry->bindNew("clusters"); { - auto clusterTypes = getClusterTypesFromSetting(releasesClusterTypesSetting); + auto clusterTypes = ScanSettings::get(LmsApp->getDboSession())->getClusterTypes(); auto clusterGroups = release->getClusterGroups(clusterTypes, 1); for (auto clusters : clusterGroups) diff --git a/src/ui/explore/TracksView.cpp b/src/ui/explore/TracksView.cpp index 7889499b..00dbef25 100644 --- a/src/ui/explore/TracksView.cpp +++ b/src/ui/explore/TracksView.cpp @@ -26,7 +26,6 @@ #include "database/Artist.hpp" #include "database/Release.hpp" -#include "database/Setting.hpp" #include "database/Track.hpp" #include "utils/Logger.hpp" @@ -36,32 +35,15 @@ #include "LmsApplication.hpp" #include "Filters.hpp" -#include "ExploreUtils.hpp" using namespace Database; -namespace { - -const std::string trackClusterTypesSetting = "track_cluster_types"; -const std::set 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("search"); @@ -154,7 +136,7 @@ Tracks::addSome() Wt::WContainerWidget* clusterContainers = entry->bindNew("clusters"); { - auto clusterTypes = getClusterTypesFromSetting(trackClusterTypesSetting); + auto clusterTypes = ScanSettings::get(LmsApp->getDboSession())->getClusterTypes(); auto clusterGroups = track->getClusterGroups(clusterTypes, 1); for (auto clusters : clusterGroups) From ee966448cee302c3540f221b53d772f315bcb75d Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 24 May 2018 13:39:46 +0200 Subject: [PATCH 136/195] Add a tooltip for each tag --- src/ui/LmsApplication.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index d847964b..1cc95977 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -184,6 +184,7 @@ LmsApplication::createCluster(Database::Cluster::pointer cluster, bool canDelete res->setCondition("if-can-delete", canDelete); res->setStyleClass("Lms-cluster"); + res->setToolTip(cluster->getType()->getName(), Wt::TextFormat::Plain); return res; } From ed17769808e68b3ca9929d8781d2c8784dde94d0 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 24 May 2018 14:07:47 +0200 Subject: [PATCH 137/195] Fixed regression --- src/ui/admin/DatabaseSettingsView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/admin/DatabaseSettingsView.cpp b/src/ui/admin/DatabaseSettingsView.cpp index 90890588..86cc91a9 100644 --- a/src/ui/admin/DatabaseSettingsView.cpp +++ b/src/ui/admin/DatabaseSettingsView.cpp @@ -80,7 +80,7 @@ class DatabaseSettingsModel : public Wt::WFormModel auto scanSettings = ScanSettings::get(LmsApp->getDboSession()); - setValue(MediaDirectoryField, scanSettings->getMediaDirectory()); + setValue(MediaDirectoryField, scanSettings->getMediaDirectory().string()); auto periodRow = getUpdatePeriodModelRow( scanSettings->getUpdatePeriod() ); if (periodRow) From a087f470a7a4c01235399593bfb99821a4ade4a8 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 24 May 2018 14:08:13 +0200 Subject: [PATCH 138/195] Add a scan version field for each scanned track --- src/database/ScanSettings.cpp | 6 ++++++ src/database/ScanSettings.hpp | 3 +++ src/database/Track.hpp | 38 +++++++++++++++++++---------------- src/scanner/MediaScanner.cpp | 18 ++++++++--------- src/scanner/MediaScanner.hpp | 1 + 5 files changed, 40 insertions(+), 26 deletions(-) diff --git a/src/database/ScanSettings.cpp b/src/database/ScanSettings.cpp index 2e05e377..e265c956 100644 --- a/src/database/ScanSettings.cpp +++ b/src/database/ScanSettings.cpp @@ -77,6 +77,7 @@ ScanSettings::setMediaDirectory(boost::filesystem::path p) void ScanSettings::setClusterTypes(const std::set& clusterTypeNames) { + bool needRescan = false; assert(session()); // Backup the old list @@ -91,6 +92,7 @@ ScanSettings::setClusterTypes(const std::set& clusterTypeNames) { LMS_LOG(DB, INFO) << "Creating cluster type " << clusterTypeName; clusterType = ClusterType::create(*session(), clusterTypeName); + needRescan = true; } _clusterTypes.insert(clusterType); } @@ -103,8 +105,12 @@ ScanSettings::setClusterTypes(const std::set& clusterTypeNames) { LMS_LOG(DB, INFO) << "Deleting cluster type " << oldClusterType->getName(); oldClusterType.remove(); + needRescan = true; } } + + if (needRescan) + _scanVersion += 1; } } // namespace Database diff --git a/src/database/ScanSettings.hpp b/src/database/ScanSettings.hpp index cdc1ef0e..a8bc39c2 100644 --- a/src/database/ScanSettings.hpp +++ b/src/database/ScanSettings.hpp @@ -44,6 +44,7 @@ class ScanSettings : public Wt::Dbo::Dbo static pointer get(Wt::Dbo::Session& session); // Getters + std::size_t getScanVersion() const { return _scanVersion; } boost::filesystem::path getMediaDirectory() const { return _mediaDirectory; } Wt::WTime getUpdateStartTime() const { return _startTime; } UpdatePeriod getUpdatePeriod() const { return _updatePeriod; } @@ -60,6 +61,7 @@ class ScanSettings : public Wt::Dbo::Dbo template void persist(Action& a) { + Wt::Dbo::field(a, _scanVersion, "scan_version"); Wt::Dbo::field(a, _mediaDirectory, "media_directory"); Wt::Dbo::field(a, _startTime, "start_time"); Wt::Dbo::field(a, _updatePeriod, "update_period"); @@ -69,6 +71,7 @@ class ScanSettings : public Wt::Dbo::Dbo private: + int _scanVersion = 0; std::string _mediaDirectory = ""; Wt::WTime _startTime = Wt::WTime(0,0,0); UpdatePeriod _updatePeriod = UpdatePeriod::Never; diff --git a/src/database/Track.hpp b/src/database/Track.hpp index cb619296..e1acb8ee 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -81,6 +81,7 @@ class Track : public Wt::Dbo::Dbo static void removeClusters(std::string type); // Accessors + void setScanVersion(std::size_t version) {_scanVersion = version; } void setTrackNumber(int num) { _trackNumber = num; } void setTotalTrackNumber(int num) { _totalTrackNumber = num; } void setDiscNumber(int num) { _discNumber = num; } @@ -98,29 +99,31 @@ class Track : public Wt::Dbo::Dbo void setArtist(Wt::Dbo::ptr artist) { _artist = artist; } void setRelease(Wt::Dbo::ptr release) { _release = release; } - boost::optional getTrackNumber(void) const; - boost::optional getTotalTrackNumber(void) const; - boost::optional getDiscNumber(void) const; - boost::optional getTotalDiscNumber(void) const; - std::string getName(void) const { return _name; } - boost::filesystem::path getPath(void) const { return _filePath; } - std::chrono::milliseconds getDuration(void) const { return _duration; } - boost::optional getYear(void) const; - boost::optional getOriginalYear(void) const; - Wt::WDateTime getLastWriteTime(void) const { return _fileLastWrite; } - Wt::WDateTime getAddedTime(void) const { return _fileAdded; } - const std::vector& getChecksum(void) const { return _fileChecksum; } - CoverType getCoverType(void) const { return _coverType; } - const std::string& getMBID(void) const { return _MBID; } - Wt::Dbo::ptr getArtist(void) const { return _artist; } - Wt::Dbo::ptr getRelease(void) const { return _release; } - std::vector> getClusters(void) const; + std::size_t getScanVersion() const { return _scanVersion; } + boost::optional getTrackNumber() const; + boost::optional getTotalTrackNumber() const; + boost::optional getDiscNumber() const; + boost::optional getTotalDiscNumber() const; + std::string getName() const { return _name; } + boost::filesystem::path getPath() const { return _filePath; } + std::chrono::milliseconds getDuration() const { return _duration; } + boost::optional getYear() const; + boost::optional getOriginalYear() const; + Wt::WDateTime getLastWriteTime() const { return _fileLastWrite; } + Wt::WDateTime getAddedTime() const { return _fileAdded; } + const std::vector& getChecksum() const { return _fileChecksum; } + CoverType getCoverType() const { return _coverType; } + const std::string& getMBID() const { return _MBID; } + Wt::Dbo::ptr getArtist() const { return _artist; } + Wt::Dbo::ptr getRelease() const { return _release; } + std::vector> getClusters() const; std::vector>> getClusterGroups(std::vector> clusterTypes, std::size_t size) const; template void persist(Action& a) { + Wt::Dbo::field(a, _scanVersion, "scan_version"); Wt::Dbo::field(a, _trackNumber, "track_number"); Wt::Dbo::field(a, _totalTrackNumber, "total_track_number"); Wt::Dbo::field(a, _discNumber, "disc_number"); @@ -146,6 +149,7 @@ class Track : public Wt::Dbo::Dbo static const std::size_t _maxNameLength = 128; + int _scanVersion = 0; int _trackNumber = 0; int _totalTrackNumber = 0; int _discNumber = 0; diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index d652f6af..6e5d0f83 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -345,6 +345,7 @@ MediaScanner::refreshScanSettings() auto scanSettings = ScanSettings::get(_db.getSession()); + _scanVersion = scanSettings->getScanVersion(); _startTime = scanSettings->getUpdateStartTime(); _updatePeriod = scanSettings->getUpdatePeriod(); @@ -369,16 +370,14 @@ MediaScanner::scanAudioFile(const boost::filesystem::path& file, bool forceScan, if (!forceScan) { // Skip file if last write is the same + Wt::Dbo::Transaction transaction(_db.getSession()); + + Wt::Dbo::ptr track = Track::getByPath(_db.getSession(), file); + + if (track && track->getLastWriteTime() == lastWriteTime && track->getScanVersion() == _scanVersion) { - Wt::Dbo::Transaction transaction(_db.getSession()); - - Wt::Dbo::ptr track = Track::getByPath(_db.getSession(), file); - - if (track && track->getLastWriteTime() == lastWriteTime) - { - stats.skips++; - return; - } + stats.skips++; + return; } } @@ -508,6 +507,7 @@ MediaScanner::scanAudioFile(const boost::filesystem::path& file, bool forceScan, assert(track); + track.modify()->setScanVersion(_scanVersion); track.modify()->setChecksum(checksum); track.modify()->setArtist(artist); track.modify()->setRelease(release); diff --git a/src/scanner/MediaScanner.hpp b/src/scanner/MediaScanner.hpp index 9102574b..3e9309d8 100644 --- a/src/scanner/MediaScanner.hpp +++ b/src/scanner/MediaScanner.hpp @@ -97,6 +97,7 @@ class MediaScanner Database::Handler _db; // Current scan settings + std::size_t _scanVersion; Wt::WTime _startTime; Database::ScanSettings::UpdatePeriod _updatePeriod; std::set _fileExtensions; From 26d2065180a74c2124f4514e6102af971f8a09e8 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 24 May 2018 20:54:31 +0200 Subject: [PATCH 139/195] Do not drop all clusters when updating the scan settings --- approot/messages.xml | 2 +- src/database/ScanSettings.cpp | 12 ++++-------- src/scanner/MediaScanner.cpp | 24 +++++++++++------------- src/ui/LmsApplication.cpp | 1 + 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/approot/messages.xml b/approot/messages.xml index 2b203b94..7c8d693f 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -24,7 +24,7 @@ Monthly Never Media root directory -Scan complete: {1} total files, {2} additions, {3} deletions, {4} duplicates, {5} errors +Scan complete: {1} total files, {2} additions, {3} updates, {4} deletions, {5} duplicates, {6} errors Scan launched! Scan options New settings saved! diff --git a/src/database/ScanSettings.cpp b/src/database/ScanSettings.cpp index e265c956..19e251f2 100644 --- a/src/database/ScanSettings.cpp +++ b/src/database/ScanSettings.cpp @@ -80,10 +80,6 @@ ScanSettings::setClusterTypes(const std::set& clusterTypeNames) bool needRescan = false; assert(session()); - // Backup the old list - std::vector oldClusterTypes(_clusterTypes.begin(), _clusterTypes.end()); - - _clusterTypes.clear(); // Create any missing cluster type for (auto clusterTypeName : clusterTypeNames) { @@ -98,13 +94,13 @@ ScanSettings::setClusterTypes(const std::set& clusterTypeNames) } // Delete no longer existing cluster types - for (auto oldClusterType : oldClusterTypes) + for (auto clusterType : _clusterTypes) { if (std::none_of(clusterTypeNames.begin(), clusterTypeNames.end(), - [oldClusterType](const std::string& name) { return name == oldClusterType->getName(); })) + [clusterType](const std::string& name) { return name == clusterType->getName(); })) { - LMS_LOG(DB, INFO) << "Deleting cluster type " << oldClusterType->getName(); - oldClusterType.remove(); + LMS_LOG(DB, INFO) << "Deleting cluster type " << clusterType->getName(); + clusterType.remove(); needRescan = true; } } diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 6e5d0f83..f2bcf716 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -345,6 +345,8 @@ MediaScanner::refreshScanSettings() auto scanSettings = ScanSettings::get(_db.getSession()); + LMS_LOG(DBUPDATER, INFO) << "Using scan settings version " << scanSettings->getScanVersion(); + _scanVersion = scanSettings->getScanVersion(); _startTime = scanSettings->getUpdateStartTime(); _updatePeriod = scanSettings->getUpdatePeriod(); @@ -607,21 +609,18 @@ checkFile(const boost::filesystem::path& p, boost::filesystem::path mediaDirecto if (!boost::filesystem::exists( p ) || !boost::filesystem::is_regular( p ) ) { - LMS_LOG(DBUPDATER, INFO) << "Missing file '" << p.string() << "'"; + LMS_LOG(DBUPDATER, INFO) << "Removing '" << p.string() << "': missing"; status = false; } - else + else if (!isPathInParentPath(p, mediaDirectory)) { - if (!isPathInParentPath(p, mediaDirectory)) - { - LMS_LOG(DBUPDATER, INFO) << "File '" << p.string() << "' is out of media directory '"; - status = false; - } - else if (!isFileSupported(p, extensions)) - { - LMS_LOG(DBUPDATER, INFO) << "File format no longer supported for '" << p.string() << "'"; - status = false; - } + LMS_LOG(DBUPDATER, INFO) << "Removing '" << p.string() << "': out of media directory"; + status = false; + } + else if (!isFileSupported(p, extensions)) + { + LMS_LOG(DBUPDATER, INFO) << "Removing '" << p.string() << "': file format no longer handled"; + status = false; } return status; @@ -632,7 +631,6 @@ checkFile(const boost::filesystem::path& p, boost::filesystem::path mediaDirecto LMS_LOG(DBUPDATER, ERROR) << "Caught exception while checking file '" << p.string() << "': " << e.what(); return false; } - } void diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 1cc95977..41295e9b 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -401,6 +401,7 @@ LmsApplication::handleAuthEvent(void) notifyMsg(Wt::WString::tr("Lms.Admin.Database.scan-complete") .arg(static_cast(stats.nbFiles())) .arg(static_cast(stats.additions)) + .arg(static_cast(stats.updates)) .arg(static_cast(stats.deletions)) .arg(static_cast(stats.nbDuplicates())) .arg(static_cast(stats.nbErrors()))); From b92717fa4f4beef48b9efc0e6a29f15bc3a693c7 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 25 May 2018 23:10:25 +0200 Subject: [PATCH 140/195] Added some notifications when queing/playing files --- approot/messages.xml | 2 ++ src/ui/PlayQueueView.cpp | 14 +++++++++++--- src/ui/PlayQueueView.hpp | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/approot/messages.xml b/approot/messages.xml index 7c8d693f..f1e6febe 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -70,6 +70,8 @@ Play Queue {1} tracks +Added {1} tracks +Playing {1} tracks Account diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index bc2f00fe..ed27df15 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -165,7 +165,7 @@ PlayQueue::updateCurrentTrack(bool selected) } void -PlayQueue::addTracks(const std::vector& tracks) +PlayQueue::enqueueTracks(const std::vector& tracks) { // Use a "session" playqueue in order to store the current playqueue // so that the user can disconnect and get its playqueue back @@ -181,6 +181,13 @@ PlayQueue::addTracks(const std::vector& tracks) addSome(); } +void +PlayQueue::addTracks(const std::vector& tracks) +{ + enqueueTracks(tracks); + LmsApp->notifyMsg(Wt::WString::tr("Lms.PlayQueue.nb-tracks-added").arg(tracks.size())); +} + void PlayQueue::playTracks(const std::vector& tracks) { @@ -193,9 +200,10 @@ PlayQueue::playTracks(const std::vector& tracks) _entriesContainer->clear(); - addTracks(tracks); - + enqueueTracks(tracks); play(0); + + LmsApp->notifyMsg(Wt::WString::tr("Lms.PlayQueue.nb-tracks-playing").arg(tracks.size())); } diff --git a/src/ui/PlayQueueView.hpp b/src/ui/PlayQueueView.hpp index 9249073d..b2652bb8 100644 --- a/src/ui/PlayQueueView.hpp +++ b/src/ui/PlayQueueView.hpp @@ -51,6 +51,7 @@ class PlayQueue : public Wt::WTemplate Wt::Signal<> playbackStop; private: + void enqueueTracks(const std::vector& tracks); void addSome(); void updateInfo(); void updateCurrentTrack(bool selected); From e0ae294abf44149c359fbcef2c0cecaf5fceac5b Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 30 May 2018 13:35:49 +0200 Subject: [PATCH 141/195] Adding basic radio mode --- approot/messages.xml | 3 ++- approot/playqueue.xml | 1 + src/database/Cluster.cpp | 23 +++++++++++++---- src/database/Cluster.hpp | 2 ++ src/database/Playlist.cpp | 30 +++++++++++++++++++++- src/database/Playlist.hpp | 11 +++++++-- src/ui/PlayQueueView.cpp | 52 +++++++++++++++++++++++++++++++++++++++ src/ui/PlayQueueView.hpp | 4 +++ 8 files changed, 117 insertions(+), 9 deletions(-) diff --git a/approot/messages.xml b/approot/messages.xml index f1e6febe..75297f4f 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -68,10 +68,11 @@ Various artists -Play Queue {1} tracks Added {1} tracks Playing {1} tracks +Play Queue +Radio mode Account diff --git a/approot/playqueue.xml b/approot/playqueue.xml index 81bb710c..4b26bd9d 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -11,6 +11,7 @@

${tr:Lms.PlayQueue.playqueue}

${nb-tracks} ${clear-btn} + ${radio-mode}
${entries} ${show-more} diff --git a/src/database/Cluster.cpp b/src/database/Cluster.cpp index 5468cd46..136c48e9 100644 --- a/src/database/Cluster.cpp +++ b/src/database/Cluster.cpp @@ -57,6 +57,24 @@ Cluster::getById(Wt::Dbo::Session& session, IdType id) return session.find().where("id = ?").bind(id); } +void +Cluster::addTrack(Wt::Dbo::ptr track) +{ + _tracks.insert(track); +} + +std::vector> +Cluster::getTracks(int offset, int limit) const +{ + Wt::Dbo::collection res = session()->query("select t from track t INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id") + .where("c.id = ?").bind(self()->id()) + .offset(offset) + .limit(limit); + + return std::vector>(res.begin(), res.end()); +} + + ClusterType::ClusterType(std::string name) : _name(name) { @@ -117,11 +135,6 @@ ClusterType::getClusters() const return std::vector(res.begin(), res.end()); } -void -Cluster::addTrack(Wt::Dbo::ptr track) -{ - _tracks.insert(track); -} } // namespace Database diff --git a/src/database/Cluster.hpp b/src/database/Cluster.hpp index 65c1d68f..ba7965a3 100644 --- a/src/database/Cluster.hpp +++ b/src/database/Cluster.hpp @@ -53,6 +53,8 @@ class Cluster : public Wt::Dbo::Dbo const std::string& getName(void) const { return _name; } Wt::Dbo::ptr getType() const { return _clusterType; } const Wt::Dbo::collection>& getTracks() const { return _tracks; } + std::size_t getTrackCount() const { return _tracks.size(); } + std::vector> getTracks(int offset, int limit) const; void addTrack(Wt::Dbo::ptr track); diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index ca5cccd1..17d55eab 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -20,6 +20,7 @@ #include +#include "Cluster.hpp" #include "User.hpp" #include "Track.hpp" @@ -50,7 +51,7 @@ PlaylistEntry::PlaylistEntry() } PlaylistEntry::pointer -PlaylistEntry::getById(Wt::Dbo::Session& session, PlaylistEntry::id_type id) +PlaylistEntry::getById(Wt::Dbo::Session& session, IdType id) { return session.find().where("id = ?").bind(id); } @@ -133,4 +134,31 @@ Playlist::getCount() const return _entries.size(); } +std::vector> +Playlist::getClusters() const +{ + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection res = session()->query("SELECT c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN playlist_entry p_e ON p_e.track_id = t.id INNER JOIN playlist p ON p.id = p_e.playlist_id") + .where("p.id = ?").bind(self()->id()) + .groupBy("c.id") + .orderBy("COUNT(c.id) DESC"); + + return std::vector>(res.begin(), res.end()); +} + +bool +Playlist::hasTrack(IdType trackId) const +{ + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection res = session()->query("SELECT p_e from playlist_entry p_e INNER JOIN playlist p ON p_e.playlist_id = p.id") + .where("p_e.track_id = ?").bind(trackId); + + return res.size() > 0; +} + + } // namespace Database diff --git a/src/database/Playlist.hpp b/src/database/Playlist.hpp index b9840fc9..27135c9d 100644 --- a/src/database/Playlist.hpp +++ b/src/database/Playlist.hpp @@ -23,11 +23,14 @@ #include +#include "Types.hpp" + namespace Database { class PlaylistEntry; class User; class Track; +class Cluster; class Playlist : public Wt::Dbo::Dbo { @@ -56,6 +59,11 @@ class Playlist : public Wt::Dbo::Dbo Wt::Dbo::ptr getEntry(std::size_t pos) const; std::vector> getEntries(int offset, int size, bool& moreResults) const; + // Get clusters, order by occurence + std::vector> getClusters() const; + + bool hasTrack(IdType trackId) const; + template void persist(Action& a) { @@ -79,12 +87,11 @@ class PlaylistEntry public: using pointer = Wt::Dbo::ptr; - using id_type = Wt::Dbo::dbo_traits::IdType; PlaylistEntry(); PlaylistEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr playlist); - static pointer getById(Wt::Dbo::Session& session, id_type id); + static pointer getById(Wt::Dbo::Session& session, IdType id); // Create utility static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr playlist); diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index ed27df15..824a2e9e 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -19,6 +19,8 @@ #include "PlayQueueView.hpp" +#include + #include #include #include @@ -46,6 +48,8 @@ PlayQueue::PlayQueue() _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); _showMore->setHidden(true); + _radioMode = bindNew("radio-mode", Wt::WString::tr("Lms.PlayQueue.radio-mode")); + _nbTracks = bindNew("nb-tracks"); { @@ -107,6 +111,10 @@ PlayQueue::play(std::size_t pos) return; } + // If last and radio mode, fill the next song + if (_radioMode->checkState() == Wt::CheckState::Checked && pos == playlist->getCount() - 1) + addRadioTrack(); + _trackPos = pos; trackId = playlist->getEntry(*_trackPos)->getTrack().id(); updateCurrentTrack(true); @@ -181,6 +189,12 @@ PlayQueue::enqueueTracks(const std::vector& tracks) addSome(); } +void +PlayQueue::enqueueTrack(Database::Track::pointer track) +{ + enqueueTracks(std::vector(1, track)); +} + void PlayQueue::addTracks(const std::vector& tracks) { @@ -274,5 +288,43 @@ PlayQueue::addSome() _showMore->setHidden(!moreResults); } +void +PlayQueue::addRadioTrack() +{ + auto now = std::chrono::system_clock::now(); + std::mt19937 randGenerator(std::chrono::duration_cast(now.time_since_epoch()).count()); + + LMS_LOG(UI, INFO) << "Radio mode: adding track"; + + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); + + // Get all the tracks of the playlist, get the cluster that is mostly used + // and reuse it to get the next track + auto clusters = playlist->getClusters(); + if (clusters.empty()) + return; + + for (auto cluster : clusters) + { + LMS_LOG(UI, DEBUG) << "Processing cluster '" << cluster->getName() << "'"; + + auto nbTracks = cluster->getTrackCount(); + if (nbTracks == 0) + continue; + + std::uniform_int_distribution dist(0, nbTracks - 1); + + auto trackToAdd = cluster->getTracks(dist(randGenerator), 1).front(); + + if (!playlist->hasTrack(trackToAdd.id())) + { + enqueueTrack(trackToAdd); + return; + } + } + + LMS_LOG(UI, INFO) << "No more track to be added!"; +} + } // namespace UserInterface diff --git a/src/ui/PlayQueueView.hpp b/src/ui/PlayQueueView.hpp index b2652bb8..dfee6f6d 100644 --- a/src/ui/PlayQueueView.hpp +++ b/src/ui/PlayQueueView.hpp @@ -19,6 +19,7 @@ #pragma once +#include #include #include #include @@ -52,13 +53,16 @@ class PlayQueue : public Wt::WTemplate private: void enqueueTracks(const std::vector& tracks); + void enqueueTrack(Database::Track::pointer track); void addSome(); + void addRadioTrack(); void updateInfo(); void updateCurrentTrack(bool selected); void play(std::size_t pos); void stop(); + Wt::WCheckBox* _radioMode; Wt::WContainerWidget* _entriesContainer; Wt::WTemplate* _showMore; Wt::WText* _nbTracks; From fff899cecb7c90ba197020651da56aaeae67f9c9 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 31 May 2018 20:43:09 +0200 Subject: [PATCH 142/195] Better radio mode --- src/database/Cluster.cpp | 13 +++++++++++++ src/database/Cluster.hpp | 4 ++-- src/database/Playlist.cpp | 16 +++++++++++++++- src/database/Playlist.hpp | 1 + src/scanner/MediaScanner.cpp | 2 +- src/ui/PlayQueueView.cpp | 33 +++++++++++++++++---------------- 6 files changed, 49 insertions(+), 20 deletions(-) diff --git a/src/database/Cluster.cpp b/src/database/Cluster.cpp index 136c48e9..102e6f5e 100644 --- a/src/database/Cluster.cpp +++ b/src/database/Cluster.cpp @@ -74,6 +74,19 @@ Cluster::getTracks(int offset, int limit) const return std::vector>(res.begin(), res.end()); } +std::set +Cluster::getTrackIds() const +{ + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection res = session()->query("SELECT t_c.track_id from track_cluster t_c INNER JOIN cluster c ON c.id = t_c.cluster_id") + .where("c.id = ?").bind(self()->id()); + + return std::set(res.begin(), res.end()); + +} + ClusterType::ClusterType(std::string name) : _name(name) diff --git a/src/database/Cluster.hpp b/src/database/Cluster.hpp index ba7965a3..04b96279 100644 --- a/src/database/Cluster.hpp +++ b/src/database/Cluster.hpp @@ -52,9 +52,9 @@ class Cluster : public Wt::Dbo::Dbo // Accessors const std::string& getName(void) const { return _name; } Wt::Dbo::ptr getType() const { return _clusterType; } - const Wt::Dbo::collection>& getTracks() const { return _tracks; } - std::size_t getTrackCount() const { return _tracks.size(); } + std::size_t getCount() const { return _tracks.size(); } std::vector> getTracks(int offset, int limit) const; + std::set getTrackIds() const; void addTrack(Wt::Dbo::ptr track); diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index 17d55eab..341bc368 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -155,10 +155,24 @@ Playlist::hasTrack(IdType trackId) const assert(IdIsValid(self()->id())); Wt::Dbo::collection res = session()->query("SELECT p_e from playlist_entry p_e INNER JOIN playlist p ON p_e.playlist_id = p.id") - .where("p_e.track_id = ?").bind(trackId); + .where("p_e.track_id = ?").bind(trackId) + .where("p.id = ?").bind(self()->id()); return res.size() > 0; } +std::vector +Playlist::getTrackIds() const +{ + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection res = session()->query("SELECT p_e.track_id from playlist_entry p_e INNER JOIN playlist p ON p_e.playlist_id = p.id") + .where("p.id = ?").bind(self()->id()); + + return std::vector(res.begin(), res.end()); + +} + } // namespace Database diff --git a/src/database/Playlist.hpp b/src/database/Playlist.hpp index 27135c9d..904f3ae3 100644 --- a/src/database/Playlist.hpp +++ b/src/database/Playlist.hpp @@ -58,6 +58,7 @@ class Playlist : public Wt::Dbo::Dbo std::size_t getCount() const; Wt::Dbo::ptr getEntry(std::size_t pos) const; std::vector> getEntries(int offset, int size, bool& moreResults) const; + std::vector getTrackIds() const; // Get clusters, order by occurence std::vector> getClusters() const; diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index f2bcf716..a7ed1094 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -668,7 +668,7 @@ MediaScanner::checkAudioFiles( Stats& stats ) auto clusters = Cluster::getAll(_db.getSession()); for (auto cluster : clusters) { - if (cluster->getTracks().size() == 0) + if (cluster->getCount() == 0) { LMS_LOG(DBUPDATER, DEBUG) << "Removing orphan cluster '" << cluster->getName() << "'"; cluster.remove(); diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index 824a2e9e..6721805a 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -178,8 +178,6 @@ PlayQueue::enqueueTracks(const std::vector& tracks) // Use a "session" playqueue in order to store the current playqueue // so that the user can disconnect and get its playqueue back - LMS_LOG(UI, DEBUG) << "Adding tracks to the current queue"; - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); for (auto track : tracks) @@ -205,8 +203,6 @@ PlayQueue::addTracks(const std::vector& tracks) void PlayQueue::playTracks(const std::vector& tracks) { - LMS_LOG(UI, DEBUG) << "Emptying current queue to play new tracks"; - Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); auto playqueue = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); @@ -294,10 +290,14 @@ PlayQueue::addRadioTrack() auto now = std::chrono::system_clock::now(); std::mt19937 randGenerator(std::chrono::duration_cast(now.time_since_epoch()).count()); - LMS_LOG(UI, INFO) << "Radio mode: adding track"; - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); + std::set playlistTrackIds; + { + auto ids = playlist->getTrackIds(); + playlistTrackIds = std::set(ids.begin(), ids.end()); + } + // Get all the tracks of the playlist, get the cluster that is mostly used // and reuse it to get the next track auto clusters = playlist->getClusters(); @@ -306,21 +306,22 @@ PlayQueue::addRadioTrack() for (auto cluster : clusters) { - LMS_LOG(UI, DEBUG) << "Processing cluster '" << cluster->getName() << "'"; + std::set clusterTrackIds = cluster->getTrackIds(); - auto nbTracks = cluster->getTrackCount(); - if (nbTracks == 0) + std::set candidateTrackIds; + std::set_difference(clusterTrackIds.begin(), clusterTrackIds.end(), + playlistTrackIds.begin(), playlistTrackIds.end(), + std::inserter(candidateTrackIds, candidateTrackIds.end())); + + if (candidateTrackIds.empty()) continue; - std::uniform_int_distribution dist(0, nbTracks - 1); + std::uniform_int_distribution dist(0, candidateTrackIds.size() - 1); - auto trackToAdd = cluster->getTracks(dist(randGenerator), 1).front(); + auto trackToAdd = Database::Track::getById(LmsApp->getDboSession(), *std::next(candidateTrackIds.begin(), dist(randGenerator))); + enqueueTrack(trackToAdd); - if (!playlist->hasTrack(trackToAdd.id())) - { - enqueueTrack(trackToAdd); - return; - } + return; } LMS_LOG(UI, INFO) << "No more track to be added!"; From 96dd5d48ceb02bb9892ab0ccc22a18adfb4c2d6e Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 2 Jun 2018 20:03:36 +0200 Subject: [PATCH 143/195] Updated documentation --- README.md | 8 +++++--- TODO | 20 +++++++------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index b8e9dfdd..17f2a0f8 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,11 @@ It allows you to access your music using an http(s) web interface. ## Features - Audio transcode for maximum interoperability and low bandwith requirements - - MusicBrainzID support to handle duplicated artist and release names - - Filter by genre and/or group - User management + - Browse your audio collection using tag-based filters + - Custom tags scan + - MusicBrainzID support to handle duplicated artist and release names + - Reverse proxy support LMS is written entirely in C++. Therefore, it is suitable to run on embedded devices, where space and memory are limited. @@ -28,7 +30,7 @@ mkdir build cd build ../configure --prefix=/usr --sysconfdir=/etc ``` -configure will complain if a mandatory library is missing. +configure will report any missing library. ```sh make diff --git a/TODO b/TODO index d498857e..289a935c 100644 --- a/TODO +++ b/TODO @@ -7,11 +7,9 @@ - Implement a cache to improve speed [Database] -- Optim, use SQL query to get the "genre" orphans - Use Inotify like system to watch modified/added files? - handle access rights problems (instead of aborting) - add a global play counter for tracks. This will help people to spot most popular files -- Make cluster scan configurable as it is very difficult to handle them all? - Use albumartist when available (useful for compilations) - Add AcousticBrainz support to create new kind of clusters @@ -19,27 +17,23 @@ - WMA covers: add support [Playlist] +- Save/Load playlists - Make public playlists so that users can see what other people are listening to [Users] - Handle login lifetime? - Use the WServer::post method to kick users already logged in? +- Or save the current playqueue by session (using a cookie)? - Limit multi login from UI and API interfaces (limit per interface is acceptable) [UI] - - Add a download button to get the current playqueue in a streamed zip file - - Save user prefs in local storage (volume, loop, shuffle, current playqueue, etc.) - - Add keyboard shortcuts - - Add a hint for the user to get the nature of tag (created from genre ? created from audio features?) - - Implement a play queue - - Implement a decent player - - Dedicate a color for each tag type - - Display only the most popular cluster of each cluster type? +- Add a download button to get the current playqueue in a streamed zip file +- Save user prefs in local storage (volume, loop, shuffle, current playqueue, etc.) +- Add keyboard shortcuts +- Implement a decent player [Settings] - - Add a user management view - - Add multi root directories support - - Add a first connection wizard +- Add multi root directories support [REST API] - Make a dedicated REST API. Maybe use the SubSonic API or Ampache API? From da2e2148cfe64bae47d82a8cdf900b5b793313b0 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 5 Jun 2018 13:18:55 +0200 Subject: [PATCH 144/195] Added most played artists feature --- approot/artists.xml | 8 ++++++++ approot/messages.xml | 1 + src/Makefile.am | 1 + src/database/DatabaseHandler.cpp | 2 ++ src/database/Track.hpp | 11 +++++++---- src/ui/PlayQueueView.cpp | 8 +++++++- src/ui/explore/ArtistsView.cpp | 19 +++++++++++++++++++ src/ui/explore/ArtistsView.hpp | 2 ++ 8 files changed, 47 insertions(+), 5 deletions(-) diff --git a/approot/artists.xml b/approot/artists.xml index 43dcc37c..c5c70050 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -3,6 +3,10 @@ +
+

${tr:Lms.Explore.most-played-artists}

+
+ ${most-played-artists}

${tr:Lms.Explore.artists}

@@ -16,6 +20,10 @@ ${show-more} + + ${name} + +
${nb-release} diff --git a/approot/messages.xml b/approot/messages.xml index 75297f4f..cf0918e3 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -59,6 +59,7 @@ Add filter Artists +Most played artists Albums Search... Show more diff --git a/src/Makefile.am b/src/Makefile.am index 663e56cc..fd9f89d2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,6 +13,7 @@ lms_SOURCES = \ $(srcdir)/database/ScanSettings.cpp \ $(srcdir)/database/SqlQuery.cpp \ $(srcdir)/database/Track.cpp \ + $(srcdir)/database/TrackStats.cpp \ $(srcdir)/database/User.cpp \ $(srcdir)/image/Image.cpp \ $(srcdir)/metadata/AvFormat.cpp \ diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index 7d3eb8d5..f835c09f 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -41,6 +41,7 @@ #include "Release.hpp" #include "ScanSettings.hpp" #include "Track.hpp" +#include "TrackStats.hpp" namespace Database { @@ -106,6 +107,7 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) _session.mapClass("release"); _session.mapClass("setting"); _session.mapClass("track"); + _session.mapClass("track_stats"); _session.mapClass("scan_settings"); diff --git a/src/database/Track.hpp b/src/database/Track.hpp index e1acb8ee..c63de183 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -35,10 +35,11 @@ namespace Database { class Artist; -class Release; -class PlaylistEntry; class Cluster; class ClusterType; +class PlaylistEntry; +class Release; +class TrackStats; class Track : public Wt::Dbo::Dbo { @@ -143,6 +144,7 @@ class Track : public Wt::Dbo::Dbo Wt::Dbo::belongsTo(a, _artist, "artist", Wt::Dbo::OnDeleteCascade); Wt::Dbo::hasMany(a, _clusters, Wt::Dbo::ManyToMany, "track_cluster", "", Wt::Dbo::OnDeleteCascade); Wt::Dbo::hasMany(a, _playlistEntries, Wt::Dbo::ManyToOne, "track"); + Wt::Dbo::hasMany(a, _stats, Wt::Dbo::ManyToOne, "track"); } private: @@ -170,8 +172,9 @@ class Track : public Wt::Dbo::Dbo Wt::Dbo::ptr _artist; Wt::Dbo::ptr _release; - Wt::Dbo::collection< Wt::Dbo::ptr > _clusters; - Wt::Dbo::collection< Wt::Dbo::ptr > _playlistEntries; + Wt::Dbo::collection> _clusters; + Wt::Dbo::collection> _playlistEntries; + Wt::Dbo::collection> _stats; }; diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index 6721805a..6f124884 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -28,6 +28,7 @@ #include "utils/Logger.hpp" #include "database/Playlist.hpp" +#include "database/TrackStats.hpp" #include "LmsApplication.hpp" @@ -116,7 +117,12 @@ PlayQueue::play(std::size_t pos) addRadioTrack(); _trackPos = pos; - trackId = playlist->getEntry(*_trackPos)->getTrack().id(); + auto track = playlist->getEntry(*_trackPos)->getTrack(); + + trackId = track.id(); + + Database::TrackStats::get(LmsApp->getDboSession(), track, LmsApp->getCurrentUser()).modify()->incPlayCount(); + updateCurrentTrack(true); } diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index 201cbc65..d7e32bf0 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -25,6 +25,7 @@ #include "database/Artist.hpp" #include "database/Setting.hpp" +#include "database/TrackStats.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -47,6 +48,7 @@ Artists::Artists(Filters* filters) _search->textInput().connect(this, &Artists::refresh); _artistsContainer = bindNew("artists"); + _mostPlayedArtistsContainer = bindNew("most-played-artists"); _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.template.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); @@ -57,10 +59,27 @@ Artists::Artists(Filters* filters) })); refresh(); + refreshMostPlayed(); filters->updated().connect(this, &Artists::refresh); } +void +Artists::refreshMostPlayed() +{ + _mostPlayedArtistsContainer->clear(); + + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + auto artists = TrackStats::getMostPlayedArtists(LmsApp->getDboSession(), LmsApp->getCurrentUser(), 5); + + for (auto artist : artists) + { + Wt::WTemplate* entry = _mostPlayedArtistsContainer->addNew(Wt::WString::tr("Lms.Explore.Artists.template.most-played-entry")); + + entry->bindWidget("name", LmsApplication::createArtistAnchor(artist)); + } +} + void Artists::refresh() { diff --git a/src/ui/explore/ArtistsView.hpp b/src/ui/explore/ArtistsView.hpp index 7aa9bb0c..78c5b019 100644 --- a/src/ui/explore/ArtistsView.hpp +++ b/src/ui/explore/ArtistsView.hpp @@ -39,6 +39,7 @@ class Artists : public Wt::WTemplate Wt::Signal artistPlay; private: + void refreshMostPlayed(); void refresh(); void addSome(); @@ -46,6 +47,7 @@ class Artists : public Wt::WTemplate Wt::WTemplate* _showMore; Wt::WLineEdit* _search; Wt::WContainerWidget* _artistsContainer; + Wt::WContainerWidget* _mostPlayedArtistsContainer; }; } // namespace UserInterface From d6b0dfa2b00fe873ba25a57f8cd44d0c7ebc0c2f Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 5 Jun 2018 13:53:51 +0200 Subject: [PATCH 145/195] Added most played releases feature --- approot/messages.xml | 1 + approot/releases.xml | 10 +++++++++ src/ui/explore/ReleasesView.cpp | 37 +++++++++++++++++++++++++++++++++ src/ui/explore/ReleasesView.hpp | 2 ++ 4 files changed, 50 insertions(+) diff --git a/approot/messages.xml b/approot/messages.xml index cf0918e3..87f6afde 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -60,6 +60,7 @@ Add filter Artists Most played artists +Most played releases Albums Search... Show more diff --git a/approot/releases.xml b/approot/releases.xml index 69f6864f..a77d74c6 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -3,6 +3,10 @@ +
+

${tr:Lms.Explore.most-played-releases}

+
+ ${most-played-releases}

${tr:Lms.Explore.releases}

@@ -24,6 +28,12 @@ + + ${cover} + ${release-name} + ${}${artist-name}${} + +
diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index c823a79f..3220cefd 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -26,6 +26,7 @@ #include #include "database/Release.hpp" +#include "database/TrackStats.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -50,6 +51,7 @@ _filters(filters) _search->textInput().connect(this, &Releases::refresh); _releasesContainer = bindNew("releases"); + _mostPlayedReleasesContainer = bindNew("most-played-releases"); _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); @@ -58,11 +60,46 @@ _filters(filters) addSome(); })); + refreshMostPlayed(); refresh(); filters->updated().connect(this, &Releases::refresh); } +void +Releases::refreshMostPlayed() +{ + _mostPlayedReleasesContainer->clear(); + + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + + auto releases = TrackStats::getMostPlayedReleases(LmsApp->getDboSession(), LmsApp->getCurrentUser(), 5); + + for (auto release : releases) + { + Wt::WTemplate* entry = _mostPlayedReleasesContainer->addNew(Wt::WString::tr("Lms.Explore.Releases.template.most-played-entry")); + + entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(release)); + + Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); + auto cover = std::make_unique(); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); + anchor->setImage(std::move(cover)); + + auto artists = release->getArtists(); + if (artists.size() > 1) + { + entry->setCondition("if-has-artist", true); + entry->bindString("artist-name", Wt::WString::tr("Lms.Explore.various-artists")); + } + else if (artists.size() == 1) + { + entry->setCondition("if-has-artist", true); + entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(artists.front())); + } + } +} + void Releases::refresh() { diff --git a/src/ui/explore/ReleasesView.hpp b/src/ui/explore/ReleasesView.hpp index eec4ec62..934afeeb 100644 --- a/src/ui/explore/ReleasesView.hpp +++ b/src/ui/explore/ReleasesView.hpp @@ -39,6 +39,7 @@ class Releases : public Wt::WTemplate Wt::Signal releasePlay; private: + void refreshMostPlayed(); void refresh(); void addSome(); @@ -46,6 +47,7 @@ class Releases : public Wt::WTemplate Wt::WTemplate* _showMore; Wt::WLineEdit* _search; Wt::WContainerWidget* _releasesContainer; + Wt::WContainerWidget* _mostPlayedReleasesContainer; }; } // namespace UserInterface From 1bd5633202d1a80d3b98ca38e41fba97d262a85b Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 5 Jun 2018 14:02:45 +0200 Subject: [PATCH 146/195] Added missing files --- src/database/TrackStats.cpp | 75 +++++++++++++++++++++++++++++++++++++ src/database/TrackStats.hpp | 68 +++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+) create mode 100644 src/database/TrackStats.cpp create mode 100644 src/database/TrackStats.hpp diff --git a/src/database/TrackStats.cpp b/src/database/TrackStats.cpp new file mode 100644 index 00000000..c8844503 --- /dev/null +++ b/src/database/TrackStats.cpp @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2014 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 . + */ + +#include "TrackStats.hpp" + +#include "Artist.hpp" +#include "Release.hpp" +#include "Track.hpp" +#include "User.hpp" + +namespace Database { + +TrackStats::TrackStats(Wt::Dbo::ptr track, Wt::Dbo::ptr user) +: _track(track), + _user(user) +{} + +std::vector +TrackStats::getMostPlayedArtists(Wt::Dbo::Session& session, User::pointer user, int limit) +{ + Wt::Dbo::collection res = session.query + ("SELECT a FROM artist a INNER JOIN track t ON a.id = t.artist_id INNER JOIN track_stats t_s ON t.id = t_s.track_id") + .where("t_s.user_id = ?").bind(user.id()) + .groupBy("a.id") + .orderBy("SUM(t_s.play_count) DESC") + .limit(limit); + + return std::vector(res.begin(), res.end()); +} + +std::vector +TrackStats::getMostPlayedReleases(Wt::Dbo::Session& session, User::pointer user, int limit) +{ + Wt::Dbo::collection res = session.query + ("SELECT r FROM release r INNER JOIN track t ON r.id = t.release_id INNER JOIN track_stats t_s ON t.id = t_s.track_id") + .where("t_s.user_id = ?").bind(user.id()) + .groupBy("r.id") + .orderBy("SUM(t_s.play_count) DESC") + .limit(limit); + + return std::vector(res.begin(), res.end()); +} + +TrackStats::pointer +TrackStats::get(Wt::Dbo::Session& session, Track::pointer track, User::pointer user) +{ + Wt::Dbo::Transaction transaction(session); + + TrackStats::pointer res = session.find() + .where("track_id = ?").bind(track.id()) + .where("user_id = ?").bind(user.id()); + if (!res) + res = session.add(std::make_unique(track, user)); + + return res; +} + +} // namespace Database + diff --git a/src/database/TrackStats.hpp b/src/database/TrackStats.hpp new file mode 100644 index 00000000..c599abc8 --- /dev/null +++ b/src/database/TrackStats.hpp @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2014 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 . + */ + +#pragma once + +#include + +#include + +#include "Types.hpp" + +namespace Database { + +class Artist; +class Release; +class Track; +class User; + +class TrackStats +{ + public: + using pointer = Wt::Dbo::ptr; + + TrackStats() {} + TrackStats(Wt::Dbo::ptr track, Wt::Dbo::ptr user); + + static std::vector> getMostPlayedArtists(Wt::Dbo::Session& session, Wt::Dbo::ptr, int limit = 1); + static std::vector> getMostPlayedReleases(Wt::Dbo::Session& session, Wt::Dbo::ptr, int limit = 1); + + // Get utility (will create if does not exist) + static pointer get(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr user); + + void incPlayCount() { _playCount++; } + + template + void persist(Action& a) + { + Wt::Dbo::field(a, _playCount, "play_count"); + Wt::Dbo::belongsTo(a, _track, "track", Wt::Dbo::OnDeleteCascade); + Wt::Dbo::belongsTo(a, _user, "user", Wt::Dbo::OnDeleteCascade); + } + + private: + + int _playCount = 0; + Wt::Dbo::ptr _track; + Wt::Dbo::ptr _user; +}; + + +} // namespace Database + From c1e7e9a602ced6fcbef732b6ec4328adecb24221 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 5 Jun 2018 14:03:28 +0200 Subject: [PATCH 147/195] Removed unused Home view --- Makefile.am | 1 - approot/home.xml | 9 --------- approot/messages.xml | 3 --- src/Makefile.am | 1 - src/ui/HomeView.cpp | 41 --------------------------------------- src/ui/HomeView.hpp | 39 ------------------------------------- src/ui/LmsApplication.cpp | 13 ++++--------- 7 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 approot/home.xml delete mode 100644 src/ui/HomeView.cpp delete mode 100644 src/ui/HomeView.hpp diff --git a/Makefile.am b/Makefile.am index 15ac8af4..5737756e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,6 @@ lms_approot_DATA = \ approot/artist.xml \ approot/artists.xml \ approot/explore.xml \ - approot/home.xml \ approot/login.xml \ approot/mediaplayer.xml \ approot/messages.xml \ diff --git a/approot/home.xml b/approot/home.xml deleted file mode 100644 index 8b877520..00000000 --- a/approot/home.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - ${tr:Lms.Home.welcome} - - - - diff --git a/approot/messages.xml b/approot/messages.xml index 87f6afde..5312e568 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -53,9 +53,6 @@ Remember me Welcome! - -

Welcome!

 - Add filter Artists diff --git a/src/Makefile.am b/src/Makefile.am index fd9f89d2..f3774a12 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,6 @@ lms_SOURCES = \ $(srcdir)/metadata/TagLibParser.cpp \ $(srcdir)/scanner/MediaScanner.cpp \ $(srcdir)/ui/Auth.cpp \ - $(srcdir)/ui/HomeView.cpp \ $(srcdir)/ui/LmsApplication.cpp \ $(srcdir)/ui/MediaPlayer.cpp \ $(srcdir)/ui/PlayQueueView.cpp \ diff --git a/src/ui/HomeView.cpp b/src/ui/HomeView.cpp deleted file mode 100644 index 965d7da9..00000000 --- a/src/ui/HomeView.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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 . - */ - -#include "HomeView.hpp" - -#include - -#include "utils/Logger.hpp" - -#include "LmsApplication.hpp" - -namespace UserInterface { - - -Home::Home() -: Wt::WContainerWidget() -{ - auto t = std::make_unique(Wt::WString::tr("Lms.Home.template")); - t->addFunction("tr", &Wt::WTemplate::Functions::tr); - - this->addWidget(std::move(t)); -} - -} // namespace UserInterface - diff --git a/src/ui/HomeView.hpp b/src/ui/HomeView.hpp deleted file mode 100644 index 8406bc58..00000000 --- a/src/ui/HomeView.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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 . - */ - -#pragma once - -#include - -namespace UserInterface { - -class Home : public Wt::WContainerWidget -{ - public: - Home(); - - private: - - void displayFilter(void); - void displayContents(void); - -}; - -} // namespace UserInterface - diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 41295e9b..fb25b9cb 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -35,7 +35,6 @@ #include "utils/Utils.hpp" #include "explore/Explore.hpp" -#include "HomeView.hpp" #include "MediaPlayer.hpp" #include "PlayQueueView.hpp" #include "SettingsView.hpp" @@ -94,7 +93,6 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti messageResourceBundle().use(appRoot() + "admin-initwizard"); messageResourceBundle().use(appRoot() + "artist"); messageResourceBundle().use(appRoot() + "artists"); - messageResourceBundle().use(appRoot() + "home"); messageResourceBundle().use(appRoot() + "explore"); messageResourceBundle().use(appRoot() + "login"); messageResourceBundle().use(appRoot() + "mediaplayer"); @@ -192,7 +190,7 @@ LmsApplication::createCluster(Database::Cluster::pointer cluster, bool canDelete void LmsApplication::goHome() { - setInternalPath("/home", true); + setInternalPath("/artists", true); } void @@ -205,8 +203,7 @@ LmsApplication::goHomeAndQuit() enum IdxRoot { - IdxHome = 0, - IdxExplore, + IdxExplore = 0, IdxPlayQueue, IdxSettings, IdxAdminDatabase, @@ -224,7 +221,6 @@ handlePathChange(Wt::WStackedWidget* stack, bool isAdmin) bool admin; } views[] = { - { "/home", IdxHome, false }, { "/artists", IdxExplore, false }, { "/artist", IdxExplore, false }, { "/releases", IdxExplore, false }, @@ -251,7 +247,7 @@ handlePathChange(Wt::WStackedWidget* stack, bool isAdmin) } } - wApp->setInternalPath("/home", true); + wApp->setInternalPath("/artists", true); } void @@ -281,7 +277,7 @@ LmsApplication::handleAuthEvent(void) // Navbar Wt::WNavigationBar* navbar = main->bindNew("navbar-top"); - navbar->setTitle("LMS", Wt::WLink(Wt::LinkType::InternalPath, "/home")); + navbar->setTitle("LMS", Wt::WLink(Wt::LinkType::InternalPath, "/artists")); navbar->setResponsive(true); Wt::WMenu* menu = navbar->addMenu(std::make_unique()); @@ -344,7 +340,6 @@ LmsApplication::handleAuthEvent(void) // Order is important in mainStack, see IdxRoot! Wt::WStackedWidget* mainStack = main->bindNew("contents"); - mainStack->addNew(); Explore* explore = mainStack->addNew(); PlayQueue* playqueue = mainStack->addNew(); mainStack->addNew(); From 1e68ccce2aa2ab23a0576677a10f7169a292331b Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 6 Jun 2018 13:14:00 +0200 Subject: [PATCH 148/195] Added recently added releases feature --- approot/artists.xml | 8 ++- approot/messages.xml | 2 + approot/releases.xml | 8 ++- src/database/Artist.cpp | 14 ++++ src/database/Artist.hpp | 2 + src/database/Release.cpp | 12 ++++ src/database/Release.hpp | 3 +- src/ui/LmsApplication.cpp | 4 +- src/ui/explore/ArtistsView.cpp | 67 ++++++++++++++---- src/ui/explore/ArtistsView.hpp | 6 +- src/ui/explore/ReleasesView.cpp | 120 +++++++++++++++++++++----------- src/ui/explore/ReleasesView.hpp | 6 +- 12 files changed, 190 insertions(+), 62 deletions(-) diff --git a/approot/artists.xml b/approot/artists.xml index c5c70050..23425af9 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -7,6 +7,12 @@

${tr:Lms.Explore.most-played-artists}

${most-played-artists} + +
+

${tr:Lms.Explore.recently-added-artists}

+
+ ${recently-added-artists} +

${tr:Lms.Explore.artists}

@@ -20,7 +26,7 @@ ${show-more} - + ${name} diff --git a/approot/messages.xml b/approot/messages.xml index 5312e568..e50b99e3 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -58,6 +58,8 @@ Artists Most played artists Most played releases +Recently added artists +Recently added releases Albums Search... Show more diff --git a/approot/releases.xml b/approot/releases.xml index a77d74c6..92cf00ce 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -7,6 +7,12 @@

${tr:Lms.Explore.most-played-releases}

${most-played-releases} + +
+

${tr:Lms.Explore.recently-added-releases}

+
+ ${recently-added-releases} +

${tr:Lms.Explore.releases}

@@ -28,7 +34,7 @@ - + ${cover} ${release-name} ${}${artist-name}${} diff --git a/src/database/Artist.cpp b/src/database/Artist.cpp index 2da5adbf..194b8581 100644 --- a/src/database/Artist.cpp +++ b/src/database/Artist.cpp @@ -18,6 +18,8 @@ */ #include "Artist.hpp" +#include + #include "utils/Logger.hpp" #include "Cluster.hpp" @@ -140,6 +142,18 @@ Artist::getByFilter(Wt::Dbo::Session& session, return res; } +std::vector +Artist::getLastAdded(Wt::Dbo::Session& session, Wt::WDateTime after, int limit) +{ + Wt::Dbo::collection res = session.query("SELECT a from artist a INNER JOIN track t ON a.id = t.artist_id") + .where("t.file_added > ?").bind(after) + .groupBy("a.id") + .orderBy("t.file_added DESC") + .limit(limit); + + return std::vector(res.begin(), res.end()); +} + std::vector> Artist::getReleases(const std::set& clusterIds) const { diff --git a/src/database/Artist.hpp b/src/database/Artist.hpp index 1c814a0d..2ae1acda 100644 --- a/src/database/Artist.hpp +++ b/src/database/Artist.hpp @@ -22,6 +22,7 @@ #include #include +#include #include #include "Types.hpp" @@ -56,6 +57,7 @@ class Artist : public Wt::Dbo::Dbo static std::vector getAll(Wt::Dbo::Session& session, int offset = -1, int size = -1); static std::vector getAllOrphans(Wt::Dbo::Session& session); // No track related + static std::vector getLastAdded(Wt::Dbo::Session& session, Wt::WDateTime after, int size = 1); // Accessors std::string getName(void) const { return _name; } diff --git a/src/database/Release.cpp b/src/database/Release.cpp index cc49954f..7cabd1d8 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -74,6 +74,18 @@ Release::getAllOrphans(Wt::Dbo::Session& session) return std::vector(res.begin(), res.end()); } +std::vector +Release::getLastAdded(Wt::Dbo::Session& session, Wt::WDateTime after, int limit) +{ + Wt::Dbo::collection res = session.query("SELECT r from release r INNER JOIN track t ON r.id = t.release_id") + .where("t.file_added > ?").bind(after) + .groupBy("r.id") + .orderBy("t.file_added DESC") + .limit(limit); + + return std::vector(res.begin(), res.end()); +} + static Wt::Dbo::Query getQuery(Wt::Dbo::Session& session, diff --git a/src/database/Release.hpp b/src/database/Release.hpp index 32cd1f10..1122314a 100644 --- a/src/database/Release.hpp +++ b/src/database/Release.hpp @@ -21,7 +21,7 @@ #include -#include +#include #include "Types.hpp" @@ -49,6 +49,7 @@ class Release : public Wt::Dbo::Dbo static pointer getById(Wt::Dbo::Session& session, IdType id); static std::vector getAllOrphans(Wt::Dbo::Session& session); // no track related static std::vector getAll(Wt::Dbo::Session& session, int offset, int size); + static std::vector getLastAdded(Wt::Dbo::Session& session, Wt::WDateTime after, int size = 1); static std::vector getByFilter(Wt::Dbo::Session& session, const std::set& clusters, // at least one track that belongs to these clusters diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index fb25b9cb..90df1480 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -263,6 +263,9 @@ LmsApplication::handleAuthEvent(void) LMS_LOG(UI, INFO) << "User '" << LmsApp->getCurrentAuthUser().identity(Wt::Auth::Identity::LoginName) << "' logged in from '" << Wt::WApplication::instance()->environment().clientAddress() << "', user agent = " << Wt::WApplication::instance()->environment().userAgent() << ", session = " << Wt::WApplication::instance()->sessionId(); + // Since we plug into the Media Scanner events, we need to enable updates + enableUpdates(true); + { Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); _isAdmin = LmsApp->getCurrentUser()->isAdmin(); @@ -387,7 +390,6 @@ LmsApplication::handleAuthEvent(void) // Events from MediaScanner if (_isAdmin) { - enableUpdates(true); std::string sessionId = this->sessionId(); _scanner.scanComplete().connect(std::bind([=] (Scanner::MediaScanner::Stats stats) { diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index d7e32bf0..26d89f67 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -20,8 +20,10 @@ #include "ArtistsView.hpp" #include -#include #include +#include +#include +#include #include "database/Artist.hpp" #include "database/Setting.hpp" @@ -35,6 +37,22 @@ using namespace Database; +namespace { + +using namespace UserInterface; + +void addCompactEntries(Wt::WContainerWidget *container, const std::vector& artists) +{ + for (auto artist : artists) + { + Wt::WTemplate* entry = container->addNew(Wt::WString::tr("Lms.Explore.Artists.template.compact-entry")); + + entry->bindWidget("name", LmsApplication::createArtistAnchor(artist)); + } +} + +} + namespace UserInterface { Artists::Artists(Filters* filters) @@ -47,8 +65,9 @@ Artists::Artists(Filters* filters) _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); _search->textInput().connect(this, &Artists::refresh); - _artistsContainer = bindNew("artists"); - _mostPlayedArtistsContainer = bindNew("most-played-artists"); + _container = bindNew("artists"); + _mostPlayedContainer = bindNew("most-played-artists"); + _recentlyAddedContainer = bindNew("recently-added-artists"); _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.template.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); @@ -60,30 +79,50 @@ Artists::Artists(Filters* filters) refresh(); refreshMostPlayed(); + refreshRecentlyAdded(); filters->updated().connect(this, &Artists::refresh); + + std::string sessionId = LmsApp->sessionId(); + LmsApp->getMediaScanner().scanComplete().connect([=] (Scanner::MediaScanner::Stats stats) + { + if (stats.nbChanges() > 0) + { + Wt::WServer::instance()->post(sessionId, [=] + { + refreshRecentlyAdded(); + LmsApp->triggerUpdate(); + }); + } + }); +} + +void +Artists::refreshRecentlyAdded() +{ + auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1); + + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + auto artists = Artist::getLastAdded(LmsApp->getDboSession(), after, 5); + + _recentlyAddedContainer->clear(); + addCompactEntries(_recentlyAddedContainer, artists); } void Artists::refreshMostPlayed() { - _mostPlayedArtistsContainer->clear(); - Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); auto artists = TrackStats::getMostPlayedArtists(LmsApp->getDboSession(), LmsApp->getCurrentUser(), 5); - for (auto artist : artists) - { - Wt::WTemplate* entry = _mostPlayedArtistsContainer->addNew(Wt::WString::tr("Lms.Explore.Artists.template.most-played-entry")); - - entry->bindWidget("name", LmsApplication::createArtistAnchor(artist)); - } + _mostPlayedContainer->clear(); + addCompactEntries(_mostPlayedContainer, artists); } void Artists::refresh() { - _artistsContainer->clear(); + _container->clear(); addSome(); } @@ -100,11 +139,11 @@ Artists::addSome() auto artists = Artist::getByFilter(LmsApp->getDboSession(), clusterIds, searchKeywords, - _artistsContainer->count(), 20, moreResults); + _container->count(), 20, moreResults); for (auto artist : artists) { - Wt::WTemplate* entry = _artistsContainer->addNew(Wt::WString::tr("Lms.Explore.Artists.template.entry")); + Wt::WTemplate* entry = _container->addNew(Wt::WString::tr("Lms.Explore.Artists.template.entry")); entry->bindInt("nb-release", artist->getReleases(clusterIds).size()); entry->bindWidget("name", LmsApplication::createArtistAnchor(artist)); diff --git a/src/ui/explore/ArtistsView.hpp b/src/ui/explore/ArtistsView.hpp index 78c5b019..3a6f6974 100644 --- a/src/ui/explore/ArtistsView.hpp +++ b/src/ui/explore/ArtistsView.hpp @@ -39,6 +39,7 @@ class Artists : public Wt::WTemplate Wt::Signal artistPlay; private: + void refreshRecentlyAdded(); void refreshMostPlayed(); void refresh(); void addSome(); @@ -46,8 +47,9 @@ class Artists : public Wt::WTemplate Filters* _filters; Wt::WTemplate* _showMore; Wt::WLineEdit* _search; - Wt::WContainerWidget* _artistsContainer; - Wt::WContainerWidget* _mostPlayedArtistsContainer; + Wt::WContainerWidget* _container; + Wt::WContainerWidget* _mostPlayedContainer; + Wt::WContainerWidget* _recentlyAddedContainer; }; } // namespace UserInterface diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index 3220cefd..bdbecaf4 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -19,9 +19,10 @@ #include "ReleasesView.hpp" -#include +#include #include #include +#include #include #include @@ -38,46 +39,15 @@ using namespace Database; -namespace UserInterface { +namespace { -Releases::Releases(Filters* filters) -: Wt::WTemplate(Wt::WString::tr("Lms.Explore.Releases.template")), -_filters(filters) +using namespace UserInterface; + +void addCompactEntries(Wt::WContainerWidget* container, const std::vector& releases) { - addFunction("tr", &Wt::WTemplate::Functions::tr); - - _search = bindNew("search"); - _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); - _search->textInput().connect(this, &Releases::refresh); - - _releasesContainer = bindNew("releases"); - _mostPlayedReleasesContainer = bindNew("most-played-releases"); - - _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.show-more")); - _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); - _showMore->clicked().connect(std::bind([=] - { - addSome(); - })); - - refreshMostPlayed(); - refresh(); - - filters->updated().connect(this, &Releases::refresh); -} - -void -Releases::refreshMostPlayed() -{ - _mostPlayedReleasesContainer->clear(); - - Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - - auto releases = TrackStats::getMostPlayedReleases(LmsApp->getDboSession(), LmsApp->getCurrentUser(), 5); - for (auto release : releases) { - Wt::WTemplate* entry = _mostPlayedReleasesContainer->addNew(Wt::WString::tr("Lms.Explore.Releases.template.most-played-entry")); + Wt::WTemplate* entry = container->addNew(Wt::WString::tr("Lms.Explore.Releases.template.compact-entry")); entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(release)); @@ -100,10 +70,80 @@ Releases::refreshMostPlayed() } } +} // namespace + +namespace UserInterface { + +Releases::Releases(Filters* filters) +: Wt::WTemplate(Wt::WString::tr("Lms.Explore.Releases.template")), +_filters(filters) +{ + addFunction("tr", &Wt::WTemplate::Functions::tr); + + _search = bindNew("search"); + _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); + _search->textInput().connect(this, &Releases::refresh); + + _container = bindNew("releases"); + _mostPlayedContainer = bindNew("most-played-releases"); + _recentlyAddedContainer = bindNew("recently-added-releases"); + + _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.show-more")); + _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); + _showMore->clicked().connect(std::bind([=] + { + addSome(); + })); + + refreshRecentlyAdded(); + refreshMostPlayed(); + refresh(); + + filters->updated().connect(this, &Releases::refresh); + + std::string sessionId = LmsApp->sessionId(); + LmsApp->getMediaScanner().scanComplete().connect([=] (Scanner::MediaScanner::Stats stats) + { + if (stats.nbChanges() > 0) + { + Wt::WServer::instance()->post(sessionId, [=] + { + refreshRecentlyAdded(); + LmsApp->triggerUpdate(); + }); + } + }); +} + +void +Releases::refreshRecentlyAdded() +{ + auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1); + + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + + auto releases = Release::getLastAdded(LmsApp->getDboSession(), after, 5); + + _recentlyAddedContainer->clear(); + addCompactEntries(_recentlyAddedContainer, releases); +} + +void +Releases::refreshMostPlayed() +{ + + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + + auto releases = TrackStats::getMostPlayedReleases(LmsApp->getDboSession(), LmsApp->getCurrentUser(), 5); + + _mostPlayedContainer->clear(); + addCompactEntries(_mostPlayedContainer, releases); +} + void Releases::refresh() { - _releasesContainer->clear(); + _container->clear(); addSome(); } @@ -117,13 +157,13 @@ Releases::addSome() Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); bool moreResults; - auto releases = Release::getByFilter(LmsApp->getDboSession(), clusterIds, searchKeywords, _releasesContainer->count(), 20, moreResults); + auto releases = Release::getByFilter(LmsApp->getDboSession(), clusterIds, searchKeywords, _container->count(), 20, moreResults); for (auto release : releases) { auto releaseId = release.id(); - Wt::WTemplate* entry = _releasesContainer->addNew(Wt::WString::tr("Lms.Explore.Releases.template.entry")); + Wt::WTemplate* entry = _container->addNew(Wt::WString::tr("Lms.Explore.Releases.template.entry")); entry->addFunction("tr", Wt::WTemplate::Functions::tr); Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); diff --git a/src/ui/explore/ReleasesView.hpp b/src/ui/explore/ReleasesView.hpp index 934afeeb..5c8374a2 100644 --- a/src/ui/explore/ReleasesView.hpp +++ b/src/ui/explore/ReleasesView.hpp @@ -39,6 +39,7 @@ class Releases : public Wt::WTemplate Wt::Signal releasePlay; private: + void refreshRecentlyAdded(); void refreshMostPlayed(); void refresh(); void addSome(); @@ -46,8 +47,9 @@ class Releases : public Wt::WTemplate Filters* _filters; Wt::WTemplate* _showMore; Wt::WLineEdit* _search; - Wt::WContainerWidget* _releasesContainer; - Wt::WContainerWidget* _mostPlayedReleasesContainer; + Wt::WContainerWidget* _container; + Wt::WContainerWidget* _mostPlayedContainer; + Wt::WContainerWidget* _recentlyAddedContainer; }; } // namespace UserInterface From 49f92ba0f98a8a37517e08eb3f19195f2849e86d Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 8 Jun 2018 16:01:03 +0200 Subject: [PATCH 149/195] Make recetnly played/most played info update --- approot/artists.xml | 5 +++++ approot/messages.xml | 6 ++++-- approot/releases.xml | 5 +++++ src/database/TrackStats.cpp | 26 ++++++++++++++++++++++++++ src/database/TrackStats.hpp | 7 +++++++ src/ui/LmsApplication.cpp | 27 ++++++++++++++++++++------- src/ui/PlayQueueView.cpp | 6 +++++- src/ui/explore/ArtistsView.cpp | 27 +++++++++++++-------------- src/ui/explore/ArtistsView.hpp | 5 ++++- src/ui/explore/Explore.cpp | 17 +++++++++++++++++ src/ui/explore/Explore.hpp | 6 ++++++ src/ui/explore/ReleasesView.cpp | 32 ++++++++++++++++++-------------- src/ui/explore/ReleasesView.hpp | 5 ++++- 13 files changed, 134 insertions(+), 40 deletions(-) diff --git a/approot/artists.xml b/approot/artists.xml index 23425af9..0b467c46 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -8,6 +8,11 @@
${most-played-artists} +
+

${tr:Lms.Explore.recently-played-artists}

+
+ ${recently-played-artists} +

${tr:Lms.Explore.recently-added-artists}

diff --git a/approot/messages.xml b/approot/messages.xml index e50b99e3..467646ca 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -57,9 +57,11 @@ Add filter Artists Most played artists -Most played releases +Most played albums Recently added artists -Recently added releases +Recently added albums +Recently played artists +Recently played albums Albums Search... Show more diff --git a/approot/releases.xml b/approot/releases.xml index 92cf00ce..5bf6e950 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -8,6 +8,11 @@
${most-played-releases} +
+

${tr:Lms.Explore.recently-played-releases}

+
+ ${recently-played-releases} +

${tr:Lms.Explore.recently-added-releases}

diff --git a/src/database/TrackStats.cpp b/src/database/TrackStats.cpp index c8844503..944ac7a2 100644 --- a/src/database/TrackStats.cpp +++ b/src/database/TrackStats.cpp @@ -44,6 +44,19 @@ TrackStats::getMostPlayedArtists(Wt::Dbo::Session& session, User::pointer user, return std::vector(res.begin(), res.end()); } +std::vector +TrackStats::getLastPlayedArtists(Wt::Dbo::Session& session, User::pointer user, int limit) +{ + Wt::Dbo::collection res = session.query + ("SELECT a FROM artist a INNER JOIN track t ON a.id = t.artist_id INNER JOIN track_stats t_s ON t.id = t_s.track_id") + .where("t_s.user_id = ?").bind(user.id()) + .groupBy("a.id") + .orderBy("t_s.last_played DESC") + .limit(limit); + + return std::vector(res.begin(), res.end()); +} + std::vector TrackStats::getMostPlayedReleases(Wt::Dbo::Session& session, User::pointer user, int limit) { @@ -57,6 +70,19 @@ TrackStats::getMostPlayedReleases(Wt::Dbo::Session& session, User::pointer user, return std::vector(res.begin(), res.end()); } +std::vector +TrackStats::getLastPlayedReleases(Wt::Dbo::Session& session, User::pointer user, int limit) +{ + Wt::Dbo::collection res = session.query + ("SELECT r FROM release r INNER JOIN track t ON r.id = t.release_id INNER JOIN track_stats t_s ON t.id = t_s.track_id") + .where("t_s.user_id = ?").bind(user.id()) + .groupBy("r.id") + .orderBy("t_s.last_played DESC") + .limit(limit); + + return std::vector(res.begin(), res.end()); +} + TrackStats::pointer TrackStats::get(Wt::Dbo::Session& session, Track::pointer track, User::pointer user) { diff --git a/src/database/TrackStats.hpp b/src/database/TrackStats.hpp index c599abc8..6c4d66d6 100644 --- a/src/database/TrackStats.hpp +++ b/src/database/TrackStats.hpp @@ -20,6 +20,7 @@ #pragma once #include +#include #include @@ -41,17 +42,22 @@ class TrackStats TrackStats(Wt::Dbo::ptr track, Wt::Dbo::ptr user); static std::vector> getMostPlayedArtists(Wt::Dbo::Session& session, Wt::Dbo::ptr, int limit = 1); + static std::vector> getLastPlayedArtists(Wt::Dbo::Session& session, Wt::Dbo::ptr, int limit = 1); + static std::vector> getMostPlayedReleases(Wt::Dbo::Session& session, Wt::Dbo::ptr, int limit = 1); + static std::vector> getLastPlayedReleases(Wt::Dbo::Session& session, Wt::Dbo::ptr, int limit = 1); // Get utility (will create if does not exist) static pointer get(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr user); void incPlayCount() { _playCount++; } + void setLastPlayed(Wt::WDateTime lastPlayed) { _lastPlayed = lastPlayed; } template void persist(Action& a) { Wt::Dbo::field(a, _playCount, "play_count"); + Wt::Dbo::field(a, _lastPlayed, "last_played"); Wt::Dbo::belongsTo(a, _track, "track", Wt::Dbo::OnDeleteCascade); Wt::Dbo::belongsTo(a, _user, "user", Wt::Dbo::OnDeleteCascade); } @@ -59,6 +65,7 @@ class TrackStats private: int _playCount = 0; + Wt::WDateTime _lastPlayed; Wt::Dbo::ptr _track; Wt::Dbo::ptr _user; }; diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 90df1480..a0eb5030 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -384,16 +384,20 @@ LmsApplication::handleAuthEvent(void) })); // Events from the PlayQueue + playqueue->playTrack.connect(explore, &Explore::handleTrackPlayed); + playqueue->playTrack.connect(player, &MediaPlayer::playTrack); playqueue->playbackStop.connect(player, &MediaPlayer::stop); // Events from MediaScanner - if (_isAdmin) + std::string sessionId = this->sessionId(); + _scanner.scanComplete().connect([=] (Scanner::MediaScanner::Stats stats) { - std::string sessionId = this->sessionId(); - _scanner.scanComplete().connect(std::bind([=] (Scanner::MediaScanner::Stats stats) + Wt::WServer::instance()->post(sessionId, [=] { - Wt::WServer::instance()->post(sessionId, [=] + bool changes = false; + + if (_isAdmin) { notifyMsg(Wt::WString::tr("Lms.Admin.Database.scan-complete") .arg(static_cast(stats.nbFiles())) @@ -402,10 +406,19 @@ LmsApplication::handleAuthEvent(void) .arg(static_cast(stats.deletions)) .arg(static_cast(stats.nbDuplicates())) .arg(static_cast(stats.nbErrors()))); + changes = true; + } + + if (stats.nbChanges() > 0) + { + explore->handleDbChanged(); + changes = true; + } + + if (changes) triggerUpdate(); - }); - }, std::placeholders::_1)); - } + }); + }); internalPathChanged().connect(std::bind([=] { diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index 6f124884..333f2e40 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -23,6 +23,7 @@ #include #include +#include #include #include "utils/Logger.hpp" @@ -121,7 +122,10 @@ PlayQueue::play(std::size_t pos) trackId = track.id(); - Database::TrackStats::get(LmsApp->getDboSession(), track, LmsApp->getCurrentUser()).modify()->incPlayCount(); + auto stats = Database::TrackStats::get(LmsApp->getDboSession(), track, LmsApp->getCurrentUser()); + + stats.modify()->incPlayCount(); + stats.modify()->setLastPlayed(Wt::WLocalDateTime::currentServerDateTime().toUTC()); updateCurrentTrack(true); } diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index 26d89f67..b664daec 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include "database/Artist.hpp" @@ -68,6 +67,7 @@ Artists::Artists(Filters* filters) _container = bindNew("artists"); _mostPlayedContainer = bindNew("most-played-artists"); _recentlyAddedContainer = bindNew("recently-added-artists"); + _recentlyPlayedContainer = bindNew("recently-played-artists"); _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.template.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); @@ -80,21 +80,9 @@ Artists::Artists(Filters* filters) refresh(); refreshMostPlayed(); refreshRecentlyAdded(); + refreshRecentlyPlayed(); filters->updated().connect(this, &Artists::refresh); - - std::string sessionId = LmsApp->sessionId(); - LmsApp->getMediaScanner().scanComplete().connect([=] (Scanner::MediaScanner::Stats stats) - { - if (stats.nbChanges() > 0) - { - Wt::WServer::instance()->post(sessionId, [=] - { - refreshRecentlyAdded(); - LmsApp->triggerUpdate(); - }); - } - }); } void @@ -109,6 +97,17 @@ Artists::refreshRecentlyAdded() addCompactEntries(_recentlyAddedContainer, artists); } +void +Artists::refreshRecentlyPlayed() +{ + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + auto artists = TrackStats::getLastPlayedArtists(LmsApp->getDboSession(), LmsApp->getCurrentUser(), 5); + + _recentlyPlayedContainer->clear(); + addCompactEntries(_recentlyPlayedContainer, artists); +} + + void Artists::refreshMostPlayed() { diff --git a/src/ui/explore/ArtistsView.hpp b/src/ui/explore/ArtistsView.hpp index 3a6f6974..f39c5fe4 100644 --- a/src/ui/explore/ArtistsView.hpp +++ b/src/ui/explore/ArtistsView.hpp @@ -38,9 +38,11 @@ class Artists : public Wt::WTemplate Wt::Signal artistAdd; Wt::Signal artistPlay; - private: void refreshRecentlyAdded(); + void refreshRecentlyPlayed(); void refreshMostPlayed(); + + private: void refresh(); void addSome(); @@ -50,6 +52,7 @@ class Artists : public Wt::WTemplate Wt::WContainerWidget* _container; Wt::WContainerWidget* _mostPlayedContainer; Wt::WContainerWidget* _recentlyAddedContainer; + Wt::WContainerWidget* _recentlyPlayedContainer; }; } // namespace UserInterface diff --git a/src/ui/explore/Explore.cpp b/src/ui/explore/Explore.cpp index 4d376b86..6b62da7f 100644 --- a/src/ui/explore/Explore.cpp +++ b/src/ui/explore/Explore.cpp @@ -79,6 +79,7 @@ Explore::Explore() Wt::WStackedWidget* stack = bindNew("contents"); auto artists = std::make_unique(_filters); + auto artists_raw = artists.get(); artists->artistAdd.connect(this, &Explore::handleArtistAdd); artists->artistPlay.connect(this, &Explore::handleArtistPlay); stack->addWidget(std::move(artists)); @@ -91,6 +92,7 @@ Explore::Explore() stack->addWidget(std::move(artist)); auto releases = std::make_unique(_filters); + auto releases_raw = releases.get(); releases->releaseAdd.connect(this, &Explore::handleReleaseAdd); releases->releasePlay.connect(this, &Explore::handleReleasePlay); stack->addWidget(std::move(releases)); @@ -102,6 +104,21 @@ Explore::Explore() release->trackPlay.connect(this, &Explore::handleTrackPlay); stack->addWidget(std::move(release)); + _dbChanged.connect([=] + { + artists_raw->refreshRecentlyAdded(); + releases_raw->refreshRecentlyAdded(); + }); + + _trackPlayed.connect([=] + { + artists_raw->refreshMostPlayed(); + artists_raw->refreshRecentlyPlayed(); + releases_raw->refreshMostPlayed(); + releases_raw->refreshRecentlyPlayed(); + + }); + auto tracks = std::make_unique(_filters); tracks->trackAdd.connect(this, &Explore::handleTrackAdd); tracks->trackPlay.connect(this, &Explore::handleTrackPlay); diff --git a/src/ui/explore/Explore.hpp b/src/ui/explore/Explore.hpp index ea538876..e00c8bc7 100644 --- a/src/ui/explore/Explore.hpp +++ b/src/ui/explore/Explore.hpp @@ -36,6 +36,9 @@ class Explore : public Wt::WTemplate Wt::Signal> tracksAdd; Wt::Signal> tracksPlay; + void handleDbChanged() { _dbChanged.emit(); }; + void handleTrackPlayed(Database::IdType trackId) { _trackPlayed.emit(); } + private: void handleArtistAdd(Database::IdType id); @@ -48,6 +51,9 @@ class Explore : public Wt::WTemplate void handleTracksPlay(std::vector tracks); Filters* _filters; + + Wt::Signal<> _dbChanged; + Wt::Signal<> _trackPlayed; }; } // namespace UserInterface diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index bdbecaf4..8c58108c 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -18,7 +18,6 @@ */ #include "ReleasesView.hpp" - #include #include #include @@ -87,6 +86,7 @@ _filters(filters) _container = bindNew("releases"); _mostPlayedContainer = bindNew("most-played-releases"); _recentlyAddedContainer = bindNew("recently-added-releases"); + _recentlyPlayedContainer = bindNew("recently-played-releases"); _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); @@ -96,28 +96,18 @@ _filters(filters) })); refreshRecentlyAdded(); + refreshRecentlyPlayed(); refreshMostPlayed(); refresh(); filters->updated().connect(this, &Releases::refresh); - - std::string sessionId = LmsApp->sessionId(); - LmsApp->getMediaScanner().scanComplete().connect([=] (Scanner::MediaScanner::Stats stats) - { - if (stats.nbChanges() > 0) - { - Wt::WServer::instance()->post(sessionId, [=] - { - refreshRecentlyAdded(); - LmsApp->triggerUpdate(); - }); - } - }); } void Releases::refreshRecentlyAdded() { + LMS_LOG(UI, DEBUG) << "Refreshing recently added releases"; + auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1); Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); @@ -128,9 +118,23 @@ Releases::refreshRecentlyAdded() addCompactEntries(_recentlyAddedContainer, releases); } +void +Releases::refreshRecentlyPlayed() +{ + LMS_LOG(UI, DEBUG) << "Refreshing recently played releases"; + + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + + auto releases = TrackStats::getLastPlayedReleases(LmsApp->getDboSession(), LmsApp->getCurrentUser(), 5); + + _recentlyPlayedContainer->clear(); + addCompactEntries(_recentlyPlayedContainer, releases); +} + void Releases::refreshMostPlayed() { + LMS_LOG(UI, DEBUG) << "Refreshing most played releases"; Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); diff --git a/src/ui/explore/ReleasesView.hpp b/src/ui/explore/ReleasesView.hpp index 5c8374a2..fff677f1 100644 --- a/src/ui/explore/ReleasesView.hpp +++ b/src/ui/explore/ReleasesView.hpp @@ -38,9 +38,11 @@ class Releases : public Wt::WTemplate Wt::Signal releaseAdd; Wt::Signal releasePlay; - private: void refreshRecentlyAdded(); + void refreshRecentlyPlayed(); void refreshMostPlayed(); + + private: void refresh(); void addSome(); @@ -50,6 +52,7 @@ class Releases : public Wt::WTemplate Wt::WContainerWidget* _container; Wt::WContainerWidget* _mostPlayedContainer; Wt::WContainerWidget* _recentlyAddedContainer; + Wt::WContainerWidget* _recentlyPlayedContainer; }; } // namespace UserInterface From ed008533b27d070c89ca00896dd5ff3d53d1a8e5 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 8 Jun 2018 17:11:59 +0200 Subject: [PATCH 150/195] Added a playque shuffle --- approot/playqueue.xml | 5 +++++ src/database/Playlist.cpp | 25 ++++++++++++++++++++++++- src/database/Playlist.hpp | 5 ++++- src/ui/PlayQueueView.cpp | 13 +++++++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) diff --git a/approot/playqueue.xml b/approot/playqueue.xml index 4b26bd9d..2e45a05c 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -6,11 +6,16 @@ + + + +

${tr:Lms.PlayQueue.playqueue}

${nb-tracks} ${clear-btn} + ${shuffle-btn} ${radio-mode}
${entries} diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index 341bc368..4e7a0ee0 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -19,6 +19,7 @@ #include "Playlist.hpp" #include +#include #include "Cluster.hpp" #include "User.hpp" @@ -115,6 +116,13 @@ Playlist::getEntries(int offset, int size, bool& moreResults) const return res; } +std::vector> +Playlist::getAllEntries() const +{ + bool moreResults; + return getEntries(-1, -1, moreResults); +} + Wt::Dbo::ptr Playlist::getEntry(std::size_t pos) const { @@ -171,8 +179,23 @@ Playlist::getTrackIds() const .where("p.id = ?").bind(self()->id()); return std::vector(res.begin(), res.end()); - } +void +Playlist::shuffle() +{ + assert(session()); + + auto entries = getAllEntries(); + + auto now = std::chrono::system_clock::now(); + std::mt19937 randGenerator(std::chrono::duration_cast(now.time_since_epoch()).count()); + + std::shuffle(entries.begin(), entries.end(), randGenerator); + + clear(); + for (auto entry : entries) + PlaylistEntry::create(*session(), entry->getTrack(), self()); +} } // namespace Database diff --git a/src/database/Playlist.hpp b/src/database/Playlist.hpp index 904f3ae3..ef9aa059 100644 --- a/src/database/Playlist.hpp +++ b/src/database/Playlist.hpp @@ -53,11 +53,14 @@ class Playlist : public Wt::Dbo::Dbo // Modifiers void clear() { _entries.clear(); } + void shuffle(); // Get tracks, ordered by position std::size_t getCount() const; Wt::Dbo::ptr getEntry(std::size_t pos) const; std::vector> getEntries(int offset, int size, bool& moreResults) const; + std::vector> getAllEntries() const; + std::vector getTrackIds() const; // Get clusters, order by occurence @@ -95,7 +98,7 @@ class PlaylistEntry static pointer getById(Wt::Dbo::Session& session, IdType id); // Create utility - static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr playlist); + static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr playlist); // Accessors Wt::Dbo::ptr getTrack() const { return _track; } diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index 333f2e40..15a9c125 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -50,6 +50,7 @@ PlayQueue::PlayQueue() _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); _showMore->setHidden(true); + Wt::WText* shuffleBtn = bindNew("shuffle-btn", Wt::WString::tr("Lms.PlayQueue.shuffle"), Wt::TextFormat::XHTML); _radioMode = bindNew("radio-mode", Wt::WString::tr("Lms.PlayQueue.radio-mode")); _nbTracks = bindNew("nb-tracks"); @@ -78,6 +79,18 @@ PlayQueue::PlayQueue() updateInfo(); })); + shuffleBtn->clicked().connect([=] + { + { + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); + playlist.modify()->shuffle(); + } + _entriesContainer->clear(); + addSome(); + }); + _showMore->clicked().connect(std::bind([=] { addSome(); From c4273966239587a86f700c58a3556581011459c2 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 22 Jun 2018 13:10:19 +0200 Subject: [PATCH 151/195] Added an ApplicationGroup system to track the multiple sessions open by a user --- approot/messages.xml | 1 + src/Makefile.am | 3 +- src/main/main.cpp | 3 +- src/ui/LmsApplication.cpp | 120 ++++++++++++++++++++++---------- src/ui/LmsApplication.hpp | 32 +++++++-- src/ui/LmsApplicationGroup.cpp | 78 +++++++++++++++++++++ src/ui/LmsApplicationGroup.hpp | 57 +++++++++++++++ src/ui/PlayQueueView.cpp | 24 +++---- src/ui/SettingsView.cpp | 15 ++-- src/ui/admin/UserView.cpp | 2 +- src/ui/admin/UsersView.cpp | 2 +- src/ui/explore/ArtistsView.cpp | 4 +- src/ui/explore/ReleasesView.cpp | 4 +- 13 files changed, 274 insertions(+), 71 deletions(-) create mode 100644 src/ui/LmsApplicationGroup.cpp create mode 100644 src/ui/LmsApplicationGroup.hpp diff --git a/approot/messages.xml b/approot/messages.xml index 467646ca..1912f986 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -15,6 +15,7 @@ Confirm password Passwords don't match Are you sure? +Another session has been open. Reopen this one? Save diff --git a/src/Makefile.am b/src/Makefile.am index f3774a12..a8d7ec97 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,7 @@ lms_SOURCES = \ $(srcdir)/database/ScanSettings.cpp \ $(srcdir)/database/SqlQuery.cpp \ $(srcdir)/database/Track.cpp \ - $(srcdir)/database/TrackStats.cpp \ + $(srcdir)/database/TrackStats.cpp \ $(srcdir)/database/User.cpp \ $(srcdir)/image/Image.cpp \ $(srcdir)/metadata/AvFormat.cpp \ @@ -21,6 +21,7 @@ lms_SOURCES = \ $(srcdir)/scanner/MediaScanner.cpp \ $(srcdir)/ui/Auth.cpp \ $(srcdir)/ui/LmsApplication.cpp \ + $(srcdir)/ui/LmsApplicationGroup.cpp \ $(srcdir)/ui/MediaPlayer.cpp \ $(srcdir)/ui/PlayQueueView.cpp \ $(srcdir)/ui/SettingsView.cpp \ diff --git a/src/main/main.cpp b/src/main/main.cpp index 9a3820f4..44eb8740 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -122,12 +122,13 @@ int main(int argc, char* argv[]) // Initializing a connection pool to the database that will be shared along services auto connectionPool = Database::Handler::createConnectionPool(Config::instance().getPath("working-dir") / "lms.db"); + UserInterface::LmsApplicationGroups appGroups; Scanner::MediaScanner scanner(*connectionPool); // bind entry point server.addEntryPoint(Wt::EntryPointType::Application, std::bind(UserInterface::LmsApplication::create, - std::placeholders::_1, std::ref(*connectionPool), std::ref(scanner))); + std::placeholders::_1, std::ref(*connectionPool), std::ref(appGroups), std::ref(scanner))); // Start LMS_LOG(MAIN, INFO) << "Starting Media scanner..."; diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index a0eb5030..5749bb0b 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -50,13 +50,13 @@ namespace UserInterface { std::unique_ptr -LmsApplication::create(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner) +LmsApplication::create(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroups& appGroups, Scanner::MediaScanner& scanner) { /* * You could read information from the environment to decide whether * the user has permission to start a new application */ - return std::make_unique(env, connectionPool, scanner); + return std::make_unique(env, connectionPool, appGroups, scanner); } LmsApplication* @@ -71,9 +71,10 @@ LmsApplication::instance() * constructor so it is typically also an argument for your custom * application constructor. */ -LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner) +LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroups& appGroups, Scanner::MediaScanner& scanner) : Wt::WApplication(env), _db(connectionPool), + _appGroups(appGroups), _scanner(scanner), _imageResource(nullptr), _transcodeResource(nullptr) @@ -125,23 +126,23 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti } else { - LmsApp->getDb().getLogin().changed().connect(std::bind([=] - { - try - { - handleAuthEvent(); - } - catch (std::exception& e) - { - LMS_LOG(UI, ERROR) << "Error while handling auth event: " << e.what(); - throw std::runtime_error("Internal error"); - } - })); - + LmsApp->getDb().getLogin().changed().connect(this, &LmsApplication::handleAuthEvent); _auth = root()->addNew(); } } +LmsApplication::~LmsApplication() +{ + LmsApplicationInfo info = LmsApplicationInfo::fromEnvironment(environment()); + + getApplicationGroup().postOthers([info] + { + LmsApp->getGroupEvents().appClosed(info); + }); + + getApplicationGroup().leave(); +} + std::unique_ptr LmsApplication::createArtistAnchor(Database::Artist::pointer artist, bool addText) { @@ -250,25 +251,56 @@ handlePathChange(Wt::WStackedWidget* stack, bool isAdmin) wApp->setInternalPath("/artists", true); } -void -LmsApplication::handleAuthEvent(void) +LmsApplicationGroup& +LmsApplication::getApplicationGroup() { - if (!LmsApp->getDb().getLogin().loggedIn()) + return _appGroups[_userIdentity]; +} + +void +LmsApplication::handleAuthEvent() +{ + try { - LMS_LOG(UI, INFO) << "User logged out, session = " << Wt::WApplication::instance()->sessionId(); + if (!getDb().getLogin().loggedIn()) + { + LMS_LOG(UI, INFO) << "User '" << _userIdentity << " 'logged out, session = " << sessionId(); - goHomeAndQuit(); - return; + goHomeAndQuit(); + return; + } + else + { + _userIdentity = getAuthUser().identity(Wt::Auth::Identity::LoginName); + LmsApplicationInfo info = LmsApplicationInfo::fromEnvironment(environment()); + + LMS_LOG(UI, INFO) << "User '" << _userIdentity << "' logged in from '" << environment().clientAddress() << "', user agent = " << environment().userAgent() << ", session = " << sessionId(); + getApplicationGroup().join(info); + + getApplicationGroup().postOthers([info] + { + LmsApp->getGroupEvents().appOpen(info); + }); + + createHome(); + } } + catch (std::exception& e) + { + LMS_LOG(UI, ERROR) << "Error while handling auth event: " << e.what(); + throw std::runtime_error("Internal error"); + } +} - LMS_LOG(UI, INFO) << "User '" << LmsApp->getCurrentAuthUser().identity(Wt::Auth::Identity::LoginName) << "' logged in from '" << Wt::WApplication::instance()->environment().clientAddress() << "', user agent = " << Wt::WApplication::instance()->environment().userAgent() << ", session = " << Wt::WApplication::instance()->sessionId(); - - // Since we plug into the Media Scanner events, we need to enable updates +void +LmsApplication::createHome() +{ + // Handle Media Scanner events and other session events enableUpdates(true); { Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); - _isAdmin = LmsApp->getCurrentUser()->isAdmin(); + _isAdmin = LmsApp->getUser()->isAdmin(); } _imageResource = std::make_shared(_db); @@ -355,33 +387,33 @@ LmsApplication::handleAuthEvent(void) mainStack->addNew(); } - explore->tracksAdd.connect(std::bind([=] (std::vector tracks) + explore->tracksAdd.connect([=] (std::vector tracks) { playqueue->addTracks(tracks); - }, std::placeholders::_1)); + }); - explore->tracksPlay.connect(std::bind([=] (std::vector tracks) + explore->tracksPlay.connect([=] (std::vector tracks) { playqueue->playTracks(tracks); - }, std::placeholders::_1)); + }); // MediaPlayer MediaPlayer* player = main->bindNew("player"); // Events from MediaPlayer - player->playNext.connect(std::bind([=] + player->playNext.connect([=] { playqueue->playNext(); - })); - player->playPrevious.connect(std::bind([=] + }); + player->playPrevious.connect([=] { playqueue->playPrevious(); - })); - player->playbackEnded.connect(std::bind([=] + }); + player->playbackEnded.connect([=] { playqueue->playNext(); - })); + }); // Events from the PlayQueue playqueue->playTrack.connect(explore, &Explore::handleTrackPlayed); @@ -390,7 +422,7 @@ LmsApplication::handleAuthEvent(void) playqueue->playbackStop.connect(player, &MediaPlayer::stop); // Events from MediaScanner - std::string sessionId = this->sessionId(); + std::string sessionId = LmsApp->sessionId(); _scanner.scanComplete().connect([=] (Scanner::MediaScanner::Stats stats) { Wt::WServer::instance()->post(sessionId, [=] @@ -420,6 +452,19 @@ LmsApplication::handleAuthEvent(void) }); }); + // Events from Application group + _groupEvents.appOpen.connect([=] (LmsApplicationInfo info) + { + // Only one active session by user + setConfirmCloseMessage(""); + quit(Wt::WString::tr("Lms.quit-other-session")); + }); + + _groupEvents.appClosed.connect([=] (LmsApplicationInfo info) + { + ; + }); + internalPathChanged().connect(std::bind([=] { handlePathChange(mainStack, _isAdmin); @@ -449,6 +494,7 @@ LmsApplication::notifyMsg(const Wt::WString& message) root()->addNew(message); } + } // namespace UserInterface diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index b03a66d5..7733e691 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -30,6 +30,7 @@ #include "database/Cluster.hpp" #include "database/Release.hpp" +#include "LmsApplicationGroup.hpp" #include "Auth.hpp" namespace UserInterface { @@ -37,13 +38,20 @@ namespace UserInterface { class TranscodeResource; class ImageResource; +struct GroupEvents +{ + Wt::Signal appOpen; + Wt::Signal appClosed; +}; + class LmsApplication : public Wt::WApplication { public: - LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner); + LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroups& appGroups, Scanner::MediaScanner& scanner); + ~LmsApplication(); static std::unique_ptr create(const Wt::WEnvironment& env, - Wt::Dbo::SqlConnectionPool& connectionPool, Scanner::MediaScanner& scanner); + Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroups& appGroups, Scanner::MediaScanner& scanner); static LmsApplication* instance(); // Session application data @@ -52,11 +60,14 @@ class LmsApplication : public Wt::WApplication Database::Handler& getDb() { return _db;} Wt::Dbo::Session& getDboSession() { return _db.getSession();} - const Wt::Auth::User& getCurrentAuthUser() { return _db.getLogin().user(); } - Database::User::pointer getCurrentUser() { return _db.getCurrentUser(); } + const Wt::Auth::User& getAuthUser() { return _db.getLogin().user(); } + Database::User::pointer getUser() { return _db.getCurrentUser(); } + Wt::WString getUserIdentity() { return _userIdentity; } Scanner::MediaScanner& getMediaScanner() { return _scanner; } + GroupEvents& getGroupEvents() { return _groupEvents; } + // Utils void goHome(); void goHomeAndQuit(); @@ -68,10 +79,18 @@ class LmsApplication : public Wt::WApplication private: - void handleAuthEvent(void); + LmsApplicationGroup& getApplicationGroup(); + + // Events + void handleAuthEvent(); void notify(const Wt::WEvent& event) override; + void createHome(); + Database::Handler _db; + LmsApplicationGroups& _appGroups; + GroupEvents _groupEvents; + Wt::WString _userIdentity; Auth* _auth; Scanner::MediaScanner& _scanner; std::shared_ptr _imageResource; @@ -79,7 +98,8 @@ class LmsApplication : public Wt::WApplication bool _isAdmin = false; }; -// Helper to get session data + +// Helper to get session instance #define LmsApp LmsApplication::instance() } // namespace UserInterface diff --git a/src/ui/LmsApplicationGroup.cpp b/src/ui/LmsApplicationGroup.cpp new file mode 100644 index 00000000..7e64ca65 --- /dev/null +++ b/src/ui/LmsApplicationGroup.cpp @@ -0,0 +1,78 @@ +/* + * 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 . + */ + +#include "LmsApplicationGroup.hpp" + +#include + +#include +#include + + +namespace UserInterface { + +LmsApplicationInfo +LmsApplicationInfo::fromEnvironment(const Wt::WEnvironment& env) +{ + LmsApplicationInfo info = {.userAgent = wApp->environment().agent()}; + return info; +} + +void +LmsApplicationGroup::join(LmsApplicationInfo info) +{ + + _apps.emplace(wApp->sessionId(), std::move(info)); +} + +void +LmsApplicationGroup::leave() +{ + _apps.erase(wApp->sessionId()); +} + +std::vector +LmsApplicationGroup::getOtherSessionIds() const +{ + std::vector res; + + for (auto const& app : _apps) + { + if (app.first != wApp->sessionId()) + res.push_back(app.first); + } + + return res; +} + +void +LmsApplicationGroup::postOthers(std::function func) const +{ + for (auto const& sessionId : getOtherSessionIds()) + { + Wt::WServer::instance()->post(sessionId, [=] + { + func(); + wApp->triggerUpdate(); + }); + } +} + + +} // UserInterface diff --git a/src/ui/LmsApplicationGroup.hpp b/src/ui/LmsApplicationGroup.hpp new file mode 100644 index 00000000..e18cc456 --- /dev/null +++ b/src/ui/LmsApplicationGroup.hpp @@ -0,0 +1,57 @@ +/* + * 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 . + */ + +#pragma once + +#include + +#include +#include + +namespace UserInterface { + + +struct LmsApplicationInfo +{ + Wt::UserAgent userAgent; + + static LmsApplicationInfo fromEnvironment(const Wt::WEnvironment& env); +}; + +// LmsApplication instances are grouped by User +class LmsApplicationGroup +{ + public: + void join(LmsApplicationInfo info); + void leave(); + + std::vector list() const; + + void postOthers(std::function func) const; + + private: + + std::vector getOtherSessionIds() const; + + std::map _apps; +}; + +using LmsApplicationGroups = std::map; + +} // UserInterface diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index 15a9c125..d0e6b940 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -58,11 +58,11 @@ PlayQueue::PlayQueue() { Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); if (!playlist) - playlist = Database::Playlist::create(LmsApp->getDboSession(), currentPlayQueueName, false, LmsApp->getCurrentUser()); + playlist = Database::Playlist::create(LmsApp->getDboSession(), currentPlayQueueName, false, LmsApp->getUser()); - _trackPos = LmsApp->getCurrentUser()->getCurPlayingTrackPos(); + _trackPos = LmsApp->getUser()->getCurPlayingTrackPos(); } clearBtn->clicked().connect(std::bind([=] @@ -70,7 +70,7 @@ PlayQueue::PlayQueue() { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); playlist.modify()->clear(); _showMore->setHidden(true); } @@ -84,7 +84,7 @@ PlayQueue::PlayQueue() { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); playlist.modify()->shuffle(); } _entriesContainer->clear(); @@ -117,7 +117,7 @@ PlayQueue::play(std::size_t pos) { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); // If out of range, stop playing if (pos >= playlist->getCount()) @@ -135,7 +135,7 @@ PlayQueue::play(std::size_t pos) trackId = track.id(); - auto stats = Database::TrackStats::get(LmsApp->getDboSession(), track, LmsApp->getCurrentUser()); + auto stats = Database::TrackStats::get(LmsApp->getDboSession(), track, LmsApp->getUser()); stats.modify()->incPlayCount(); stats.modify()->setLastPlayed(Wt::WLocalDateTime::currentServerDateTime().toUTC()); @@ -175,7 +175,7 @@ PlayQueue::updateInfo() { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); _nbTracks->setText(Wt::WString::tr("Lms.PlayQueue.nb-tracks").arg(static_cast(playlist->getCount()))); } @@ -201,7 +201,7 @@ PlayQueue::enqueueTracks(const std::vector& tracks) // Use a "session" playqueue in order to store the current playqueue // so that the user can disconnect and get its playqueue back - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); for (auto track : tracks) Database::PlaylistEntry::create(LmsApp->getDboSession(), track, playlist); @@ -228,7 +228,7 @@ PlayQueue::playTracks(const std::vector& tracks) { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playqueue = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); + auto playqueue = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); playqueue.modify()->clear(); _entriesContainer->clear(); @@ -245,7 +245,7 @@ PlayQueue::addSome() { Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); bool moreResults; auto playlistEntries = playlist->getEntries(_entriesContainer->count(), 50, moreResults); @@ -313,7 +313,7 @@ PlayQueue::addRadioTrack() auto now = std::chrono::system_clock::now(); std::mt19937 randGenerator(std::chrono::duration_cast(now.time_since_epoch()).count()); - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getCurrentUser()); + auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); std::set playlistTrackIds; { diff --git a/src/ui/SettingsView.cpp b/src/ui/SettingsView.cpp index 89a99107..5fbcb668 100644 --- a/src/ui/SettingsView.cpp +++ b/src/ui/SettingsView.cpp @@ -68,11 +68,11 @@ class SettingsModel : public Wt::WFormModel { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto bitrate = getBitrateRow(LmsApp->getCurrentUser()->getAudioBitrate()); + auto bitrate = getBitrateRow(LmsApp->getUser()->getAudioBitrate()); if (bitrate) setValue(BitrateField, bitrateString(*bitrate)); - auto encodingRow = getEncodingRow(LmsApp->getCurrentUser()->getAudioEncoding()); + auto encodingRow = getEncodingRow(LmsApp->getUser()->getAudioEncoding()); if (encodingRow) setValue(EncodingField, encodingString(*encodingRow)); @@ -84,14 +84,14 @@ class SettingsModel : public Wt::WFormModel auto bitrateRow = getBitrateRow(Wt::asString(value(BitrateField))); assert(bitrateRow); - LmsApp->getCurrentUser().modify()->setAudioBitrate(bitrate(*bitrateRow)); + LmsApp->getUser().modify()->setAudioBitrate(bitrate(*bitrateRow)); auto encodingRow = getEncodingRow(Wt::asString(value(EncodingField))); - LmsApp->getCurrentUser().modify()->setAudioEncoding(encoding(*encodingRow)); + LmsApp->getUser().modify()->setAudioEncoding(encoding(*encodingRow)); if (!valueText(PasswordField).empty()) { - Database::Handler::getPasswordService().updatePassword(LmsApp->getCurrentAuthUser(), valueText(PasswordField)); + Database::Handler::getPasswordService().updatePassword(LmsApp->getAuthUser(), valueText(PasswordField)); } } @@ -104,8 +104,7 @@ class SettingsModel : public Wt::WFormModel if (!valueText(PasswordField).empty()) { // Evaluate the strength of the password - auto res = Database::Handler::getPasswordService().strengthValidator()->evaluateStrength(valueText(PasswordField), - LmsApp->getCurrentAuthUser().identity(Wt::Auth::Identity::LoginName), ""); + auto res = Database::Handler::getPasswordService().strengthValidator()->evaluateStrength(valueText(PasswordField), LmsApp->getUserIdentity(), ""); if (!res.isValid()) error = res.message(); @@ -209,7 +208,7 @@ class SettingsModel : public Wt::WFormModel std::size_t maxAudioBitrate; { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - maxAudioBitrate = LmsApp->getCurrentUser()->getMaxAudioBitrate(); + maxAudioBitrate = LmsApp->getUser()->getMaxAudioBitrate(); } std::size_t id = 0; diff --git a/src/ui/admin/UserView.cpp b/src/ui/admin/UserView.cpp index 43839835..0bf1de76 100644 --- a/src/ui/admin/UserView.cpp +++ b/src/ui/admin/UserView.cpp @@ -78,7 +78,7 @@ class UserModel : public Wt::WFormModel Wt::Auth::User authUser = LmsApp->getDb().getUserDatabase().findWithId( std::to_string(*_userId) ); Database::User::pointer user = LmsApp->getDb().getUser(authUser); - if (user == LmsApp->getCurrentUser()) + if (user == LmsApp->getUser()) throw std::runtime_error("Cannot edit ourselves"); auto bitrate = getBitrateLimitRow(user->getMaxAudioBitrate()); diff --git a/src/ui/admin/UsersView.cpp b/src/ui/admin/UsersView.cpp index 3a2c7940..e38140b3 100644 --- a/src/ui/admin/UsersView.cpp +++ b/src/ui/admin/UsersView.cpp @@ -75,7 +75,7 @@ UsersView::refreshView() entry->bindString("name", authUser.identity(Wt::Auth::Identity::LoginName), Wt::TextFormat::Plain); // Don't edit ourself this way - if (LmsApp->getCurrentUser() == user) + if (LmsApp->getUser() == user) continue; entry->setCondition("if-edit", true); diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index b664daec..2ad6e681 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -101,7 +101,7 @@ void Artists::refreshRecentlyPlayed() { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto artists = TrackStats::getLastPlayedArtists(LmsApp->getDboSession(), LmsApp->getCurrentUser(), 5); + auto artists = TrackStats::getLastPlayedArtists(LmsApp->getDboSession(), LmsApp->getUser(), 5); _recentlyPlayedContainer->clear(); addCompactEntries(_recentlyPlayedContainer, artists); @@ -112,7 +112,7 @@ void Artists::refreshMostPlayed() { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto artists = TrackStats::getMostPlayedArtists(LmsApp->getDboSession(), LmsApp->getCurrentUser(), 5); + auto artists = TrackStats::getMostPlayedArtists(LmsApp->getDboSession(), LmsApp->getUser(), 5); _mostPlayedContainer->clear(); addCompactEntries(_mostPlayedContainer, artists); diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index 8c58108c..a7e0d60b 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -125,7 +125,7 @@ Releases::refreshRecentlyPlayed() Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto releases = TrackStats::getLastPlayedReleases(LmsApp->getDboSession(), LmsApp->getCurrentUser(), 5); + auto releases = TrackStats::getLastPlayedReleases(LmsApp->getDboSession(), LmsApp->getUser(), 5); _recentlyPlayedContainer->clear(); addCompactEntries(_recentlyPlayedContainer, releases); @@ -138,7 +138,7 @@ Releases::refreshMostPlayed() Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto releases = TrackStats::getMostPlayedReleases(LmsApp->getDboSession(), LmsApp->getCurrentUser(), 5); + auto releases = TrackStats::getMostPlayedReleases(LmsApp->getDboSession(), LmsApp->getUser(), 5); _mostPlayedContainer->clear(); addCompactEntries(_mostPlayedContainer, releases); From ff96775a0342d00db9118129f783b22473c86e8f Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 26 Jun 2018 13:28:24 +0200 Subject: [PATCH 152/195] Corrected multithreading issue --- src/main/main.cpp | 2 +- src/ui/LmsApplication.cpp | 6 +++--- src/ui/LmsApplication.hpp | 6 +++--- src/ui/LmsApplicationGroup.cpp | 9 +++++++++ src/ui/LmsApplicationGroup.hpp | 15 ++++++++++++--- 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/main/main.cpp b/src/main/main.cpp index 44eb8740..f047267f 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -122,7 +122,7 @@ int main(int argc, char* argv[]) // Initializing a connection pool to the database that will be shared along services auto connectionPool = Database::Handler::createConnectionPool(Config::instance().getPath("working-dir") / "lms.db"); - UserInterface::LmsApplicationGroups appGroups; + UserInterface::LmsApplicationGroupContainer appGroups; Scanner::MediaScanner scanner(*connectionPool); // bind entry point diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 5749bb0b..237b92df 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -50,7 +50,7 @@ namespace UserInterface { std::unique_ptr -LmsApplication::create(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroups& appGroups, Scanner::MediaScanner& scanner) +LmsApplication::create(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroupContainer& appGroups, Scanner::MediaScanner& scanner) { /* * You could read information from the environment to decide whether @@ -71,7 +71,7 @@ LmsApplication::instance() * constructor so it is typically also an argument for your custom * application constructor. */ -LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroups& appGroups, Scanner::MediaScanner& scanner) +LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroupContainer& appGroups, Scanner::MediaScanner& scanner) : Wt::WApplication(env), _db(connectionPool), _appGroups(appGroups), @@ -254,7 +254,7 @@ handlePathChange(Wt::WStackedWidget* stack, bool isAdmin) LmsApplicationGroup& LmsApplication::getApplicationGroup() { - return _appGroups[_userIdentity]; + return _appGroups.get(_userIdentity); } void diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index 7733e691..4bdd04bf 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -47,11 +47,11 @@ struct GroupEvents class LmsApplication : public Wt::WApplication { public: - LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroups& appGroups, Scanner::MediaScanner& scanner); + LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroupContainer& appGroups, Scanner::MediaScanner& scanner); ~LmsApplication(); static std::unique_ptr create(const Wt::WEnvironment& env, - Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroups& appGroups, Scanner::MediaScanner& scanner); + Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroupContainer& appGroups, Scanner::MediaScanner& scanner); static LmsApplication* instance(); // Session application data @@ -88,7 +88,7 @@ class LmsApplication : public Wt::WApplication void createHome(); Database::Handler _db; - LmsApplicationGroups& _appGroups; + LmsApplicationGroupContainer& _appGroups; GroupEvents _groupEvents; Wt::WString _userIdentity; Auth* _auth; diff --git a/src/ui/LmsApplicationGroup.cpp b/src/ui/LmsApplicationGroup.cpp index 7e64ca65..8a742486 100644 --- a/src/ui/LmsApplicationGroup.cpp +++ b/src/ui/LmsApplicationGroup.cpp @@ -37,6 +37,7 @@ LmsApplicationInfo::fromEnvironment(const Wt::WEnvironment& env) void LmsApplicationGroup::join(LmsApplicationInfo info) { + std::lock_guard lock(_mutex); _apps.emplace(wApp->sessionId(), std::move(info)); } @@ -52,6 +53,7 @@ LmsApplicationGroup::getOtherSessionIds() const { std::vector res; + std::lock_guard lock(_mutex); for (auto const& app : _apps) { if (app.first != wApp->sessionId()) @@ -74,5 +76,12 @@ LmsApplicationGroup::postOthers(std::function func) const } } +LmsApplicationGroup& +LmsApplicationGroupContainer::get(Wt::WString identity) +{ + std::lock_guard lock(_mutex); + + return _apps[identity]; +} } // UserInterface diff --git a/src/ui/LmsApplicationGroup.hpp b/src/ui/LmsApplicationGroup.hpp index e18cc456..326fe63a 100644 --- a/src/ui/LmsApplicationGroup.hpp +++ b/src/ui/LmsApplicationGroup.hpp @@ -20,6 +20,7 @@ #pragma once #include +#include #include #include @@ -41,17 +42,25 @@ class LmsApplicationGroup void join(LmsApplicationInfo info); void leave(); - std::vector list() const; - void postOthers(std::function func) const; private: + mutable std::mutex _mutex; + std::vector getOtherSessionIds() const; std::map _apps; }; -using LmsApplicationGroups = std::map; +class LmsApplicationGroupContainer +{ + public: + LmsApplicationGroup& get(Wt::WString identity); + + private: + std::map _apps; + std::mutex _mutex; +}; } // UserInterface From 853bcbe008d04f6b7983a0003ccebf2d3bb5269c Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 26 Jul 2018 10:04:29 +0200 Subject: [PATCH 153/195] Corrected multithreading issue --- src/ui/LmsApplicationGroup.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ui/LmsApplicationGroup.cpp b/src/ui/LmsApplicationGroup.cpp index 8a742486..36e0647b 100644 --- a/src/ui/LmsApplicationGroup.cpp +++ b/src/ui/LmsApplicationGroup.cpp @@ -45,6 +45,8 @@ LmsApplicationGroup::join(LmsApplicationInfo info) void LmsApplicationGroup::leave() { + std::lock_guard lock(_mutex); + _apps.erase(wApp->sessionId()); } From a31fb3c062c23a60fd945d2035b8271b0f0ca28d Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 26 Jul 2018 10:26:49 +0200 Subject: [PATCH 154/195] Always use our own exception tree --- src/av/AvInfo.cpp | 2 +- src/av/AvInfo.hpp | 8 +++++++- src/av/AvTranscoder.cpp | 8 ++++---- src/database/SqlQuery.cpp | 6 ++---- src/ui/LmsApplication.cpp | 4 ++-- src/ui/admin/InitWizardView.cpp | 3 ++- src/ui/admin/UserView.cpp | 5 +++-- src/ui/resource/ImageResource.cpp | 5 +++-- src/utils/Path.cpp | 6 +++--- 9 files changed, 27 insertions(+), 20 deletions(-) diff --git a/src/av/AvInfo.cpp b/src/av/AvInfo.cpp index 186d41f6..1b5f7c6d 100644 --- a/src/av/AvInfo.cpp +++ b/src/av/AvInfo.cpp @@ -36,7 +36,7 @@ static std::string averror_to_string(int error) } MediaFileException::MediaFileException(int avError) -: LmsException("MediaFileException: " + averror_to_string(avError)) +: AvException("MediaFileException: " + averror_to_string(avError)) { } diff --git a/src/av/AvInfo.hpp b/src/av/AvInfo.hpp index f3a4ee53..7e0e79ed 100644 --- a/src/av/AvInfo.hpp +++ b/src/av/AvInfo.hpp @@ -57,7 +57,13 @@ struct StreamInfo std::size_t bitrate; }; -class MediaFileException : public LmsException +class AvException : public LmsException +{ + public: + AvException(const std::string& msg) : LmsException(msg) {} +}; + +class MediaFileException : public AvException { public: MediaFileException(int avError); diff --git a/src/av/AvTranscoder.cpp b/src/av/AvTranscoder.cpp index 479d50f6..9dc28884 100644 --- a/src/av/AvTranscoder.cpp +++ b/src/av/AvTranscoder.cpp @@ -52,7 +52,7 @@ std::string encodingToMimetype(Encoding encoding) return encodingInfo.mimetype; } - throw std::logic_error("encoding_to_mimetype failed!"); + throw AvException("Invalid encoding"); } int encodingToInt(Encoding encoding) @@ -63,7 +63,7 @@ int encodingToInt(Encoding encoding) return encodingInfo.id; } - throw std::logic_error("encoding_to_int failed!"); + throw AvException("Invalid encoding"); } Encoding encodingFromInt(int encodingId) @@ -74,7 +74,7 @@ Encoding encodingFromInt(int encodingId) return encodingInfo.encoding; } - throw std::logic_error("encoding_from_int failed!"); + throw AvException("Invalid encodingId"); } // TODO, parametrize? @@ -104,7 +104,7 @@ Transcoder::init() if (!avConvPath.empty()) LMS_LOG(TRANSCODE, INFO) << "Using transcoder " << avConvPath.string(); else - throw std::runtime_error("Cannot find any transcoder binary!"); + throw AvException("Cannot find any transcoder binary!"); } Transcoder::Transcoder(boost::filesystem::path filePath, TranscodeParameters parameters) diff --git a/src/database/SqlQuery.cpp b/src/database/SqlQuery.cpp index 6956d180..c10eaee1 100644 --- a/src/database/SqlQuery.cpp +++ b/src/database/SqlQuery.cpp @@ -20,9 +20,8 @@ #include "SqlQuery.hpp" #include - +#include #include -#include WhereClause& WhereClause::And(const WhereClause& otherClause) @@ -70,8 +69,7 @@ WhereClause::get(void) const WhereClause& WhereClause::bind(const std::string& bindArg) { - if (_bindArgs.size() >= static_cast( std::count(_clause.begin(), _clause.end(), '?') )) - throw std::runtime_error("Too many bind args!"); + assert(_bindArgs.size() < static_cast(std::count(_clause.begin(), _clause.end(), '?'))); _bindArgs.push_back(bindArg); diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 237b92df..cd8860bc 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -288,7 +288,7 @@ LmsApplication::handleAuthEvent() catch (std::exception& e) { LMS_LOG(UI, ERROR) << "Error while handling auth event: " << e.what(); - throw std::runtime_error("Internal error"); + throw LmsException("Internal error"); // Do not put details here at it appears on the user rendered html } } @@ -483,7 +483,7 @@ LmsApplication::notify(const Wt::WEvent& event) catch (std::exception& e) { LMS_LOG(UI, ERROR) << "Caught exception: " << e.what(); - throw std::runtime_error("Internal error"); + throw LmsException("Internal error"); // Do not put details here at it appears on the user rendered html } } diff --git a/src/ui/admin/InitWizardView.cpp b/src/ui/admin/InitWizardView.cpp index 93f8faaf..bbc97b0f 100644 --- a/src/ui/admin/InitWizardView.cpp +++ b/src/ui/admin/InitWizardView.cpp @@ -24,6 +24,7 @@ #include #include +#include "utils/Exception.hpp" #include "utils/Logger.hpp" #include "common/Validators.hpp" @@ -58,7 +59,7 @@ class InitWizardModel : public Wt::WFormModel // Check if a user already exist // If it's the case, just do nothing if (!Database::User::getAll(LmsApp->getDboSession()).empty()) - throw std::runtime_error("Admin user already created"); + throw LmsException("Admin user already created"); // Create user Wt::Auth::User authUser = LmsApp->getDb().getUserDatabase().registerNew(); diff --git a/src/ui/admin/UserView.cpp b/src/ui/admin/UserView.cpp index 0bf1de76..da5ba9bd 100644 --- a/src/ui/admin/UserView.cpp +++ b/src/ui/admin/UserView.cpp @@ -30,8 +30,9 @@ #include #include "common/Validators.hpp" -#include "utils/Utils.hpp" +#include "utils/Exception.hpp" #include "utils/Logger.hpp" +#include "utils/Utils.hpp" #include "LmsApplication.hpp" @@ -79,7 +80,7 @@ class UserModel : public Wt::WFormModel Database::User::pointer user = LmsApp->getDb().getUser(authUser); if (user == LmsApp->getUser()) - throw std::runtime_error("Cannot edit ourselves"); + throw LmsException("Cannot edit ourselves"); auto bitrate = getBitrateLimitRow(user->getMaxAudioBitrate()); if (bitrate) diff --git a/src/ui/resource/ImageResource.cpp b/src/ui/resource/ImageResource.cpp index d78c2b46..dc45b339 100644 --- a/src/ui/resource/ImageResource.cpp +++ b/src/ui/resource/ImageResource.cpp @@ -22,6 +22,7 @@ #include #include +#include "utils/Exception.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -58,7 +59,7 @@ ImageResource::getDefaultCover(std::size_t size) Image::Image image; if (!image.load( Wt::WApplication::instance()->docRoot() + unknownCoverPath )) - throw std::runtime_error("Cannot read default cover file"); + throw LmsException("Cannot read default cover file"); image.scale(size); @@ -80,7 +81,7 @@ ImageResource::getDefaultArtistImage(std::size_t size) Image::Image image; if (!image.load( Wt::WApplication::instance()->docRoot() + unknownArtistImagePath)) - throw std::runtime_error("Cannot read default artist image file"); + throw LmsException("Cannot read default artist image file"); image.scale(size); diff --git a/src/utils/Path.cpp b/src/utils/Path.cpp index b6511840..b1a87666 100644 --- a/src/utils/Path.cpp +++ b/src/utils/Path.cpp @@ -21,11 +21,11 @@ #include #include -#include #include // for boost::crc_32_type #include +#include "utils/Exception.hpp" #include "utils/Logger.hpp" boost::filesystem::path searchExecPath(std::string filename) @@ -34,7 +34,7 @@ boost::filesystem::path searchExecPath(std::string filename) path = ::getenv("PATH"); if (path.empty()) - throw std::runtime_error("Environment variable PATH not found"); + throw LmsException("Environment variable PATH not found"); std::string result; typedef boost::tokenizer > tokenizer; @@ -75,7 +75,7 @@ void computeCrc(const boost::filesystem::path& p, std::vector& cr else { LMS_LOG(DBUPDATER, ERROR) << "Failed to open file '" << p.string() << "'"; - throw std::runtime_error("Failed to open file '" + p.string() + "'" ); + throw LmsException("Failed to open file '" + p.string() + "'" ); } // Copy back result into the vector From 4cadb915ba259767aec9e48a0fa714d69a9e9abb Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 1 Aug 2018 12:57:03 +0200 Subject: [PATCH 155/195] Added demo account support --- approot/admin-user.xml | 20 +++++++++--- approot/admin-users.xml | 2 +- approot/messages.xml | 8 +++++ conf/lms.conf | 3 +- src/database/User.cpp | 11 +++++-- src/database/User.hpp | 24 ++++++++++---- src/ui/Auth.cpp | 12 +++++++ src/ui/SettingsView.cpp | 11 +++++++ src/ui/admin/InitWizardView.cpp | 2 +- src/ui/admin/UserView.cpp | 58 +++++++++++++++++++++++---------- src/ui/admin/UsersView.cpp | 7 ++++ 11 files changed, 124 insertions(+), 34 deletions(-) diff --git a/approot/admin-user.xml b/approot/admin-user.xml index f3a9ebc9..b74f00b4 100644 --- a/approot/admin-user.xml +++ b/approot/admin-user.xml @@ -33,19 +33,31 @@
- ${audio-bitrate-limit} - kbps + ${audio-bitrate-limit} + kbps
${audio-bitrate-limit-info}
- + ${} +
+ +
+ ${demo} +
+
+ ${demo-info} +
+
+ ${}
${save-btn class="btn-primary"} diff --git a/approot/admin-users.xml b/approot/admin-users.xml index be2e36d9..481a79bd 100644 --- a/approot/admin-users.xml +++ b/approot/admin-users.xml @@ -11,7 +11,7 @@
- ${name} ${}${edit-btn} ${del-btn class="btn-danger"}${} + ${name} ${}${tag}${} ${}${edit-btn} ${del-btn class="btn-danger"}${}
diff --git a/approot/messages.xml b/approot/messages.xml index 1912f986..561a2f49 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -36,10 +36,17 @@ New user +Admin Delete +Demo Edit Users + +Audio bitrate limit +Demo account +Demo account already exists! +Demo password must be the login name! User already exists! New user New user created! @@ -83,6 +90,7 @@ Audio Auto Bitrate +Cannot save using a demo account! Encoding MP3 OGA diff --git a/conf/lms.conf b/conf/lms.conf index 3d9b06f5..4c8acc54 100644 --- a/conf/lms.conf +++ b/conf/lms.conf @@ -20,4 +20,5 @@ wt-resources="/usr/share/Wt/resources"; docroot = "/usr/share/lms/docroot/;/resources,/css,/images,/js,/favicon.ico"; approot = "/usr/share/lms/approot"; - +# Turn on this option to allow the demo account creation/use +#demo = false; diff --git a/src/database/User.cpp b/src/database/User.cpp index dd8ed1dd..b687572f 100644 --- a/src/database/User.cpp +++ b/src/database/User.cpp @@ -33,7 +33,7 @@ User::audioBitrates = User::User() : _maxAudioBitrate(audioBitrates.back()), -_isAdmin(false), +_type(Type::REGULAR), _audioBitrate(defaultAudioBitrate), _audioEncoding(AudioEncoding::AUTO), _curPlayingTrackPos(0) @@ -48,6 +48,13 @@ User::getAll(Wt::Dbo::Session& session) return std::vector(res.begin(), res.end()); } +User::pointer +User::getDemo(Wt::Dbo::Session& session) +{ + pointer res = session.find().where("type = ?").bind(Type::DEMO); + return res; +} + User::pointer User::create(Wt::Dbo::Session& session) { @@ -55,7 +62,7 @@ User::create(Wt::Dbo::Session& session) } User::pointer -User::getById(Wt::Dbo::Session& session, id_type id) +User::getById(Wt::Dbo::Session& session, IdType id) { return session.find().where("id = ?").bind( id ); } diff --git a/src/database/User.hpp b/src/database/User.hpp index 325b11a9..fd536172 100644 --- a/src/database/User.hpp +++ b/src/database/User.hpp @@ -24,6 +24,8 @@ #include #include +#include "Types.hpp" + namespace Database { class User; @@ -43,12 +45,18 @@ enum class AudioEncoding class User : public Wt::Dbo::Dbo { public: - typedef Wt::Dbo::dbo_traits::IdType id_type; - typedef Wt::Dbo::ptr pointer; + using pointer = Wt::Dbo::ptr; static const std::size_t MinNameLength = 3; static const std::size_t MaxNameLength = 15; + enum class Type + { + REGULAR, + ADMIN, + DEMO + }; + // list of audio parameters static const std::vector audioBitrates; @@ -58,18 +66,20 @@ class User : public Wt::Dbo::Dbo static pointer create(Wt::Dbo::Session& session); // accessors - static pointer getById(Wt::Dbo::Session& session, id_type id); + static pointer getById(Wt::Dbo::Session& session, IdType id); static std::vector getAll(Wt::Dbo::Session& session); + static pointer getDemo(Wt::Dbo::Session& session); // write - void setAdmin(bool admin) { _isAdmin = admin; } + void setType(Type type) { _type = type; } void setAudioBitrate(std::size_t bitrate); void setAudioEncoding(AudioEncoding encoding) { _audioEncoding = encoding; } void setMaxAudioBitrate(std::size_t bitrate); void setCurPlayingTrackPos(std::size_t pos) { _curPlayingTrackPos = pos; } // read - bool isAdmin() const { return _isAdmin; } + bool isAdmin() const { return _type == Type::ADMIN; } + bool isDemo() const { return _type == Type::DEMO; } std::size_t getAudioBitrate() const; AudioEncoding getAudioEncoding() const { return _audioEncoding; } std::size_t getMaxAudioBitrate() const; @@ -79,7 +89,7 @@ class User : public Wt::Dbo::Dbo void persist(Action& a) { Wt::Dbo::field(a, _maxAudioBitrate, "max_audio_bitrate"); - Wt::Dbo::field(a, _isAdmin, "admin"); + Wt::Dbo::field(a, _type, "type"); Wt::Dbo::field(a, _audioBitrate, "audio_bitrate"); Wt::Dbo::field(a, _audioEncoding, "audio_encoding"); // User's dynamic data @@ -93,7 +103,7 @@ class User : public Wt::Dbo::Dbo // Admin defined settings int _maxAudioBitrate; - bool _isAdmin; + Type _type; // User defined settings int _audioBitrate; diff --git a/src/ui/Auth.cpp b/src/ui/Auth.cpp index c2837d2c..c3f4d4b5 100644 --- a/src/ui/Auth.cpp +++ b/src/ui/Auth.cpp @@ -40,6 +40,18 @@ Auth::Auth() // LoginName setFormWidget(Wt::Auth::AuthModel::LoginNameField, std::make_unique()); + { + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + + auto demoUser = Database::User::getDemo(LmsApp->getDboSession()); + if (demoUser) + { + Wt::Auth::User authUser = LmsApp->getDb().getUserDatabase().findWithId(std::to_string(demoUser.id())); + _model->setValue(Wt::Auth::AuthModel::LoginNameField, authUser.identity(Wt::Auth::Identity::LoginName)); + _model->setValue(Wt::Auth::AuthModel::PasswordField, authUser.identity(Wt::Auth::Identity::LoginName)); + } + } + // Password auto password = std::make_unique(); password->setEchoMode(Wt::EchoMode::Password); diff --git a/src/ui/SettingsView.cpp b/src/ui/SettingsView.cpp index 5fbcb668..f6c7a8eb 100644 --- a/src/ui/SettingsView.cpp +++ b/src/ui/SettingsView.cpp @@ -295,6 +295,17 @@ SettingsView::refreshView() saveBtn->clicked().connect(std::bind([=] () { + + { + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + + if (LmsApp->getUser()->isDemo()) + { + LmsApp->notifyMsg(Wt::WString::tr("Lms.Settings.demo-cannot-save")); + return; + } + } + t->updateModel(model.get()); if (model->validate()) diff --git a/src/ui/admin/InitWizardView.cpp b/src/ui/admin/InitWizardView.cpp index bbc97b0f..4bf99a02 100644 --- a/src/ui/admin/InitWizardView.cpp +++ b/src/ui/admin/InitWizardView.cpp @@ -69,7 +69,7 @@ class InitWizardModel : public Wt::WFormModel authUser.setIdentity(Wt::Auth::Identity::LoginName, valueText(AdminLoginField)); Database::Handler::getPasswordService().updatePassword(authUser, valueText(PasswordField)); - user.modify()->setAdmin( true ); + user.modify()->setType(Database::User::Type::ADMIN); } bool validateField(Field field) diff --git a/src/ui/admin/UserView.cpp b/src/ui/admin/UserView.cpp index da5ba9bd..d28de35d 100644 --- a/src/ui/admin/UserView.cpp +++ b/src/ui/admin/UserView.cpp @@ -30,6 +30,7 @@ #include #include "common/Validators.hpp" +#include "utils/Config.hpp" #include "utils/Exception.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -45,8 +46,9 @@ class UserModel : public Wt::WFormModel static const Field LoginField; static const Field PasswordField; static const Field BitrateLimitField; + static const Field DemoField; - UserModel(boost::optional userId) + UserModel(boost::optional userId) : Wt::WFormModel(), _userId(userId) { @@ -58,7 +60,7 @@ class UserModel : public Wt::WFormModel addField(PasswordField); addField(BitrateLimitField); - + addField(DemoField); if (!_userId) setValidator(PasswordField, createMandatoryValidator()); @@ -76,8 +78,8 @@ class UserModel : public Wt::WFormModel Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - Wt::Auth::User authUser = LmsApp->getDb().getUserDatabase().findWithId( std::to_string(*_userId) ); - Database::User::pointer user = LmsApp->getDb().getUser(authUser); + auto authUser = LmsApp->getDb().getUserDatabase().findWithId( std::to_string(*_userId) ); + auto user = LmsApp->getDb().getUser(authUser); if (user == LmsApp->getUser()) throw LmsException("Cannot edit ourselves"); @@ -117,6 +119,9 @@ class UserModel : public Wt::WFormModel auto bitrateLimitRow = getBitrateLimitRow(Wt::asString(value(BitrateLimitField))); user.modify()->setMaxAudioBitrate(bitrateLimit(*bitrateLimitRow)); + + if (Wt::asNumber(value(DemoField))) + user.modify()->setType(Database::User::Type::DEMO); } } @@ -140,30 +145,41 @@ class UserModel : public Wt::WFormModel auto user = LmsApp->getDb().getUserDatabase().findWithIdentity(Wt::Auth::Identity::LoginName, valueText(LoginField)); if (user.isValid()) error = Wt::WString::tr("Lms.Admin.User.user-already-exists"); - else - return Wt::WFormModel::validateField(field); } else if (field == PasswordField) { if (!valueText(PasswordField).empty()) { - // Evaluate the strength of the password - auto res = Database::Handler::getPasswordService().strengthValidator()->evaluateStrength(valueText(PasswordField), getLogin(), ""); + if (Wt::asNumber(value(DemoField))) + { + //Demo account: password must be the same as the login name + if (valueText(PasswordField) != getLogin()) + error = Wt::WString::tr("Lms.Admin.User.demo-password-invalid"); + } + else + { + // Evaluate the strength of the password for non demo accounts + auto res = Database::Handler::getPasswordService().strengthValidator()->evaluateStrength(valueText(PasswordField), getLogin(), ""); - if (!res.isValid()) - error = res.message(); + if (!res.isValid()) + error = res.message(); + } } - else - return Wt::WFormModel::validateField(field); } - else + else if (field == DemoField) { - return Wt::WFormModel::validateField(field); + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + + if (Wt::asNumber(value(DemoField)) && Database::User::getDemo(LmsApp->getDboSession())) + error = Wt::WString::tr("Lms.Admin.User.demo-account-already-exists"); } - setValidation(field, Wt::WValidator::Result( error.empty() ? Wt::ValidationState::Valid : Wt::ValidationState::Invalid, error)); + if (error.empty()) + return Wt::WFormModel::validateField(field); - return (validation(field).state() == Wt::ValidationState::Valid); + setValidation(field, Wt::WValidator::Result( Wt::ValidationState::Invalid, error)); + + return false; } boost::optional getBitrateLimitRow(Wt::WString value) @@ -219,12 +235,13 @@ class UserModel : public Wt::WFormModel } std::shared_ptr _bitrateModel; - boost::optional _userId; + boost::optional _userId; }; const Wt::WFormModel::Field UserModel::LoginField = "login"; const Wt::WFormModel::Field UserModel::PasswordField = "password"; const Wt::WFormModel::Field UserModel::BitrateLimitField = "audio-bitrate-limit"; +const Wt::WFormModel::Field UserModel::DemoField = "demo"; UserView::UserView() { @@ -242,7 +259,7 @@ UserView::refreshView() if (!wApp->internalPathMatches("/admin/user")) return; - auto userId = readAs(wApp->internalPathNextPart("/admin/user/")); + auto userId = readAs(wApp->internalPathNextPart("/admin/user/")); LMS_LOG(UI, DEBUG) << "userId = " << (userId ? std::to_string(*userId) : "none"); @@ -276,6 +293,11 @@ UserView::refreshView() bitrate->setModel(model->bitrateModel()); t->setFormWidget(UserModel::BitrateLimitField, std::move(bitrate)); + // Demo account + t->setFormWidget(UserModel::DemoField, std::make_unique()); + if (!userId && Config::instance().getBool("demo", false)) + t->setCondition("if-demo", true); + Wt::WPushButton* saveBtn = t->bindNew("save-btn", Wt::WString::tr(userId ? "Lms.save" : "Lms.create")); saveBtn->clicked().connect(std::bind([=] { diff --git a/src/ui/admin/UsersView.cpp b/src/ui/admin/UsersView.cpp index e38140b3..226a3acc 100644 --- a/src/ui/admin/UsersView.cpp +++ b/src/ui/admin/UsersView.cpp @@ -74,6 +74,13 @@ UsersView::refreshView() entry->bindString("name", authUser.identity(Wt::Auth::Identity::LoginName), Wt::TextFormat::Plain); + // Create tag + if (user->isAdmin() || user->isDemo()) + { + entry->setCondition("if-tag", true); + entry->bindString("tag", Wt::WString::tr(user->isAdmin() ? "Lms.Admin.Users.admin" : "Lms.Admin.Users.demo")); + } + // Don't edit ourself this way if (LmsApp->getUser() == user) continue; From 1caadcd7c53a5be4b85e5ef550bccfdb110931b0 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 1 Aug 2018 14:55:31 +0200 Subject: [PATCH 156/195] Minor playqueue/playlist modification --- src/ui/PlayQueueView.cpp | 68 +++++++++++++++++++++------------------- src/ui/PlayQueueView.hpp | 4 +++ 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index d0e6b940..d337ddfe 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -35,8 +35,6 @@ namespace UserInterface { -static const std::string currentPlayQueueName = "__current__playqueue__"; - PlayQueue::PlayQueue() : Wt::WTemplate(Wt::WString::tr("Lms.PlayQueue.template")) { @@ -58,48 +56,57 @@ PlayQueue::PlayQueue() { Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); - if (!playlist) - playlist = Database::Playlist::create(LmsApp->getDboSession(), currentPlayQueueName, false, LmsApp->getUser()); - _trackPos = LmsApp->getUser()->getCurPlayingTrackPos(); } - clearBtn->clicked().connect(std::bind([=] + clearBtn->clicked().connect([=] { - { - Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); - playlist.modify()->clear(); - _showMore->setHidden(true); - } - - _entriesContainer->clear(); - updateInfo(); - })); + clearTracks(); + }); shuffleBtn->clicked().connect([=] { { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); - playlist.modify()->shuffle(); + getPlaylist().modify()->shuffle(); } _entriesContainer->clear(); addSome(); }); - _showMore->clicked().connect(std::bind([=] + _showMore->clicked().connect([=] { addSome(); - })); + }); updateInfo(); addSome(); } +Database::Playlist::pointer +PlayQueue::getPlaylist() +{ + static const std::string currentPlayQueueName = "__current__playqueue__"; + + Database::Playlist::pointer res = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); + if (!res) + res = Database::Playlist::create(LmsApp->getDboSession(), currentPlayQueueName, false, LmsApp->getUser()); + + return res; +} + +void +PlayQueue::clearTracks() +{ + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + + getPlaylist().modify()->clear(); + _showMore->setHidden(true); + _entriesContainer->clear(); + updateInfo(); +} + void PlayQueue::stop() { @@ -117,7 +124,7 @@ PlayQueue::play(std::size_t pos) { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); + auto playlist = getPlaylist(); // If out of range, stop playing if (pos >= playlist->getCount()) @@ -175,8 +182,7 @@ PlayQueue::updateInfo() { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); - _nbTracks->setText(Wt::WString::tr("Lms.PlayQueue.nb-tracks").arg(static_cast(playlist->getCount()))); + _nbTracks->setText(Wt::WString::tr("Lms.PlayQueue.nb-tracks").arg(static_cast(getPlaylist()->getCount()))); } void @@ -201,7 +207,7 @@ PlayQueue::enqueueTracks(const std::vector& tracks) // Use a "session" playqueue in order to store the current playqueue // so that the user can disconnect and get its playqueue back - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); + auto playlist = getPlaylist(); for (auto track : tracks) Database::PlaylistEntry::create(LmsApp->getDboSession(), track, playlist); @@ -228,11 +234,7 @@ PlayQueue::playTracks(const std::vector& tracks) { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playqueue = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); - playqueue.modify()->clear(); - - _entriesContainer->clear(); - + clearTracks(); enqueueTracks(tracks); play(0); @@ -245,7 +247,7 @@ PlayQueue::addSome() { Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); + auto playlist = getPlaylist(); bool moreResults; auto playlistEntries = playlist->getEntries(_entriesContainer->count(), 50, moreResults); @@ -313,7 +315,7 @@ PlayQueue::addRadioTrack() auto now = std::chrono::system_clock::now(); std::mt19937 randGenerator(std::chrono::duration_cast(now.time_since_epoch()).count()); - auto playlist = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); + auto playlist = getPlaylist(); std::set playlistTrackIds; { diff --git a/src/ui/PlayQueueView.hpp b/src/ui/PlayQueueView.hpp index dfee6f6d..8457eabb 100644 --- a/src/ui/PlayQueueView.hpp +++ b/src/ui/PlayQueueView.hpp @@ -27,6 +27,7 @@ #include +#include "database/Playlist.hpp" #include "database/Track.hpp" namespace UserInterface { @@ -52,6 +53,9 @@ class PlayQueue : public Wt::WTemplate Wt::Signal<> playbackStop; private: + Database::Playlist::pointer getPlaylist(); + + void clearTracks(); void enqueueTracks(const std::vector& tracks); void enqueueTrack(Database::Track::pointer track); void addSome(); From 5c182f2868b72a22c67839dcee4fe4ffcff3e7ad Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 2 Aug 2018 12:45:33 +0200 Subject: [PATCH 157/195] Handle multiple connections from the demo user --- src/database/Playlist.cpp | 7 +++++++ src/database/Playlist.hpp | 1 + src/ui/LmsApplication.cpp | 12 +++++++++--- src/ui/LmsApplication.hpp | 6 +++++- src/ui/PlayQueueView.cpp | 38 ++++++++++++++++++++++++++++++-------- src/ui/PlayQueueView.hpp | 1 + 6 files changed, 53 insertions(+), 12 deletions(-) diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp index 4e7a0ee0..b26cc91b 100644 --- a/src/database/Playlist.cpp +++ b/src/database/Playlist.cpp @@ -71,6 +71,13 @@ Playlist::getAll(Wt::Dbo::Session& session, Wt::Dbo::ptr user) return std::vector(res.begin(), res.end()); } +Playlist::pointer +Playlist::getById(Wt::Dbo::Session& session, IdType id) +{ + return session.find().where("id = ?").bind(id); +} + + PlaylistEntry::PlaylistEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr playlist) : _track(track), _playlist(playlist) diff --git a/src/database/Playlist.hpp b/src/database/Playlist.hpp index ef9aa059..15795494 100644 --- a/src/database/Playlist.hpp +++ b/src/database/Playlist.hpp @@ -42,6 +42,7 @@ class Playlist : public Wt::Dbo::Dbo // Search utility static pointer get(Wt::Dbo::Session& session, std::string name, Wt::Dbo::ptr user); + static pointer getById(Wt::Dbo::Session& session, IdType playlistId); static std::vector getAll(Wt::Dbo::Session& session, Wt::Dbo::ptr user); // Create utility diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index cd8860bc..b1e108b7 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -131,7 +131,8 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti } } -LmsApplication::~LmsApplication() +void +LmsApplication::finalize() { LmsApplicationInfo info = LmsApplicationInfo::fromEnvironment(environment()); @@ -141,6 +142,8 @@ LmsApplication::~LmsApplication() }); getApplicationGroup().leave(); + + preQuit().emit(); } std::unique_ptr @@ -456,8 +459,11 @@ LmsApplication::createHome() _groupEvents.appOpen.connect([=] (LmsApplicationInfo info) { // Only one active session by user - setConfirmCloseMessage(""); - quit(Wt::WString::tr("Lms.quit-other-session")); + if (!LmsApp->getUser()->isDemo()) + { + setConfirmCloseMessage(""); + quit(Wt::WString::tr("Lms.quit-other-session")); + } }); _groupEvents.appClosed.connect([=] (LmsApplicationInfo info) diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index 4bdd04bf..21d2eaaf 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -48,7 +48,6 @@ class LmsApplication : public Wt::WApplication { public: LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroupContainer& appGroups, Scanner::MediaScanner& scanner); - ~LmsApplication(); static std::unique_ptr create(const Wt::WEnvironment& env, Wt::Dbo::SqlConnectionPool& connectionPool, LmsApplicationGroupContainer& appGroups, Scanner::MediaScanner& scanner); @@ -77,6 +76,9 @@ class LmsApplication : public Wt::WApplication static std::unique_ptr createReleaseAnchor(Database::Release::pointer release, bool addText = true); static std::unique_ptr createCluster(Database::Cluster::pointer cluster, bool canDelete = false); + // Signal emitted just before the session ends (user may already be logged out) + Wt::Signal<>& preQuit() { return _preQuit; } + private: LmsApplicationGroup& getApplicationGroup(); @@ -84,9 +86,11 @@ class LmsApplication : public Wt::WApplication // Events void handleAuthEvent(); void notify(const Wt::WEvent& event) override; + void finalize() override; void createHome(); + Wt::Signal<> _preQuit; Database::Handler _db; LmsApplicationGroupContainer& _appGroups; GroupEvents _groupEvents; diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index d337ddfe..b8c93d2e 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -33,6 +33,7 @@ #include "LmsApplication.hpp" + namespace UserInterface { PlayQueue::PlayQueue() @@ -50,15 +51,8 @@ PlayQueue::PlayQueue() Wt::WText* shuffleBtn = bindNew("shuffle-btn", Wt::WString::tr("Lms.PlayQueue.shuffle"), Wt::TextFormat::XHTML); _radioMode = bindNew("radio-mode", Wt::WString::tr("Lms.PlayQueue.radio-mode")); - _nbTracks = bindNew("nb-tracks"); - { - Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); - - _trackPos = LmsApp->getUser()->getCurPlayingTrackPos(); - } - clearBtn->clicked().connect([=] { clearTracks(); @@ -80,6 +74,20 @@ PlayQueue::PlayQueue() addSome(); }); + LmsApp->preQuit().connect([=] + { + if (_playlistId) + { + LMS_LOG(UI, DEBUG) << "Removing playlist id " << *_playlistId; + + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + + auto playlist = Database::Playlist::getById(LmsApp->getDboSession(), *_playlistId); + if (playlist) + playlist.remove(); + } + }); + updateInfo(); addSome(); } @@ -88,8 +96,22 @@ Database::Playlist::pointer PlayQueue::getPlaylist() { static const std::string currentPlayQueueName = "__current__playqueue__"; + Database::Playlist::pointer res; - Database::Playlist::pointer res = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); + if (LmsApp->getUser()->isDemo()) + { + if (!_playlistId) + { + res = Database::Playlist::create(LmsApp->getDboSession(), currentPlayQueueName, false, LmsApp->getUser()); + LmsApp->getDboSession().flush(); + _playlistId = res.id(); + return res; + } + + return Database::Playlist::getById(LmsApp->getDboSession(), *_playlistId); + } + + res = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); if (!res) res = Database::Playlist::create(LmsApp->getDboSession(), currentPlayQueueName, false, LmsApp->getUser()); diff --git a/src/ui/PlayQueueView.hpp b/src/ui/PlayQueueView.hpp index 8457eabb..75210d23 100644 --- a/src/ui/PlayQueueView.hpp +++ b/src/ui/PlayQueueView.hpp @@ -66,6 +66,7 @@ class PlayQueue : public Wt::WTemplate void play(std::size_t pos); void stop(); + boost::optional _playlistId; Wt::WCheckBox* _radioMode; Wt::WContainerWidget* _entriesContainer; Wt::WTemplate* _showMore; From a7e279ce427e0bde29ba88e9999344495680b1b7 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 3 Aug 2018 14:01:56 +0200 Subject: [PATCH 158/195] Added an played tracklist --- approot/artists.xml | 5 - approot/releases.xml | 5 - src/Makefile.am | 3 +- src/database/DatabaseHandler.cpp | 13 +- src/database/Playlist.cpp | 208 ---------------- src/database/Setting.cpp | 133 ----------- src/database/Setting.hpp | 71 ------ src/database/Track.hpp | 6 +- src/database/TrackList.cpp | 238 +++++++++++++++++++ src/database/{Playlist.hpp => TrackList.hpp} | 42 ++-- src/database/TrackStats.cpp | 101 -------- src/database/TrackStats.hpp | 75 ------ src/database/User.cpp | 34 +++ src/database/User.hpp | 9 +- src/ui/LmsApplication.cpp | 8 +- src/ui/PlayQueueView.cpp | 85 +++---- src/ui/PlayQueueView.hpp | 6 +- src/ui/explore/ArtistView.cpp | 1 - src/ui/explore/ArtistsView.cpp | 17 +- src/ui/explore/ArtistsView.hpp | 1 - src/ui/explore/Explore.cpp | 3 - src/ui/explore/ReleasesView.cpp | 22 +- src/ui/explore/ReleasesView.hpp | 1 - 23 files changed, 360 insertions(+), 727 deletions(-) delete mode 100644 src/database/Playlist.cpp delete mode 100644 src/database/Setting.cpp delete mode 100644 src/database/Setting.hpp create mode 100644 src/database/TrackList.cpp rename src/database/{Playlist.hpp => TrackList.hpp} (66%) delete mode 100644 src/database/TrackStats.cpp delete mode 100644 src/database/TrackStats.hpp diff --git a/approot/artists.xml b/approot/artists.xml index 0b467c46..23425af9 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -8,11 +8,6 @@
${most-played-artists} -
-

${tr:Lms.Explore.recently-played-artists}

-
- ${recently-played-artists} -

${tr:Lms.Explore.recently-added-artists}

diff --git a/approot/releases.xml b/approot/releases.xml index 5bf6e950..92cf00ce 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -8,11 +8,6 @@
${most-played-releases} -
-

${tr:Lms.Explore.recently-played-releases}

-
- ${recently-played-releases} -

${tr:Lms.Explore.recently-added-releases}

diff --git a/src/Makefile.am b/src/Makefile.am index a8d7ec97..f0a622f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,12 +8,11 @@ lms_SOURCES = \ $(srcdir)/database/Artist.cpp \ $(srcdir)/database/Cluster.cpp \ $(srcdir)/database/DatabaseHandler.cpp \ - $(srcdir)/database/Playlist.cpp \ + $(srcdir)/database/TrackList.cpp \ $(srcdir)/database/Release.cpp \ $(srcdir)/database/ScanSettings.cpp \ $(srcdir)/database/SqlQuery.cpp \ $(srcdir)/database/Track.cpp \ - $(srcdir)/database/TrackStats.cpp \ $(srcdir)/database/User.cpp \ $(srcdir)/image/Image.cpp \ $(srcdir)/metadata/AvFormat.cpp \ diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index f835c09f..1473d7d1 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -31,17 +31,14 @@ #include #include -#include "Setting.hpp" - #include "utils/Logger.hpp" #include "Artist.hpp" #include "Cluster.hpp" -#include "Playlist.hpp" +#include "TrackList.hpp" #include "Release.hpp" #include "ScanSettings.hpp" #include "Track.hpp" -#include "TrackStats.hpp" namespace Database { @@ -102,12 +99,10 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) _session.mapClass("artist"); _session.mapClass("cluster"); _session.mapClass("cluster_type"); - _session.mapClass("playlist"); - _session.mapClass("playlist_entry"); + _session.mapClass("tracklist"); + _session.mapClass("tracklist_entry"); _session.mapClass("release"); - _session.mapClass("setting"); _session.mapClass("track"); - _session.mapClass("track_stats"); _session.mapClass("scan_settings"); @@ -139,7 +134,7 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) _session.execute("CREATE INDEX IF NOT EXISTS track_release_idx ON track(release_id)"); _session.execute("CREATE INDEX IF NOT EXISTS cluster_name_idx ON cluster(name)"); _session.execute("CREATE INDEX IF NOT EXISTS cluster_type_name_idx ON cluster_type(name)"); - _session.execute("CREATE INDEX IF NOT EXISTS settings_name_idx ON setting(name)"); + _session.execute("CREATE INDEX IF NOT EXISTS tracklist_name ON tracklist(name)"); } _users = new UserDatabase(_session); diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp deleted file mode 100644 index b26cc91b..00000000 --- a/src/database/Playlist.cpp +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Copyright (C) 2014 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 . - */ -#include "Playlist.hpp" - -#include -#include - -#include "Cluster.hpp" -#include "User.hpp" -#include "Track.hpp" - -namespace Database { - -Playlist::Playlist() -: _isPublic(false) -{ - -} - -Playlist::Playlist(std::string name, bool isPublic, Wt::Dbo::ptr user) -: _name(name), - _isPublic(isPublic), - _user(user) -{ - -} - -Playlist::pointer -Playlist::create(Wt::Dbo::Session& session, std::string name, bool isPublic, Wt::Dbo::ptr user) -{ - return session.add( std::make_unique(name, isPublic, user) ); -} - -PlaylistEntry::PlaylistEntry() -{ -} - -PlaylistEntry::pointer -PlaylistEntry::getById(Wt::Dbo::Session& session, IdType id) -{ - return session.find().where("id = ?").bind(id); -} - -Playlist::pointer -Playlist::get(Wt::Dbo::Session& session, std::string name, Wt::Dbo::ptr user) -{ - return session.find().where("name = ? AND user_id = ?").bind(name).bind(user.id()); -} - -std::vector -Playlist::getAll(Wt::Dbo::Session& session, Wt::Dbo::ptr user) -{ - Wt::Dbo::collection res = session.find().where("user_id = ?").bind(user.id()).orderBy("name"); - - return std::vector(res.begin(), res.end()); -} - -Playlist::pointer -Playlist::getById(Wt::Dbo::Session& session, IdType id) -{ - return session.find().where("id = ?").bind(id); -} - - -PlaylistEntry::PlaylistEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr playlist) -: _track(track), - _playlist(playlist) -{ - -} - -PlaylistEntry::pointer -PlaylistEntry::create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr playlist) -{ - return session.add( std::make_unique( track, playlist) ); -} - - -std::vector> -Playlist::getEntries(int offset, int size, bool& moreResults) const -{ - assert(session()); - assert(IdIsValid(self()->id())); - - moreResults = false; - - Wt::Dbo::collection> entries = - session()->find() - .where("playlist_id = ?").bind(self().id()) - .orderBy("id") - .limit(size != -1 ? size + 1 : -1) - .offset(offset); - - std::vector> res; - - for (auto entry : entries) - { - if (size != -1 && res.size() == static_cast(size)) - { - moreResults = true; - break; - } - - res.push_back(entry); - } - - return res; -} - -std::vector> -Playlist::getAllEntries() const -{ - bool moreResults; - return getEntries(-1, -1, moreResults); -} - -Wt::Dbo::ptr -Playlist::getEntry(std::size_t pos) const -{ - Wt::Dbo::ptr res; - - bool moreResults; - auto entries = getEntries(pos, 1, moreResults); - if (!entries.empty()) - res = entries.front(); - - return res; -} - -std::size_t -Playlist::getCount() const -{ - return _entries.size(); -} - -std::vector> -Playlist::getClusters() const -{ - assert(session()); - assert(IdIsValid(self()->id())); - - Wt::Dbo::collection res = session()->query("SELECT c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN playlist_entry p_e ON p_e.track_id = t.id INNER JOIN playlist p ON p.id = p_e.playlist_id") - .where("p.id = ?").bind(self()->id()) - .groupBy("c.id") - .orderBy("COUNT(c.id) DESC"); - - return std::vector>(res.begin(), res.end()); -} - -bool -Playlist::hasTrack(IdType trackId) const -{ - assert(session()); - assert(IdIsValid(self()->id())); - - Wt::Dbo::collection res = session()->query("SELECT p_e from playlist_entry p_e INNER JOIN playlist p ON p_e.playlist_id = p.id") - .where("p_e.track_id = ?").bind(trackId) - .where("p.id = ?").bind(self()->id()); - - return res.size() > 0; -} - -std::vector -Playlist::getTrackIds() const -{ - assert(session()); - assert(IdIsValid(self()->id())); - - Wt::Dbo::collection res = session()->query("SELECT p_e.track_id from playlist_entry p_e INNER JOIN playlist p ON p_e.playlist_id = p.id") - .where("p.id = ?").bind(self()->id()); - - return std::vector(res.begin(), res.end()); -} - -void -Playlist::shuffle() -{ - assert(session()); - - auto entries = getAllEntries(); - - auto now = std::chrono::system_clock::now(); - std::mt19937 randGenerator(std::chrono::duration_cast(now.time_since_epoch()).count()); - - std::shuffle(entries.begin(), entries.end(), randGenerator); - - clear(); - for (auto entry : entries) - PlaylistEntry::create(*session(), entry->getTrack(), self()); -} - -} // namespace Database diff --git a/src/database/Setting.cpp b/src/database/Setting.cpp deleted file mode 100644 index e987d111..00000000 --- a/src/database/Setting.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ - -#include "Setting.hpp" - -namespace Database { - -bool -Setting::exists(Wt::Dbo::Session& session, std::string setting) -{ - Wt::Dbo::Transaction transaction(session); - return (getByName(session, setting) != Setting::pointer()); -} - -std::string -Setting::getString(Wt::Dbo::Session& session, std::string setting, std::string defaultValue) -{ - Wt::Dbo::Transaction transaction(session); - - pointer res = getByName(session, setting); - if (!res) - return defaultValue; - - return res->_value; -} - -bool -Setting::getBool(Wt::Dbo::Session& session, std::string setting, bool defaultValue) -{ - Wt::Dbo::Transaction transaction(session); - - pointer res = getByName(session, setting); - if (!res) - return defaultValue; - - return (res->_value == "true"); -} - -Wt::WTime -Setting::getTime(Wt::Dbo::Session& session, std::string setting, Wt::WTime defaultValue) -{ - Wt::Dbo::Transaction transaction(session); - - pointer res = getByName(session, setting); - if (!res) - return defaultValue; - - return Wt::WTime::fromString(res->_value); -} - -int -Setting::getInt(Wt::Dbo::Session& session, std::string setting, int defaultValue) -{ - Wt::Dbo::Transaction transaction(session); - - pointer res = getByName(session, setting); - if (!res) - return defaultValue; - - return std::stoi(res->_value); -} - - - -Setting::pointer -Setting::create(Wt::Dbo::Session& session, std::string name) -{ - return session.add(std::make_unique(name)); -} - -Setting::pointer -Setting::getByName(Wt::Dbo::Session& session, std::string name) -{ - return session.find().where("name = ?").bind(name); -} - -Setting::pointer -Setting::getOrCreateByName(Wt::Dbo::Session& session, std::string name) -{ - pointer res = getByName(session, name); - if (!res) - res = create(session, name); - - return res; -} - -void -Setting::setString(Wt::Dbo::Session& session, std::string setting, std::string value) -{ - Wt::Dbo::Transaction transaction(session); - getOrCreateByName(session, setting).modify()->_value = value; -} - -void -Setting::setBool(Wt::Dbo::Session& session, std::string setting, bool value) -{ - Wt::Dbo::Transaction transaction(session); - getOrCreateByName(session, setting).modify()->_value = (value ? "true" : "false"); -} - -void -Setting::setTime(Wt::Dbo::Session& session, std::string setting, Wt::WTime value) -{ - Wt::Dbo::Transaction transaction(session); - getOrCreateByName(session, setting).modify()->_value = value.toString().toUTF8(); -} - -void -Setting::setInt(Wt::Dbo::Session& session, std::string setting, int value) -{ - Wt::Dbo::Transaction transaction(session); - getOrCreateByName(session, setting).modify()->_value = std::to_string(value); -} - - -} // namespace Database - diff --git a/src/database/Setting.hpp b/src/database/Setting.hpp deleted file mode 100644 index 808a0902..00000000 --- a/src/database/Setting.hpp +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ - -#pragma once - -#include -#include - -namespace Database { - -// class meant to store general settings -class Setting -{ - public: - using pointer = Wt::Dbo::ptr; - - Setting() {} - Setting(std::string name) : _name(name) {} - - // check if a setting exists or not - static bool exists(Wt::Dbo::Session& session, std::string setting); - - // Getters - // Nested transactions - static std::string getString(Wt::Dbo::Session& session, std::string setting, std::string defaultValue = ""); - static bool getBool(Wt::Dbo::Session& session, std::string setting, bool defaultValue = false); - static Wt::WTime getTime(Wt::Dbo::Session& session, std::string setting, Wt::WTime defaultValue = Wt::WTime()); - static int getInt(Wt::Dbo::Session& session, std::string setting, int defaultValue = 0); - - // Setters - // Nested transactions - static void setString(Wt::Dbo::Session& session, std::string setting, std::string value); - static void setBool(Wt::Dbo::Session& session, std::string setting, bool value); - static void setTime(Wt::Dbo::Session& session, std::string setting, Wt::WTime value); - static void setInt(Wt::Dbo::Session& session, std::string setting, int value); - - template - void persist(Action& a) - { - Wt::Dbo::field(a, _name, "name"); - Wt::Dbo::field(a, _value, "value"); - } - - private: - static pointer getByName(Wt::Dbo::Session& session, std::string name); - static pointer create(Wt::Dbo::Session& session, std::string name); - static pointer getOrCreateByName(Wt::Dbo::Session& session, std::string name); - - std::string _name; - std::string _value; -}; - - -} // namespace Database - diff --git a/src/database/Track.hpp b/src/database/Track.hpp index c63de183..550df65e 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -37,7 +37,7 @@ namespace Database { class Artist; class Cluster; class ClusterType; -class PlaylistEntry; +class TrackListEntry; class Release; class TrackStats; @@ -144,7 +144,6 @@ class Track : public Wt::Dbo::Dbo Wt::Dbo::belongsTo(a, _artist, "artist", Wt::Dbo::OnDeleteCascade); Wt::Dbo::hasMany(a, _clusters, Wt::Dbo::ManyToMany, "track_cluster", "", Wt::Dbo::OnDeleteCascade); Wt::Dbo::hasMany(a, _playlistEntries, Wt::Dbo::ManyToOne, "track"); - Wt::Dbo::hasMany(a, _stats, Wt::Dbo::ManyToOne, "track"); } private: @@ -173,8 +172,7 @@ class Track : public Wt::Dbo::Dbo Wt::Dbo::ptr _artist; Wt::Dbo::ptr _release; Wt::Dbo::collection> _clusters; - Wt::Dbo::collection> _playlistEntries; - Wt::Dbo::collection> _stats; + Wt::Dbo::collection> _playlistEntries; }; diff --git a/src/database/TrackList.cpp b/src/database/TrackList.cpp new file mode 100644 index 00000000..d46b4e58 --- /dev/null +++ b/src/database/TrackList.cpp @@ -0,0 +1,238 @@ +/* + * Copyright (C) 2014 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 . + */ +#include "TrackList.hpp" + +#include +#include + +#include "utils/Logger.hpp" + +#include "Artist.hpp" +#include "Cluster.hpp" +#include "Release.hpp" +#include "User.hpp" +#include "Track.hpp" + +namespace Database { + +TrackList::TrackList() +: _isPublic(false) +{ + +} + +TrackList::TrackList(std::string name, bool isPublic, Wt::Dbo::ptr user) +: _name(name), + _isPublic(isPublic), + _user(user) +{ + +} + +TrackList::pointer +TrackList::create(Wt::Dbo::Session& session, std::string name, bool isPublic, Wt::Dbo::ptr user) +{ + assert(user); + + auto res = session.add( std::make_unique(name, isPublic, user) ); + session.flush(); + + return res; +} + +TrackListEntry::pointer +TrackList::add(IdType trackId) +{ + assert(session()); + assert(self()); + + return TrackListEntry::create(*session(), Database::Track::getById(*session(), trackId), self()); +} + +TrackList::pointer +TrackList::get(Wt::Dbo::Session& session, std::string name, Wt::Dbo::ptr user) +{ + return session.find().where("name = ? AND user_id = ?").bind(name).bind(user.id()); +} + +std::vector +TrackList::getAll(Wt::Dbo::Session& session, Wt::Dbo::ptr user) +{ + Wt::Dbo::collection res = session.find().where("user_id = ?").bind(user.id()).orderBy("name"); + + return std::vector(res.begin(), res.end()); +} + +TrackList::pointer +TrackList::getById(Wt::Dbo::Session& session, IdType id) +{ + return session.find().where("id = ?").bind(id); +} + + +std::vector> +TrackList::getEntries(int offset, int size) const +{ + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection> entries = + session()->find() + .where("tracklist_id = ?").bind(self().id()) + .orderBy("id") + .limit(size) + .offset(offset); + + return std::vector>(entries.begin(), entries.end()); +} + +Wt::Dbo::ptr +TrackList::getEntry(std::size_t pos) const +{ + Wt::Dbo::ptr res; + + auto entries = getEntries(pos, 1); + if (!entries.empty()) + res = entries.front(); + + return res; +} + +std::size_t +TrackList::getCount() const +{ + return _entries.size(); +} + +std::vector> +TrackList::getClusters() const +{ + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection res = session()->query("SELECT c from cluster c INNER JOIN track t ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id INNER JOIN tracklist_entry p_e ON p_e.track_id = t.id INNER JOIN tracklist p ON p.id = p_e.tracklist_id") + .where("p.id = ?").bind(self()->id()) + .groupBy("c.id") + .orderBy("COUNT(c.id) DESC"); + + return std::vector>(res.begin(), res.end()); +} + +bool +TrackList::hasTrack(IdType trackId) const +{ + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection res = session()->query("SELECT p_e from tracklist_entry p_e INNER JOIN tracklist p ON p_e.tracklist_id = p.id") + .where("p_e.track_id = ?").bind(trackId) + .where("p.id = ?").bind(self()->id()); + + return res.size() > 0; +} + +std::vector +TrackList::getTrackIds() const +{ + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection res = session()->query("SELECT p_e.track_id from tracklist_entry p_e INNER JOIN tracklist p ON p_e.tracklist_id = p.id") + .where("p.id = ?").bind(self()->id()); + + return std::vector(res.begin(), res.end()); +} + +void +TrackList::shuffle() +{ + assert(session()); + + auto entries = getEntries(); + + auto now = std::chrono::system_clock::now(); + std::mt19937 randGenerator(std::chrono::duration_cast(now.time_since_epoch()).count()); + + std::shuffle(entries.begin(), entries.end(), randGenerator); + + clear(); + for (auto entry : entries) + TrackListEntry::create(*session(), entry->getTrack(), self()); +} + +std::vector +TrackList::getTopArtists(int limit) const +{ + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection res = session()->query("SELECT a from artist a INNER JOIN track t ON t.artist_id = a.id INNER JOIN tracklist_entry p_e ON p_e.track_id = t.id INNER JOIN tracklist p ON p.id = p_e.tracklist_id") + .where("p.id = ?").bind(self()->id()) + .groupBy("a.id") + .orderBy("COUNT(a.id) DESC") + .limit(limit); + + return std::vector(res.begin(), res.end()); +} + +std::vector +TrackList::getTopReleases(int limit) const +{ + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection res = session()->query("SELECT r from release r INNER JOIN track t ON t.release_id = r.id INNER JOIN tracklist_entry p_e ON p_e.track_id = t.id INNER JOIN tracklist p ON p.id = p_e.tracklist_id") + .where("p.id = ?").bind(self()->id()) + .groupBy("r.id") + .orderBy("COUNT(r.id) DESC") + .limit(limit); + + return std::vector(res.begin(), res.end()); +} + +TrackListEntry::TrackListEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr tracklist) +: _track(track), + _tracklist(tracklist) +{ + +} + +TrackListEntry::TrackListEntry() +{ +} + +TrackListEntry::pointer +TrackListEntry::create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr tracklist) +{ + assert(track); + assert(tracklist); + + auto res = session.add( std::make_unique( track, tracklist) ); + session.flush(); + + return res; +} + +TrackListEntry::pointer +TrackListEntry::getById(Wt::Dbo::Session& session, IdType id) +{ + return session.find().where("id = ?").bind(id); +} + +} // namespace Database diff --git a/src/database/Playlist.hpp b/src/database/TrackList.hpp similarity index 66% rename from src/database/Playlist.hpp rename to src/database/TrackList.hpp index 15795494..0a54a2c7 100644 --- a/src/database/Playlist.hpp +++ b/src/database/TrackList.hpp @@ -27,22 +27,28 @@ namespace Database { -class PlaylistEntry; +class Artist; +class Release; class User; class Track; +class TrackListEntry; class Cluster; -class Playlist : public Wt::Dbo::Dbo +class TrackList : public Wt::Dbo::Dbo { public: - using pointer = Wt::Dbo::ptr; + using pointer = Wt::Dbo::ptr; - Playlist(); - Playlist(std::string name, bool isPublic, Wt::Dbo::ptr user); + TrackList(); + TrackList(std::string name, bool isPublic, Wt::Dbo::ptr user); + + // Stats utility + std::vector> getTopArtists(int limit = 1) const; + std::vector> getTopReleases(int limit = 1) const; // Search utility static pointer get(Wt::Dbo::Session& session, std::string name, Wt::Dbo::ptr user); - static pointer getById(Wt::Dbo::Session& session, IdType playlistId); + static pointer getById(Wt::Dbo::Session& session, IdType tracklistId); static std::vector getAll(Wt::Dbo::Session& session, Wt::Dbo::ptr user); // Create utility @@ -53,14 +59,14 @@ class Playlist : public Wt::Dbo::Dbo bool isPublic() const { return _isPublic; } // Modifiers + Wt::Dbo::ptr add(IdType trackId); void clear() { _entries.clear(); } void shuffle(); // Get tracks, ordered by position std::size_t getCount() const; - Wt::Dbo::ptr getEntry(std::size_t pos) const; - std::vector> getEntries(int offset, int size, bool& moreResults) const; - std::vector> getAllEntries() const; + Wt::Dbo::ptr getEntry(std::size_t pos) const; + std::vector> getEntries(int offset = -1, int size = -1) const; std::vector getTrackIds() const; @@ -75,7 +81,7 @@ class Playlist : public Wt::Dbo::Dbo Wt::Dbo::field(a, _name, "name"); Wt::Dbo::field(a, _isPublic, "public"); Wt::Dbo::belongsTo(a, _user, "user", Wt::Dbo::OnDeleteCascade); - Wt::Dbo::hasMany(a, _entries, Wt::Dbo::ManyToOne, "playlist"); + Wt::Dbo::hasMany(a, _entries, Wt::Dbo::ManyToOne, "tracklist"); } private: @@ -83,23 +89,23 @@ class Playlist : public Wt::Dbo::Dbo std::string _name; bool _isPublic; Wt::Dbo::ptr _user; - Wt::Dbo::collection< Wt::Dbo::ptr > _entries; + Wt::Dbo::collection< Wt::Dbo::ptr > _entries; }; -class PlaylistEntry +class TrackListEntry : public Wt::Dbo::Dbo { public: - using pointer = Wt::Dbo::ptr; + using pointer = Wt::Dbo::ptr; - PlaylistEntry(); - PlaylistEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr playlist); + TrackListEntry(); + TrackListEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr tracklist); static pointer getById(Wt::Dbo::Session& session, IdType id); // Create utility - static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr playlist); + static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr tracklist); // Accessors Wt::Dbo::ptr getTrack() const { return _track; } @@ -108,13 +114,13 @@ class PlaylistEntry void persist(Action& a) { Wt::Dbo::belongsTo(a, _track, "track", Wt::Dbo::OnDeleteCascade); - Wt::Dbo::belongsTo(a, _playlist, "playlist", Wt::Dbo::OnDeleteCascade); + Wt::Dbo::belongsTo(a, _tracklist, "tracklist", Wt::Dbo::OnDeleteCascade); } private: Wt::Dbo::ptr _track; - Wt::Dbo::ptr _playlist; + Wt::Dbo::ptr _tracklist; }; } // namespace Database diff --git a/src/database/TrackStats.cpp b/src/database/TrackStats.cpp deleted file mode 100644 index 944ac7a2..00000000 --- a/src/database/TrackStats.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (C) 2014 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 . - */ - -#include "TrackStats.hpp" - -#include "Artist.hpp" -#include "Release.hpp" -#include "Track.hpp" -#include "User.hpp" - -namespace Database { - -TrackStats::TrackStats(Wt::Dbo::ptr track, Wt::Dbo::ptr user) -: _track(track), - _user(user) -{} - -std::vector -TrackStats::getMostPlayedArtists(Wt::Dbo::Session& session, User::pointer user, int limit) -{ - Wt::Dbo::collection res = session.query - ("SELECT a FROM artist a INNER JOIN track t ON a.id = t.artist_id INNER JOIN track_stats t_s ON t.id = t_s.track_id") - .where("t_s.user_id = ?").bind(user.id()) - .groupBy("a.id") - .orderBy("SUM(t_s.play_count) DESC") - .limit(limit); - - return std::vector(res.begin(), res.end()); -} - -std::vector -TrackStats::getLastPlayedArtists(Wt::Dbo::Session& session, User::pointer user, int limit) -{ - Wt::Dbo::collection res = session.query - ("SELECT a FROM artist a INNER JOIN track t ON a.id = t.artist_id INNER JOIN track_stats t_s ON t.id = t_s.track_id") - .where("t_s.user_id = ?").bind(user.id()) - .groupBy("a.id") - .orderBy("t_s.last_played DESC") - .limit(limit); - - return std::vector(res.begin(), res.end()); -} - -std::vector -TrackStats::getMostPlayedReleases(Wt::Dbo::Session& session, User::pointer user, int limit) -{ - Wt::Dbo::collection res = session.query - ("SELECT r FROM release r INNER JOIN track t ON r.id = t.release_id INNER JOIN track_stats t_s ON t.id = t_s.track_id") - .where("t_s.user_id = ?").bind(user.id()) - .groupBy("r.id") - .orderBy("SUM(t_s.play_count) DESC") - .limit(limit); - - return std::vector(res.begin(), res.end()); -} - -std::vector -TrackStats::getLastPlayedReleases(Wt::Dbo::Session& session, User::pointer user, int limit) -{ - Wt::Dbo::collection res = session.query - ("SELECT r FROM release r INNER JOIN track t ON r.id = t.release_id INNER JOIN track_stats t_s ON t.id = t_s.track_id") - .where("t_s.user_id = ?").bind(user.id()) - .groupBy("r.id") - .orderBy("t_s.last_played DESC") - .limit(limit); - - return std::vector(res.begin(), res.end()); -} - -TrackStats::pointer -TrackStats::get(Wt::Dbo::Session& session, Track::pointer track, User::pointer user) -{ - Wt::Dbo::Transaction transaction(session); - - TrackStats::pointer res = session.find() - .where("track_id = ?").bind(track.id()) - .where("user_id = ?").bind(user.id()); - if (!res) - res = session.add(std::make_unique(track, user)); - - return res; -} - -} // namespace Database - diff --git a/src/database/TrackStats.hpp b/src/database/TrackStats.hpp deleted file mode 100644 index 6c4d66d6..00000000 --- a/src/database/TrackStats.hpp +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2014 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 . - */ - -#pragma once - -#include -#include - -#include - -#include "Types.hpp" - -namespace Database { - -class Artist; -class Release; -class Track; -class User; - -class TrackStats -{ - public: - using pointer = Wt::Dbo::ptr; - - TrackStats() {} - TrackStats(Wt::Dbo::ptr track, Wt::Dbo::ptr user); - - static std::vector> getMostPlayedArtists(Wt::Dbo::Session& session, Wt::Dbo::ptr, int limit = 1); - static std::vector> getLastPlayedArtists(Wt::Dbo::Session& session, Wt::Dbo::ptr, int limit = 1); - - static std::vector> getMostPlayedReleases(Wt::Dbo::Session& session, Wt::Dbo::ptr, int limit = 1); - static std::vector> getLastPlayedReleases(Wt::Dbo::Session& session, Wt::Dbo::ptr, int limit = 1); - - // Get utility (will create if does not exist) - static pointer get(Wt::Dbo::Session& session, Wt::Dbo::ptr track, Wt::Dbo::ptr user); - - void incPlayCount() { _playCount++; } - void setLastPlayed(Wt::WDateTime lastPlayed) { _lastPlayed = lastPlayed; } - - template - void persist(Action& a) - { - Wt::Dbo::field(a, _playCount, "play_count"); - Wt::Dbo::field(a, _lastPlayed, "last_played"); - Wt::Dbo::belongsTo(a, _track, "track", Wt::Dbo::OnDeleteCascade); - Wt::Dbo::belongsTo(a, _user, "user", Wt::Dbo::OnDeleteCascade); - } - - private: - - int _playCount = 0; - Wt::WDateTime _lastPlayed; - Wt::Dbo::ptr _track; - Wt::Dbo::ptr _user; -}; - - -} // namespace Database - diff --git a/src/database/User.cpp b/src/database/User.cpp index b687572f..2bd01e70 100644 --- a/src/database/User.cpp +++ b/src/database/User.cpp @@ -19,6 +19,8 @@ #include "User.hpp" +#include "TrackList.hpp" + namespace Database { // must be ordered @@ -93,6 +95,38 @@ User::getMaxAudioBitrate(void) const return _maxAudioBitrate; } +Wt::Dbo::ptr +User::getPlayedTrackList() const +{ + static const std::string listName = "__played_tracks__"; + + assert(self()); + assert(IdIsValid(self()->id())); + assert(session()); + + auto res = TrackList::get(*session(), listName, self()); + if (!res) + res = TrackList::create(*session(), listName, false, self()); + + return res; +} + +Wt::Dbo::ptr +User::getQueuedTrackList() const +{ + static const std::string listName = "__queued_tracks__"; + + assert(self()); + assert(IdIsValid(self()->id())); + assert(session()); + + auto res = TrackList::get(*session(), listName, self()); + if (!res) + res = TrackList::create(*session(), listName, false, self()); + + return res; +} + } // namespace Database diff --git a/src/database/User.hpp b/src/database/User.hpp index fd536172..cd3aa01a 100644 --- a/src/database/User.hpp +++ b/src/database/User.hpp @@ -31,7 +31,7 @@ namespace Database { class User; using AuthInfo = Wt::Auth::Dbo::AuthInfo; -class Playlist; +class TrackList; // User selectable audio formats enum class AudioEncoding @@ -85,6 +85,9 @@ class User : public Wt::Dbo::Dbo std::size_t getMaxAudioBitrate() const; std::size_t getCurPlayingTrackPos() const { return _curPlayingTrackPos; } + Wt::Dbo::ptr getQueuedTrackList() const; + Wt::Dbo::ptr getPlayedTrackList() const; + template void persist(Action& a) { @@ -94,7 +97,7 @@ class User : public Wt::Dbo::Dbo Wt::Dbo::field(a, _audioEncoding, "audio_encoding"); // User's dynamic data Wt::Dbo::field(a, _curPlayingTrackPos, "cur_playing_track_pos"); - Wt::Dbo::hasMany(a, _playlists, Wt::Dbo::ManyToOne, "user"); + Wt::Dbo::hasMany(a, _tracklists, Wt::Dbo::ManyToOne, "user"); } private: @@ -112,7 +115,7 @@ class User : public Wt::Dbo::Dbo // User's dynamic data int _curPlayingTrackPos; // Current track position in queue - Wt::Dbo::collection< Wt::Dbo::ptr > _playlists; + Wt::Dbo::collection< Wt::Dbo::ptr > _tracklists; }; diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index b1e108b7..8dc0e9f5 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -419,9 +419,15 @@ LmsApplication::createHome() }); // Events from the PlayQueue - playqueue->playTrack.connect(explore, &Explore::handleTrackPlayed); + playqueue->playTrack.connect([=](Database::IdType trackId) + { + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + LmsApp->getUser()->getPlayedTrackList().modify()->add(trackId); + }); + playqueue->playTrack.connect(explore, &Explore::handleTrackPlayed); playqueue->playTrack.connect(player, &MediaPlayer::playTrack); + playqueue->playbackStop.connect(player, &MediaPlayer::stop); // Events from MediaScanner diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index b8c93d2e..f0334ae0 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -28,8 +28,7 @@ #include "utils/Logger.hpp" -#include "database/Playlist.hpp" -#include "database/TrackStats.hpp" +#include "database/TrackList.hpp" #include "LmsApplication.hpp" @@ -63,7 +62,7 @@ PlayQueue::PlayQueue() { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - getPlaylist().modify()->shuffle(); + getTrackList().modify()->shuffle(); } _entriesContainer->clear(); addSome(); @@ -76,15 +75,15 @@ PlayQueue::PlayQueue() LmsApp->preQuit().connect([=] { - if (_playlistId) + if (_tracklistId) { - LMS_LOG(UI, DEBUG) << "Removing playlist id " << *_playlistId; + LMS_LOG(UI, DEBUG) << "Removing tracklist id " << *_tracklistId; Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playlist = Database::Playlist::getById(LmsApp->getDboSession(), *_playlistId); - if (playlist) - playlist.remove(); + auto tracklist = Database::TrackList::getById(LmsApp->getDboSession(), *_tracklistId); + if (tracklist) + tracklist.remove(); } }); @@ -92,30 +91,26 @@ PlayQueue::PlayQueue() addSome(); } -Database::Playlist::pointer -PlayQueue::getPlaylist() +Database::TrackList::pointer +PlayQueue::getTrackList() { static const std::string currentPlayQueueName = "__current__playqueue__"; - Database::Playlist::pointer res; + Database::TrackList::pointer res; if (LmsApp->getUser()->isDemo()) { - if (!_playlistId) + if (!_tracklistId) { - res = Database::Playlist::create(LmsApp->getDboSession(), currentPlayQueueName, false, LmsApp->getUser()); + res = Database::TrackList::create(LmsApp->getDboSession(), currentPlayQueueName, false, LmsApp->getUser()); LmsApp->getDboSession().flush(); - _playlistId = res.id(); + _tracklistId = res.id(); return res; } - return Database::Playlist::getById(LmsApp->getDboSession(), *_playlistId); + return Database::TrackList::getById(LmsApp->getDboSession(), *_tracklistId); } - res = Database::Playlist::get(LmsApp->getDboSession(), currentPlayQueueName, LmsApp->getUser()); - if (!res) - res = Database::Playlist::create(LmsApp->getDboSession(), currentPlayQueueName, false, LmsApp->getUser()); - - return res; + return LmsApp->getUser()->getQueuedTrackList(); } void @@ -123,7 +118,7 @@ PlayQueue::clearTracks() { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - getPlaylist().modify()->clear(); + getTrackList().modify()->clear(); _showMore->setHidden(true); _entriesContainer->clear(); updateInfo(); @@ -146,29 +141,24 @@ PlayQueue::play(std::size_t pos) { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto playlist = getPlaylist(); + auto tracklist = getTrackList(); // If out of range, stop playing - if (pos >= playlist->getCount()) + if (pos >= tracklist->getCount()) { stop(); return; } // If last and radio mode, fill the next song - if (_radioMode->checkState() == Wt::CheckState::Checked && pos == playlist->getCount() - 1) + if (_radioMode->checkState() == Wt::CheckState::Checked && pos == tracklist->getCount() - 1) addRadioTrack(); _trackPos = pos; - auto track = playlist->getEntry(*_trackPos)->getTrack(); + auto track = tracklist->getEntry(*_trackPos)->getTrack(); trackId = track.id(); - auto stats = Database::TrackStats::get(LmsApp->getDboSession(), track, LmsApp->getUser()); - - stats.modify()->incPlayCount(); - stats.modify()->setLastPlayed(Wt::WLocalDateTime::currentServerDateTime().toUTC()); - updateCurrentTrack(true); } @@ -204,7 +194,7 @@ PlayQueue::updateInfo() { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - _nbTracks->setText(Wt::WString::tr("Lms.PlayQueue.nb-tracks").arg(static_cast(getPlaylist()->getCount()))); + _nbTracks->setText(Wt::WString::tr("Lms.PlayQueue.nb-tracks").arg(static_cast(getTrackList()->getCount()))); } void @@ -229,10 +219,10 @@ PlayQueue::enqueueTracks(const std::vector& tracks) // Use a "session" playqueue in order to store the current playqueue // so that the user can disconnect and get its playqueue back - auto playlist = getPlaylist(); + auto tracklist = getTrackList(); for (auto track : tracks) - Database::PlaylistEntry::create(LmsApp->getDboSession(), track, playlist); + Database::TrackListEntry::create(LmsApp->getDboSession(), track, tracklist); updateInfo(); addSome(); @@ -269,14 +259,13 @@ PlayQueue::addSome() { Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); - auto playlist = getPlaylist(); + auto tracklist = getTrackList(); - bool moreResults; - auto playlistEntries = playlist->getEntries(_entriesContainer->count(), 50, moreResults); - for (auto playlistEntry : playlistEntries) + auto tracklistEntries = tracklist->getEntries(_entriesContainer->count(), 50); + for (auto tracklistEntry : tracklistEntries) { - auto playlistEntryId = playlistEntry.id(); - auto track = playlistEntry->getTrack(); + auto tracklistEntryId = tracklistEntry.id(); + auto track = tracklistEntry->getTrack(); Wt::WTemplate* entry = _entriesContainer->addNew(Wt::WString::tr("Lms.PlayQueue.template.entry")); @@ -310,7 +299,7 @@ PlayQueue::addSome() { Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); - auto entryToRemove = Database::PlaylistEntry::getById(LmsApp->getDboSession(), playlistEntryId); + auto entryToRemove = Database::TrackListEntry::getById(LmsApp->getDboSession(), tracklistEntryId); entryToRemove.remove(); } @@ -328,7 +317,7 @@ PlayQueue::addSome() } - _showMore->setHidden(!moreResults); + _showMore->setHidden(static_cast(_entriesContainer->count()) >= tracklist->getCount()); } void @@ -337,17 +326,17 @@ PlayQueue::addRadioTrack() auto now = std::chrono::system_clock::now(); std::mt19937 randGenerator(std::chrono::duration_cast(now.time_since_epoch()).count()); - auto playlist = getPlaylist(); + auto tracklist = getTrackList(); - std::set playlistTrackIds; + std::set trackIds; { - auto ids = playlist->getTrackIds(); - playlistTrackIds = std::set(ids.begin(), ids.end()); + auto ids = tracklist->getTrackIds(); + trackIds = std::set(ids.begin(), ids.end()); } - // Get all the tracks of the playlist, get the cluster that is mostly used + // Get all the tracks of the tracklist, get the cluster that is mostly used // and reuse it to get the next track - auto clusters = playlist->getClusters(); + auto clusters = tracklist->getClusters(); if (clusters.empty()) return; @@ -357,7 +346,7 @@ PlayQueue::addRadioTrack() std::set candidateTrackIds; std::set_difference(clusterTrackIds.begin(), clusterTrackIds.end(), - playlistTrackIds.begin(), playlistTrackIds.end(), + trackIds.begin(), trackIds.end(), std::inserter(candidateTrackIds, candidateTrackIds.end())); if (candidateTrackIds.empty()) diff --git a/src/ui/PlayQueueView.hpp b/src/ui/PlayQueueView.hpp index 75210d23..e95eec41 100644 --- a/src/ui/PlayQueueView.hpp +++ b/src/ui/PlayQueueView.hpp @@ -27,7 +27,7 @@ #include -#include "database/Playlist.hpp" +#include "database/TrackList.hpp" #include "database/Track.hpp" namespace UserInterface { @@ -53,7 +53,7 @@ class PlayQueue : public Wt::WTemplate Wt::Signal<> playbackStop; private: - Database::Playlist::pointer getPlaylist(); + Database::TrackList::pointer getTrackList(); void clearTracks(); void enqueueTracks(const std::vector& tracks); @@ -66,7 +66,7 @@ class PlayQueue : public Wt::WTemplate void play(std::size_t pos); void stop(); - boost::optional _playlistId; + boost::optional _tracklistId; Wt::WCheckBox* _radioMode; Wt::WContainerWidget* _entriesContainer; Wt::WTemplate* _showMore; diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index 665b98a6..71047dfa 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -25,7 +25,6 @@ #include #include "database/Artist.hpp" -#include "database/Setting.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index 2ad6e681..b2b73e4a 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -25,8 +25,7 @@ #include #include "database/Artist.hpp" -#include "database/Setting.hpp" -#include "database/TrackStats.hpp" +#include "database/TrackList.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -80,7 +79,6 @@ Artists::Artists(Filters* filters) refresh(); refreshMostPlayed(); refreshRecentlyAdded(); - refreshRecentlyPlayed(); filters->updated().connect(this, &Artists::refresh); } @@ -97,22 +95,11 @@ Artists::refreshRecentlyAdded() addCompactEntries(_recentlyAddedContainer, artists); } -void -Artists::refreshRecentlyPlayed() -{ - Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto artists = TrackStats::getLastPlayedArtists(LmsApp->getDboSession(), LmsApp->getUser(), 5); - - _recentlyPlayedContainer->clear(); - addCompactEntries(_recentlyPlayedContainer, artists); -} - - void Artists::refreshMostPlayed() { Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto artists = TrackStats::getMostPlayedArtists(LmsApp->getDboSession(), LmsApp->getUser(), 5); + auto artists = LmsApp->getUser()->getPlayedTrackList()->getTopArtists(5); _mostPlayedContainer->clear(); addCompactEntries(_mostPlayedContainer, artists); diff --git a/src/ui/explore/ArtistsView.hpp b/src/ui/explore/ArtistsView.hpp index f39c5fe4..e6da4276 100644 --- a/src/ui/explore/ArtistsView.hpp +++ b/src/ui/explore/ArtistsView.hpp @@ -39,7 +39,6 @@ class Artists : public Wt::WTemplate Wt::Signal artistPlay; void refreshRecentlyAdded(); - void refreshRecentlyPlayed(); void refreshMostPlayed(); private: diff --git a/src/ui/explore/Explore.cpp b/src/ui/explore/Explore.cpp index 6b62da7f..d19a9a2c 100644 --- a/src/ui/explore/Explore.cpp +++ b/src/ui/explore/Explore.cpp @@ -113,10 +113,7 @@ Explore::Explore() _trackPlayed.connect([=] { artists_raw->refreshMostPlayed(); - artists_raw->refreshRecentlyPlayed(); releases_raw->refreshMostPlayed(); - releases_raw->refreshRecentlyPlayed(); - }); auto tracks = std::make_unique(_filters); diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index a7e0d60b..1dc79f8d 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -26,7 +26,7 @@ #include #include "database/Release.hpp" -#include "database/TrackStats.hpp" +#include "database/TrackList.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -96,7 +96,6 @@ _filters(filters) })); refreshRecentlyAdded(); - refreshRecentlyPlayed(); refreshMostPlayed(); refresh(); @@ -106,8 +105,6 @@ _filters(filters) void Releases::refreshRecentlyAdded() { - LMS_LOG(UI, DEBUG) << "Refreshing recently added releases"; - auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1); Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); @@ -118,27 +115,12 @@ Releases::refreshRecentlyAdded() addCompactEntries(_recentlyAddedContainer, releases); } -void -Releases::refreshRecentlyPlayed() -{ - LMS_LOG(UI, DEBUG) << "Refreshing recently played releases"; - - Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - - auto releases = TrackStats::getLastPlayedReleases(LmsApp->getDboSession(), LmsApp->getUser(), 5); - - _recentlyPlayedContainer->clear(); - addCompactEntries(_recentlyPlayedContainer, releases); -} - void Releases::refreshMostPlayed() { - LMS_LOG(UI, DEBUG) << "Refreshing most played releases"; - Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto releases = TrackStats::getMostPlayedReleases(LmsApp->getDboSession(), LmsApp->getUser(), 5); + auto releases = LmsApp->getUser()->getPlayedTrackList()->getTopReleases(5); _mostPlayedContainer->clear(); addCompactEntries(_mostPlayedContainer, releases); diff --git a/src/ui/explore/ReleasesView.hpp b/src/ui/explore/ReleasesView.hpp index fff677f1..bbf45960 100644 --- a/src/ui/explore/ReleasesView.hpp +++ b/src/ui/explore/ReleasesView.hpp @@ -39,7 +39,6 @@ class Releases : public Wt::WTemplate Wt::Signal releasePlay; void refreshRecentlyAdded(); - void refreshRecentlyPlayed(); void refreshMostPlayed(); private: From ea9ff83355f38c57e6d32cc71d3defb3e5a3cd37 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 3 Aug 2018 14:25:08 +0200 Subject: [PATCH 159/195] Updated TODO --- TODO | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/TODO b/TODO index 289a935c..1935aaf5 100644 --- a/TODO +++ b/TODO @@ -9,7 +9,6 @@ [Database] - Use Inotify like system to watch modified/added files? - handle access rights problems (instead of aborting) -- add a global play counter for tracks. This will help people to spot most popular files - Use albumartist when available (useful for compilations) - Add AcousticBrainz support to create new kind of clusters @@ -22,15 +21,13 @@ [Users] - Handle login lifetime? -- Use the WServer::post method to kick users already logged in? -- Or save the current playqueue by session (using a cookie)? -- Limit multi login from UI and API interfaces (limit per interface is acceptable) [UI] - Add a download button to get the current playqueue in a streamed zip file -- Save user prefs in local storage (volume, loop, shuffle, current playqueue, etc.) -- Add keyboard shortcuts -- Implement a decent player +- Save user prefs in local storage (volume, loop, radio mode, etc.) +- Add global keyboard shortcuts +- scrollbar in player +- display a play history somewhere [Settings] - Add multi root directories support From 500fa104c3270756859687627f221b360f65a475 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 3 Aug 2018 15:30:38 +0200 Subject: [PATCH 160/195] Added a play history view --- Makefile.am | 1 + approot/messages.xml | 8 ++- src/Makefile.am | 1 + src/database/TrackList.cpp | 16 ++++++ src/database/TrackList.hpp | 1 + src/ui/LmsApplication.cpp | 17 +++--- src/ui/PlayHistoryView.cpp | 106 +++++++++++++++++++++++++++++++++++++ src/ui/PlayHistoryView.hpp | 45 ++++++++++++++++ src/ui/PlayQueueView.cpp | 2 - 9 files changed, 187 insertions(+), 10 deletions(-) create mode 100644 src/ui/PlayHistoryView.cpp create mode 100644 src/ui/PlayHistoryView.hpp diff --git a/Makefile.am b/Makefile.am index 5737756e..bbc921d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,6 +31,7 @@ lms_approot_DATA = \ approot/login.xml \ approot/mediaplayer.xml \ approot/messages.xml \ + approot/playhistory.xml \ approot/playqueue.xml \ approot/release.xml \ approot/releases.xml \ diff --git a/approot/messages.xml b/approot/messages.xml index 561a2f49..5419428a 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -64,8 +64,8 @@ Add filter Artists -Most played artists -Most played albums +Top artists +Top albums Recently added artists Recently added albums Recently played artists @@ -85,6 +85,10 @@ Play Queue Radio mode + +Play History + + Account Audio diff --git a/src/Makefile.am b/src/Makefile.am index f0a622f3..468d413d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,6 +23,7 @@ lms_SOURCES = \ $(srcdir)/ui/LmsApplicationGroup.cpp \ $(srcdir)/ui/MediaPlayer.cpp \ $(srcdir)/ui/PlayQueueView.cpp \ + $(srcdir)/ui/PlayHistoryView.cpp \ $(srcdir)/ui/SettingsView.cpp \ $(srcdir)/ui/admin/DatabaseSettingsView.cpp \ $(srcdir)/ui/admin/InitWizardView.cpp \ diff --git a/src/database/TrackList.cpp b/src/database/TrackList.cpp index d46b4e58..d7983c57 100644 --- a/src/database/TrackList.cpp +++ b/src/database/TrackList.cpp @@ -102,6 +102,22 @@ TrackList::getEntries(int offset, int size) const return std::vector>(entries.begin(), entries.end()); } +std::vector> +TrackList::getEntriesReverse(int offset, int size) const +{ + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection> entries = + session()->find() + .where("tracklist_id = ?").bind(self().id()) + .orderBy("id DESC") + .limit(size) + .offset(offset); + + return std::vector>(entries.begin(), entries.end()); +} + Wt::Dbo::ptr TrackList::getEntry(std::size_t pos) const { diff --git a/src/database/TrackList.hpp b/src/database/TrackList.hpp index 0a54a2c7..60637b9d 100644 --- a/src/database/TrackList.hpp +++ b/src/database/TrackList.hpp @@ -67,6 +67,7 @@ class TrackList : public Wt::Dbo::Dbo std::size_t getCount() const; Wt::Dbo::ptr getEntry(std::size_t pos) const; std::vector> getEntries(int offset = -1, int size = -1) const; + std::vector> getEntriesReverse(int offset = -1, int size = -1) const; std::vector getTrackIds() const; diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 8dc0e9f5..8488339a 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -36,6 +36,7 @@ #include "explore/Explore.hpp" #include "MediaPlayer.hpp" +#include "PlayHistoryView.hpp" #include "PlayQueueView.hpp" #include "SettingsView.hpp" @@ -99,6 +100,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti messageResourceBundle().use(appRoot() + "mediaplayer"); messageResourceBundle().use(appRoot() + "messages"); messageResourceBundle().use(appRoot() + "playqueue"); + messageResourceBundle().use(appRoot() + "playhistory"); messageResourceBundle().use(appRoot() + "release"); messageResourceBundle().use(appRoot() + "releases"); messageResourceBundle().use(appRoot() + "settings"); @@ -209,6 +211,7 @@ enum IdxRoot { IdxExplore = 0, IdxPlayQueue, + IdxPlayHistory, IdxSettings, IdxAdminDatabase, IdxAdminUsers, @@ -231,6 +234,7 @@ handlePathChange(Wt::WStackedWidget* stack, bool isAdmin) { "/release", IdxExplore, false }, { "/tracks", IdxExplore, false }, { "/playqueue", IdxPlayQueue, false }, + { "/playhistory", IdxPlayHistory, false }, { "/settings", IdxSettings, false }, { "/admin/database", IdxAdminDatabase, true }, { "/admin/users", IdxAdminUsers, true }, @@ -339,6 +343,11 @@ LmsApplication::createHome() menuItem->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/playqueue")); menuItem->setSelectable(false); } + { + auto menuItem = menu->insertItem(4, Wt::WString::tr("Lms.PlayHistory.playhistory")); + menuItem->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/playhistory")); + menuItem->setSelectable(false); + } Wt::WMenu* rightMenu = navbar->addMenu(std::make_unique(), Wt::AlignmentFlag::Right); std::size_t itemCounter = 0; @@ -380,6 +389,7 @@ LmsApplication::createHome() Explore* explore = mainStack->addNew(); PlayQueue* playqueue = mainStack->addNew(); + PlayHistory* playhistory = mainStack->addNew(); mainStack->addNew(); // Admin stuff @@ -419,12 +429,7 @@ LmsApplication::createHome() }); // Events from the PlayQueue - playqueue->playTrack.connect([=](Database::IdType trackId) - { - Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - - LmsApp->getUser()->getPlayedTrackList().modify()->add(trackId); - }); + playqueue->playTrack.connect(playhistory, &PlayHistory::addTrack); playqueue->playTrack.connect(explore, &Explore::handleTrackPlayed); playqueue->playTrack.connect(player, &MediaPlayer::playTrack); diff --git a/src/ui/PlayHistoryView.cpp b/src/ui/PlayHistoryView.cpp new file mode 100644 index 00000000..a6859b07 --- /dev/null +++ b/src/ui/PlayHistoryView.cpp @@ -0,0 +1,106 @@ +/* + * 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 . + */ + +#include "PlayHistoryView.hpp" + +#include +#include + +#include "utils/Logger.hpp" + +#include "database/Track.hpp" +#include "database/TrackList.hpp" + +#include "LmsApplication.hpp" + +namespace { + +using namespace UserInterface; + +std::unique_ptr createEntry(Database::Track::pointer track) +{ + auto entry = std::make_unique(Wt::WString::tr("Lms.PlayHistory.template.entry")); + + entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain); + + auto artist = track->getArtist(); + if (artist) + { + entry->setCondition("if-has-artist", true); + entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(track->getArtist())); + } + auto release = track->getRelease(); + if (release) + { + entry->setCondition("if-has-release", true); + entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(track->getRelease())); + } + + return entry; +} + +} + +namespace UserInterface { + +PlayHistory::PlayHistory() +: Wt::WTemplate(Wt::WString::tr("Lms.PlayHistory.template")) +{ + addFunction("tr", &Wt::WTemplate::Functions::tr); + + _entriesContainer = bindNew("entries"); + + // TODO move "Lms.Explore.show-more" + _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.show-more")); + _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); + _showMore->setHidden(true); + + _showMore->clicked().connect([=] + { + addSome(); + }); + + addSome(); +} + +void +PlayHistory::addTrack(Database::IdType trackId) +{ + Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); + + auto trackEntry = LmsApp->getUser()->getPlayedTrackList().modify()->add(trackId); + _entriesContainer->insertWidget(0, createEntry(trackEntry->getTrack())); +} + + +void +PlayHistory::addSome() +{ + Wt::Dbo::Transaction transaction (LmsApp->getDboSession()); + + auto trackList = LmsApp->getUser()->getPlayedTrackList(); + auto trackEntries = trackList->getEntriesReverse(_entriesContainer->count(), 50); + for (auto trackEntry : trackEntries) + _entriesContainer->addWidget(createEntry(trackEntry->getTrack())); + + _showMore->setHidden(static_cast(_entriesContainer->count()) >= trackList->getCount()); +} + +} // namespace UserInterface + diff --git a/src/ui/PlayHistoryView.hpp b/src/ui/PlayHistoryView.hpp new file mode 100644 index 00000000..5c2ee676 --- /dev/null +++ b/src/ui/PlayHistoryView.hpp @@ -0,0 +1,45 @@ +/* + * 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 . + */ + +#pragma once + +#include +#include + +#include "database/Types.hpp" + +namespace UserInterface { + +class PlayHistory : public Wt::WTemplate +{ + public: + PlayHistory(); + + void addTrack(Database::IdType trackId); + + private: + + void addSome(); + + Wt::WContainerWidget* _entriesContainer; + Wt::WTemplate* _showMore; +}; + +} // namespace UserInterface + diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index f0334ae0..ce3fc83b 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -22,8 +22,6 @@ #include #include -#include -#include #include #include "utils/Logger.hpp" From 25413fb5c96cbccda0338087af490d7c7a86110d Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 25 Aug 2018 15:01:25 +0200 Subject: [PATCH 161/195] Updated README --- README.md | 55 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 17f2a0f8..eb3aa79d 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,25 @@ -# LMS - Lightweight Media Server +# LMS - Lightweight Music Server LMS is a self-hosted media streaming software, released under the GPLv3 license. It allows you to access your music using an http(s) web interface. ## Features - - Audio transcode for maximum interoperability and low bandwith requirements - - User management - - Browse your audio collection using tag-based filters - - Custom tags scan - - MusicBrainzID support to handle duplicated artist and release names - - Reverse proxy support +- Audio transcode for maximum interoperability and low bandwith requirements +- User management +- Browse your audio collection using tag-based filters +- Custom tag support +- MusicBrainzID support to handle duplicated artist and release names +- Reverse proxy support LMS is written entirely in C++. Therefore, it is suitable to run on embedded devices, where space and memory are limited. -## Dependencies -### Debian - +## Installation +Here are the required packages to build on Debian Stretch: ```sh -apt-get install g++ autoconf automake libboost-filesystem-dev libboost-system-dev libavcodec-dev libavutil-dev libavformat-dev libav-tools libwtdbosqlite-dev libwthttp-dev libwtdbo-dev libwt-dev libmagick++-dev libpstreams-dev libconfig++-dev libpstreams-dev ffmpeg libtag1-dev +apt-get install g++ autoconf automake libboost-filesystem-dev libboost-system-dev libavcodec-dev libavutil-dev libavformat-dev libav-tools libmagick++-dev libpstreams-dev libconfig++-dev libpstreams-dev ffmpeg libtag1-dev ``` -## Build +You also need wt4, that is not packaged yet on Debian. See [installation instructions](https://www.webtoolkit.eu/wt/doc/reference/html/InstallationUnix.html). ```sh git clone https://github.com/epoupon/lms.git lms @@ -36,8 +35,6 @@ configure will report any missing library. make ``` -## Install - ```sh make install ``` @@ -51,6 +48,35 @@ All other settings are set using the web interface. It is highly recommended to run LMS as a non root user. Therefore make sure the user has write permissions on the working directory. +## Reverse proxy settings +You have to set the 'behind-reverse-proxy' option to 'true' in the configuration file. + +Here is an example to make LMS properly work on myserver.org using nginx. +``` +server { + listen 80; + + server_name myserver.org; + + access_log /var/log/nginx/myserver.access.log; + + proxy_request_buffering off; + proxy_buffering off; + proxy_buffer_size 4k; + + location / { + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + proxy_pass http://localhost:5091; + proxy_read_timeout 120; + } +} +``` + ## Running ```sh lms [config_file] @@ -60,7 +86,6 @@ Logs are output in the working directory, in the file 'lms.log' To connect to LMS, just open your favorite browser and go to http://localhost:5082 ## Credits - - Wt (http://www.webtoolkit.eu/) - bootstrap3 (http://getbootstrap.com/) - ffmpeg project (https://ffmpeg.org/) From 01bc71856beb2394efb4a8e156cb9c75a72808df Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 28 Aug 2018 13:57:56 +0200 Subject: [PATCH 162/195] Minor spelling fixes --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index eb3aa79d..c7e5c48d 100644 --- a/README.md +++ b/README.md @@ -38,11 +38,10 @@ make ```sh make install ``` -This command requires root privileges +This command requires root privileges. ## Configuration -LMS uses a configuration file, installed in '/etc/lms.conf' -It is recommended to edit this file and change the relevant settings (working directory, listen port, etc.) +LMS uses a configuration file, installed in '/etc/lms.conf'. It is recommended to edit this file and change the relevant settings (working directory, listen port, etc.) All other settings are set using the web interface. @@ -81,7 +80,7 @@ server { ```sh lms [config_file] ``` -Logs are output in the working directory, in the file 'lms.log' +Logs are output in the working directory, in the file 'lms.log'. To connect to LMS, just open your favorite browser and go to http://localhost:5082 From 95f206a2093b4243b299b2ce34a57d565a18a5bd Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 28 Aug 2018 15:23:16 +0200 Subject: [PATCH 163/195] Move the top/recently added parts into a dedicated panel on the left --- Makefile.am | 2 + approot/artists.xml | 14 ---- approot/artistsinfo.xml | 25 ++++++ approot/explore.xml | 16 +++- approot/messages.xml | 17 ++-- approot/playhistory.xml | 17 ++++ approot/releases.xml | 16 ---- approot/releasesinfo.xml | 27 +++++++ src/Makefile.am | 2 + src/ui/LmsApplication.cpp | 2 + src/ui/explore/ArtistsInfoView.cpp | 87 +++++++++++++++++++++ src/ui/explore/ArtistsInfoView.hpp | 41 ++++++++++ src/ui/explore/ArtistsView.cpp | 44 ----------- src/ui/explore/ArtistsView.hpp | 6 -- src/ui/explore/Explore.cpp | 116 ++++++++++++++++++++-------- src/ui/explore/Filters.cpp | 2 + src/ui/explore/ReleasesInfoView.cpp | 108 ++++++++++++++++++++++++++ src/ui/explore/ReleasesInfoView.hpp | 41 ++++++++++ src/ui/explore/ReleasesView.cpp | 66 +--------------- src/ui/explore/ReleasesView.hpp | 7 -- 20 files changed, 462 insertions(+), 194 deletions(-) create mode 100644 approot/artistsinfo.xml create mode 100644 approot/playhistory.xml create mode 100644 approot/releasesinfo.xml create mode 100644 src/ui/explore/ArtistsInfoView.cpp create mode 100644 src/ui/explore/ArtistsInfoView.hpp create mode 100644 src/ui/explore/ReleasesInfoView.cpp create mode 100644 src/ui/explore/ReleasesInfoView.hpp diff --git a/Makefile.am b/Makefile.am index bbc921d5..b62cf797 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,6 +27,7 @@ lms_approot_DATA = \ approot/admin-initwizard.xml \ approot/artist.xml \ approot/artists.xml \ + approot/artistsinfo.xml \ approot/explore.xml \ approot/login.xml \ approot/mediaplayer.xml \ @@ -35,6 +36,7 @@ lms_approot_DATA = \ approot/playqueue.xml \ approot/release.xml \ approot/releases.xml \ + approot/releasesinfo.xml \ approot/settings.xml \ approot/templates.xml \ approot/tracks.xml diff --git a/approot/artists.xml b/approot/artists.xml index 23425af9..43dcc37c 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -3,16 +3,6 @@ -
-

${tr:Lms.Explore.most-played-artists}

-
- ${most-played-artists} - -
-

${tr:Lms.Explore.recently-added-artists}

-
- ${recently-added-artists} -

${tr:Lms.Explore.artists}

@@ -26,10 +16,6 @@ ${show-more} - - ${name} - -
${nb-release} diff --git a/approot/artistsinfo.xml b/approot/artistsinfo.xml new file mode 100644 index 00000000..56e5c6bb --- /dev/null +++ b/approot/artistsinfo.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + ${name} + + + diff --git a/approot/explore.xml b/approot/explore.xml index 446a3893..2cc7a377 100644 --- a/approot/explore.xml +++ b/approot/explore.xml @@ -2,8 +2,15 @@ - ${filters} - ${contents} +
+
+ ${filters} + ${info} +
+
+ ${contents} +
+
@@ -12,7 +19,10 @@
- ${add-filter}${clusters} +
+

${tr:Lms.Explore.filters} ${add-filter class="btn-primary"}

+
+ ${clusters}
diff --git a/approot/messages.xml b/approot/messages.xml index 5419428a..5e020a35 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -62,14 +62,9 @@ Welcome! -Add filter +Add Artists -Top artists -Top albums -Recently added artists -Recently added albums -Recently played artists -Recently played albums +Filters Albums Search... Show more @@ -78,6 +73,14 @@ Value Various artists + +Recently added +Top artists + + +Recently added +Top releases + {1} tracks Added {1} tracks diff --git a/approot/playhistory.xml b/approot/playhistory.xml new file mode 100644 index 00000000..d674445e --- /dev/null +++ b/approot/playhistory.xml @@ -0,0 +1,17 @@ + + + + + +
+

${tr:Lms.PlayHistory.playhistory}

+
+ ${entries} + ${show-more} + + + + ${name} ${}${release-name}${} ${}${artist-name}${} + + + diff --git a/approot/releases.xml b/approot/releases.xml index 92cf00ce..69f6864f 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -3,16 +3,6 @@ -
-

${tr:Lms.Explore.most-played-releases}

-
- ${most-played-releases} - -
-

${tr:Lms.Explore.recently-added-releases}

-
- ${recently-added-releases} -

${tr:Lms.Explore.releases}

@@ -34,12 +24,6 @@ - - ${cover} - ${release-name} - ${}${artist-name}${} - -
diff --git a/approot/releasesinfo.xml b/approot/releasesinfo.xml new file mode 100644 index 00000000..f6f44d65 --- /dev/null +++ b/approot/releasesinfo.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + ${cover} + ${release-name} + ${}${artist-name}${} + + + diff --git a/src/Makefile.am b/src/Makefile.am index 468d413d..bf097b57 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,9 +32,11 @@ lms_SOURCES = \ $(srcdir)/ui/common/Validators.cpp \ $(srcdir)/ui/explore/ArtistView.cpp \ $(srcdir)/ui/explore/ArtistsView.cpp \ + $(srcdir)/ui/explore/ArtistsInfoView.cpp \ $(srcdir)/ui/explore/Explore.cpp \ $(srcdir)/ui/explore/Filters.cpp \ $(srcdir)/ui/explore/ReleasesView.cpp \ + $(srcdir)/ui/explore/ReleasesInfoView.cpp \ $(srcdir)/ui/explore/ReleaseView.cpp \ $(srcdir)/ui/explore/TracksView.cpp \ $(srcdir)/ui/resource/ImageResource.cpp \ diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 8488339a..80f3433d 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -95,6 +95,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti messageResourceBundle().use(appRoot() + "admin-initwizard"); messageResourceBundle().use(appRoot() + "artist"); messageResourceBundle().use(appRoot() + "artists"); + messageResourceBundle().use(appRoot() + "artistsinfo"); messageResourceBundle().use(appRoot() + "explore"); messageResourceBundle().use(appRoot() + "login"); messageResourceBundle().use(appRoot() + "mediaplayer"); @@ -103,6 +104,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti messageResourceBundle().use(appRoot() + "playhistory"); messageResourceBundle().use(appRoot() + "release"); messageResourceBundle().use(appRoot() + "releases"); + messageResourceBundle().use(appRoot() + "releasesinfo"); messageResourceBundle().use(appRoot() + "settings"); messageResourceBundle().use(appRoot() + "tracks"); messageResourceBundle().use(appRoot() + "templates"); diff --git a/src/ui/explore/ArtistsInfoView.cpp b/src/ui/explore/ArtistsInfoView.cpp new file mode 100644 index 00000000..ec389a3b --- /dev/null +++ b/src/ui/explore/ArtistsInfoView.cpp @@ -0,0 +1,87 @@ +/* + * 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 . + */ + +#include "ArtistsInfoView.hpp" + +#include +#include + +#include "database/Artist.hpp" +#include "database/TrackList.hpp" + +#include "utils/Utils.hpp" + +#include "LmsApplication.hpp" + +using namespace Database; + +namespace { + +using namespace UserInterface; + +void addEntries(Wt::WContainerWidget *container, const std::vector& artists) +{ + for (auto artist : artists) + { + Wt::WTemplate* entry = container->addNew(Wt::WString::tr("Lms.Explore.ArtistsInfo.template.entry")); + + entry->bindWidget("name", LmsApplication::createArtistAnchor(artist)); + } +} + +} + +namespace UserInterface { + +ArtistsInfo::ArtistsInfo() +: Wt::WTemplate(Wt::WString::tr("Lms.Explore.ArtistsInfo.template")) +{ + addFunction("tr", &Wt::WTemplate::Functions::tr); + + _mostPlayedContainer = bindNew("most-played"); + _recentlyAddedContainer = bindNew("recently-added"); + + refreshMostPlayed(); + refreshRecentlyAdded(); +} + +void +ArtistsInfo::refreshRecentlyAdded() +{ + auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1); + + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + auto artists = Artist::getLastAdded(LmsApp->getDboSession(), after, 5); + + _recentlyAddedContainer->clear(); + addEntries(_recentlyAddedContainer, artists); +} + +void +ArtistsInfo::refreshMostPlayed() +{ + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + auto artists = LmsApp->getUser()->getPlayedTrackList()->getTopArtists(5); + + _mostPlayedContainer->clear(); + addEntries(_mostPlayedContainer, artists); +} + +} // namespace UserInterface + diff --git a/src/ui/explore/ArtistsInfoView.hpp b/src/ui/explore/ArtistsInfoView.hpp new file mode 100644 index 00000000..dc9d83c1 --- /dev/null +++ b/src/ui/explore/ArtistsInfoView.hpp @@ -0,0 +1,41 @@ +/* + * 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 . + */ + +#pragma once + +#include +#include + +namespace UserInterface { + +class ArtistsInfo : public Wt::WTemplate +{ + public: + ArtistsInfo(); + + void refreshRecentlyAdded(); + void refreshMostPlayed(); + + private: + Wt::WContainerWidget* _mostPlayedContainer; + Wt::WContainerWidget* _recentlyAddedContainer; +}; + +} // namespace UserInterface + diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index b2b73e4a..78d202aa 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -25,7 +25,6 @@ #include #include "database/Artist.hpp" -#include "database/TrackList.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -35,22 +34,6 @@ using namespace Database; -namespace { - -using namespace UserInterface; - -void addCompactEntries(Wt::WContainerWidget *container, const std::vector& artists) -{ - for (auto artist : artists) - { - Wt::WTemplate* entry = container->addNew(Wt::WString::tr("Lms.Explore.Artists.template.compact-entry")); - - entry->bindWidget("name", LmsApplication::createArtistAnchor(artist)); - } -} - -} - namespace UserInterface { Artists::Artists(Filters* filters) @@ -64,9 +47,6 @@ Artists::Artists(Filters* filters) _search->textInput().connect(this, &Artists::refresh); _container = bindNew("artists"); - _mostPlayedContainer = bindNew("most-played-artists"); - _recentlyAddedContainer = bindNew("recently-added-artists"); - _recentlyPlayedContainer = bindNew("recently-played-artists"); _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.template.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); @@ -77,34 +57,10 @@ Artists::Artists(Filters* filters) })); refresh(); - refreshMostPlayed(); - refreshRecentlyAdded(); filters->updated().connect(this, &Artists::refresh); } -void -Artists::refreshRecentlyAdded() -{ - auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1); - - Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto artists = Artist::getLastAdded(LmsApp->getDboSession(), after, 5); - - _recentlyAddedContainer->clear(); - addCompactEntries(_recentlyAddedContainer, artists); -} - -void -Artists::refreshMostPlayed() -{ - Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - auto artists = LmsApp->getUser()->getPlayedTrackList()->getTopArtists(5); - - _mostPlayedContainer->clear(); - addCompactEntries(_mostPlayedContainer, artists); -} - void Artists::refresh() { diff --git a/src/ui/explore/ArtistsView.hpp b/src/ui/explore/ArtistsView.hpp index e6da4276..6a54e934 100644 --- a/src/ui/explore/ArtistsView.hpp +++ b/src/ui/explore/ArtistsView.hpp @@ -38,9 +38,6 @@ class Artists : public Wt::WTemplate Wt::Signal artistAdd; Wt::Signal artistPlay; - void refreshRecentlyAdded(); - void refreshMostPlayed(); - private: void refresh(); void addSome(); @@ -49,9 +46,6 @@ class Artists : public Wt::WTemplate Wt::WTemplate* _showMore; Wt::WLineEdit* _search; Wt::WContainerWidget* _container; - Wt::WContainerWidget* _mostPlayedContainer; - Wt::WContainerWidget* _recentlyAddedContainer; - Wt::WContainerWidget* _recentlyPlayedContainer; }; } // namespace UserInterface diff --git a/src/ui/explore/Explore.cpp b/src/ui/explore/Explore.cpp index d19a9a2c..1b9f8ce9 100644 --- a/src/ui/explore/Explore.cpp +++ b/src/ui/explore/Explore.cpp @@ -29,26 +29,29 @@ #include "Filters.hpp" #include "ArtistsView.hpp" +#include "ArtistsInfoView.hpp" #include "ArtistView.hpp" #include "ReleasesView.hpp" +#include "ReleasesInfoView.hpp" #include "ReleaseView.hpp" #include "TracksView.hpp" namespace UserInterface { +namespace { -enum IdxRoot +void +handleContentsPathChange(Wt::WStackedWidget* stack) { - IdxArtists = 0, - IdxArtist, - IdxReleases, - IdxRelease, - IdxTracks, -}; + enum Idx + { + IdxArtists = 0, + IdxArtist, + IdxReleases, + IdxRelease, + IdxTracks, + }; -static void -handlePathChange(Wt::WStackedWidget* stack) -{ static const std::map indexes = { { "/artists", IdxArtists }, @@ -70,65 +73,114 @@ handlePathChange(Wt::WStackedWidget* stack) } } +void +handleInfoPathChange(Wt::WStackedWidget* stack) +{ + enum Idx + { + IdxArtists = 0, + IdxReleases, + IdxEmpty, + }; + + static const std::map indexes = + { + { "/artists", IdxArtists }, + { "/artist", IdxArtists }, + { "/releases", IdxReleases }, + { "/release", IdxReleases }, + { "/tracks", IdxEmpty }, + }; + + LMS_LOG(UI, DEBUG) << "Internal path changed to '" << wApp->internalPath() << "'"; + + for (auto index : indexes) + { + if (wApp->internalPathMatches(index.first)) + { + stack->setCurrentIndex(index.second); + return; + } + } +} + +} // namespace + Explore::Explore() : Wt::WTemplate(Wt::WString::tr("Lms.Explore.template")) { + addFunction("tr", &Functions::tr); + _filters = bindNew("filters"); // Contents - Wt::WStackedWidget* stack = bindNew("contents"); + Wt::WStackedWidget* contentsStack = bindNew("contents"); auto artists = std::make_unique(_filters); - auto artists_raw = artists.get(); artists->artistAdd.connect(this, &Explore::handleArtistAdd); artists->artistPlay.connect(this, &Explore::handleArtistPlay); - stack->addWidget(std::move(artists)); + contentsStack->addWidget(std::move(artists)); auto artist = std::make_unique(_filters); artist->artistAdd.connect(this, &Explore::handleArtistAdd); artist->artistPlay.connect(this, &Explore::handleArtistPlay); artist->releaseAdd.connect(this, &Explore::handleReleaseAdd); artist->releasePlay.connect(this, &Explore::handleReleasePlay); - stack->addWidget(std::move(artist)); + contentsStack->addWidget(std::move(artist)); auto releases = std::make_unique(_filters); - auto releases_raw = releases.get(); releases->releaseAdd.connect(this, &Explore::handleReleaseAdd); releases->releasePlay.connect(this, &Explore::handleReleasePlay); - stack->addWidget(std::move(releases)); + contentsStack->addWidget(std::move(releases)); auto release = std::make_unique(_filters); release->releaseAdd.connect(this, &Explore::handleReleaseAdd); release->releasePlay.connect(this, &Explore::handleReleasePlay); release->trackAdd.connect(this, &Explore::handleTrackAdd); release->trackPlay.connect(this, &Explore::handleTrackPlay); - stack->addWidget(std::move(release)); - - _dbChanged.connect([=] - { - artists_raw->refreshRecentlyAdded(); - releases_raw->refreshRecentlyAdded(); - }); - - _trackPlayed.connect([=] - { - artists_raw->refreshMostPlayed(); - releases_raw->refreshMostPlayed(); - }); + contentsStack->addWidget(std::move(release)); auto tracks = std::make_unique(_filters); tracks->trackAdd.connect(this, &Explore::handleTrackAdd); tracks->trackPlay.connect(this, &Explore::handleTrackPlay); tracks->tracksAdd.connect(this, &Explore::handleTracksAdd); tracks->tracksPlay.connect(this, &Explore::handleTracksPlay); - stack->addWidget(std::move(tracks)); + contentsStack->addWidget(std::move(tracks)); + + // Info + Wt::WStackedWidget* infoStack = bindNew("info"); + + auto artistsInfo = std::make_unique(); + auto artistsInfoRaw = artistsInfo.get(); + infoStack->addWidget(std::move(artistsInfo)); + + auto releasesInfo = std::make_unique(); + auto releasesInfoRaw = releasesInfo.get(); + infoStack->addWidget(std::move(releasesInfo)); + + infoStack->addWidget(std::make_unique()); + + _dbChanged.connect([=] + { + artistsInfoRaw->refreshRecentlyAdded(); + releasesInfoRaw->refreshRecentlyAdded(); + }); + + _trackPlayed.connect([=] + { + artistsInfoRaw->refreshMostPlayed(); + releasesInfoRaw->refreshMostPlayed(); + }); + wApp->internalPathChanged().connect(std::bind([=] { - handlePathChange(stack); + handleContentsPathChange(contentsStack); + handleInfoPathChange(infoStack); })); - handlePathChange(stack); + handleContentsPathChange(contentsStack); + handleInfoPathChange(infoStack); } // TODO SQL this? diff --git a/src/ui/explore/Filters.cpp b/src/ui/explore/Filters.cpp index a460c3e9..abbf6626 100644 --- a/src/ui/explore/Filters.cpp +++ b/src/ui/explore/Filters.cpp @@ -142,6 +142,8 @@ Filters::add(Database::IdType clusterId) Filters::Filters() : Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.filters")) { + addFunction("tr", &Functions::tr); + // Filters Wt::WPushButton *addFilterBtn = bindNew("add-filter", Wt::WText::tr("Lms.Explore.add-filter")); addFilterBtn->clicked().connect(this, &Filters::showDialog); diff --git a/src/ui/explore/ReleasesInfoView.cpp b/src/ui/explore/ReleasesInfoView.cpp new file mode 100644 index 00000000..99e85331 --- /dev/null +++ b/src/ui/explore/ReleasesInfoView.cpp @@ -0,0 +1,108 @@ +/* + * 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 . + */ + +#include "ReleasesInfoView.hpp" + +#include +#include +#include +#include + +#include "database/Release.hpp" +#include "database/TrackList.hpp" + +#include "resource/ImageResource.hpp" + +#include "LmsApplication.hpp" + +using namespace Database; + +namespace { + +using namespace UserInterface; + +void addEntries(Wt::WContainerWidget* container, const std::vector& releases) +{ + for (auto release : releases) + { + Wt::WTemplate* entry = container->addNew(Wt::WString::tr("Lms.Explore.ReleasesInfo.template.entry")); + + entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(release)); + + Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); + auto cover = std::make_unique(); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); + anchor->setImage(std::move(cover)); + + auto artists = release->getArtists(); + if (artists.size() > 1) + { + entry->setCondition("if-has-artist", true); + entry->bindString("artist-name", Wt::WString::tr("Lms.Explore.various-artists")); + } + else if (artists.size() == 1) + { + entry->setCondition("if-has-artist", true); + entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(artists.front())); + } + } +} + +} // namespace + +namespace UserInterface { + +ReleasesInfo::ReleasesInfo() +: Wt::WTemplate(Wt::WString::tr("Lms.Explore.ReleasesInfo.template")) +{ + addFunction("tr", &Wt::WTemplate::Functions::tr); + + _mostPlayedContainer = bindNew("most-played"); + _recentlyAddedContainer = bindNew("recently-added"); + + refreshRecentlyAdded(); + refreshMostPlayed(); +} + +void +ReleasesInfo::refreshRecentlyAdded() +{ + auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1); + + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + + auto releases = Release::getLastAdded(LmsApp->getDboSession(), after, 5); + + _recentlyAddedContainer->clear(); + addEntries(_recentlyAddedContainer, releases); +} + +void +ReleasesInfo::refreshMostPlayed() +{ + Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); + + auto releases = LmsApp->getUser()->getPlayedTrackList()->getTopReleases(5); + + _mostPlayedContainer->clear(); + addEntries(_mostPlayedContainer, releases); +} + +} // namespace UserInterface + diff --git a/src/ui/explore/ReleasesInfoView.hpp b/src/ui/explore/ReleasesInfoView.hpp new file mode 100644 index 00000000..fe402421 --- /dev/null +++ b/src/ui/explore/ReleasesInfoView.hpp @@ -0,0 +1,41 @@ +/* + * 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 . + */ + +#pragma once + +#include +#include + +namespace UserInterface { + +class ReleasesInfo : public Wt::WTemplate +{ + public: + ReleasesInfo(); + + void refreshRecentlyAdded(); + void refreshMostPlayed(); + + private: + Wt::WContainerWidget* _mostPlayedContainer; + Wt::WContainerWidget* _recentlyAddedContainer; +}; + +} // namespace UserInterface + diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp index 1dc79f8d..26137186 100644 --- a/src/ui/explore/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -18,15 +18,13 @@ */ #include "ReleasesView.hpp" -#include + #include #include -#include #include #include #include "database/Release.hpp" -#include "database/TrackList.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp" @@ -38,39 +36,6 @@ using namespace Database; -namespace { - -using namespace UserInterface; - -void addCompactEntries(Wt::WContainerWidget* container, const std::vector& releases) -{ - for (auto release : releases) - { - Wt::WTemplate* entry = container->addNew(Wt::WString::tr("Lms.Explore.Releases.template.compact-entry")); - - entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(release)); - - Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); - auto cover = std::make_unique(); - cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); - anchor->setImage(std::move(cover)); - - auto artists = release->getArtists(); - if (artists.size() > 1) - { - entry->setCondition("if-has-artist", true); - entry->bindString("artist-name", Wt::WString::tr("Lms.Explore.various-artists")); - } - else if (artists.size() == 1) - { - entry->setCondition("if-has-artist", true); - entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(artists.front())); - } - } -} - -} // namespace - namespace UserInterface { Releases::Releases(Filters* filters) @@ -84,9 +49,6 @@ _filters(filters) _search->textInput().connect(this, &Releases::refresh); _container = bindNew("releases"); - _mostPlayedContainer = bindNew("most-played-releases"); - _recentlyAddedContainer = bindNew("recently-added-releases"); - _recentlyPlayedContainer = bindNew("recently-played-releases"); _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); @@ -95,37 +57,11 @@ _filters(filters) addSome(); })); - refreshRecentlyAdded(); - refreshMostPlayed(); refresh(); filters->updated().connect(this, &Releases::refresh); } -void -Releases::refreshRecentlyAdded() -{ - auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1); - - Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - - auto releases = Release::getLastAdded(LmsApp->getDboSession(), after, 5); - - _recentlyAddedContainer->clear(); - addCompactEntries(_recentlyAddedContainer, releases); -} - -void -Releases::refreshMostPlayed() -{ - Wt::Dbo::Transaction transaction(LmsApp->getDboSession()); - - auto releases = LmsApp->getUser()->getPlayedTrackList()->getTopReleases(5); - - _mostPlayedContainer->clear(); - addCompactEntries(_mostPlayedContainer, releases); -} - void Releases::refresh() { diff --git a/src/ui/explore/ReleasesView.hpp b/src/ui/explore/ReleasesView.hpp index bbf45960..da4cd227 100644 --- a/src/ui/explore/ReleasesView.hpp +++ b/src/ui/explore/ReleasesView.hpp @@ -21,7 +21,6 @@ #include #include -#include #include #include "database/Types.hpp" @@ -38,9 +37,6 @@ class Releases : public Wt::WTemplate Wt::Signal releaseAdd; Wt::Signal releasePlay; - void refreshRecentlyAdded(); - void refreshMostPlayed(); - private: void refresh(); void addSome(); @@ -49,9 +45,6 @@ class Releases : public Wt::WTemplate Wt::WTemplate* _showMore; Wt::WLineEdit* _search; Wt::WContainerWidget* _container; - Wt::WContainerWidget* _mostPlayedContainer; - Wt::WContainerWidget* _recentlyAddedContainer; - Wt::WContainerWidget* _recentlyPlayedContainer; }; } // namespace UserInterface From d51a0465cfdcc7f5488523e729969fbacf46edad Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 29 Aug 2018 14:10:22 +0200 Subject: [PATCH 164/195] Added anchors in the player --- approot/mediaplayer.xml | 10 ++++------ docroot/js/mediaplayer.js | 8 +------- src/ui/LmsApplication.cpp | 16 ++++++++++++++-- src/ui/LmsApplication.hpp | 2 ++ src/ui/MediaPlayer.cpp | 35 ++++++++++++++++++++++++----------- src/ui/MediaPlayer.hpp | 5 +++++ 6 files changed, 50 insertions(+), 26 deletions(-) diff --git a/approot/mediaplayer.xml b/approot/mediaplayer.xml index 949cefd3..f03eb4e5 100644 --- a/approot/mediaplayer.xml +++ b/approot/mediaplayer.xml @@ -2,17 +2,15 @@ - + +
-
...
-
-
+
+ ${title}${artist}${release}
00:00
00:00
-
-
diff --git a/docroot/js/mediaplayer.js b/docroot/js/mediaplayer.js index 71e1ec46..fc430683 100644 --- a/docroot/js/mediaplayer.js +++ b/docroot/js/mediaplayer.js @@ -44,9 +44,6 @@ LMS.mediaplayer = function () { _elems.pause = document.getElementById("lms-mp-pause"); _elems.previous = document.getElementById("lms-mp-previous"); _elems.next = document.getElementById("lms-mp-next"); - _elems.title = document.getElementById("lms-mp-title"); - _elems.artist = document.getElementById("lms-mp-artist"); - _elems.release = document.getElementById("lms-mp-release"); _elems.duration = document.getElementById("lms-mp-duration"); _elems.time = document.getElementById("lms-mp-time"); _elems.cover = document.getElementById("lms-mp-cover"); @@ -79,14 +76,11 @@ LMS.mediaplayer = function () { } var loadTrack = function(params, autoplay) { - console.log("Loading track '" + params.name + "', release = '" + params.release + "', artist = '" + params.artist + "', resource = '" + params.resource + "', imgResource = '" + params.imgResource + "'"); + console.log("Loading track, resource = '" + params.resource + "', imgResource = '" + params.imgResource + "'"); _offset = 0; _duration = params.duration; - _elems.title.innerHTML = params.name; - _elems.artist.innerHTML = params.artist; - _elems.release.innerHTML = params.release; _elems.audio.src = params.resource; _elems.duration.innerHTML = _durationToString(_duration, _duration > 3600); _elems.time.innerHTML = _durationToString(0, _duration > 3600) diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 80f3433d..78ee608c 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -150,10 +150,16 @@ LmsApplication::finalize() preQuit().emit(); } +Wt::WLink +LmsApplication::createArtistLink(Database::Artist::pointer artist) +{ + return Wt::WLink(Wt::LinkType::InternalPath, "/artist/" + std::to_string(artist.id())); +} + std::unique_ptr LmsApplication::createArtistAnchor(Database::Artist::pointer artist, bool addText) { - auto res = std::make_unique(Wt::WLink(Wt::LinkType::InternalPath, "/artist/" + std::to_string(artist.id()))); + auto res = std::make_unique(createArtistLink(artist)); if (addText) { @@ -164,10 +170,16 @@ LmsApplication::createArtistAnchor(Database::Artist::pointer artist, bool addTex return res; } +Wt::WLink +LmsApplication::createReleaseLink(Database::Release::pointer release) +{ + return Wt::WLink(Wt::LinkType::InternalPath, "/release/" + std::to_string(release.id())); +} + std::unique_ptr LmsApplication::createReleaseAnchor(Database::Release::pointer release, bool addText) { - auto res = std::make_unique(Wt::WLink(Wt::LinkType::InternalPath, "/release/" + std::to_string(release.id()))); + auto res = std::make_unique(createReleaseLink(release)); if (addText) { diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index 21d2eaaf..2c084a61 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -72,7 +72,9 @@ class LmsApplication : public Wt::WApplication void goHomeAndQuit(); void notifyMsg(const Wt::WString& message); + static Wt::WLink createArtistLink(Database::Artist::pointer artist); static std::unique_ptr createArtistAnchor(Database::Artist::pointer artist, bool addText = true); + static Wt::WLink createReleaseLink(Database::Release::pointer release); static std::unique_ptr createReleaseAnchor(Database::Release::pointer release, bool addText = true); static std::unique_ptr createCluster(Database::Cluster::pointer cluster, bool canDelete = false); diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp index 961d33d2..758d4859 100644 --- a/src/ui/MediaPlayer.cpp +++ b/src/ui/MediaPlayer.cpp @@ -19,8 +19,6 @@ #include "MediaPlayer.hpp" -#include - #include "av/AvInfo.hpp" #include "utils/Logger.hpp" @@ -35,17 +33,21 @@ namespace UserInterface { MediaPlayer::MediaPlayer() -: Wt::WTemplate(Wt::WString::tr("template-mediaplayer")), +: Wt::WTemplate(Wt::WString::tr("Lms.MediaPlayer.template")), playbackEnded(this, "playbackEnded"), playPrevious(this, "playPrevious"), playNext(this, "playNext") { - wApp->doJavaScript("LMS.mediaplayer.init(" + jsRef() + ")"); -} + _title = bindNew("title"); + _title->setTextFormat(Wt::TextFormat::Plain); -static std::string escape(const std::string& str) -{ - return boost::replace_all_copy(str, "\"", "\\\""); + _artist = bindNew("artist"); + _artist->setTextFormat(Wt::TextFormat::Plain); + + _release = bindNew("release"); + _release->setTextFormat(Wt::TextFormat::Plain); + + wApp->doJavaScript("LMS.mediaplayer.init(" + jsRef() + ")"); } void @@ -66,9 +68,6 @@ MediaPlayer::playTrack(Database::IdType trackId) std::ostringstream oss; oss << "var params = {" - << " name: \"" << escape(track->getName()) + "\"," - << " release: " << (track->getRelease() ? "\"" + escape(track->getRelease()->getName()) + "\"" : "undefined" ) << "," - << " artist: " << (track->getArtist() ? "\"" + escape(track->getArtist()->getName()) + "\"" : "undefined" ) << "," << " resource: \"" << resource << "\"," << " duration: " << std::chrono::duration_cast(track->getDuration()).count() << "," << " imgResource: \"" << imgResource << "\"," @@ -77,6 +76,20 @@ MediaPlayer::playTrack(Database::IdType trackId) LMS_LOG(UI, DEBUG) << "Runing js = '" << oss.str() << "'"; + _title->setText(Wt::WString::fromUTF8(track->getName())); + + if (track->getArtist()) + { + _artist->setText(Wt::WString::fromUTF8(track->getArtist()->getName())); + _artist->setLink(LmsApp->createArtistLink(track->getArtist())); + } + + if (track->getRelease()) + { + _release->setText(Wt::WString::fromUTF8(track->getRelease()->getName())); + _release->setLink(LmsApp->createReleaseLink(track->getRelease())); + } + wApp->doJavaScript(oss.str()); } catch (Av::MediaFileException& e) diff --git a/src/ui/MediaPlayer.hpp b/src/ui/MediaPlayer.hpp index eec209b7..d5d83315 100644 --- a/src/ui/MediaPlayer.hpp +++ b/src/ui/MediaPlayer.hpp @@ -19,8 +19,10 @@ #pragma once +#include #include #include +#include #include "database/Types.hpp" @@ -41,6 +43,9 @@ class MediaPlayer : public Wt::WTemplate private: + Wt::WText* _title; + Wt::WAnchor* _release; + Wt::WAnchor* _artist; }; } // namespace UserInterface From dbe0b81e43dd1025202a03615e5b4dcedf260fd8 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 29 Aug 2018 14:20:11 +0200 Subject: [PATCH 165/195] Do not display previous artist/release when no one is set --- approot/mediaplayer.xml | 12 ++++++------ docroot/js/mediaplayer.js | 4 ++-- src/ui/MediaPlayer.cpp | 10 ++++++++++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/approot/mediaplayer.xml b/approot/mediaplayer.xml index f03eb4e5..38e3a2fb 100644 --- a/approot/mediaplayer.xml +++ b/approot/mediaplayer.xml @@ -4,13 +4,13 @@ -
-
- -
+ + + + ${title}${artist}${release} -
00:00
-
00:00
+ 00:00 + 00:00 diff --git a/docroot/js/mediaplayer.js b/docroot/js/mediaplayer.js index fc430683..fb0b9e00 100644 --- a/docroot/js/mediaplayer.js +++ b/docroot/js/mediaplayer.js @@ -11,11 +11,11 @@ LMS.mediaplayer = function () { var _updateControls = function() { if (_elems.audio.paused) { - _elems.play.style.display = "block"; + _elems.play.style.display = "inline"; _elems.pause.style.display = "none"; } else { - _elems.pause.style.display = "block"; + _elems.pause.style.display = "inline"; _elems.play.style.display = "none"; } } diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp index 758d4859..521888f2 100644 --- a/src/ui/MediaPlayer.cpp +++ b/src/ui/MediaPlayer.cpp @@ -83,12 +83,22 @@ MediaPlayer::playTrack(Database::IdType trackId) _artist->setText(Wt::WString::fromUTF8(track->getArtist()->getName())); _artist->setLink(LmsApp->createArtistLink(track->getArtist())); } + else + { + _artist->setText(""); + _artist->setLink(Wt::WLink()); + } if (track->getRelease()) { _release->setText(Wt::WString::fromUTF8(track->getRelease()->getName())); _release->setLink(LmsApp->createReleaseLink(track->getRelease())); } + else + { + _release->setText(""); + _release->setLink(Wt::WLink()); + } wApp->doJavaScript(oss.str()); } From 512ae5a0d610499ecc139a3e8f66f13d3a6f215d Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 29 Aug 2018 15:10:00 +0200 Subject: [PATCH 166/195] Use bootstrap notify to notify messages --- Makefile.am | 2 + README.md | 1 + docroot/js/bootstrap-notify.js | 417 ++++++++++++++++++++++++++ docroot/js/jquery-1.10.2.min.js | 6 + src/ui/LmsApplication.cpp | 34 ++- src/ui/LmsApplication.hpp | 11 +- src/ui/PlayQueueView.cpp | 4 +- src/ui/SettingsView.cpp | 4 +- src/ui/admin/DatabaseSettingsView.cpp | 4 +- src/ui/admin/InitWizardView.cpp | 2 +- src/ui/admin/UserView.cpp | 2 +- 11 files changed, 473 insertions(+), 14 deletions(-) create mode 100755 docroot/js/bootstrap-notify.js create mode 100755 docroot/js/jquery-1.10.2.min.js diff --git a/Makefile.am b/Makefile.am index b62cf797..0fba14a7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,8 @@ lms_images_DATA = \ docroot/images/unknown-artist.jpg lms_js_DATA = \ + docroot/js/bootstrap-notify.js \ + docroot/js/jquery-1.10.2.min.js \ docroot/js/mediaplayer.js lms_approot_DATA = \ diff --git a/README.md b/README.md index c7e5c48d..1707c526 100644 --- a/README.md +++ b/README.md @@ -90,3 +90,4 @@ To connect to LMS, just open your favorite browser and go to http://localhost:50 - ffmpeg project (https://ffmpeg.org/) - Magick++ (http://www.imagemagick.org/Magick++/) - MetaBrainz (https://metabrainz.org/) +- Bootstrap Notify: https://github.com/mouse0270/bootstrap-notify diff --git a/docroot/js/bootstrap-notify.js b/docroot/js/bootstrap-notify.js new file mode 100755 index 00000000..d97e4c00 --- /dev/null +++ b/docroot/js/bootstrap-notify.js @@ -0,0 +1,417 @@ +/* +* Project: Bootstrap Notify = v3.1.5 +* Description: Turns standard Bootstrap alerts into "Growl-like" notifications. +* Author: Mouse0270 aka Robert McIntosh +* License: MIT License +* Website: https://github.com/mouse0270/bootstrap-growl +*/ + +/* global define:false, require: false, jQuery:false */ + +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define(['jquery'], factory); + } else if (typeof exports === 'object') { + // Node/CommonJS + factory(require('jquery')); + } else { + // Browser globals + factory(jQuery); + } +}(function ($) { + // Create the defaults once + var defaults = { + element: 'body', + position: null, + type: "info", + allow_dismiss: true, + allow_duplicates: true, + newest_on_top: false, + showProgressbar: false, + placement: { + from: "top", + align: "right" + }, + offset: 20, + spacing: 10, + z_index: 1031, + delay: 5000, + timer: 1000, + url_target: '_blank', + mouse_over: null, + animate: { + enter: 'animated fadeInDown', + exit: 'animated fadeOutUp' + }, + onShow: null, + onShown: null, + onClose: null, + onClosed: null, + onClick: null, + icon_type: 'class', + template: '' + }; + + String.format = function () { + var args = arguments; + var str = arguments[0]; + return str.replace(/(\{\{\d\}\}|\{\d\})/g, function (str) { + if (str.substring(0, 2) === "{{") return str; + var num = parseInt(str.match(/\d/)[0]); + return args[num + 1]; + }); + }; + + function isDuplicateNotification(notification) { + var isDupe = false; + + $('[data-notify="container"]').each(function (i, el) { + var $el = $(el); + var title = $el.find('[data-notify="title"]').html().trim(); + var message = $el.find('[data-notify="message"]').html().trim(); + + // The input string might be different than the actual parsed HTML string! + // (
vs
for example) + // So we have to force-parse this as HTML here! + var isSameTitle = title === $("
" + notification.settings.content.title + "
").html().trim(); + var isSameMsg = message === $("
" + notification.settings.content.message + "
").html().trim(); + var isSameType = $el.hasClass('alert-' + notification.settings.type); + + if (isSameTitle && isSameMsg && isSameType) { + //we found the dupe. Set the var and stop checking. + isDupe = true; + } + return !isDupe; + }); + + return isDupe; + } + + function Notify(element, content, options) { + // Setup Content of Notify + var contentObj = { + content: { + message: typeof content === 'object' ? content.message : content, + title: content.title ? content.title : '', + icon: content.icon ? content.icon : '', + url: content.url ? content.url : '#', + target: content.target ? content.target : '-' + } + }; + + options = $.extend(true, {}, contentObj, options); + this.settings = $.extend(true, {}, defaults, options); + this._defaults = defaults; + if (this.settings.content.target === "-") { + this.settings.content.target = this.settings.url_target; + } + this.animations = { + start: 'webkitAnimationStart oanimationstart MSAnimationStart animationstart', + end: 'webkitAnimationEnd oanimationend MSAnimationEnd animationend' + }; + + if (typeof this.settings.offset === 'number') { + this.settings.offset = { + x: this.settings.offset, + y: this.settings.offset + }; + } + + //if duplicate messages are not allowed, then only continue if this new message is not a duplicate of one that it already showing + if (this.settings.allow_duplicates || (!this.settings.allow_duplicates && !isDuplicateNotification(this))) { + this.init(); + } + } + + $.extend(Notify.prototype, { + init: function () { + var self = this; + + this.buildNotify(); + if (this.settings.content.icon) { + this.setIcon(); + } + if (this.settings.content.url != "#") { + this.styleURL(); + } + this.styleDismiss(); + this.placement(); + this.bind(); + + this.notify = { + $ele: this.$ele, + update: function (command, update) { + var commands = {}; + if (typeof command === "string") { + commands[command] = update; + } else { + commands = command; + } + for (var cmd in commands) { + switch (cmd) { + case "type": + this.$ele.removeClass('alert-' + self.settings.type); + this.$ele.find('[data-notify="progressbar"] > .progress-bar').removeClass('progress-bar-' + self.settings.type); + self.settings.type = commands[cmd]; + this.$ele.addClass('alert-' + commands[cmd]).find('[data-notify="progressbar"] > .progress-bar').addClass('progress-bar-' + commands[cmd]); + break; + case "icon": + var $icon = this.$ele.find('[data-notify="icon"]'); + if (self.settings.icon_type.toLowerCase() === 'class') { + $icon.removeClass(self.settings.content.icon).addClass(commands[cmd]); + } else { + if (!$icon.is('img')) { + $icon.find('img'); + } + $icon.attr('src', commands[cmd]); + } + self.settings.content.icon = commands[command]; + break; + case "progress": + var newDelay = self.settings.delay - (self.settings.delay * (commands[cmd] / 100)); + this.$ele.data('notify-delay', newDelay); + this.$ele.find('[data-notify="progressbar"] > div').attr('aria-valuenow', commands[cmd]).css('width', commands[cmd] + '%'); + break; + case "url": + this.$ele.find('[data-notify="url"]').attr('href', commands[cmd]); + break; + case "target": + this.$ele.find('[data-notify="url"]').attr('target', commands[cmd]); + break; + default: + this.$ele.find('[data-notify="' + cmd + '"]').html(commands[cmd]); + } + } + var posX = this.$ele.outerHeight() + parseInt(self.settings.spacing) + parseInt(self.settings.offset.y); + self.reposition(posX); + }, + close: function () { + self.close(); + } + }; + + }, + buildNotify: function () { + var content = this.settings.content; + this.$ele = $(String.format(this.settings.template, this.settings.type, content.title, content.message, content.url, content.target)); + this.$ele.attr('data-notify-position', this.settings.placement.from + '-' + this.settings.placement.align); + if (!this.settings.allow_dismiss) { + this.$ele.find('[data-notify="dismiss"]').css('display', 'none'); + } + if ((this.settings.delay <= 0 && !this.settings.showProgressbar) || !this.settings.showProgressbar) { + this.$ele.find('[data-notify="progressbar"]').remove(); + } + }, + setIcon: function () { + if (this.settings.icon_type.toLowerCase() === 'class') { + this.$ele.find('[data-notify="icon"]').addClass(this.settings.content.icon); + } else { + if (this.$ele.find('[data-notify="icon"]').is('img')) { + this.$ele.find('[data-notify="icon"]').attr('src', this.settings.content.icon); + } else { + this.$ele.find('[data-notify="icon"]').append('Notify Icon'); + } + } + }, + styleDismiss: function () { + this.$ele.find('[data-notify="dismiss"]').css({ + position: 'absolute', + right: '10px', + top: '5px', + zIndex: this.settings.z_index + 2 + }); + }, + styleURL: function () { + this.$ele.find('[data-notify="url"]').css({ + backgroundImage: 'url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)', + height: '100%', + left: 0, + position: 'absolute', + top: 0, + width: '100%', + zIndex: this.settings.z_index + 1 + }); + }, + placement: function () { + var self = this, + offsetAmt = this.settings.offset.y, + css = { + display: 'inline-block', + margin: '0px auto', + position: this.settings.position ? this.settings.position : (this.settings.element === 'body' ? 'fixed' : 'absolute'), + transition: 'all .5s ease-in-out', + zIndex: this.settings.z_index + }, + hasAnimation = false, + settings = this.settings; + + $('[data-notify-position="' + this.settings.placement.from + '-' + this.settings.placement.align + '"]:not([data-closing="true"])').each(function () { + offsetAmt = Math.max(offsetAmt, parseInt($(this).css(settings.placement.from)) + parseInt($(this).outerHeight()) + parseInt(settings.spacing)); + }); + if (this.settings.newest_on_top === true) { + offsetAmt = this.settings.offset.y; + } + css[this.settings.placement.from] = offsetAmt + 'px'; + + switch (this.settings.placement.align) { + case "left": + case "right": + css[this.settings.placement.align] = this.settings.offset.x + 'px'; + break; + case "center": + css.left = 0; + css.right = 0; + break; + } + this.$ele.css(css).addClass(this.settings.animate.enter); + $.each(Array('webkit-', 'moz-', 'o-', 'ms-', ''), function (index, prefix) { + self.$ele[0].style[prefix + 'AnimationIterationCount'] = 1; + }); + + $(this.settings.element).append(this.$ele); + + if (this.settings.newest_on_top === true) { + offsetAmt = (parseInt(offsetAmt) + parseInt(this.settings.spacing)) + this.$ele.outerHeight(); + this.reposition(offsetAmt); + } + + if ($.isFunction(self.settings.onShow)) { + self.settings.onShow.call(this.$ele); + } + + this.$ele.one(this.animations.start, function () { + hasAnimation = true; + }).one(this.animations.end, function () { + self.$ele.removeClass(self.settings.animate.enter); + if ($.isFunction(self.settings.onShown)) { + self.settings.onShown.call(this); + } + }); + + setTimeout(function () { + if (!hasAnimation) { + if ($.isFunction(self.settings.onShown)) { + self.settings.onShown.call(this); + } + } + }, 600); + }, + bind: function () { + var self = this; + + this.$ele.find('[data-notify="dismiss"]').on('click', function () { + self.close(); + }); + + if ($.isFunction(self.settings.onClick)) { + this.$ele.on('click', function (event) { + if (event.target != self.$ele.find('[data-notify="dismiss"]')[0]) { + self.settings.onClick.call(this, event); + } + }); + } + + this.$ele.mouseover(function () { + $(this).data('data-hover', "true"); + }).mouseout(function () { + $(this).data('data-hover', "false"); + }); + this.$ele.data('data-hover', "false"); + + if (this.settings.delay > 0) { + self.$ele.data('notify-delay', self.settings.delay); + var timer = setInterval(function () { + var delay = parseInt(self.$ele.data('notify-delay')) - self.settings.timer; + if ((self.$ele.data('data-hover') === 'false' && self.settings.mouse_over === "pause") || self.settings.mouse_over != "pause") { + var percent = ((self.settings.delay - delay) / self.settings.delay) * 100; + self.$ele.data('notify-delay', delay); + self.$ele.find('[data-notify="progressbar"] > div').attr('aria-valuenow', percent).css('width', percent + '%'); + } + if (delay <= -(self.settings.timer)) { + clearInterval(timer); + self.close(); + } + }, self.settings.timer); + } + }, + close: function () { + var self = this, + posX = parseInt(this.$ele.css(this.settings.placement.from)), + hasAnimation = false; + + this.$ele.attr('data-closing', 'true').addClass(this.settings.animate.exit); + self.reposition(posX); + + if ($.isFunction(self.settings.onClose)) { + self.settings.onClose.call(this.$ele); + } + + this.$ele.one(this.animations.start, function () { + hasAnimation = true; + }).one(this.animations.end, function () { + $(this).remove(); + if ($.isFunction(self.settings.onClosed)) { + self.settings.onClosed.call(this); + } + }); + + setTimeout(function () { + if (!hasAnimation) { + self.$ele.remove(); + if ($.isFunction(self.settings.onClosed)) { + self.settings.onClosed.call(this); + } + } + }, 600); + }, + reposition: function (posX) { + var self = this, + notifies = '[data-notify-position="' + this.settings.placement.from + '-' + this.settings.placement.align + '"]:not([data-closing="true"])', + $elements = this.$ele.nextAll(notifies); + if (this.settings.newest_on_top === true) { + $elements = this.$ele.prevAll(notifies); + } + $elements.each(function () { + $(this).css(self.settings.placement.from, posX); + posX = (parseInt(posX) + parseInt(self.settings.spacing)) + $(this).outerHeight(); + }); + } + }); + + $.notify = function (content, options) { + var plugin = new Notify(this, content, options); + return plugin.notify; + }; + $.notifyDefaults = function (options) { + defaults = $.extend(true, {}, defaults, options); + return defaults; + }; + + $.notifyClose = function (selector) { + + if (typeof selector === "undefined" || selector === "all") { + $('[data-notify]').find('[data-notify="dismiss"]').trigger('click'); + }else if(selector === 'success' || selector === 'info' || selector === 'warning' || selector === 'danger'){ + $('.alert-' + selector + '[data-notify]').find('[data-notify="dismiss"]').trigger('click'); + } else if(selector){ + $(selector + '[data-notify]').find('[data-notify="dismiss"]').trigger('click'); + } + else { + $('[data-notify-position="' + selector + '"]').find('[data-notify="dismiss"]').trigger('click'); + } + }; + + $.notifyCloseExcept = function (selector) { + + if(selector === 'success' || selector === 'info' || selector === 'warning' || selector === 'danger'){ + $('[data-notify]').not('.alert-' + selector).find('[data-notify="dismiss"]').trigger('click'); + } else{ + $('[data-notify]').not(selector).find('[data-notify="dismiss"]').trigger('click'); + } + }; + + +})); + + diff --git a/docroot/js/jquery-1.10.2.min.js b/docroot/js/jquery-1.10.2.min.js new file mode 100755 index 00000000..da417064 --- /dev/null +++ b/docroot/js/jquery-1.10.2.min.js @@ -0,0 +1,6 @@ +/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license +//@ sourceMappingURL=jquery-1.10.2.min.map +*/ +(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="
",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="
a",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="
t
",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="
",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t +}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/\s*$/g,At={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X
","
"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?""!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle); +u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("