aboutsummaryrefslogtreecommitdiff
path: root/lib/headlines.ml
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--lib/headlines.ml62
1 files changed, 20 insertions, 42 deletions
diff --git a/lib/headlines.ml b/lib/headlines.ml
index 4565f5f..7d410d7 100644
--- a/lib/headlines.ml
+++ b/lib/headlines.ml
@@ -4,18 +4,33 @@ open Notty
module Input_screen = Input_screen
module Stitched_article = Stitched_article
module Help_screen = Help_screen
-module Todos = Todos
type state =
{ pos : int * int
; scroll : int
; content : (string * string) array
; content_pretty : string array
- ; todo_state : Todos.state option
+ ; goto_todos_view : (unit -> unit) -> unit
}
+let init ~goto_todos_view ~regexp =
+ let tag = if String.equal regexp "" then None else Some regexp in
+ let content =
+ match tag with
+ | None -> Grep.get_headlines () |> Grep.parse_headlines
+ | Some tag -> Grep.get_tagged_headlines tag () |> Grep.parse_headlines
+ in
+ if Array.length content == 0
+ then (
+ print_endline "Regexp not found";
+ exit 0)
+ else (
+ let content_pretty = content |> Grep.pretty_format in
+ { pos = 0, 0; scroll = 0; content; content_pretty; goto_todos_view })
+
+
(* TODO: Add page title *)
-let rec render t ({ pos; scroll; content; content_pretty; todo_state } as state) =
+let rec render t ({ pos; scroll; content; content_pretty; goto_todos_view } as state) =
let x, y = pos in
let img =
let dot = I.string A.(st bold) ">" |> I.pad ~l:0 ~t:(y - scroll)
@@ -51,26 +66,7 @@ let rec render t ({ pos; scroll; content; content_pretty; todo_state } as state)
| `Mouse ((`Press _ | `Drag), (_, y), _) ->
render t { state with pos = 0, min y content_length }
| `Key (`ASCII '?', []) -> Help_screen.render t { go_back = (fun () -> render t state) }
- | `Key (`ASCII '2', []) ->
- (match todo_state with
- | Some todo_state ->
- Todos.render
- t
- { todo_state with
- goto_headlines =
- (fun new_state -> render t { state with todo_state = Some new_state })
- }
- | None ->
- let todo_content = Grep.get_todos () |> Grep.parse_todo_string in
- let todo_pretty = Grep.pretty_format_todo todo_content in
- let todo_state =
- Todos.init
- ~goto_headlines:(fun new_state ->
- render t { state with todo_state = Some new_state })
- ~content:(todo_content |> Array.of_list)
- ~content_pretty:(todo_pretty |> Array.of_list)
- in
- Todos.render t todo_state)
+ | `Key (`ASCII '2', []) -> goto_todos_view (fun () -> render t state)
| `Key (`ASCII 's', []) ->
let content =
Array.map
@@ -89,7 +85,7 @@ let rec render t ({ pos; scroll; content; content_pretty; todo_state } as state)
; content_pretty = full_content_pretty
; scroll = 0
; go_back = (fun () -> render t state)
- ; todo_state
+ ; goto_todos_view
}
| `Key (`ASCII 'r', []) ->
let (input_state : Input_screen.state) =
@@ -145,21 +141,3 @@ let rec render t ({ pos; scroll; content; content_pretty; todo_state } as state)
in
run_editor ()
| _ -> render t state
-
-
-let start (tag : string) () =
- let tag = if String.equal tag "" then None else Some tag in
- let content =
- match tag with
- | None -> Grep.get_headlines () |> Grep.parse_headlines
- | Some tag -> Grep.get_tagged_headlines tag () |> Grep.parse_headlines
- in
- if Array.length content == 0
- then (
- print_endline "No entry for tag";
- exit 0)
- else (
- let content_pretty = content |> Grep.pretty_format in
- render
- (Common.Term.create ())
- { pos = 0, 0; scroll = 0; content; content_pretty; todo_state = None })