Commit: 45b69bfe94bdf5aab1ac7eb28d2c1705d4d6f5c1 - flitter-nix (git)

A Nix-friendly SQLite-enhanced fork of Flitter, a speedrunning split timer for Unix-style terminals

Commit MetaInfo

• Révision: 45b69bfe94bdf5aab1ac7eb28d2c1705d4d6f5c1 (tree)
• l'heure: 2023-07-04 01:51:27
• Auteur: Corbin <cds@corb...>
• Commiter: Corbin

Message de Log

Duplicate and simplify row-displaying logic.

Change Summary

• modified: src/display.ml
• modified: src/display.mli
• modified: src/gold.ml
• modified: src/gold.mli

Modification

--- a/src/display.ml
+++ b/src/display.ml
@@ -112,7 +112,6 @@ let split_row timer width i =
   in
 
   let plain_duration = uncolored_duration 1 in
-  let wr_duration = uncolored_duration 2 in
   let curr_split = get_curr_split timer.state in
   let show_comparison = i > curr_split in
 

--- a/src/display.mli
+++ b/src/display.mli
@@ -1,5 +1,10 @@
 type t
 
+val time_col_width : int
+
+val left_pad : int -> Notty.image -> Notty.image
+val join_pad : int -> Notty.image -> Notty.image -> Notty.image
+
 val make : unit -> t
 val draw : t -> Timer_types.timer -> unit
 val close : t -> unit

--- a/src/gold.ml
+++ b/src/gold.ml
@@ -16,3 +16,51 @@ let sum_of_best =
     (fun sd (_, _, min) ->
       match (min, sd) with Some best, Some d -> Some (d + best) | _, _ -> None)
     (Some 0)
+
+let to_image (_, s) ((avg, stddev, min), md) ~width ~now =
+  (* XXX should be Colors.selection_bg on the active split;
+     parameterize the color and add a zipper to Run.t? *)
+  let bg_attr = Colors.default_bg in
+  let uncolored_attr = Notty.A.(Colors.text ++ bg_attr) in
+  let hyphen = Notty.I.string uncolored_attr "-" in
+  let title = Notty.I.string bg_attr s in
+
+  (* Compute the split's ahead/behind time image *)
+  let delta_image =
+    match (md, min) with
+    | Some d, Some m ->
+        let diff = d - m in
+        let time_str = Duration.to_string_plus diff 1 in
+        (* XXX only supports two of five colors *)
+        let color =
+          if diff > 0 then Colors.behind_loss else Colors.ahead_gain
+        in
+        let color_attr = Notty.A.(color ++ bg_attr) in
+        Notty.I.string color_attr time_str
+    | _ -> hyphen
+  in
+
+  let plain_duration d =
+    match d with
+    | None -> hyphen
+    | Some sgmt -> Notty.I.string uncolored_attr (Duration.to_string sgmt 1)
+  in
+
+  (* Compute the image of the split's segment time *)
+  let sgmt_image = plain_duration min in
+
+  (* Compute the image of the split's absolute time *)
+  (* XXX needs to fold and sum *)
+  let time_image = plain_duration None in
+
+  (* Combine the three time columns together with proper padding *)
+  let time_cells = [ delta_image; sgmt_image; time_image ] in
+  let time_cols_combined =
+    List.map (Display.left_pad Display.time_col_width) time_cells
+    |> Notty.I.hcat
+  in
+
+  (* Add the split title and background color to fill in the padding *)
+  let row_top = Display.join_pad width title time_cols_combined in
+  let row_bottom = Notty.I.char bg_attr ' ' width 1 in
+  Notty.I.(row_top </> row_bottom)

--- a/src/gold.mli
+++ b/src/gold.mli
@@ -8,3 +8,5 @@ val standard_deviation : t -> Duration.t option
 val is_gold : t -> Duration.t -> bool
 val ahead_by : t -> Duration.t -> Duration.t option
 val sum_of_best : t list -> Duration.t option
+
+val to_image : string * string -> t * Duration.t option -> width:int -> now:float -> Notty.image