mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 15:17:36 +00:00
Spreadsheet: Add support for importing from and exporting to CSV files
Closes #4136.
This commit is contained in:
parent
8066a623d9
commit
48d8534967
3 changed files with 125 additions and 43 deletions
|
@ -486,6 +486,52 @@ JsonObject Sheet::to_json() const
|
||||||
return object;
|
return object;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Vector<Vector<String>> Sheet::to_xsv() const
|
||||||
|
{
|
||||||
|
Vector<Vector<String>> data;
|
||||||
|
|
||||||
|
// First row = headers.
|
||||||
|
data.append(m_columns);
|
||||||
|
|
||||||
|
for (size_t i = 0; i < m_rows; ++i) {
|
||||||
|
Vector<String> row;
|
||||||
|
row.resize(m_columns.size());
|
||||||
|
for (size_t j = 0; j < m_columns.size(); ++j) {
|
||||||
|
auto cell = at({ m_columns[j], i });
|
||||||
|
if (cell)
|
||||||
|
row[j] = cell->typed_display();
|
||||||
|
}
|
||||||
|
|
||||||
|
data.append(move(row));
|
||||||
|
}
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
RefPtr<Sheet> Sheet::from_xsv(const Reader::XSV& xsv, Workbook& workbook)
|
||||||
|
{
|
||||||
|
auto cols = xsv.headers();
|
||||||
|
auto rows = xsv.size();
|
||||||
|
|
||||||
|
auto sheet = adopt(*new Sheet(workbook));
|
||||||
|
sheet->m_columns = cols;
|
||||||
|
for (size_t i = 0; i < rows; ++i)
|
||||||
|
sheet->add_row();
|
||||||
|
|
||||||
|
for (auto row : xsv) {
|
||||||
|
for (size_t i = 0; i < cols.size(); ++i) {
|
||||||
|
auto str = row[i];
|
||||||
|
if (str.is_empty())
|
||||||
|
continue;
|
||||||
|
Position position { cols[i], row.index() };
|
||||||
|
auto cell = make<Cell>(str, position, *sheet);
|
||||||
|
sheet->m_cells.set(position, move(cell));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return sheet;
|
||||||
|
}
|
||||||
|
|
||||||
JsonObject Sheet::gather_documentation() const
|
JsonObject Sheet::gather_documentation() const
|
||||||
{
|
{
|
||||||
JsonObject object;
|
JsonObject object;
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
|
|
||||||
#include "Cell.h"
|
#include "Cell.h"
|
||||||
#include "Forward.h"
|
#include "Forward.h"
|
||||||
|
#include "Readers/XSV.h"
|
||||||
#include <AK/HashMap.h>
|
#include <AK/HashMap.h>
|
||||||
#include <AK/HashTable.h>
|
#include <AK/HashTable.h>
|
||||||
#include <AK/String.h>
|
#include <AK/String.h>
|
||||||
|
@ -60,6 +61,9 @@ public:
|
||||||
JsonObject to_json() const;
|
JsonObject to_json() const;
|
||||||
static RefPtr<Sheet> from_json(const JsonObject&, Workbook&);
|
static RefPtr<Sheet> from_json(const JsonObject&, Workbook&);
|
||||||
|
|
||||||
|
Vector<Vector<String>> to_xsv() const;
|
||||||
|
static RefPtr<Sheet> from_xsv(const Reader::XSV&, Workbook&);
|
||||||
|
|
||||||
const String& name() const { return m_name; }
|
const String& name() const { return m_name; }
|
||||||
void set_name(const StringView& name) { m_name = name; }
|
void set_name(const StringView& name) { m_name = name; }
|
||||||
|
|
||||||
|
|
|
@ -26,12 +26,17 @@
|
||||||
|
|
||||||
#include "Workbook.h"
|
#include "Workbook.h"
|
||||||
#include "JSIntegration.h"
|
#include "JSIntegration.h"
|
||||||
|
#include "Readers/CSV.h"
|
||||||
|
#include "Writers/CSV.h"
|
||||||
#include <AK/ByteBuffer.h>
|
#include <AK/ByteBuffer.h>
|
||||||
#include <AK/JsonArray.h>
|
#include <AK/JsonArray.h>
|
||||||
#include <AK/JsonObject.h>
|
#include <AK/JsonObject.h>
|
||||||
#include <AK/JsonObjectSerializer.h>
|
#include <AK/JsonObjectSerializer.h>
|
||||||
#include <AK/JsonParser.h>
|
#include <AK/JsonParser.h>
|
||||||
|
#include <AK/Stream.h>
|
||||||
#include <LibCore/File.h>
|
#include <LibCore/File.h>
|
||||||
|
#include <LibCore/FileStream.h>
|
||||||
|
#include <LibCore/MimeData.h>
|
||||||
#include <LibJS/Parser.h>
|
#include <LibJS/Parser.h>
|
||||||
#include <LibJS/Runtime/GlobalObject.h>
|
#include <LibJS/Runtime/GlobalObject.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -77,42 +82,57 @@ Result<bool, String> Workbook::load(const StringView& filename)
|
||||||
return sb.to_string();
|
return sb.to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
auto json_value_option = JsonParser(file_or_error.value()->read_all()).parse();
|
auto mime = Core::guess_mime_type_based_on_filename(filename);
|
||||||
if (!json_value_option.has_value()) {
|
|
||||||
StringBuilder sb;
|
|
||||||
sb.append("Failed to parse ");
|
|
||||||
sb.append(filename);
|
|
||||||
|
|
||||||
return sb.to_string();
|
if (mime == "text/csv") {
|
||||||
}
|
// FIXME: Prompt the user for settings.
|
||||||
|
NonnullRefPtrVector<Sheet> sheets;
|
||||||
|
|
||||||
auto& json_value = json_value_option.value();
|
auto sheet = Sheet::from_xsv(Reader::CSV(file_or_error.value()->read_all(), Reader::default_behaviours() | Reader::ParserBehaviour::ReadHeaders), *this);
|
||||||
if (!json_value.is_array()) {
|
if (sheet)
|
||||||
StringBuilder sb;
|
sheets.append(sheet.release_nonnull());
|
||||||
sb.append("Did not find a spreadsheet in ");
|
|
||||||
sb.append(filename);
|
|
||||||
|
|
||||||
return sb.to_string();
|
m_sheets.clear();
|
||||||
}
|
m_sheets = move(sheets);
|
||||||
|
} else {
|
||||||
|
// Assume JSON.
|
||||||
|
auto json_value_option = JsonParser(file_or_error.value()->read_all()).parse();
|
||||||
|
if (!json_value_option.has_value()) {
|
||||||
|
StringBuilder sb;
|
||||||
|
sb.append("Failed to parse ");
|
||||||
|
sb.append(filename);
|
||||||
|
|
||||||
NonnullRefPtrVector<Sheet> sheets;
|
return sb.to_string();
|
||||||
|
}
|
||||||
|
|
||||||
|
auto& json_value = json_value_option.value();
|
||||||
|
if (!json_value.is_array()) {
|
||||||
|
StringBuilder sb;
|
||||||
|
sb.append("Did not find a spreadsheet in ");
|
||||||
|
sb.append(filename);
|
||||||
|
|
||||||
|
return sb.to_string();
|
||||||
|
}
|
||||||
|
|
||||||
|
NonnullRefPtrVector<Sheet> sheets;
|
||||||
|
|
||||||
|
auto& json_array = json_value.as_array();
|
||||||
|
json_array.for_each([&](auto& sheet_json) {
|
||||||
|
if (!sheet_json.is_object())
|
||||||
|
return IterationDecision::Continue;
|
||||||
|
|
||||||
|
auto sheet = Sheet::from_json(sheet_json.as_object(), *this);
|
||||||
|
if (!sheet)
|
||||||
|
return IterationDecision::Continue;
|
||||||
|
|
||||||
|
sheets.append(sheet.release_nonnull());
|
||||||
|
|
||||||
auto& json_array = json_value.as_array();
|
|
||||||
json_array.for_each([&](auto& sheet_json) {
|
|
||||||
if (!sheet_json.is_object())
|
|
||||||
return IterationDecision::Continue;
|
return IterationDecision::Continue;
|
||||||
|
});
|
||||||
|
|
||||||
auto sheet = Sheet::from_json(sheet_json.as_object(), *this);
|
m_sheets.clear();
|
||||||
if (!sheet)
|
m_sheets = move(sheets);
|
||||||
return IterationDecision::Continue;
|
}
|
||||||
|
|
||||||
sheets.append(sheet.release_nonnull());
|
|
||||||
|
|
||||||
return IterationDecision::Continue;
|
|
||||||
});
|
|
||||||
|
|
||||||
m_sheets.clear();
|
|
||||||
m_sheets = move(sheets);
|
|
||||||
|
|
||||||
set_filename(filename);
|
set_filename(filename);
|
||||||
|
|
||||||
|
@ -121,13 +141,7 @@ Result<bool, String> Workbook::load(const StringView& filename)
|
||||||
|
|
||||||
Result<bool, String> Workbook::save(const StringView& filename)
|
Result<bool, String> Workbook::save(const StringView& filename)
|
||||||
{
|
{
|
||||||
JsonArray array;
|
auto mime = Core::guess_mime_type_based_on_filename(filename);
|
||||||
|
|
||||||
for (auto& sheet : m_sheets)
|
|
||||||
array.append(sheet.to_json());
|
|
||||||
|
|
||||||
auto file_content = array.to_string();
|
|
||||||
|
|
||||||
auto file = Core::File::construct(filename);
|
auto file = Core::File::construct(filename);
|
||||||
file->open(Core::IODevice::WriteOnly);
|
file->open(Core::IODevice::WriteOnly);
|
||||||
if (!file->is_open()) {
|
if (!file->is_open()) {
|
||||||
|
@ -140,14 +154,32 @@ Result<bool, String> Workbook::save(const StringView& filename)
|
||||||
return sb.to_string();
|
return sb.to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool result = file->write(file_content);
|
if (mime == "text/csv") {
|
||||||
if (!result) {
|
// FIXME: Prompt the user for settings and which sheet to export.
|
||||||
int error_number = errno;
|
Core::OutputFileStream stream { file };
|
||||||
StringBuilder sb;
|
auto data = m_sheets[0].to_xsv();
|
||||||
sb.append("Unable to save file. Error: ");
|
auto header_string = data.take_first();
|
||||||
sb.append(strerror(error_number));
|
Vector<StringView> headers;
|
||||||
|
for (auto& str : header_string)
|
||||||
|
headers.append(str);
|
||||||
|
Writer::CSV csv { stream, data, headers };
|
||||||
|
if (csv.has_error())
|
||||||
|
return String::formatted("Unable to save file, CSV writer error: {}", csv.error_string());
|
||||||
|
} else {
|
||||||
|
JsonArray array;
|
||||||
|
for (auto& sheet : m_sheets)
|
||||||
|
array.append(sheet.to_json());
|
||||||
|
|
||||||
return sb.to_string();
|
auto file_content = array.to_string();
|
||||||
|
bool result = file->write(file_content);
|
||||||
|
if (!result) {
|
||||||
|
int error_number = errno;
|
||||||
|
StringBuilder sb;
|
||||||
|
sb.append("Unable to save file. Error: ");
|
||||||
|
sb.append(strerror(error_number));
|
||||||
|
|
||||||
|
return sb.to_string();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
set_filename(filename);
|
set_filename(filename);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue