Time: 2019 -> 2020

Author: rr0gi

dune

@@ -59,7 +59,7 @@
 
 (executable
   (name test)
-  (libraries devkit extlib libevent netstring ounit2 yojson)
+  (libraries devkit extlib extunix libevent netstring ounit2 yojson)
   (modules test test_httpev))
 
 (rule

test.ml

@@ -2,6 +2,8 @@ open OUnit
 open Printf
 open ExtLib
 
+module U = ExtUnix.Specific
+
 open Devkit
 
 let tests = ref []
@@ -182,6 +184,13 @@ let () = test "Time.show_duration" begin fun () ->
   t 93784. "1 day 2 hours 3 mins 4 secs";
 end
 
+let () = test "Time.basic_string" begin fun () ->
+  let t n s = assert_equal ~printer:id s (Time.basic_gmt_string n) in
+  t (U.timegm @@ U.strptime "%Y%m%d %H%M%S" "20200101 123456") "2020-01-01 12:34:56";
+  t (U.timegm @@ U.strptime "%Y%m%d %H%M%S" "20190101 123456") "2019-01-01 12:34:56";
+  t (U.timegm @@ U.strptime "%Y%m%d %H%M%S" "20090101 123456") "2009-01-01 12:34:56";
+end
+
 let () = test "Time.compact_duration" begin fun () ->
   let t n s =
     (* FIXME epsilon compare *)

time.ml

@@ -22,18 +22,20 @@ let unsafe_digit n = Char.unsafe_chr (Char.code '0' + n)
 let put_2d s ofs n =
   Bytes.unsafe_set s ofs (unsafe_digit (n / 10));
   Bytes.unsafe_set s (ofs+1) (unsafe_digit (n mod 10))
-let replace_year_2019 s year =
-  if year <> 2019 then
+
+let replace_year_2020 s t =
+  let year = t.Unix.tm_year + 1900 in
+  if year <> 2020 then
   begin
-    if year >= 2010 && year < 2020 then
+    if year >= 2020 && year < 2030 then
       Bytes.unsafe_set s 3 (unsafe_digit (year mod 10))
     else
       Bytes.unsafe_blit (Bytes.unsafe_of_string @@ if year >= 1000 then string_of_int year else sprintf "%04u" year) 0 s 0 4
   end
 
 let fast_to_string =
   (* "%04u-%02u-%02uT%02u:%02u:%02u%s" *)
-  let template = "2019-__-__T__:__:__" in
+  let template = "2020-__-__T__:__:__" in
   let template_z = template ^ "Z" in
   let last_time = ref 0 in
   let last_gmt = ref true in
@@ -45,7 +47,7 @@ let fast_to_string =
     let open Unix in
     let t = (if gmt then gmtime else localtime) f in
     let s = Bytes.of_string (if gmt then template_z else template) in
-    replace_year_2019 s (t.tm_year + 1900);
+    replace_year_2020 s t;
     put_2d s 5 (t.tm_mon+1);
     put_2d s 8 t.tm_mday;
     put_2d s 11 t.tm_hour;
@@ -72,45 +74,45 @@ let gmt_string_ms = to_string ~gmt:true ~ms:true
 
 (** YYYY-MM-DD *)
 let format_date_w3 =
-  let template = "2019-__-__" in
+  let template = "2020-__-__" in
   fun t ->
     let open Unix in
     let s = Bytes.of_string template in
-    replace_year_2019 s (t.tm_year + 1900);
+    replace_year_2020 s t;
     put_2d s 5 (t.tm_mon+1);
     put_2d s 8 t.tm_mday;
     Bytes.unsafe_to_string s
 
 (** YYYYMMDD *)
 let format_date8 =
-  let template = "2019____" in
+  let template = "2020____" in
   fun t ->
     let open Unix in
     let s = Bytes.of_string template in
-    replace_year_2019 s (t.tm_year + 1900);
+    replace_year_2020 s t;
     put_2d s 4 (t.tm_mon+1);
     put_2d s 6 t.tm_mday;
     Bytes.unsafe_to_string s
 
 (** YYYYMMDDhh *)
 let format_date8h =
-  let template = "2019______" in
+  let template = "2020______" in
   fun t ->
     let open Unix in
     let s = Bytes.of_string template in
-    replace_year_2019 s (t.tm_year + 1900);
+    replace_year_2020 s t;
     put_2d s 4 (t.tm_mon+1);
     put_2d s 6 t.tm_mday;
     put_2d s 8 t.tm_hour;
     Bytes.unsafe_to_string s
 
 (** YYYYMMDDhhmm *)
 let format_date8hm =
-  let template = "2019________" in
+  let template = "2020________" in
   fun t ->
     let open Unix in
     let s = Bytes.of_string template in
-    replace_year_2019 s (t.tm_year + 1900);
+    replace_year_2020 s t;
     put_2d s 4 (t.tm_mon+1);
     put_2d s 6 t.tm_mday;
     put_2d s 8 t.tm_hour;
@@ -119,11 +121,11 @@ let format_date8hm =
 
 (** YYYYMMDDhhmmss *)
 let format_date8hms =
-  let template = "2019__________" in
+  let template = "2020__________" in
   fun t ->
     let open Unix in
     let s = Bytes.of_string template in
-    replace_year_2019 s (t.tm_year + 1900);
+    replace_year_2020 s t;
     put_2d s 4 (t.tm_mon+1);
     put_2d s 6 t.tm_mday;
     put_2d s 8 t.tm_hour;
@@ -132,12 +134,12 @@ let format_date8hms =
     Bytes.unsafe_to_string s
 
 (** YYYY-MM-DD hh:mm:ss *)
-let format_date8hms =
-  let template = "2019-__-__ __:__:__" in
+let format_basic =
+  let template = "2020-__-__ __:__:__" in
   fun t ->
     let open Unix in
     let s = Bytes.of_string template in
-    replace_year_2019 s (t.tm_year + 1900);
+    replace_year_2020 s t;
     put_2d s 5 (t.tm_mon+1);
     put_2d s 8 t.tm_mday;
     put_2d s 11 t.tm_hour;