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

When changing settings, reload the scanner in order to take new params into account

Browse Source
This commit is contained in:
emeric
2024-04-29 13:53:55 +02:00
parent 2b7aecce4e
commit 553787b595
5 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/services/scanner/impl/ScannerService.cpp
-5
View File
@@ -148,11 +148,6 @@ namespace lms::scanner
}); });
} }
void ScannerService::requestStop()
{
abortScan();
}
void ScannerService::requestReload() void ScannerService::requestReload()
{ {
abortScan(); abortScan();
src/libs/services/scanner/impl/ScannerService.hpp
-1
View File
@@ -50,7 +50,6 @@ namespace lms::scanner
ScannerService(const ScannerService&) = delete; ScannerService(const ScannerService&) = delete;
ScannerService& operator=(const ScannerService&) = delete; ScannerService& operator=(const ScannerService&) = delete;
void requestStop() override;
void requestReload() override; void requestReload() override;
void requestImmediateScan(const ScanOptions& scanOptions) override; void requestImmediateScan(const ScanOptions& scanOptions) override;
src/libs/services/scanner/include/services/scanner/IScannerService.hpp
+1 -3
View File
@@ -38,9 +38,7 @@ namespace lms::scanner
virtual ~IScannerService() = default; virtual ~IScannerService() = default;
// Async requests // Async requests
virtual void requestStop() = 0; virtual void requestReload() = 0; // will stop/reschedule scan
virtual void requestReload() = 0;
virtual void requestImmediateScan(const ScanOptions& options = {}) = 0; virtual void requestImmediateScan(const ScanOptions& options = {}) = 0;
enum class State enum class State
src/lms/ui/admin/MediaLibrariesView.cpp
+2 -2
View File
@@ -106,7 +106,7 @@ namespace lms::ui
} }
// Don't want the scanner to go on with wrong settings // Don't want the scanner to go on with wrong settings
core::Service<scanner::IScannerService>::get()->requestStop(); core::Service<scanner::IScannerService>::get()->requestReload();
LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibraries.media-libraries"), Wt::WString::tr("Lms.Admin.MediaLibrary.library-deleted")); LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibraries.media-libraries"), Wt::WString::tr("Lms.Admin.MediaLibrary.library-deleted"));
_libraries->removeWidget(libraryEntry); _libraries->removeWidget(libraryEntry);
@@ -148,7 +148,7 @@ namespace lms::ui
updateEntry(newMediaLibraryId, entry); updateEntry(newMediaLibraryId, entry);
// Don't want the scanner to go on with wrong settings // Don't want the scanner to go on with wrong settings
core::Service<scanner::IScannerService>::get()->requestStop(); core::Service<scanner::IScannerService>::get()->requestReload();
LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibraries.media-libraries"), Wt::WString::tr("Lms.settings-saved")); LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibraries.media-libraries"), Wt::WString::tr("Lms.settings-saved"));
LmsApp->getModalManager().dispose(mediaLibraryModalPtr); LmsApp->getModalManager().dispose(mediaLibraryModalPtr);
src/lms/ui/admin/ScanSettingsView.cpp
+1 -1
View File
@@ -269,7 +269,7 @@ namespace lms::ui
core::Service<recommendation::IRecommendationService>::get()->load(); core::Service<recommendation::IRecommendationService>::get()->load();
// Don't want the scanner to go on with wrong settings // Don't want the scanner to go on with wrong settings
core::Service<scanner::IScannerService>::get()->requestStop(); core::Service<scanner::IScannerService>::get()->requestReload();
LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.Database.database"), Wt::WString::tr("Lms.settings-saved")); LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.Database.database"), Wt::WString::tr("Lms.settings-saved"));
} }