Open excel file automatically when generated

This commit is contained in:
2025-05-28 17:37:53 +02:00
parent dcde8c01be
commit 514968a082
11 changed files with 97 additions and 69 deletions

View File

@@ -336,6 +336,7 @@ namespace platform {
BestResultsExcel excel_report(path, score, datasets);
excel_report.reportSingle(model, path + Paths::bestResultsFile(score, model));
messageOutputFile("Excel", excel_report.getFileName());
excelFileName = excel_report.getFileName();
}
}
void BestResults::reportAll(bool excel, bool tex, bool index)
@@ -373,6 +374,7 @@ namespace platform {
excel.reportSingle(model, path + Paths::bestResultsFile(score, model));
}
messageOutputFile("Excel", excel.getFileName());
excelFileName = excel.getFileName();
}
}
void BestResults::messageOutputFile(const std::string& title, const std::string& fileName)

View File

@@ -15,6 +15,7 @@ namespace platform {
void reportSingle(bool excel);
void reportAll(bool excel, bool tex, bool index);
void buildAll();
std::string getExcelFileName() const { return excelFileName; }
private:
std::vector<std::string> getModels();
std::vector<std::string> getDatasets(json table);
@@ -33,6 +34,7 @@ namespace platform {
int maxModelName = 0;
int maxDatasetName = 0;
int minLength = 13; // Minimum length for scores
std::string excelFileName;
};
}
#endif

View File

@@ -4,6 +4,7 @@
#include "main/modelRegister.h"
#include "common/Paths.h"
#include "common/Colors.h"
#include "common/Utils.h"
#include "best/BestResults.h"
#include "common/DotEnv.h"
#include "config_platform.h"
@@ -80,6 +81,11 @@ int main(int argc, char** argv)
std::cout << Colors::GREEN() << fileName << " created!" << Colors::RESET() << std::endl;
results.reportSingle(excel);
}
if (excel) {
auto fileName = results.getExcelFileName();
std::cout << "Opening " << fileName << std::endl;
platform::openFile(fileName);
}
std::cout << Colors::RESET();
return 0;
}

View File

@@ -8,6 +8,7 @@
#include "common/Paths.h"
#include "common/Colors.h"
#include "common/Datasets.h"
#include "common/Utils.h"
#include "reports/DatasetsExcel.h"
#include "reports/DatasetsConsole.h"
#include "results/ResultsDatasetConsole.h"
@@ -24,9 +25,13 @@ void list_datasets(argparse::ArgumentParser& program)
std::cout << report.getOutput();
if (excel) {
auto data = report.getData();
auto report = platform::DatasetsExcel();
report.report(data);
std::cout << std::endl << Colors::GREEN() << "Output saved in " << report.getFileName() << std::endl;
auto ereport = new platform::DatasetsExcel();
ereport->report(data);
std::cout << std::endl << Colors::GREEN() << "Output saved in " << ereport->getFileName() << std::endl;
auto fileName = ereport->getExcelFileName();
delete ereport;
std::cout << "Opening " << fileName << std::endl;
platform::openFile(fileName);
}
}
@@ -42,9 +47,13 @@ void list_results(argparse::ArgumentParser& program)
std::cout << report.getOutput();
if (excel) {
auto data = report.getData();
auto report = platform::ResultsDatasetExcel();
report.report(data);
std::cout << std::endl << Colors::GREEN() << "Output saved in " << report.getFileName() << std::endl;
auto ereport = new platform::ResultsDatasetExcel();
ereport->report(data);
std::cout << std::endl << Colors::GREEN() << "Output saved in " << ereport->getFileName() << std::endl;
auto fileName = ereport->getExcelFileName();
delete ereport;
std::cout << "Opening " << fileName << std::endl;
platform::openFile(fileName);
}
}

View File

@@ -1,7 +1,7 @@
#include <utility>
#include <iostream>
#include <sys/ioctl.h>
#include <utility>
#include <unistd.h>
#include "common/Paths.h"
#include <argparse/argparse.hpp>
#include "manage/ManageScreen.h"
@@ -53,65 +53,7 @@ void handleResize(int sig)
manager->updateSize(rows, cols);
}
void openFile(const std::string& fileName)
{
// #ifdef __APPLE__
// // macOS uses the "open" command
// std::string command = "open";
// #elif defined(__linux__)
// // Linux typically uses "xdg-open"
// std::string command = "xdg-open";
// #else
// // For other OSes, do nothing or handle differently
// std::cerr << "Unsupported platform." << std::endl;
// return;
// #endif
// execlp(command.c_str(), command.c_str(), fileName.c_str(), NULL);
#ifdef __APPLE__
const char* tool = "/usr/bin/open";
#elif defined(__linux__)
const char* tool = "/usr/bin/xdg-open";
#else
std::cerr << "Unsupported platform." << std::endl;
return;
#endif
// We'll build an argv array for execve:
std::vector<char*> argv;
argv.push_back(const_cast<char*>(tool)); // argv[0]
argv.push_back(const_cast<char*>(fileName.c_str())); // argv[1]
argv.push_back(nullptr);
// Make a new environment array, skipping BASH_FUNC_ variables
std::vector<std::string> filteredEnv;
for (char** env = environ; *env != nullptr; ++env) {
// *env is a string like "NAME=VALUE"
// We want to skip those starting with "BASH_FUNC_"
if (strncmp(*env, "BASH_FUNC_", 10) == 0) {
// skip it
continue;
}
filteredEnv.push_back(*env);
}
// Convert filteredEnv into a char* array
std::vector<char*> envp;
for (auto& var : filteredEnv) {
envp.push_back(const_cast<char*>(var.c_str()));
}
envp.push_back(nullptr);
// Now call execve with the cleaned environment
// NOTE: You may need a full path to the tool if it's not in PATH, or use which() logic
// For now, let's assume "open" or "xdg-open" is found in the default PATH:
execve(tool, argv.data(), envp.data());
// If we reach here, execve failed
perror("execve failed");
// This would terminate your current process if it's not in a child
// Usually you'd do something like:
_exit(EXIT_FAILURE);
}
int main(int argc, char** argv)
{
@@ -137,7 +79,7 @@ int main(int argc, char** argv)
delete manager;
if (!fileName.empty()) {
std::cout << "Opening " << fileName << std::endl;
openFile(fileName);
platform::openFile(fileName);
}
return 0;
}

View File

@@ -49,6 +49,7 @@ namespace platform {
return "BestResults_" + score + ".xlsx";
}
static std::string excelResults() { return "some_results.xlsx"; }
static std::string excelDatasets() { return "datasets.xlsx"; }
static std::string grid_input(const std::string& model)
{
return grid() + "grid_" + model + "_input.json";
@@ -73,6 +74,7 @@ namespace platform {
{
return "post_hoc.md";
}
};
}
#endif

View File

@@ -1,5 +1,7 @@
#ifndef UTILS_H
#define UTILS_H
#include <unistd.h>
#include <sstream>
#include <string>
#include <vector>
@@ -66,5 +68,64 @@ namespace platform {
oss << std::put_time(timeinfo, "%H:%M:%S");
return oss.str();
}
static void openFile(const std::string& fileName)
{
// #ifdef __APPLE__
// // macOS uses the "open" command
// std::string command = "open";
// #elif defined(__linux__)
// // Linux typically uses "xdg-open"
// std::string command = "xdg-open";
// #else
// // For other OSes, do nothing or handle differently
// std::cerr << "Unsupported platform." << std::endl;
// return;
// #endif
// execlp(command.c_str(), command.c_str(), fileName.c_str(), NULL);
#ifdef __APPLE__
const char* tool = "/usr/bin/open";
#elif defined(__linux__)
const char* tool = "/usr/bin/xdg-open";
#else
std::cerr << "Unsupported platform." << std::endl;
return;
#endif
// We'll build an argv array for execve:
std::vector<char*> argv;
argv.push_back(const_cast<char*>(tool)); // argv[0]
argv.push_back(const_cast<char*>(fileName.c_str())); // argv[1]
argv.push_back(nullptr);
// Make a new environment array, skipping BASH_FUNC_ variables
std::vector<std::string> filteredEnv;
for (char** env = environ; *env != nullptr; ++env) {
// *env is a string like "NAME=VALUE"
// We want to skip those starting with "BASH_FUNC_"
if (strncmp(*env, "BASH_FUNC_", 10) == 0) {
// skip it
continue;
}
filteredEnv.push_back(*env);
}
// Convert filteredEnv into a char* array
std::vector<char*> envp;
for (auto& var : filteredEnv) {
envp.push_back(const_cast<char*>(var.c_str()));
}
envp.push_back(nullptr);
// Now call execve with the cleaned environment
// NOTE: You may need a full path to the tool if it's not in PATH, or use which() logic
// For now, let's assume "open" or "xdg-open" is found in the default PATH:
execve(tool, argv.data(), envp.data());
// If we reach here, execve failed
perror("execve failed");
// This would terminate your current process if it's not in a child
// Usually you'd do something like:
_exit(EXIT_FAILURE);
}
}
#endif

View File

@@ -1,8 +1,9 @@
#include "common/Paths.h"
#include "DatasetsExcel.h"
namespace platform {
DatasetsExcel::DatasetsExcel()
{
file_name = "datasets.xlsx";
file_name = Paths::excelDatasets();
workbook = workbook_new(getFileName().c_str());
createFormats();
setProperties("Datasets");

View File

@@ -11,6 +11,7 @@ namespace platform {
DatasetsExcel();
~DatasetsExcel();
void report(json& data);
std::string getExcelFileName() { return getFileName(); }
};
}
#endif

View File

@@ -1,8 +1,9 @@
#include "common/Paths.h"
#include "ResultsDatasetExcel.h"
namespace platform {
ResultsDatasetExcel::ResultsDatasetExcel()
{
file_name = "some_results.xlsx";
file_name = Paths::excelResults();
workbook = workbook_new(getFileName().c_str());
createFormats();
setProperties("Results");

View File

@@ -12,6 +12,7 @@ namespace platform {
ResultsDatasetExcel();
~ResultsDatasetExcel();
void report(json& data);
std::string getExcelFileName() { return getFileName(); }
};
}
#endif