From ee42e51b00945f40f8842ce7feed02409462cef2 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 25 May 2022 21:04:35 +0200 Subject: [PATCH] Codefactor review --- approot/main.xml | 2 +- docroot/css/lms.css | 2 +- src/libs/metadata/impl/AvFormatParser.cpp | 1 - src/libs/metadata/impl/TagLibParser.cpp | 1 - src/libs/som/include/som/DataNormalizer.hpp | 1 - src/libs/som/include/som/InputVector.hpp | 1 - src/libs/som/include/som/Matrix.hpp | 2 -- src/libs/som/include/som/Network.hpp | 1 - src/libs/subsonic/impl/SubsonicResponse.hpp | 1 - src/libs/utils/impl/FileResourceHandler.hpp | 1 - src/libs/utils/include/utils/IConfig.hpp | 1 - src/libs/utils/include/utils/UUID.hpp | 1 - src/libs/utils/include/utils/Zipper.hpp | 1 - src/lms/ui/Auth.cpp | 4 ---- src/lms/ui/LmsApplication.hpp | 1 - src/lms/ui/SettingsView.cpp | 1 - src/lms/ui/admin/DatabaseSettingsView.cpp | 1 - src/lms/ui/admin/InitWizardView.cpp | 1 - src/lms/ui/admin/InitWizardView.hpp | 1 - src/lms/ui/admin/ScannerController.cpp | 2 -- src/lms/ui/admin/UserView.cpp | 1 - src/lms/ui/common/ValueStringModel.hpp | 2 -- src/lms/ui/explore/Filters.cpp | 1 - src/lms/ui/explore/TrackListHelpers.cpp | 1 - src/tools/metadata/LmsMetadata.cpp | 1 - src/tools/similarity-parameters/GeneticAlgorithm.hpp | 1 - src/tools/similarity-parameters/LmsSimilarityParameters.cpp | 2 -- 27 files changed, 2 insertions(+), 34 deletions(-) diff --git a/approot/main.xml b/approot/main.xml index a58d5ca9..ffd58fbb 100644 --- a/approot/main.xml +++ b/approot/main.xml @@ -35,7 +35,7 @@ ${playqueue class="nav-link"}
  • - ${filters class="py-2 d-flex align-items-center"} + ${filters class="nav-link d-flex align-items-center"}
    • diff --git a/docroot/css/lms.css b/docroot/css/lms.css index 70851556..41839ce7 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -89,7 +89,7 @@ body { .Lms-notification-container { position: fixed; bottom: 78px; - right: 0px; + right: 0; } .Lms-player { diff --git a/src/libs/metadata/impl/AvFormatParser.cpp b/src/libs/metadata/impl/AvFormatParser.cpp index 9c588a2a..e5a472dd 100644 --- a/src/libs/metadata/impl/AvFormatParser.cpp +++ b/src/libs/metadata/impl/AvFormatParser.cpp @@ -226,7 +226,6 @@ AvFormatParser::parse(const std::filesystem::path& p, bool debug) track.clusters[tag] = std::move(values); } } - } track.artists = getArtists(metadataMap); diff --git a/src/libs/metadata/impl/TagLibParser.cpp b/src/libs/metadata/impl/TagLibParser.cpp index 456747cd..0e8d827c 100644 --- a/src/libs/metadata/impl/TagLibParser.cpp +++ b/src/libs/metadata/impl/TagLibParser.cpp @@ -148,7 +148,6 @@ getAlbum(const TagLib::PropertyMap& properties) void TagLibParser::processTag(Track& track, const std::string& tag, const TagLib::StringList& values, bool debug) { - if (debug) { std::vector strs; diff --git a/src/libs/som/include/som/DataNormalizer.hpp b/src/libs/som/include/som/DataNormalizer.hpp index 96006556..ef0de5fc 100644 --- a/src/libs/som/include/som/DataNormalizer.hpp +++ b/src/libs/som/include/som/DataNormalizer.hpp @@ -30,7 +30,6 @@ namespace SOM class DataNormalizer { public: - struct MinMax { InputVector::value_type min; diff --git a/src/libs/som/include/som/InputVector.hpp b/src/libs/som/include/som/InputVector.hpp index 50737fec..f31c215e 100644 --- a/src/libs/som/include/som/InputVector.hpp +++ b/src/libs/som/include/som/InputVector.hpp @@ -163,7 +163,6 @@ class InputVector } private: - friend class InputVector operator-(const InputVector& a, const InputVector& b) { if (!a.hasSameDimension(b.getNbDimensions())) diff --git a/src/libs/som/include/som/Matrix.hpp b/src/libs/som/include/som/Matrix.hpp index 3148d1d8..4a855a72 100644 --- a/src/libs/som/include/som/Matrix.hpp +++ b/src/libs/som/include/som/Matrix.hpp @@ -53,7 +53,6 @@ template class Matrix { public: - Matrix() = default; Matrix(Coordinate width, Coordinate height) @@ -109,7 +108,6 @@ class Matrix } private: - Coordinate _width {}; Coordinate _height {}; std::vector _values; diff --git a/src/libs/som/include/som/Network.hpp b/src/libs/som/include/som/Network.hpp index be854237..b46abb09 100644 --- a/src/libs/som/include/som/Network.hpp +++ b/src/libs/som/include/som/Network.hpp @@ -40,7 +40,6 @@ std::ostream& operator<<(std::ostream& os, const InputVector& a); class Network { public: - // Init a network with random values Network(Coordinate width, Coordinate height, std::size_t inputDimCount); diff --git a/src/libs/subsonic/impl/SubsonicResponse.hpp b/src/libs/subsonic/impl/SubsonicResponse.hpp index c0d49b1e..dc6a94f1 100644 --- a/src/libs/subsonic/impl/SubsonicResponse.hpp +++ b/src/libs/subsonic/impl/SubsonicResponse.hpp @@ -203,7 +203,6 @@ class Response void addArrayChild(const std::string& key, Node node); private: - void setVersionAttribute(ProtocolVersion version); friend class Response; diff --git a/src/libs/utils/impl/FileResourceHandler.hpp b/src/libs/utils/impl/FileResourceHandler.hpp index 8baca6e4..e6666a59 100644 --- a/src/libs/utils/impl/FileResourceHandler.hpp +++ b/src/libs/utils/impl/FileResourceHandler.hpp @@ -28,7 +28,6 @@ class FileResourceHandler final : public IResourceHandler FileResourceHandler(const std::filesystem::path& filePath); private: - Wt::Http::ResponseContinuation* processRequest(const Wt::Http::Request& request, Wt::Http::Response& response) override; static constexpr std::size_t _chunkSize {65536}; diff --git a/src/libs/utils/include/utils/IConfig.hpp b/src/libs/utils/include/utils/IConfig.hpp index 975e5d6f..e795b579 100644 --- a/src/libs/utils/include/utils/IConfig.hpp +++ b/src/libs/utils/include/utils/IConfig.hpp @@ -26,7 +26,6 @@ class IConfig { public: - virtual ~IConfig() = default; // Default values are returned in case of setting not found diff --git a/src/libs/utils/include/utils/UUID.hpp b/src/libs/utils/include/utils/UUID.hpp index 82396cc7..9d4ee2f2 100644 --- a/src/libs/utils/include/utils/UUID.hpp +++ b/src/libs/utils/include/utils/UUID.hpp @@ -28,7 +28,6 @@ class UUID { public: - static std::optional fromString(std::string_view str); std::string_view getAsString() const { return _value; } diff --git a/src/libs/utils/include/utils/Zipper.hpp b/src/libs/utils/include/utils/Zipper.hpp index 03ff2e95..288799fa 100644 --- a/src/libs/utils/include/utils/Zipper.hpp +++ b/src/libs/utils/include/utils/Zipper.hpp @@ -40,7 +40,6 @@ namespace Zip class Zipper { public: - Zipper(const std::map& files, const Wt::WDateTime& lastModifiedTime = {}); static constexpr SizeType minOutputBufferSize {64}; diff --git a/src/lms/ui/Auth.cpp b/src/lms/ui/Auth.cpp index 2db329bc..95646614 100644 --- a/src/lms/ui/Auth.cpp +++ b/src/lms/ui/Auth.cpp @@ -86,7 +86,6 @@ processAuthToken(const Wt::WEnvironment& env) class AuthModel : public Wt::WFormModel { public: - // Associate each field with a unique string literal. static const Field LoginNameField; static const Field PasswordField; @@ -160,7 +159,6 @@ class AuthModel : public Wt::WFormModel std::optional getUserId() const { return _userId; } private: - std::optional _userId; }; @@ -168,7 +166,6 @@ const AuthModel::Field AuthModel::LoginNameField {"login-name"}; const AuthModel::Field AuthModel::PasswordField {"password"}; const AuthModel::Field AuthModel::RememberMeField {"remember-me"}; - Auth::Auth() : Wt::WTemplateFormView {Wt::WString::tr("Lms.Auth.template")} { @@ -217,7 +214,6 @@ Auth::Auth() loginBtn->clicked().connect(this, processAuth); updateView(model.get()); - } } // namespace UserInterface diff --git a/src/lms/ui/LmsApplication.hpp b/src/lms/ui/LmsApplication.hpp index 559b9b18..af89b8f7 100644 --- a/src/lms/ui/LmsApplication.hpp +++ b/src/lms/ui/LmsApplication.hpp @@ -52,7 +52,6 @@ class ModalManager; class LmsApplication : public Wt::WApplication { public: - LmsApplication(const Wt::WEnvironment& env, Database::Db& db, LmsApplicationManager& appManager, std::optional userId = std::nullopt); ~LmsApplication(); diff --git a/src/lms/ui/SettingsView.cpp b/src/lms/ui/SettingsView.cpp index 66aaad6b..089e9367 100644 --- a/src/lms/ui/SettingsView.cpp +++ b/src/lms/ui/SettingsView.cpp @@ -187,7 +187,6 @@ class SettingsModel : public Wt::WFormModel { _authPasswordService->setPassword(user->getId(), valueText(PasswordField).toUTF8()); } - } void loadData() diff --git a/src/lms/ui/admin/DatabaseSettingsView.cpp b/src/lms/ui/admin/DatabaseSettingsView.cpp index ee291749..f0459b98 100644 --- a/src/lms/ui/admin/DatabaseSettingsView.cpp +++ b/src/lms/ui/admin/DatabaseSettingsView.cpp @@ -143,7 +143,6 @@ class DatabaseSettingsModel : public Wt::WFormModel } private: - void initializeModels() { _updatePeriodModel = std::make_shared>(); diff --git a/src/lms/ui/admin/InitWizardView.cpp b/src/lms/ui/admin/InitWizardView.cpp index d1c22065..4f4316dd 100644 --- a/src/lms/ui/admin/InitWizardView.cpp +++ b/src/lms/ui/admin/InitWizardView.cpp @@ -41,7 +41,6 @@ namespace UserInterface { class InitWizardModel : public Wt::WFormModel { public: - // Associate each field with a unique string literal. static inline const Field AdminLoginField {"admin-login"}; static inline const Field PasswordField {"password"}; diff --git a/src/lms/ui/admin/InitWizardView.hpp b/src/lms/ui/admin/InitWizardView.hpp index 260dd9bf..bf27091d 100644 --- a/src/lms/ui/admin/InitWizardView.hpp +++ b/src/lms/ui/admin/InitWizardView.hpp @@ -27,7 +27,6 @@ class InitWizardView : public Wt::WTemplateFormView { public: InitWizardView(); - }; } // namespace UserInterface diff --git a/src/lms/ui/admin/ScannerController.cpp b/src/lms/ui/admin/ScannerController.cpp index 5cf4873c..e1754b8f 100644 --- a/src/lms/ui/admin/ScannerController.cpp +++ b/src/lms/ui/admin/ScannerController.cpp @@ -55,7 +55,6 @@ durationToString(const Wt::WDateTime& begin, const Wt::WDateTime& end) class ReportResource : public Wt::WResource { public: - ReportResource() { suggestFileName("report.txt"); @@ -268,7 +267,6 @@ ScannerController::refreshContents() } break; } - } } // namespace UserInterface diff --git a/src/lms/ui/admin/UserView.cpp b/src/lms/ui/admin/UserView.cpp index 7baaf313..fa5d50ae 100644 --- a/src/lms/ui/admin/UserView.cpp +++ b/src/lms/ui/admin/UserView.cpp @@ -47,7 +47,6 @@ using namespace Database; class UserModel : public Wt::WFormModel { - public: static inline const Field LoginField {"login"}; static inline const Field PasswordField {"password"}; diff --git a/src/lms/ui/common/ValueStringModel.hpp b/src/lms/ui/common/ValueStringModel.hpp index 5c4dce95..69008024 100644 --- a/src/lms/ui/common/ValueStringModel.hpp +++ b/src/lms/ui/common/ValueStringModel.hpp @@ -30,7 +30,6 @@ template class ValueStringModel : public Wt::WStringListModel { public: - T getValue(std::size_t row) const { return Wt::cpp17::any_cast(data(index(static_cast(row), 0), Wt::ItemDataRole::User)); @@ -78,7 +77,6 @@ class ValueStringModel : public Wt::WStringListModel { removeRows(0, rowCount()); } - }; } // namespace UserInterface diff --git a/src/lms/ui/explore/Filters.cpp b/src/lms/ui/explore/Filters.cpp index c66b743f..7310405f 100644 --- a/src/lms/ui/explore/Filters.cpp +++ b/src/lms/ui/explore/Filters.cpp @@ -124,7 +124,6 @@ Filters::showDialog() void Filters::add(ClusterId clusterId) { - if (std::find(std::cbegin(_clusterIds), std::cend(_clusterIds), clusterId) != std::cend(_clusterIds)) return; diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp index bb10437d..aa2ddbf1 100644 --- a/src/lms/ui/explore/TrackListHelpers.cpp +++ b/src/lms/ui/explore/TrackListHelpers.cpp @@ -106,7 +106,6 @@ namespace UserInterface::TrackListHelpers starBtn->setText(Wt::WString::tr("Lms.Explore.unstar")); } }); - } entry->bindNew("download", Wt::WString::tr("Lms.Explore.download")) diff --git a/src/tools/metadata/LmsMetadata.cpp b/src/tools/metadata/LmsMetadata.cpp index 2b25401d..a64bd501 100644 --- a/src/tools/metadata/LmsMetadata.cpp +++ b/src/tools/metadata/LmsMetadata.cpp @@ -194,7 +194,6 @@ int main(int argc, char *argv[]) parse(parser, file); } } - } catch (std::exception& e) { diff --git a/src/tools/similarity-parameters/GeneticAlgorithm.hpp b/src/tools/similarity-parameters/GeneticAlgorithm.hpp index 3a5c7327..9fe17a0e 100644 --- a/src/tools/similarity-parameters/GeneticAlgorithm.hpp +++ b/src/tools/similarity-parameters/GeneticAlgorithm.hpp @@ -50,7 +50,6 @@ class GeneticAlgorithm Individual simulate(const std::vector& initialPopulation); private: - struct ScoredIndividual { Individual individual; diff --git a/src/tools/similarity-parameters/LmsSimilarityParameters.cpp b/src/tools/similarity-parameters/LmsSimilarityParameters.cpp index 6929ce31..b9ae643b 100644 --- a/src/tools/similarity-parameters/LmsSimilarityParameters.cpp +++ b/src/tools/similarity-parameters/LmsSimilarityParameters.cpp @@ -324,7 +324,6 @@ static void printBadlyClassifiedTracks(Database::Session& session, FeaturesSearcher::TrainSettings trainSettings) { - FeaturesSearcher searcher {session, trainSettings}; const std::vector trackIds = std::invoke([&]() @@ -384,7 +383,6 @@ int main(int argc, char *argv[]) { try { - // log to stdout // ServiceProvider::create(std::cout);