lee/gsmartcontrol
1
0
Fork 0
mirror of https://github.com/ashaduri/gsmartcontrol.git synced 2026-09-25 21:35:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented loading virtual drives from JSON.

Browse Source
This commit is contained in:
Alexander Shaduri
2024-05-14 16:57:01 +04:00
parent ac2d3d6b33
commit ade001359b
7 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/applib/gsc_settings.h
+1 -1
View File
@@ -68,7 +68,7 @@ inline void init_default_settings()
rconfig::set_default_data("gui/show_smart_capable_only", false); // show smart-capable drives only
rconfig::set_default_data("gui/scan_on_startup", true); // scan drives on startup
rconfig::set_default_data("gui/smartctl_output_filename_format", "{model}_{serial}_{date}.txt"); // when suggesting filename
rconfig::set_default_data("gui/smartctl_output_filename_format", "{model}_{serial}_{date}.json"); // when suggesting filename
rconfig::set_default_data("gui/icons_show_device_name", false); // text under icons
rconfig::set_default_data("gui/icons_show_serial_number", false); // text under icons
src/applib/smartctl_text_basic_parser.cpp
+1 -1
View File
@@ -153,7 +153,7 @@ hz::ExpectedVoid<SmartctlParserError> SmartctlTextBasicParser::parse(std::string
model = hz::string_remove_adjacent_duplicates_copy(hz::string_trim_copy(model), ' ');
StorageProperty p;
p.set_name("Device Model", "model_name", "Device Model");
p.value = p.reported_value; // string-type value
p.value = model; // string-type value
add_property(p);
} else if (app_pcre_match("/^(?:Device|Product):[ \\t]*(.*)$/mi", output, &model)) { // usb flash drives
src/applib/storage_device.cpp
+1 -1
View File
@@ -417,7 +417,7 @@ hz::ExpectedVoid<StorageDeviceError> StorageDevice::parse_any_data_for_virtual()
}
// This will add some properties and emit signal_changed().
auto basic_parse_status = this->parse_basic_data();
auto basic_parse_status = basic_parser->parse(this->full_output_);
if (!basic_parse_status) {
return hz::Unexpected(StorageDeviceError::ParseError,
std::vformat(_("Cannot parse smartctl output: {}"), std::make_format_args(basic_parse_status.error().message())));
src/gsc_executor_log_window.cpp
+5 -4
View File
@@ -197,7 +197,8 @@ void GscExecutorLogWindow::on_window_save_current_button_clicked()
int result = 0;
const Glib::RefPtr<Gtk::FileFilter> specific_filter = Gtk::FileFilter::create();
specific_filter->set_name(_("Text Files"));
specific_filter->set_name(_("JSON and Text Files"));
specific_filter->add_pattern("*.json");
specific_filter->add_pattern("*.txt");
const Glib::RefPtr<Gtk::FileFilter> all_filter = Gtk::FileFilter::create();
@@ -237,7 +238,7 @@ void GscExecutorLogWindow::on_window_save_current_button_clicked()
if (!last_dir.empty())
dialog.set_current_folder(last_dir);
dialog.set_current_name(".txt");
dialog.set_current_name(".json");
// Show the dialog and wait for a user response
result = dialog.run(); // the main cycle blocks here
@@ -257,8 +258,8 @@ void GscExecutorLogWindow::on_window_save_current_button_clicked()
#endif
rconfig::set_data("gui/drive_data_open_save_dir", last_dir);
if (file.extension() != ".txt") {
file += ".txt";
if (file.extension() != ".json" && file.extension() != ".txt") {
file += ".json";
}
auto ec = hz::fs_file_put_contents(file, entry->std_output);
src/gsc_info_window.cpp
+4 -3
View File
@@ -836,7 +836,8 @@ void GscInfoWindow::on_save_info_button_clicked()
const std::string filename = drive->get_save_filename();
Glib::RefPtr<Gtk::FileFilter> specific_filter = Gtk::FileFilter::create();
specific_filter->set_name(_("Text Files"));
specific_filter->set_name(_("JSON and Text Files"));
specific_filter->add_pattern("*.json");
specific_filter->add_pattern("*.txt");
Glib::RefPtr<Gtk::FileFilter> all_filter = Gtk::FileFilter::create();
@@ -898,8 +899,8 @@ void GscInfoWindow::on_save_info_button_clicked()
#endif
rconfig::set_data("gui/drive_data_open_save_dir", last_dir);
if (file.extension() != ".txt") {
file += ".txt";
if (file.extension() != ".json" && file.extension() != ".txt") {
file += ".json";
}
std::string data = this->drive->get_full_output();
src/gsc_main_window.cpp
+2 -1
View File
@@ -1303,7 +1303,8 @@ void GscMainWindow::show_load_virtual_file_chooser()
int result = 0;
Glib::RefPtr<Gtk::FileFilter> specific_filter = Gtk::FileFilter::create();
specific_filter->set_name(_("Text Files"));
specific_filter->set_name(_("JSON and Text Files"));
specific_filter->add_pattern("*.json");
specific_filter->add_pattern("*.txt");
Glib::RefPtr<Gtk::FileFilter> all_filter = Gtk::FileFilter::create();
src/gsc_text_window.h
+4 -3
View File
@@ -159,7 +159,8 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins
int result = 0;
Glib::RefPtr<Gtk::FileFilter> specific_filter = Gtk::FileFilter::create();
specific_filter->set_name(_("Text Files"));
specific_filter->set_name(_("JSON and Text Files"));
specific_filter->add_pattern("*.json");
specific_filter->add_pattern("*.txt");
Glib::RefPtr<Gtk::FileFilter> all_filter = Gtk::FileFilter::create();
@@ -221,8 +222,8 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins
#endif
rconfig::set_data("gui/drive_data_open_save_dir", last_dir);
if (file.extension() != ".txt") {
file += ".txt";
if (file.extension() != ".json" && file.extension() != ".txt") {
file += ".json";
}
std::string text;