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

Enabled some scan settings by default for new installs

Browse Source
This commit is contained in:
emeric
2026-06-21 20:33:21 +02:00
parent 95eb1f00bc
commit 8b8e3cc99c
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/database/impl/objects/ScanSettings.cpp
+2 -2
View File
@@ -132,9 +132,9 @@ namespace lms::db
_allowMBIDArtistMerge = value; _allowMBIDArtistMerge = value;
} }
void ScanSettings::setArtistImageFallbackToReleaseField(bool value) void ScanSettings::setArtistImageFallbackToRelease(bool value)
{ {
_artistImageFallbackToReleaseField = value; _artistImageFallbackToRelease = value;
} }
void ScanSettings::incAudioScanVersion() void ScanSettings::incAudioScanVersion()
src/libs/database/include/database/objects/ScanSettings.hpp
+6 -6
View File
@@ -75,7 +75,7 @@ namespace lms::db
std::vector<std::string> getArtistsToNotSplit() const; std::vector<std::string> getArtistsToNotSplit() const;
bool getSkipSingleReleasePlayLists() const { return _skipSingleReleasePlayLists; } bool getSkipSingleReleasePlayLists() const { return _skipSingleReleasePlayLists; }
bool getAllowMBIDArtistMerge() const { return _allowMBIDArtistMerge; } bool getAllowMBIDArtistMerge() const { return _allowMBIDArtistMerge; }
bool getArtistImageFallbackToReleaseField() const { return _artistImageFallbackToReleaseField; } bool getArtistImageFallbackToRelease() const { return _artistImageFallbackToRelease; }
// Setters // Setters
void setUpdateStartTime(Wt::WTime t) { _startTime = t; } void setUpdateStartTime(Wt::WTime t) { _startTime = t; }
@@ -87,7 +87,7 @@ namespace lms::db
void setDefaultTagDelimiters(std::span<const std::string_view> delimiters); void setDefaultTagDelimiters(std::span<const std::string_view> delimiters);
void setSkipSingleReleasePlayLists(bool value); void setSkipSingleReleasePlayLists(bool value);
void setAllowMBIDArtistMerge(bool value); void setAllowMBIDArtistMerge(bool value);
void setArtistImageFallbackToReleaseField(bool value); void setArtistImageFallbackToRelease(bool value);
void setMusicNNModelIdentifier(std::string_view identifier) { _musicnnModelIdentifier = identifier; } void setMusicNNModelIdentifier(std::string_view identifier) { _musicnnModelIdentifier = identifier; }
template<class Action> template<class Action>
void persist(Action& a) void persist(Action& a)
@@ -104,7 +104,7 @@ namespace lms::db
Wt::Dbo::field(a, _defaultTagDelimiters, "default_tag_delimiters"); Wt::Dbo::field(a, _defaultTagDelimiters, "default_tag_delimiters");
Wt::Dbo::field(a, _skipSingleReleasePlayLists, "skip_single_release_playlists"); Wt::Dbo::field(a, _skipSingleReleasePlayLists, "skip_single_release_playlists");
Wt::Dbo::field(a, _allowMBIDArtistMerge, "allow_mbid_artist_merge"); 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"); Wt::Dbo::field(a, _musicnnModelIdentifier, "musicnn_model_identifier");
} }
@@ -126,9 +126,9 @@ namespace lms::db
std::string _artistTagDelimiters; std::string _artistTagDelimiters;
std::string _artistsToNotSplit; std::string _artistsToNotSplit;
std::string _defaultTagDelimiters; std::string _defaultTagDelimiters;
bool _skipSingleReleasePlayLists{}; bool _skipSingleReleasePlayLists{ true };
bool _allowMBIDArtistMerge{}; bool _allowMBIDArtistMerge{ true };
bool _artistImageFallbackToReleaseField{}; bool _artistImageFallbackToRelease{ true };
std::string _musicnnModelIdentifier; std::string _musicnnModelIdentifier;
}; };
} // namespace lms::db } // namespace lms::db
src/libs/services/scanner/impl/ScannerService.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ namespace lms::scanner
settings->skipSingleReleasePlayLists = scanSettings->getSkipSingleReleasePlayLists(); settings->skipSingleReleasePlayLists = scanSettings->getSkipSingleReleasePlayLists();
settings->allowArtistMBIDFallback = scanSettings->getAllowMBIDArtistMerge(); settings->allowArtistMBIDFallback = scanSettings->getAllowMBIDArtistMerge();
settings->artistImageFallbackToRelease = scanSettings->getArtistImageFallbackToReleaseField(); settings->artistImageFallbackToRelease = scanSettings->getArtistImageFallbackToRelease();
settings->extractMusicNNEmbeddings = scanSettings->getRecommendationEngineType() == db::ScanSettings::RecommendationEngineType::AudioSimilarity; settings->extractMusicNNEmbeddings = scanSettings->getRecommendationEngineType() == db::ScanSettings::RecommendationEngineType::AudioSimilarity;
settings->musicnnModelPath = core::Service<core::IConfig>::get()->getPath("musicnn-model-path", "/usr/share/lms/models/MSD_musicnn_embedding.onnx"); settings->musicnnModelPath = core::Service<core::IConfig>::get()->getPath("musicnn-model-path", "/usr/share/lms/models/MSD_musicnn_embedding.onnx");
src/lms/ui/admin/ScanSettingsView.cpp
+2 -2
View File
@@ -160,7 +160,7 @@ namespace lms::ui
setValue(SkipSingleReleasePlayListsField, scanSettings->getSkipSingleReleasePlayLists()); setValue(SkipSingleReleasePlayListsField, scanSettings->getSkipSingleReleasePlayLists());
setValue(AllowMBIDArtistMergeField, scanSettings->getAllowMBIDArtistMerge()); setValue(AllowMBIDArtistMergeField, scanSettings->getAllowMBIDArtistMerge());
setValue(ArtistImageFallbackToReleaseField, scanSettings->getArtistImageFallbackToReleaseField()); setValue(ArtistImageFallbackToReleaseField, scanSettings->getArtistImageFallbackToRelease());
auto recommendationEngineTypeRow{ _recommendationEngineTypeModel->getRowFromValue(scanSettings->getRecommendationEngineType()) }; auto recommendationEngineTypeRow{ _recommendationEngineTypeModel->getRowFromValue(scanSettings->getRecommendationEngineType()) };
if (recommendationEngineTypeRow) if (recommendationEngineTypeRow)
@@ -210,7 +210,7 @@ namespace lms::ui
{ {
const bool artistImageFallbackToRelease{ Wt::asNumber(value(ArtistImageFallbackToReleaseField)) != 0 }; const bool artistImageFallbackToRelease{ Wt::asNumber(value(ArtistImageFallbackToReleaseField)) != 0 };
scanSettings.modify()->setArtistImageFallbackToReleaseField(artistImageFallbackToRelease); scanSettings.modify()->setArtistImageFallbackToRelease(artistImageFallbackToRelease);
} }
{ {