commit b21bc78c898fc524aeb88e637e62a8b8fa09436b · ryan.freumh.org/caledonia

+1 -1

README.md

···

       1
       1
        
       # 📅 Caledonia 🏴󠁧󠁢󠁳󠁣󠁴󠁿

     

       2
       2
        
       

     

       3
       3
        
       Caledonia is a command-line calendar client.

     

       4
       4
       -
       Currently, it operates on directories of [`.ics`](https://datatracker.ietf.org/doc/html/rfc5545) files (as managed by tools like [vdirsyncer](https://github.com/pimutils/vdirsyncer)).

     

       4
       4
       +
       Currently, it operates on a [vdir](https://pimutils.org/specs/vdir/) directory of [`.ics`](https://datatracker.ietf.org/doc/html/rfc5545) files (as managed by tools like [vdirsyncer](https://github.com/pimutils/vdirsyncer)).

     

       5
       5
        
       It has the `list`, `search`, `show`, `add`, `delete`, and `edit` subcommands, and supports timezones.

     

       6
       6
        
       See [TODO](./TODO.org) for future plans.

     

       7
       7

TODO.org

···

       2
       2
        
       - [x] add/remove events

     

       3
       3
        
       - [x] edit events

     

       4
       4
        
       - [x] timezones

     

       5
       5
       +
       - [ ] allow editting recurrence-ids

     

       5
       6
        
       - [ ] really stress test the timezone handling -- this is full of gotcha's

     

       6
       7
        
       - [ ] don't load all calendars into memory to show only one event

     

       7
       8
        
       - [ ] support specifying duration

+1 -1

bin/add_cmd.ml

···

       15
       15
        
         let* recurrence =

     

       16
       16
        
           match recur with

     

       17
       17
        
           | Some r ->

     

       18
       18
       -
               let* p = Recur.parse_recurrence r in

     

       18
       18
       +
               let* p = parse_recurrence r in

     

       19
       19
        
               Ok (Some p)

     

       20
       20
        
           | None -> Ok None

     

       21
       21
        
         in

+1 -1

bin/delete_cmd.ml

···

       4
       4
        
       let run ~event_id ~fs calendar_dir =

     

       5
       5
        
         let ( let* ) = Result.bind in

     

       6
       6
        
         let filter = Query.with_id event_id in

     

       7
       7
       -
         let* results = Query.query_events ~fs calendar_dir ~filter () in

     

       7
       7
       +
         let* results = Query.query_without_recurrence ~fs calendar_dir ~filter () in

     

       8
       8
        
         let* event =

     

       9
       9
        
           match results with

     

       10
       10
        
           | [ event ] -> Ok event

+2 -2

bin/edit_cmd.ml

···

       6
       6
        
           ~description ~recur ?timezone ?end_timezone ~fs calendar_dir =

     

       7
       7
        
         let ( let* ) = Result.bind in

     

       8
       8
        
         let filter = Query.with_id event_id in

     

       9
       9
       -
         let* results = Query.query_events ~fs calendar_dir ~filter () in

     

       9
       9
       +
         let* results = Query.query_without_recurrence ~fs calendar_dir ~filter () in

     

       10
       10
        
         let* event =

     

       11
       11
        
           match results with

     

       12
       12
        
           | [ event ] -> Ok event

     
···

       18
       18
        
         let* recurrence =

     

       19
       19
        
           match recur with

     

       20
       20
        
           | Some r ->

     

       21
       21
       -
               let* p = Recur.parse_recurrence r in

     

       21
       21
       +
               let* p = parse_recurrence r in

     

       22
       22
        
               Ok (Some p)

     

       23
       23
        
           | None -> Ok None

     

       24
       24
        
         in

+133

bin/event_args.ml

···

       212
       212
        
                          (`Dtend

     

       213
       213
        
                             ( Icalendar.Params.empty,

     

       214
       214
        
                               `Datetime (`With_tzid (datetime, (false, tzid))) )))))

     

       215
       215
       +
       

     

       216
       216
       +
       let combine_results (results : ('a, 'b) result list) : ('a list, 'b) result =

     

       217
       217
       +
         let rec aux acc = function

     

       218
       218
       +
           | [] -> Ok (List.rev acc)

     

       219
       219
       +
           | Ok v :: rest -> aux (v :: acc) rest

     

       220
       220
       +
           | Error e :: _ -> Error e

     

       221
       221
       +
         in

     

       222
       222
       +
         aux [] results

     

       223
       223
       +
       

     

       224
       224
       +
       let parse_recurrence recur =

     

       225
       225
       +
         let ( let* ) = Result.bind in

     

       226
       226
       +
         let parts = String.split_on_char ';' recur in

     

       227
       227
       +
         let freq = ref None in

     

       228
       228
       +
         let count = ref None in

     

       229
       229
       +
         let until = ref None in

     

       230
       230
       +
         let interval = ref None in

     

       231
       231
       +
         let by_parts = ref [] in

     

       232
       232
       +
         let results =

     

       233
       233
       +
           List.map

     

       234
       234
       +
             (fun part ->

     

       235
       235
       +
               let kv = String.split_on_char '=' part in

     

       236
       236
       +
               match kv with

     

       237
       237
       +
               | [ "FREQ"; value ] -> (

     

       238
       238
       +
                   match String.uppercase_ascii value with

     

       239
       239
       +
                   | "DAILY" ->

     

       240
       240
       +
                       freq := Some `Daily;

     

       241
       241
       +
                       Ok ()

     

       242
       242
       +
                   | "WEEKLY" ->

     

       243
       243
       +
                       freq := Some `Weekly;

     

       244
       244
       +
                       Ok ()

     

       245
       245
       +
                   | "MONTHLY" ->

     

       246
       246
       +
                       freq := Some `Monthly;

     

       247
       247
       +
                       Ok ()

     

       248
       248
       +
                   | "YEARLY" ->

     

       249
       249
       +
                       freq := Some `Yearly;

     

       250
       250
       +
                       Ok ()

     

       251
       251
       +
                   | _ -> Error (`Msg ("Unsupported frequency: " ^ value)))

     

       252
       252
       +
               | [ "COUNT"; value ] ->

     

       253
       253
       +
                   if !until <> None then

     

       254
       254
       +
                     Error (`Msg "Cannot use both COUNT and UNTIL in the same rule")

     

       255
       255
       +
                   else (

     

       256
       256
       +
                     count := Some (`Count (int_of_string value));

     

       257
       257
       +
                     Ok ())

     

       258
       258
       +
               | [ "UNTIL"; value ] -> (

     

       259
       259
       +
                   if !count <> None then

     

       260
       260
       +
                     Error (`Msg "Cannot use both COUNT and UNTIL in the same rule")

     

       261
       261
       +
                   else

     

       262
       262
       +
                     let* v =

     

       263
       263
       +
                       match Icalendar.parse_datetime value with

     

       264
       264
       +
                       | Ok v -> Ok v

     

       265
       265
       +
                       | Error e -> Error (`Msg e)

     

       266
       266
       +
                     in

     

       267
       267
       +
                     match v with

     

       268
       268
       +
                     | `With_tzid _ -> Error (`Msg "Until can't be in a timezone")

     

       269
       269
       +
                     | `Utc u ->

     

       270
       270
       +
                         until := Some (`Until (`Utc u));

     

       271
       271
       +
                         Ok ()

     

       272
       272
       +
                     | `Local l ->

     

       273
       273
       +
                         until := Some (`Until (`Local l));

     

       274
       274
       +
                         Ok ())

     

       275
       275
       +
               | [ "INTERVAL"; value ] ->

     

       276
       276
       +
                   interval := Some (int_of_string value);

     

       277
       277
       +
                   Ok ()

     

       278
       278
       +
               | [ "BYDAY"; value ] ->

     

       279
       279
       +
                   (* Parse day specifications like MO,WE,FR or 1MO,-1FR *)

     

       280
       280
       +
                   let days = String.split_on_char ',' value in

     

       281
       281
       +
                   let parse_day day =

     

       282
       282
       +
                     (* Extract ordinal if present (like 1MO or -1FR) *)

     

       283
       283
       +
                     let ordinal, day_code =

     

       284
       284
       +
                       if

     

       285
       285
       +
                         String.length day >= 3

     

       286
       286
       +
                         && (String.get day 0 = '+'

     

       287
       287
       +
                            || String.get day 0 = '-'

     

       288
       288
       +
                            || (String.get day 0 >= '0' && String.get day 0 <= '9'))

     

       289
       289
       +
                       then (

     

       290
       290
       +
                         let idx = ref 0 in

     

       291
       291
       +
                         while

     

       292
       292
       +
                           !idx < String.length day

     

       293
       293
       +
                           && (String.get day !idx = '+'

     

       294
       294
       +
                              || String.get day !idx = '-'

     

       295
       295
       +
                              || String.get day !idx >= '0'

     

       296
       296
       +
                                 && String.get day !idx <= '9')

     

       297
       297
       +
                         do

     

       298
       298
       +
                           incr idx

     

       299
       299
       +
                         done;

     

       300
       300
       +
                         let ord_str = String.sub day 0 !idx in

     

       301
       301
       +
                         let day_str =

     

       302
       302
       +
                           String.sub day !idx (String.length day - !idx)

     

       303
       303
       +
                         in

     

       304
       304
       +
                         (int_of_string ord_str, day_str))

     

       305
       305
       +
                       else (0, day)

     

       306
       306
       +
                     in

     

       307
       307
       +
                     let* weekday =

     

       308
       308
       +
                       match day_code with

     

       309
       309
       +
                       | "MO" -> Ok `Monday

     

       310
       310
       +
                       | "TU" -> Ok `Tuesday

     

       311
       311
       +
                       | "WE" -> Ok `Wednesday

     

       312
       312
       +
                       | "TH" -> Ok `Thursday

     

       313
       313
       +
                       | "FR" -> Ok `Friday

     

       314
       314
       +
                       | "SA" -> Ok `Saturday

     

       315
       315
       +
                       | "SU" -> Ok `Sunday

     

       316
       316
       +
                       | _ -> Error (`Msg ("Invalid weekday: " ^ day_code))

     

       317
       317
       +
                     in

     

       318
       318
       +
                     Ok (ordinal, weekday)

     

       319
       319
       +
                   in

     

       320
       320
       +
                   let* day_specs = combine_results (List.map parse_day days) in

     

       321
       321
       +
                   by_parts := `Byday day_specs :: !by_parts;

     

       322
       322
       +
                   Ok ()

     

       323
       323
       +
               | [ "BYMONTHDAY"; value ] ->

     

       324
       324
       +
                   let days = String.split_on_char ',' value in

     

       325
       325
       +
                   let month_days = List.map int_of_string days in

     

       326
       326
       +
                   by_parts := `Bymonthday month_days :: !by_parts;

     

       327
       327
       +
                   Ok ()

     

       328
       328
       +
               | [ "BYMONTH"; value ] ->

     

       329
       329
       +
                   let months = String.split_on_char ',' value in

     

       330
       330
       +
                   let month_nums = List.map int_of_string months in

     

       331
       331
       +
                   by_parts := `Bymonth month_nums :: !by_parts;

     

       332
       332
       +
                   Ok ()

     

       333
       333
       +
               | _ -> Ok ())

     

       334
       334
       +
             parts

     

       335
       335
       +
         in

     

       336
       336
       +
         let* _ = combine_results results in

     

       337
       337
       +
         match !freq with

     

       338
       338
       +
         | Some f ->

     

       339
       339
       +
             let limit =

     

       340
       340
       +
               match (!count, !until) with

     

       341
       341
       +
               | Some c, None -> Some c

     

       342
       342
       +
               | None, Some u -> Some u

     

       343
       343
       +
               | _ -> None

     

       344
       344
       +
             in

     

       345
       345
       +
             let recurrence = (f, limit, !interval, !by_parts) in

     

       346
       346
       +
             Ok recurrence

     

       347
       347
       +
         | None -> Error (`Msg "FREQ is required in recurrence rule")

+2 -3

bin/list_cmd.ml

···

       55
       55
        
               Some (Query.in_collections [ Collection.Col collection_id ])

     

       56
       56
        
           | None -> None

     

       57
       57
        
         in

     

       58
       58
       -
         let comparator = Query_args.create_instance_comparator sort in

     

       58
       58
       +
         let comparator = Query_args.create_event_comparator sort in

     

       59
       59
        
         let* results =

     

       60
       60
        
           Query.query ~fs calendar_dir ?filter ~from ~to_ ~comparator ?limit:count ()

     

       61
       61
        
         in

     

       62
       62
        
         if results = [] then print_endline "No events found."

     

       63
       63
        
         else

     

       64
       64
       -
           print_endline

     

       65
       65
       -
             (Format.format_instances ~fs ~calendar_dir ~format ~tz results);

     

       64
       64
       +
           print_endline (Format.format_events ~fs ~calendar_dir ~format ~tz results);

     

       66
       65
        
         Ok ()

     

       67
       66
        
       

     

       68
       67
        
       let cmd ~fs calendar_dir =

+22 -24

bin/query_args.ml

···

       136
       136
        
           & opt_all sort_converter [ default_sort ]

     

       137
       137
        
           & info [ "sort"; "S" ] ~docv:"SORT" ~doc)

     

       138
       138
        
       

     

       139
       139
       -
       (* Convert sort specs to an instance comparator *)

     

       140
       140
       -
       let create_instance_comparator sort_specs =

     

       139
       139
       +
       (* Convert sort specs to an event comparator *)

     

       140
       140
       +
       let create_event_comparator sort_specs =

     

       141
       141
        
         match sort_specs with

     

       142
       142
       -
         | [] -> Recur.Instance.by_start

     

       142
       142
       +
         | [] -> Event.by_start

     

       143
       143
        
         | [ spec ] ->

     

       144
       144
        
             let comp =

     

       145
       145
        
               match spec.field with

     

       146
       146
       -
               | `Start -> Recur.Instance.by_start

     

       147
       147
       -
               | `End -> Recur.Instance.by_end

     

       148
       148
       -
               | `Summary -> Recur.Instance.by_event Event.by_summary

     

       149
       149
       -
               | `Location -> Recur.Instance.by_event Event.by_location

     

       150
       150
       -
               | `Calendar -> Recur.Instance.by_event Event.by_collection

     

       146
       146
       +
               | `Start -> Event.by_start

     

       147
       147
       +
               | `End -> Event.by_end

     

       148
       148
       +
               | `Summary -> Event.by_summary

     

       149
       149
       +
               | `Location -> Event.by_location

     

       150
       150
       +
               | `Calendar -> Event.by_collection

     

       151
       151
        
             in

     

       152
       152
       -
             if spec.descending then Recur.Instance.descending comp else comp

     

       152
       152
       +
             if spec.descending then Event.descending comp else comp

     

       153
       153
        
         | specs ->

     

       154
       154
        
             (* Chain multiple sort specs together *)

     

       155
       155
        
             List.fold_right

     

       156
       156
        
               (fun spec acc ->

     

       157
       157
        
                 let comp =

     

       158
       158
        
                   match spec.field with

     

       159
       159
       -
                   | `Start -> Recur.Instance.by_start

     

       160
       160
       -
                   | `End -> Recur.Instance.by_end

     

       161
       161
       -
                   | `Summary -> Recur.Instance.by_event Event.by_summary

     

       162
       162
       -
                   | `Location -> Recur.Instance.by_event Event.by_location

     

       163
       163
       -
                   | `Calendar -> Recur.Instance.by_event Event.by_collection

     

       164
       164
       -
                 in

     

       165
       165
       -
                 let comp =

     

       166
       166
       -
                   if spec.descending then Recur.Instance.descending comp else comp

     

       159
       159
       +
                   | `Start -> Event.by_start

     

       160
       160
       +
                   | `End -> Event.by_end

     

       161
       161
       +
                   | `Summary -> Event.by_summary

     

       162
       162
       +
                   | `Location -> Event.by_location

     

       163
       163
       +
                   | `Calendar -> Event.by_collection

     

       167
       164
        
                 in

     

       168
       168
       -
                 Recur.Instance.chain comp acc)

     

       165
       165
       +
                 let comp = if spec.descending then Event.descending comp else comp in

     

       166
       166
       +
                 Event.chain comp acc)

     

       169
       167
        
               (List.tl specs)

     

       170
       168
        
               (let spec = List.hd specs in

     

       171
       169
        
                let comp =

     

       172
       170
        
                  match spec.field with

     

       173
       173
       -
                  | `Start -> Recur.Instance.by_start

     

       174
       174
       -
                  | `End -> Recur.Instance.by_end

     

       175
       175
       -
                  | `Summary -> Recur.Instance.by_event Event.by_summary

     

       176
       176
       -
                  | `Location -> Recur.Instance.by_event Event.by_location

     

       177
       177
       -
                  | `Calendar -> Recur.Instance.by_event Event.by_collection

     

       171
       171
       +
                  | `Start -> Event.by_start

     

       172
       172
       +
                  | `End -> Event.by_end

     

       173
       173
       +
                  | `Summary -> Event.by_summary

     

       174
       174
       +
                  | `Location -> Event.by_location

     

       175
       175
       +
                  | `Calendar -> Event.by_collection

     

       178
       176
        
                in

     

       179
       179
       -
                if spec.descending then Recur.Instance.descending comp else comp)

     

       177
       177
       +
                if spec.descending then Event.descending comp else comp)

     

       180
       178
        
       

     

       181
       179
        
       let date_format_manpage_entries =

     

       182
       180
        
         [

+2 -3

bin/search_cmd.ml

···

       68
       68
        
         if recurring then filters := Query.recurring_only () :: !filters;

     

       69
       69
        
         if non_recurring then filters := Query.non_recurring_only () :: !filters;

     

       70
       70
        
         let filter = Query.and_filter !filters in

     

       71
       71
       -
         let comparator = Query_args.create_instance_comparator sort in

     

       71
       71
       +
         let comparator = Query_args.create_event_comparator sort in

     

       72
       72
        
         let* results =

     

       73
       73
        
           Query.query ~fs calendar_dir ~filter ~from ~to_ ~comparator ?limit:count ()

     

       74
       74
        
         in

     

       75
       75
        
         if results = [] then print_endline "No events found."

     

       76
       76
        
         else

     

       77
       77
       -
           print_endline

     

       78
       78
       -
             (Format.format_instances ~tz ~fs ~calendar_dir ~format results);

     

       77
       77
       +
           print_endline (Format.format_events ~tz ~fs ~calendar_dir ~format results);

     

       79
       78
        
         Ok ()

     

       80
       79
        
       

     

       81
       80
        
       let query_text_arg =

+1 -1

bin/show_cmd.ml

···

       4
       4
        
       let run ~event_id ~format ~fs calendar_dir =

     

       5
       5
        
         let ( let* ) = Result.bind in

     

       6
       6
        
         let filter = Query.with_id event_id in

     

       7
       7
       -
         let* results = Query.query_events ~fs calendar_dir ~filter () in

     

       7
       7
       +
         let* results = Query.query_without_recurrence ~fs calendar_dir ~filter () in

     

       8
       8
        
         if results = [] then print_endline "No events found."

     

       9
       9
        
         else print_endline (Format.format_events ~fs ~calendar_dir ~format results);

     

       10
       10
        
         Ok ()

+2 -2

caledonia.opam

···

       29
       29
        
         "alcotest" {>= "1.8.0" & with-test}

     

       30
       30
        
       ]

     

       31
       31
        
       pin-depends: [

     

       32
       32
       -
         # https://github.com/robur-coop/icalendar/pull/17

     

       33
       33
       -
         ["icalendar.dev" "git+https://github.com/robur-coop/icalendar#70006afc8cf05963f5187966aae18d40e532d4b5"]

     

       32
       32
       +
         # https://github.com/robur-coop/icalendar/pull/13

     

       33
       33
       +
         ["icalendar.dev" "git+https://github.com/robur-coop/icalendar#1ab8d3970295bc96dc651c53b25c7c9963a27f81"]

     

       34
       34
        
       ]

+11 -36

lib/calendar_dir.ml

···

       54
       54
        
               let content = Eio.Path.load file in

     

       55
       55
        
               match parse content with

     

       56
       56
        
               | Ok calendar ->

     

       57
       57
       -
                   let events =

     

       58
       58
       -
                     List.filter_map

     

       59
       59
       -
                       (function

     

       60
       60
       -
                         | `Event e ->

     

       61
       61
       -
                             Some (Event.of_icalendar collection ~file_name e)

     

       62
       62
       -
                         | _ -> None)

     

       63
       63
       -
                       (snd calendar)

     

       64
       64
       -
                   in

     

       65
       65
       -
                   events

     

       57
       57
       +
                   Event.events_of_icalendar ~file_name collection calendar

     

       66
       58
        
               | Error err ->

     

       67
       59
        
                   Printf.eprintf "Failed to parse %s: %s\n%!" file_path err;

     

       68
       60
        
                   []

     
···

       91
       83
        
                   (`Msg

     

       92
       84
        
                      (Printf.sprintf "Exception processing directory %s: %s"

     

       93
       85
        
                         (snd collection_path) (Printexc.to_string e))))

     

       86
       86
       +
         

     

       87
       87
       +
       let ( let* ) = Result.bind

     

       94
       88
        
       

     

       95
       95
       -
       let get_collections ~fs calendar_dir =

     

       89
       89
       +
       let get_events ~fs calendar_dir =

     

       96
       90
        
         match list_collections ~fs calendar_dir with

     

       97
       91
        
         | Error e -> Error e

     

       98
       92
        
         | Ok ids -> (

     
···

       101
       95
        
                 | [] -> Ok (List.rev acc)

     

       102
       96
        
                 | id :: rest -> (

     

       103
       97
        
                     match get_collection ~fs calendar_dir id with

     

       104
       104
       -
                     | Ok cal -> process_ids ((id, cal) :: acc) rest

     

       98
       98
       +
                     | Ok cal -> process_ids (cal :: acc) rest

     

       105
       99
        
                     | Error `Not_found -> process_ids acc rest

     

       106
       100
        
                     | Error (`Msg e) -> Error (`Msg e))

     

       107
       101
        
               in

     

       108
       108
       -
               process_ids [] ids

     

       102
       102
       +
               let* collections = process_ids [] ids in

     

       103
       103
       +
               Ok (List.flatten collections)

     

       109
       104
        
             with exn ->

     

       110
       105
        
               Error

     

       111
       106
        
                 (`Msg

     

       112
       107
        
                    (Printf.sprintf "Error getting collections: %s"

     

       113
       108
        
                       (Printexc.to_string exn))))

     

       114
       114
       -
       

     

       115
       115
       -
       let default_prodid = `Prodid (Params.empty, "-//Freumh//Caledonia//EN")

     

       116
       109
        
       

     

       117
       110
        
       let add_event ~fs calendar_dir event =

     

       118
       111
        
         let collection = Event.get_collection event in

     

       119
       112
        
         let file_path =

     

       120
       113
        
           Event.get_file_path ~fs ~calendar_dir_path:calendar_dir.path event

     

       121
       114
        
         in

     

       122
       122
       -
         let ical_event = Event.to_icalendar event in

     

       123
       115
        
         let collection_path = get_collection_path ~fs calendar_dir collection in

     

       124
       124
       -
         let ( let* ) = Result.bind in

     

       125
       116
        
         let* () = ensure_dir collection_path in

     

       126
       126
       -
         let calendar =

     

       127
       127
       -
           let props = [ default_prodid ] in

     

       128
       128
       -
           let components = [ `Event ical_event ] in

     

       129
       129
       -
           (props, components)

     

       130
       130
       -
         in

     

       117
       117
       +
         let calendar = Event.to_ical_calendar event in

     

       131
       118
        
         let content = Icalendar.to_ics ~cr:true calendar in

     

       132
       119
        
         let* _ =

     

       133
       120
        
           try

     
···

       149
       136
        
             calendar_dir.collections;

     

       150
       137
        
         Ok ()

     

       151
       138
        
       

     

       152
       152
       -
       let load_calendar path =

     

       153
       153
       -
         try

     

       154
       154
       -
           let file_content = Eio.Path.load path in

     

       155
       155
       -
           match Icalendar.parse file_content with

     

       156
       156
       -
           | Ok calendar -> Ok calendar

     

       157
       157
       -
           | Error msg -> Error (`Msg msg)

     

       158
       158
       -
         with Eio.Exn.Io _ as exn ->

     

       159
       159
       -
           Error

     

       160
       160
       -
             (`Msg (Fmt.str "Failed to read file %s: %a\n%!" (snd path) Eio.Exn.pp exn))

     

       161
       161
       -
       

     

       162
       139
        
       let edit_event ~fs calendar_dir event =

     

       163
       140
        
         let collection = Event.get_collection event in

     

       164
       141
        
         let event_id = Event.get_id event in

     

       165
       142
        
         let collection_path = get_collection_path ~fs calendar_dir collection in

     

       166
       166
       -
         let ( let* ) = Result.bind in

     

       167
       143
        
         let* () = ensure_dir collection_path in

     

       168
       168
       -
         let ical_event = Event.to_icalendar event in

     

       144
       144
       +
         let ical_event = Event.to_ical_event event in

     

       169
       145
        
         let file_path =

     

       170
       146
        
           Event.get_file_path ~fs ~calendar_dir_path:calendar_dir.path event

     

       171
       147
        
         in

     

       172
       172
       -
         let* existing_props, existing_components = load_calendar file_path in

     

       148
       148
       +
         let existing_props, existing_components = Event.to_ical_calendar event in

     

       173
       149
        
         let calendar =

     

       174
       150
        
           (* Replace the event with our updated version *)

     

       175
       151
        
           let filtered_components =

     
···

       210
       186
        
         let collection = Event.get_collection event in

     

       211
       187
        
         let event_id = Event.get_id event in

     

       212
       188
        
         let collection_path = get_collection_path ~fs calendar_dir collection in

     

       213
       213
       -
         let ( let* ) = Result.bind in

     

       214
       189
        
         let* () = ensure_dir collection_path in

     

       215
       190
        
         let file_path =

     

       216
       191
        
           Event.get_file_path ~fs ~calendar_dir_path:calendar_dir.path event

     

       217
       192
        
         in

     

       218
       218
       -
         let* existing_props, existing_components = load_calendar file_path in

     

       193
       193
       +
         let existing_props, existing_components = Event.to_ical_calendar event in

     

       219
       194
        
         let other_events = ref false in

     

       220
       195
        
         let calendar =

     

       221
       196
        
           (* Replace the event with our updated version *)

+3 -3

lib/calendar_dir.mli

···

       27
       27
        
       (** Get all calendar files in a Collection.t. If the collection doesn't exist in

     

       28
       28
        
           the cache, it will be loaded from disk. *)

     

       29
       29
        
       

     

       30
       30
       -
       val get_collections :

     

       30
       30
       +
       val get_events :

     

       31
       31
        
         fs:[> Eio.Fs.dir_ty ] Eio.Path.t ->

     

       32
       32
        
         t ->

     

       33
       33
       -
         ((Collection.t * Event.t list) list, [> `Msg of string ]) result

     

       34
       34
       -
       (** Get all Collection.ts with their calendar files. This will load any

     

       33
       33
       +
         (Event.t list, [> `Msg of string ]) result

     

       34
       34
       +
       (** Get all events in all collections. This will load any

     

       35
       35
        
           Collection.ts that haven't been loaded yet. *)

     

       36
       36
        
       

     

       37
       37
        
       val add_event :

+111 -44

lib/event.ml

···

       1
       1
        
       open Icalendar

     

       2
       2
        
       

     

       3
       3
        
       type event_id = string

     

       4
       4
       -
       type t = { collection : Collection.t; file_name : string; ical : event }

     

       4
       4
       +
       

     

       5
       5
       +
       type t = {

     

       6
       6
       +
         collection : Collection.t;

     

       7
       7
       +
         file_name : string;

     

       8
       8
       +
         event : event;

     

       9
       9
       +
         calendar : calendar;

     

       10
       10
       +
       }

     

       11
       11
       +
       

     

       5
       12
        
       type date_error = [ `Msg of string ]

     

       6
       13
        
       

     

       7
       14
        
       let generate_uuid () =

     

       8
       15
        
         let uuid = Uuidm.v4_gen (Random.State.make_self_init ()) () in

     

       9
       16
        
         Uuidm.to_string uuid

     

       10
       17
        
       

     

       18
       18
       +
       let default_prodid = `Prodid (Params.empty, "-//Freumh//Caledonia//EN")

     

       19
       19
       +
       

     

       11
       20
        
       let create ~summary ~start ?end_ ?location ?description ?recurrence collection =

     

       12
       21
        
         let uuid = generate_uuid () in

     

       13
       22
        
         let uid = (Params.empty, uuid) in

     
···

       27
       36
        
           | Some desc -> `Description (Params.empty, desc) :: props

     

       28
       37
        
           | None -> props

     

       29
       38
        
         in

     

       30
       30
       -
         let ical =

     

       39
       39
       +
         let event =

     

       31
       40
        
           {

     

       32
       41
        
             dtstamp = (Params.empty, now);

     

       33
       42
        
             uid;

     
···

       38
       47
        
             alarms = [];

     

       39
       48
        
           }

     

       40
       49
        
         in

     

       41
       41
       -
         { collection; file_name; ical }

     

       50
       50
       +
         let calendar =

     

       51
       51
       +
           let props = [ default_prodid ] in

     

       52
       52
       +
           let components = [ `Event event ] in

     

       53
       53
       +
           (props, components)

     

       54
       54
       +
         in

     

       55
       55
       +
         { collection; file_name; event; calendar }

     

       42
       56
        
       

     

       43
       57
        
       let edit ?summary ?start ?end_ ?location ?description ?recurrence t =

     

       44
       58
        
         let now = Ptime_clock.now () in

     

       45
       45
       -
         let uid = t.ical.uid in

     

       59
       59
       +
         let uid = t.event.uid in

     

       46
       60
        
         let dtstart =

     

       47
       47
       -
           match start with None -> t.ical.dtstart | Some s -> (Params.empty, s)

     

       61
       61
       +
           match start with None -> t.event.dtstart | Some s -> (Params.empty, s)

     

       48
       62
        
         in

     

       49
       63
        
         let dtend_or_duration =

     

       50
       50
       -
           match end_ with None -> t.ical.dtend_or_duration | Some _ -> end_

     

       64
       64
       +
           match end_ with None -> t.event.dtend_or_duration | Some _ -> end_

     

       51
       65
        
         in

     

       52
       66
        
         let rrule =

     

       53
       67
        
           match recurrence with

     

       54
       54
       -
           | None -> t.ical.rrule

     

       68
       68
       +
           | None -> t.event.rrule

     

       55
       69
        
           | Some r -> Some (Params.empty, r)

     

       56
       70
        
         in

     

       57
       71
        
         let props =

     
···

       62
       76
        
               | `Description _ -> (

     

       63
       77
        
                   match description with None -> true | Some _ -> false)

     

       64
       78
        
               | _ -> true)

     

       65
       65
       -
             t.ical.props

     

       79
       79
       +
             t.event.props

     

       66
       80
        
         in

     

       67
       81
        
         let props =

     

       68
       82
        
           match summary with

     
···

       79
       93
        
           | Some desc -> `Description (Params.empty, desc) :: props

     

       80
       94
        
           | None -> props

     

       81
       95
        
         in

     

       82
       82
       -
         let alarms = t.ical.alarms in

     

       83
       83
       -
         let ical =

     

       96
       96
       +
         let alarms = t.event.alarms in

     

       97
       97
       +
         let event =

     

       84
       98
        
           {

     

       85
       99
        
             dtstamp = (Params.empty, now);

     

       86
       100
        
             uid;

     
···

       93
       107
        
         in

     

       94
       108
        
         let collection = t.collection in

     

       95
       109
        
         let file_name = t.file_name in

     

       96
       96
       -
         { collection; file_name; ical }

     

       97
       97
       -
       

     

       98
       98
       -
       let of_icalendar collection ~file_name (ical : event) =

     

       99
       99
       -
         { collection; file_name; ical }

     

       110
       110
       +
         let calendar = t.calendar in

     

       111
       111
       +
         { collection; file_name; event; calendar }

     

       100
       112
        
       

     

       101
       101
       -
       let to_icalendar t =

     

       102
       102
       -
         let now = Ptime_clock.now () in

     

       103
       103
       -
         let uid = t.ical.uid in

     

       104
       104
       -
         let dtstart = t.ical.dtstart in

     

       105
       105
       -
         let dtend_or_duration = t.ical.dtend_or_duration in

     

       106
       106
       -
         let rrule = t.ical.rrule in

     

       107
       107
       -
         let props = t.ical.props in

     

       108
       108
       -
         let alarms = t.ical.alarms in

     

       109
       109
       -
         {

     

       110
       110
       -
           dtstamp = (Params.empty, now);

     

       111
       111
       -
           uid;

     

       112
       112
       -
           dtstart;

     

       113
       113
       -
           dtend_or_duration;

     

       114
       114
       -
           rrule;

     

       115
       115
       -
           props;

     

       116
       116
       -
           alarms;

     

       117
       117
       -
         }

     

       113
       113
       +
       let events_of_icalendar collection ~file_name calendar =

     

       114
       114
       +
         List.filter_map

     

       115
       115
       +
           (function

     

       116
       116
       +
             | `Event event -> Some { collection; file_name; event; calendar }

     

       117
       117
       +
             | _ -> None)

     

       118
       118
       +
           (snd calendar)

     

       118
       119
        
       

     

       119
       119
       -
       let get_id t = snd t.ical.uid

     

       120
       120
       +
       let to_ical_event t = t.event

     

       121
       121
       +
       let to_ical_calendar t = t.calendar

     

       122
       122
       +
       let get_id t = snd t.event.uid

     

       120
       123
        
       

     

       121
       124
        
       let get_summary t =

     

       122
       125
        
         match

     

       123
       126
        
           List.filter_map

     

       124
       127
        
             (function `Summary (_, s) when s <> "" -> Some s | _ -> None)

     

       125
       125
       -
             t.ical.props

     

       128
       128
       +
             t.event.props

     

       126
       129
        
         with

     

       127
       130
        
         | s :: _ -> Some s

     

       128
       131
        
         | _ -> None

     

       129
       132
        
       

     

       130
       130
       -
       let get_start t = Date.ptime_of_ical (snd t.ical.dtstart)

     

       133
       133
       +
       let get_ical_start event =

     

       134
       134
       +
         Date.ptime_of_ical (snd event.dtstart)

     

       135
       135
       +
       

     

       136
       136
       +
       let get_start t = get_ical_start t.event

     

       131
       137
        
       

     

       132
       132
       -
       let get_end t =

     

       133
       133
       -
         match t.ical.dtend_or_duration with

     

       138
       138
       +
       let get_ical_end event =

     

       139
       139
       +
         match event.dtend_or_duration with

     

       134
       140
        
         | Some (`Dtend (_, d)) -> Some (Date.ptime_of_ical d)

     

       135
       141
        
         | Some (`Duration (_, span)) -> (

     

       136
       136
       -
             let start = get_start t in

     

       142
       142
       +
             let start = get_ical_start event in

     

       137
       143
        
             match Ptime.add_span start span with

     

       138
       144
        
             | Some t -> Some t

     

       139
       145
        
             | None ->

     
···

       143
       149
        
                      (Printf.sprintf "%.2fs" (Ptime.Span.to_float_s span))))

     

       144
       150
        
         | None -> None

     

       145
       151
        
       

     

       152
       152
       +
       let get_end t = get_ical_end t.event

     

       153
       153
       +
       

     

       146
       154
        
       let get_start_timezone t =

     

       147
       147
       -
         match t.ical.dtstart with

     

       155
       155
       +
         match t.event.dtstart with

     

       148
       156
        
         | _, `Datetime (`With_tzid (_, (_, tzid))) -> Some tzid

     

       149
       157
        
         | _ -> None

     

       150
       158
        
       

     

       151
       159
        
       let get_end_timezone t =

     

       152
       152
       -
         match t.ical.dtend_or_duration with

     

       160
       160
       +
         match t.event.dtend_or_duration with

     

       153
       161
        
         | Some (`Dtend (_, `Datetime (`With_tzid (_, (_, tzid))))) -> Some tzid

     

       154
       162
        
         | _ -> None

     

       155
       163
        
       

     

       156
       164
        
       let get_duration t =

     

       157
       157
       -
         match t.ical.dtend_or_duration with

     

       165
       165
       +
         match t.event.dtend_or_duration with

     

       158
       166
        
         | Some (`Duration (_, span)) -> Some span

     

       159
       167
        
         | Some (`Dtend (_, e)) ->

     

       160
       168
        
             let span = Ptime.diff (Date.ptime_of_ical e) (get_start t) in

     
···

       162
       170
        
         | None -> None

     

       163
       171
        
       

     

       164
       172
        
       let is_date t =

     

       165
       165
       -
         match (t.ical.dtstart, t.ical.dtend_or_duration) with

     

       173
       173
       +
         match (t.event.dtstart, t.event.dtend_or_duration) with

     

       166
       174
        
         | (_, `Date _), _ -> true

     

       167
       175
        
         | _, Some (`Dtend (_, `Date _)) -> true

     

       168
       176
        
         | _ -> false

     
···

       171
       179
        
         match

     

       172
       180
        
           List.filter_map

     

       173
       181
        
             (function `Location (_, s) when s <> "" -> Some s | _ -> None)

     

       174
       174
       -
             t.ical.props

     

       182
       182
       +
             t.event.props

     

       175
       183
        
         with

     

       176
       184
        
         | s :: _ -> Some s

     

       177
       185
        
         | _ -> None

     
···

       180
       188
        
         match

     

       181
       189
        
           List.filter_map

     

       182
       190
        
             (function `Description (_, s) when s <> "" -> Some s | _ -> None)

     

       183
       183
       -
             t.ical.props

     

       191
       191
       +
             t.event.props

     

       184
       192
        
         with

     

       185
       193
        
         | s :: _ -> Some s

     

       186
       194
        
         | _ -> None

     

       187
       195
        
       

     

       188
       188
       -
       let get_recurrence t = Option.map (fun r -> snd r) t.ical.rrule

     

       196
       196
       +
       let get_recurrence t = Option.map (fun r -> snd r) t.event.rrule

     

       189
       197
        
       let get_collection t = t.collection

     

       190
       198
        
       

     

       191
       199
        
       let get_file_path ~fs ~calendar_dir_path t =

     
···

       194
       202
        
           / (match t.collection with Col s -> s)

     

       195
       203
        
           / t.file_name)

     

       196
       204
        
       

     

       205
       205
       +
       let get_recurrence_ids t =

     

       206
       206
       +
         let _, recurrence_ids =

     

       207
       207
       +
           match

     

       208
       208
       +
             List.partition (function `Event _ -> true | _ -> false) (snd t.calendar)

     

       209
       209
       +
           with

     

       210
       210
       +
           | `Event hd :: tl, _ ->

     

       211
       211
       +
               (hd, List.map (function `Event e -> e | _ -> assert false) tl)

     

       212
       212
       +
           | _ -> assert false

     

       213
       213
       +
         in

     

       214
       214
       +
         recurrence_ids

     

       215
       215
       +
       

     

       197
       216
        
       type comparator = t -> t -> int

     

       198
       217
        
       

     

       199
       218
        
       let by_start e1 e2 =

     
···

       231
       250
        
       let chain comp1 comp2 e1 e2 =

     

       232
       251
        
         let result = comp1 e1 e2 in

     

       233
       252
        
         if result <> 0 then result else comp2 e1 e2

     

       253
       253
       +
       

     

       254
       254
       +
       let clone_with_event t event =

     

       255
       255
       +
         let collection = t.collection in

     

       256
       256
       +
         let file_name = t.file_name in

     

       257
       257
       +
         let calendar = t.calendar in

     

       258
       258
       +
         { collection; file_name; event; calendar }

     

       259
       259
       +
       

     

       260
       260
       +
       let expand_recurrences ~from ~to_ event =

     

       261
       261
       +
         let rule = get_recurrence event in

     

       262
       262
       +
         match rule with

     

       263
       263
       +
         (* If there's no recurrence we just return the original event. *)

     

       264
       264
       +
         | None ->

     

       265
       265
       +
             (* Include the original event instance only if it falls within the query range. *)

     

       266
       266
       +
             let start = get_start event in

     

       267
       267
       +
             let end_ = match get_end event with None -> start | Some e -> e in

     

       268
       268
       +
             if

     

       269
       269
       +
               Ptime.compare start to_ < 0

     

       270
       270
       +
               &&

     

       271
       271
       +
               (* end_ > f, meaning we don't include events that end at the exact start of our range.

     

       272
       272
       +
                  This is handy to exclude date events that end at 00:00 the next day. *)

     

       273
       273
       +
               match from with Some f -> Ptime.compare end_ f > 0 | None -> true

     

       274
       274
       +
             then [ event ]

     

       275
       275
       +
             else []

     

       276
       276
       +
         | Some _ ->

     

       277
       277
       +
             let rec collect generator acc =

     

       278
       278
       +
               match generator () with

     

       279
       279
       +
               | None -> List.rev acc

     

       280
       280
       +
               | Some recur ->

     

       281
       281
       +
                   let start = get_ical_start recur in

     

       282
       282
       +
                   let end_ = match get_ical_end recur with None -> start | Some e -> e in

     

       283
       283
       +
                   (* if start >= to then we're outside our (exclusive) date range and we terminate *)

     

       284
       284
       +
                   if Ptime.compare start to_ >= 0 then List.rev acc

     

       285
       285
       +
                   (* if end > from then, *)

     

       286
       286
       +
                   else if

     

       287
       287
       +
                     match from with

     

       288
       288
       +
                     | Some f -> Ptime.compare end_ f > 0

     

       289
       289
       +
                     | None -> true

     

       290
       290
       +
                   (* we include the event *)

     

       291
       291
       +
                   then collect generator (clone_with_event event recur :: acc)

     

       292
       292
       +
                   (* otherwise we iterate till the event is in range *)

     

       293
       293
       +
                   else collect generator acc

     

       294
       294
       +
             in

     

       295
       295
       +
             let generator =

     

       296
       296
       +
               let ical_event = to_ical_event event in

     

       297
       297
       +
               let recurrence_ids = get_recurrence_ids event in

     

       298
       298
       +
               recur_events ~recurrence_ids ical_event

     

       299
       299
       +
             in

     

       300
       300
       +
             collect generator []

+8 -5

lib/event.mli

···

       40
       40
        
         t

     

       41
       41
        
       (** Edit an existing event. *)

     

       42
       42
        
       

     

       43
       43
       -
       val of_icalendar : Collection.t -> file_name:string -> Icalendar.event -> t

     

       44
       44
       -
       (** Convert an Icalendar event to our event type. *)

     

       43
       43
       +
       val events_of_icalendar :

     

       44
       44
       +
         Collection.t -> file_name:string -> Icalendar.calendar -> t list

     

       45
       45
        
       

     

       46
       46
       -
       val to_icalendar : t -> Icalendar.event

     

       47
       47
       -
       (** Convert our event type to an Icalendar event *)

     

       48
       48
       -
       

     

       46
       46
       +
       val to_ical_event : t -> Icalendar.event

     

       47
       47
       +
       val to_ical_calendar : t -> Icalendar.calendar

     

       49
       48
        
       val get_id : t -> event_id

     

       50
       49
        
       val get_summary : t -> string option

     

       51
       50
        
       

     
···

       74
       73
        
       val get_file_path :

     

       75
       74
        
         fs:'a Eio.Path.t -> calendar_dir_path:string -> t -> 'a Eio.Path.t

     

       76
       75
        
       

     

       76
       76
       +
       val get_recurrence_ids : t -> Icalendar.event list

     

       77
       77
       +
       

     

       77
       78
        
       type comparator = t -> t -> int

     

       78
       79
        
       (** Event comparator function type *)

     

       79
       80
        
       

     
···

       101
       102
        
       val chain : comparator -> comparator -> comparator

     

       102
       103
        
       (** Chain two comparators together, using the second one as a tiebreaker when

     

       103
       104
        
           the first one returns equality (0) *)

     

       105
       105
       +
       

     

       106
       106
       +
       val expand_recurrences : from:Ptime.t option -> to_:Ptime.t -> t -> t list

+5 -43

lib/format.ml

···

       124
       124
        
             recur_to_ics recur)

     

       125
       125
        
           l

     

       126
       126
        
       

     

       127
       127
       -
       let format_alt ~fs ~calendar_dir ~format ~start ~end_ ?tz event =

     

       127
       127
       +
       let format_event ~fs ~calendar_dir ?(format = `Text) ?tz event =

     

       128
       128
        
         let open Event in

     

       129
       129
       +
         let start = get_start event in

     

       130
       130
       +
         let end_ = Event.get_end event in

     

       129
       131
        
         match format with

     

       130
       132
        
         | `Text ->

     

       131
       133
        
             let id = get_id event in

     
···

       244
       246
        
             Printf.sprintf "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\"" summary start end_str

     

       245
       247
        
               location cal_id

     

       246
       248
        
         | `Ics ->

     

       247
       247
       -
             let cal_props = [] in

     

       248
       248
       -
             let event_ical = Event.to_icalendar event in

     

       249
       249
       -
             Icalendar.to_ics ~cr:true (cal_props, [ `Event event_ical ])

     

       249
       249
       +
             let calendar = Event.to_ical_calendar event in

     

       250
       250
       +
             Icalendar.to_ics ~cr:true calendar

     

       250
       251
        
         | `Sexp ->

     

       251
       252
        
             let summary =

     

       252
       253
        
               match get_summary event with Some summary -> summary | None -> ""

     
···

       317
       318
        
               (String.escaped id) (String.escaped summary) start_date start_time

     

       318
       319
        
               end_str location description calendar

     

       319
       320
        
       

     

       320
       320
       -
       let format_event ~fs ~calendar_dir ?(format = `Text) ?tz event =

     

       321
       321
       -
         format_alt ~fs ~calendar_dir ~format ~start:(Event.get_start event)

     

       322
       322
       -
           ~end_:(Event.get_end event) ?tz event

     

       323
       323
       -
       

     

       324
       324
       -
       let format_instance ~fs ~calendar_dir ?(format = `Text) ?tz instance =

     

       325
       325
       -
         let open Recur in

     

       326
       326
       -
         format_alt ~fs ~calendar_dir ~format ~start:instance.start ~end_:instance.end_

     

       327
       327
       -
           ?tz instance.event

     

       328
       328
       -
       

     

       329
       321
        
       let format_events ~fs ~calendar_dir ?(format = `Text) ?tz events =

     

       330
       322
        
         match format with

     

       331
       323
        
         | `Json ->

     
···

       353
       345
        
               (List.map

     

       354
       346
        
                  (fun e -> format_event ~fs ~calendar_dir ~format ?tz e)

     

       355
       347
        
                  events)

     

       356
       356
       -
       

     

       357
       357
       -
       let format_instances ~fs ~calendar_dir ?(format = `Text) ?tz instances =

     

       358
       358
       -
         match format with

     

       359
       359
       -
         | `Json ->

     

       360
       360
       -
             let json_instances =

     

       361
       361
       -
               List.map

     

       362
       362
       -
                 (fun e ->

     

       363
       363
       -
                   Yojson.Safe.from_string

     

       364
       364
       -
                     (format_instance ~fs ~calendar_dir ~format:`Json ?tz e))

     

       365
       365
       -
                 instances

     

       366
       366
       -
             in

     

       367
       367
       -
             Yojson.Safe.to_string (`List json_instances)

     

       368
       368
       -
         | `Csv ->

     

       369
       369
       -
             "\"Summary\",\"Start\",\"End\",\"Location\",\"Calendar\"\n"

     

       370
       370
       -
             ^ String.concat "\n"

     

       371
       371
       -
                 (List.map

     

       372
       372
       -
                    (format_instance ~fs ~calendar_dir ~format:`Csv ?tz)

     

       373
       373
       -
                    instances)

     

       374
       374
       -
         | `Sexp ->

     

       375
       375
       -
             "("

     

       376
       376
       -
             ^ String.concat "\n "

     

       377
       377
       -
                 (List.map

     

       378
       378
       -
                    (fun e -> format_instance ~fs ~calendar_dir ~format:`Sexp ?tz e)

     

       379
       379
       -
                    instances)

     

       380
       380
       -
             ^ ")"

     

       381
       381
       -
         | _ ->

     

       382
       382
       -
             String.concat "\n"

     

       383
       383
       -
               (List.map

     

       384
       384
       -
                  (fun e -> format_instance ~fs ~calendar_dir ~format ?tz e)

     

       385
       385
       -
                  instances)

-18

lib/format.mli

···

       13
       13
        
         string

     

       14
       14
        
       (** Format a single event, optionally using the specified timezone *)

     

       15
       15
        
       

     

       16
       16
       -
       val format_instance :

     

       17
       17
       -
         fs:'a Eio.Path.t ->

     

       18
       18
       -
         calendar_dir:Calendar_dir.t ->

     

       19
       19
       -
         ?format:format ->

     

       20
       20
       -
         ?tz:Timedesc.Time_zone.t ->

     

       21
       21
       -
         Recur.instance ->

     

       22
       22
       -
         string

     

       23
       23
       -
       (** Format a single event instance, optionally using the specified timezone *)

     

       24
       24
       -
       

     

       25
       16
        
       val format_events :

     

       26
       17
        
         fs:'a Eio.Path.t ->

     

       27
       18
        
         calendar_dir:Calendar_dir.t ->

     
···

       30
       21
        
         Event.t list ->

     

       31
       22
        
         string

     

       32
       23
        
       (** Format a list of events, optionally using the specified timezone *)

     

       33
       33
       -
       

     

       34
       34
       -
       val format_instances :

     

       35
       35
       -
         fs:'a Eio.Path.t ->

     

       36
       36
       -
         calendar_dir:Calendar_dir.t ->

     

       37
       37
       -
         ?format:format ->

     

       38
       38
       -
         ?tz:Timedesc.Time_zone.t ->

     

       39
       39
       -
         Recur.instance list ->

     

       40
       40
       -
         string

     

       41
       41
       -
       (** Format a list of event instances, optionally using the specified timezone *)

+28 -36

lib/query.ml

···

       31
       31
        
       let not_filter filter event = not (filter event)

     

       32
       32
        
       let matches_filter event filter = filter event

     

       33
       33
        
       

     

       34
       34
       -
       let query_events ~fs calendar_dir ?filter ?(comparator = Event.by_start) ?limit

     

       35
       35
       -
           () =

     

       36
       36
       -
         let ( let* ) = Result.bind in

     

       37
       37
       -
         let* collections = Calendar_dir.get_collections ~fs calendar_dir in

     

       38
       38
       -
         let events =

     

       39
       39
       -
           List.flatten (List.map (fun (_collection, events) -> events) collections)

     

       34
       34
       +
       let take n list =

     

       35
       35
       +
         let rec aux n lst acc =

     

       36
       36
       +
           match (lst, n) with

     

       37
       37
       +
           | _, 0 -> List.rev acc

     

       38
       38
       +
           | [], _ -> List.rev acc

     

       39
       39
       +
           | x :: xs, n -> aux (n - 1) xs (x :: acc)

     

       40
       40
        
         in

     

       41
       41
       +
         aux n list []

     

       42
       42
       +
       

     

       43
       43
       +
       let ( let* ) = Result.bind

     

       44
       44
       +
       

     

       45
       45
       +
       let query_without_recurrence ~fs calendar_dir ?filter

     

       46
       46
       +
           ?(comparator = Event.by_start) ?limit () =

     

       47
       47
       +
         let* events = Calendar_dir.get_events ~fs calendar_dir in

     

       41
       48
        
         let filtered_events =

     

       42
       49
        
           match filter with Some f -> List.filter f events | None -> events

     

       43
       50
        
         in

     

       44
       51
        
         let sorted_events = List.sort comparator filtered_events in

     

       45
       52
        
         Ok

     

       46
       53
        
           (match limit with

     

       47
       47
       -
           | Some n when n > 0 ->

     

       48
       48
       -
               let rec take n lst acc =

     

       49
       49
       -
                 match (lst, n) with

     

       50
       50
       -
                 | _, 0 -> List.rev acc

     

       51
       51
       -
                 | [], _ -> List.rev acc

     

       52
       52
       -
                 | x :: xs, n -> take (n - 1) xs (x :: acc)

     

       53
       53
       -
               in

     

       54
       54
       -
               take n sorted_events []

     

       54
       54
       +
           | Some n when n > 0 -> take n sorted_events

     

       55
       55
        
           | _ -> sorted_events)

     

       56
       56
        
       

     

       57
       57
       -
       let query ~fs calendar_dir ?filter ~from ~to_

     

       58
       58
       -
           ?(comparator = Recur.Instance.by_start) ?limit () =

     

       59
       59
       -
         match query_events ~fs calendar_dir ?filter () with

     

       60
       60
       -
         | Ok events ->

     

       61
       61
       -
             let instances =

     

       62
       62
       -
               List.concat_map

     

       63
       63
       -
                 (fun event -> Recur.expand_event event ~from ~to_)

     

       64
       64
       -
                 events

     

       65
       65
       -
             in

     

       66
       66
       -
             let sorted_instances = List.sort comparator instances in

     

       67
       67
       -
             Ok

     

       68
       68
       -
               (match limit with

     

       69
       69
       -
               | Some n when n > 0 ->

     

       70
       70
       -
                   let rec take n lst acc =

     

       71
       71
       -
                     match (lst, n) with

     

       72
       72
       -
                     | _, 0 -> List.rev acc

     

       73
       73
       -
                     | [], _ -> List.rev acc

     

       74
       74
       -
                     | x :: xs, n -> take (n - 1) xs (x :: acc)

     

       75
       75
       -
                   in

     

       76
       76
       -
                   take n sorted_instances []

     

       77
       77
       -
               | _ -> sorted_instances)

     

       78
       78
       -
         | Error e -> Error e

     

       57
       57
       +
       let query ~fs calendar_dir ?filter ~from ~to_ ?(comparator = Event.by_start)

     

       58
       58
       +
           ?limit () =

     

       59
       59
       +
         let* events = Calendar_dir.get_events ~fs calendar_dir in

     

       60
       60
       +
         let events =

     

       61
       61
       +
           match filter with Some f -> List.filter f events | None -> events

     

       62
       62
       +
         in

     

       63
       63
       +
         let events =

     

       64
       64
       +
           List.concat_map

     

       65
       65
       +
             (fun event -> Event.expand_recurrences event ~from ~to_)

     

       66
       66
       +
             events

     

       67
       67
       +
         in

     

       68
       68
       +
         let sorted_events = List.sort comparator events in

     

       69
       69
       +
         Ok

     

       70
       70
       +
           (match limit with Some n when n > 0 -> take n events | _ -> sorted_events)

+4 -4

lib/query.mli

···

       13
       13
        
       val or_filter : filter list -> filter

     

       14
       14
        
       val not_filter : filter -> filter

     

       15
       15
        
       

     

       16
       16
       -
       val query_events :

     

       16
       16
       +
       val query_without_recurrence :

     

       17
       17
        
         fs:[> Eio.Fs.dir_ty ] Eio.Path.t ->

     

       18
       18
        
         Calendar_dir.t ->

     

       19
       19
        
         ?filter:filter ->

     
···

       30
       30
        
         ?filter:filter ->

     

       31
       31
        
         from:Ptime.t option ->

     

       32
       32
        
         to_:Ptime.t ->

     

       33
       33
       -
         ?comparator:Recur.Instance.comparator ->

     

       33
       33
       +
         ?comparator:Event.comparator ->

     

       34
       34
        
         ?limit:int ->

     

       35
       35
        
         unit ->

     

       36
       36
       -
         (Recur.instance list, [> `Msg of string ]) result

     

       36
       36
       +
         (Event.t list, [> `Msg of string ]) result

     

       37
       37
        
       (** Find events with expansion of recurring events. Returns Ok with the list of

     

       38
       38
       -
           instances, or Error with a message. *)

     

       38
       38
       +
           events, or Error with a message. *)

     

       39
       39
        
       

     

       40
       40
        
       (* Test-only helper functions *)

     

       41
       41
        
       val matches_filter : Event.t -> filter -> bool

-200

lib/recur.ml

···

       1
       1
       -
       open Icalendar

     

       2
       2
       -
       

     

       3
       3
       -
       type instance = { event : Event.t; start : Ptime.t; end_ : Ptime.t option }

     

       4
       4
       -
       

     

       5
       5
       -
       module Instance = struct

     

       6
       6
       -
         type t = instance

     

       7
       7
       -
         type comparator = t -> t -> int

     

       8
       8
       -
       

     

       9
       9
       -
         let by_start i1 i2 = Ptime.compare i1.start i2.start

     

       10
       10
       -
       

     

       11
       11
       -
         let by_end i1 i2 =

     

       12
       12
       -
           match (i1.end_, i2.end_) with

     

       13
       13
       -
           | Some t1, Some t2 -> Ptime.compare t1 t2

     

       14
       14
       -
           | Some _, None -> 1

     

       15
       15
       -
           | None, Some _ -> -1

     

       16
       16
       -
           | None, None -> 0

     

       17
       17
       -
       

     

       18
       18
       -
         let by_event event_comp i1 i2 = event_comp i1.event i2.event

     

       19
       19
       -
         let descending comp i1 i2 = -1 * comp i1 i2

     

       20
       20
       -
       

     

       21
       21
       -
         let chain comp1 comp2 i1 i2 =

     

       22
       22
       -
           let result = comp1 i1 i2 in

     

       23
       23
       -
           if result <> 0 then result else comp2 i1 i2

     

       24
       24
       -
       end

     

       25
       25
       -
       

     

       26
       26
       -
       let clone_with_time original start =

     

       27
       27
       -
         let duration = Event.get_duration original in

     

       28
       28
       -
         let end_ =

     

       29
       29
       -
           match duration with Some span -> Ptime.add_span start span | None -> None

     

       30
       30
       -
         in

     

       31
       31
       -
         { event = original; start; end_ }

     

       32
       32
       -
       

     

       33
       33
       -
       let expand_event event ~from ~to_ =

     

       34
       34
       -
         let rule = Event.get_recurrence event in

     

       35
       35
       -
         match rule with

     

       36
       36
       -
         (* If there's no recurrence we just return the original event. *)

     

       37
       37
       -
         | None ->

     

       38
       38
       -
             (* Include the original event instance only if it falls within the query range. *)

     

       39
       39
       -
             let start = Event.get_start event in

     

       40
       40
       -
             let end_ = match Event.get_end event with None -> start | Some e -> e in

     

       41
       41
       -
             if

     

       42
       42
       -
               Ptime.compare start to_ < 0

     

       43
       43
       -
               &&

     

       44
       44
       -
               (* end_ > f, meaning we don't include events that end at the exact start of our range.

     

       45
       45
       -
                  This is handy to exclude date events that end at 00:00 the next day. *)

     

       46
       46
       -
               match from with Some f -> Ptime.compare end_ f > 0 | None -> true

     

       47
       47
       -
             then [ clone_with_time event start ]

     

       48
       48
       -
             else []

     

       49
       49
       -
         (* We return all instances within the range, regardless of whether the original

     

       50
       50
       -
            event instance was included. This ensures recurring events that start before

     

       51
       51
       -
            the query range but have instances within it are properly included. *)

     

       52
       52
       -
         | Some rule ->

     

       53
       53
       -
             let rec collect generator acc =

     

       54
       54
       -
               match generator () with

     

       55
       55
       -
               | None -> List.rev acc

     

       56
       56
       -
               | Some date ->

     

       57
       57
       -
                   if Ptime.compare date to_ > 0 then List.rev acc

     

       58
       58
       -
                   else if

     

       59
       59
       -
                     match from with

     

       60
       60
       -
                     | Some f -> Ptime.compare date f < 0

     

       61
       61
       -
                     | None -> false

     

       62
       62
       -
                   then collect generator acc

     

       63
       63
       -
                   else collect generator (clone_with_time event date :: acc)

     

       64
       64
       -
             in

     

       65
       65
       -
             let start_date = Event.get_start event in

     

       66
       66
       -
             let generator = recur_dates start_date rule in

     

       67
       67
       -
             collect generator []

     

       68
       68
       -
       

     

       69
       69
       -
       let combine_results (results : ('a, 'b) result list) : ('a list, 'b) result =

     

       70
       70
       -
         let rec aux acc = function

     

       71
       71
       -
           | [] -> Ok (List.rev acc)

     

       72
       72
       -
           | Ok v :: rest -> aux (v :: acc) rest

     

       73
       73
       -
           | Error e :: _ -> Error e

     

       74
       74
       -
         in

     

       75
       75
       -
         aux [] results

     

       76
       76
       -
       

     

       77
       77
       -
       let parse_recurrence recur =

     

       78
       78
       -
         let ( let* ) = Result.bind in

     

       79
       79
       -
         let parts = String.split_on_char ';' recur in

     

       80
       80
       -
         let freq = ref None in

     

       81
       81
       -
         let count = ref None in

     

       82
       82
       -
         let until = ref None in

     

       83
       83
       -
         let interval = ref None in

     

       84
       84
       -
         let by_parts = ref [] in

     

       85
       85
       -
         let results =

     

       86
       86
       -
           List.map

     

       87
       87
       -
             (fun part ->

     

       88
       88
       -
               let kv = String.split_on_char '=' part in

     

       89
       89
       -
               match kv with

     

       90
       90
       -
               | [ "FREQ"; value ] -> (

     

       91
       91
       -
                   match String.uppercase_ascii value with

     

       92
       92
       -
                   | "DAILY" ->

     

       93
       93
       -
                       freq := Some `Daily;

     

       94
       94
       -
                       Ok ()

     

       95
       95
       -
                   | "WEEKLY" ->

     

       96
       96
       -
                       freq := Some `Weekly;

     

       97
       97
       -
                       Ok ()

     

       98
       98
       -
                   | "MONTHLY" ->

     

       99
       99
       -
                       freq := Some `Monthly;

     

       100
       100
       -
                       Ok ()

     

       101
       101
       -
                   | "YEARLY" ->

     

       102
       102
       -
                       freq := Some `Yearly;

     

       103
       103
       -
                       Ok ()

     

       104
       104
       -
                   | _ -> Error (`Msg ("Unsupported frequency: " ^ value)))

     

       105
       105
       -
               | [ "COUNT"; value ] ->

     

       106
       106
       -
                   if !until <> None then

     

       107
       107
       -
                     Error (`Msg "Cannot use both COUNT and UNTIL in the same rule")

     

       108
       108
       -
                   else (

     

       109
       109
       -
                     count := Some (`Count (int_of_string value));

     

       110
       110
       -
                     Ok ())

     

       111
       111
       -
               | [ "UNTIL"; value ] -> (

     

       112
       112
       -
                   if !count <> None then

     

       113
       113
       -
                     Error (`Msg "Cannot use both COUNT and UNTIL in the same rule")

     

       114
       114
       -
                   else

     

       115
       115
       -
                     let* v =

     

       116
       116
       -
                       match parse_datetime value with

     

       117
       117
       -
                       | Ok v -> Ok v

     

       118
       118
       -
                       | Error e -> Error (`Msg e)

     

       119
       119
       -
                     in

     

       120
       120
       -
                     match v with

     

       121
       121
       -
                     | `With_tzid _ -> Error (`Msg "Until can't be in a timezone")

     

       122
       122
       -
                     | `Utc u ->

     

       123
       123
       -
                         until := Some (`Until (`Utc u));

     

       124
       124
       -
                         Ok ()

     

       125
       125
       -
                     | `Local l ->

     

       126
       126
       -
                         until := Some (`Until (`Local l));

     

       127
       127
       -
                         Ok ())

     

       128
       128
       -
               | [ "INTERVAL"; value ] ->

     

       129
       129
       -
                   interval := Some (int_of_string value);

     

       130
       130
       -
                   Ok ()

     

       131
       131
       -
               | [ "BYDAY"; value ] ->

     

       132
       132
       -
                   (* Parse day specifications like MO,WE,FR or 1MO,-1FR *)

     

       133
       133
       -
                   let days = String.split_on_char ',' value in

     

       134
       134
       -
                   let parse_day day =

     

       135
       135
       -
                     (* Extract ordinal if present (like 1MO or -1FR) *)

     

       136
       136
       -
                     let ordinal, day_code =

     

       137
       137
       -
                       if

     

       138
       138
       -
                         String.length day >= 3

     

       139
       139
       -
                         && (String.get day 0 = '+'

     

       140
       140
       -
                            || String.get day 0 = '-'

     

       141
       141
       -
                            || (String.get day 0 >= '0' && String.get day 0 <= '9'))

     

       142
       142
       -
                       then (

     

       143
       143
       -
                         let idx = ref 0 in

     

       144
       144
       -
                         while

     

       145
       145
       -
                           !idx < String.length day

     

       146
       146
       -
                           && (String.get day !idx = '+'

     

       147
       147
       -
                              || String.get day !idx = '-'

     

       148
       148
       -
                              || String.get day !idx >= '0'

     

       149
       149
       -
                                 && String.get day !idx <= '9')

     

       150
       150
       -
                         do

     

       151
       151
       -
                           incr idx

     

       152
       152
       -
                         done;

     

       153
       153
       -
                         let ord_str = String.sub day 0 !idx in

     

       154
       154
       -
                         let day_str =

     

       155
       155
       -
                           String.sub day !idx (String.length day - !idx)

     

       156
       156
       -
                         in

     

       157
       157
       -
                         (int_of_string ord_str, day_str))

     

       158
       158
       -
                       else (0, day)

     

       159
       159
       -
                     in

     

       160
       160
       -
                     let* weekday =

     

       161
       161
       -
                       match day_code with

     

       162
       162
       -
                       | "MO" -> Ok `Monday

     

       163
       163
       -
                       | "TU" -> Ok `Tuesday

     

       164
       164
       -
                       | "WE" -> Ok `Wednesday

     

       165
       165
       -
                       | "TH" -> Ok `Thursday

     

       166
       166
       -
                       | "FR" -> Ok `Friday

     

       167
       167
       -
                       | "SA" -> Ok `Saturday

     

       168
       168
       -
                       | "SU" -> Ok `Sunday

     

       169
       169
       -
                       | _ -> Error (`Msg ("Invalid weekday: " ^ day_code))

     

       170
       170
       -
                     in

     

       171
       171
       -
                     Ok (ordinal, weekday)

     

       172
       172
       -
                   in

     

       173
       173
       -
                   let* day_specs = combine_results (List.map parse_day days) in

     

       174
       174
       -
                   by_parts := `Byday day_specs :: !by_parts;

     

       175
       175
       -
                   Ok ()

     

       176
       176
       -
               | [ "BYMONTHDAY"; value ] ->

     

       177
       177
       -
                   let days = String.split_on_char ',' value in

     

       178
       178
       -
                   let month_days = List.map int_of_string days in

     

       179
       179
       -
                   by_parts := `Bymonthday month_days :: !by_parts;

     

       180
       180
       -
                   Ok ()

     

       181
       181
       -
               | [ "BYMONTH"; value ] ->

     

       182
       182
       -
                   let months = String.split_on_char ',' value in

     

       183
       183
       -
                   let month_nums = List.map int_of_string months in

     

       184
       184
       -
                   by_parts := `Bymonth month_nums :: !by_parts;

     

       185
       185
       -
                   Ok ()

     

       186
       186
       -
               | _ -> Ok ())

     

       187
       187
       -
             parts

     

       188
       188
       -
         in

     

       189
       189
       -
         let* _ = combine_results results in

     

       190
       190
       -
         match !freq with

     

       191
       191
       -
         | Some f ->

     

       192
       192
       -
             let limit =

     

       193
       193
       -
               match (!count, !until) with

     

       194
       194
       -
               | Some c, None -> Some c

     

       195
       195
       -
               | None, Some u -> Some u

     

       196
       196
       -
               | _ -> None

     

       197
       197
       -
             in

     

       198
       198
       -
             let recurrence = (f, limit, !interval, !by_parts) in

     

       199
       199
       -
             Ok recurrence

     

       200
       200
       -
         | None -> Error (`Msg "FREQ is required in recurrence rule")

-35

lib/recur.mli

···

       1
       1
       -
       type instance = { event : Event.t; start : Ptime.t; end_ : Ptime.t option }

     

       2
       2
       -
       (** Instances of recurring events with adjusted start/end times *)

     

       3
       3
       -
       

     

       4
       4
       -
       module Instance : sig

     

       5
       5
       -
         type t = instance

     

       6
       6
       -
       

     

       7
       7
       -
         type comparator = t -> t -> int

     

       8
       8
       -
         (** Instance comparator function type *)

     

       9
       9
       -
       

     

       10
       10
       -
         val by_start : comparator

     

       11
       11
       -
         (** Compare instances by start time, earlier times come first *)

     

       12
       12
       -
       

     

       13
       13
       -
         val by_end : comparator

     

       14
       14
       -
         (** Compare instances by end time, earlier times come first. Instances with

     

       15
       15
       -
             end times come after those without *)

     

       16
       16
       -
       

     

       17
       17
       -
         val by_event : Event.comparator -> comparator

     

       18
       18
       -
         (** Apply an event comparator to instances *)

     

       19
       19
       -
       

     

       20
       20
       -
         val descending : comparator -> comparator

     

       21
       21
       -
         (** Reverse the order of a comparator *)

     

       22
       22
       -
       

     

       23
       23
       -
         val chain : comparator -> comparator -> comparator

     

       24
       24
       -
         (** Chain two comparators together, using the second one as a tiebreaker when

     

       25
       25
       -
             the first one returns equality (0) *)

     

       26
       26
       -
       end

     

       27
       27
       -
       

     

       28
       28
       -
       val expand_event :

     

       29
       29
       -
         Event.t -> from:Ptime.t option -> to_:Ptime.t -> instance list

     

       30
       30
       -
       (** Generates all instances of an event within a date range, including the

     

       31
       31
       -
           original and recurrences. If the event result is an Error, returns an empty

     

       32
       32
       -
           list. *)

     

       33
       33
       -
       

     

       34
       34
       -
       val parse_recurrence :

     

       35
       35
       -
         string -> (Icalendar.recurrence, [ `Msg of string ]) result

+1 -1

test/dune

···

       1
       1
        
       (tests

     

       2
       2
       -
        (names test_calendar_dir test_query test_recur)

     

       2
       2
       +
        (names test_calendar_dir test_query)

     

       3
       3
        
        (libraries caledonia_lib alcotest str ptime)

     

       4
       4
        
        (deps

     

       5
       5
        
         (source_tree calendar)))

+6 -14

test/test_calendar_dir.ml

···

       39
       39
        
         | Error `Not_found -> Alcotest.fail "Failed to find example collection"

     

       40
       40
        
         | Error (`Msg msg) -> Alcotest.fail ("Error getting collection: " ^ msg)

     

       41
       41
        
       

     

       42
       42
       -
       let test_get_collections ~fs () =

     

       42
       42
       +
       let test_get_events ~fs () =

     

       43
       43
        
         let calendar_dir =

     

       44
       44
        
           match Calendar_dir.create ~fs calendar_dir_path with

     

       45
       45
        
           | Ok dir -> dir

     

       46
       46
        
           | Error (`Msg msg) ->

     

       47
       47
        
               Alcotest.fail ("Calendar directory creation failed: " ^ msg)

     

       48
       48
        
         in

     

       49
       49
       -
         match Calendar_dir.get_collections ~fs calendar_dir with

     

       50
       50
       -
         | Ok collections ->

     

       49
       49
       +
         match Calendar_dir.get_events ~fs calendar_dir with

     

       50
       50
       +
         | Ok events ->

     

       51
       51
        
             Alcotest.(check int)

     

       52
       52
       -
               "Should find two collections" 2 (List.length collections);

     

       53
       53
       -
             Alcotest.(check bool)

     

       54
       54
       -
               "example should be in the results" true

     

       55
       55
       -
               (List.exists (fun (id, _) -> id = Collection.Col "example") collections);

     

       56
       56
       -
             Alcotest.(check bool)

     

       57
       57
       -
               "recurrence should be in the results" true

     

       58
       58
       -
               (List.exists

     

       59
       59
       -
                  (fun (id, _) -> id = Collection.Col "recurrence")

     

       60
       60
       -
                  collections);

     

       52
       52
       +
               "Should find two events" 32 (List.length events);

     

       61
       53
        
             ()

     

       62
       54
        
         | Error e ->

     

       63
       55
        
             let msg =

     

       64
       64
       -
               match e with `Msg m -> m | `Not_found -> "Collection not found"

     

       56
       56
       +
               match e with `Msg m -> m

     

       65
       57
        
             in

     

       66
       58
        
             Alcotest.fail ("Error getting collections: " ^ msg)

     

       67
       59
        
       

     
···

       69
       61
        
         [

     

       70
       62
        
           ("list collections", `Quick, test_list_collections ~fs);

     

       71
       63
        
           ("get collection", `Quick, test_get_collection ~fs);

     

       72
       72
       -
           ("get all collections", `Quick, test_get_collections ~fs);

     

       64
       64
       +
           ("get all collections", `Quick, test_get_events ~fs);

     

       73
       65
        
         ]

     

       74
       66
        
       

     

       75
       67
        
       let () =

+27 -32

test/test_query.ml

···

       20
       20
        
         in

     

       21
       21
        
         let to_ = Option.get @@ Ptime.of_date_time ((2026, 01, 01), ((0, 0, 0), 0)) in

     

       22
       22
        
         match Query.query ~fs calendar_dir ~from ~to_ () with

     

       23
       23
       -
         | Ok instances ->

     

       24
       24
       -
             Alcotest.(check int) "Should find events" 792 (List.length instances);

     

       23
       23
       +
         | Ok events ->

     

       24
       24
       +
             Alcotest.(check int) "Should find events" 791 (List.length events);

     

       25
       25
        
             let test_event =

     

       26
       26
        
               List.find_opt

     

       27
       27
       -
                 (fun instance ->

     

       28
       28
       -
                   Option.get @@ Event.get_summary instance.Recur.event = "Test Event")

     

       29
       29
       -
                 instances

     

       27
       27
       +
                 (fun event -> Option.get @@ Event.get_summary event = "Test Event")

     

       28
       28
       +
                 events

     

       30
       29
        
             in

     

       31
       30
        
             Alcotest.(check bool) "Should find Test Event" true (test_event <> None)

     

       32
       31
        
         | Error _ -> Alcotest.fail "Error querying events"

     
···

       42
       41
        
           Option.get @@ Ptime.of_date_time ((2025, 5, 31), ((23, 59, 59), 0))

     

       43
       42
        
         in

     

       44
       43
        
         match Query.query ~fs calendar_dir ~from ~to_ () with

     

       45
       45
       -
         | Ok instances ->

     

       46
       46
       -
             let recurring_instances =

     

       44
       44
       +
         | Ok events ->

     

       45
       45
       +
             let recurring_events =

     

       47
       46
        
               List.filter

     

       48
       48
       -
                 (fun instance ->

     

       49
       49
       -
                   Option.get @@ Event.get_summary instance.Recur.event

     

       50
       50
       -
                   = "Recurring Event")

     

       51
       51
       -
                 instances

     

       47
       47
       +
                 (fun event ->

     

       48
       48
       +
                   Option.get @@ Event.get_summary event = "Recurring Event")

     

       49
       49
       +
                 events

     

       52
       50
        
             in

     

       53
       51
        
             Alcotest.(check bool)

     

       54
       54
       -
               "Should find multiple recurring event instances" true

     

       55
       55
       -
               (List.length recurring_instances > 1)

     

       52
       52
       +
               "Should find multiple recurring event events" true

     

       53
       53
       +
               (List.length recurring_events > 1)

     

       56
       54
        
         | Error _ -> Alcotest.fail "Error querying events"

     

       57
       55
        
       

     

       58
       56
        
       let test_text_search ~fs () =

     
···

       65
       63
        
         in

     

       66
       64
        
         let to_ = Option.get @@ Ptime.of_date_time ((2026, 01, 01), ((0, 0, 0), 0)) in

     

       67
       65
        
         (match Query.query ~fs calendar_dir ~from ~to_ ~filter () with

     

       68
       68
       -
         | Ok instances ->

     

       66
       66
       +
         | Ok events ->

     

       69
       67
        
             Alcotest.(check int)

     

       70
       70
       -
               "Should find event with 'Test' in summary" 2 (List.length instances)

     

       68
       68
       +
               "Should find event with 'Test' in summary" 2 (List.length events)

     

       71
       69
        
         | Error _ -> Alcotest.fail "Error querying events");

     

       72
       70
        
         let filter = Query.location_contains "Weekly" in

     

       73
       71
        
         (match Query.query ~fs calendar_dir ~from ~to_ ~filter () with

     

       74
       74
       -
         | Ok instances ->

     

       72
       72
       +
         | Ok events ->

     

       75
       73
        
             Alcotest.(check int)

     

       76
       76
       -
               "Should find event with 'Weekly' in location" 10 (List.length instances)

     

       74
       74
       +
               "Should find event with 'Weekly' in location" 10 (List.length events)

     

       77
       75
        
         | Error _ -> Alcotest.fail "Error querying events");

     

       78
       76
        
         let filter =

     

       79
       77
        
           Query.and_filter

     

       80
       78
        
             [ Query.summary_contains "Test"; Query.description_contains "test" ]

     

       81
       79
        
         in

     

       82
       80
        
         (match Query.query ~fs calendar_dir ~from ~to_ ~filter () with

     

       83
       83
       -
         | Ok instances ->

     

       81
       81
       +
         | Ok events ->

     

       84
       82
        
             Alcotest.(check int)

     

       85
       83
        
               "Should find events matching combined and criteria" 2

     

       86
       86
       -
               (List.length instances)

     

       84
       84
       +
               (List.length events)

     

       87
       85
        
         | Error _ -> Alcotest.fail "Error querying events");

     

       88
       86
        
         let filter =

     

       89
       87
        
           Query.or_filter

     

       90
       88
        
             [ Query.summary_contains "Test"; Query.location_contains "Weekly" ]

     

       91
       89
        
         in

     

       92
       90
        
         (match Query.query ~fs calendar_dir ~from ~to_ ~filter () with

     

       93
       93
       -
         | Ok instances ->

     

       91
       91
       +
         | Ok events ->

     

       94
       92
        
             Alcotest.(check int)

     

       95
       93
        
               "Should find events matching combined or criteria" 12

     

       96
       96
       -
               (List.length instances)

     

       94
       94
       +
               (List.length events)

     

       97
       95
        
         | Error _ -> Alcotest.fail "Error querying events");

     

       98
       96
        
         ()

     

       99
       97
        
       

     
···

       108
       106
        
         let collection = Collection.Col "example" in

     

       109
       107
        
         let filter = Query.in_collections [ collection ] in

     

       110
       108
        
         (match Query.query ~fs calendar_dir ~from ~to_ ~filter () with

     

       111
       111
       -
         | Ok instances ->

     

       109
       109
       +
         | Ok events ->

     

       112
       110
        
             let all_match_calendar =

     

       113
       111
        
               List.for_all

     

       114
       114
       -
                 (fun e ->

     

       115
       115
       -
                   match Event.get_collection e.Recur.event with

     

       116
       116
       -
                   | id -> id = collection)

     

       117
       117
       -
                 instances

     

       112
       112
       +
                 (fun e -> match Event.get_collection e with id -> id = collection)

     

       113
       113
       +
                 events

     

       118
       114
        
             in

     

       119
       115
        
             Alcotest.(check bool)

     

       120
       116
        
               (Printf.sprintf "All events should be from calendar '%s'"

     

       121
       117
        
                  (match collection with Col str -> str))

     

       122
       118
        
               true all_match_calendar;

     

       123
       123
       -
             Alcotest.(check int) "Should find events" 2 (List.length instances)

     

       119
       119
       +
             Alcotest.(check int) "Should find events" 2 (List.length events)

     

       124
       120
        
         | Error _ -> Alcotest.fail "Error querying events");

     

       125
       121
        
         let collections = [ Collection.Col "example"; Collection.Col "recurrence" ] in

     

       126
       122
        
         let filter = Query.in_collections collections in

     

       127
       123
        
         (match Query.query ~fs calendar_dir ~from ~to_ ~filter () with

     

       128
       128
       -
         | Ok instances ->

     

       129
       129
       -
             Alcotest.(check int) "Should find events" 792 (List.length instances)

     

       124
       124
       +
         | Ok events ->

     

       125
       125
       +
             Alcotest.(check int) "Should find events" 791 (List.length events)

     

       130
       126
        
         | Error _ -> Alcotest.fail "Error querying events");

     

       131
       127
        
         let filter =

     

       132
       128
        
           Query.in_collections [ Collection.Col "non-existent-calendar" ]

     

       133
       129
        
         in

     

       134
       130
        
         (match Query.query ~fs calendar_dir ~from ~to_ ~filter () with

     

       135
       135
       -
         | Ok instances ->

     

       131
       131
       +
         | Ok events ->

     

       136
       132
        
             Alcotest.(check int)

     

       137
       137
       -
               "Should find 0 events for non-existent calendar" 0

     

       138
       138
       -
               (List.length instances)

     

       133
       133
       +
               "Should find 0 events for non-existent calendar" 0 (List.length events)

     

       139
       134
        
         | Error _ -> Alcotest.fail "Error querying events");

     

       140
       135
        
         ()

     

       141
       136

-738

test/test_recur.ml

···

       1
       1
       -
       (* Test recurrence expansion for specific event file.

     

       2
       2
       -
          More tests can be found in the icalendar library at test/test_recur.ml *)

     

       3
       3
       -
       

     

       4
       4
       -
       open Caledonia_lib

     

       5
       5
       -
       

     

       6
       6
       -
       let test_recurring_events_in_date_range () =

     

       7
       7
       -
         (* Create a recurring event that starts BEFORE our test range *)

     

       8
       8
       -
         let event_start =

     

       9
       9
       -
           Option.get @@ Ptime.of_date_time ((2025, 2, 1), ((14, 0, 0), 0))

     

       10
       10
       -
         in

     

       11
       11
       -
         let recurrence = (`Weekly, None, Some 1, []) in

     

       12
       12
       -
         (* Weekly recurrence *)

     

       13
       13
       -
         let recurring_event =

     

       14
       14
       -
           Event.create ~summary:"Weekly Recurring Event"

     

       15
       15
       -
             ~start:(`Datetime (`Utc event_start))

     

       16
       16
       -
             ~recurrence (Collection.Col "test")

     

       17
       17
       -
         in

     

       18
       18
       -
         let test_date_range from_str to_str expected_count =

     

       19
       19
       -
           try

     

       20
       20
       -
             let from = Some (Result.get_ok @@ Date.parse_date from_str `From) in

     

       21
       21
       -
             let to_ = Result.get_ok @@ Date.parse_date to_str `To in

     

       22
       22
       -
             let instances = Recur.expand_event recurring_event ~from ~to_ in

     

       23
       23
       -
             Printf.printf "Testing date range: %s to %s\n" from_str to_str;

     

       24
       24
       -
             Printf.printf "Found %d instances:\n" (List.length instances);

     

       25
       25
       -
             List.iter

     

       26
       26
       -
               (fun i ->

     

       27
       27
       -
                 let date_str =

     

       28
       28
       -
                   let y, m, d = Ptime.to_date i.Recur.start in

     

       29
       29
       -
                   Printf.sprintf "%04d-%02d-%02d" y m d

     

       30
       30
       -
                 in

     

       31
       31
       -
                 let time_str =

     

       32
       32
       -
                   let _, ((h, m, s), _) = Ptime.to_date_time i.Recur.start in

     

       33
       33
       -
                   Printf.sprintf "%02d:%02d:%02d" h m s

     

       34
       34
       -
                 in

     

       35
       35
       -
                 Printf.printf "  - %s %s\n" date_str time_str)

     

       36
       36
       -
               instances;

     

       37
       37
       -
             (* Check the count matches what we expect *)

     

       38
       38
       -
             Alcotest.(check int)

     

       39
       39
       -
               (Printf.sprintf "Date range %s to %s should have %d occurrences"

     

       40
       40
       -
                  from_str to_str expected_count)

     

       41
       41
       -
               expected_count (List.length instances)

     

       42
       42
       -
           with Failure msg ->

     

       43
       43
       -
             Alcotest.fail

     

       44
       44
       -
               (Printf.sprintf "Failed to parse date range '%s' to '%s': %s" from_str

     

       45
       45
       -
                  to_str msg)

     

       46
       46
       -
         in

     

       47
       47
       -
         test_date_range "2025-01-25" "2025-01-31" 0;

     

       48
       48
       -
         test_date_range "2025-02-01" "2025-02-02" 1;

     

       49
       49
       -
         test_date_range "2025-02-01" "2025-02-14" 2;

     

       50
       50
       -
         test_date_range "2025-02-01" "2025-02-15" 2;

     

       51
       51
       -
         (* Event started in February, but query range is only in March *)

     

       52
       52
       -
         test_date_range "2025-03-01" "2025-03-31" 5;

     

       53
       53
       -
         (* Specific test for the March 8 instance *)

     

       54
       54
       -
         test_date_range "2025-03-08" "2025-03-09" 1;

     

       55
       55
       -
         (* Test a range that spans original event date and later dates *)

     

       56
       56
       -
         test_date_range "2025-01-15" "2025-03-15" 6;

     

       57
       57
       -
         ()

     

       58
       58
       -
       

     

       59
       59
       -
       let test_dir = Filename.concat (Sys.getcwd ()) "calendar/recurrence/"

     

       60
       60
       -
       let day_seconds = 86400

     

       61
       61
       -
       

     

       62
       62
       -
       (* Parse date string in YYYY-MM-DD format *)

     

       63
       63
       -
       let parse_date s =

     

       64
       64
       -
         try

     

       65
       65
       -
           let year = int_of_string (String.sub s 0 4) in

     

       66
       66
       -
           let month = int_of_string (String.sub s 5 2) in

     

       67
       67
       -
           let day = int_of_string (String.sub s 8 2) in

     

       68
       68
       -
       

     

       69
       69
       -
           match Ptime.of_date_time ((year, month, day), ((0, 0, 0), 0)) with

     

       70
       70
       -
           | Some t -> t

     

       71
       71
       -
           | None -> failwith "Invalid date"

     

       72
       72
       -
         with _ ->

     

       73
       73
       -
           failwith (Printf.sprintf "Invalid date format: %s (expected YYYY-MM-DD)" s)

     

       74
       74
       -
       

     

       75
       75
       -
       let load_event_from_file ~fs event_file =

     

       76
       76
       -
         let file = Eio.Path.(fs / test_dir / event_file) in

     

       77
       77
       -
         let _, file_name = Option.get @@ Eio.Path.split file in

     

       78
       78
       -
         let content = Eio.Path.load file in

     

       79
       79
       -
         match Icalendar.parse content with

     

       80
       80
       -
         | Error err -> failwith (Printf.sprintf "Error parsing calendar: %s" err)

     

       81
       81
       -
         | Ok (_, components) -> (

     

       82
       82
       -
             match

     

       83
       83
       -
               (* load a single event *)

     

       84
       84
       -
               List.find_map (function `Event e -> Some e | _ -> None) components

     

       85
       85
       -
             with

     

       86
       86
       -
             | None -> failwith "No event found in file"

     

       87
       87
       -
             | Some ical_event ->

     

       88
       88
       -
                 Event.of_icalendar (Collection.Col "example") ~file_name ical_event)

     

       89
       89
       -
       

     

       90
       90
       -
       (* Format RRULE for display *)

     

       91
       91
       -
       let format_rrule_str rule =

     

       92
       92
       -
         let freq, until_count, interval, _ = rule in

     

       93
       93
       -
         let freq_str =

     

       94
       94
       -
           match freq with

     

       95
       95
       -
           | `Daily -> "DAILY"

     

       96
       96
       -
           | `Weekly -> "WEEKLY"

     

       97
       97
       -
           | `Monthly -> "MONTHLY"

     

       98
       98
       -
           | `Yearly -> "YEARLY"

     

       99
       99
       -
           | _ -> "OTHER"

     

       100
       100
       -
         in

     

       101
       101
       -
         let count_until_str =

     

       102
       102
       -
           match until_count with

     

       103
       103
       -
           | Some (`Count n) -> Printf.sprintf "COUNT=%d" n

     

       104
       104
       -
           | Some (`Until _) -> "UNTIL=..."

     

       105
       105
       -
           | None -> ""

     

       106
       106
       -
         in

     

       107
       107
       -
         let interval_str =

     

       108
       108
       -
           match interval with Some n -> Printf.sprintf "INTERVAL=%d" n | None -> ""

     

       109
       109
       -
         in

     

       110
       110
       -
         let parts =

     

       111
       111
       -
           List.filter (fun s -> s <> "") [ freq_str; count_until_str; interval_str ]

     

       112
       112
       -
         in

     

       113
       113
       -
         "RRULE:" ^ String.concat ";" parts

     

       114
       114
       -
       

     

       115
       115
       -
       (* Common recurrence test logic *)

     

       116
       116
       -
       let test_recurrence_expansion ~fs event_file start_str end_str expected_count =

     

       117
       117
       -
         let event = load_event_from_file ~fs event_file in

     

       118
       118
       -
         let start_date = parse_date start_str in

     

       119
       119
       -
         let end_date = parse_date end_str in

     

       120
       120
       -
         let instances =

     

       121
       121
       -
           Recur.expand_event event ~from:(Some start_date) ~to_:end_date

     

       122
       122
       -
         in

     

       123
       123
       -
         (* Format readable info for test failure messages *)

     

       124
       124
       -
         let rrule_str =

     

       125
       125
       -
           match Event.get_recurrence event with

     

       126
       126
       -
           | Some rule -> format_rrule_str rule

     

       127
       127
       -
           | None -> "No recurrence rule"

     

       128
       128
       -
         in

     

       129
       129
       -
         let summary = Option.get @@ Event.get_summary event in

     

       130
       130
       -
         let msg =

     

       131
       131
       -
           Printf.sprintf

     

       132
       132
       -
             "Expected %d instances for '%s' (%s) between %s and %s, but got %d"

     

       133
       133
       -
             expected_count summary rrule_str start_str end_str (List.length instances)

     

       134
       134
       -
         in

     

       135
       135
       -
         Alcotest.(check int) msg expected_count (List.length instances);

     

       136
       136
       -
         instances

     

       137
       137
       -
       

     

       138
       138
       -
       (* Helper to verify instances are properly spaced *)

     

       139
       139
       -
       let verify_instance_spacing instances expected_interval =

     

       140
       140
       -
         if List.length instances < 2 then

     

       141
       141
       -
           Alcotest.(check bool) "Should have at least 2 unique instances" true false

     

       142
       142
       -
         else

     

       143
       143
       -
           let errors = ref [] in

     

       144
       144
       -
           ignore

     

       145
       145
       -
             (List.fold_left

     

       146
       146
       -
                (fun prev curr ->

     

       147
       147
       -
                  let span = Ptime.diff curr.Recur.start prev.Recur.start in

     

       148
       148
       -
                  let days_diff =

     

       149
       149
       -
                    Ptime.Span.to_float_s span /. float_of_int day_seconds

     

       150
       150
       -
                    |> Float.round |> int_of_float

     

       151
       151
       -
                  in

     

       152
       152
       -
                  if days_diff <> expected_interval then

     

       153
       153
       -
                    errors := (prev, curr, days_diff) :: !errors;

     

       154
       154
       -
                  curr)

     

       155
       155
       -
                (List.hd instances) (List.tl instances));

     

       156
       156
       -
           match !errors with

     

       157
       157
       -
           | [] -> ()

     

       158
       158
       -
           | (prev, curr, actual) :: _ ->

     

       159
       159
       -
               let msg =

     

       160
       160
       -
                 Printf.sprintf

     

       161
       161
       -
                   "Expected interval of %d days, but found %d days between %s and %s"

     

       162
       162
       -
                   expected_interval actual

     

       163
       163
       -
                   (Ptime.to_rfc3339 ~space:true prev.Recur.start)

     

       164
       164
       -
                   (Ptime.to_rfc3339 ~space:true curr.Recur.start)

     

       165
       165
       -
               in

     

       166
       166
       -
               if actual = 0 then

     

       167
       167
       -
                 (* Ignore zero interval errors for now - this means we have duplicates *)

     

       168
       168
       -
                 ()

     

       169
       169
       -
               else Alcotest.(check int) msg expected_interval actual

     

       170
       170
       -
       

     

       171
       171
       -
       let test_daily ~fs () =

     

       172
       172
       -
         let instances =

     

       173
       173
       -
           test_recurrence_expansion ~fs "1_daily.ics" "2025-03-27" "2025-04-10" 14

     

       174
       174
       -
         in

     

       175
       175
       -
         verify_instance_spacing instances 1

     

       176
       176
       -
       

     

       177
       177
       -
       let test_weekly ~fs () =

     

       178
       178
       -
         let instances =

     

       179
       179
       -
           test_recurrence_expansion ~fs "2_weekly.ics" "2025-03-27" "2025-06-27" 14

     

       180
       180
       -
         in

     

       181
       181
       -
         verify_instance_spacing instances 7

     

       182
       182
       -
       

     

       183
       183
       -
       let test_monthly ~fs () =

     

       184
       184
       -
         let instances =

     

       185
       185
       -
           test_recurrence_expansion ~fs "3_monthly.ics" "2025-01-01" "2025-12-31" 8

     

       186
       186
       -
         in

     

       187
       187
       -
         (* Just verify the results without checking the interval, since months have different lengths *)

     

       188
       188
       -
         let first_instance = List.hd instances in

     

       189
       189
       -
         let (_, _, first_day), _ = Ptime.to_date_time first_instance.Recur.start in

     

       190
       190
       -
         (* Check that they all fall on the same day of the month *)

     

       191
       191
       -
         let all_same_day =

     

       192
       192
       -
           List.for_all

     

       193
       193
       -
             (fun instance ->

     

       194
       194
       -
               let (_, _, day), _ = Ptime.to_date_time instance.Recur.start in

     

       195
       195
       -
               day = first_day)

     

       196
       196
       -
             instances

     

       197
       197
       -
         in

     

       198
       198
       -
         Alcotest.(check bool)

     

       199
       199
       -
           (Printf.sprintf "All instances should be on day %d of the month" first_day)

     

       200
       200
       -
           true all_same_day

     

       201
       201
       -
       

     

       202
       202
       -
       let test_yearly ~fs () =

     

       203
       203
       -
         let instances =

     

       204
       204
       -
           test_recurrence_expansion ~fs "4_yearly.ics" "2025-01-01" "2035-12-31" 11

     

       205
       205
       -
         in

     

       206
       206
       -
         (* Verify instances are one year apart by checking the date *)

     

       207
       207
       -
         let all_same_month_day =

     

       208
       208
       -
           if List.length instances < 2 then true

     

       209
       209
       -
           else

     

       210
       210
       -
             let first = List.hd instances in

     

       211
       211
       -
             let (_, first_month, first_day), _ =

     

       212
       212
       -
               Ptime.to_date_time first.Recur.start

     

       213
       213
       -
             in

     

       214
       214
       -
             List.for_all

     

       215
       215
       -
               (fun instance ->

     

       216
       216
       -
                 let (_, month, day), _ = Ptime.to_date_time instance.Recur.start in

     

       217
       217
       -
                 month = first_month && day = first_day)

     

       218
       218
       -
               instances

     

       219
       219
       -
         in

     

       220
       220
       -
         Alcotest.(check bool)

     

       221
       221
       -
           "All instances should be on the same day/month" true all_same_month_day

     

       222
       222
       -
       

     

       223
       223
       -
       let test_every_2_days ~fs () =

     

       224
       224
       -
         let instances =

     

       225
       225
       -
           test_recurrence_expansion ~fs "5_every_2_days.ics" "2025-05-01" "2025-05-31"

     

       226
       226
       -
             15

     

       227
       227
       -
         in

     

       228
       228
       -
         verify_instance_spacing instances 2

     

       229
       229
       -
       

     

       230
       230
       -
       let test_every_3_weeks ~fs () =

     

       231
       231
       -
         let instances =

     

       232
       232
       -
           test_recurrence_expansion ~fs "6_every_3_weeks.ics" "2025-05-01"

     

       233
       233
       -
             "2025-08-31" 6

     

       234
       234
       -
         in

     

       235
       235
       -
         verify_instance_spacing instances 21 (* 3 weeks = 21 days *)

     

       236
       236
       -
       

     

       237
       237
       -
       let test_bimonthly ~fs () =

     

       238
       238
       -
         let instances =

     

       239
       239
       -
           test_recurrence_expansion ~fs "7_bimonthly.ics" "2025-05-01" "2026-05-31" 7

     

       240
       240
       -
         in

     

       241
       241
       -
         (* Verify all instances are on the same day of month *)

     

       242
       242
       -
         let first_instance = List.hd instances in

     

       243
       243
       -
         let (_, _, first_day), _ = Ptime.to_date_time first_instance.Recur.start in

     

       244
       244
       -
         let all_same_day =

     

       245
       245
       -
           List.for_all

     

       246
       246
       -
             (fun instance ->

     

       247
       247
       -
               let (_, _, day), _ = Ptime.to_date_time instance.Recur.start in

     

       248
       248
       -
               day = first_day)

     

       249
       249
       -
             instances

     

       250
       250
       -
         in

     

       251
       251
       -
         Alcotest.(check bool)

     

       252
       252
       -
           (Printf.sprintf "All instances should be on day %d of the month" first_day)

     

       253
       253
       -
           true all_same_day

     

       254
       254
       -
       

     

       255
       255
       -
       let test_biennial ~fs () =

     

       256
       256
       -
         let instances =

     

       257
       257
       -
           test_recurrence_expansion ~fs "8_biennial.ics" "2025-01-01" "2035-12-31" 6

     

       258
       258
       -
         in

     

       259
       259
       -
         (* Verify all instances are on the same month and day, every two years *)

     

       260
       260
       -
         let first_instance = List.hd instances in

     

       261
       261
       -
         let (first_year, first_month, first_day), _ =

     

       262
       262
       -
           Ptime.to_date_time first_instance.Recur.start

     

       263
       263
       -
         in

     

       264
       264
       -
         let all_same_date_alternate_years =

     

       265
       265
       -
           List.for_all

     

       266
       266
       -
             (fun instance ->

     

       267
       267
       -
               let (year, month, day), _ = Ptime.to_date_time instance.Recur.start in

     

       268
       268
       -
               month = first_month && day = first_day && (year - first_year) mod 2 = 0)

     

       269
       269
       -
             instances

     

       270
       270
       -
         in

     

       271
       271
       -
         Alcotest.(check bool)

     

       272
       272
       -
           "All instances should be on same day/month every two years" true

     

       273
       273
       -
           all_same_date_alternate_years

     

       274
       274
       -
       

     

       275
       275
       -
       let test_daily_count5 ~fs () =

     

       276
       276
       -
         let instances =

     

       277
       277
       -
           test_recurrence_expansion ~fs "9_daily_count5.ics" "2025-05-01" "2025-05-31"

     

       278
       278
       -
             5

     

       279
       279
       -
         in

     

       280
       280
       -
         Alcotest.(check int)

     

       281
       281
       -
           "Should have exactly 5 instances" 5 (List.length instances);

     

       282
       282
       -
         verify_instance_spacing instances 1

     

       283
       283
       -
       

     

       284
       284
       -
       let test_weekly_count10 ~fs () =

     

       285
       285
       -
         let instances =

     

       286
       286
       -
           test_recurrence_expansion ~fs "10_weekly_count10.ics" "2025-03-17"

     

       287
       287
       -
             "2025-06-30" 10

     

       288
       288
       -
         in

     

       289
       289
       -
         verify_instance_spacing instances 7

     

       290
       290
       -
       

     

       291
       291
       -
       let test_daily_until ~fs () =

     

       292
       292
       -
         let instances =

     

       293
       293
       -
           test_recurrence_expansion ~fs "11_daily_until.ics" "2025-05-01" "2025-05-31"

     

       294
       294
       -
             14

     

       295
       295
       -
         in

     

       296
       296
       -
         (* Verify instances only occur until May 15 *)

     

       297
       297
       -
         let last_instance =

     

       298
       298
       -
           List.fold_left

     

       299
       299
       -
             (fun latest curr ->

     

       300
       300
       -
               if Ptime.compare curr.Recur.start latest.Recur.start > 0 then curr

     

       301
       301
       -
               else latest)

     

       302
       302
       -
             (List.hd instances) instances

     

       303
       303
       -
         in

     

       304
       304
       -
         let (_, month, day), _ = Ptime.to_date_time last_instance.Recur.start in

     

       305
       305
       -
         Alcotest.(check int) "Last instance should be in May" 5 month;

     

       306
       306
       -
         Alcotest.(check bool)

     

       307
       307
       -
           "Last instance should be on or before May 15" true (day <= 15);

     

       308
       308
       -
         verify_instance_spacing instances 1

     

       309
       309
       -
       

     

       310
       310
       -
       let test_weekly_until ~fs () =

     

       311
       311
       -
         let instances =

     

       312
       312
       -
           test_recurrence_expansion ~fs "12_weekly_until.ics" "2025-05-01"

     

       313
       313
       -
             "2025-07-31" 9

     

       314
       314
       -
         in

     

       315
       315
       -
         (* Verify instances only occur until June 30 *)

     

       316
       316
       -
         let last_instance =

     

       317
       317
       -
           List.fold_left

     

       318
       318
       -
             (fun latest curr ->

     

       319
       319
       -
               if Ptime.compare curr.Recur.start latest.Recur.start > 0 then curr

     

       320
       320
       -
               else latest)

     

       321
       321
       -
             (List.hd instances) instances

     

       322
       322
       -
         in

     

       323
       323
       -
         let (_, month, day), _ = Ptime.to_date_time last_instance.Recur.start in

     

       324
       324
       -
         Alcotest.(check int) "Last instance should be in June" 6 month;

     

       325
       325
       -
         Alcotest.(check bool)

     

       326
       326
       -
           "Last instance should be on or before June 30" true (day <= 30);

     

       327
       327
       -
         verify_instance_spacing instances 7

     

       328
       328
       -
       

     

       329
       329
       -
       let test_weekly_monday_wednesday ~fs () =

     

       330
       330
       -
         let instances =

     

       331
       331
       -
           test_recurrence_expansion ~fs "13_weekly_monday_wednesday.ics" "2025-03-24"

     

       332
       332
       -
             "2025-04-30" 11

     

       333
       333
       -
         in

     

       334
       334
       -
         let check_day_of_week instance day_list =

     

       335
       335
       -
           let date = instance.Recur.start in

     

       336
       336
       -
           let weekday =

     

       337
       337
       -
             match Ptime.weekday ~tz_offset_s:0 date with

     

       338
       338
       -
             | `Mon -> 1

     

       339
       339
       -
             | `Tue -> 2

     

       340
       340
       -
             | `Wed -> 3

     

       341
       341
       -
             | `Thu -> 4

     

       342
       342
       -
             | `Fri -> 5

     

       343
       343
       -
             | `Sat -> 6

     

       344
       344
       -
             | `Sun -> 0

     

       345
       345
       -
           in

     

       346
       346
       -
           List.mem weekday day_list

     

       347
       347
       -
         in

     

       348
       348
       -
         let all_on_mon_wed =

     

       349
       349
       -
           List.for_all

     

       350
       350
       -
             (fun instance ->

     

       351
       351
       -
               check_day_of_week instance [ 1; 3 ] (* Monday = 1, Wednesday = 3 *))

     

       352
       352
       -
             instances

     

       353
       353
       -
         in

     

       354
       354
       -
         Alcotest.(check bool)

     

       355
       355
       -
           "All instances should be on Monday or Wednesday" true all_on_mon_wed

     

       356
       356
       -
       

     

       357
       357
       -
       let test_weekly_weekends ~fs () =

     

       358
       358
       -
         let instances =

     

       359
       359
       -
           test_recurrence_expansion ~fs "14_weekly_weekends.ics" "2025-05-01"

     

       360
       360
       -
             "2025-06-30" 18

     

       361
       361
       -
         in

     

       362
       362
       -
         let check_day_of_week instance day_list =

     

       363
       363
       -
           let date = instance.Recur.start in

     

       364
       364
       -
           let weekday =

     

       365
       365
       -
             match Ptime.weekday ~tz_offset_s:0 date with

     

       366
       366
       -
             | `Mon -> 1

     

       367
       367
       -
             | `Tue -> 2

     

       368
       368
       -
             | `Wed -> 3

     

       369
       369
       -
             | `Thu -> 4

     

       370
       370
       -
             | `Fri -> 5

     

       371
       371
       -
             | `Sat -> 6

     

       372
       372
       -
             | `Sun -> 0

     

       373
       373
       -
           in

     

       374
       374
       -
           List.mem weekday day_list

     

       375
       375
       -
         in

     

       376
       376
       -
         let all_on_weekends =

     

       377
       377
       -
           List.for_all

     

       378
       378
       -
             (fun instance ->

     

       379
       379
       -
               check_day_of_week instance [ 6; 0 ] (* Saturday = 6, Sunday = 0 *))

     

       380
       380
       -
             instances

     

       381
       381
       -
         in

     

       382
       382
       -
         Alcotest.(check bool)

     

       383
       383
       -
           "All instances should be on Saturday or Sunday" true all_on_weekends

     

       384
       384
       -
       

     

       385
       385
       -
       let test_monthly_specific_day ~fs () =

     

       386
       386
       -
         let instances =

     

       387
       387
       -
           test_recurrence_expansion ~fs "15_monthly_specific_day.ics" "2025-01-01"

     

       388
       388
       -
             "2025-12-31" 8

     

       389
       389
       -
         in

     

       390
       390
       -
         (* Verify all instances are on the same day of month *)

     

       391
       391
       -
         let first_instance = List.hd instances in

     

       392
       392
       -
         let (_, _, first_day), _ = Ptime.to_date_time first_instance.Recur.start in

     

       393
       393
       -
         let all_same_day =

     

       394
       394
       -
           List.for_all

     

       395
       395
       -
             (fun instance ->

     

       396
       396
       -
               let (_, _, day), _ = Ptime.to_date_time instance.Recur.start in

     

       397
       397
       -
               day = first_day)

     

       398
       398
       -
             instances

     

       399
       399
       -
         in

     

       400
       400
       -
         Alcotest.(check bool)

     

       401
       401
       -
           (Printf.sprintf "All instances should be on day %d of the month" first_day)

     

       402
       402
       -
           true all_same_day

     

       403
       403
       -
       

     

       404
       404
       -
       let test_monthly_second_monday ~fs () =

     

       405
       405
       -
         let instances =

     

       406
       406
       -
           test_recurrence_expansion ~fs "16_monthly_second_monday.ics" "2025-05-01"

     

       407
       407
       -
             "2026-04-30" 11

     

       408
       408
       -
         in

     

       409
       409
       -
         let check_day_of_week instance =

     

       410
       410
       -
           let date = instance.Recur.start in

     

       411
       411
       -
           let weekday =

     

       412
       412
       -
             match Ptime.weekday ~tz_offset_s:0 date with `Mon -> true | _ -> false

     

       413
       413
       -
           in

     

       414
       414
       -
           let (_, _, day), _ = Ptime.to_date_time date in

     

       415
       415
       -
           weekday && day >= 8 && day <= 14 (* Second Monday is between 8th and 14th *)

     

       416
       416
       -
         in

     

       417
       417
       -
         let all_second_mondays = List.for_all check_day_of_week instances in

     

       418
       418
       -
         Alcotest.(check bool)

     

       419
       419
       -
           "All instances should be on the second Monday of each month" true

     

       420
       420
       -
           all_second_mondays

     

       421
       421
       -
       

     

       422
       422
       -
       let test_monthly_last_day ~fs () =

     

       423
       423
       -
         let instances =

     

       424
       424
       -
           test_recurrence_expansion ~fs "17_monthly_last_day.ics" "2025-05-01"

     

       425
       425
       -
             "2026-04-30" 11

     

       426
       426
       -
         in

     

       427
       427
       -
         let is_last_day_of_month instance =

     

       428
       428
       -
           let date = instance.Recur.start in

     

       429
       429
       -
           let (year, month, day), _ = Ptime.to_date_time date in

     

       430
       430
       -
           let last_day =

     

       431
       431
       -
             match month with

     

       432
       432
       -
             | 2 ->

     

       433
       433
       -
                 if (year mod 4 = 0 && year mod 100 <> 0) || year mod 400 = 0 then 29

     

       434
       434
       -
                 else 28

     

       435
       435
       -
             | 4 | 6 | 9 | 11 -> 30

     

       436
       436
       -
             | _ -> 31

     

       437
       437
       -
           in

     

       438
       438
       -
           day = last_day

     

       439
       439
       -
         in

     

       440
       440
       -
         let all_last_days = List.for_all is_last_day_of_month instances in

     

       441
       441
       -
         Alcotest.(check bool)

     

       442
       442
       -
           "All instances should be on the last day of each month" true all_last_days

     

       443
       443
       -
       

     

       444
       444
       -
       let test_yearly_specific_date ~fs () =

     

       445
       445
       -
         let instances =

     

       446
       446
       -
           test_recurrence_expansion ~fs "18_yearly_specific_date.ics" "2025-01-01"

     

       447
       447
       -
             "2035-12-31" 11

     

       448
       448
       -
         in

     

       449
       449
       -
         (* Verify all instances are on the same month and day *)

     

       450
       450
       -
         let first_instance = List.hd instances in

     

       451
       451
       -
         let (_, first_month, first_day), _ =

     

       452
       452
       -
           Ptime.to_date_time first_instance.Recur.start

     

       453
       453
       -
         in

     

       454
       454
       -
         let all_same_date =

     

       455
       455
       -
           List.for_all

     

       456
       456
       -
             (fun instance ->

     

       457
       457
       -
               let (_, month, day), _ = Ptime.to_date_time instance.Recur.start in

     

       458
       458
       -
               month = first_month && day = first_day)

     

       459
       459
       -
             instances

     

       460
       460
       -
         in

     

       461
       461
       -
         Alcotest.(check bool)

     

       462
       462
       -
           (Printf.sprintf "All instances should be on %d/%d" first_month first_day)

     

       463
       463
       -
           true all_same_date

     

       464
       464
       -
       

     

       465
       465
       -
       let test_yearly_mothers_day ~fs () =

     

       466
       466
       -
         let instances =

     

       467
       467
       -
           test_recurrence_expansion ~fs "19_yearly_mothers_day.ics" "2025-01-01"

     

       468
       468
       -
             "2035-12-31" 10

     

       469
       469
       -
         in

     

       470
       470
       -
         let is_second_sunday_in_may instance =

     

       471
       471
       -
           let date = instance.Recur.start in

     

       472
       472
       -
           let (_, month, day), _ = Ptime.to_date_time date in

     

       473
       473
       -
           let is_sunday =

     

       474
       474
       -
             match Ptime.weekday ~tz_offset_s:0 date with `Sun -> true | _ -> false

     

       475
       475
       -
           in

     

       476
       476
       -
           month = 5 && is_sunday && day >= 8

     

       477
       477
       -
           && day <= 14 (* Second Sunday is between 8th and 14th *)

     

       478
       478
       -
         in

     

       479
       479
       -
         let all_mothers_days = List.for_all is_second_sunday_in_may instances in

     

       480
       480
       -
         Alcotest.(check bool)

     

       481
       481
       -
           "All instances should be on the second Sunday in May" true all_mothers_days

     

       482
       482
       -
       

     

       483
       483
       -
       let test_complex_weekdays_months ~fs () =

     

       484
       484
       -
         let instances =

     

       485
       485
       -
           test_recurrence_expansion ~fs "20_complex_weekdays_months.ics" "2025-05-01"

     

       486
       486
       -
             "2025-09-30" 26

     

       487
       487
       -
         in

     

       488
       488
       -
         let is_tue_thu_in_summer instance =

     

       489
       489
       -
           let date = instance.Recur.start in

     

       490
       490
       -
           let (_, month, _), _ = Ptime.to_date_time date in

     

       491
       491
       -
           let is_tue_thu =

     

       492
       492
       -
             match Ptime.weekday ~tz_offset_s:0 date with

     

       493
       493
       -
             | `Tue | `Thu -> true

     

       494
       494
       -
             | _ -> false

     

       495
       495
       -
           in

     

       496
       496
       -
           is_tue_thu && (month = 6 || month = 7 || month = 8)

     

       497
       497
       -
           (* Jun, Jul, Aug *)

     

       498
       498
       -
         in

     

       499
       499
       -
         let all_valid = List.for_all is_tue_thu_in_summer instances in

     

       500
       500
       -
         Alcotest.(check bool)

     

       501
       501
       -
           "All instances should be on Tuesday/Thursday in summer months" true

     

       502
       502
       -
           all_valid

     

       503
       503
       -
       

     

       504
       504
       -
       let test_complex_multiple_monthdays ~fs () =

     

       505
       505
       -
         let instances =

     

       506
       506
       -
           test_recurrence_expansion ~fs "21_complex_multiple_monthdays.ics"

     

       507
       507
       -
             "2025-05-01" "2026-05-31" 38

     

       508
       508
       -
         in

     

       509
       509
       -
         (* Verify instances fall on the specified days (1st, 15th, or last day of month) *)

     

       510
       510
       -
         let valid_day =

     

       511
       511
       -
          fun day month ->

     

       512
       512
       -
           day = 1 || day = 15

     

       513
       513
       -
           || (month = 1 && day = 31)

     

       514
       514
       -
           (* not a leap year *)

     

       515
       515
       -
           || (month = 2 && day = 28)

     

       516
       516
       -
           || (month = 3 && day = 31)

     

       517
       517
       -
           || (month = 4 && day = 30)

     

       518
       518
       -
           || (month = 5 && day = 31)

     

       519
       519
       -
           || (month = 6 && day = 30)

     

       520
       520
       -
           || (month = 7 && day = 31)

     

       521
       521
       -
           || (month = 8 && day = 31)

     

       522
       522
       -
           || (month = 9 && day = 30)

     

       523
       523
       -
           || (month = 10 && day = 31)

     

       524
       524
       -
           || (month = 11 && day = 30)

     

       525
       525
       -
           || (month = 12 && day = 31)

     

       526
       526
       -
         in

     

       527
       527
       -
         let all_valid_days =

     

       528
       528
       -
           List.for_all

     

       529
       529
       -
             (fun instance ->

     

       530
       530
       -
               let (_, month, day), _ = Ptime.to_date_time instance.Recur.start in

     

       531
       531
       -
               valid_day day month)

     

       532
       532
       -
             instances

     

       533
       533
       -
         in

     

       534
       534
       -
         Alcotest.(check bool)

     

       535
       535
       -
           "All instances should be on 1st, 15th, or last day of month" true

     

       536
       536
       -
           all_valid_days

     

       537
       537
       -
       

     

       538
       538
       -
       let test_with_exdate ~fs () =

     

       539
       539
       -
         let instances =

     

       540
       540
       -
           test_recurrence_expansion ~fs "22_with_exdate.ics" "2025-05-01" "2025-06-30"

     

       541
       541
       -
             9

     

       542
       542
       -
         in

     

       543
       543
       -
         (* Verify that excluded dates (May 15 and May 29) are not in the instances *)

     

       544
       544
       -
         let excluded_dates = [ parse_date "2025-05-15"; parse_date "2025-05-29" ] in

     

       545
       545
       -
         let no_excluded_dates =

     

       546
       546
       -
           List.for_all

     

       547
       547
       -
             (fun instance ->

     

       548
       548
       -
               let check_not_excluded excluded =

     

       549
       549
       -
                 Ptime.compare instance.Recur.start excluded <> 0

     

       550
       550
       -
               in

     

       551
       551
       -
               List.for_all check_not_excluded excluded_dates)

     

       552
       552
       -
             instances

     

       553
       553
       -
         in

     

       554
       554
       -
         Alcotest.(check bool)

     

       555
       555
       -
           "No instances should be on excluded dates" true no_excluded_dates;

     

       556
       556
       -
         (* Weekly recurrence should have 9 instances in this period *)

     

       557
       557
       -
         Alcotest.(check int) "Should have 9 instances" 9 (List.length instances)

     

       558
       558
       -
       

     

       559
       559
       -
       let test_dst_transition ~fs () =

     

       560
       560
       -
         (* This event occurs from 2025-10-27 to 2025-11-17 *)

     

       561
       561
       -
         let instances =

     

       562
       562
       -
           test_recurrence_expansion ~fs "23_dst_transition.ics" "2025-10-01"

     

       563
       563
       -
             "2025-11-30" 4

     

       564
       564
       -
         in

     

       565
       565
       -
         Alcotest.(check int)

     

       566
       566
       -
           "Should have 4 instances across DST transition" 4 (List.length instances);

     

       567
       567
       -
         (* Check each consecutive pair of dates *)

     

       568
       568
       -
         ignore

     

       569
       569
       -
           (List.fold_left

     

       570
       570
       -
              (fun prev curr ->

     

       571
       571
       -
                let span = Ptime.diff curr.Recur.start prev.Recur.start in

     

       572
       572
       -
                let days_diff =

     

       573
       573
       -
                  Ptime.Span.to_float_s span /. float_of_int day_seconds

     

       574
       574
       -
                  |> Float.round |> int_of_float

     

       575
       575
       -
                in

     

       576
       576
       -
                Alcotest.(check int)

     

       577
       577
       -
                  (Printf.sprintf "Days diff should be 7 days")

     

       578
       578
       -
                  7 days_diff;

     

       579
       579
       -
                curr)

     

       580
       580
       -
              (List.hd instances) (List.tl instances))

     

       581
       581
       -
       

     

       582
       582
       -
       let test_long_interval ~fs () =

     

       583
       583
       -
         let instances =

     

       584
       584
       -
           test_recurrence_expansion ~fs "24_long_interval.ics" "2025-05-01"

     

       585
       585
       -
             "2026-05-31" 4

     

       586
       586
       -
         in

     

       587
       587
       -
         verify_instance_spacing instances 100

     

       588
       588
       -
       

     

       589
       589
       -
       let test_leap_day ~fs () =

     

       590
       590
       -
         let instances =

     

       591
       591
       -
           test_recurrence_expansion ~fs "25_leap_day.ics" "2028-01-01" "2036-12-31" 3

     

       592
       592
       -
         in

     

       593
       593
       -
         Alcotest.(check int)

     

       594
       594
       -
           "Should have 3 leap day instances" 3 (List.length instances);

     

       595
       595
       -
         let all_leap_days =

     

       596
       596
       -
           List.for_all

     

       597
       597
       -
             (fun instance ->

     

       598
       598
       -
               let (_, month, day), _ = Ptime.to_date_time instance.Recur.start in

     

       599
       599
       -
               month = 2 && day = 29)

     

       600
       600
       -
             instances

     

       601
       601
       -
         in

     

       602
       602
       -
         Alcotest.(check bool)

     

       603
       603
       -
           "All instances should be on February 29" true all_leap_days;

     

       604
       604
       -
         let years =

     

       605
       605
       -
           List.map

     

       606
       606
       -
             (fun instance ->

     

       607
       607
       -
               let (year, _, _), _ = Ptime.to_date_time instance.Recur.start in

     

       608
       608
       -
               year)

     

       609
       609
       -
             instances

     

       610
       610
       -
           |> List.sort_uniq compare

     

       611
       611
       -
         in

     

       612
       612
       -
         let expected_years = [ 2028; 2032; 2036 ] in

     

       613
       613
       -
         Alcotest.(check (list int))

     

       614
       614
       -
           "Should have instances in leap years 2028, 2032, and 2036" expected_years

     

       615
       615
       -
           years

     

       616
       616
       -
       

     

       617
       617
       -
       let test_weekly_wkst ~fs () =

     

       618
       618
       -
         let instances =

     

       619
       619
       -
           test_recurrence_expansion ~fs "26_weekly_wkst.ics" "2025-05-01" "2025-05-31"

     

       620
       620
       -
             4

     

       621
       621
       -
         in

     

       622
       622
       -
         (* Verify we get exactly 4 instances (COUNT=4) *)

     

       623
       623
       -
         Alcotest.(check int)

     

       624
       624
       -
           "Should have exactly 4 instances" 4 (List.length instances);

     

       625
       625
       -
         verify_instance_spacing instances 7

     

       626
       626
       -
       

     

       627
       627
       -
       let test_monthly_nth_weekday ~fs () =

     

       628
       628
       -
         let instances =

     

       629
       629
       -
           test_recurrence_expansion ~fs "27_monthly_nth_weekday.ics" "2025-05-01"

     

       630
       630
       -
             "2026-04-30" 11

     

       631
       631
       -
         in

     

       632
       632
       -
         let is_third_sunday instance =

     

       633
       633
       -
           let date = instance.Recur.start in

     

       634
       634
       -
           let is_sunday =

     

       635
       635
       -
             match Ptime.weekday ~tz_offset_s:0 date with `Sun -> true | _ -> false

     

       636
       636
       -
           in

     

       637
       637
       -
           let (_, _, day), _ = Ptime.to_date_time date in

     

       638
       638
       -
           is_sunday && day >= 15

     

       639
       639
       -
           && day <= 21 (* Third Sunday is between 15th and 21st *)

     

       640
       640
       -
         in

     

       641
       641
       -
         let all_third_sundays = List.for_all is_third_sunday instances in

     

       642
       642
       -
         Alcotest.(check bool)

     

       643
       643
       -
           "All instances should be on the third Sunday of each month" true

     

       644
       644
       -
           all_third_sundays

     

       645
       645
       -
       

     

       646
       646
       -
       let test_yearly_historical ~fs () =

     

       647
       647
       -
         let instances =

     

       648
       648
       -
           test_recurrence_expansion ~fs "28_yearly_historical.ics" "2000-01-01"

     

       649
       649
       -
             "2011-01-01" 11

     

       650
       650
       -
         in

     

       651
       651
       -
         (* Verify instances are yearly and end by 2010-12-31 *)

     

       652
       652
       -
         let all_before_2011 =

     

       653
       653
       -
           List.for_all

     

       654
       654
       -
             (fun instance ->

     

       655
       655
       -
               let (year, _, _), _ = Ptime.to_date_time instance.Recur.start in

     

       656
       656
       -
               year <= 2010)

     

       657
       657
       -
             instances

     

       658
       658
       -
         in

     

       659
       659
       -
         Alcotest.(check bool)

     

       660
       660
       -
           "All instances should be before 2011" true all_before_2011;

     

       661
       661
       -
         ()

     

       662
       662
       -
       

     

       663
       663
       -
       let test_monthly_bymonth ~fs () =

     

       664
       664
       -
         let instances =

     

       665
       665
       -
           test_recurrence_expansion ~fs "29_monthly_bymonth.ics" "2025-01-01"

     

       666
       666
       -
             "2026-12-31" 8

     

       667
       667
       -
         in

     

       668
       668
       -
         let is_specified_month instance =

     

       669
       669
       -
           let date = instance.Recur.start in

     

       670
       670
       -
           let (_, month, _), _ = Ptime.to_date_time date in

     

       671
       671
       -
           month = 3 || month = 6 || month = 9 || month = 12 (* Mar, Jun, Sep, Dec *)

     

       672
       672
       -
         in

     

       673
       673
       -
         let all_specified_months = List.for_all is_specified_month instances in

     

       674
       674
       -
         Alcotest.(check bool)

     

       675
       675
       -
           "All instances should be in Mar, Jun, Sep, or Dec" true all_specified_months;

     

       676
       676
       -
         ()

     

       677
       677
       -
       

     

       678
       678
       -
       let test_fourth_weekday ~fs () =

     

       679
       679
       -
         let instances =

     

       680
       680
       -
           test_recurrence_expansion ~fs "30_fourth_weekday.ics" "2025-01-01"

     

       681
       681
       -
             "2035-12-31" 10

     

       682
       682
       -
         in

     

       683
       683
       -
         let is_fourth_sunday_in_october instance =

     

       684
       684
       -
           let date = instance.Recur.start in

     

       685
       685
       -
           let (_, month, day), _ = Ptime.to_date_time date in

     

       686
       686
       -
           let is_sunday =

     

       687
       687
       -
             match Ptime.weekday ~tz_offset_s:0 date with `Sun -> true | _ -> false

     

       688
       688
       -
           in

     

       689
       689
       -
           month = 10 && is_sunday && day >= 22

     

       690
       690
       -
           && day <= 28 (* Fourth Sunday is between 22nd and 28th *)

     

       691
       691
       -
         in

     

       692
       692
       -
         let all_fourth_sundays = List.for_all is_fourth_sunday_in_october instances in

     

       693
       693
       -
         Alcotest.(check bool)

     

       694
       694
       -
           "All instances should be on the fourth Sunday in October" true

     

       695
       695
       -
           all_fourth_sundays

     

       696
       696
       -
       

     

       697
       697
       -
       let recur_expand_tests ~fs =

     

       698
       698
       -
         [

     

       699
       699
       -
           ( "recurring events in date range",

     

       700
       700
       -
             `Quick,

     

       701
       701
       -
             test_recurring_events_in_date_range );

     

       702
       702
       -
           ("daily recurrence", `Quick, test_daily ~fs);

     

       703
       703
       -
           ("weekly recurrence", `Quick, test_weekly ~fs);

     

       704
       704
       -
           ("monthly recurrence", `Quick, test_monthly ~fs);

     

       705
       705
       -
           ("yearly recurrence", `Quick, test_yearly ~fs);

     

       706
       706
       -
           ("every 2 days", `Quick, test_every_2_days ~fs);

     

       707
       707
       -
           ("every 3 weeks", `Quick, test_every_3_weeks ~fs);

     

       708
       708
       -
           ("bimonthly", `Quick, test_bimonthly ~fs);

     

       709
       709
       -
           ("biennial", `Quick, test_biennial ~fs);

     

       710
       710
       -
           ("daily with count=5", `Quick, test_daily_count5 ~fs);

     

       711
       711
       -
           ("weekly with count=10", `Quick, test_weekly_count10 ~fs);

     

       712
       712
       -
           ("daily until", `Quick, test_daily_until ~fs);

     

       713
       713
       -
           ("weekly until", `Quick, test_weekly_until ~fs);

     

       714
       714
       -
           ("weekly on Monday/Wednesday", `Quick, test_weekly_monday_wednesday ~fs);

     

       715
       715
       -
           ("weekly on weekends", `Quick, test_weekly_weekends ~fs);

     

       716
       716
       -
           ("monthly on specific day", `Quick, test_monthly_specific_day ~fs);

     

       717
       717
       -
           ("monthly on second Monday", `Quick, test_monthly_second_monday ~fs);

     

       718
       718
       -
           ("monthly on last day", `Quick, test_monthly_last_day ~fs);

     

       719
       719
       -
           ("yearly on specific date", `Quick, test_yearly_specific_date ~fs);

     

       720
       720
       -
           ("yearly on Mother's Day", `Quick, test_yearly_mothers_day ~fs);

     

       721
       721
       -
           ("complex weekdays and months", `Quick, test_complex_weekdays_months ~fs);

     

       722
       722
       -
           ("complex multiple month days", `Quick, test_complex_multiple_monthdays ~fs);

     

       723
       723
       -
           ("with excluded dates", `Quick, test_with_exdate ~fs);

     

       724
       724
       -
           ("DST transition handling", `Quick, test_dst_transition ~fs);

     

       725
       725
       -
           ("long interval", `Quick, test_long_interval ~fs);

     

       726
       726
       -
           ("leap day handling", `Quick, test_leap_day ~fs);

     

       727
       727
       -
           ("weekly with week start", `Quick, test_weekly_wkst ~fs);

     

       728
       728
       -
           ("monthly on nth weekday", `Quick, test_monthly_nth_weekday ~fs);

     

       729
       729
       -
           ("yearly historical", `Quick, test_yearly_historical ~fs);

     

       730
       730
       -
           ("monthly by month", `Quick, test_monthly_bymonth ~fs);

     

       731
       731
       -
           ("fourth weekday", `Quick, test_fourth_weekday ~fs);

     

       732
       732
       -
         ]

     

       733
       733
       -
       

     

       734
       734
       -
       let () =

     

       735
       735
       -
         Eio_main.run @@ fun env ->

     

       736
       736
       -
         let fs = Eio.Stdenv.fs env in

     

       737
       737
       -
         Alcotest.run "Recur Expansion Tests"

     

       738
       738
       -
           [ ("recur_expand", recur_expand_tests ~fs) ]