From 61fe92e201a17ced07eafc370a2b1e9d9e31423c Mon Sep 17 00:00:00 2001
From: Alexander Shaduri <ashaduri@gmail.com>
Date: Wed, 24 Apr 2024 15:58:45 +0400
Subject: [PATCH] ATA JSON parser improvements.

---
 src/applib/smartctl_json_ata_parser.cpp | 8 +++++---
 src/applib/smartctl_text_ata_parser.cpp | 2 +-
 src/gsc_info_window.cpp                 | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/applib/smartctl_json_ata_parser.cpp b/src/applib/smartctl_json_ata_parser.cpp
index 6af48adf..5cbb08bd 100644
--- a/src/applib/smartctl_json_ata_parser.cpp
+++ b/src/applib/smartctl_json_ata_parser.cpp
@@ -754,6 +754,8 @@ hz::ExpectedVoid<SmartctlParserError> SmartctlJsonAtaParser::parse_section_direc
 
 	// Entries
 	if (table_node.has_value() && table_node->is_array()) {
+		lines.emplace_back();
+
 		for (const auto& table_entry : table_node.value()) {
 			const uint64_t address = get_node_data<uint64_t>(table_entry, "address").value_or(0);
 			const std::string name = get_node_data<std::string>(table_entry, "name").value_or(std::string());
@@ -1018,7 +1020,7 @@ hz::ExpectedVoid<SmartctlParserError> SmartctlJsonAtaParser::parse_section_selec
 			const std::string status_str = get_node_data<std::string>(table_entry, "status/string").value_or(std::string());
 
 			lines.emplace_back(std::format(
-					"{:2}    Min/Max LBA: {:20}{:20}    Status: {}",
+					"Span: {:2}    Min LBA: {:020}    Max LBA: {:020}    Status: {}",
 					entry_num,
 					lba_min,
 					lba_max,
@@ -1119,7 +1121,7 @@ hz::ExpectedVoid<SmartctlParserError> SmartctlJsonAtaParser::parse_section_sctte
 	// The whole section
 	if (!lines.empty()) {
 		AtaStorageProperty p;
-		p.set_name("Temperature log", "ata_sct_status/_merged");
+		p.set_name("Temperature log", "ata_sct_status/_and/ata_sct_temperature_history/_merged");
 		p.section = AtaStorageProperty::Section::TemperatureLog;
 		p.reported_value = hz::string_join(lines, "\n");
 		p.value = p.reported_value;  // string-type value
@@ -1261,7 +1263,7 @@ hz::ExpectedVoid<SmartctlParserError> SmartctlJsonAtaParser::parse_section_satap
 //			const bool overflow = get_node_data<bool>(table_entry, "overflow").value_or(false);
 
 			lines.emplace_back(std::format(
-					"ID: 0x{:02X}    Size: {:8}    Value: {:20} Description: {}",
+					"ID: 0x{:04X}    Size: {:8}    Value: {:20}    Description: {}",
 					id,
 					size,
 					value,
diff --git a/src/applib/smartctl_text_ata_parser.cpp b/src/applib/smartctl_text_ata_parser.cpp
index 9093dacf..26758f17 100644
--- a/src/applib/smartctl_text_ata_parser.cpp
+++ b/src/applib/smartctl_text_ata_parser.cpp
@@ -2052,7 +2052,7 @@ SCT Error Recovery Control:
 	// the whole subsection
 	{
 		AtaStorageProperty p(pt);
-		p.set_name("SCT ERC log", "ata_sct_erc");
+		p.set_name("SCT ERC log", "ata_sct_erc/_merged");
 		p.reported_value = sub;
 		p.value = p.reported_value;  // string-type value
 
diff --git a/src/gsc_info_window.cpp b/src/gsc_info_window.cpp
index 2aebca3d..923336ca 100644
--- a/src/gsc_info_window.cpp
+++ b/src/gsc_info_window.cpp
@@ -1628,7 +1628,7 @@ WarningLevel GscInfoWindow::fill_ui_error_recovery(const std::vector<AtaStorageP
 			continue;
 
 		// Note: Don't use property description as a tooltip here. It won't be available if there's no property.
-		if (p.generic_name == "ata_sct_erc") {
+		if (p.generic_name == "ata_sct_erc/_merged") {
 			Glib::RefPtr<Gtk::TextBuffer> buffer = textview->get_buffer();
 			buffer->set_text("\n" + Glib::ustring::compose(_("Complete SCT Error Recovery Control settings: %1"), "\n\n" + p.get_value<std::string>()));