RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:07:45 +00:00
Code Issues Activity Actions

Spreadsheet/XSV: Make the writer respect QuoteAll

Browse source 
Also make the header container type generic, and name an enum.
This commit is contained in:
AnotherTest 2021-03-20 13:55:33 +03:30 • committed by Andreas Kling
parent 3c151b3de6
commit 8bd138cbbe
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Applications/Spreadsheet/Writers/XSV.h
View file

@ -57,7 +57,7 @@ inline WriterBehaviour operator|(WriterBehaviour left, WriterBehaviour right)
struct WriterTraits { struct WriterTraits {
String separator; String separator;
String quote { "\"" }; String quote { "\"" };
enum { enum QuoteEscape {
Repeat, Repeat,
Backslash, Backslash,
} quote_escape { Repeat }; } quote_escape { Repeat };
@ -79,10 +79,10 @@ inline constexpr WriterBehaviour default_behaviours()
return WriterBehaviour::None; return WriterBehaviour::None;
} }
template<typename ContainerType> template<typename ContainerType, typename HeaderType = Vector<StringView>>
class XSV { class XSV {
public: public:
XSV(OutputStream& output, const ContainerType& data, const WriterTraits& traits, const Vector<StringView>& headers = {}, WriterBehaviour behaviours = default_behaviours()) XSV(OutputStream& output, const ContainerType& data, const WriterTraits& traits, const HeaderType& headers = {}, WriterBehaviour behaviours = default_behaviours())
: m_data(data) : m_data(data)
, m_traits(traits) , m_traits(traits)
, m_behaviours(behaviours) , m_behaviours(behaviours)
@ -159,13 +159,17 @@ private:
{ {
auto string = String::formatted("{}", FormatIfSupported(entry)); auto string = String::formatted("{}", FormatIfSupported(entry));
auto safe_to_write_normally = !string.contains("\n") && !string.contains(m_traits.separator); auto safe_to_write_normally = (m_behaviours & WriterBehaviour::QuoteAll) == WriterBehaviour::None
&& !string.contains("\n")
&& !string.contains(m_traits.separator);
if (safe_to_write_normally) { if (safe_to_write_normally) {
if ((m_behaviours & WriterBehaviour::QuoteOnlyInFieldStart) == WriterBehaviour::None) if ((m_behaviours & WriterBehaviour::QuoteOnlyInFieldStart) == WriterBehaviour::None)
safe_to_write_normally = !string.contains(m_traits.quote); safe_to_write_normally = !string.contains(m_traits.quote);
else else
safe_to_write_normally = !string.starts_with(m_traits.quote); safe_to_write_normally = !string.starts_with(m_traits.quote);
} }
if (safe_to_write_normally) { if (safe_to_write_normally) {
if (m_output.write(string.bytes()) != string.length()) if (m_output.write(string.bytes()) != string.length())
set_error(WriteError::InternalError); set_error(WriteError::InternalError);
@ -207,7 +211,7 @@ private:
const ContainerType& m_data; const ContainerType& m_data;
const WriterTraits& m_traits; const WriterTraits& m_traits;
WriterBehaviour m_behaviours; WriterBehaviour m_behaviours;
const Vector<StringView>& m_names; const HeaderType& m_names;
WriteError m_error { WriteError::None }; WriteError m_error { WriteError::None };
OutputStream& m_output; OutputStream& m_output;
}; };