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

Allow wildcards in file names to search for images, fixes #697

Browse Source
This commit is contained in:
emeric
2025-08-05 22:33:03 +02:00
parent 9ae425a800
commit 35ba66099f
16 changed files with 142 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/services/scanner/impl/steps/ScanStepAssociateArtistImages.cpp
+1 -1
View File
@@ -73,7 +73,7 @@ namespace lms::scanner
{
db::Image::FindParameters params;
params.setDirectory(directory->getId());
params.setFileStem(fileStem); // no need to sanitize here, user is responsible for providing sanitized file stems in conf file
params.setFileStem(fileStem, db::Image::FindParameters::ProcessWildcards{ true }); // no need to sanitize here, user is responsible for providing sanitized file stems in conf file
db::Image::find(session, params, [&](const db::Image::pointer foundImg) {
if (!image)
src/libs/services/scanner/impl/steps/ScanStepAssociateMediumImages.cpp
+4 -4
View File
@@ -62,7 +62,7 @@ namespace lms::scanner
std::span<const std::string_view> mediumFileNames;
};
db::Image::pointer findImageInDirectory(db::Session& session, const db::Directory::pointer& directory, std::span<const std::string_view> fileStemsToSearch)
db::Image::pointer findImageInDirectory(db::Session& session, const db::Directory::pointer& directory, std::span<const std::string_view> fileStemsToSearch, db::Image::FindParameters::ProcessWildcards processWildcards)
{
db::Image::pointer image;
@@ -70,7 +70,7 @@ namespace lms::scanner
{
db::Image::FindParameters params;
params.setDirectory(directory->getId());
params.setFileStem(fileStem);
params.setFileStem(fileStem, processWildcards);
db::Image::find(session, params, [&](const db::Image::pointer foundImg) {
if (!image)
@@ -109,11 +109,11 @@ namespace lms::scanner
if (const std::string mediumName{ core::pathUtils::sanitizeFileStem(medium->getName()) }; !mediumName.empty())
{
std::string_view mediumNameView{ mediumName };
image = findImageInDirectory(session, directory, std::span{ &mediumNameView, 1 });
image = findImageInDirectory(session, directory, std::span{ &mediumNameView, 1 }, db::Image::FindParameters::ProcessWildcards{ false });
}
if (!image)
image = findImageInDirectory(session, directory, searchParams.mediumFileNames);
image = findImageInDirectory(session, directory, searchParams.mediumFileNames, db::Image::FindParameters::ProcessWildcards{ true });
});
return image;
src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ namespace lms::scanner
{
db::Image::FindParameters params;
params.setDirectory(directory->getId());
params.setFileStem(fileStem);
params.setFileStem(fileStem, db::Image::FindParameters::ProcessWildcards{ true }); // no need to sanitize here, user is responsible for providing sanitized file stems in conf file
db::Image::find(session, params, [&](const db::Image::pointer& image) {
if (!artwork)