Minor fixes

Author: nojb

src/imap/imapCommands.ml

@@ -1122,8 +1122,35 @@ module Namespace = struct
     ImapParser.(register_parser {parse})
 end
 
+(*
+command-auth =/ compress
+
+compress    = "COMPRESS" SP algorithm
+
+capability  =/ "COMPRESS=" algorithm
+              ;; multiple COMPRESS capabilities allowed
+
+algorithm   = "DEFLATE"
+
+resp-text-code =/ "COMPRESSIONACTIVE"
+*)
+
 module Compress = struct
+  type resp_text_code_extension +=
+       RESP_TEXT_CODE_COMPRESSIONACTIVE
+
+  let parse : type a. a extension_kind -> a ImapParser.t = fun kind ->
+    let open ImapParser in
+    match kind with
+      RESP_TEXT_CODE ->
+        str "COMPRESSIONACTIVE" >> ret RESP_TEXT_CODE_COMPRESSIONACTIVE
+    | _ ->
+        fail
+       
   let compress = std_command (send "COMPRESS DEFLATE")
+
+  let _ =
+    ImapParser.(register_parser {parse})
 end
 
 module Idle = struct

src/imap/imapCore.ml

@@ -89,8 +89,6 @@ let resp_text_store s {rsp_code; rsp_text} =
       {s with sel_info = {s.sel_info with sel_uidvalidity = uid}}
   | RESP_TEXT_CODE_UNSEEN unseen ->
       {s with sel_info = {s.sel_info with sel_first_unseen = unseen}}
-  (* | RESP_TEXT_CODE_COMPRESSIONACTIVE -> *)
-      (* {s with rsp_info = {s.rsp_info with rsp_compressionactive = true}} *)
   | RESP_TEXT_CODE_EXTENSION e ->
       extension_data_store s RESP_TEXT_CODE e
   | RESP_TEXT_CODE_OTHER other ->
@@ -157,8 +155,6 @@ let response_data_store s =
       {s with cap_info}
   | RESP_DATA_EXTENSION_DATA e ->
       extension_data_store s RESPONSE_DATA e
-  (* | `NAMESPACE (pers, other, shared) -> *)
-  (*   {s with rsp_info = {s.rsp_info with rsp_namespace = pers, other, shared}} *)
 
 let response_tagged_store s {rsp_cond_state = r} =
   resp_cond_state_store s r

src/imap/imapTypes.mli

@@ -38,7 +38,7 @@ type flag =
   | FLAG_KEYWORD of string
   (** keyword flag *)
   | FLAG_EXTENSION of string
-  (* (\** \extension flag *\) ] with sexp *)
+  (** \extension flag *)
 
 type flag_fetch =
     FLAG_FETCH_RECENT
@@ -214,10 +214,6 @@ type fetch_att =
   | FETCH_ATT_FLAGS
   (** Message flags *)
   | FETCH_ATT_EXTENSION of string
-  (* | `X_GM_MSGID *)
-  (* (\** Gmail message ID. *\) *)
-  (* | `X_GM_THRID *)
-  (* (\** Gmail thread ID. *\) *)
 
 type fetch_type =
     FETCH_TYPE_ALL

src/lwt/imapSession.ml

@@ -56,6 +56,7 @@ module type IndexSet = sig
   val until : elt -> t
   val all : t
   val index : elt -> t
+  val length : t -> int
   val add_range : elt -> elt -> t -> t
   val add : elt -> t -> t
   val remove_range : elt -> elt -> t -> t
@@ -83,6 +84,9 @@ end = struct
   let until l = if cmp l Uint32.zero = 0 then [] else (Uint32.one, l) :: []
   let all = from Uint32.one
   let index n = range n n
+  let length s =
+    let l (l, r) = succ Uint32.(sub r l) |> Uint32.to_int in
+    List.fold_left (fun acc x -> acc + (l x)) 0 s
   let add_range l r s =
     let l, r = if cmp l r <= 0 then l, r else r, l in
     let rec loop l r = function
@@ -1624,7 +1628,7 @@ let idle s ~folder ?(last_known_uid = Uid.zero) () =
     else
       Session.with_folder s folder begin fun ci ->
         lwt () = Conn.run ImapCommands.Idle.idle_start ci in
-        ci.idling <- Some waker;
+        ci.Conn.idling <- Some waker;
         try_lwt
           lwt () = Lwt.pick [ Conn.wait_read ci; Lwt_unix.sleep (29. *. 60.); waiter ] in
           Conn.run ImapCommands.Idle.idle_done ci

src/lwt/imapSession.mli

@@ -29,6 +29,7 @@ module type IndexSet = sig
   val until : elt -> t
   val all : t
   val index : elt -> t
+  val length : t -> int
   val add_range : elt -> elt -> t -> t
   val add : elt -> t -> t
   val remove_range : elt -> elt -> t -> t