INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-12 07:48:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Create CsvStream class to replace CsvWriter

Browse Source
This commit is contained in:
Jan
2021-03-11 12:43:33 +01:00
parent 9b15afa70e
commit 88b5eefe24
7 changed files with 149 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/ObjWriting/Dumping/CsvWriter.cpp
View File

@ -1,74 +0,0 @@
#include "CsvWriter.h"
#include <sstream>
CsvWriter::CsvWriter(std::ostream& stream)
: m_stream(stream),
m_column_count(0),
m_current_column(0),
m_first_row(true)
{
}
void CsvWriter::WriteColumn(const std::string& value)
{
if (m_current_column++ > 0)
m_stream << ",";
auto containsSeparator = false;
auto containsQuote = false;
for (const auto& c : value)
{
if (c == '"')
{
containsQuote = true;
break;
}
if (c == SEPARATOR)
containsSeparator = true;
}
if (containsQuote)
{
std::ostringstream str;
for (const auto& c : value)
{
if (c == '"')
str << "\"\"";
else
str << c;
}
m_stream << "\"" << str.str() << "\"";
}
else if (containsSeparator)
{
m_stream << "\"" << value << "\"";
}
else
{
m_stream << value;
}
}
void CsvWriter::NextRow()
{
if (m_first_row)
{
m_first_row = false;
m_column_count = m_current_column;
}
else
{
while (m_current_column < m_column_count)
{
m_stream << ",";
m_current_column++;
}
}
m_stream << "\n";
m_current_column = 0;
}

20
src/ObjWriting/Dumping/CsvWriter.h
View File

@ -1,20 +0,0 @@
#pragma once
#include <string>
#include <ostream>
class CsvWriter
{
static constexpr char SEPARATOR = ',';
std::ostream& m_stream;
unsigned m_column_count;
unsigned m_current_column;
bool m_first_row;
public:
explicit CsvWriter(std::ostream& stream);
void WriteColumn(const std::string& value);
void NextRow();
};

4
src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperStringTable.cpp
View File

@ -1,6 +1,6 @@
#include "AssetDumperStringTable.h"
#include "Dumping/CsvWriter.h"
#include "Csv/CsvStream.h"
using namespace IW4;
@ -22,7 +22,7 @@ std::string AssetDumperStringTable::GetFileNameForAsset(Zone* zone, XAssetInfo<S
void AssetDumperStringTable::DumpRaw(AssetDumpingContext& context, XAssetInfo<StringTable>* asset, std::ostream& stream)
{
const auto* stringTable = asset->Asset();
CsvWriter csv(stream);
CsvOutputStream csv(stream);
for (auto row = 0; row < stringTable->rowCount; row++)
{

4
src/ObjWriting/Game/T6/AssetDumpers/AssetDumperFontIcon.cpp
View File

@ -1,6 +1,6 @@
#include "AssetDumperFontIcon.h"
#include "Dumping/CsvWriter.h"
#include "Csv/CsvStream.h"
#include "Game/T6/CommonT6.h"
#include <sstream>
@ -141,7 +141,7 @@ class AssetDumperFontIconInternal
KnownAlias("Remote_LStick")
};
CsvWriter m_csv;
CsvOutputStream m_csv;
static FontIconEntry* FindEntryByHash(FontIcon* fontIcon, const int hash)
{

4
src/ObjWriting/Game/T6/AssetDumpers/AssetDumperStringTable.cpp
View File

@ -1,6 +1,6 @@
#include "AssetDumperStringTable.h"
#include "Dumping/CsvWriter.h"
#include "Csv/CsvStream.h"
using namespace T6;
@ -22,7 +22,7 @@ std::string AssetDumperStringTable::GetFileNameForAsset(Zone* zone, XAssetInfo<S
void AssetDumperStringTable::DumpRaw(AssetDumpingContext& context, XAssetInfo<StringTable>* asset, std::ostream& stream)
{
const auto* stringTable = asset->Asset();
CsvWriter csv(stream);
CsvOutputStream csv(stream);
for(auto row = 0; row < stringTable->rowCount; row++)
{