Skip to content

Fix "Save as txt" not working from View Output window #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Claude wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Fix "Save as txt" not working from View Output window #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4642c9b
Initial plan
Claude Mar 22, 2026
81f21c9
Implement JSON/Text save filters in View Output window
Claude Mar 22, 2026
4823af1
Fix data format detection logic for JSON vs Text
Claude Mar 22, 2026
893dfc7
Improve format detection: check output content for JSON vs text
Claude Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/gui/gsc_info_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,9 @@ void GscInfoWindow::on_view_output_button_clicked()
if (!filename.empty())
win->set_save_filename(filename);

// Pass the storage device so the text window can access text/JSON data
win->set_storage_device(drive_);

win->show();
}

Expand Down
130 changes: 123 additions & 7 deletions src/gui/gsc_text_window.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ License: GNU General Public License v3.0 only

#include "applib/app_builder_widget.h"
#include "applib/app_gtkmm_tools.h"
#include "applib/storage_device.h"



Expand Down Expand Up @@ -130,6 +131,13 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins
}


/// Set the storage device to enable text/JSON format detection
void set_storage_device(std::shared_ptr<StorageDevice> device)
{
storage_device_ = std::move(device);
}


protected:


Expand Down Expand Up @@ -158,11 +166,59 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins
}
int result = 0;

// Determine if we have JSON and/or text data available
bool has_json = false;
bool has_text = false;

if (storage_device_) {
// Check if we have text output in the property repository
bool has_text_property = false;
if (auto p = storage_device_->get_property_repository().lookup_property("smartctl/output"); !p.empty()) {
const std::string text_output = p.get_value<std::string>();
if (!text_output.empty()) {
has_text_property = true;
}
}
// Get the output - it could be JSON or text format
std::string output = storage_device_->get_full_output();
if (output.empty()) {
output = storage_device_->get_basic_output();
}
if (!output.empty()) {
// If we have text in property repo, the output is JSON with embedded text
if (has_text_property) {
has_json = true;
has_text = true;
} else {
// No text in property means either:
// 1. Output is JSON without embedded text, or
// 2. Output is text format (loaded text virtual drive)
// We check if output starts with '{' to detect JSON
if (!output.empty() && output[0] == '{') {
has_json = true;
} else {
has_text = true;
}
}
}
} else {
// If no storage device is set, we only have the contents (assume JSON for backward compatibility)
has_json = true;
}

Glib::RefPtr<Gtk::FileFilter> specific_filter = Gtk::FileFilter::create();
specific_filter->set_name(_("JSON and Text Files"));
specific_filter->add_pattern("*.json");
specific_filter->add_pattern("*.txt");

Glib::RefPtr<Gtk::FileFilter> json_filter = Gtk::FileFilter::create();
json_filter->set_name(_("JSON Files"));
json_filter->add_pattern("*.json");

Glib::RefPtr<Gtk::FileFilter> txt_filter = Gtk::FileFilter::create();
txt_filter->set_name(_("Text Files"));
txt_filter->add_pattern("*.txt");

Glib::RefPtr<Gtk::FileFilter> all_filter = Gtk::FileFilter::create();
all_filter->set_name(_("All Files"));
all_filter->add_pattern("*");
Expand All @@ -174,7 +230,16 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins

gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog.get()), TRUE);

gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog.get()), specific_filter->gobj());
// Add filters based on what data is available
if (has_json && has_text) {
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog.get()), specific_filter->gobj());
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog.get()), json_filter->gobj());
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog.get()), txt_filter->gobj());
} else if (has_json) {
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog.get()), json_filter->gobj());
} else if (has_text) {
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog.get()), txt_filter->gobj());
}
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog.get()), all_filter->gobj());

if (!last_dir.empty())
Expand All @@ -195,7 +260,16 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins

dialog.set_do_overwrite_confirmation(true);

dialog.add_filter(specific_filter);
// Add filters based on what data is available
if (has_json && has_text) {
dialog.add_filter(specific_filter);
dialog.add_filter(json_filter);
dialog.add_filter(txt_filter);
} else if (has_json) {
dialog.add_filter(json_filter);
} else if (has_text) {
dialog.add_filter(txt_filter);
}
dialog.add_filter(all_filter);

if (!last_dir.empty())
Expand All @@ -216,22 +290,62 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins
#if GTK_CHECK_VERSION(3, 20, 0)
file = hz::fs_path_from_string(app_string_from_gchar(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog.get()))));
last_dir = hz::fs_path_to_string(file.parent_path());

// Detect which filter was selected
bool txt_selected = gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(dialog.get())) == txt_filter->gobj();
bool json_selected = gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(dialog.get())) == json_filter->gobj();
#else
file = hz::fs_path_from_string(dialog.get_filename()); // in fs encoding
last_dir = dialog.get_current_folder(); // save for the future

// Detect which filter was selected
bool txt_selected = dialog.get_filter() == txt_filter;
bool json_selected = dialog.get_filter() == json_filter;
#endif
rconfig::set_data("gui/drive_data_open_save_dir", last_dir);

// Add extension if not present, based on selected filter
if (file.extension() != ".json" && file.extension() != ".txt") {
file += ".json";
if (txt_selected) {
file += ".txt";
} else if (json_selected) {
file += ".json";
} else {
// "JSON and Text Files" or "All Files" selected - use user-provided extension or default
if (has_json && !has_text) {
file += ".json";
} else if (has_text && !has_json) {
file += ".txt";
} else {
// Both available, default to JSON (per requirements)
file += ".json";
}
}
}

// Determine if we should save as text based on extension or filter
bool save_txt = txt_selected || file.extension() == ".txt";

std::string text;
if (std::holds_alternative<std::string>(contents_)) {
text = std::get<std::string>(contents_);
} else {
text = std::get<Glib::ustring>(contents_);
if (save_txt && storage_device_) {
// Try to get text output from property repository
if (auto p = storage_device_->get_property_repository().lookup_property("smartctl/output"); !p.empty()) {
const std::string text_output = p.get_value<std::string>();
if (!text_output.empty()) {
text = text_output;
}
}
}

// If we didn't get text output or not saving as text, use the contents
if (text.empty()) {
if (std::holds_alternative<std::string>(contents_)) {
text = std::get<std::string>(contents_);
} else {
text = std::get<Glib::ustring>(contents_);
}
}

auto ec = hz::fs_file_put_contents(file, text);
if (ec) {
gui_show_error_dialog(_("Cannot save data to file"), ec.message(), this);
Expand Down Expand Up @@ -269,6 +383,8 @@ class GscTextWindow : public AppBuilderWidget<GscTextWindow<InstanceSwitch>, Ins

std::string save_filename_; ///< Default filename for Save As

std::shared_ptr<StorageDevice> storage_device_; ///< Storage device for accessing text/JSON data

};


Expand Down
Loading