example.diff

--- a/document.txt
+++ b/document.txt
@@ -1,5 +1,5 @@
-The quick brown fox jumps over the lazy dog.
+The fast brown fox leaps over the sleeping dog.
 She sells seashells by the seashore.
-The rain in Spain stays mainly in the plain.
+The rain in France falls mainly on the plain.
 To be or not to be, that is the question.
-All that glitters is not gold.
+Not all that glitters is gold.
@@ -7,3 +7,3 @@
 A stitch in time saves nine.
-An apple a day keeps the doctor away.
+An apple each day keeps the doctor away.
 Actions speak louder than words.
@@ -11,2 +11,2 @@
-The early bird catches the worm.
+The early riser catches the worm.
@@ -14,2 +14,2 @@
-Practice makes perfect.
+Practice leads to perfection.
@@ -17,3 +17,3 @@
 When in Rome, do as the Romans do.
-Don't put all your eggs in one basket.
+Never put all your eggs in one basket.
 A penny saved is a penny earned.
@@ -21,2 +21,2 @@
-Every cloud has a silver lining.
+Every cloud possesses a silver lining.
@@ -24,2 +24,2 @@
-Two wrongs don't make a right.
+Two wrongs never make a right.
@@ -27,1 +27,2 @@
 The pen is mightier than the sword.
+Words can be sharper than any blade.

--- a/sample.txt
+++ b/sample.txt
@@ -1,2 +1,2 @@
-foo bar baz
+foo bat bak
@@ -4,2 +4,1 @@
-The quick brown fox jumps over the lazy dog.
+The quick black cat jumps over the lazy dog.
@@ -7,2 +6,2 @@
-She sells sea shells by the sea shore.
+He sells sea shells by the sea floor.

diff --git a/bin/dune b/bin/dune
index fca70de..fd7f225 100644
--- a/bin/dune
+++ b/bin/dune
@@ -1,4 +1,4 @@
 (executable
  (public_name diffcessible)
  (name main)
- (libraries diffcessible cmdliner))
+ (libraries diffcessible cmdliner patch))
diff --git a/bin/main.ml b/bin/main.ml
index e03c4a4..cb71f31 100644
--- a/bin/main.ml
+++ b/bin/main.ml
@@ -1,7 +1,9 @@
 open Diffcessible
 
 let main () =
-  Interactive_viewer.start ()
+  let s = In_channel.input_all In_channel.stdin in
+  let patch = Patch.to_diffs s in
+  Interactive_viewer.start patch
 
 open Cmdliner
 
diff --git a/lib/dune b/lib/dune
index 196ed80..4269b32 100644
--- a/lib/dune
+++ b/lib/dune
@@ -1,3 +1,3 @@
 (library
  (name diffcessible)
- (libraries notty nottui lwd))
+ (libraries notty nottui lwd patch))
diff --git a/lib/interactive_viewer.ml b/lib/interactive_viewer.ml
index 9b59dfe..169ab52 100644
--- a/lib/interactive_viewer.ml
+++ b/lib/interactive_viewer.ml
@@ -1,39 +1,25 @@
 open Nottui
 module W = Nottui_widgets
-open Lwd_infix
-
-type patch = unit
+(* open Lwd_infix *)
 
 let pure_str s = Lwd.pure (W.string s)
-
-let string_of_counter c =
-  let$ c = c in
-  W.string (string_of_int c)
-
 let quit = Lwd.var false
-let counter = Lwd.var 0
-let counter_d = Lwd.get counter
+let string_of_operation = Format.asprintf "%a" (Patch.pp_operation ~git:false)
 
-let view =
+let view (patch : Patch.t list) =
+  let patch = match patch with p :: _ -> p | _ -> assert false in
   W.scrollbox
     (W.vbox
        [
-         pure_str "Hello world!";
-         string_of_counter counter_d;
+         pure_str (string_of_operation patch.operation);
          Lwd.pure
          @@ Ui.keyboard_area
               (function
                 | `ASCII 'q', [] ->
                     Lwd.set quit true;
                     `Handled
-                | `ASCII 'a', [] ->
-                    Lwd.set counter (Lwd.peek counter + 1);
-                    `Handled
-                | `ASCII 'b', [] ->
-                    Lwd.set counter (Lwd.peek counter - 1);
-                    `Handled
                 | _ -> `Unhandled)
               (W.string "Type 'q' to quit.");
        ])
 
-let start () = Ui_loop.run ~quit ~tick_period:0.2 view
+let start patch = Ui_loop.run ~quit ~tick_period:0.2 (view patch)
diff --git a/lib/interactive_viewer.mli b/lib/interactive_viewer.mli
index 1202346..1afff98 100644
--- a/lib/interactive_viewer.mli
+++ b/lib/interactive_viewer.mli
@@ -1,5 +1,3 @@
 (** Render and navigate through a diff. *)
 
-type patch = unit
-
-val start : patch -> unit
+val start : Patch.t list -> unit
diff --git a/dir1/file.txt b/dir2/file.txt
index dfd0d1e..ce59064 100644
--- a/dir1/file.txt
+++ b/dir2/file.txt
@@ -1 +1 @@
-This is the original content.
+This is the modified content.
diff --git a/dir2/new_diff.diff b/dir2/new_diff.diff
new file mode 100644
index 0000000..e69de29
diff --git a/dir1/file.txt b/dir2/file.txt
index dfd0d1e..50e0cc9 100644
--- a/dir1/file.txt
+++ b/dir2/file.txt
@@ -1 +1,2 @@
 This is the original content.
+Here is some additional line.
diff --git a/dir2/new_diff.diff b/dir2/new_diff.diff
new file mode 100644
index 0000000..e69de29
diff --git a/dir1/file.txt b/dir2/file.txt
index dfd0d1e..cf5dea7 100644
--- a/dir1/file.txt
+++ b/dir2/file.txt
@@ -1 +1,2 @@
-This is the original content.
+Here is some additional line.
+Deleted line 1 and added this.
diff --git a/dir2/file.txt b/dir2/file.txt
new file mode 100644
index 0000000..01a59b0
--- /dev/null
+++ b/dir2/file.txt
@@ -0,0 +1 @@
+lorem ipsum
diff --git a/dir1/file.txt b/dir1/file.txt
deleted file mode 100644
index 7b57bd2..0000000
--- a/dir1/file.txt
+++ /dev/null
@@ -1 +0,0 @@
-some text
diff --git a/dir1/file.txt b/dir2/new_file.txt
similarity index 100%
rename from dir1/file.txt
rename to dir2/new_file.txt
diff --git a/dir1/file.txt b/dir1/file.txt
deleted file mode 100644
index 7b57bd2..0000000
--- a/dir1/file.txt
+++ /dev/null
@@ -1 +0,0 @@
-some text
diff --git a/dir2/sample.txt b/dir2/sample.txt
new file mode 100644
index 0000000..9809dd1
--- /dev/null
+++ b/dir2/sample.txt
@@ -0,0 +1,2 @@
+some text
+lorem ipsum
diff --git a/dir1/file.txt b/dir2/file.txt
index e69de29..eee417f 100644
--- a/dir1/file.txt
+++ b/dir2/file.txt
@@ -0,0 +1 @@
+new text
diff --git a/ocaml.txt b/ocaml.txt
index 4327c22..7becacf 100755
--- a/ocaml.txt
+++ b/ocaml.txt
@@ -0,0 +1,2 @@
+OCaml is an industrial-strength functional programming language with an emphasis on expressiveness and safety.
+Learning OCaml is interesting.
@@ -4,1 +4,2 @@
-Want to begin?
+Take a tour at https://ocaml.org/docs/tour-of-ocaml
+Write your first OCaml program here - https://ocaml.org/docs/your-first-program
diff --git a/outreachy.txt b/outreachy.txt
index 0de0c1f..dad322e 100755
--- a/outreachy.txt
+++ b/outreachy.txt
@@ -1,2 +1,2 @@
 Outreachy internship projects may include programming, research, user experience, documentation, graphical design, data science, marketing, user advocacy, event planning, and more!
-Outreachy provides internships in open source and open science.
+Outreachy provides internships to people subject to systemic bias and impacted by underrepresentation in the technical industry where they are living.
@@ -5,2 +5,1 @@
-Outreachy is a diversity initiative of Software Freedom Conservancy.
-It is a life-changing experience.
+Outreachy provides a platform to contribute to open source and open science through learning, collaboration, and contribution.
@@ -9,2 +9,2 @@
-Join us in making a difference!
-Thank you
+Hello
+Outreachy