added apply api

Author: eugenehp

Cargo.toml

@@ -1,14 +1,20 @@
 [package]
-name = "patch"
+name = "patch-apply"
 version = "0.8.0"
-authors = ["phil <[email protected]>", "Eugene Hauptmann"]
-description = "Parse patches in the unified diff format"
-repository = "https://github.com/eugenehp/patch-rs"
+authors = ["phil <[email protected]>", "Eugene Hauptmann <[email protected]>"]
+description = "Parse and apply patches in the unified diff format"
+repository = "https://github.com/eugenehp/patch-apply-rs"
 readme = "README.md"
-keywords = ["patch", "diff", "parse", "nom"]
+keywords = ["patch", "diff", "parse", "nom", "git"]
+categories = [
+    "parsing",
+    "development-tools",
+    "parser-implementations"
+]
 license = "MIT"
 edition = "2018"
 
+
 [[example]]
 name = "apply"
 path = "./examples/apply.rs"

LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) 2016 uniphil
+Copyright (c) 2024 Eugene Hauptmann
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,11 +1,11 @@
 # Patch
 
-[![Checks](https://github.com/uniphil/patch-rs/actions/workflows/checks.yml/badge.svg)](https://github.com/uniphil/patch-rs/actions/workflows/checks.yml)
+[![Checks](https://github.com/uniphil/patch-rs/actions/workflows/checks.yml/badge.svg)](https://github.com/eugenehp/patch-apply-rs/actions/workflows/checks.yml)
 [![Crates.io Badge](https://img.shields.io/crates/v/patch.svg)](https://crates.io/crates/patch)
 [![docs.rs](https://docs.rs/patch/badge.svg)](https://docs.rs/patch)
-[![Lines of Code](https://tokei.rs/b1/github/uniphil/patch-rs)](https://github.com/uniphil/patch-rs)
+[![Lines of Code](https://tokei.rs/b1/github/eugenehp/patch-apply-rs)](https://github.com/eugenehp/patch-apply-rs)
 
-Rust crate for parsing and producing patch files in the [Unified Format].
+Rust crate for parsing, producing and applying patch files in the [Unified Format].
 
 The parser attempts to be forgiving enough to be compatible with diffs produced
 by programs like git. It accomplishes this by ignoring the additional code
@@ -14,4 +14,4 @@ context and information provided in the diff by those programs.
 See the **[Documentation]** for more information and for examples.
 
 [Unified Format]: https://www.gnu.org/software/diffutils/manual/html_node/Unified-Format.html
-[Documentation]: https://docs.rs/patch
+[Documentation]: https://docs.rs/patch-apply

examples/apply.rs

@@ -2,7 +2,7 @@
 
 use std::{fs, path::PathBuf};
 
-use patch::{Line, Patch};
+use patch_apply::{Line, Patch};
 
 fn apply(patch: Patch, old: &str) -> String {
     let old_lines = old.lines().collect::<Vec<&str>>();

examples/files/output.txt

@@ -0,0 +1,22 @@
+use crate::{Line, Patch};
+
+/// Apply patch to the string from the input file source
+pub fn apply(input: String, patch: Patch) -> String {
+    let old_lines = input.lines().collect::<Vec<&str>>();
+    let mut out: Vec<&str> = vec![];
+    let mut old_line = 0;
+    for hunk in patch.hunks {
+        while old_line < hunk.old_range.start - 1 {
+            out.push(old_lines[old_line as usize]);
+            old_line += 1;
+        }
+        old_line += hunk.old_range.count;
+        for line in hunk.lines {
+            match line {
+                Line::Add(s) | Line::Context(s) => out.push(s),
+                Line::Remove(_) | Line::EndOfFile(_) => {}
+            }
+        }
+    }
+    out.join("\n")
+}

src/apply.rs

@@ -45,8 +45,10 @@
 
 #![deny(unused_must_use)]
 
+mod apply;
 mod ast;
 mod parser;
 
+pub use apply::*;
 pub use ast::*;
 pub use parser::ParseError;

src/lib.rs

@@ -1,5 +1,5 @@
 use chrono::DateTime;
-use patch::{File, FileMetadata, ParseError, Patch};
+use patch_apply::{File, FileMetadata, ParseError, Patch};
 
 use pretty_assertions::assert_eq;
 

tests/parse_patch.rs

@@ -3,7 +3,7 @@ use std::path::PathBuf;
 
 use pretty_assertions::assert_eq;
 
-use patch::Patch;
+use patch_apply::Patch;
 
 #[test]
 fn parse_samples() {

tests/parse_samples.rs

@@ -1,4 +1,4 @@
-use patch::{File, FileMetadata, Hunk, Line, ParseError, Patch, Range};
+use patch_apply::{File, FileMetadata, Hunk, Line, ParseError, Patch, Range};
 
 use pretty_assertions::assert_eq;