Skip to content

Use monadic operations #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ProgramMax merged 1 commit into from
Jun 27, 2025
Merged

Use monadic operations #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 23 additions & 41 deletions Code/png_cicp_editor/Actions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,37 +150,27 @@ png_cicp_editor depends on max:
print_bsd_3_clause_license(max_year, max_copyright_holder);
}



void ActionExecutor::operator()(const AddAction& action) const noexcept {
// TODO: Return error values
// Read the file
auto file_contents = read_file(action.file_path_);

auto file_contents = read_file(action.file_path_)
.transform_error(print_monad_error<ReadFileError>);
if (!file_contents.has_value()) {
print_error(file_contents.error());
//return 1;
return;
}


// Get indicies of all chunks
auto chunk_indices = get_chunk_indices(file_contents.value());
auto chunk_indices = get_chunk_indices(file_contents.value())
.transform_error(print_monad_error<GetChunkIndicesError>);
if (!chunk_indices.has_value()) {
print_error(chunk_indices.error());
//return 1;
return;
}


// Find overwrite index for cICP chunk
auto split_buffer = get_split_buffer_across_cicp_insertion_point(file_contents.value(), chunk_indices.value(), /*overwrite_cicp*/ false);
auto split_buffer = get_split_buffer_across_cicp_insertion_point(file_contents.value(), chunk_indices.value(), /*overwrite_cicp*/ false)
.transform_error(print_monad_error<GetInsertionIndexError>);
if (!split_buffer.has_value()) {
print_error(split_buffer.error());
//return 1;
return;
}


// Prepare cICP buffer to write
auto cicp_buffer = create_cicp_buffer(action.cicp_);

Expand All @@ -193,39 +183,35 @@ png_cicp_editor depends on max:


// Write the file with cICP inserted
auto write_result = PNG_CICP_Editor::write_file(action.file_path_, buffers);
auto write_result = PNG_CICP_Editor::write_file(action.file_path_, buffers)
.transform_error(print_monad_error<WriteFileError>);
if (!write_result.has_value()) {
print_error(write_result.error());
//return 1;
return;
}
}

void ActionExecutor::operator()(const OverwriteAction& action) const noexcept {
// TODO: Return error values
// Read the file
auto file_contents = read_file(action.file_path_);
auto file_contents = read_file(action.file_path_)
.transform_error(print_monad_error<ReadFileError>);
if (!file_contents.has_value()) {
print_error(file_contents.error());
//return 1;
return;
}


// Get indicies of all chunks
auto chunk_indices = get_chunk_indices(file_contents.value());
auto chunk_indices = get_chunk_indices(file_contents.value())
.transform_error(print_monad_error<GetChunkIndicesError>);
if (!chunk_indices.has_value()) {
print_error(chunk_indices.error());
//return 1;
return;
}


// Find overwrite index for cICP chunk
auto split_buffer = get_split_buffer_across_cicp_insertion_point(file_contents.value(), chunk_indices.value(), /*overwrite_cicp*/ true);
auto split_buffer = get_split_buffer_across_cicp_insertion_point(file_contents.value(), chunk_indices.value(), /*overwrite_cicp*/ true)
.transform_error(print_monad_error<GetInsertionIndexError>);
if (!split_buffer.has_value()) {
print_error(split_buffer.error());
//return 1;
return;
}

Expand All @@ -242,30 +228,27 @@ png_cicp_editor depends on max:


// Write the file with cICP inserted
auto write_result = PNG_CICP_Editor::write_file(action.file_path_, buffers);
auto write_result = PNG_CICP_Editor::write_file(action.file_path_, buffers)
.transform_error(print_monad_error<WriteFileError>);
if (!write_result.has_value()) {
print_error(write_result.error());
//return 1;
return;
}
}

void ActionExecutor::operator()(const RemoveAction& action) const noexcept {
// TODO: Return error values
// Read the file
auto file_contents = read_file(action.file_path_);
auto file_contents = read_file(action.file_path_)
.transform_error(print_monad_error<ReadFileError>);
if (!file_contents.has_value()) {
print_error(file_contents.error());
//return 1;
return;
}


// Get indicies of all chunks
auto chunk_indices = get_chunk_indices(file_contents.value());
auto chunk_indices = get_chunk_indices(file_contents.value())
.transform_error(print_monad_error<GetChunkIndicesError>);
if (!chunk_indices.has_value()) {
print_error(chunk_indices.error());
//return 1;
return;
}

Expand Down Expand Up @@ -310,10 +293,9 @@ png_cicp_editor depends on max:


// Write the file with cICP inserted
auto write_result = PNG_CICP_Editor::write_file(action.file_path_, buffers);
auto write_result = PNG_CICP_Editor::write_file(action.file_path_, buffers)
.transform_error(print_monad_error<WriteFileError>);
if (!write_result.has_value()) {
print_error(write_result.error());
//return 1;
return;
}
}
Expand Down
Loading
Loading