From 20b6a56994b03464f9754cc69cb52db137ed6fa7 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 18 Jul 2026 09:34:26 +0200 Subject: [PATCH] Minot cleanup --- src/libs/audio/impl/ffmpeg/PcmDecoder.cpp | 6 +++--- src/libs/audio/impl/pulseaudio/AudioOutput.cpp | 4 ++-- src/libs/audio/impl/pulseaudio/AudioOutputStream.cpp | 12 ++++++------ src/libs/database/impl/Db.cpp | 4 ++-- src/libs/database/impl/objects/Artist.cpp | 6 +++--- src/libs/database/impl/objects/Listen.cpp | 6 +++--- src/libs/database/impl/objects/Release.cpp | 6 +++--- src/libs/database/impl/objects/Track.cpp | 6 +++--- src/libs/database/impl/objects/TrackList.cpp | 2 +- src/lms/ui/Auth.cpp | 2 +- src/lms/ui/admin/MediaLibraryModal.cpp | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/libs/audio/impl/ffmpeg/PcmDecoder.cpp b/src/libs/audio/impl/ffmpeg/PcmDecoder.cpp index b77290f9..97612035 100644 --- a/src/libs/audio/impl/ffmpeg/PcmDecoder.cpp +++ b/src/libs/audio/impl/ffmpeg/PcmDecoder.cpp @@ -65,7 +65,7 @@ namespace lms::audio::ffmpeg return planar ? AV_SAMPLE_FMT_DBLP : AV_SAMPLE_FMT_DBL; } - throw Exception("Unsupported PcmSampleType"); + throw Exception{ "Unsupported PcmSampleType" }; } SwrContextPtr createResampler(const PcmParameters& params, const AVChannelLayout& inLayout, AVSampleFormat inFmt, int inSampleRate) @@ -104,7 +104,7 @@ namespace lms::audio::ffmpeg : _parameters{ parameters } { if (_parameters.channelCount > AV_NUM_DATA_POINTERS) - throw Exception("Channel count exceeds maximum supported channels"); + throw Exception{ "Channel count exceeds maximum supported channels" }; utils::init(); @@ -179,7 +179,7 @@ namespace lms::audio::ffmpeg { int error{ ::avcodec_open2(_decoderContext.get(), decoder, nullptr) }; if (error < 0) - throw FFmpegException("Cannot open decoder", error); + throw FFmpegException{ "Cannot open decoder", error }; } _decodedFrame = AVFramePtr{ av_frame_alloc() }; diff --git a/src/libs/audio/impl/pulseaudio/AudioOutput.cpp b/src/libs/audio/impl/pulseaudio/AudioOutput.cpp index 65b3cdb2..5c102558 100644 --- a/src/libs/audio/impl/pulseaudio/AudioOutput.cpp +++ b/src/libs/audio/impl/pulseaudio/AudioOutput.cpp @@ -89,13 +89,13 @@ namespace lms::audio::pulseaudio { const int error{ ::pa_context_connect(_context.get(), nullptr, PA_CONTEXT_NOFLAGS, nullptr) }; if (error < 0) - throw PaException("pa_context_connect failed", error); + throw PaException{ "pa_context_connect failed", error }; } { const int error{ ::pa_threaded_mainloop_start(_mainLoop.get()) }; if (error < 0) - throw PaException("pa_threaded_mainloop_start failed", error); + throw PaException{ "pa_threaded_mainloop_start failed", error }; } } diff --git a/src/libs/audio/impl/pulseaudio/AudioOutputStream.cpp b/src/libs/audio/impl/pulseaudio/AudioOutputStream.cpp index 27832fbb..b8f357f4 100644 --- a/src/libs/audio/impl/pulseaudio/AudioOutputStream.cpp +++ b/src/libs/audio/impl/pulseaudio/AudioOutputStream.cpp @@ -226,7 +226,7 @@ namespace lms::audio::pulseaudio { pa_operation* op{ ::pa_stream_flush(_stream.get(), nullptr, nullptr) }; if (!op) - throw PaException("pa_stream_flush failed", pa_context_errno(_context)); + throw PaException{ "pa_stream_flush failed", pa_context_errno(_context) }; ::pa_operation_unref(op); } @@ -249,7 +249,7 @@ namespace lms::audio::pulseaudio pa_operation* op{ ::pa_stream_cork(_stream.get(), 1, nullptr, nullptr) }; if (!op) - throw PaException("pa_stream_cork (pause) failed", pa_context_errno(_context)); + throw PaException{ "pa_stream_cork (pause) failed", pa_context_errno(_context) }; ::pa_operation_unref(op); } @@ -263,14 +263,14 @@ namespace lms::audio::pulseaudio { pa_operation* op{ ::pa_stream_cork(_stream.get(), 0, nullptr, nullptr) }; if (!op) - throw PaException("pa_stream_cork (resume) failed", pa_context_errno(_context)); + throw PaException{ "pa_stream_cork (resume) failed", pa_context_errno(_context) }; ::pa_operation_unref(op); } { pa_operation* op{ ::pa_stream_trigger(_stream.get(), NULL, NULL) }; if (!op) - throw PaException("pa_stream_trigger failed", pa_context_errno(_context)); + throw PaException{ "pa_stream_trigger failed", pa_context_errno(_context) }; ::pa_operation_unref(op); } } @@ -301,7 +301,7 @@ namespace lms::audio::pulseaudio nullptr, nullptr) }; if (!op) - throw PaException("pa_context_set_sink_input_volume failed", pa_context_errno(_context)); + throw PaException{ "pa_context_set_sink_input_volume failed", pa_context_errno(_context) }; ::pa_operation_unref(op); @@ -425,7 +425,7 @@ namespace lms::audio::pulseaudio ::pa_operation* op{ ::pa_stream_drain(_stream.get(), [](pa_stream*, int success, void* userdata) { static_cast(userdata)->onDrainComplete(success); }, this) }; if (!op) - throw PaException("pa_stream_drain failed", pa_context_errno(_context)); + throw PaException{ "pa_stream_drain failed", pa_context_errno(_context) }; ::pa_operation_unref(op); } diff --git a/src/libs/database/impl/Db.cpp b/src/libs/database/impl/Db.cpp index 6d242777..6779b70c 100644 --- a/src/libs/database/impl/Db.cpp +++ b/src/libs/database/impl/Db.cpp @@ -248,7 +248,7 @@ namespace lms::db } else if (checkType != "none") { - throw Exception("Invalid 'db-integrity-check' value: '" + checkType + "'. Expected 'quick', 'full' or 'none'."); + throw Exception{ "Invalid 'db-integrity-check' value: '" + checkType + "'. Expected 'quick', 'full' or 'none'." }; } } @@ -360,7 +360,7 @@ namespace lms::db }) }; if (!foreignKeyConstraintsPassed) - throw Exception("Foreign key constraints check failed! Please restore from a backup or recreate the database."); + throw Exception{ "Foreign key constraints check failed! Please restore from a backup or recreate the database." }; LMS_LOG(DB, INFO, "Foreign key constraints check passed!"); } diff --git a/src/libs/database/impl/objects/Artist.cpp b/src/libs/database/impl/objects/Artist.cpp index 61da64e7..d2a5160c 100644 --- a/src/libs/database/impl/objects/Artist.cpp +++ b/src/libs/database/impl/objects/Artist.cpp @@ -161,7 +161,7 @@ namespace lms::db WhereClause clusterClause; for (const ClusterId clusterId : params.filters.clusters) { - clusterClause.Or(WhereClause("t_c.cluster_id = ?")); + clusterClause.Or(WhereClause{ "t_c.cluster_id = ?" }); query.bind(clusterId); } @@ -442,11 +442,11 @@ AND NOT EXISTS ( 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_a_l.artist_id = a.id INNER JOIN track_artist_link t_a_l ON t_a_l.track_id = t.id"; - where.And(WhereClause("a.id = ?")).bind(getId().toString()); + where.And(WhereClause{ "a.id = ?" }).bind(getId().toString()); { WhereClause clusterClause; for (const ClusterTypeId clusterTypeId : clusterTypeIds) - clusterClause.Or(WhereClause("c_type.id = ?")).bind(clusterTypeId.toString()); + clusterClause.Or(WhereClause{ "c_type.id = ?" }).bind(clusterTypeId.toString()); where.And(clusterClause); } diff --git a/src/libs/database/impl/objects/Listen.cpp b/src/libs/database/impl/objects/Listen.cpp index 5370ddc7..a2a6f405 100644 --- a/src/libs/database/impl/objects/Listen.cpp +++ b/src/libs/database/impl/objects/Listen.cpp @@ -127,7 +127,7 @@ namespace lms::db WhereClause clusterClause; for (const db::ClusterId id : params.filters.clusters) { - clusterClause.Or(WhereClause("t_c.cluster_id = ?")); + clusterClause.Or(WhereClause{ "t_c.cluster_id = ?" }); query.bind(id); } @@ -229,7 +229,7 @@ namespace lms::db WhereClause clusterClause; for (const ClusterId id : params.filters.clusters) { - clusterClause.Or(WhereClause("c.id = ?")); + clusterClause.Or(WhereClause{ "c.id = ?" }); query.bind(id); } @@ -313,7 +313,7 @@ namespace lms::db WhereClause clusterClause; for (const ClusterId id : params.filters.clusters) { - clusterClause.Or(WhereClause("c.id = ?")).bind(id.toString()); + clusterClause.Or(WhereClause{ "c.id = ?" }).bind(id.toString()); query.bind(id); } diff --git a/src/libs/database/impl/objects/Release.cpp b/src/libs/database/impl/objects/Release.cpp index d7aa9e0d..f50b49d9 100644 --- a/src/libs/database/impl/objects/Release.cpp +++ b/src/libs/database/impl/objects/Release.cpp @@ -236,7 +236,7 @@ namespace lms::db WhereClause clusterClause; for (const ClusterId clusterId : params.filters.clusters) { - clusterClause.Or(WhereClause("t_c.cluster_id = ?")); + clusterClause.Or(WhereClause{ "t_c.cluster_id = ?" }); query.bind(clusterId); } @@ -1003,11 +1003,11 @@ namespace lms::db oss << "SELECT c from cluster c INNER JOIN track_cluster t_c ON t_c.cluster_id = c.id INNER JOIN track t ON t.id = t_c.track_id "; - where.And(WhereClause("t.release_id = ?")).bind(getId().toString()); + where.And(WhereClause{ "t.release_id = ?" }).bind(getId().toString()); { WhereClause clusterClause; for (const ClusterTypeId clusterTypeId : clusterTypeIds) - clusterClause.Or(WhereClause("c.cluster_type_id = ?")).bind(clusterTypeId.toString()); + clusterClause.Or(WhereClause{ "c.cluster_type_id = ?" }).bind(clusterTypeId.toString()); where.And(clusterClause); } oss << " " << where.get(); diff --git a/src/libs/database/impl/objects/Track.cpp b/src/libs/database/impl/objects/Track.cpp index d1d2e7f0..f188351c 100644 --- a/src/libs/database/impl/objects/Track.cpp +++ b/src/libs/database/impl/objects/Track.cpp @@ -105,7 +105,7 @@ namespace lms::db WhereClause clusterClause; for (const ClusterId clusterId : params.filters.clusters) { - clusterClause.Or(WhereClause("t_c.cluster_id = ?")); + clusterClause.Or(WhereClause{ "t_c.cluster_id = ?" }); query.bind(clusterId); } @@ -897,11 +897,11 @@ namespace lms::db 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(getId().toString()); + where.And(WhereClause{ "t.id = ?" }).bind(getId().toString()); { WhereClause clusterClause; for (ClusterTypeId clusterTypeId : clusterTypeIds) - clusterClause.Or(WhereClause("c_type.id = ?")).bind(clusterTypeId.toString()); + clusterClause.Or(WhereClause{ "c_type.id = ?" }).bind(clusterTypeId.toString()); where.And(clusterClause); } oss << " " << where.get(); diff --git a/src/libs/database/impl/objects/TrackList.cpp b/src/libs/database/impl/objects/TrackList.cpp index 018fd1e2..506885da 100644 --- a/src/libs/database/impl/objects/TrackList.cpp +++ b/src/libs/database/impl/objects/TrackList.cpp @@ -115,7 +115,7 @@ namespace lms::db WhereClause clusterClause; for (const ClusterId clusterId : params.filters.clusters) { - clusterClause.Or(WhereClause("c.id = ?")); + clusterClause.Or(WhereClause{ "c.id = ?" }); query.bind(clusterId); } diff --git a/src/lms/ui/Auth.cpp b/src/lms/ui/Auth.cpp index c2dc5c6e..9715241f 100644 --- a/src/lms/ui/Auth.cpp +++ b/src/lms/ui/Auth.cpp @@ -138,7 +138,7 @@ namespace lms::ui return Wt::WFormModel::validateField(field); } - setValidation(field, Wt::WValidator::Result(error.empty() ? Wt::ValidationState::Valid : Wt::ValidationState::Invalid, error)); + setValidation(field, Wt::WValidator::Result{ error.empty() ? Wt::ValidationState::Valid : Wt::ValidationState::Invalid, error }); return (validation(field).state() == Wt::ValidationState::Valid); } diff --git a/src/lms/ui/admin/MediaLibraryModal.cpp b/src/lms/ui/admin/MediaLibraryModal.cpp index 225dbd49..71e6a6e8 100644 --- a/src/lms/ui/admin/MediaLibraryModal.cpp +++ b/src/lms/ui/admin/MediaLibraryModal.cpp @@ -83,7 +83,7 @@ namespace lms::ui std::error_code ec; if (p.is_relative()) - return Wt::WValidator::Result(Wt::ValidationState::Invalid, Wt::WString::tr("Lms.Admin.MediaLibrary.path-must-be-absolute")); + return Wt::WValidator::Result{ Wt::ValidationState::Invalid, Wt::WString::tr("Lms.Admin.MediaLibrary.path-must-be-absolute") }; // TODO check and translate access rights issues bool res{ std::filesystem::is_directory(p, ec) };