Commit: 6ff31367158c4b76a8910eda99c2b16b21ad8f00 - flitter-nix (git)

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

Commit MetaInfo

• Revisión: 6ff31367158c4b76a8910eda99c2b16b21ad8f00 (tree)
• Tiempo: 2023-06-24 02:01:01
• Autor: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Remove world-record support.

For posterity: This is the ability to take somebody else's segments and
store them in a way that doesn't associate them with any particular
attempt. I don't like this because it's incompatible with the rest of
the data model, and also breaks an assumption about provenance; but
also, I think that it's unhealthy to compare oneself to the
world-record-holding runners constantly.

Cambiar Resumen

• modified: src/display.ml
• modified: src/loadsave.ml
• modified: src/timer_types.ml
• modified: src/timer_types.mli

Diferencia incremental

--- a/src/display.ml
+++ b/src/display.ml
@@ -21,10 +21,7 @@ let preamble timer width =
   I.(title <-> category)
 
 let splits_header timer width =
-  let labels =
-    if Option.is_some timer.wr then [ "Delta"; "Sgmt"; "Time"; "WR" ]
-    else [ "Delta"; "Sgmt"; "Time" ]
-  in
+  let labels = [ "Delta"; "Sgmt"; "Time" ] in
 
   let cell_padded =
     List.map
@@ -153,36 +150,8 @@ let split_row timer width i =
   in
   let time_image = plain_duration time in
 
-  (* Compute the image of the WR comparison cell *)
-  let wr_image =
-    Option.map timer.wr ~f:(fun wr_run ->
-        let default_img = wr_duration wr_run.splits.(i).time in
-
-        if i >= curr_split then default_img
-        else
-          (* Determine how much we're ahead or behind WR *)
-          match timer.state with
-          | Idle -> default_img
-          | Timing (splits, _, _)
-          | Paused (splits, _, _, _)
-          | Done (splits, _, _) -> (
-              match (splits.(i), wr_run.splits.(i).time) with
-              | Some curr_t, Some wr_t ->
-                  let delta = curr_t - wr_t in
-                  let delta_str = Duration.to_string_plus delta 2 in
-                  let delta_color =
-                    if delta < 0 then Colors.ahead_gain else Colors.behind_gain
-                  in
-                  I.string delta_color delta_str
-              | _ -> hyphen))
-  in
-
   (* Combine the three time columns together with proper padding *)
-  let time_cells =
-    match wr_image with
-    | Some wr -> [ delta_image; sgmt_image; time_image; wr ]
-    | None -> [ delta_image; sgmt_image; time_image ]
-  in
+  let time_cells = [ delta_image; sgmt_image; time_image ] in
   let time_cols_combined =
     List.map time_cells ~f:(left_pad time_col_width) |> I.hcat
   in

--- a/src/loadsave.ml
+++ b/src/loadsave.ml
@@ -26,7 +26,6 @@ type game = {
   split_names : string array;
   golds : gold array; [@sexp.omit_nil]
   personal_best : archived_run option; [@sexp.option]
-  world_record : archived_run option; [@sexp.option]
   history : archived_run list; [@sexp.omit_nil]
 }
 [@@deriving sexp]
@@ -50,7 +49,6 @@ let game_of_sexp sexp =
     in
 
     check_run game.personal_best "Personal best";
-    check_run game.world_record "World record";
 
     let history_runs_ok =
       List.fold game.history ~init:true ~f:(fun all_ok run ->
@@ -98,7 +96,6 @@ let load_route { title; category } = { title; category; Route.order = None }
 let load filepath =
   let game = Sexp.load_sexp_conv_exn filepath game_of_sexp in
   let pb = Option.map ~f:load_run game.personal_best in
-  let wr = Option.map ~f:load_run game.world_record in
   let golds = load_golds game in
   let history = List.map game.history ~f:load_run in
 
@@ -111,7 +108,6 @@ let load filepath =
     history;
     comparison = pb;
     pb;
-    wr;
     state = Idle;
     splits_file = filepath;
   }
@@ -140,7 +136,6 @@ let save (timer : Timer_types.timer) =
   in
 
   let pb = Option.map ~f:export_run timer.pb in
-  let wr = Option.map ~f:export_run timer.wr in
 
   let history = List.map timer.history ~f:export_run in
 
@@ -154,7 +149,6 @@ let save (timer : Timer_types.timer) =
       golds = Array.map timer.golds ~f:map_gold;
       history;
       personal_best = pb;
-      world_record = wr;
     }
   in
 

--- a/src/timer_types.ml
+++ b/src/timer_types.ml
@@ -35,7 +35,6 @@ type timer = {
   history : archived_run list;
   comparison : archived_run option;
   pb : archived_run option;
-  wr : archived_run option;
   state : live_splits timer_state;
   splits_file : string;
 }

--- a/src/timer_types.mli
+++ b/src/timer_types.mli
@@ -27,7 +27,6 @@ type timer = {
   history : archived_run list;
   comparison : archived_run option;
   pb : archived_run option;
-  wr : archived_run option;
   state : live_splits timer_state;
   splits_file : string;
 }