Set buffer size optional

Author: visuve

PystykorvaLib/Pystykorva.cpp

@@ -105,6 +105,33 @@ namespace Pystykorva
 		_callbacks(callbacks),
 		_rdi(options.Directory, std::filesystem::directory_options::skip_permission_denied)
 	{
+		if (_options.SearchExpression.empty())
+		{
+			throw std::invalid_argument("Search expression cannot be empty");
+		}
+		else if (_options.SearchExpression.size() > 0x400)
+		{
+			throw std::invalid_argument("Search expression is too long");
+		}
+
+		if (_options.ReplacementText.size() > 0x400)
+		{
+			throw std::invalid_argument("Replacement text is too long");
+		}
+
+		if (_options.BufferSize == 0)
+		{
+			throw std::invalid_argument("Buffer size cannot be zero");
+		}
+		else if (_options.BufferSize < _options.SearchExpression.size() * 4)
+		{
+			throw std::invalid_argument("Buffer size is too small for the search expression");
+		}
+
+		if (_options.MaximumThreads == 0)
+		{
+			throw std::invalid_argument("Maximum threads cannot be zero");
+		}
 	}
 
 	Runner::~Runner()
@@ -114,11 +141,6 @@ namespace Pystykorva
 
 	void Runner::Start()
 	{
-		if (!_options.MaximumThreads)
-		{
-			_options.MaximumThreads = 1u;
-		}
-
 		_start = std::chrono::high_resolution_clock::now();
 
 		if (_callbacks.Started)

PystykorvaLib/Pystykorva.hpp

@@ -29,6 +29,7 @@ namespace Pystykorva
 		std::filesystem::file_time_type MaximumTime = std::filesystem::file_time_type() + std::chrono::years(2000);
 
 		uint32_t MaximumThreads = std::thread::hardware_concurrency();
+		uint64_t BufferSize = 0x400 * 0x400; // 1 MiB
 	};
 
 	enum Status : uint32_t
@@ -194,8 +195,8 @@ namespace Pystykorva
 		std::filesystem::path Next();
 		void BackgroundThread(std::stop_token token);
 
-		Options _options;
-		Callbacks _callbacks;
+		const Options _options;
+		const Callbacks _callbacks;
 
 		std::chrono::high_resolution_clock::time_point _start;
 		std::stop_source _stopSource;

PystykorvaLib/TextProcessor.cpp

@@ -352,9 +352,7 @@ namespace Pystykorva
 
 	void TextProcessor::ProcessFile(std::fstream& file, size_t size, Result& result) const
 	{
-		constexpr size_t ChunkSize = 0x400 * 0x400; // 1MB Chunk Read
-
-		size_t initialAllocation = std::min(ChunkSize, size);
+		size_t initialAllocation = std::min(_options.BufferSize, size);
 		std::string rawBuffer(initialAllocation, '\0');
 
 		std::string activeWindow;
@@ -372,7 +370,7 @@ namespace Pystykorva
 			}
 
 			size_t remainingBytes = size - totalBytesProcessed;
-			size_t bytesToRead = std::min(ChunkSize, remainingBytes);
+			size_t bytesToRead = std::min(_options.BufferSize, remainingBytes);
 
 			file.read(rawBuffer.data(), bytesToRead);
 			size_t bytesRead = file.gcount();