Refactor: extract export commands; co-locate sigtype popup logic.
Two focused, behaviour-preserving moves: 1. `OpenSignalTypeDialog` + `ApplySignalTypeChoice` moved from `shell.cpp` to `screen_sigtype_modal.cpp` so the popup owns all of its logic instead of having its open/apply functions live in the shell file. 2. The `export` command extracted from `commands.cpp` to a new `commands_export.cpp` under a `Tui::RegisterExportCommands()` member. `RegisterCommands()` calls it at the end. File-local helpers (`csv_quote`, `pin_side`) move alongside in an anonymous namespace. Establishes the pattern for future per-group splits: declare a `Register<X>Commands()` member, define it in its own file, call it from the orchestrator. Other groups stay in `commands.cpp` for now — nothing else has grown large enough to warrant the split. Sizes: shell.cpp 497 → 448, commands.cpp 846 → 675 (+ 191 for the new commands_export.cpp). DESIGN.md updated. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
191
src/tui/commands_export.cpp
Normal file
191
src/tui/commands_export.cpp
Normal file
@@ -0,0 +1,191 @@
|
||||
#include "tui/tui.hpp"
|
||||
#include "tui/tui_helpers.hpp"
|
||||
|
||||
#include "imports/ods_writer.hpp"
|
||||
#include "system/connect.hpp"
|
||||
#include "system/modules.hpp"
|
||||
#include "system/parts.hpp"
|
||||
#include "system/pins.hpp"
|
||||
#include "system/signal_type.hpp"
|
||||
#include "system/signals.hpp"
|
||||
#include "system/system.hpp"
|
||||
|
||||
#include <fstream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
namespace {
|
||||
|
||||
// Minimal CSV quoter — wraps in `"…"` and doubles internal quotes when
|
||||
// the field contains a comma, quote, or newline. Local to this file.
|
||||
std::string csv_quote(const std::string &s) {
|
||||
bool needs = s.find_first_of(",\"\n") != std::string::npos;
|
||||
if (!needs) return s;
|
||||
std::string out = "\"";
|
||||
for (char c : s) { if (c == '"') out += '"'; out += c; }
|
||||
out += '"';
|
||||
return out;
|
||||
}
|
||||
|
||||
// Flatten one pin into the 6 string slots the export row uses.
|
||||
void pin_side(Pin *p, std::string &mod, std::string &part,
|
||||
std::string &pin, std::string &sig,
|
||||
std::string &type, std::string &suspect) {
|
||||
if (!p) { mod = part = pin = sig = type = suspect = ""; return; }
|
||||
mod = (p->prnt && p->prnt->prnt) ? p->prnt->prnt->name : "";
|
||||
part = p->prnt ? p->prnt->name : "";
|
||||
pin = p->name;
|
||||
Signal *s = p->signal();
|
||||
if (!s) {
|
||||
sig = ""; type = "(NC)"; suspect = "";
|
||||
} else {
|
||||
sig = s->name;
|
||||
type = signal_type_name(s->type);
|
||||
suspect = (infer_signal_type(s->name) == SignalType::Power
|
||||
&& s->type == SignalType::Other) ? "yes" : "no";
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
void Tui::RegisterExportCommands() {
|
||||
commands["export"] = {
|
||||
{{"kind [connections]", Completion::None},
|
||||
{"filename (.csv)", Completion::Path}},
|
||||
[this](const std::vector<std::string> &args) {
|
||||
if (!sys) { Print("no system: run 'new' first."); return; }
|
||||
if (args.empty()) {
|
||||
// Bare → reuse the generic file dialog. Filters give a
|
||||
// one-keystroke CSV/ODS toggle; picking either rewrites
|
||||
// the filename's extension, and the action below
|
||||
// dispatches on that extension.
|
||||
OpenFileDialog(
|
||||
"Export — connections",
|
||||
"export.connections",
|
||||
"connections.csv",
|
||||
{{"CSV", ".csv"}, {"ODS", ".ods"}},
|
||||
[this](const std::string &path) {
|
||||
Dispatch("export connections " + path);
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (args.size() != 2) {
|
||||
Print("usage: export <kind> <file> (or no args for the dialog)");
|
||||
return;
|
||||
}
|
||||
const std::string &kind = args[0];
|
||||
const std::string &path = args[1];
|
||||
|
||||
if (kind == "connections") {
|
||||
// Accepted extensions: `.csv` (flat file) and `.ods`
|
||||
// (one sheet per connection). Anything else is an error.
|
||||
std::string ext;
|
||||
{
|
||||
size_t dot = path.rfind('.');
|
||||
if (dot != std::string::npos) ext = ToLower(path.substr(dot));
|
||||
}
|
||||
bool ods = (ext == ".ods");
|
||||
bool csv = (ext == ".csv");
|
||||
if (!ods && !csv) {
|
||||
ShowError("export: unknown extension '"
|
||||
+ (ext.empty() ? std::string("(none)") : ext)
|
||||
+ "'\nAccepted: .csv, .ods");
|
||||
return;
|
||||
}
|
||||
|
||||
if (ods) {
|
||||
OdsWriter w;
|
||||
int total = 0;
|
||||
for (auto &ckv : *sys->connections()) {
|
||||
Connection *c = ckv.second;
|
||||
// Sheet names: Excel rejects /\?*:[] characters
|
||||
// (LibreOffice tolerates them but stays portable).
|
||||
std::string sname = c->name;
|
||||
for (char &ch : sname)
|
||||
if (ch == '/' || ch == '\\' || ch == '?' || ch == '*'
|
||||
|| ch == ':' || ch == '[' || ch == ']') ch = '_';
|
||||
OdsSheet *s = w.add_sheet(sname);
|
||||
const char *hdr[] = {
|
||||
"transform",
|
||||
"left_module", "left_part", "left_pin",
|
||||
"left_signal", "left_type", "left_suspect",
|
||||
"right_module", "right_part", "right_pin",
|
||||
"right_signal", "right_type", "right_suspect",
|
||||
"mixed"};
|
||||
for (int i = 0; i < 14; ++i) s->set(0, i, hdr[i]);
|
||||
int row = 1;
|
||||
for (auto &wp : c->pin_map) {
|
||||
std::string lm, lp, ln, ls, lt, lsus;
|
||||
std::string rm, rp, rn, rs, rt, rsus;
|
||||
pin_side(wp.first, lm, lp, ln, ls, lt, lsus);
|
||||
pin_side(wp.second, rm, rp, rn, rs, rt, rsus);
|
||||
std::string mixed = (lt != "(NC)" && rt != "(NC)" && lt != rt)
|
||||
? "yes" : "no";
|
||||
s->set(row, 0, c->transform_name);
|
||||
s->set(row, 1, lm); s->set(row, 2, lp);
|
||||
s->set(row, 3, ln); s->set(row, 4, ls);
|
||||
s->set(row, 5, lt); s->set(row, 6, lsus);
|
||||
s->set(row, 7, rm); s->set(row, 8, rp);
|
||||
s->set(row, 9, rn); s->set(row, 10, rs);
|
||||
s->set(row, 11, rt); s->set(row, 12, rsus);
|
||||
s->set(row, 13, mixed);
|
||||
++row; ++total;
|
||||
}
|
||||
}
|
||||
std::string err;
|
||||
if (!w.save(path, err)) {
|
||||
ShowError("export (.ods) failed:\n" + err);
|
||||
return;
|
||||
}
|
||||
Print("export connections (.ods): "
|
||||
+ std::to_string(sys->connections()->size())
|
||||
+ " sheet(s), " + std::to_string(total)
|
||||
+ " wire(s) → " + path);
|
||||
return;
|
||||
}
|
||||
|
||||
// CSV fallback.
|
||||
std::ofstream f(path);
|
||||
if (!f) {
|
||||
ShowError("export: cannot open '" + path + "' for writing");
|
||||
return;
|
||||
}
|
||||
f << "connection,transform,"
|
||||
"left_module,left_part,left_pin,left_signal,left_type,left_suspect,"
|
||||
"right_module,right_part,right_pin,right_signal,right_type,right_suspect,"
|
||||
"mixed\n";
|
||||
|
||||
int rows = 0;
|
||||
for (auto &ckv : *sys->connections()) {
|
||||
Connection *c = ckv.second;
|
||||
for (auto &wp : c->pin_map) {
|
||||
std::string lm, lp, ln, ls, lt, lsus;
|
||||
std::string rm, rp, rn, rs, rt, rsus;
|
||||
pin_side(wp.first, lm, lp, ln, ls, lt, lsus);
|
||||
pin_side(wp.second, rm, rp, rn, rs, rt, rsus);
|
||||
std::string mixed = "no";
|
||||
if (lt != "(NC)" && rt != "(NC)" && lt != rt) mixed = "yes";
|
||||
f << csv_quote(c->name) << ',' << csv_quote(c->transform_name) << ','
|
||||
<< csv_quote(lm) << ',' << csv_quote(lp) << ',' << csv_quote(ln) << ','
|
||||
<< csv_quote(ls) << ',' << csv_quote(lt) << ',' << csv_quote(lsus) << ','
|
||||
<< csv_quote(rm) << ',' << csv_quote(rp) << ',' << csv_quote(rn) << ','
|
||||
<< csv_quote(rs) << ',' << csv_quote(rt) << ',' << csv_quote(rsus) << ','
|
||||
<< mixed << '\n';
|
||||
++rows;
|
||||
}
|
||||
}
|
||||
Print("export connections (.csv): " + std::to_string(rows)
|
||||
+ " wire(s) → " + path);
|
||||
return;
|
||||
}
|
||||
|
||||
ShowError("export: unknown kind '" + kind + "'\n"
|
||||
"Known kinds: connections");
|
||||
},
|
||||
/*prompt_for_missing=*/ false,
|
||||
"export structured data to CSV / ODS (kinds: connections; "
|
||||
"bare form opens the file-picker dialog)",
|
||||
/*scriptable=*/ true,
|
||||
/*interactive=*/ true,
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user