diff --git a/src/libs/database/impl/objects/ScanSettings.cpp b/src/libs/database/impl/objects/ScanSettings.cpp index 23907e24..ab41d137 100644 --- a/src/libs/database/impl/objects/ScanSettings.cpp +++ b/src/libs/database/impl/objects/ScanSettings.cpp @@ -132,9 +132,9 @@ namespace lms::db _allowMBIDArtistMerge = value; } - void ScanSettings::setArtistImageFallbackToReleaseField(bool value) + void ScanSettings::setArtistImageFallbackToRelease(bool value) { - _artistImageFallbackToReleaseField = value; + _artistImageFallbackToRelease = value; } void ScanSettings::incAudioScanVersion() diff --git a/src/libs/database/include/database/objects/ScanSettings.hpp b/src/libs/database/include/database/objects/ScanSettings.hpp index 53593388..d8e68db1 100644 --- a/src/libs/database/include/database/objects/ScanSettings.hpp +++ b/src/libs/database/include/database/objects/ScanSettings.hpp @@ -75,7 +75,7 @@ namespace lms::db std::vector getArtistsToNotSplit() const; bool getSkipSingleReleasePlayLists() const { return _skipSingleReleasePlayLists; } bool getAllowMBIDArtistMerge() const { return _allowMBIDArtistMerge; } - bool getArtistImageFallbackToReleaseField() const { return _artistImageFallbackToReleaseField; } + bool getArtistImageFallbackToRelease() const { return _artistImageFallbackToRelease; } // Setters void setUpdateStartTime(Wt::WTime t) { _startTime = t; } @@ -87,7 +87,7 @@ namespace lms::db void setDefaultTagDelimiters(std::span delimiters); void setSkipSingleReleasePlayLists(bool value); void setAllowMBIDArtistMerge(bool value); - void setArtistImageFallbackToReleaseField(bool value); + void setArtistImageFallbackToRelease(bool value); void setMusicNNModelIdentifier(std::string_view identifier) { _musicnnModelIdentifier = identifier; } template void persist(Action& a) @@ -104,7 +104,7 @@ namespace lms::db Wt::Dbo::field(a, _defaultTagDelimiters, "default_tag_delimiters"); Wt::Dbo::field(a, _skipSingleReleasePlayLists, "skip_single_release_playlists"); Wt::Dbo::field(a, _allowMBIDArtistMerge, "allow_mbid_artist_merge"); - Wt::Dbo::field(a, _artistImageFallbackToReleaseField, "artist_image_fallback_to_release"); + Wt::Dbo::field(a, _artistImageFallbackToRelease, "artist_image_fallback_to_release"); Wt::Dbo::field(a, _musicnnModelIdentifier, "musicnn_model_identifier"); } @@ -126,9 +126,9 @@ namespace lms::db std::string _artistTagDelimiters; std::string _artistsToNotSplit; std::string _defaultTagDelimiters; - bool _skipSingleReleasePlayLists{}; - bool _allowMBIDArtistMerge{}; - bool _artistImageFallbackToReleaseField{}; + bool _skipSingleReleasePlayLists{ true }; + bool _allowMBIDArtistMerge{ true }; + bool _artistImageFallbackToRelease{ true }; std::string _musicnnModelIdentifier; }; } // namespace lms::db diff --git a/src/libs/services/scanner/impl/ScannerService.cpp b/src/libs/services/scanner/impl/ScannerService.cpp index 87e07fd0..d1ce1a5e 100644 --- a/src/libs/services/scanner/impl/ScannerService.cpp +++ b/src/libs/services/scanner/impl/ScannerService.cpp @@ -124,7 +124,7 @@ namespace lms::scanner settings->skipSingleReleasePlayLists = scanSettings->getSkipSingleReleasePlayLists(); settings->allowArtistMBIDFallback = scanSettings->getAllowMBIDArtistMerge(); - settings->artistImageFallbackToRelease = scanSettings->getArtistImageFallbackToReleaseField(); + settings->artistImageFallbackToRelease = scanSettings->getArtistImageFallbackToRelease(); settings->extractMusicNNEmbeddings = scanSettings->getRecommendationEngineType() == db::ScanSettings::RecommendationEngineType::AudioSimilarity; settings->musicnnModelPath = core::Service::get()->getPath("musicnn-model-path", "/usr/share/lms/models/MSD_musicnn_embedding.onnx"); diff --git a/src/lms/ui/admin/ScanSettingsView.cpp b/src/lms/ui/admin/ScanSettingsView.cpp index 93a4a824..44caa2c2 100644 --- a/src/lms/ui/admin/ScanSettingsView.cpp +++ b/src/lms/ui/admin/ScanSettingsView.cpp @@ -160,7 +160,7 @@ namespace lms::ui setValue(SkipSingleReleasePlayListsField, scanSettings->getSkipSingleReleasePlayLists()); setValue(AllowMBIDArtistMergeField, scanSettings->getAllowMBIDArtistMerge()); - setValue(ArtistImageFallbackToReleaseField, scanSettings->getArtistImageFallbackToReleaseField()); + setValue(ArtistImageFallbackToReleaseField, scanSettings->getArtistImageFallbackToRelease()); auto recommendationEngineTypeRow{ _recommendationEngineTypeModel->getRowFromValue(scanSettings->getRecommendationEngineType()) }; if (recommendationEngineTypeRow) @@ -210,7 +210,7 @@ namespace lms::ui { const bool artistImageFallbackToRelease{ Wt::asNumber(value(ArtistImageFallbackToReleaseField)) != 0 }; - scanSettings.modify()->setArtistImageFallbackToReleaseField(artistImageFallbackToRelease); + scanSettings.modify()->setArtistImageFallbackToRelease(artistImageFallbackToRelease); } {