lee/gsmartcontrol
1
0
Fork 0
mirror of https://github.com/ashaduri/gsmartcontrol.git synced 2026-10-01 08:05:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored command executors (better naming, documentation).

Browse Source
This commit is contained in:
Alexander Shaduri
2021-03-16 15:24:08 +04:00
parent cfc11bef6e
commit d74da816a1
31 changed files with 696 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/applib/storage_detector.cpp
+4 -4
View File
@@ -43,11 +43,11 @@ std::string StorageDetector::detect(std::vector<StorageDevicePtr>& drives, const
#elif defined CONFIG_KERNEL_FAMILY_WINDOWS
error_msg = detect_drives_win32(all_detected, ex_factory); // win32
error_message = detect_drives_win32(all_detected, ex_factory); // win32
#else // freebsd, etc...
error_msg = detect_drives_other(all_detected, ex_factory); // bsd, etc... . scans /dev.
error_message = detect_drives_other(all_detected, ex_factory); // bsd, etc... . scans /dev.
#endif
@@ -101,7 +101,7 @@ std::string StorageDetector::fetch_basic_data(std::vector<StorageDevicePtr>& dri
fetch_data_errors_.clear();
fetch_data_error_outputs_.clear();
std::shared_ptr<CmdexSync> smartctl_ex = ex_factory->create_executor(ExecutorFactory::ExecutorType::Smartctl);
std::shared_ptr<CommandExecutor> smartctl_ex = ex_factory->create_executor(CommandExecutorFactory::ExecutorType::Smartctl);
for (auto& drive : drives) {
debug_out_info("app", "Retrieving basic information about the device...\n");
@@ -123,7 +123,7 @@ std::string StorageDetector::fetch_basic_data(std::vector<StorageDevicePtr>& dri
if (!error_msg.empty()) {
// use original executor error if present (permits matches by our users).
// if (!smartctl_ex->get_error_msg().empty())
// error_msg = smartctl_ex->get_error_msg();
// error_message = smartctl_ex->get_error_msg();
fetch_data_errors_.push_back(error_msg);
fetch_data_error_outputs_.push_back(smartctl_ex->get_stdout_str());