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

Spreadsheet: Use has_flag helper functions for XSV WriterBehaviors

Browse source
This commit is contained in:
Karol Kosek 2022-08-06 21:56:03 +02:00 • committed by Ali Mohammad Pur
parent e0aae9e60a
commit c74441395b
1 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,16 +23,7 @@ enum class WriterBehavior : u32 {
QuoteOnlyInFieldStart = WriteHeaders << 2, QuoteOnlyInFieldStart = WriteHeaders << 2,
QuoteAll = WriteHeaders << 3, QuoteAll = WriteHeaders << 3,
}; };
AK_ENUM_BITWISE_OPERATORS(WriterBehavior);
inline WriterBehavior operator&(WriterBehavior left, WriterBehavior right)
{
return static_cast<WriterBehavior>(static_cast<u32>(left) & static_cast<u32>(right));
}
inline WriterBehavior operator|(WriterBehavior left, WriterBehavior right)
{
return static_cast<WriterBehavior>(static_cast<u32>(left) | static_cast<u32>(right));
}
struct WriterTraits { struct WriterTraits {
DeprecatedString separator; DeprecatedString separator;
@ -101,7 +92,7 @@ private:
void generate() void generate()
{ {
auto with_headers = (m_behaviors & WriterBehavior::WriteHeaders) != WriterBehavior::None; auto with_headers = has_flag(m_behaviors, WriterBehavior::WriteHeaders);
if (with_headers) { if (with_headers) {
write_row(m_names); write_row(m_names);
if (m_output.write({ "\n", 1 }) != 1) if (m_output.write({ "\n", 1 }) != 1)
@ -139,15 +130,15 @@ private:
{ {
auto string = DeprecatedString::formatted("{}", FormatIfSupported(entry)); auto string = DeprecatedString::formatted("{}", FormatIfSupported(entry));
auto safe_to_write_normally = (m_behaviors & WriterBehavior::QuoteAll) == WriterBehavior::None auto safe_to_write_normally = !has_flag(m_behaviors, WriterBehavior::QuoteAll)
&& !string.contains('\n') && !string.contains('\n')
&& !string.contains(m_traits.separator); && !string.contains(m_traits.separator);
if (safe_to_write_normally) { if (safe_to_write_normally) {
if ((m_behaviors & WriterBehavior::QuoteOnlyInFieldStart) == WriterBehavior::None) if (has_flag(m_behaviors, WriterBehavior::QuoteOnlyInFieldStart))
safe_to_write_normally = !string.contains(m_traits.quote);
else
safe_to_write_normally = !string.starts_with(m_traits.quote); safe_to_write_normally = !string.starts_with(m_traits.quote);
else
safe_to_write_normally = !string.contains(m_traits.quote);
} }
if (safe_to_write_normally) { if (safe_to_write_normally) {