From 1608d01bb68c1f6292b04c70caa609d34943b371 Mon Sep 17 00:00:00 2001 From: Alex Schofield Date: Wed, 19 Feb 2025 15:37:57 +0000 Subject: rename write function & update references --- obfuscator/write.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 obfuscator/write.py (limited to 'obfuscator/write.py') diff --git a/obfuscator/write.py b/obfuscator/write.py new file mode 100644 index 0000000..de7cd4b --- /dev/null +++ b/obfuscator/write.py @@ -0,0 +1,23 @@ +import csv +import io +from typing import List, Dict +from obfuscator.logger import get_logger + +logger = get_logger("CSVWRITER") + + +def create_byte_stream(data: List[Dict[str, str]]) -> bytes: + if not data: + logger.error("Invalid or empty data was provided to write") + + output = io.StringIO() + + headers = list(data[0].keys()) + + writer = csv.DictWriter(output, fieldnames=headers) + writer.writeheader() + writer.writerows(data) + + csv_string = output.getvalue() + + return csv_string.encode("utf-8") -- cgit v1.2.3 From ef3f16de8d93821d54344d5cdd16d8deee0b016c Mon Sep 17 00:00:00 2001 From: Alex Schofield Date: Wed, 19 Feb 2025 15:40:39 +0000 Subject: wrap write functions in class and update references --- cli.py | 6 ++++-- obfuscator/write.py | 24 ++++++++++++++---------- test/test_write.py | 2 +- 3 files changed, 19 insertions(+), 13 deletions(-) (limited to 'obfuscator/write.py') diff --git a/cli.py b/cli.py index 5100e2b..bd49707 100644 --- a/cli.py +++ b/cli.py @@ -1,8 +1,8 @@ import argparse from obfuscator.read import DataReader +from obfuscator.write import DataWriter from obfuscator.obfuscate import obfuscate from obfuscator.logger import get_logger -from obfuscator.csv_writer import create_byte_stream def main(): @@ -43,7 +43,9 @@ def main(): obfuscated_data = obfuscate(data, args.pii) - return create_byte_stream(obfuscated_data) + writer = DataWriter() + + return writer.create_byte_stream(obfuscated_data) if __name__ == "__main__": diff --git a/obfuscator/write.py b/obfuscator/write.py index de7cd4b..4081f0f 100644 --- a/obfuscator/write.py +++ b/obfuscator/write.py @@ -6,18 +6,22 @@ from obfuscator.logger import get_logger logger = get_logger("CSVWRITER") -def create_byte_stream(data: List[Dict[str, str]]) -> bytes: - if not data: - logger.error("Invalid or empty data was provided to write") +class DataWriter: + def __init__(self): + pass - output = io.StringIO() + def create_byte_stream(self, data: List[Dict[str, str]]) -> bytes: + if not data: + logger.error("Invalid or empty data was provided to write") - headers = list(data[0].keys()) + output = io.StringIO() - writer = csv.DictWriter(output, fieldnames=headers) - writer.writeheader() - writer.writerows(data) + headers = list(data[0].keys()) - csv_string = output.getvalue() + writer = csv.DictWriter(output, fieldnames=headers) + writer.writeheader() + writer.writerows(data) - return csv_string.encode("utf-8") + csv_string = output.getvalue() + + return csv_string.encode("utf-8") diff --git a/test/test_write.py b/test/test_write.py index eceac28..f339799 100644 --- a/test/test_write.py +++ b/test/test_write.py @@ -1,6 +1,6 @@ import io import csv -from obfuscator.csv_writer import create_byte_stream +from obfuscator.write import create_byte_stream def csv_bytes_to_list(csv_bytes: bytes): -- cgit v1.2.3 From b402ee55d9f9e37c772c47b703ae4b66b66adda6 Mon Sep 17 00:00:00 2001 From: Alex Schofield Date: Wed, 19 Feb 2025 15:54:18 +0000 Subject: re-add original behaviour of returning empty byte stream when data empty in create_byte_stream() --- obfuscator/write.py | 1 + 1 file changed, 1 insertion(+) (limited to 'obfuscator/write.py') diff --git a/obfuscator/write.py b/obfuscator/write.py index 4081f0f..451b073 100644 --- a/obfuscator/write.py +++ b/obfuscator/write.py @@ -13,6 +13,7 @@ class DataWriter: def create_byte_stream(self, data: List[Dict[str, str]]) -> bytes: if not data: logger.error("Invalid or empty data was provided to write") + return b"" output = io.StringIO() -- cgit v1.2.3