comparing 6c6e6ee5e70f36fd183de834d9dbc3be252c2c05 and main on ryan.freumh.org/caledonia

CHANGELOG.md

···

       1
       1
       +
       

     

       2
       2
       +
       ### 0.4.0

     

       3
       3
       +
       

     

       4
       4
       +
       - Emacs front end that communicates with a server mode via an S-expression protocol

     

       5
       5
       +
       

     

       6
       6
       +
       ### 0.3.1

     

       7
       7
       +
       

     

       8
       8
       +
       - various bugfixes and tweaks

     

       1
       9
        
       

     

       2
       10
        
       ### 0.3.0

     

       3
       11

+43 -4

README.md

···

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

     

       1
       1
       +
       # Caledonia

     

       2
       2
       +
       

     

       3
       3
       +
       Caledonia is a calendar client with command-line and Emacs front-ends.

     

       4
       4
       +
       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), which allows it to interact with CalDAV servers.

     

       5
       5
       +
       

     

       6
       6
       +
       The command-line has the `list`, `search`, `show`, `add`, `delete`, and `edit` subcommands, and has full timezone support.

     

       7
       7
       +
       

     

       8
       8
       +
       An example `list` invocation is,

     

       9
       9
       +
       

     

       10
       10
       +
       ```

     

       11
       11
       +
       $ caled list

     

       12
       12
       +
       personal   2025-04-04 Fri 13:00 - 14:00 (America/New_York) New York 8am meeting      054bb346-b24f-49f4-80ab-fcb6040c19a7

     

       13
       13
       +
       family     2025-04-06 Sun 21:00 - 22:00 (UTC)              Family chat @Video call   3B84B125-6EFC-4E1C-B35A-97EFCA61110E

     

       14
       14
       +
       work       2025-04-09 Wed 15:00 - 16:00 (Europe/London)    Weekly Meeting            4adcb98dfc1848601e38c2ea55edf71fab786c674d7b72d4c263053b23560a8d

     

       15
       15
       +
       personal   2025-04-10 Thu 11:00 - 12:00 (UTC)              Dentist                   ccef66cd4d1e87ae7319097f027f8322de67f758

     

       16
       16
       +
       family     2025-04-13 Sun 21:00 - 22:00 (UTC)              Family chat @Video call   3B84B125-6EFC-4E1C-B35A-97EFCA61110E

     

       17
       17
       +
       personal   2025-04-15 Tue - 2025-04-17 Thu                 John Doe in town          33cf18ec-90d3-40f8-8335-f338fbdb395b

     

       18
       18
       +
       personal   2025-04-15 Tue 21:00 - 21:30 (UTC)              Grandma call              8601c255-65fc-4bc9-baa9-465dd7b4cd7d

     

       19
       19
       +
       work       2025-04-16 Wed 15:00 - 16:00 (Europe/London)    Weekly Meeting            4adcb98dfc1848601e38c2ea55edf71fab786c674d7b72d4c263053b23560a8d

     

       20
       20
       +
       personal   2025-04-19 Sat                                  Jane Doe's birthday       7hm4laoadevr1ene8o876f2576@google.com

     

       21
       21
       +
       family     2025-04-20 Sun 21:00 - 22:00 (UTC)              Family chat @Video call   3B84B125-6EFC-4E1C-B35A-97EFCA61110E

     

       22
       22
       +
       personal   2025-04-22 Tue 21:00 - 21:30 (UTC)              Grandma call              8601c255-65fc-4bc9-baa9-465dd7b4cd7d

     

       23
       23
       +
       work       2025-04-23 Wed 15:00 - 16:00 (Europe/London)    Weekly Meeting            4adcb98dfc1848601e38c2ea55edf71fab786c674d7b72d4c263053b23560a8d

     

       24
       24
       +
       family     2025-04-27 Sun 21:00 - 22:00 (UTC)              Family chat @Video call   3B84B125-6EFC-4E1C-B35A-97EFCA61110E

     

       25
       25
       +
       personal   2025-04-29 Tue 21:00 - 21:30 (UTC)              Grandma call              8601c255-65fc-4bc9-baa9-465dd7b4cd7d

     

       26
       26
       +
       work       2025-04-30 Wed 15:00 - 16:00 (Europe/London)    Weekly Meeting            4adcb98dfc1848601e38c2ea55edf71fab786c674d7b72d4c263053b23560a8d

     

       27
       27
       +
       ```

     

       2
       28
        
       

     

       3
       3
       -
       Caledonia is a command-line calendar client.

     

       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.

     

       29
       29
       +
       The Emacs client is defined in [./emacs](./emacs) and communicates with `caled server` using a [S-expression](https://en.wikipedia.org/wiki/S-expression) based protocol.

     

       30
       30
       +
       

     

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

     

       32
       32
       +
       

     

       33
       33
       +
       ## Installation

     

       34
       34
       +
       

     

       35
       35
       +
       With [opam](https://opam.ocaml.org/),

     

       36
       36
       +
       

     

       37
       37
       +
       ```

     

       38
       38
       +
       $ opam install .

     

       39
       39
       +
       ```

     

       40
       40
       +
       

     

       41
       41
       +
       With [Nix](https://nixos.org/),

     

       42
       42
       +
       

     

       43
       43
       +
       ```

     

       44
       44
       +
       $ nix shell 'git+https://tangled.sh/@ryan.freumh.org/caledonia?ref=main'

     

       45
       45
       +
       ```

     

       7
       46
        
       

     

       8
       47
        
       ## Configuration

     

       9
       48

+33 -28

TODO.org

···

       1
       1
       -
       - [x] list/search events

     

       2
       2
       -
       - [x] add/remove events

     

       3
       3
       -
       - [x] edit events

     

       4
       4
       -
       - [x] timezones

     

       5
       5
       -
       - [ ] allow editting recurrence-ids

     

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

     

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

     

       8
       8
       -
       - [ ] support specifying duration

     

       9
       9
       -
       - [ ] diagnose events failing to parse

     

       10
       10
       -
         - [[https://github.com/robur-coop/icalendar/issues/14]]

     

       11
       11
       -
       - [ ] [[https://github.com/robur-coop/icalendar/pull/13][handle RECURRENCE-ID]]

     

       12
       12
       -
       - [ ] [[https://github.com/robur-coop/icalendar/issues/15][RRULE with local datetime]]

     

       13
       13
       -
       - [ ] CalDAV syncing

     

       14
       14
       -
         - Currently, you can use [[https://github.com/pimutils/vdirsyncer][vdirsyncer]]

     

       15
       15
       -
       - [ ] support querying times as well as dates

     

       16
       16
       -
       - [ ] custom date/time formatting

     

       17
       17
       -
       - [ ] support querying regex

     

       18
       18
       -
       - [ ] support VTIMEZONE

     

       19
       19
       -
       - [ ] support VALARMS

     

       20
       20
       -
       - [ ] support VOTODS

     

       21
       21
       -
       - [ ] support VCARDS

     

       22
       22
       -
       - [ ] server mode

     

       23
       23
       -
         - and maybe hold =Event='s in-memory in a =Collection= instead of parsing them for every =Query=

     

       24
       24
       -
       - [ ] implement TUI front end with something like [[https://github.com/leostera/minttea][minttea]]

     

       25
       25
       -
       - [ ] implement an emacs client like mu4e

     

       26
       26
       -
       - [ ] parallel queries

     

       27
       27
       -
       - [ ] remove collection module

     

       28
       28
       -
         - ref [[https://github.com/ocaml-ppx/ppxlib/issues/481]] cc patrick

     

       1
       1
       +
       * DONE list/search events

     

       2
       2
       +
       * DONE add/remove events

     

       3
       3
       +
       * DONE edit events

     

       4
       4
       +
       * DONE timezones

     

       5
       5
       +
       * DONE diagnose events failing to parse [[https://github.com/robur-coop/icalendar/issues/14]]

     

       6
       6
       +
       * DONE [[https://github.com/robur-coop/icalendar/pull/13][handle RECURRENCE-ID]]

     

       7
       7
       +
       * DONE [[https://github.com/robur-coop/icalendar/issues/15][RRULE with local datetime]]

     

       8
       8
       +
       * DONE server mode

     

       9
       9
       +
       * DONE hold =Event='s in-memory instead of parsing them for every =Query=

     

       10
       10
       +
       * TODO support vdir metadata

     

       11
       11
       +
       * TODO add timezone all date functions

     

       12
       12
       +
       * TODO allow editing recurrence-ids

     

       13
       13
       +
       * TODO support specifying duration

     

       14
       14
       +
       * TODO CalDAV syncing

     

       15
       15
       +
       * TODO support complex datetime queries

     

       16
       16
       +
       * TODO custom date/time formatting

     

       17
       17
       +
       * TODO support querying text with regex

     

       18
       18
       +
       * TODO support VTIMEZONE

     

       19
       19
       +
       * TODO support VALARMS

     

       20
       20
       +
       * TODO support VOTODS

     

       21
       21
       +
       * TODO support VCARDS

     

       22
       22
       +
       * TODO support VJOURNAL

     

       23
       23
       +
       * TODO implement TUI front end with something like [[https://github.com/leostera/minttea][minttea]]

     

       24
       24
       +
       * TODO implement an emacs front end, like mu4e to mu

     

       25
       25
       +
       ** DONE listing, searching, querying

     

       26
       26
       +
       ** DONE show details

     

       27
       27
       +
       ** DONE show file

     

       28
       28
       +
       ** DONE refresh

     

       29
       29
       +
       ** DONE list possible calendars

     

       30
       30
       +
       ** DONE add functions and bindings to change query parameters on the fly

     

       31
       31
       +
       ** TODO timezone support

     

       32
       32
       +
       ** TODO support adding, deleting, and editing events

     

       33
       33
       +
       ** TODO add a org-agenda style view for caledonia-list

+58 -68

bin/add_cmd.ml

···

       3
       3
        
       open Event_args

     

       4
       4
        
       

     

       5
       5
        
       let run ~summary ~start_date ~start_time ~end_date ~end_time ~location

     

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

     

       6
       6
       +
           ~description ~recur ~calendar_name ?timezone ?end_timezone ~fs calendar_dir

     

       7
       7
       +
           =

     

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

     

       8
       9
        
         let* start = parse_start ~start_date ~start_time ~timezone in

     

       9
       10
        
         let* start =

     
···

       11
       12
        
           | Some s -> Ok s

     

       12
       13
        
           | None -> Error (`Msg "Start date required")

     

       13
       14
        
         in

     

       14
       14
       -
         let* end_ = parse_end ~end_date ~end_time ~timezone ~end_timezone in

     

       15
       15
       +
         let* end_ =

     

       16
       16
       +
           (* if we have an endtime and no end date default to start date *)

     

       17
       17
       +
           let end_date =

     

       18
       18
       +
             match (end_date, end_time) with

     

       19
       19
       +
             | None, Some _ -> start_date

     

       20
       20
       +
             | _ -> end_date

     

       21
       21
       +
           in

     

       22
       22
       +
           (* if we have a start date and no end date default to start date *)

     

       23
       23
       +
           let end_date =

     

       24
       24
       +
             match (start_date, end_date) with

     

       25
       25
       +
             | Some _, None -> start_date

     

       26
       26
       +
             | _ -> end_date

     

       27
       27
       +
           in

     

       28
       28
       +
           let end_timezone =

     

       29
       29
       +
             (* if we specify and end date and time without a end timezone, default to the start timezone *)

     

       30
       30
       +
             match (end_date, end_time, end_timezone) with

     

       31
       31
       +
             | Some _, Some _, None -> timezone

     

       32
       32
       +
             | _ -> end_timezone

     

       33
       33
       +
           in

     

       34
       34
       +
           parse_end ~end_date ~end_time ~end_timezone

     

       35
       35
       +
         in

     

       15
       36
        
         let* recurrence =

     

       16
       37
        
           match recur with

     

       17
       38
        
           | Some r ->

     
···

       19
       40
        
               Ok (Some p)

     

       20
       41
        
           | None -> Ok None

     

       21
       42
        
         in

     

       22
       22
       -
         let collection = Collection.Col collection in

     

       23
       23
       -
         let event =

     

       43
       43
       +
         let calendar_name = calendar_name in

     

       44
       44
       +
         let* event =

     

       24
       45
        
           Event.create ~fs

     

       25
       46
        
             ~calendar_dir_path:(Calendar_dir.get_path calendar_dir)

     

       26
       26
       -
             ~summary ~start ?end_ ?location ?description ?recurrence collection

     

       47
       47
       +
             ~summary ~start ?end_ ?location ?description ?recurrence calendar_name

     

       27
       48
        
         in

     

       28
       28
       -
         let* _ = Calendar_dir.add_event ~fs calendar_dir event in

     

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

     

       50
       50
       +
         let* _ = Calendar_dir.add_event ~fs calendar_dir events event in

     

       29
       51
        
         Printf.printf "Event created with ID: %s\n" (Event.get_id event);

     

       30
       52
        
         Ok ()

     

       31
       53
        
       

     

       32
       54
        
       let cmd ~fs calendar_dir =

     

       33
       55
        
         let run summary start_date start_time end_date end_time location description

     

       34
       34
       -
             recur collection timezone end_timezone =

     

       56
       56
       +
             recur calendar_name timezone end_timezone () =

     

       35
       57
        
           match

     

       36
       58
        
             run ~summary ~start_date ~start_time ~end_date ~end_time ~location

     

       37
       37
       -
               ~description ~recur ~collection ?timezone ?end_timezone ~fs calendar_dir

     

       59
       59
       +
               ~description ~recur ~calendar_name ?timezone ?end_timezone ~fs

     

       60
       60
       +
               calendar_dir

     

       38
       61
        
           with

     

       39
       62
        
           | Error (`Msg msg) ->

     

       40
       63
        
               Printf.eprintf "Error: %s\n%!" msg;

     
···

       45
       68
        
           Term.(

     

       46
       69
        
             const run $ required_summary_arg $ start_date_arg $ start_time_arg

     

       47
       70
        
             $ end_date_arg $ end_time_arg $ location_arg $ description_arg $ recur_arg

     

       48
       48
       -
             $ collection_arg $ timezone_arg $ end_time_arg)

     

       71
       71
       +
             $ calendar_name_arg $ timezone_arg $ end_timezone_arg)

     

       49
       72
        
         in

     

       50
       73
        
         let doc = "Add a new calendar event" in

     

       51
       74
        
         let man =

     
···

       55
       78
        
             `P

     

       56
       79
        
               "Specify the event summary (title) as the first argument, and use \

     

       57
       80
        
                options to set other details.";

     

       81
       81
       +
             `S Manpage.s_examples;

     

       82
       82
       +
             `I

     

       83
       83
       +
               ( "Add a event for today:",

     

       84
       84
       +
                 "caled add \"Meeting\" --date today --time 14:00" );

     

       85
       85
       +
             `I

     

       86
       86
       +
               ( "Add an event with a specific date and time:",

     

       87
       87
       +
                 "caled add \"Dentist Appointment\" --date 2025-04-15 --time 10:30" );

     

       88
       88
       +
             `I

     

       89
       89
       +
               ( "Add an event with an end time:",

     

       90
       90
       +
                 "caled add \"Conference\" --date 2025-05-20 --time 09:00 --end-date \

     

       91
       91
       +
                  2025-05-22 --end-time 17:00" );

     

       92
       92
       +
             `I

     

       93
       93
       +
               ( "Add an event with location and description:",

     

       94
       94
       +
                 "caled add \"Lunch with Bob\" --date 2025-04-02 --time 12:30 \

     

       95
       95
       +
                  --location \"Pasta Restaurant\" --description \"Discuss project \

     

       96
       96
       +
                  plans\"" );

     

       97
       97
       +
             `I

     

       98
       98
       +
               ( "Add an event to a specific calendar:",

     

       99
       99
       +
                 "caled add \"Work Meeting\" --date 2025-04-03 --time 15:00 \

     

       100
       100
       +
                  --calendar work" );

     

       58
       101
        
             `S Manpage.s_options;

     

       59
       102
        
           ]

     

       60
       60
       -
           @ date_format_manpage_entries

     

       61
       61
       -
           @ [

     

       62
       62
       -
               `S Manpage.s_examples;

     

       63
       63
       -
               `I

     

       64
       64
       -
                 ( "Add a event for today:",

     

       65
       65
       -
                   "caled add \"Meeting\" --date today --time 14:00" );

     

       66
       66
       -
               `I

     

       67
       67
       -
                 ( "Add an event with a specific date and time:",

     

       68
       68
       -
                   "caled add \"Dentist Appointment\" --date 2025-04-15 --time 10:30"

     

       69
       69
       -
                 );

     

       70
       70
       -
               `I

     

       71
       71
       -
                 ( "Add an event with an end time:",

     

       72
       72
       -
                   "caled add \"Conference\" --date 2025-05-20 --time 09:00 \

     

       73
       73
       -
                    --end-date 2025-05-22 --end-time 17:00" );

     

       74
       74
       -
               `I

     

       75
       75
       -
                 ( "Add an event with location and description:",

     

       76
       76
       -
                   "caled add \"Lunch with Bob\" --date 2025-04-02 --time 12:30 \

     

       77
       77
       -
                    --location \"Pasta Restaurant\" --description \"Discuss project \

     

       78
       78
       -
                    plans\"" );

     

       79
       79
       -
               `I

     

       80
       80
       -
                 ( "Add an event to a specific calendar:",

     

       81
       81
       -
                   "caled add \"Work Meeting\" --date 2025-04-03 --time 15:00 \

     

       82
       82
       -
                    --calendar work" );

     

       83
       83
       -
               `S "RECURRENCE";

     

       84
       84
       -
               `P

     

       85
       85
       -
                 "Recurrence rule in iCalendar RFC5545 format. The FREQ part is \

     

       86
       86
       -
                  required.";

     

       87
       87
       -
               `I ("FREQ=<frequency>", "DAILY, WEEKLY, MONTHLY, or YEARLY (required)");

     

       88
       88
       -
               `I

     

       89
       89
       -
                 ( "COUNT=<number>",

     

       90
       90
       -
                   "Limit to this many occurrences (optional, cannot be used with \

     

       91
       91
       -
                    UNTIL)" );

     

       92
       92
       -
               `I

     

       93
       93
       -
                 ( "UNTIL=<date>",

     

       94
       94
       -
                   "Repeat until this date (optional, cannot be used with COUNT)" );

     

       95
       95
       -
               `I

     

       96
       96
       -
                 ( "INTERVAL=<number>",

     

       97
       97
       -
                   "Interval between occurrences, e.g., 2 for every other (optional)"

     

       98
       98
       -
                 );

     

       99
       99
       -
               `I

     

       100
       100
       -
                 ( "BYDAY=<dayspec>",

     

       101
       101
       -
                   "Specific days, e.g., MO,WE,FR or 1MO (first Monday) (optional)" );

     

       102
       102
       -
               `I

     

       103
       103
       -
                 ( "BYMONTHDAY=<daynum>",

     

       104
       104
       -
                   "Day of month, e.g., 1,15 or -1 (last day) (optional)" );

     

       105
       105
       -
               `I

     

       106
       106
       -
                 ( "BYMONTH=<monthnum>",

     

       107
       107
       -
                   "Month number, e.g., 1,6,12 for Jan,Jun,Dec (optional)" );

     

       108
       108
       -
               `P "Examples:";

     

       109
       109
       -
               `I ("FREQ=DAILY;COUNT=5", "Daily for 5 occurrences");

     

       110
       110
       -
               `I ("FREQ=WEEKLY;INTERVAL=2", "Every other week indefinitely");

     

       111
       111
       -
               `I ("FREQ=WEEKLY;BYDAY=MO,WE,FR", "Every Monday, Wednesday, Friday");

     

       112
       112
       -
               `I ("FREQ=MONTHLY;BYDAY=1MO", "First Monday of every month");

     

       113
       113
       -
               `I

     

       114
       114
       -
                 ( "FREQ=YEARLY;BYMONTH=1;BYMONTHDAY=1",

     

       115
       115
       -
                   "Every January 1st (New Year's Day)" );

     

       116
       116
       -
               `I ("FREQ=MONTHLY;BYMONTHDAY=-1", "Last day of every month");

     

       117
       117
       -
             ]

     

       103
       103
       +
           @ date_format_manpage_entries @ recurrence_format_manpage_entries

     

       104
       104
       +
           @ [ `S Manpage.s_see_also ]

     

       105
       105
       +
         in

     

       106
       106
       +
         let exit_info =

     

       107
       107
       +
           [ Cmd.Exit.info ~doc:"on success." 0; Cmd.Exit.info ~doc:"on error." 1 ]

     

       118
       108
        
         in

     

       119
       119
       -
         let info = Cmd.info "add" ~doc ~man in

     

       109
       109
       +
         let info = Cmd.info "add" ~doc ~man ~exits:exit_info in

     

       120
       110
        
         Cmd.v info term

+13 -7

bin/delete_cmd.ml

···

       3
       3
        
       

     

       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_without_recurrence ~fs calendar_dir ~filter () in

     

       6
       6
       +
         let filter = Event.with_id event_id in

     

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

     

       8
       8
       +
         let events = Event.query_without_recurrence events ~filter () in

     

       8
       9
        
         let* event =

     

       9
       9
       -
           match results with

     

       10
       10
       +
           match events with

     

       10
       11
        
           | [ event ] -> Ok event

     

       11
       12
        
           | [] -> Error (`Msg ("No events found found for id " ^ event_id))

     

       12
       13
        
           | _ -> Error (`Msg ("More than one found for id " ^ event_id))

     

       13
       14
        
         in

     

       14
       14
       -
         let result = Calendar_dir.delete_event ~fs calendar_dir event in

     

       15
       15
       +
         let result = Calendar_dir.delete_event ~fs calendar_dir events event in

     

       15
       16
        
         match result with

     

       16
       17
        
         | Error (`Msg msg) -> Error (`Msg msg)

     

       17
       17
       -
         | Ok () ->

     

       18
       18
       +
         | Ok _ ->

     

       18
       19
        
             Printf.printf "Event %s successfully deleted.\n" event_id;

     

       19
       20
        
             Ok ()

     

       20
       21
        
       

     
···

       23
       24
        
         Arg.(required & pos 0 (some string) None & info [] ~docv:"EVENT_ID" ~doc)

     

       24
       25
        
       

     

       25
       26
        
       let cmd ~fs calendar_dir =

     

       26
       26
       -
         let run event_id =

     

       27
       27
       +
         let run event_id () =

     

       27
       28
        
           match run ~event_id ~fs calendar_dir with

     

       28
       29
        
           | Error (`Msg msg) ->

     

       29
       30
        
               Printf.eprintf "Error: %s\n%!" msg;

     
···

       40
       41
        
             `S Manpage.s_examples;

     

       41
       42
        
             `P "Delete an event:";

     

       42
       43
        
             `P "  caled delete 12345678-1234-5678-1234-567812345678";

     

       44
       44
       +
             `S Manpage.s_options;

     

       43
       45
        
           ]

     

       46
       46
       +
           @ [ `S Manpage.s_see_also ]

     

       44
       47
        
         in

     

       45
       45
       -
         let info = Cmd.info "delete" ~doc ~man in

     

       48
       48
       +
         let exit_info =

     

       49
       49
       +
           [ Cmd.Exit.info ~doc:"on success." 0; Cmd.Exit.info ~doc:"on error." 1 ]

     

       50
       50
       +
         in

     

       51
       51
       +
         let info = Cmd.info "delete" ~doc ~man ~exits:exit_info in

     

       46
       52
        
         Cmd.v info term

+5 -2

bin/dune

···

       14
       14
        
         ptime.clock.os

     

       15
       15
        
         eio

     

       16
       16
        
         eio_main

     

       17
       17
       -
         timere)

     

       17
       17
       +
         timere

     

       18
       18
       +
         sexplib

     

       19
       19
       +
         sexplib.unix)

     

       18
       20
        
        (modules

     

       19
       21
        
         main

     

       20
       22
        
         query_args

     
···

       24
       26
        
         show_cmd

     

       25
       27
        
         add_cmd

     

       26
       28
        
         delete_cmd

     

       27
       27
       -
         edit_cmd))

     

       29
       29
       +
         edit_cmd

     

       30
       30
       +
         server_cmd))

+44 -27

bin/edit_cmd.ml

···

       5
       5
        
       let run ~event_id ~summary ~start_date ~start_time ~end_date ~end_time ~location

     

       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_without_recurrence ~fs calendar_dir ~filter () in

     

       8
       8
       +
         let filter = Event.with_id event_id in

     

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

     

       10
       10
       +
         let results = Event.query_without_recurrence events ~filter () in

     

       10
       11
        
         let* event =

     

       11
       12
        
           match results with

     

       12
       13
        
           | [ event ] -> Ok event

     
···

       14
       15
        
           | _ -> Error (`Msg ("More than one found for id " ^ event_id))

     

       15
       16
        
         in

     

       16
       17
        
         let* start = parse_start ~start_date ~start_time ~timezone in

     

       17
       17
       -
         let* end_ = parse_end ~end_date ~end_time ~timezone ~end_timezone in

     

       18
       18
       +
         let* end_ =

     

       19
       19
       +
           let end_date =

     

       20
       20
       +
             (* if we have an endtime and no end date default to start date *)

     

       21
       21
       +
             match (end_date, end_time) with

     

       22
       22
       +
             | None, Some _ -> start_date

     

       23
       23
       +
             | _ -> end_date

     

       24
       24
       +
           in

     

       25
       25
       +
           let end_timezone =

     

       26
       26
       +
             (* if we specify and end date and time without a end timezone, default to the start timezone *)

     

       27
       27
       +
             match (end_date, end_time, end_timezone) with

     

       28
       28
       +
             | Some _, Some _, None -> timezone

     

       29
       29
       +
             | _ -> end_timezone

     

       30
       30
       +
           in

     

       31
       31
       +
           parse_end ~end_date ~end_time ~end_timezone

     

       32
       32
       +
         in

     

       18
       33
        
         let* recurrence =

     

       19
       34
        
           match recur with

     

       20
       35
        
           | Some r ->

     
···

       22
       37
        
               Ok (Some p)

     

       23
       38
        
           | None -> Ok None

     

       24
       39
        
         in

     

       25
       25
       -
         let modifed_event =

     

       40
       40
       +
         let* modifed_event =

     

       26
       41
        
           Event.edit ?summary ?start ?end_ ?location ?description ?recurrence event

     

       27
       42
        
         in

     

       28
       28
       -
         let* _ = Calendar_dir.edit_event ~fs calendar_dir modifed_event in

     

       43
       43
       +
         let* _ = Calendar_dir.edit_event ~fs calendar_dir events modifed_event in

     

       29
       44
        
         Printf.printf "Event %s updated.\n" event_id;

     

       30
       45
        
         Ok ()

     

       31
       46
        
       

     
···

       35
       50
        
       

     

       36
       51
        
       let cmd ~fs calendar_dir =

     

       37
       52
        
         let run event_id summary start_date start_time end_date end_time location

     

       38
       38
       -
             description recur timezone end_timezone =

     

       53
       53
       +
             description recur timezone end_timezone () =

     

       39
       54
        
           match

     

       40
       55
        
             run ~event_id ~summary ~start_date ~start_time ~end_date ~end_time

     

       41
       56
        
               ~location ~description ~recur ?timezone ?end_timezone ~fs calendar_dir

     
···

       59
       74
        
             `P

     

       60
       75
        
               "Specify the event ID as the first argument, and use options to change \

     

       61
       76
        
                event details.";

     

       77
       77
       +
             `S Manpage.s_examples;

     

       78
       78
       +
             `I

     

       79
       79
       +
               ( "Change the summary of an event:",

     

       80
       80
       +
                 "caled edit 12345678-1234-5678-1234-567812345678 --summary \"New \

     

       81
       81
       +
                  Title\"" );

     

       82
       82
       +
             `I

     

       83
       83
       +
               ( "Change the date and time:",

     

       84
       84
       +
                 "caled edit 12345678-1234-5678-1234-567812345678 --date 2025-05-01 \

     

       85
       85
       +
                  --time 15:30" );

     

       86
       86
       +
             `I

     

       87
       87
       +
               ( "Update the location:",

     

       88
       88
       +
                 "caled edit 12345678-1234-5678-1234-567812345678 --location \

     

       89
       89
       +
                  \"Conference Room B\"" );

     

       90
       90
       +
             `I

     

       91
       91
       +
               ( "Change the description:",

     

       92
       92
       +
                 "caled edit 12345678-1234-5678-1234-567812345678 --description \

     

       93
       93
       +
                  \"Updated agenda for the meeting\"" );

     

       62
       94
        
             `S Manpage.s_options;

     

       63
       95
        
           ]

     

       64
       64
       -
           @ date_format_manpage_entries

     

       65
       65
       -
           @ [

     

       66
       66
       -
               `S Manpage.s_examples;

     

       67
       67
       -
               `I

     

       68
       68
       -
                 ( "Change the summary of an event:",

     

       69
       69
       -
                   "caled edit 12345678-1234-5678-1234-567812345678 --summary \"New \

     

       70
       70
       -
                    Title\"" );

     

       71
       71
       -
               `I

     

       72
       72
       -
                 ( "Change the date and time:",

     

       73
       73
       -
                   "caled edit 12345678-1234-5678-1234-567812345678 --date 2025-05-01 \

     

       74
       74
       -
                    --time 15:30" );

     

       75
       75
       -
               `I

     

       76
       76
       -
                 ( "Update the location:",

     

       77
       77
       -
                   "caled edit 12345678-1234-5678-1234-567812345678 --location \

     

       78
       78
       -
                    \"Conference Room B\"" );

     

       79
       79
       -
               `I

     

       80
       80
       -
                 ( "Change the description:",

     

       81
       81
       -
                   "caled edit 12345678-1234-5678-1234-567812345678 --description \

     

       82
       82
       -
                    \"Updated agenda for the meeting\"" );

     

       83
       83
       -
             ]

     

       96
       96
       +
           @ date_format_manpage_entries @ recurrence_format_manpage_entries

     

       97
       97
       +
           @ [ `S Manpage.s_see_also ]

     

       98
       98
       +
         in

     

       99
       99
       +
         let exit_info =

     

       100
       100
       +
           [ Cmd.Exit.info ~doc:"on success." 0; Cmd.Exit.info ~doc:"on error." 1 ]

     

       84
       101
        
         in

     

       85
       85
       -
         let info = Cmd.info "edit" ~doc ~man in

     

       102
       102
       +
         let info = Cmd.info "edit" ~doc ~man ~exits:exit_info in

     

       86
       103
        
         Cmd.v info term

+125 -38

bin/event_args.ml

···

       1
       1
        
       open Cmdliner

     

       2
       2
        
       open Caledonia_lib

     

       3
       3
        
       

     

       4
       4
       -
       let collection_arg =

     

       4
       4
       +
       let calendar_name_arg =

     

       5
       5
        
         let doc = "Calendar to add the event to" in

     

       6
       6
        
         Arg.(

     

       7
       7
        
           required

     
···

       28
       28
        
         Arg.(value & opt (some string) None & info [ "time"; "t" ] ~docv:"TIME" ~doc)

     

       29
       29
        
       

     

       30
       30
        
       let end_date_arg =

     

       31
       31
       -
         let doc = "Event end date (YYYY-MM-DD)" in

     

       31
       31
       +
         let doc = "Event end date (YYYY-MM-DD). Defaults to DATE." in

     

       32
       32
        
         Arg.(

     

       33
       33
        
           value

     

       34
       34
        
           & opt (some string) None

     
···

       44
       44
        
       let timezone_arg =

     

       45
       45
        
         let doc =

     

       46
       46
        
           "Timezone to add events to (e.g., 'America/New_York', 'UTC', \

     

       47
       47
       -
            'Europe/London'). If not specified, will use the local timezone."

     

       47
       47
       +
            'Europe/London'). If not specified, will use the local timezone. For a \

     

       48
       48
       +
            floating time (always at whatever the sytem time is), use 'FLOATING'."

     

       48
       49
        
         in

     

       49
       50
        
         Arg.(

     

       50
       51
        
           value

     
···

       80
       81
        
       let date_format_manpage_entries =

     

       81
       82
        
         [

     

       82
       83
        
           `S "DATE FORMATS";

     

       83
       83
       -
           `P "Relative date formats for --date / -d and --end-date / -e:";

     

       84
       84
       +
           `P

     

       85
       85
       +
             "The following are the possible date formats for the --date and \

     

       86
       86
       +
              --end-date command line parameters. Note the value is dependent on \

     

       87
       87
       +
              --date / --end-date, so --date 2025-03 --end-date 2025-03 will span the \

     

       88
       88
       +
              month of March.";

     

       89
       89
       +
           `I ("YYYY-MM-DD", "Specific date (e.g., 2025-3-27, zero-padding optional)");

     

       90
       90
       +
           `I ("YYYY-MM", "Start/end of specific month (e.g., 2025-3 for March 2025)");

     

       91
       91
       +
           `I ("YYYY", "Start/end of specific year (e.g., 2025)");

     

       84
       92
        
           `I ("today", "Current day");

     

       85
       93
        
           `I ("tomorrow", "Next day");

     

       86
       94
        
           `I ("yesterday", "Previous day");

     

       87
       87
       -
           `I ("this-week", "Start of current week");

     

       88
       88
       -
           `I ("next-week", "Start of next week");

     

       89
       89
       -
           `I ("this-month", "Start of current month");

     

       90
       90
       -
           `I ("next-month", "Start of next month");

     

       95
       95
       +
           `I ("this-week", "Start/end of current week");

     

       96
       96
       +
           `I ("next-week", "Start/end of next week");

     

       97
       97
       +
           `I ("this-month", "Start/end of current month");

     

       98
       98
       +
           `I ("next-month", "Start/end of next month");

     

       91
       99
        
           `I ("+Nd", "N days from today (e.g., +7d for a week from today)");

     

       92
       100
        
           `I ("-Nd", "N days before today (e.g., -7d for a week ago)");

     

       93
       101
        
           `I ("+Nw", "N weeks from today (e.g., +4w for 4 weeks from today)");

     
···

       96
       104
        
       

     

       97
       105
        
       let parse_start ~start_date ~start_time ~timezone =

     

       98
       106
        
         let ( let* ) = Result.bind in

     

       107
       107
       +
         let* _ =

     

       108
       108
       +
           match timezone with

     

       109
       109
       +
           | None -> Ok ()

     

       110
       110
       +
           | Some tzid -> (

     

       111
       111
       +
               match Timedesc.Time_zone.make tzid with

     

       112
       112
       +
               | Some _ -> Ok ()

     

       113
       113
       +
               | None ->

     

       114
       114
       +
                   Error (`Msg (Printf.sprintf "Warning: Unknown timezone %s" tzid)))

     

       115
       115
       +
         in

     

       99
       116
        
         match start_date with

     

       100
       117
        
         | None ->

     

       101
       118
        
             let* _ =

     

       102
       119
        
               match start_time with

     

       103
       120
        
               | None -> Ok ()

     

       104
       121
        
               | Some _ ->

     

       105
       105
       -
                   Error (`Msg "Can't specify an start time without an end date")

     

       122
       122
       +
                   Error (`Msg "Can't specify an start time without a start date")

     

       106
       123
        
             in

     

       107
       124
        
             let* _ =

     

       108
       125
        
               match timezone with

     
···

       122
       139
        
                   Date.parse_date ~tz:Timedesc.Time_zone.utc start_date `From

     

       123
       140
        
                 in

     

       124
       141
        
                 let date = Ptime.to_date ptime in

     

       125
       125
       -
                 Ok (Some (`Date date))

     

       142
       142
       +
                 Ok (Some (Icalendar.Params.singleton Valuetype `Date, `Date date))

     

       126
       143
        
             | Some start_time -> (

     

       127
       144
        
                 match timezone with

     

       128
       145
        
                 | None ->

     

       146
       146
       +
                     let* tzid =

     

       147
       147
       +
                       match Timedesc.Time_zone.local () with

     

       148
       148
       +
                       | Some tz -> Ok (Timedesc.Time_zone.name tz)

     

       149
       149
       +
                       | None -> Error (`Msg "Failed to get system timezone")

     

       150
       150
       +
                     in

     

       129
       151
        
                     let* datetime =

     

       130
       152
        
                       Date.parse_date_time ~tz:Timedesc.Time_zone.utc ~date:start_date

     

       131
       153
        
                         ~time:start_time `From

     

       132
       154
        
                     in

     

       133
       133
       -
                     Ok (Some (`Datetime (`Local datetime)))

     

       155
       155
       +
                     Ok

     

       156
       156
       +
                       (Some

     

       157
       157
       +
                          ( Icalendar.Params.empty,

     

       158
       158
       +
                            `Datetime (`With_tzid (datetime, (false, tzid))) ))

     

       159
       159
       +
                 | Some "FLOATING" ->

     

       160
       160
       +
                     let* datetime =

     

       161
       161
       +
                       Date.parse_date_time ~tz:Timedesc.Time_zone.utc ~date:start_date

     

       162
       162
       +
                         ~time:start_time `From

     

       163
       163
       +
                     in

     

       164
       164
       +
                     Ok (Some (Icalendar.Params.empty, `Datetime (`Local datetime)))

     

       134
       165
        
                 | Some "UTC" ->

     

       135
       166
        
                     let* datetime =

     

       136
       167
        
                       Date.parse_date_time ~tz:Timedesc.Time_zone.utc ~date:start_date

     

       137
       168
        
                         ~time:start_time `From

     

       138
       169
        
                     in

     

       139
       139
       -
                     Ok (Some (`Datetime (`Utc datetime)))

     

       170
       170
       +
                     Ok (Some (Icalendar.Params.empty, `Datetime (`Utc datetime)))

     

       140
       171
        
                 | Some tzid ->

     

       141
       141
       -
                     let* tz =

     

       142
       142
       -
                       match Timedesc.Time_zone.make tzid with

     

       143
       143
       -
                       | Some tz_obj -> Ok tz_obj

     

       144
       144
       -
                       | None -> Error (`Msg ("Invalid timezone: " ^ tzid))

     

       145
       145
       -
                     in

     

       146
       172
        
                     let* datetime =

     

       147
       147
       -
                       Date.parse_date_time ~tz ~date:start_date ~time:start_time `From

     

       173
       173
       +
                       Date.parse_date_time ~tz:Timedesc.Time_zone.utc ~date:start_date

     

       174
       174
       +
                         ~time:start_time `From

     

       148
       175
        
                     in

     

       149
       149
       -
                     Ok (Some (`Datetime (`With_tzid (datetime, (false, tzid)))))))

     

       176
       176
       +
                     Ok

     

       177
       177
       +
                       (Some

     

       178
       178
       +
                          ( Icalendar.Params.empty,

     

       179
       179
       +
                            `Datetime (`With_tzid (datetime, (false, tzid))) ))))

     

       150
       180
        
       

     

       151
       151
       -
       let parse_end ~end_date ~end_time ~timezone ~end_timezone =

     

       181
       181
       +
       let parse_end ~end_date ~end_time ~end_timezone =

     

       152
       182
        
         let ( let* ) = Result.bind in

     

       183
       183
       +
         let* _ =

     

       184
       184
       +
           match end_timezone with

     

       185
       185
       +
           | None -> Ok ()

     

       186
       186
       +
           | Some tzid -> (

     

       187
       187
       +
               match Timedesc.Time_zone.make tzid with

     

       188
       188
       +
               | Some _ -> Ok ()

     

       189
       189
       +
               | None ->

     

       190
       190
       +
                   Error (`Msg (Printf.sprintf "Warning: Unknown timezone %s" tzid)))

     

       191
       191
       +
         in

     

       153
       192
        
         match end_date with

     

       154
       193
        
         | None ->

     

       155
       194
        
             let* _ =

     
···

       160
       199
        
             let* _ =

     

       161
       200
        
               match end_timezone with

     

       162
       201
        
               | None -> Ok ()

     

       163
       163
       -
               | Some _ -> Error (`Msg "Can't specify a timezone without a end time")

     

       202
       202
       +
               | Some _ ->

     

       203
       203
       +
                   Error (`Msg "Can't specify an end timezone without an end date")

     

       164
       204
        
             in

     

       165
       205
        
             Ok None

     

       166
       206
        
         | Some end_date -> (

     

       167
       207
        
             match end_time with

     

       168
       208
        
             | None ->

     

       169
       209
        
                 let* _ =

     

       170
       170
       -
                   match (timezone, end_timezone) with

     

       171
       171
       -
                   | None, None -> Ok ()

     

       172
       172
       -
                   | Some _, None ->

     

       173
       173
       -
                       Error (`Msg "Can't specify a timezone without a end time")

     

       174
       174
       -
                   | _ ->

     

       210
       210
       +
                   match end_timezone with

     

       211
       211
       +
                   | Some _ ->

     

       175
       212
        
                       Error (`Msg "Can't specify an end timezone without a end time")

     

       213
       213
       +
                   | _ -> Ok ()

     

       176
       214
        
                 in

     

       177
       215
        
                 let* ptime =

     

       178
       216
        
                   Date.parse_date end_date ~tz:Timedesc.Time_zone.utc `From

     

       179
       217
        
                 in

     

       218
       218
       +
                 (* DTEND;VALUE=DATE the event ends at the start of the specified date *)

     

       219
       219
       +
                 let ptime = Date.add_days ptime 1 in

     

       180
       220
        
                 let date = Ptime.to_date ptime in

     

       181
       181
       -
                 Ok (Some (`Dtend (Icalendar.Params.empty, `Date date)))

     

       221
       221
       +
                 Ok

     

       222
       222
       +
                   (Some

     

       223
       223
       +
                      (`Dtend (Icalendar.Params.singleton Valuetype `Date, `Date date)))

     

       182
       224
        
             | Some end_time -> (

     

       183
       183
       -
                 match (timezone, end_timezone) with

     

       184
       184
       -
                 | None, None ->

     

       225
       225
       +
                 match end_timezone with

     

       226
       226
       +
                 | None ->

     

       227
       227
       +
                     let* tzid =

     

       228
       228
       +
                       match Timedesc.Time_zone.local () with

     

       229
       229
       +
                       | Some tz -> Ok (Timedesc.Time_zone.name tz)

     

       230
       230
       +
                       | None -> Error (`Msg "Failed to get system timezone")

     

       231
       231
       +
                     in

     

       232
       232
       +
                     let* datetime =

     

       233
       233
       +
                       Date.parse_date_time ~tz:Timedesc.Time_zone.utc ~date:end_date

     

       234
       234
       +
                         ~time:end_time `From

     

       235
       235
       +
                     in

     

       236
       236
       +
                     Ok

     

       237
       237
       +
                       (Some

     

       238
       238
       +
                          (`Dtend

     

       239
       239
       +
                             ( Icalendar.Params.empty,

     

       240
       240
       +
                               `Datetime (`With_tzid (datetime, (false, tzid))) )))

     

       241
       241
       +
                 | Some "FLOATING" ->

     

       185
       242
        
                     let* datetime =

     

       186
       243
        
                       Date.parse_date_time ~tz:Timedesc.Time_zone.utc ~date:end_date

     

       187
       244
        
                         ~time:end_time `From

     
···

       189
       246
        
                     Ok

     

       190
       247
        
                       (Some

     

       191
       248
        
                          (`Dtend (Icalendar.Params.empty, `Datetime (`Local datetime))))

     

       192
       192
       -
                 | _, Some "UTC" | Some "UTC", None ->

     

       249
       249
       +
                 | Some "UTC" ->

     

       193
       250
        
                     let* datetime =

     

       194
       251
        
                       Date.parse_date_time ~tz:Timedesc.Time_zone.utc ~date:end_date

     

       195
       252
        
                         ~time:end_time `From

     
···

       197
       254
        
                     Ok

     

       198
       255
        
                       (Some

     

       199
       256
        
                          (`Dtend (Icalendar.Params.empty, `Datetime (`Utc datetime))))

     

       200
       200
       -
                 | _, Some tzid | Some tzid, _ ->

     

       201
       201
       -
                     let* tz =

     

       202
       202
       -
                       match Timedesc.Time_zone.make tzid with

     

       203
       203
       -
                       | Some tz_obj -> Ok tz_obj

     

       204
       204
       -
                       | None -> Error (`Msg ("Invalid timezone: " ^ tzid))

     

       205
       205
       -
                     in

     

       257
       257
       +
                 | Some tzid ->

     

       206
       258
        
                     let* datetime =

     

       207
       207
       -
                       Date.parse_date_time ~tz ~date:end_date ~time:end_time `From

     

       259
       259
       +
                       Date.parse_date_time ~tz:Timedesc.Time_zone.utc ~date:end_date

     

       260
       260
       +
                         ~time:end_time `From

     

       208
       261
        
                     in

     

       209
       209
       -
       

     

       210
       262
        
                     Ok

     

       211
       263
        
                       (Some

     

       212
       264
        
                          (`Dtend

     
···

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

     

       346
       398
        
             Ok recurrence

     

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

     

       400
       400
       +
       

     

       401
       401
       +
       let recurrence_format_manpage_entries =

     

       402
       402
       +
         [

     

       403
       403
       +
           `S "RECURRENCE";

     

       404
       404
       +
           `P "Recurrence rule in iCalendar RFC5545 format. The FREQ part is required.";

     

       405
       405
       +
           `I ("FREQ=<frequency>", "DAILY, WEEKLY, MONTHLY, or YEARLY (required)");

     

       406
       406
       +
           `I

     

       407
       407
       +
             ( "COUNT=<number>",

     

       408
       408
       +
               "Limit to this many occurrences (optional, cannot be used with UNTIL)"

     

       409
       409
       +
             );

     

       410
       410
       +
           `I

     

       411
       411
       +
             ( "UNTIL=<date>",

     

       412
       412
       +
               "Repeat until this date (optional, cannot be used with COUNT)" );

     

       413
       413
       +
           `I

     

       414
       414
       +
             ( "INTERVAL=<number>",

     

       415
       415
       +
               "Interval between occurrences, e.g., 2 for every other (optional)" );

     

       416
       416
       +
           `I

     

       417
       417
       +
             ( "BYDAY=<dayspec>",

     

       418
       418
       +
               "Specific days, e.g., MO,WE,FR or 1MO (first Monday) (optional)" );

     

       419
       419
       +
           `I

     

       420
       420
       +
             ( "BYMONTHDAY=<daynum>",

     

       421
       421
       +
               "Day of month, e.g., 1,15 or -1 (last day) (optional)" );

     

       422
       422
       +
           `I

     

       423
       423
       +
             ( "BYMONTH=<monthnum>",

     

       424
       424
       +
               "Month number, e.g., 1,6,12 for Jan,Jun,Dec (optional)" );

     

       425
       425
       +
           `P "Examples:";

     

       426
       426
       +
           `I ("FREQ=DAILY;COUNT=5", "Daily for 5 occurrences");

     

       427
       427
       +
           `I ("FREQ=WEEKLY;INTERVAL=2", "Every other week indefinitely");

     

       428
       428
       +
           `I ("FREQ=WEEKLY;BYDAY=MO,WE,FR", "Every Monday, Wednesday, Friday");

     

       429
       429
       +
           `I ("FREQ=MONTHLY;BYDAY=1MO", "First Monday of every month");

     

       430
       430
       +
           `I

     

       431
       431
       +
             ( "FREQ=YEARLY;BYMONTH=1;BYMONTHDAY=1",

     

       432
       432
       +
               "Every January 1st (New Year's Day)" );

     

       433
       433
       +
           `I ("FREQ=MONTHLY;BYMONTHDAY=-1", "Last day of every month");

     

       434
       434
       +
         ]

+39 -43

bin/list_cmd.ml

···

       2
       2
        
       open Caledonia_lib

     

       3
       3
        
       open Query_args

     

       4
       4
        
       

     

       5
       5
       -
       let run ?from_str ?to_str ?calendar ?count ~format ~today ~tomorrow ~week ~month

     

       6
       6
       -
           ?timezone ~sort ~fs calendar_dir =

     

       5
       5
       +
       let run ?from_str ?to_str ~calendar:calendars ?count ~format ~today ~tomorrow

     

       6
       6
       +
           ~week ~month ?timezone ~sort ~fs calendar_dir =

     

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

     

       8
       8
        
         let tz = Query_args.parse_timezone ~timezone in

     

       9
       9
        
         let* from, to_ =

     
···

       33
       33
        
                 match to_str with

     

       34
       34
        
                 | None -> Ok None

     

       35
       35
        
                 | Some s ->

     

       36
       36
       -
                     let* d = Date.parse_date ~tz s `From in

     

       36
       36
       +
                     let* d = Date.parse_date ~tz s `To in

     

       37
       37
        
                     Ok (Some d)

     

       38
       38
        
               in

     

       39
       39
        
               match (from, to_) with

     
···

       41
       41
        
               | Some f, None ->

     

       42
       42
        
                   let one_month_later = Date.add_months f 1 in

     

       43
       43
        
                   Ok (Some f, one_month_later)

     

       44
       44
       -
               | None, Some t ->

     

       45
       45
       -
                   let today_date = !Date.get_today ~tz () in

     

       46
       46
       -
                   Ok (Some today_date, Date.to_end_of_day t)

     

       44
       44
       +
               | None, Some t -> Ok (None, Date.to_end_of_day t)

     

       47
       45
        
               | None, None ->

     

       48
       46
        
                   let today_date = !Date.get_today ~tz () in

     

       49
       47
        
                   let one_month_later = Date.add_months today_date 1 in

     

       50
       48
        
                   Ok (Some today_date, one_month_later))

     

       51
       49
        
         in

     

       52
       50
        
         let filter =

     

       53
       53
       -
           match calendar with

     

       54
       54
       -
           | Some collection_id ->

     

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

     

       56
       56
       -
           | None -> None

     

       51
       51
       +
           match calendars with

     

       52
       52
       +
           | [] -> None

     

       53
       53
       +
           | calendar -> Some (Event.in_calendars calendar)

     

       57
       54
        
         in

     

       58
       55
        
         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 ()

     

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

     

       57
       57
       +
         let events =

     

       58
       58
       +
           Event.query events ?filter ~from ~to_ ~comparator ?limit:count ()

     

       61
       59
        
         in

     

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

     

       63
       63
       -
         else print_endline (Event.format_events ~format ~tz results);

     

       60
       60
       +
         if events = [] then print_endline "No events found."

     

       61
       61
       +
         else print_endline (Event.format_events ~format ~tz events);

     

       64
       62
        
         Ok ()

     

       65
       63
        
       

     

       66
       64
        
       let cmd ~fs calendar_dir =

     

       67
       67
       -
         let run from_str to_str calendar count format today tomorrow week month

     

       68
       68
       -
             timezone sort =

     

       65
       65
       +
         let run from_str to_str calendars count format today tomorrow week month

     

       66
       66
       +
             timezone sort () =

     

       69
       67
        
           match

     

       70
       70
       -
             run ?from_str ?to_str ?calendar ?count ~format ~today ~tomorrow ~week

     

       71
       71
       -
               ~month ?timezone ~sort ~fs calendar_dir

     

       68
       68
       +
             run ?from_str ?to_str ~calendar:calendars ?count ~format ~today ~tomorrow

     

       69
       69
       +
               ~week ~month ?timezone ~sort ~fs calendar_dir

     

       72
       70
        
           with

     

       73
       71
        
           | Error (`Msg msg) ->

     

       74
       72
        
               Printf.eprintf "Error: %s\n%!" msg;

     
···

       85
       83
        
         let man =

     

       86
       84
        
           [

     

       87
       85
        
             `S Manpage.s_description;

     

       88
       88
       -
             `P "List calendar events within a specified date range.";

     

       89
       89
       -
             `P "By default, events from today to one month from today are shown.";

     

       90
       90
       -
             `P "You can use date flags to show events for a specific time period.";

     

       91
       91
       -
             `P "You can also filter events by calendar using the --calendar flag.";

     

       92
       92
       -
             `P "Use the --sort option to control the sorting of results.";

     

       86
       86
       +
             `P

     

       87
       87
       +
               "List calendar events within a specified date range. By default, \

     

       88
       88
       +
                events from today to one month from today are shown. You can use date \

     

       89
       89
       +
                flags to show events for a specific time period, and filter events \

     

       90
       90
       +
                with the --sort option.";

     

       91
       91
       +
             `S Manpage.s_examples;

     

       92
       92
       +
             `I ("List all events for today:", "caled list --today");

     

       93
       93
       +
             `I ("List all events for tomorrow:", "caled list --tomorrow");

     

       94
       94
       +
             `I ("List all events for the current week:", "caled list --week");

     

       95
       95
       +
             `I ("List all events for the current month:", "caled list --month");

     

       96
       96
       +
             `I

     

       97
       97
       +
               ( "List events within a specific date range:",

     

       98
       98
       +
                 "caled list --from 2025-03-27 --to 2025-04-01" );

     

       99
       99
       +
             `I ("List events from a specific calendar:", "caled list --calendar work");

     

       100
       100
       +
             `I ("List events in JSON format:", "caled list --format json");

     

       101
       101
       +
             `I ("Limit the number of events shown:", "caled list --count 5");

     

       102
       102
       +
             `I

     

       103
       103
       +
               ( "Sort by multiple fields (start time and summary):",

     

       104
       104
       +
                 "caled list --sort start --sort summary" );

     

       105
       105
       +
             `I

     

       106
       106
       +
               ( "Sort by calendar name in descending order:",

     

       107
       107
       +
                 "caled list --sort calendar:desc" );

     

       93
       108
        
             `S Manpage.s_options;

     

       94
       109
        
           ]

     

       95
       110
        
           @ date_format_manpage_entries

     

       96
       96
       -
           @ [

     

       97
       97
       -
               `S Manpage.s_examples;

     

       98
       98
       -
               `I ("List all events for today:", "caled list --today");

     

       99
       99
       -
               `I ("List all events for tomorrow:", "caled list --tomorrow");

     

       100
       100
       -
               `I ("List all events for the current week:", "caled list --week");

     

       101
       101
       -
               `I ("List all events for the current month:", "caled list --month");

     

       102
       102
       -
               `I

     

       103
       103
       -
                 ( "List events within a specific date range:",

     

       104
       104
       -
                   "caled list --from 2025-03-27 --to 2025-04-01" );

     

       105
       105
       -
               `I

     

       106
       106
       -
                 ("List events from a specific calendar:", "caled list --calendar work");

     

       107
       107
       -
               `I ("List events in JSON format:", "caled list --format json");

     

       108
       108
       -
               `I ("Limit the number of events shown:", "caled list --count 5");

     

       109
       109
       -
               `I

     

       110
       110
       -
                 ( "Sort by multiple fields (start time and summary):",

     

       111
       111
       -
                   "caled list --sort start --sort summary" );

     

       112
       112
       -
               `I

     

       113
       113
       -
                 ( "Sort by calendar name in descending order:",

     

       114
       114
       -
                   "caled list --sort calendar:desc" );

     

       115
       115
       -
             ]

     

       111
       111
       +
           @ [ `S Manpage.s_see_also ]

     

       116
       112
        
         in

     

       117
       113
        
         let exit_info =

     

       118
       114
        
           [ Cmd.Exit.info ~doc:"on success." 0; Cmd.Exit.info ~doc:"on error." 1 ]

+4 -3

bin/main.ml

···

       1
       1
       -
       (* Main entry point for the calendar CLI *)

     

       2
       2
       -
       

     

       3
       1
        
       open Cmdliner

     

       4
       2
        
       

     

       5
       3
        
       let list_cmd = List_cmd.cmd

     
···

       8
       6
        
       let add_cmd = Add_cmd.cmd

     

       9
       7
        
       let delete_cmd = Delete_cmd.cmd

     

       10
       8
        
       let edit_cmd = Edit_cmd.cmd

     

       9
       9
       +
       let server_cmd = Server_cmd.cmd

     

       11
       10
        
       let doc = "Command-line calendar tool for managing local .ics files"

     

       12
       11
        
       let version = "%%VERSION%%"

     

       13
       12
        
       

     
···

       47
       46
        
                      add_cmd ~fs calendar_dir;

     

       48
       47
        
                      edit_cmd ~fs calendar_dir;

     

       49
       48
        
                      delete_cmd ~fs calendar_dir;

     

       49
       49
       +
                      server_cmd ~stdin:(Eio.Stdenv.stdin env)

     

       50
       50
       +
                        ~stdout:(Eio.Stdenv.stdout env) ~fs calendar_dir;

     

       50
       51
        
                    ])

     

       51
       52
        
             with

     

       52
       52
       -
             | Ok (`Ok n) -> n

     

       53
       53
       +
             | Ok (`Ok f) -> f ()

     

       53
       54
        
             | Ok _ -> 0

     

       54
       55
        
             | Error _ -> 1)

     

       55
       56

+35 -35

bin/query_args.ml

···

       3
       3
        
       

     

       4
       4
        
       let from_arg =

     

       5
       5
        
         let doc =

     

       6
       6
       -
           "Start date in YYYY-MM-DD format or a relative expression (today, \

     

       7
       7
       -
            tomorrow, this-week, next-week, this-month, next-month, +Nd, -Nd, +Nw, \

     

       8
       8
       -
            +Nm)"

     

       6
       6
       +
           "Start date in YYYY-MM-DD format, partial date format (YYYY-MM or YYYY), \

     

       7
       7
       +
            or a relative expression (today, tomorrow, this-week, next-week, \

     

       8
       8
       +
            this-month, next-month, +Nd, -Nd, +Nw, +Nm). See DATE FORMATS for more."

     

       9
       9
        
         in

     

       10
       10
        
         let i = Arg.info [ "from"; "f" ] ~docv:"DATE" ~doc in

     

       11
       11
        
         Arg.(value @@ opt (some string) None i)

     

       12
       12
        
       

     

       13
       13
        
       let to_arg =

     

       14
       14
        
         let doc =

     

       15
       15
       -
           "End date in YYYY-MM-DD format or a relative expression (today, tomorrow, \

     

       16
       16
       -
            this-week, next-week, this-month, next-month, +Nd, -Nd, +Nw, +Nm)"

     

       15
       15
       +
           "End date in YYYY-MM-DD format, partial date format (YYYY-MM or YYYY), or \

     

       16
       16
       +
            a relative expression (today, tomorrow, this-week, next-week, this-month, \

     

       17
       17
       +
            next-month, +Nd, -Nd, +Nw, +Nm). See DATE FORMATS for more."

     

       17
       18
        
         in

     

       18
       19
        
         let i = Arg.info [ "to"; "t" ] ~docv:"DATE" ~doc in

     

       19
       20
        
         Arg.(value @@ opt (some string) None i)

     

       20
       21
        
       

     

       21
       22
        
       let calendar_arg =

     

       22
       22
       -
         let doc = "Calendar to filter by" in

     

       23
       23
       +
         let doc = "Filter by calendar" in

     

       23
       24
        
         Arg.(

     

       24
       24
       -
           value

     

       25
       25
       -
           & opt (some string) None

     

       26
       26
       -
           & info [ "calendar"; "c" ] ~docv:"CALENDAR" ~doc)

     

       25
       25
       +
           value & opt_all string [] & info [ "calendar"; "c" ] ~docv:"CALENDAR" ~doc)

     

       27
       26
        
       

     

       28
       27
        
       let format_enum =

     

       29
       28
        
         [

     
···

       36
       35
        
         ]

     

       37
       36
        
       

     

       38
       37
        
       let format_arg =

     

       39
       39
       -
         let doc = "Output format (text, entries, json, csv, ics, sexp)" in

     

       38
       38
       +
         let doc =

     

       39
       39
       +
           "Output format (text, entries, json, csv, ics, sexp). Note that dates are \

     

       40
       40
       +
            localised to the TIMEZONE option but the timezone they're defined in is \

     

       41
       41
       +
            displayed."

     

       42
       42
       +
         in

     

       40
       43
        
         Arg.(

     

       41
       44
        
           value

     

       42
       45
        
           & opt (enum format_enum) `Text

     
···

       147
       150
        
               | `End -> Event.by_end

     

       148
       151
        
               | `Summary -> Event.by_summary

     

       149
       152
        
               | `Location -> Event.by_location

     

       150
       150
       -
               | `Calendar -> Event.by_collection

     

       153
       153
       +
               | `Calendar -> Event.by_calendar_name

     

       151
       154
        
             in

     

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

     

       153
       156
        
         | specs ->

     
···

       160
       163
        
                   | `End -> Event.by_end

     

       161
       164
        
                   | `Summary -> Event.by_summary

     

       162
       165
        
                   | `Location -> Event.by_location

     

       163
       163
       -
                   | `Calendar -> Event.by_collection

     

       166
       166
       +
                   | `Calendar -> Event.by_calendar_name

     

       164
       167
        
                 in

     

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

     

       166
       169
        
                 Event.chain comp acc)

     
···

       172
       175
        
                  | `End -> Event.by_end

     

       173
       176
        
                  | `Summary -> Event.by_summary

     

       174
       177
        
                  | `Location -> Event.by_location

     

       175
       175
       -
                  | `Calendar -> Event.by_collection

     

       178
       178
       +
                  | `Calendar -> Event.by_calendar_name

     

       176
       179
        
                in

     

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

     

       178
       181
        
       

     

       182
       182
       +
       let parse_timezone ~timezone =

     

       183
       183
       +
         match timezone with

     

       184
       184
       +
         | Some tzid -> (

     

       185
       185
       +
             match Timedesc.Time_zone.make tzid with

     

       186
       186
       +
             | Some tz -> tz

     

       187
       187
       +
             | None -> failwith ("Invalid timezone: " ^ tzid))

     

       188
       188
       +
         | None -> !Date.default_timezone ()

     

       189
       189
       +
       

     

       179
       190
        
       let date_format_manpage_entries =

     

       180
       191
        
         [

     

       181
       192
        
           `S "DATE FORMATS";

     

       182
       182
       -
           `P "Date format flags:";

     

       183
       183
       -
           `I ("--today, -d", "Show events for today only");

     

       184
       184
       -
           `I ("--tomorrow", "Show events for tomorrow only");

     

       185
       185
       -
           `I ("--week, -w", "Show events for the current week");

     

       186
       186
       -
           `I ("--month, -m", "Show events for the current month");

     

       187
       187
       -
           `I

     

       188
       188
       -
             ( "--timezone, -z",

     

       189
       189
       -
               "Timezone to use for date calculations (e.g., 'America/New_York', \

     

       190
       190
       -
                'UTC')" );

     

       191
       191
       -
           `P "Relative date formats for --from and --to:";

     

       193
       193
       +
           `P

     

       194
       194
       +
             "The following are the possible date formats for the --from and --to \

     

       195
       195
       +
              command line parameters. Note the value is dependent on --from / --to, \

     

       196
       196
       +
              so --from 2025 --to 2025 will include all the events in the year 2025";

     

       197
       197
       +
           `I ("YYYY-MM-DD", "Specific date (e.g., 2025-3-27, zero-padding optional)");

     

       198
       198
       +
           `I ("YYYY-MM", "Start/end of specific month (e.g., 2025-3 for March 2025)");

     

       199
       199
       +
           `I ("YYYY", "Start/end of specific year (e.g., 2025)");

     

       192
       200
        
           `I ("today", "Current day");

     

       193
       201
        
           `I ("tomorrow", "Next day");

     

       194
       202
        
           `I ("yesterday", "Previous day");

     

       195
       195
       -
           `I ("this-week", "Start of current week");

     

       196
       196
       -
           `I ("next-week", "Start of next week");

     

       197
       197
       -
           `I ("this-month", "Start of current month");

     

       198
       198
       -
           `I ("next-month", "Start of next month");

     

       203
       203
       +
           `I ("this-week", "Start/end of current week");

     

       204
       204
       +
           `I ("next-week", "Start/end of next week");

     

       205
       205
       +
           `I ("this-month", "Start/end of current month");

     

       206
       206
       +
           `I ("next-month", "Start/end of next month");

     

       199
       207
        
           `I ("+Nd", "N days from today (e.g., +7d for a week from today)");

     

       200
       208
        
           `I ("-Nd", "N days before today (e.g., -7d for a week ago)");

     

       201
       209
        
           `I ("+Nw", "N weeks from today (e.g., +4w for 4 weeks from today)");

     

       202
       210
        
           `I ("+Nm", "N months from today (e.g., +2m for 2 months from today)");

     

       203
       211
        
         ]

     

       204
       204
       -
       

     

       205
       205
       -
       let parse_timezone ~timezone =

     

       206
       206
       -
         match timezone with

     

       207
       207
       -
         | Some tzid -> (

     

       208
       208
       -
             match Timedesc.Time_zone.make tzid with

     

       209
       209
       -
             | Some tz -> tz

     

       210
       210
       -
             | None -> failwith ("Invalid timezone: " ^ tzid))

     

       211
       211
       -
         | None -> !Date.default_timezone ()

+69 -81

bin/search_cmd.ml

···

       2
       2
        
       open Caledonia_lib

     

       3
       3
        
       open Query_args

     

       4
       4
        
       

     

       5
       5
       -
       let run ?from_str ?to_str ?calendar ?count ?query_text ~summary ~description

     

       5
       5
       +
       let run ?from_str ?to_str ~calendar ?count ?query_text ~summary ~description

     

       6
       6
        
           ~location ~id ~format ~today ~tomorrow ~week ~month ~recurring

     

       7
       7
        
           ~non_recurring ?timezone ~sort ~fs calendar_dir =

     

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

     
···

       35
       35
        
                 match to_str with

     

       36
       36
        
                 | None -> Ok None

     

       37
       37
        
                 | Some s ->

     

       38
       38
       -
                     let* d = Date.parse_date s `From in

     

       38
       38
       +
                     let* d = Date.parse_date s `To in

     

       39
       39
        
                     Ok (Some d)

     

       40
       40
        
               in

     

       41
       41
        
               let max_date = Date.add_years (!Date.get_today ()) 75 in

     
···

       46
       46
        
               | None, None -> Ok (None, Date.to_end_of_day max_date))

     

       47
       47
        
         in

     

       48
       48
        
         (match calendar with

     

       49
       49
       -
         | Some collection_id ->

     

       50
       50
       -
             filters :=

     

       51
       51
       -
               Query.in_collections [ Collection.Col collection_id ] :: !filters

     

       52
       52
       -
         | None -> ());

     

       49
       49
       +
         | [] -> ()

     

       50
       50
       +
         | calendars -> filters := Event.in_calendars calendars :: !filters);

     

       53
       51
        
         (match query_text with

     

       54
       52
        
         | Some text ->

     

       55
       55
       -
             if summary then filters := Query.summary_contains text :: !filters;

     

       56
       56
       -
             if description then filters := Query.description_contains text :: !filters;

     

       57
       57
       -
             if location then filters := Query.location_contains text :: !filters;

     

       53
       53
       +
             if summary then filters := Event.summary_contains text :: !filters;

     

       54
       54
       +
             if description then filters := Event.description_contains text :: !filters;

     

       55
       55
       +
             if location then filters := Event.location_contains text :: !filters;

     

       58
       56
        
             if not (summary || description || location) then

     

       59
       57
        
               filters :=

     

       60
       60
       -
                 Query.or_filter

     

       58
       58
       +
                 Event.or_filter

     

       61
       59
        
                   [

     

       62
       62
       -
                     Query.summary_contains text;

     

       63
       63
       -
                     Query.description_contains text;

     

       64
       64
       -
                     Query.location_contains text;

     

       60
       60
       +
                     Event.summary_contains text;

     

       61
       61
       +
                     Event.description_contains text;

     

       62
       62
       +
                     Event.location_contains text;

     

       65
       63
        
                   ]

     

       66
       64
        
                 :: !filters

     

       67
       65
        
         | None -> ());

     

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

     

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

     

       66
       66
       +
         if recurring then filters := Event.recurring_only () :: !filters;

     

       67
       67
       +
         if non_recurring then filters := Event.non_recurring_only () :: !filters;

     

       70
       68
        
         (match id with

     

       71
       71
       -
         | Some id -> filters := Query.with_id id :: !filters

     

       69
       69
       +
         | Some id -> filters := Event.with_id id :: !filters

     

       72
       70
        
         | None -> ());

     

       73
       73
       -
         let filter = Query.and_filter !filters in

     

       71
       71
       +
         let filter = Event.and_filter !filters in

     

       74
       72
        
         let comparator = Query_args.create_event_comparator sort in

     

       75
       75
       -
         let* results =

     

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

     

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

     

       74
       74
       +
         let events =

     

       75
       75
       +
           Event.query events ~filter ~from ~to_ ~comparator ?limit:count ()

     

       77
       76
        
         in

     

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

     

       79
       79
       -
         else print_endline (Event.format_events ~tz ~format results);

     

       77
       77
       +
         if events = [] then print_endline "No events found."

     

       78
       78
       +
         else print_endline (Event.format_events ~tz ~format events);

     

       80
       79
        
         Ok ()

     

       81
       80
        
       

     

       82
       81
        
       let query_text_arg =

     

       83
       83
       -
         let doc = "Text to search for in events (summary, description, location)" in

     

       82
       82
       +
         let doc =

     

       83
       83
       +
           "Text to search for in the fields summary, description, and/or location."

     

       84
       84
       +
         in

     

       84
       85
        
         Arg.(value & pos 0 (some string) None & info [] ~docv:"TEXT" ~doc)

     

       85
       86
        
       

     

       86
       87
        
       let summary_arg =

     
···

       108
       109
        
         Arg.(value & opt (some string) None & info [ "id"; "i" ] ~docv:"ID" ~doc)

     

       109
       110
        
       

     

       110
       111
        
       let cmd ~fs calendar_dir =

     

       111
       111
       -
         let run query_text from_str to_str calendar count format summary description

     

       112
       112
       +
         let run query_text from_str to_str calendars count format summary description

     

       112
       113
        
             location id today tomorrow week month recurring non_recurring timezone

     

       113
       113
       -
             sort =

     

       114
       114
       +
             sort () =

     

       114
       115
        
           match

     

       115
       115
       -
             run ?from_str ?to_str ?calendar ?count ?query_text ~summary ~description

     

       116
       116
       -
               ~location ~id ~format ~today ~tomorrow ~week ~month ~recurring

     

       117
       117
       -
               ~non_recurring ?timezone ~sort ~fs calendar_dir

     

       116
       116
       +
             run ?from_str ?to_str ~calendar:calendars ?count ?query_text ~summary

     

       117
       117
       +
               ~description ~location ~id ~format ~today ~tomorrow ~week ~month

     

       118
       118
       +
               ~recurring ~non_recurring ?timezone ~sort ~fs calendar_dir

     

       118
       119
        
           with

     

       119
       120
        
           | Error (`Msg msg) ->

     

       120
       121
        
               Printf.eprintf "Error: %s\n%!" msg;

     
···

       134
       135
        
             `S Manpage.s_description;

     

       135
       136
        
             `P

     

       136
       137
        
               "Search calendar events for text in summary, description, or location \

     

       137
       137
       -
                fields.";

     

       138
       138
       -
             `P

     

       139
       139
       -
               "By default, the search looks across all text fields in all events \

     

       140
       140
       -
                regardless of date.";

     

       141
       141
       -
             `P

     

       142
       142
       -
               "You can narrow the search to a specific date range with date flags or \

     

       143
       143
       -
                --from and --to.";

     

       144
       144
       -
             `P

     

       145
       145
       -
               "You can specify specific fields to search in using the --summary, \

     

       146
       146
       -
                --description, or --location flags.";

     

       147
       147
       -
             `P

     

       148
       148
       -
               "You can limit results to only recurring or non-recurring events using \

     

       149
       149
       -
                the --recurring or --non-recurring flags.";

     

       150
       150
       -
             `P "Use the --sort option to control the sorting of results.";

     

       151
       151
       -
             `P

     

       152
       152
       -
               "The search text is optional if you're using other filters. For \

     

       153
       153
       -
                example, you can find all recurring events without specifying any \

     

       154
       154
       -
                search text.";

     

       138
       138
       +
                fields. By default, the search looks across all text fields in all \

     

       139
       139
       +
                events regardless of date. You can specify specific fields to search \

     

       140
       140
       +
                in using the --summary, --description, or --location flags. You can \

     

       141
       141
       +
                use date flags to show events for a specific time period, and filter \

     

       142
       142
       +
                events with the --sort option.\n\

     

       143
       143
       +
               \        The search text is optional, so you search events according \

     

       144
       144
       +
                to other query criteria.";

     

       145
       145
       +
             `S Manpage.s_examples;

     

       146
       146
       +
             `I ("Search for 'meeting' in all events:", "caled search meeting");

     

       147
       147
       +
             `I

     

       148
       148
       +
               ( "Search for 'interview' in event summaries only:",

     

       149
       149
       +
                 "caled search --summary interview" );

     

       150
       150
       +
             `I

     

       151
       151
       +
               ( "Search for 'conference' in a specific calendar:",

     

       152
       152
       +
                 "caled search --calendar work conference" );

     

       153
       153
       +
             `I

     

       154
       154
       +
               ( "Search for 'workshop' in event descriptions for today only:",

     

       155
       155
       +
                 "caled search --description --today workshop" );

     

       156
       156
       +
             `I

     

       157
       157
       +
               ( "Search for 'project' in events this month:",

     

       158
       158
       +
                 "caled search --month project" );

     

       159
       159
       +
             `I

     

       160
       160
       +
               ( "Search for 'workshop' in event descriptions within a date range:",

     

       161
       161
       +
                 "caled search --description --from 2025-03-27 --to 2025-04-01 \

     

       162
       162
       +
                  workshop" );

     

       163
       163
       +
             `I

     

       164
       164
       +
               ("Search for recurring events only:", "caled search --recurring meeting");

     

       165
       165
       +
             `I

     

       166
       166
       +
               ( "Search for non-recurring events only:",

     

       167
       167
       +
                 "caled search --non-recurring appointment" );

     

       168
       168
       +
             `I ("Find all recurring events:", "caled search --recurring");

     

       169
       169
       +
             `I

     

       170
       170
       +
               ( "Find all events in a specific calendar:",

     

       171
       171
       +
                 "caled search --calendar work" );

     

       172
       172
       +
             `I

     

       173
       173
       +
               ( "Sort results by location and then summary:",

     

       174
       174
       +
                 "caled search --sort location --sort summary" );

     

       175
       175
       +
             `I

     

       176
       176
       +
               ( "Sort results by end time in descending order:",

     

       177
       177
       +
                 "caled search --sort end:desc" );

     

       155
       178
        
             `S Manpage.s_options;

     

       156
       179
        
           ]

     

       157
       180
        
           @ date_format_manpage_entries

     

       158
       158
       -
           @ [

     

       159
       159
       -
               `S Manpage.s_examples;

     

       160
       160
       -
               `I ("Search for 'meeting' in all events:", "caled search meeting");

     

       161
       161
       -
               `I

     

       162
       162
       -
                 ( "Search for 'interview' in event summaries only:",

     

       163
       163
       -
                   "caled search --summary interview" );

     

       164
       164
       -
               `I

     

       165
       165
       -
                 ( "Search for 'conference' in a specific calendar:",

     

       166
       166
       -
                   "caled search --calendar work conference" );

     

       167
       167
       -
               `I

     

       168
       168
       -
                 ( "Search for 'workshop' in event descriptions for today only:",

     

       169
       169
       -
                   "caled search --description --today workshop" );

     

       170
       170
       -
               `I

     

       171
       171
       -
                 ( "Search for 'project' in events this month:",

     

       172
       172
       -
                   "caled search --month project" );

     

       173
       173
       -
               `I

     

       174
       174
       -
                 ( "Search for 'workshop' in event descriptions within a date range:",

     

       175
       175
       -
                   "caled search --description --from 2025-03-27 --to 2025-04-01 \

     

       176
       176
       -
                    workshop" );

     

       177
       177
       -
               `I

     

       178
       178
       -
                 ( "Search for recurring events only:",

     

       179
       179
       -
                   "caled search --recurring meeting" );

     

       180
       180
       -
               `I

     

       181
       181
       -
                 ( "Search for non-recurring events only:",

     

       182
       182
       -
                   "caled search --non-recurring appointment" );

     

       183
       183
       -
               `I ("Find all recurring events:", "caled search --recurring");

     

       184
       184
       -
               `I

     

       185
       185
       -
                 ( "Find all events in a specific calendar:",

     

       186
       186
       -
                   "caled search --calendar work" );

     

       187
       187
       -
               `I

     

       188
       188
       -
                 ( "Sort results by location and then summary:",

     

       189
       189
       -
                   "caled search --sort location --sort summary" );

     

       190
       190
       -
               `I

     

       191
       191
       -
                 ( "Sort results by end time in descending order:",

     

       192
       192
       -
                   "caled search --sort end:desc" );

     

       193
       193
       -
             ]

     

       181
       181
       +
           @ [ `S Manpage.s_see_also ]

     

       194
       182
        
         in

     

       195
       183
        
         let exit_info =

     

       196
       184
        
           [ Cmd.Exit.info ~doc:"on success." 0; Cmd.Exit.info ~doc:"on error." 1 ]

+85

bin/server_cmd.ml

···

       1
       1
       +
       open Eio

     

       2
       2
       +
       open Cmdliner

     

       3
       3
       +
       open Caledonia_lib

     

       4
       4
       +
       open Caledonia_lib.Sexp

     

       5
       5
       +
       

     

       6
       6
       +
       let run ~stdin ~stdout ~fs calendar_dir () =

     

       7
       7
       +
         let reader = Buf_read.of_flow stdin ~max_size:1_000_000 in

     

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

     

       9
       9
       +
         

     

       10
       10
       +
         (* Initialize mutable events variable - will be updated on refresh *)

     

       11
       11
       +
         let mutable_events = ref (Calendar_dir.get_events ~fs calendar_dir) in

     

       12
       12
       +
         

     

       13
       13
       +
         try

     

       14
       14
       +
           while true do

     

       15
       15
       +
             let line = Buf_read.line reader in

     

       16
       16
       +
             let response =

     

       17
       17
       +
               try

     

       18
       18
       +
                 let sexp = Sexplib.Sexp.of_string line in

     

       19
       19
       +
                 let request = Sexp.request_of_sexp sexp in

     

       20
       20
       +
                 match request with

     

       21
       21
       +
                 | ListCalendars ->

     

       22
       22
       +
                     let* names = Calendar_dir.list_calendar_names ~fs calendar_dir in

     

       23
       23
       +
                     Ok (sexp_of_response (Ok (Calendars names)))

     

       24
       24
       +
                 | Refresh ->

     

       25
       25
       +
                     (* Reload events from disk *)

     

       26
       26
       +
                     mutable_events := Calendar_dir.get_events ~fs calendar_dir;

     

       27
       27
       +
                     (* Return an empty response *)

     

       28
       28
       +
                     Ok (sexp_of_response (Ok Empty))

     

       29
       29
       +
                 | Query query_req ->

     

       30
       30
       +
                     let* filter, from, to_, limit, _tz =

     

       31
       31
       +
                       generate_query_params query_req

     

       32
       32
       +
                     in

     

       33
       33
       +
                     let* events = !mutable_events in

     

       34
       34
       +
                     let events = Event.query events ~filter ~from ~to_ ?limit () in

     

       35
       35
       +
                     Ok (sexp_of_response (Ok (Events events)))

     

       36
       36
       +
               with

     

       37
       37
       +
               | Sexplib.Conv.Of_sexp_error (_exn, bad_sexp) ->

     

       38
       38
       +
                   let msg =

     

       39
       39
       +
                     Printf.sprintf "Invalid request format for '%s': %s" line

     

       40
       40
       +
                       (to_string bad_sexp)

     

       41
       41
       +
                   in

     

       42
       42
       +
                   Ok (sexp_of_response (Error msg))

     

       43
       43
       +
               | Failure msg ->

     

       44
       44
       +
                   Ok (sexp_of_response (Error ("Processing failed: " ^ msg)))

     

       45
       45
       +
               | exn ->

     

       46
       46
       +
                   let msg =

     

       47
       47
       +
                     Printf.sprintf "Unexpected error: %s" (Printexc.to_string exn)

     

       48
       48
       +
                   in

     

       49
       49
       +
                   Ok (sexp_of_response (Error msg))

     

       50
       50
       +
             in

     

       51
       51
       +
             let response_line =

     

       52
       52
       +
               to_string

     

       53
       53
       +
                 (match response with

     

       54
       54
       +
                 | Ok r -> r

     

       55
       55
       +
                 | Error (`Msg msg) -> Sexp.sexp_of_response (Error msg))

     

       56
       56
       +
             in

     

       57
       57
       +
             Flow.copy_string (response_line ^ "\n") stdout

     

       58
       58
       +
           done

     

       59
       59
       +
         with End_of_file -> ()

     

       60
       60
       +
       

     

       61
       61
       +
       let cmd ~stdin ~stdout ~fs calendar_dir =

     

       62
       62
       +
         let run () =

     

       63
       63
       +
           let _ = run ~stdin ~stdout ~fs calendar_dir () in

     

       64
       64
       +
           0

     

       65
       65
       +
         in

     

       66
       66
       +
         let term = Term.(const run) in

     

       67
       67
       +
       

     

       68
       68
       +
         let doc = "Process single-line S-expression requests from stdin to stdout." in

     

       69
       69
       +
         let man =

     

       70
       70
       +
           [

     

       71
       71
       +
             `S Manpage.s_description;

     

       72
       72
       +
             `P

     

       73
       73
       +
               "$(mname) $(tname) reads S-expression requests (one per line) from \

     

       74
       74
       +
                stdin, processes them, and writes S-expression responses (one per \

     

       75
       75
       +
                line) to stdout.";

     

       76
       76
       +
             `P "Example request: '(Query (()))'";

     

       77
       77
       +
             `P

     

       78
       78
       +
               "Example response: '(Ok (Events ((id ...) (summary ...) ...)))' or \

     

       79
       79
       +
                '(Error \"...\")'";

     

       80
       80
       +
             `S Manpage.s_examples;

     

       81
       81
       +
             `Pre "echo '(Query ((text \\\"meeting\\\")))' | $(mname) $(tname)";

     

       82
       82
       +
           ]

     

       83
       83
       +
         in

     

       84
       84
       +
         let info = Cmd.info "server" ~doc ~man in

     

       85
       85
       +
         Cmd.v info term

+10 -8

bin/show_cmd.ml

···

       3
       3
        
       

     

       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_without_recurrence ~fs calendar_dir ~filter () in

     

       6
       6
       +
         let filter = Event.with_id event_id in

     

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

     

       8
       8
       +
         let results = Event.query_without_recurrence events ~filter () in

     

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

     

       9
       10
        
         else print_endline (Event.format_events ~format results);

     

       10
       11
        
         Ok ()

     
···

       21
       22
        
           & info [ "format"; "o" ] ~docv:"FORMAT" ~doc)

     

       22
       23
        
       

     

       23
       24
        
       let cmd ~fs calendar_dir =

     

       24
       24
       -
         let run event_id format =

     

       25
       25
       +
         let run event_id format () =

     

       25
       26
        
           match run ~event_id ~format ~fs calendar_dir with

     

       26
       27
        
           | Error (`Msg msg) ->

     

       27
       28
        
               Printf.eprintf "Error: %s\n%!" msg;

     
···

       34
       35
        
           [

     

       35
       36
        
             `S Manpage.s_description;

     

       36
       37
        
             `P "Show detailed information about a specific event by its ID.";

     

       37
       37
       -
             `P

     

       38
       38
       -
               "You can find event IDs by using the `list` or `search` commands with \

     

       39
       39
       -
                the `id` output using `-o id`.";

     

       40
       40
       -
             `S Manpage.s_options;

     

       38
       38
       +
             `P "You can find event IDs by using the `list` or `search` commands.";

     

       41
       39
        
             `S Manpage.s_examples;

     

       42
       40
        
             `P "Show event details:";

     

       43
       41
        
             `P "  caled show 12345678-1234-5678-1234-567812345678";

     

       44
       42
        
             `P "Show event details in JSON format:";

     

       45
       43
        
             `P "  caled show 12345678-1234-5678-1234-567812345678 --format json";

     

       44
       44
       +
             `S Manpage.s_options;

     

       46
       45
        
           ]

     

       47
       46
        
         in

     

       48
       48
       -
         let info = Cmd.info "show" ~doc ~man in

     

       47
       47
       +
         let exit_info =

     

       48
       48
       +
           [ Cmd.Exit.info ~doc:"on success." 0; Cmd.Exit.info ~doc:"on error." 1 ]

     

       49
       49
       +
         in

     

       50
       50
       +
         let info = Cmd.info "show" ~doc ~man ~exits:exit_info in

     

       49
       51
        
         Cmd.v info term

+2 -1

caledonia.opam

···

       1
       1
        
       opam-version: "2.0"

     

       2
       2
       -
       version: "0.3.0"

     

       2
       2
       +
       version: "0.4.0"

     

       3
       3
        
       maintainer: "Ryan Gibb <ryan@freumh.org"

     

       4
       4
        
       authors: ["Ryan Gibb <ryan@freumh.org"]

     

       5
       5
        
       homepage: "https://ryan.freumh.org/caledonia.html"

     
···

       26
       26
        
         "eio_main" {>= "0.12"}

     

       27
       27
        
         "timere" {>= "0.8.0"}

     

       28
       28
        
         "timedesc" {>= "0.8.0"}

     

       29
       29
       +
         "ppx_sexp_conv" {>= "0.15.1"}

     

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

     

       30
       31
        
       ]

     

       31
       32
        
       pin-depends: [

+2 -2

dune-project

···

       1
       1
        
       (lang dune 3.4)

     

       2
       2
        
       (name caledonia)

     

       3
       3
       -
       (version 0.3.0)

     

       4
       4
       -
       (using directory-targets 0.1)
     

       3
       3
       +
       (version 0.4.0)

     

       4
       4
       +
       (using directory-targets 0.1)

+56

emacs/caledonia-evil.el

···

       1
       1
       +
       ;;; caledonia-evil.el --- Evil bindings for Caledonia -*- lexical-binding: t; -*-

     

       2
       2
       +
       ;;

     

       3
       3
       +
       ;; Copyright (C) 2025 Ryan Gibb

     

       4
       4
       +
       ;;

     

       5
       5
       +
       ;; Author: Ryan Gibb <ryan@freumh.org>

     

       6
       6
       +
       ;; Maintainer: Ryan Gibb <ryan@freumh.org>

     

       7
       7
       +
       ;; Version: 0.4.0

     

       8
       8
       +
       ;; Keywords: calendar

     

       9
       9
       +
       ;; Package-Requires: ((emacs "24.3"))

     

       10
       10
       +
       ;; URL: https://ryan.freumh.org/caledonia.html

     

       11
       11
       +
       ;;

     

       12
       12
       +
       ;; This file is not part of GNU Emacs.

     

       13
       13
       +
       ;;

     

       14
       14
       +
       ;;; Commentary:

     

       15
       15
       +
       ;;

     

       16
       16
       +
       ;; This package provides Evil bindings for Caledonia.

     

       17
       17
       +
       ;;

     

       18
       18
       +
       ;;; Code:

     

       19
       19
       +
       

     

       20
       20
       +
       (require 'evil)

     

       21
       21
       +
       (require 'caledonia)

     

       22
       22
       +
       

     

       23
       23
       +
       (defvar caledonia-evil-filter-map

     

       24
       24
       +
         (let ((map (make-sparse-keymap)))

     

       25
       25
       +
           (define-key map "d" 'caledonia-query-date-range)

     

       26
       26
       +
           (define-key map "c" 'caledonia-query-calendars)

     

       27
       27
       +
           (define-key map "t" 'caledonia-query-text)

     

       28
       28
       +
           (define-key map "i" 'caledonia-query-id)

     

       29
       29
       +
           (define-key map "r" 'caledonia-query-recurring)

     

       30
       30
       +
           (define-key map "l" 'caledonia-query-limit)

     

       31
       31
       +
           (define-key map "z" 'caledonia-query-timezone)

     

       32
       32
       +
           map)

     

       33
       33
       +
         "Evil mode keymap for filter commands in Caledonia mode.")

     

       34
       34
       +
       

     

       35
       35
       +
       (defun caledonia-evil--setup-evil-bindings ()

     

       36
       36
       +
         "Set up Evil keybindings for `caledonia-mode`."

     

       37
       37
       +
         (evil-define-key 'normal caledonia-mode-map

     

       38
       38
       +
           (kbd "RET") 'caledonia-show-event

     

       39
       39
       +
           (kbd "M-RET") 'caledonia-open-event-file

     

       40
       40
       +
           "l" 'caledonia-list

     

       41
       41
       +
           "s" 'caledonia-search

     

       42
       42
       +
           "r" 'caledonia-refresh

     

       43
       43
       +
           "q" 'quit-window

     

       44
       44
       +
           "f" caledonia-evil-filter-map))

     

       45
       45
       +
       

     

       46
       46
       +
       (defun caledonia-evil--setup-evil-integration ()

     

       47
       47
       +
         "Set up Evil integration for Caledonia mode."

     

       48
       48
       +
         (when (bound-and-true-p evil-mode)

     

       49
       49
       +
           (evil-make-overriding-map caledonia-mode-map 'normal)

     

       50
       50
       +
           (evil-normalize-keymaps)

     

       51
       51
       +
           (caledonia-evil--setup-evil-bindings)))

     

       52
       52
       +
       

     

       53
       53
       +
       (add-hook 'caledonia-mode-hook 'caledonia-evil--setup-evil-integration)

     

       54
       54
       +
       

     

       55
       55
       +
       (provide 'caledonia-evil)

     

       56
       56
       +
       ;;; caledonia-evil.el ends here

+788

emacs/caledonia.el

···

       1
       1
       +
       ;;; caledonia.el --- Emacs integration for Caledonia -*- lexical-binding: t -*-

     

       2
       2
       +
       

     

       3
       3
       +
       ;; Copyright (C) 2025 Ryan Gibb

     

       4
       4
       +
       

     

       5
       5
       +
       ;; Author: Ryan Gibb <ryan@freumh.org>

     

       6
       6
       +
       ;; Maintainer: Ryan Gibb <ryan@freumh.org>

     

       7
       7
       +
       ;; Version: 0.4.0

     

       8
       8
       +
       ;; Keywords: calendar

     

       9
       9
       +
       ;; Package-Requires: ((emacs "24.4"))

     

       10
       10
       +
       ;; URL: https://ryan.freumh.org/caledonia.html

     

       11
       11
       +
       

     

       12
       12
       +
       ;; This file is not part of GNU Emacs.

     

       13
       13
       +
       

     

       14
       14
       +
       ;;; Commentary:

     

       15
       15
       +
       

     

       16
       16
       +
       ;; This package provides an Emacs interface to the Caledonia calendar CLI.

     

       17
       17
       +
       ;; It communicates with Caledonia using S-expressions for data exchange.

     

       18
       18
       +
       

     

       19
       19
       +
       ;;; Code:

     

       20
       20
       +
       

     

       21
       21
       +
       (require 'cl-lib)

     

       22
       22
       +
       (require 'calendar)

     

       23
       23
       +
       (require 'pulse nil t)

     

       24
       24
       +
       (require 'org)

     

       25
       25
       +
       

     

       26
       26
       +
       (defgroup caledonia nil

     

       27
       27
       +
         "Interface to Caledonia calendar client."

     

       28
       28
       +
         :group 'calendar

     

       29
       29
       +
         :prefix "caledonia-")

     

       30
       30
       +
       

     

       31
       31
       +
       (defcustom caledonia-executable (executable-find "caled")

     

       32
       32
       +
         "Path to the Caledonia executable."

     

       33
       33
       +
         :type 'string

     

       34
       34
       +
         :group 'caledonia)

     

       35
       35
       +
       

     

       36
       36
       +
       (defface caledonia-calendar-name-face

     

       37
       37
       +
         '((t :inherit font-lock-function-name-face))

     

       38
       38
       +
         "Face used for calendar names in the events view."

     

       39
       39
       +
         :group 'caledonia)

     

       40
       40
       +
       

     

       41
       41
       +
       (defface caledonia-date-face

     

       42
       42
       +
         '((t :inherit font-lock-string-face))

     

       43
       43
       +
         "Face used for dates in the events view."

     

       44
       44
       +
         :group 'caledonia)

     

       45
       45
       +
       

     

       46
       46
       +
       (defface caledonia-summary-face

     

       47
       47
       +
         '((t :inherit default))

     

       48
       48
       +
         "Face used for event summaries in the events view."

     

       49
       49
       +
         :group 'caledonia)

     

       50
       50
       +
       

     

       51
       51
       +
       (defface caledonia-location-face

     

       52
       52
       +
         '((t :inherit font-lock-comment-face))

     

       53
       53
       +
         "Face used for event locations in the events view."

     

       54
       54
       +
         :group 'caledonia)

     

       55
       55
       +
       

     

       56
       56
       +
       (defcustom caledonia-calendar-column-width 0

     

       57
       57
       +
         "Column width for the Calendar entry."

     

       58
       58
       +
         :type 'natnum)

     

       59
       59
       +
       

     

       60
       60
       +
       (defcustom caledonia-start-column-width 0

     

       61
       61
       +
         "Column width for the Start entry."

     

       62
       62
       +
         :type 'natnum)

     

       63
       63
       +
       

     

       64
       64
       +
       (defcustom caledonia-end-column-width 0

     

       65
       65
       +
         "Column width for the End entry."

     

       66
       66
       +
         :type 'natnum)

     

       67
       67
       +
       

     

       68
       68
       +
       (defcustom caledonia-list-from-date "today"

     

       69
       69
       +
         "Default start date for calendar list view."

     

       70
       70
       +
         :type 'string

     

       71
       71
       +
         :group 'caledonia)

     

       72
       72
       +
       

     

       73
       73
       +
       (defcustom caledonia-list-to-date "+3m"

     

       74
       74
       +
         "Default end date for calendar list view (3 months from today)."

     

       75
       75
       +
         :type 'string

     

       76
       76
       +
         :group 'caledonia)

     

       77
       77
       +
       

     

       78
       78
       +
       (defcustom caledonia-search-from-date nil

     

       79
       79
       +
         "Default start date for calendar search; nil means no start date limit."

     

       80
       80
       +
         :type 'string

     

       81
       81
       +
         :group 'caledonia)

     

       82
       82
       +
       

     

       83
       83
       +
       (defcustom caledonia-search-to-date "+75y"

     

       84
       84
       +
         "Default end date for calendar search (75 years from today)."

     

       85
       85
       +
         :type 'string

     

       86
       86
       +
         :group 'caledonia)

     

       87
       87
       +
       

     

       88
       88
       +
       ;; Define histories for input fields

     

       89
       89
       +
       

     

       90
       90
       +
       (defvar caledonia-from-history nil "History for from date inputs.")

     

       91
       91
       +
       (defvar caledonia-to-history nil "History for to date inputs.")

     

       92
       92
       +
       (defvar caledonia-timezone-history nil "History for timezone inputs.")

     

       93
       93
       +
       (defvar caledonia-calendars-history nil "History for calendar inputs.")

     

       94
       94
       +
       (defvar caledonia-text-history nil "History for search text inputs.")

     

       95
       95
       +
       (defvar caledonia-search-fields-history nil "History for search fields inputs.")

     

       96
       96
       +
       (defvar caledonia-id-history nil "History for event ID inputs.")

     

       97
       97
       +
       (defvar caledonia-limit-history nil "History for limit inputs.")

     

       98
       98
       +
       (defvar caledonia-search-prompt-history nil "History for search prompt inputs.")

     

       99
       99
       +
       

     

       100
       100
       +
       ;; Internal variables

     

       101
       101
       +
       

     

       102
       102
       +
       (defvar caledonia--events-buffer "*Caledonia Events*"

     

       103
       103
       +
         "Buffer name for displaying Caledonia events.")

     

       104
       104
       +
       (defvar caledonia--details-buffer "*Caledonia Event Details*"

     

       105
       105
       +
         "Buffer name for displaying Caledonia event details.")

     

       106
       106
       +
       (defvar caledonia--server-process nil

     

       107
       107
       +
         "The persistent Caledonia server process.")

     

       108
       108
       +
       (defvar caledonia--server-buffer-name "*caledonia-server-io*"

     

       109
       109
       +
         "Buffer for server process I/O.")

     

       110
       110
       +
       (defvar caledonia--response-line nil

     

       111
       111
       +
         "Last response line received.")

     

       112
       112
       +
       (defvar caledonia--response-flag nil

     

       113
       113
       +
         "Non-nil means a responce has been recieved.")

     

       114
       114
       +
       (defvar-local caledonia--current-query nil

     

       115
       115
       +
         "The current query parameters being displayed in this buffer.")

     

       116
       116
       +
       

     

       117
       117
       +
       ;; API functions

     

       118
       118
       +
       

     

       119
       119
       +
       (defvar caledonia--server-line-buffer "")

     

       120
       120
       +
       

     

       121
       121
       +
       (defun caledonia--server-filter (process output)

     

       122
       122
       +
         "Filter PROCESS OUTPUT."

     

       123
       123
       +
         ;; Append to the ongoing buffer for logging/debugging

     

       124
       124
       +
         (when (buffer-live-p (process-buffer process))

     

       125
       125
       +
           (with-current-buffer (process-buffer process)

     

       126
       126
       +
             (goto-char (point-max))

     

       127
       127
       +
             (insert output)))

     

       128
       128
       +
         ;; Append new output to line buffer

     

       129
       129
       +
         (setq caledonia--server-line-buffer (concat caledonia--server-line-buffer output))

     

       130
       130
       +
         ;; Extract full lines

     

       131
       131
       +
         (let ((lines (split-string caledonia--server-line-buffer "\n")))

     

       132
       132
       +
           ;; Keep the last line (possibly incomplete) for next round

     

       133
       133
       +
           (setq caledonia--server-line-buffer (car (last lines)))

     

       134
       134
       +
           ;; Process all complete lines

     

       135
       135
       +
           (dolist (line (butlast lines))

     

       136
       136
       +
             (when (and (not caledonia--response-flag)

     

       137
       137
       +
                        (not (string-empty-p line)))

     

       138
       138
       +
               (setq caledonia--response-line line)

     

       139
       139
       +
               (setq caledonia--response-flag t)))))

     

       140
       140
       +
       

     

       141
       141
       +
       (defun caledonia--server-sentinel (process event)

     

       142
       142
       +
         "Listen on PROCESS for an EVENT."

     

       143
       143
       +
         (message "Caledonia Server process event: %s (%s)" process event)

     

       144
       144
       +
         (setq caledonia--server-process nil))

     

       145
       145
       +
       

     

       146
       146
       +
       (defun caledonia--ensure-server-running ()

     

       147
       147
       +
         "Run the caledonia binary in server mode."

     

       148
       148
       +
         (unless (and caledonia--server-process (process-live-p caledonia--server-process))

     

       149
       149
       +
           (message "Caledonia  Starting server...")

     

       150
       150
       +
           (setq caledonia--server-process

     

       151
       151
       +
                 (start-process "caledonia-server"

     

       152
       152
       +
                                (get-buffer-create caledonia--server-buffer-name)

     

       153
       153
       +
                                caledonia-executable

     

       154
       154
       +
                                "server"))

     

       155
       155
       +
           (unless (and caledonia--server-process (process-live-p caledonia--server-process))

     

       156
       156
       +
             (error "Caledonia  Failed to start server process"))

     

       157
       157
       +
           (set-process-filter caledonia--server-process #'caledonia--server-filter)

     

       158
       158
       +
           (set-process-sentinel caledonia--server-process #'caledonia--server-sentinel)

     

       159
       159
       +
           (message "Caledonia  Server started.")))

     

       160
       160
       +
       

     

       161
       161
       +
       (defun caledonia--send-request (request-str)

     

       162
       162
       +
         "Send REQUEST-STR and get responce back."

     

       163
       163
       +
         (caledonia--ensure-server-running)

     

       164
       164
       +
         (setq caledonia--response-line nil)

     

       165
       165
       +
         (setq caledonia--response-flag nil)

     

       166
       166
       +
         (process-send-string caledonia--server-process (concat request-str "\n"))

     

       167
       167
       +
         ;; Wait for response

     

       168
       168
       +
         (let ((start-time (current-time)))

     

       169
       169
       +
           (while (and (not caledonia--response-flag)

     

       170
       170
       +
                       (< (time-to-seconds (time-since start-time)) 5) ; 5 sec timeout

     

       171
       171
       +
                       (process-live-p caledonia--server-process))

     

       172
       172
       +
             (accept-process-output caledonia--server-process 0 100000))) ; Wait 100ms

     

       173
       173
       +
         (unless caledonia--response-flag

     

       174
       174
       +
           (error "Caledonia  Timeout or server died waiting for response"))

     

       175
       175
       +
         (condition-case err

     

       176
       176
       +
             (let ((response-sexp (read caledonia--response-line)))

     

       177
       177
       +
               (unless (and (listp response-sexp) (memq (car response-sexp) '(Ok Error)))

     

       178
       178
       +
                 (error "Caledonia  Invalid response format: %S" response-sexp))

     

       179
       179
       +
               (if (eq (car response-sexp) 'Error)

     

       180
       180
       +
                   (error "Caledonia Server Error: %s" (cadr response-sexp))

     

       181
       181
       +
                 ;; Return the (Ok ...) payload

     

       182
       182
       +
                 (cadr response-sexp)))

     

       183
       183
       +
           (error "Caledonia Failed to parse response line: %s"

     

       184
       184
       +
                  caledonia--response-line (error-message-string err))))

     

       185
       185
       +
       

     

       186
       186
       +
       (defun caledonia--get-events (event-payload)

     

       187
       187
       +
         "Parse EVENT-PAYLOAD of structure (Events (events...))."

     

       188
       188
       +
         (if (and (listp event-payload) (eq (car event-payload) 'Events))

     

       189
       189
       +
             (let ((event-list (cadr event-payload)))

     

       190
       190
       +
               event-list)

     

       191
       191
       +
           (error

     

       192
       192
       +
            (message "Failed to parse Caledonia output: %s" (error-message-string err))

     

       193
       193
       +
            nil)))

     

       194
       194
       +
       

     

       195
       195
       +
       ;; UI functions

     

       196
       196
       +
       

     

       197
       197
       +
       (defun caledonia--format-timestamp (iso-string &optional format)

     

       198
       198
       +
         "Format ISO-8601 time string ISO-STRING to human-readable format.

     

       199
       199
       +
       FORMAT defaults to \"%Y-%m-%d %H:%M\" if not specified."

     

       200
       200
       +
         (let* ((parsed (parse-time-string iso-string))

     

       201
       201
       +
                (time (apply #'encode-time

     

       202
       202
       +
                             (append (cl-subseq parsed 0 6) (list nil -1)))))

     

       203
       203
       +
           (format-time-string (or format "%Y-%m-%d %H:%M") time)))

     

       204
       204
       +
       

     

       205
       205
       +
       (defun caledonia--get-key (key event)

     

       206
       206
       +
         "Get KEY from EVENT as a string."

     

       207
       207
       +
         (let ((value (cadr (assoc key event))))

     

       208
       208
       +
           (cond

     

       209
       209
       +
            ((null value) nil)

     

       210
       210
       +
            ((stringp value) value)

     

       211
       211
       +
            ((symbolp value) (symbol-name value)))))

     

       212
       212
       +
       

     

       213
       213
       +
       (defun caledonia--tabulated-list-entries (events)

     

       214
       214
       +
         "Convert EVENTS for a format suitable for showing via a tabulated-list-mode'."

     

       215
       215
       +
         (let ((max-calendar-width 0)

     

       216
       216
       +
               (max-start-width 0)

     

       217
       217
       +
               (max-end-width 0)

     

       218
       218
       +
               (tabulated-list-entries nil))

     

       219
       219
       +
           ;; first pass: calculate maximum widths

     

       220
       220
       +
           (dolist (event events)

     

       221
       221
       +
             (let* ((calendar (caledonia--get-key 'calendar event))

     

       222
       222
       +
                    (start (caledonia--get-key 'start event))

     

       223
       223
       +
                    (end (caledonia--get-key 'end event))

     

       224
       224
       +
                    (cal-str (if (not calendar) "unkown" calendar))

     

       225
       225
       +
                    (start-str (caledonia--format-timestamp start))

     

       226
       226
       +
                    (end-str (when end

     

       227
       227
       +
                               (caledonia--format-timestamp (format "%s" end)))))

     

       228
       228
       +
               (setq max-calendar-width (max max-calendar-width (length cal-str)))

     

       229
       229
       +
               (setq max-start-width (max max-start-width (+ (length start-str) 2)))

     

       230
       230
       +
               (setq max-end-width (max max-end-width (length end-str)))))

     

       231
       231
       +
           (setq caledonia-calendar-column-width  (max max-calendar-width (length "Calendar")))

     

       232
       232
       +
           (setq caledonia-start-column-width (max max-start-width (length "Start")))

     

       233
       233
       +
           (setq caledonia-end-column-width  (max max-end-width (length "End")))

     

       234
       234
       +
           ;; second pass: prepare tabulated-list entries with properties

     

       235
       235
       +
           (setq tabulated-list-entries

     

       236
       236
       +
                 (mapcar (lambda (event)

     

       237
       237
       +
                           (let* (

     

       238
       238
       +
                                  (id (caledonia--get-key 'id event))

     

       239
       239
       +
                                  (summary (caledonia--get-key 'summary event))

     

       240
       240
       +
                                  (start (caledonia--get-key 'start event))

     

       241
       241
       +
                                  (end (caledonia--get-key 'end event))

     

       242
       242
       +
                                  (location (caledonia--get-key 'location event))

     

       243
       243
       +
                                  (calendar (caledonia--get-key 'calendar event))

     

       244
       244
       +
                                  (start-str (caledonia--format-timestamp start))

     

       245
       245
       +
                                  (end-str (if end (caledonia--format-timestamp (format "%s" end)) ""))

     

       246
       246
       +
                                  (start-str (if end (format "%s -" start-str) start-str))

     

       247
       247
       +
                                  (location-str (if location (concat " @ " location) ""))

     

       248
       248
       +
                                  (cal-prop (propertize calendar 'face 'caledonia-calendar-name-face))

     

       249
       249
       +
                                  (start-prop (propertize start-str 'face 'caledonia-date-face))

     

       250
       250
       +
                                  (end-prop (propertize end-str 'face 'caledonia-date-face))

     

       251
       251
       +
                                  (summary-prop (propertize (concat summary location-str)

     

       252
       252
       +
                                                            'face 'caledonia-summary-face))

     

       253
       253
       +
                                  ;; Store the full event data as a text property for retrieval

     

       254
       254
       +
                                  (entry-id (propertize (format "%s" id) 'event-data event)))

     

       255
       255
       +
                             (list entry-id (vector cal-prop start-prop end-prop summary-prop))))

     

       256
       256
       +
                         events))

     

       257
       257
       +
           tabulated-list-entries))

     

       258
       258
       +
       

     

       259
       259
       +
       (defun caledonia--sort-calendar (A B)

     

       260
       260
       +
         "Sort function for calendar column between A and B."

     

       261
       261
       +
         (let ((a (aref (cadr A) 0))

     

       262
       262
       +
               (b (aref (cadr B) 0)))

     

       263
       263
       +
           (string< a b)))

     

       264
       264
       +
       

     

       265
       265
       +
       (defun caledonia--sort-start (A B)

     

       266
       266
       +
         "Sort function for date/time column between A and B."

     

       267
       267
       +
         (let ((a (aref (cadr A) 1))

     

       268
       268
       +
               (b (aref (cadr B) 1)))

     

       269
       269
       +
           (time-less-p (date-to-time a) (date-to-time b))))

     

       270
       270
       +
       

     

       271
       271
       +
       (defun caledonia--sort-end (A B)

     

       272
       272
       +
         "Sort function for date/time column between A and B."

     

       273
       273
       +
         (let ((a (aref (cadr A) 2))

     

       274
       274
       +
               (b (aref (cadr B) 2)))

     

       275
       275
       +
           (time-less-p (date-to-time a) (date-to-time b))))

     

       276
       276
       +
       

     

       277
       277
       +
       (defun caledonia--make-query (&optional query)

     

       278
       278
       +
         "Make a query with the QUERY S-expression.

     

       279
       279
       +
       If QUERY is nil, use the current query stored in `caledonia--current-query`."

     

       280
       280
       +
         (interactive)

     

       281
       281
       +
         (let* ((query-to-use (or query caledonia--current-query '()))  ;; Use current query if available

     

       282
       282
       +
                ;; Ensure to date is set if not present in query

     

       283
       283
       +
                (query-to-use (if (assq 'to query-to-use)

     

       284
       284
       +
                                  query-to-use

     

       285
       285
       +
                                (cons `(to ,caledonia-list-to-date) query-to-use)))

     

       286
       286
       +
                (request-str (format "(Query %s)" (prin1-to-string query-to-use)))

     

       287
       287
       +
                (payload (caledonia--send-request request-str))

     

       288
       288
       +
                (events (caledonia--get-events payload))

     

       289
       289
       +
                (entries (caledonia--tabulated-list-entries events)))

     

       290
       290
       +
           ;; Save this query for future refreshes if explicitly provided

     

       291
       291
       +
           (when query

     

       292
       292
       +
             (setq-local caledonia--current-query query-to-use))

     

       293
       293
       +
           (setq tabulated-list-entries entries))

     

       294
       294
       +
         (setq tabulated-list-format

     

       295
       295
       +
               `[("Calendar" ,caledonia-calendar-column-width caledonia--sort-calendar)

     

       296
       296
       +
                 ("Start" ,caledonia-start-column-width caledonia--sort-start)

     

       297
       297
       +
                 ("End" ,caledonia-end-column-width caledonia--sort-end)

     

       298
       298
       +
                 ("Summary" 0 t)])

     

       299
       299
       +
         (setq tabulated-list-sort-key (cons "Start" nil))

     

       300
       300
       +
         (tabulated-list-init-header)

     

       301
       301
       +
         (tabulated-list-print t))

     

       302
       302
       +
       

     

       303
       303
       +
       (defun caledonia--find-and-highlight-event-in-file (file event-id)

     

       304
       304
       +
         "Find EVENT-ID in FILE, position cursor, and highlight the event.

     

       305
       305
       +
       Return non-nil if the event was found."

     

       306
       306
       +
         (when (and file event-id)

     

       307
       307
       +
           (let ((id-str (format "%s" event-id))

     

       308
       308
       +
                 (found nil))

     

       309
       309
       +
             ;; Try to find and highlight iCalendar VEVENT block

     

       310
       310
       +
             (goto-char (point-min))

     

       311
       311
       +
             (when (and (string-match-p "\\.ics$" file)

     

       312
       312
       +
                        (search-forward (format "UID:%s" id-str) nil t))

     

       313
       313
       +
               ;; Found the UID in an ICS file, try to highlight the VEVENT block

     

       314
       314
       +
               (let ((uid-pos (match-beginning 0))

     

       315
       315
       +
                     (vevent-start nil)

     

       316
       316
       +
                     (vevent-end nil))

     

       317
       317
       +
                 ;; Find start of the VEVENT block

     

       318
       318
       +
                 (save-excursion

     

       319
       319
       +
                   (goto-char uid-pos)

     

       320
       320
       +
                   (if (search-backward "BEGIN:VEVENT" nil t)

     

       321
       321
       +
                       (setq vevent-start (match-beginning 0))

     

       322
       322
       +
                     (setq vevent-start uid-pos)))

     

       323
       323
       +
                 ;; Find end of the VEVENT block

     

       324
       324
       +
                 (save-excursion

     

       325
       325
       +
                   (goto-char uid-pos)

     

       326
       326
       +
                   (if (search-forward "END:VEVENT" nil t)

     

       327
       327
       +
                       (setq vevent-end (match-end 0))

     

       328
       328
       +
                     (setq vevent-end (line-end-position))))

     

       329
       329
       +
                 ;; Highlight the whole VEVENT block if found

     

       330
       330
       +
                 (when (and vevent-start vevent-end)

     

       331
       331
       +
                   (goto-char vevent-start)

     

       332
       332
       +
                   (caledonia--highlight-region vevent-start vevent-end)

     

       333
       333
       +
                   (recenter)

     

       334
       334
       +
                   (setq found t))))

     

       335
       335
       +
             (unless found

     

       336
       336
       +
               (message "Event ID not found in file"))

     

       337
       337
       +
             found)))

     

       338
       338
       +
       

     

       339
       339
       +
       (defun caledonia--display-event-details (event)

     

       340
       340
       +
         "Display details for EVENT in a separate buffer."

     

       341
       341
       +
         (let ((buf (get-buffer-create caledonia--details-buffer)))

     

       342
       342
       +
           (with-current-buffer buf

     

       343
       343
       +
             (let ((inhibit-read-only t))

     

       344
       344
       +
               (erase-buffer)

     

       345
       345
       +
               (special-mode)

     

       346
       346
       +
               (let* ((id (caledonia--get-key 'id event))

     

       347
       347
       +
                      (summary (caledonia--get-key 'summary event))

     

       348
       348
       +
                      (description (caledonia--get-key 'description event))

     

       349
       349
       +
                      (start (caledonia--get-key 'start event))

     

       350
       350
       +
                      (end (caledonia--get-key 'end event))

     

       351
       351
       +
                      (location (caledonia--get-key 'location event))

     

       352
       352
       +
                      (calendar (caledonia--get-key 'calendar event))

     

       353
       353
       +
                      (file (caledonia--get-key 'file event))

     

       354
       354
       +
                      (start-str (when start (caledonia--format-timestamp start)))

     

       355
       355
       +
                      (end-str (when end (caledonia--format-timestamp end))))

     

       356
       356
       +
                 (when id

     

       357
       357
       +
                   (insert (propertize "Summary: " 'face 'bold) summary "\n"))

     

       358
       358
       +
                 (when id

     

       359
       359
       +
                   (insert (propertize "ID: " 'face 'bold) id "\n"))

     

       360
       360
       +
                 (when calendar

     

       361
       361
       +
                   (insert (propertize "Calendar: " 'face 'bold) calendar "\n"))

     

       362
       362
       +
                 (when start-str

     

       363
       363
       +
                   (insert (propertize "Start: " 'face 'bold) start-str "\n"))

     

       364
       364
       +
                 (when end-str

     

       365
       365
       +
                   (insert (propertize "End: " 'face 'bold) end-str "\n"))

     

       366
       366
       +
                 (when location

     

       367
       367
       +
                   (insert (propertize "Location: " 'face 'bold) location "\n"))

     

       368
       368
       +
                 (when file

     

       369
       369
       +
                   (insert (propertize "File: " 'face 'bold)

     

       370
       370
       +
                           (propertize file 'face 'link

     

       371
       371
       +
                                       'mouse-face 'highlight

     

       372
       372
       +
                                       'help-echo "Click to open file with highlighting"

     

       373
       373
       +
                                       'keymap (let ((map (make-sparse-keymap))

     

       374
       374
       +
                                                     (event-copy event))

     

       375
       375
       +
                                                 (define-key map [mouse-1]

     

       376
       376
       +
                                                             (lambda ()

     

       377
       377
       +
                                                               (interactive)

     

       378
       378
       +
                                                               (let ((file-path file)

     

       379
       379
       +
                                                                     (id-val (caledonia--get-key 'id event-copy)))

     

       380
       380
       +
                                                                 (find-file file-path)

     

       381
       381
       +
                                                                 (caledonia--find-and-highlight-event-in-file

     

       382
       382
       +
                                                                  file-path id-val))))

     

       383
       383
       +
                                                 (define-key map (kbd "RET")

     

       384
       384
       +
                                                             (lambda ()

     

       385
       385
       +
                                                               (interactive)

     

       386
       386
       +
                                                               (let ((file-path file)

     

       387
       387
       +
                                                                     (id-val (caledonia--get-key 'id event-copy)))

     

       388
       388
       +
                                                                 (find-file file-path)

     

       389
       389
       +
                                                                 (caledonia--find-and-highlight-event-in-file

     

       390
       390
       +
                                                                  file-path id-val))))

     

       391
       391
       +
                                                 map))

     

       392
       392
       +
                           "\n"))

     

       393
       393
       +
                 (when description

     

       394
       394
       +
                   (insert "\n" (propertize "Description:" 'face 'bold) "\n"

     

       395
       395
       +
                           (propertize "------------" 'face 'bold) "\n"

     

       396
       396
       +
                           description "\n")))))

     

       397
       397
       +
           (switch-to-buffer-other-window buf)))

     

       398
       398
       +
       

     

       399
       399
       +
       (defun caledonia--highlight-region (start end)

     

       400
       400
       +
         "Highlight the region between START and END."

     

       401
       401
       +
         (when (fboundp 'pulse-momentary-highlight-region)

     

       402
       402
       +
           (pulse-momentary-highlight-region start end))

     

       403
       403
       +
         ;; Fallback for when pulse is not available

     

       404
       404
       +
         (unless (fboundp 'pulse-momentary-highlight-region)

     

       405
       405
       +
           (let ((overlay (make-overlay start end)))

     

       406
       406
       +
             (overlay-put overlay 'face 'highlight)

     

       407
       407
       +
             (run-with-timer 0.5 nil (lambda () (delete-overlay overlay))))))

     

       408
       408
       +
       

     

       409
       409
       +
       (defun caledonia--read-date-range ()

     

       410
       410
       +
         "Read a date range from the user with `org-mode' date picker integration.

     

       411
       411
       +
       Returns a cons cell (from-date . to-date).

     

       412
       412
       +
       The from-date can be nil to indicate no start date constraint."

     

       413
       413
       +
         (let (from to)

     

       414
       414
       +
           (setq from

     

       415
       415
       +
                 (if (y-or-n-p "Set a start date? ")

     

       416
       416
       +
                     (org-read-date nil nil nil "From date: " nil nil t)

     

       417
       417
       +
                                               ; empty string differentiates from nil for optional args later on

     

       418
       418
       +
                   ""))

     

       419
       419
       +
           ;; Use org-mode's date picker for To date (must have a value)

     

       420
       420
       +
           (setq to (org-read-date nil nil nil "To date: " nil nil t))

     

       421
       421
       +
           (cons from to)))

     

       422
       422
       +
       

     

       423
       423
       +
       ;; Query parameter modification functions

     

       424
       424
       +
       

     

       425
       425
       +
       (defun caledonia-query-date-range ()

     

       426
       426
       +
         "Set the date range for the current calendar view."

     

       427
       427
       +
         (interactive)

     

       428
       428
       +
         (when (eq major-mode 'caledonia-mode)

     

       429
       429
       +
           (let* ((dates (caledonia--read-date-range))

     

       430
       430
       +
                  (from (car dates))

     

       431
       431
       +
                  (to (cdr dates))

     

       432
       432
       +
                  (current-query caledonia--current-query)

     

       433
       433
       +
                  (new-query (copy-tree current-query)))

     

       434
       434
       +
             ;; Update the query with the new date range

     

       435
       435
       +
             (setq new-query (assq-delete-all 'from new-query))

     

       436
       436
       +
             (setq new-query (assq-delete-all 'to new-query))

     

       437
       437
       +
             (when (and from (not (string-empty-p from)))

     

       438
       438
       +
               (push `(from ,from) new-query))

     

       439
       439
       +
             (when (and to (not (string-empty-p to)))

     

       440
       440
       +
               (push `(to ,to) new-query))

     

       441
       441
       +
             ;; Execute the updated query

     

       442
       442
       +
             (caledonia--make-query new-query))))

     

       443
       443
       +
       

     

       444
       444
       +
       (defun caledonia-query-calendars ()

     

       445
       445
       +
         "Set the calendars to filter by for the current calendar view.

     

       446
       446
       +
       Fetches available calendars from server to allow selection from a list."

     

       447
       447
       +
         (interactive)

     

       448
       448
       +
         (when (eq major-mode 'caledonia-mode)

     

       449
       449
       +
           (let* ((available-calendars

     

       450
       450
       +
                   (caledonia--send-request "ListCalendars"))

     

       451
       451
       +
                  (calendars-list

     

       452
       452
       +
                   (if (and (listp available-calendars)

     

       453
       453
       +
                            (eq (car available-calendars) 'Calendars))

     

       454
       454
       +
                       (cadr available-calendars)

     

       455
       455
       +
                     (progn

     

       456
       456
       +
                       (message "Failed to get calendar list from server")

     

       457
       457
       +
                       nil)))

     

       458
       458
       +
                  ;; Use completing-read-multiple to select from available calendars

     

       459
       459
       +
                  (selected-calendars

     

       460
       460
       +
                   (completing-read-multiple

     

       461
       461
       +
                    "Select calendars (comma-separated, empty for all): "

     

       462
       462
       +
                    ;; Use empty list if no calendars found

     

       463
       463
       +
                    (or calendars-list '())

     

       464
       464
       +
                    nil nil

     

       465
       465
       +
                    (let ((current-calendars (cdr (assq 'calendars caledonia--current-query))))

     

       466
       466
       +
                      (when current-calendars

     

       467
       467
       +
                        (mapconcat #'identity current-calendars ",")))

     

       468
       468
       +
                    'caledonia-calendars-history))

     

       469
       469
       +
                  (calendars (mapcar #'string-trim selected-calendars))

     

       470
       470
       +
                  (current-query caledonia--current-query)

     

       471
       471
       +
                  (new-query (copy-tree current-query)))

     

       472
       472
       +
             ;; Update the query with the new calendars

     

       473
       473
       +
             (setq new-query (assq-delete-all 'calendars new-query))

     

       474
       474
       +
             (when (and calendars (not (null calendars)))

     

       475
       475
       +
               (push `(calendars ,calendars) new-query))

     

       476
       476
       +
             ;; Execute the updated query

     

       477
       477
       +
             (caledonia--make-query new-query))))

     

       478
       478
       +
       

     

       479
       479
       +
       (defun caledonia-query-text ()

     

       480
       480
       +
         "Set the search text for the current calendar view."

     

       481
       481
       +
         (interactive)

     

       482
       482
       +
         (when (eq major-mode 'caledonia-mode)

     

       483
       483
       +
           (let* ((text (read-string "Search text (leave empty for no text search): "

     

       484
       484
       +
                                     nil 'caledonia-text-history))

     

       485
       485
       +
                  (search-in-str (when (and text (not (string-empty-p text)))

     

       486
       486
       +
                                   (read-string "Search in (summary,description,location - leave empty for all): "

     

       487
       487
       +
                                                nil 'caledonia-search-fields-history)))

     

       488
       488
       +
                  (search-in (when (and search-in-str (not (string-empty-p search-in-str)))

     

       489
       489
       +
                               (mapcar (lambda (field)

     

       490
       490
       +
                                         (intern (string-trim field)))

     

       491
       491
       +
                                       (split-string search-in-str "," t))))

     

       492
       492
       +
                  (current-query caledonia--current-query)

     

       493
       493
       +
                  (new-query (copy-tree current-query)))

     

       494
       494
       +
             ;; Update the query with the new text search parameters

     

       495
       495
       +
             (setq new-query (assq-delete-all 'text new-query))

     

       496
       496
       +
             (setq new-query (assq-delete-all 'search_in new-query))

     

       497
       497
       +
             (when (and text (not (string-empty-p text)))

     

       498
       498
       +
               (push `(text ,text) new-query))

     

       499
       499
       +
             (when search-in

     

       500
       500
       +
               (push `(search_in ,search-in) new-query))

     

       501
       501
       +
             ;; Execute the updated query

     

       502
       502
       +
             (caledonia--make-query new-query))))

     

       503
       503
       +
       

     

       504
       504
       +
       (defun caledonia-query-id ()

     

       505
       505
       +
         "Set the event ID to filter by for the current calendar view."

     

       506
       506
       +
         (interactive)

     

       507
       507
       +
         (when (eq major-mode 'caledonia-mode)

     

       508
       508
       +
           (let* ((id (read-string "Event ID (leave empty for all events): "

     

       509
       509
       +
                                   nil 'caledonia-id-history))

     

       510
       510
       +
                  (current-query caledonia--current-query)

     

       511
       511
       +
                  (new-query (copy-tree current-query)))

     

       512
       512
       +
             ;; Update the query with the new ID

     

       513
       513
       +
             (setq new-query (assq-delete-all 'id new-query))

     

       514
       514
       +
             (when (and id (not (string-empty-p id)))

     

       515
       515
       +
               (push `(id ,id) new-query))

     

       516
       516
       +
             ;; Execute the updated query

     

       517
       517
       +
             (caledonia--make-query new-query))))

     

       518
       518
       +
       

     

       519
       519
       +
       (defun caledonia-query-recurring ()

     

       520
       520
       +
         "Set whether to filter by recurring events for the current calendar view."

     

       521
       521
       +
         (interactive)

     

       522
       522
       +
         (when (eq major-mode 'caledonia-mode)

     

       523
       523
       +
           (let* ((recurring (completing-read "Recurring events (yes/no/all, leave empty for all): "

     

       524
       524
       +
                                              '("" "yes" "no") nil nil nil))

     

       525
       525
       +
                  (current-query caledonia--current-query)

     

       526
       526
       +
                  (new-query (copy-tree current-query)))

     

       527
       527
       +
             ;; Update the query with the recurring filter

     

       528
       528
       +
             (setq new-query (assq-delete-all 'recurring new-query))

     

       529
       529
       +
             (when (not (string-empty-p recurring))

     

       530
       530
       +
               (push `(recurring ,(if (string= recurring "yes") t nil)) new-query))

     

       531
       531
       +
             ;; Execute the updated query

     

       532
       532
       +
             (caledonia--make-query new-query))))

     

       533
       533
       +
       

     

       534
       534
       +
       (defun caledonia-query-limit ()

     

       535
       535
       +
         "Set the maximum number of events to show in the current calendar view."

     

       536
       536
       +
         (interactive)

     

       537
       537
       +
         (when (eq major-mode 'caledonia-mode)

     

       538
       538
       +
           (let* ((limit-str (read-string "Maximum events to show (leave empty for no limit): "

     

       539
       539
       +
                                          nil 'caledonia-limit-history))

     

       540
       540
       +
                  (limit (when (and limit-str (not (string-empty-p limit-str)))

     

       541
       541
       +
                           (string-to-number limit-str)))

     

       542
       542
       +
                  (current-query caledonia--current-query)

     

       543
       543
       +
                  (new-query (copy-tree current-query)))

     

       544
       544
       +
             ;; Update the query with the new limit

     

       545
       545
       +
             (setq new-query (assq-delete-all 'limit new-query))

     

       546
       546
       +
             (when limit

     

       547
       547
       +
               (push `(limit ,limit) new-query))

     

       548
       548
       +
             ;; Execute the updated query

     

       549
       549
       +
             (caledonia--make-query new-query))))

     

       550
       550
       +
       

     

       551
       551
       +
       (defun caledonia-query-timezone ()

     

       552
       552
       +
         "Set the timezone for the current calendar view."

     

       553
       553
       +
         (interactive)

     

       554
       554
       +
         (when (eq major-mode 'caledonia-mode)

     

       555
       555
       +
           (let* ((timezone-str (read-string "Timezone (e.g. Europe/London, leave empty for default): "

     

       556
       556
       +
                                             nil 'caledonia-timezone-history))

     

       557
       557
       +
                  (timezone (when (not (string-empty-p timezone-str)) timezone-str))

     

       558
       558
       +
                  (current-query caledonia--current-query)

     

       559
       559
       +
                  (new-query (copy-tree current-query)))

     

       560
       560
       +
             ;; Update the query with the new timezone

     

       561
       561
       +
             (setq new-query (assq-delete-all 'timezone new-query))

     

       562
       562
       +
             (when timezone

     

       563
       563
       +
               (push `(timezone ,timezone) new-query))

     

       564
       564
       +
             ;; Execute the updated query

     

       565
       565
       +
             (caledonia--make-query new-query))))

     

       566
       566
       +
       

     

       567
       567
       +
       ;; Buffer functions

     

       568
       568
       +
       

     

       569
       569
       +
       (defun caledonia-show-event ()

     

       570
       570
       +
         "Show details for the event at point in a separate buffer."

     

       571
       571
       +
         (interactive)

     

       572
       572
       +
         (when (eq major-mode 'caledonia-mode)

     

       573
       573
       +
           (let* ((id (tabulated-list-get-id))

     

       574
       574
       +
                  (event (when id (get-text-property 0 'event-data id))))

     

       575
       575
       +
             (if event

     

       576
       576
       +
                 (caledonia--display-event-details event)

     

       577
       577
       +
               (message "No event at point")))))

     

       578
       578
       +
       

     

       579
       579
       +
       (defun caledonia-open-event-file ()

     

       580
       580
       +
         "Open the file associated with the event at point.

     

       581
       581
       +
       If the file contains the event ID, the cursor will be positioned at that

     

       582
       582
       +
       location."

     

       583
       583
       +
         (interactive)

     

       584
       584
       +
         (when (eq major-mode 'caledonia-mode)

     

       585
       585
       +
           (let* ((id (tabulated-list-get-id))

     

       586
       586
       +
                  (event (when id (get-text-property 0 'event-data id)))

     

       587
       587
       +
                  (file (when event (caledonia--get-key 'file event)))

     

       588
       588
       +
                  (event-id (when event (caledonia--get-key 'id event))))

     

       589
       589
       +
             (cond

     

       590
       590
       +
              ((not event)

     

       591
       591
       +
               (message "No event at point"))

     

       592
       592
       +
              ((not file)

     

       593
       593
       +
               (message "No file associated with this event"))

     

       594
       594
       +
              ((not (file-exists-p file))

     

       595
       595
       +
               (message "File does not exist: %s" file))

     

       596
       596
       +
              (t

     

       597
       597
       +
               (find-file file)

     

       598
       598
       +
               (caledonia--find-and-highlight-event-in-file file event-id))))))

     

       599
       599
       +
       

     

       600
       600
       +
       (defun caledonia-refresh ()

     

       601
       601
       +
         "Refresh calendar data from disk and update the current view.

     

       602
       602
       +
       This is useful when calendar files have been modified outside Emacs."

     

       603
       603
       +
         (interactive)

     

       604
       604
       +
         (when (eq major-mode 'caledonia-mode)

     

       605
       605
       +
           ;; Send a refresh command to clear the server's cache

     

       606
       606
       +
           (caledonia--send-request "Refresh")

     

       607
       607
       +
           ;; Re-apply the current query to update the view

     

       608
       608
       +
           (when (string= (buffer-name) caledonia--events-buffer)

     

       609
       609
       +
             ;; Just use caledonia--make-query without args to use the stored query

     

       610
       610
       +
             (caledonia--make-query))))

     

       611
       611
       +
       

     

       612
       612
       +
       ;; Entry functions

     

       613
       613
       +
       

     

       614
       614
       +
       (defun caledonia-query ()

     

       615
       615
       +
         "Query events with interactive prompts for all filter parameters.

     

       616
       616
       +
       Opens a series of prompts to build a complete query and then displays the

     

       617
       617
       +
       results. After the initial query is displayed, you can further refine the

     

       618
       618
       +
       results using the caledonia-query-* family of functions."

     

       619
       619
       +
         (interactive)

     

       620
       620
       +
         (let* (

     

       621
       621
       +
                (dates (caledonia--read-date-range))

     

       622
       622
       +
                (from (car dates))

     

       623
       623
       +
                (to (cdr dates))

     

       624
       624
       +
                (timezone-str (read-string "Timezone (e.g. Europe/London, leave empty for default): "

     

       625
       625
       +
                                           nil 'caledonia-timezone-history))

     

       626
       626
       +
                (timezone (when (not (string-empty-p timezone-str)) timezone-str))

     

       627
       627
       +
                (available-calendars

     

       628
       628
       +
                 (caledonia--send-request "ListCalendars"))

     

       629
       629
       +
                (calendars-list

     

       630
       630
       +
                 (if (and (listp available-calendars)

     

       631
       631
       +
                          (eq (car available-calendars) 'Calendars))

     

       632
       632
       +
                     (cadr available-calendars)

     

       633
       633
       +
                   (progn

     

       634
       634
       +
                     (message "Failed to get calendar list from server")

     

       635
       635
       +
                     nil)))

     

       636
       636
       +
                (selected-calendars

     

       637
       637
       +
                 (completing-read-multiple

     

       638
       638
       +
                  "Select calendars (comma-separated, empty for all): "

     

       639
       639
       +
                  (or calendars-list '()) nil nil nil 'caledonia-calendars-history))

     

       640
       640
       +
                (calendars (mapcar #'string-trim selected-calendars))

     

       641
       641
       +
                (text (read-string "Search text (leave empty for no text search): "

     

       642
       642
       +
                                   nil 'caledonia-text-history))

     

       643
       643
       +
                (search-in-str (when (and text (not (string-empty-p text)))

     

       644
       644
       +
                                 (read-string "Search in (summary,description,location - leave empty for all): "

     

       645
       645
       +
                                              nil 'caledonia-search-fields-history)))

     

       646
       646
       +
                (search-in (when (and search-in-str (not (string-empty-p search-in-str)))

     

       647
       647
       +
                             (mapcar (lambda (field)

     

       648
       648
       +
                                       (intern (string-trim field)))

     

       649
       649
       +
                                     (split-string search-in-str "," t))))

     

       650
       650
       +
                (id (read-string "Event ID (leave empty for all events): "

     

       651
       651
       +
                                 nil 'caledonia-id-history))

     

       652
       652
       +
                (recurring (completing-read "Recurring events (yes/no/all, leave empty for all): "

     

       653
       653
       +
                                            '("" "yes" "no") nil nil nil))

     

       654
       654
       +
                (limit-str (read-string "Maximum events to show (leave empty for no limit): "

     

       655
       655
       +
                                        nil 'caledonia-limit-history))

     

       656
       656
       +
                (limit (when (and limit-str (not (string-empty-p limit-str)))

     

       657
       657
       +
                         (string-to-number limit-str)))

     

       658
       658
       +
                (query nil))

     

       659
       659
       +
           ;; Build query based on parameters

     

       660
       660
       +
           (when (and from (not (string-empty-p from)))

     

       661
       661
       +
             (push `(from ,from) query))

     

       662
       662
       +
           (when (and to (not (string-empty-p to)))

     

       663
       663
       +
             (push `(to ,to) query))

     

       664
       664
       +
           (when timezone

     

       665
       665
       +
             (push `(timezone ,timezone) query))

     

       666
       666
       +
           (when calendars

     

       667
       667
       +
             (push `(calendars ,calendars) query))

     

       668
       668
       +
           (when (and text (not (string-empty-p text)))

     

       669
       669
       +
             (push `(text ,text) query))

     

       670
       670
       +
           (when search-in

     

       671
       671
       +
             (push `(search_in ,search-in) query))

     

       672
       672
       +
           (when (and id (not (string-empty-p id)))

     

       673
       673
       +
             (push `(id ,id) query))

     

       674
       674
       +
           (when (not (string-empty-p recurring))

     

       675
       675
       +
             (push `(recurring ,(if (string= recurring "yes") t nil)) query))

     

       676
       676
       +
           (when limit

     

       677
       677
       +
             (push `(limit ,limit) query))

     

       678
       678
       +
           ;; Create buffer and execute query

     

       679
       679
       +
           (let ((buffer (get-buffer-create caledonia--events-buffer)))

     

       680
       680
       +
             (with-current-buffer buffer

     

       681
       681
       +
               ;; Clear the buffer and reset it

     

       682
       682
       +
               (let ((inhibit-read-only t))

     

       683
       683
       +
                 (erase-buffer))

     

       684
       684
       +
               ;; Activate our mode and make the query

     

       685
       685
       +
               (caledonia-mode)

     

       686
       686
       +
               (caledonia--make-query query)

     

       687
       687
       +
               (switch-to-buffer buffer)))))

     

       688
       688
       +
       

     

       689
       689
       +
       (defun caledonia-list (&optional from-date to-date)

     

       690
       690
       +
         "List calendar in a new buffer within the default date range.

     

       691
       691
       +
       FROM-DATE and TO-DATE override the default date range if provided. TO-DATE is

     

       692
       692
       +
       required and will use a default if not specified. With prefix arg, prompts for

     

       693
       693
       +
       the date range with an interactive calendar."

     

       694
       694
       +
         (interactive

     

       695
       695
       +
          (when current-prefix-arg

     

       696
       696
       +
            (let* ((dates (caledonia--read-date-range)))

     

       697
       697
       +
              (list (car dates) (cdr dates)))))

     

       698
       698
       +
         (let ((buffer (get-buffer-create caledonia--events-buffer))

     

       699
       699
       +
               (from (or from-date caledonia-list-from-date))

     

       700
       700
       +
               ;; Ensure to date is always provided

     

       701
       701
       +
               (to (or (and to-date (not (string-empty-p to-date)) to-date)

     

       702
       702
       +
                       caledonia-list-to-date)))

     

       703
       703
       +
           (with-current-buffer buffer

     

       704
       704
       +
             ;; Clear the buffer and reset it

     

       705
       705
       +
             (let ((inhibit-read-only t))

     

       706
       706
       +
               (erase-buffer))

     

       707
       707
       +
             ;; Build the query

     

       708
       708
       +
             (let* ((query `((to ,to))))

     

       709
       709
       +
               ;; Add from date only if specified

     

       710
       710
       +
               (when (and from (not (string-empty-p from)))

     

       711
       711
       +
                 (setq query (append query `((from ,from)))))

     

       712
       712
       +
               ;; Activate our mode and make the query

     

       713
       713
       +
               (caledonia-mode)

     

       714
       714
       +
               (caledonia--make-query query)

     

       715
       715
       +
               (switch-to-buffer buffer)))))

     

       716
       716
       +
       

     

       717
       717
       +
       (defun caledonia-search (&optional expr from-date to-date)

     

       718
       718
       +
         "Search for query EXPR with optional FROM-DATE and TO-DATE.

     

       719
       719
       +
       This is an interactive function which asks user for EXPR if not passed as an

     

       720
       720
       +
       argument. With prefix arg, also prompts for date range with an interactive

     

       721
       721
       +
       calendar. Use this to find events matching specific text across all calendars.

     

       722
       722
       +
       TO-DATE is required; a default will be used if not provided."

     

       723
       723
       +
         (interactive

     

       724
       724
       +
          (let* ((search-text (read-string "Search for: " nil 'caledonia-search-prompt-history))

     

       725
       725
       +
                 (dates (when current-prefix-arg (caledonia--read-date-range))))

     

       726
       726
       +
            (list search-text

     

       727
       727
       +
                  (when current-prefix-arg (car dates))

     

       728
       728
       +
                  (when current-prefix-arg (cdr dates)))))

     

       729
       729
       +
         (let ((buffer (get-buffer-create caledonia--events-buffer))

     

       730
       730
       +
               (from (or from-date caledonia-search-from-date))

     

       731
       731
       +
               (to (or to-date caledonia-search-to-date)))

     

       732
       732
       +
           (with-current-buffer buffer

     

       733
       733
       +
             ;; Clear the buffer and reset it

     

       734
       734
       +
             (let ((inhibit-read-only t))

     

       735
       735
       +
               (erase-buffer))

     

       736
       736
       +
             ;; Build the query

     

       737
       737
       +
             (let* ((query `((text ,expr)(to ,to))))

     

       738
       738
       +
               ;; Add from date only if specified

     

       739
       739
       +
               (when (and from (not (string-empty-p from)))

     

       740
       740
       +
                 (setq query (append query `((from ,from)))))

     

       741
       741
       +
               ;; Activate our mode and make the query

     

       742
       742
       +
               (caledonia-mode)

     

       743
       743
       +
               (caledonia--make-query query)

     

       744
       744
       +
               (switch-to-buffer buffer)))))

     

       745
       745
       +
       

     

       746
       746
       +
       ;; Modes

     

       747
       747
       +
       ;;;###autoload

     

       748
       748
       +
       

     

       749
       749
       +
       ;; Create a filter prefix map for query refinement

     

       750
       750
       +
       (defvar caledonia-filter-map

     

       751
       751
       +
         (let ((map (make-sparse-keymap)))

     

       752
       752
       +
           (define-key map (kbd "d") 'caledonia-query-date-range)

     

       753
       753
       +
           (define-key map (kbd "c") 'caledonia-query-calendars)

     

       754
       754
       +
           (define-key map (kbd "t") 'caledonia-query-text)

     

       755
       755
       +
           (define-key map (kbd "i") 'caledonia-query-id)

     

       756
       756
       +
           (define-key map (kbd "r") 'caledonia-query-recurring)

     

       757
       757
       +
           (define-key map (kbd "l") 'caledonia-query-limit)

     

       758
       758
       +
           (define-key map (kbd "z") 'caledonia-query-timezone)

     

       759
       759
       +
           map)

     

       760
       760
       +
         "Keymap for filter commands in Caledonia mode.")

     

       761
       761
       +
       

     

       762
       762
       +
       (defvar caledonia-mode-map

     

       763
       763
       +
         (let ((map (make-sparse-keymap)))

     

       764
       764
       +
           (set-keymap-parent map tabulated-list-mode-map)

     

       765
       765
       +
           (define-key map (kbd "RET") 'caledonia-show-event)

     

       766
       766
       +
           (define-key map (kbd "M-RET") 'caledonia-open-event-file)

     

       767
       767
       +
           (define-key map (kbd "l") 'caledonia-list)

     

       768
       768
       +
           (define-key map (kbd "s") 'caledonia-search)

     

       769
       769
       +
           (define-key map (kbd "r") 'caledonia-refresh)

     

       770
       770
       +
           (define-key map (kbd "q") 'quit-window)

     

       771
       771
       +
           ;; Individual filter command bindings

     

       772
       772
       +
           (define-key map (kbd "C-c d") 'caledonia-query-date-range)

     

       773
       773
       +
           (define-key map (kbd "C-c c") 'caledonia-query-calendars)

     

       774
       774
       +
           (define-key map (kbd "C-c t") 'caledonia-query-text)

     

       775
       775
       +
           (define-key map (kbd "C-c i") 'caledonia-query-id)

     

       776
       776
       +
           (define-key map (kbd "C-c r") 'caledonia-query-recurring)

     

       777
       777
       +
           (define-key map (kbd "C-c l") 'caledonia-query-limit)

     

       778
       778
       +
           (define-key map (kbd "C-c z") 'caledonia-query-timezone)

     

       779
       779
       +
           ;; Use f prefix for filter commands

     

       780
       780
       +
           (define-key map (kbd "C-c f") caledonia-filter-map)

     

       781
       781
       +
           map)

     

       782
       782
       +
         "Keymap for Caledonia mode.")

     

       783
       783
       +
       

     

       784
       784
       +
       (define-derived-mode caledonia-mode tabulated-list-mode "Caledonia"

     

       785
       785
       +
         "Major mode for displaying calendar entries in a tabular view.")

     

       786
       786
       +
       

     

       787
       787
       +
       (provide 'caledonia)

     

       788
       788
       +
       ;;; caledonia.el ends here

+175

flake.lock

···

       1
       1
       +
       {

     

       2
       2
       +
         "nodes": {

     

       3
       3
       +
           "flake-compat": {

     

       4
       4
       +
             "flake": false,

     

       5
       5
       +
             "locked": {

     

       6
       6
       +
               "lastModified": 1696426674,

     

       7
       7
       +
               "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",

     

       8
       8
       +
               "owner": "edolstra",

     

       9
       9
       +
               "repo": "flake-compat",

     

       10
       10
       +
               "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",

     

       11
       11
       +
               "type": "github"

     

       12
       12
       +
             },

     

       13
       13
       +
             "original": {

     

       14
       14
       +
               "owner": "edolstra",

     

       15
       15
       +
               "repo": "flake-compat",

     

       16
       16
       +
               "type": "github"

     

       17
       17
       +
             }

     

       18
       18
       +
           },

     

       19
       19
       +
           "flake-utils": {

     

       20
       20
       +
             "inputs": {

     

       21
       21
       +
               "systems": "systems"

     

       22
       22
       +
             },

     

       23
       23
       +
             "locked": {

     

       24
       24
       +
               "lastModified": 1731533236,

     

       25
       25
       +
               "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",

     

       26
       26
       +
               "owner": "numtide",

     

       27
       27
       +
               "repo": "flake-utils",

     

       28
       28
       +
               "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",

     

       29
       29
       +
               "type": "github"

     

       30
       30
       +
             },

     

       31
       31
       +
             "original": {

     

       32
       32
       +
               "owner": "numtide",

     

       33
       33
       +
               "repo": "flake-utils",

     

       34
       34
       +
               "type": "github"

     

       35
       35
       +
             }

     

       36
       36
       +
           },

     

       37
       37
       +
           "mirage-opam-overlays": {

     

       38
       38
       +
             "flake": false,

     

       39
       39
       +
             "locked": {

     

       40
       40
       +
               "lastModified": 1710922379,

     

       41
       41
       +
               "narHash": "sha256-j4QREQDUf8oHOX7qg6wAOupgsNQoYlufxoPrgagD+pY=",

     

       42
       42
       +
               "owner": "dune-universe",

     

       43
       43
       +
               "repo": "mirage-opam-overlays",

     

       44
       44
       +
               "rev": "797cb363df3ff763c43c8fbec5cd44de2878757e",

     

       45
       45
       +
               "type": "github"

     

       46
       46
       +
             },

     

       47
       47
       +
             "original": {

     

       48
       48
       +
               "owner": "dune-universe",

     

       49
       49
       +
               "repo": "mirage-opam-overlays",

     

       50
       50
       +
               "type": "github"

     

       51
       51
       +
             }

     

       52
       52
       +
           },

     

       53
       53
       +
           "nixpkgs": {

     

       54
       54
       +
             "locked": {

     

       55
       55
       +
               "lastModified": 1743761221,

     

       56
       56
       +
               "narHash": "sha256-g79y3RpbyfOlwm3W4yuMXLmmNI7iDgIDqg10nq8pz5U=",

     

       57
       57
       +
               "owner": "nixos",

     

       58
       58
       +
               "repo": "nixpkgs",

     

       59
       59
       +
               "rev": "e1964791d66993a8aa5b9f19c1c6dd5827851355",

     

       60
       60
       +
               "type": "github"

     

       61
       61
       +
             },

     

       62
       62
       +
             "original": {

     

       63
       63
       +
               "owner": "nixos",

     

       64
       64
       +
               "repo": "nixpkgs",

     

       65
       65
       +
               "type": "github"

     

       66
       66
       +
             }

     

       67
       67
       +
           },

     

       68
       68
       +
           "opam-nix": {

     

       69
       69
       +
             "inputs": {

     

       70
       70
       +
               "flake-compat": "flake-compat",

     

       71
       71
       +
               "flake-utils": [

     

       72
       72
       +
                 "flake-utils"

     

       73
       73
       +
               ],

     

       74
       74
       +
               "mirage-opam-overlays": "mirage-opam-overlays",

     

       75
       75
       +
               "nixpkgs": [

     

       76
       76
       +
                 "nixpkgs"

     

       77
       77
       +
               ],

     

       78
       78
       +
               "opam-overlays": "opam-overlays",

     

       79
       79
       +
               "opam-repository": "opam-repository",

     

       80
       80
       +
               "opam2json": "opam2json"

     

       81
       81
       +
             },

     

       82
       82
       +
             "locked": {

     

       83
       83
       +
               "lastModified": 1744376747,

     

       84
       84
       +
               "narHash": "sha256-CKZLqLgZtMrUyZKlroISYp6Z4aoN1N9xeyk0dPNxGvc=",

     

       85
       85
       +
               "owner": "RyanGibb",

     

       86
       86
       +
               "repo": "opam-nix",

     

       87
       87
       +
               "rev": "787eeba962582ff0142f445a74f1edb667d7e941",

     

       88
       88
       +
               "type": "github"

     

       89
       89
       +
             },

     

       90
       90
       +
             "original": {

     

       91
       91
       +
               "owner": "RyanGibb",

     

       92
       92
       +
               "ref": "timere",

     

       93
       93
       +
               "repo": "opam-nix",

     

       94
       94
       +
               "type": "github"

     

       95
       95
       +
             }

     

       96
       96
       +
           },

     

       97
       97
       +
           "opam-overlays": {

     

       98
       98
       +
             "flake": false,

     

       99
       99
       +
             "locked": {

     

       100
       100
       +
               "lastModified": 1726822209,

     

       101
       101
       +
               "narHash": "sha256-bwM18ydNT9fYq91xfn4gmS21q322NYrKwfq0ldG9GYw=",

     

       102
       102
       +
               "owner": "dune-universe",

     

       103
       103
       +
               "repo": "opam-overlays",

     

       104
       104
       +
               "rev": "f2bec38beca4aea9e481f2fd3ee319c519124649",

     

       105
       105
       +
               "type": "github"

     

       106
       106
       +
             },

     

       107
       107
       +
             "original": {

     

       108
       108
       +
               "owner": "dune-universe",

     

       109
       109
       +
               "repo": "opam-overlays",

     

       110
       110
       +
               "type": "github"

     

       111
       111
       +
             }

     

       112
       112
       +
           },

     

       113
       113
       +
           "opam-repository": {

     

       114
       114
       +
             "flake": false,

     

       115
       115
       +
             "locked": {

     

       116
       116
       +
               "lastModified": 1740730647,

     

       117
       117
       +
               "narHash": "sha256-6veU2WjUGcWDAzLDjoAI1L6GWZd0KIUq19sHcbJS+u8=",

     

       118
       118
       +
               "owner": "ocaml",

     

       119
       119
       +
               "repo": "opam-repository",

     

       120
       120
       +
               "rev": "f1f75fef5fbf1e8bd1cc9544e50b89ba59f625e2",

     

       121
       121
       +
               "type": "github"

     

       122
       122
       +
             },

     

       123
       123
       +
             "original": {

     

       124
       124
       +
               "owner": "ocaml",

     

       125
       125
       +
               "repo": "opam-repository",

     

       126
       126
       +
               "type": "github"

     

       127
       127
       +
             }

     

       128
       128
       +
           },

     

       129
       129
       +
           "opam2json": {

     

       130
       130
       +
             "inputs": {

     

       131
       131
       +
               "nixpkgs": [

     

       132
       132
       +
                 "opam-nix",

     

       133
       133
       +
                 "nixpkgs"

     

       134
       134
       +
               ]

     

       135
       135
       +
             },

     

       136
       136
       +
             "locked": {

     

       137
       137
       +
               "lastModified": 1671540003,

     

       138
       138
       +
               "narHash": "sha256-5pXfbUfpVABtKbii6aaI2EdAZTjHJ2QntEf0QD2O5AM=",

     

       139
       139
       +
               "owner": "tweag",

     

       140
       140
       +
               "repo": "opam2json",

     

       141
       141
       +
               "rev": "819d291ea95e271b0e6027679de6abb4d4f7f680",

     

       142
       142
       +
               "type": "github"

     

       143
       143
       +
             },

     

       144
       144
       +
             "original": {

     

       145
       145
       +
               "owner": "tweag",

     

       146
       146
       +
               "repo": "opam2json",

     

       147
       147
       +
               "type": "github"

     

       148
       148
       +
             }

     

       149
       149
       +
           },

     

       150
       150
       +
           "root": {

     

       151
       151
       +
             "inputs": {

     

       152
       152
       +
               "flake-utils": "flake-utils",

     

       153
       153
       +
               "nixpkgs": "nixpkgs",

     

       154
       154
       +
               "opam-nix": "opam-nix"

     

       155
       155
       +
             }

     

       156
       156
       +
           },

     

       157
       157
       +
           "systems": {

     

       158
       158
       +
             "locked": {

     

       159
       159
       +
               "lastModified": 1681028828,

     

       160
       160
       +
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

     

       161
       161
       +
               "owner": "nix-systems",

     

       162
       162
       +
               "repo": "default",

     

       163
       163
       +
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       164
       164
       +
               "type": "github"

     

       165
       165
       +
             },

     

       166
       166
       +
             "original": {

     

       167
       167
       +
               "owner": "nix-systems",

     

       168
       168
       +
               "repo": "default",

     

       169
       169
       +
               "type": "github"

     

       170
       170
       +
             }

     

       171
       171
       +
           }

     

       172
       172
       +
         },

     

       173
       173
       +
         "root": "root",

     

       174
       174
       +
         "version": 7

     

       175
       175
       +
       }

+39

flake.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         inputs = {

     

       3
       3
       +
           nixpkgs.url = "github:nixos/nixpkgs";

     

       4
       4
       +
           opam-nix.url = "github:tweag/opam-nix";

     

       5
       5
       +
           flake-utils.url = "github:numtide/flake-utils";

     

       6
       6
       +
           # we pin opam-nix's nixpkgs to follow the flakes, avoiding using two different instances

     

       7
       7
       +
           opam-nix.inputs.nixpkgs.follows = "nixpkgs";

     

       8
       8
       +
           # deduplicate flakes

     

       9
       9
       +
           opam-nix.inputs.flake-utils.follows = "flake-utils";

     

       10
       10
       +
         };

     

       11
       11
       +
         outputs = { self, nixpkgs, flake-utils, opam-nix, ... }@inputs:

     

       12
       12
       +
           flake-utils.lib.eachDefaultSystem (system:

     

       13
       13
       +
             let

     

       14
       14
       +
               package = "caledonia";

     

       15
       15
       +
               pkgs = nixpkgs.legacyPackages.${system};

     

       16
       16
       +
               opam-nix-lib = opam-nix.lib.${system};

     

       17
       17
       +
               devPackagesQuery = {

     

       18
       18
       +
                 ocaml-lsp-server = "*";

     

       19
       19
       +
                 ocamlformat = "*";

     

       20
       20
       +
                 utop = "*";

     

       21
       21
       +
               };

     

       22
       22
       +
               query = {

     

       23
       23
       +
                 ocaml-base-compiler = "*";

     

       24
       24
       +
               };

     

       25
       25
       +
               scope =

     

       26
       26
       +
                 opam-nix-lib.buildOpamProject' { } ./. (query // devPackagesQuery);

     

       27
       27
       +
             in {

     

       28
       28
       +
               packages.default = scope.${package};

     

       29
       29
       +
               defaultPackage = scope.${package};

     

       30
       30
       +
       

     

       31
       31
       +
               devShells.default = let

     

       32
       32
       +
                 devPackages = builtins.attrValues

     

       33
       33
       +
                   (pkgs.lib.getAttrs (builtins.attrNames devPackagesQuery) scope);

     

       34
       34
       +
               in pkgs.mkShell {

     

       35
       35
       +
                 inputsFrom = [ scope.${package} ];

     

       36
       36
       +
                 buildInputs = devPackages;

     

       37
       37
       +
               };

     

       38
       38
       +
             });

     

       39
       39
       +
       }

+95 -124

lib/calendar_dir.ml

···

       1
       1
        
       open Icalendar

     

       2
       2
        
       

     

       3
       3
       -
       module CollectionMap = Map.Make (struct

     

       4
       4
       -
         type t = Collection.t

     

       5
       5
       -
       

     

       6
       6
       -
         let compare (Collection.Col a) (Collection.Col b) = String.compare a b

     

       7
       7
       -
       end)

     

       8
       8
       -
       

     

       9
       9
       -
       type t = { path : string; mutable collections : Event.t list CollectionMap.t }

     

       3
       3
       +
       type t = string

     

       10
       4
        
       

     

       11
       11
       -
       let get_collection_path ~fs calendar_dir (Collection.Col collection_name) =

     

       12
       12
       -
         Eio.Path.(fs / calendar_dir.path / collection_name)

     

       5
       5
       +
       let get_calendar_path ~fs calendar_dir calendar_name_name =

     

       6
       6
       +
         Eio.Path.(fs / calendar_dir / calendar_name_name)

     

       13
       7
        
       

     

       14
       8
        
       let ensure_dir path =

     

       15
       9
        
         try

     
···

       22
       16
        
       

     

       23
       17
        
       let create ~fs path =

     

       24
       18
        
         match ensure_dir Eio.Path.(fs / path) with

     

       25
       25
       -
         | Ok () -> Ok { path; collections = CollectionMap.empty }

     

       19
       19
       +
         | Ok () -> Ok path

     

       26
       20
        
         | Error e -> Error e

     

       27
       21
        
       

     

       28
       28
       -
       let list_collections ~fs calendar_dir =

     

       22
       22
       +
       let list_calendar_names ~fs calendar_dir =

     

       29
       23
        
         try

     

       30
       30
       -
           let dir = Eio.Path.(fs / calendar_dir.path) in

     

       31
       31
       -
           let collections =

     

       24
       24
       +
           let dir = Eio.Path.(fs / calendar_dir) in

     

       25
       25
       +
           let calendar_names =

     

       32
       26
        
             Eio.Path.read_dir dir

     

       33
       27
        
             |> List.filter_map (fun file ->

     

       34
       34
       -
                    if Eio.Path.is_directory Eio.Path.(dir / file) then

     

       35
       35
       -
                      Some (Collection.Col file)

     

       28
       28
       +
                    if

     

       29
       29
       +
                      String.length file > 0

     

       30
       30
       +
                      && file.[0] != '.'

     

       31
       31
       +
                      && Eio.Path.is_directory Eio.Path.(dir / file)

     

       32
       32
       +
                    then Some file

     

       36
       33
        
                    else None)

     

       37
       37
       -
             |> List.sort (fun (Collection.Col a) (Collection.Col b) ->

     

       38
       38
       -
                    String.compare a b)

     

       34
       34
       +
             |> List.sort (fun a b -> String.compare a b)

     

       39
       35
        
           in

     

       40
       40
       -
           Ok collections

     

       36
       36
       +
           Ok calendar_names

     

       41
       37
        
         with Eio.Exn.Io _ as exn ->

     

       42
       38
        
           Error

     

       43
       39
        
             (`Msg

     

       44
       44
       -
                (Fmt.str "Failed to list calendar directory %s: %a" calendar_dir.path

     

       40
       40
       +
                (Fmt.str "Failed to list calendar directory %s: %a" calendar_dir

     

       45
       41
        
                   Eio.Exn.pp exn))

     

       46
       42
        
       

     

       47
       47
       -
       let load_events collection collection_path file_name =

     

       48
       48
       -
         let file = Eio.Path.(collection_path / file_name) in

     

       49
       49
       -
         let _, file_path = file in

     

       50
       50
       -
         match Filename.check_suffix file_name ".ics" with

     

       51
       51
       -
         | false -> []

     

       52
       52
       -
         | true -> (

     

       53
       53
       -
             try

     

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

     

       55
       55
       -
               match parse content with

     

       56
       56
       -
               | Ok calendar -> Event.events_of_icalendar ~file collection calendar

     

       57
       57
       -
               | Error err ->

     

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

     

       59
       59
       -
                   []

     

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

     

       61
       61
       -
               Fmt.epr "Failed to read file %s: %a\n%!" file_path Eio.Exn.pp exn;

     

       62
       62
       -
               [])

     

       43
       43
       +
       let rec load_events_recursive calendar_name dir_path =

     

       44
       44
       +
         try

     

       45
       45
       +
           Eio.Path.read_dir dir_path

     

       46
       46
       +
           |> List.fold_left

     

       47
       47
       +
                (fun acc name ->

     

       48
       48
       +
                  let path = Eio.Path.(dir_path / name) in

     

       49
       49
       +
                  if Eio.Path.is_directory path then

     

       50
       50
       +
                    acc @ load_events_recursive calendar_name path

     

       51
       51
       +
                  else if Filename.check_suffix name ".ics" then (

     

       52
       52
       +
                    try

     

       53
       53
       +
                      let content = Eio.Path.load path in

     

       54
       54
       +
                      match parse content with

     

       55
       55
       +
                      | Ok calendar ->

     

       56
       56
       +
                          acc

     

       57
       57
       +
                          @ Event.events_of_icalendar ~file:path calendar_name calendar

     

       58
       58
       +
                      | Error err ->

     

       59
       59
       +
                          Printf.eprintf "Failed to parse %s: %s\n%!" (snd path) err;

     

       60
       60
       +
                          acc

     

       61
       61
       +
                    with Eio.Exn.Io _ as exn ->

     

       62
       62
       +
                      Fmt.epr "Failed to read file %s: %a\n%!" (snd path) Eio.Exn.pp

     

       63
       63
       +
                        exn;

     

       64
       64
       +
                      acc)

     

       65
       65
       +
                  else acc)

     

       66
       66
       +
                []

     

       67
       67
       +
         with Eio.Exn.Io _ as exn ->

     

       68
       68
       +
           Fmt.epr "Failed to read directory %s: %a\n%!" (snd dir_path) Eio.Exn.pp exn;

     

       69
       69
       +
           []

     

       63
       70
        
       

     

       64
       64
       -
       let get_collection ~fs calendar_dir collection =

     

       65
       65
       -
         match CollectionMap.find_opt collection calendar_dir.collections with

     

       66
       66
       -
         | Some events -> Ok events

     

       67
       67
       -
         | None -> (

     

       68
       68
       -
             let collection_path = get_collection_path ~fs calendar_dir collection in

     

       69
       69
       -
             if not (Eio.Path.is_directory collection_path) then Error `Not_found

     

       70
       70
       -
             else

     

       71
       71
       -
               try

     

       72
       72
       -
                 let files = Eio.Path.read_dir collection_path in

     

       73
       73
       -
                 let events =

     

       74
       74
       -
                   List.flatten

     

       75
       75
       -
                   @@ List.map (load_events collection collection_path) files

     

       76
       76
       -
                 in

     

       77
       77
       -
                 calendar_dir.collections <-

     

       78
       78
       -
                   CollectionMap.add collection events calendar_dir.collections;

     

       79
       79
       -
                 Ok events

     

       80
       80
       -
               with e ->

     

       81
       81
       -
                 Error

     

       82
       82
       -
                   (`Msg

     

       83
       83
       -
                      (Printf.sprintf "Exception processing directory %s: %s"

     

       84
       84
       -
                         (snd collection_path) (Printexc.to_string e))))

     

       71
       71
       +
       let get_calendar_events ~fs calendar_dir calendar_name =

     

       72
       72
       +
         let calendar_name_path =

     

       73
       73
       +
           get_calendar_path ~fs calendar_dir calendar_name

     

       74
       74
       +
         in

     

       75
       75
       +
         if not (Eio.Path.is_directory calendar_name_path) then Error `Not_found

     

       76
       76
       +
         else

     

       77
       77
       +
           try

     

       78
       78
       +
             let events = load_events_recursive calendar_name calendar_name_path in

     

       79
       79
       +
             Ok events

     

       80
       80
       +
           with e ->

     

       81
       81
       +
             Error

     

       82
       82
       +
               (`Msg

     

       83
       83
       +
                  (Printf.sprintf "Exception processing directory %s: %s"

     

       84
       84
       +
                     (snd calendar_name_path) (Printexc.to_string e)))

     

       85
       85
        
       

     

       86
       86
        
       let ( let* ) = Result.bind

     

       87
       87
        
       

     

       88
       88
        
       let get_events ~fs calendar_dir =

     

       89
       89
       -
         match list_collections ~fs calendar_dir with

     

       89
       89
       +
         match list_calendar_names ~fs calendar_dir with

     

       90
       90
        
         | Error e -> Error e

     

       91
       91
        
         | Ok ids -> (

     

       92
       92
        
             try

     

       93
       93
        
               let rec process_ids acc = function

     

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

     

       95
       95
        
                 | id :: rest -> (

     

       96
       96
       -
                     match get_collection ~fs calendar_dir id with

     

       96
       96
       +
                     match get_calendar_events ~fs calendar_dir id with

     

       97
       97
        
                     | Ok cal -> process_ids (cal :: acc) rest

     

       98
       98
        
                     | Error `Not_found -> process_ids acc rest

     

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

     

       100
       100
        
               in

     

       101
       101
       -
               let* collections = process_ids [] ids in

     

       102
       102
       -
               Ok (List.flatten collections)

     

       101
       101
       +
               let* calendar_names = process_ids [] ids in

     

       102
       102
       +
               Ok (List.flatten calendar_names)

     

       103
       103
        
             with exn ->

     

       104
       104
        
               Error

     

       105
       105
        
                 (`Msg

     

       106
       106
       -
                    (Printf.sprintf "Error getting collections: %s"

     

       106
       106
       +
                    (Printf.sprintf "Error getting calendar_names: %s"

     

       107
       107
        
                       (Printexc.to_string exn))))

     

       108
       108
        
       

     

       109
       109
       -
       let add_event ~fs calendar_dir event =

     

       110
       110
       -
         let collection = Event.get_collection event in

     

       109
       109
       +
       let add_event ~fs calendar_dir events event =

     

       110
       110
       +
         let calendar_name = Event.get_calendar_name event in

     

       111
       111
        
         let file = Event.get_file event in

     

       112
       112
       -
         let collection_path = get_collection_path ~fs calendar_dir collection in

     

       113
       113
       -
         let* () = ensure_dir collection_path in

     

       112
       112
       +
         let calendar_name_path = get_calendar_path ~fs calendar_dir calendar_name in

     

       113
       113
       +
         let* () = ensure_dir calendar_name_path in

     

       114
       114
        
         let calendar = Event.to_ical_calendar event in

     

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

     

       116
       116
       -
         let* _ =

     

       117
       116
        
           try

     

       118
       117
        
             Eio.Path.save ~create:(`Or_truncate 0o644) file content;

     

       119
       119
       -
             Ok ()

     

       118
       118
       +
             Ok (event :: events)

     

       120
       119
        
           with Eio.Exn.Io _ as exn ->

     

       121
       120
        
             Error

     

       122
       121
        
               (`Msg

     

       123
       122
        
                  (Fmt.str "Failed to write file %s: %a\n%!" (snd file) Eio.Exn.pp exn))

     

       124
       124
       -
         in

     

       125
       125
       -
         calendar_dir.collections <-

     

       126
       126
       -
           CollectionMap.add collection

     

       127
       127
       -
             (event

     

       128
       128
       -
             ::

     

       129
       129
       -
             (match CollectionMap.find_opt collection calendar_dir.collections with

     

       130
       130
       -
             | Some lst -> lst

     

       131
       131
       -
             | None -> []))

     

       132
       132
       -
             calendar_dir.collections;

     

       133
       133
       -
         Ok ()

     

       134
       123
        
       

     

       135
       135
       -
       let edit_event ~fs calendar_dir event =

     

       136
       136
       -
         let collection = Event.get_collection event in

     

       124
       124
       +
       let edit_event ~fs calendar_dir events event =

     

       125
       125
       +
         let calendar_name = Event.get_calendar_name event in

     

       137
       126
        
         let event_id = Event.get_id event in

     

       138
       138
       -
         let collection_path = get_collection_path ~fs calendar_dir collection in

     

       139
       139
       -
         let* () = ensure_dir collection_path in

     

       127
       127
       +
         let calendar_name_path = get_calendar_path ~fs calendar_dir calendar_name in

     

       128
       128
       +
         let* () = ensure_dir calendar_name_path in

     

       140
       129
        
         let ical_event = Event.to_ical_event event in

     

       141
       130
        
         let file = Event.get_file event in

     

       142
       131
        
         let existing_props, existing_components = Event.to_ical_calendar event in

     
···

       155
       144
        
           (existing_props, `Event ical_event :: filtered_components)

     

       156
       145
        
         in

     

       157
       146
        
         let content = Icalendar.to_ics ~cr:true calendar in

     

       158
       158
       -
         let* _ =

     

       159
       159
       -
           try

     

       160
       160
       -
             Eio.Path.save ~create:(`Or_truncate 0o644) file content;

     

       161
       161
       -
             Ok ()

     

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

     

       163
       163
       -
             Error

     

       164
       164
       -
               (`Msg

     

       165
       165
       -
                  (Fmt.str "Failed to write file %s: %a\n%!" (snd file) Eio.Exn.pp exn))

     

       166
       166
       -
         in

     

       167
       167
       -
         calendar_dir.collections <-

     

       168
       168
       -
           CollectionMap.add collection

     

       169
       169
       -
             (event

     

       170
       170
       -
             ::

     

       171
       171
       -
             (match CollectionMap.find_opt collection calendar_dir.collections with

     

       172
       172
       -
             (* filter old version *)

     

       173
       173
       -
             | Some lst -> List.filter (fun e -> Event.get_id e = event_id) lst

     

       174
       174
       -
             | None -> []))

     

       175
       175
       -
             calendar_dir.collections;

     

       176
       176
       -
         Ok ()

     

       147
       147
       +
         try

     

       148
       148
       +
           Eio.Path.save ~create:(`Or_truncate 0o644) file content;

     

       149
       149
       +
           (* Filter out the old event and add the updated one *)

     

       150
       150
       +
           let filtered_events = List.filter (fun e -> Event.get_id e <> event_id) events in

     

       151
       151
       +
           Ok (event :: filtered_events)

     

       152
       152
       +
         with Eio.Exn.Io _ as exn ->

     

       153
       153
       +
           Error

     

       154
       154
       +
             (`Msg

     

       155
       155
       +
                (Fmt.str "Failed to write file %s: %a\n%!" (snd file) Eio.Exn.pp exn))

     

       177
       156
        
       

     

       178
       178
       -
       let delete_event ~fs calendar_dir event =

     

       179
       179
       -
         let collection = Event.get_collection event in

     

       157
       157
       +
       let delete_event ~fs calendar_dir events event =

     

       158
       158
       +
         let calendar_name = Event.get_calendar_name event in

     

       180
       159
        
         let event_id = Event.get_id event in

     

       181
       181
       -
         let collection_path = get_collection_path ~fs calendar_dir collection in

     

       182
       182
       -
         let* () = ensure_dir collection_path in

     

       160
       160
       +
         let calendar_name_path = get_calendar_path ~fs calendar_dir calendar_name in

     

       161
       161
       +
         let* () = ensure_dir calendar_name_path in

     

       183
       162
        
         let file = Event.get_file event in

     

       184
       163
        
         let existing_props, existing_components = Event.to_ical_calendar event in

     

       185
       164
        
         let other_events = ref false in

     
···

       201
       180
        
           (existing_props, filtered_components)

     

       202
       181
        
         in

     

       203
       182
        
         let content = Icalendar.to_ics ~cr:true calendar in

     

       204
       204
       -
         let* _ =

     

       205
       205
       -
           try

     

       206
       206
       -
             (match !other_events with

     

       207
       207
       -
             | true -> Eio.Path.save ~create:(`Or_truncate 0o644) file content

     

       208
       208
       -
             | false -> Eio.Path.unlink file);

     

       209
       209
       -
             Ok ()

     

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

     

       211
       211
       -
             Error

     

       212
       212
       -
               (`Msg

     

       213
       213
       -
                  (Fmt.str "Failed to write file %s: %a\n%!" (snd file) Eio.Exn.pp exn))

     

       214
       214
       -
         in

     

       215
       215
       -
         calendar_dir.collections <-

     

       216
       216
       -
           CollectionMap.add collection

     

       217
       217
       -
             (match CollectionMap.find_opt collection calendar_dir.collections with

     

       218
       218
       -
             (* filter old version *)

     

       219
       219
       -
             | Some lst -> List.filter (fun e -> Event.get_id e = event_id) lst

     

       220
       220
       -
             | None -> [])

     

       221
       221
       -
             calendar_dir.collections;

     

       222
       222
       -
         Ok ()

     

       183
       183
       +
         try

     

       184
       184
       +
           (match !other_events with

     

       185
       185
       +
           | true -> Eio.Path.save ~create:(`Or_truncate 0o644) file content

     

       186
       186
       +
           | false -> Eio.Path.unlink file);

     

       187
       187
       +
           (* Filter out the deleted event from the events list *)

     

       188
       188
       +
           let filtered_events = List.filter (fun e -> Event.get_id e <> event_id) events in

     

       189
       189
       +
           Ok filtered_events

     

       190
       190
       +
         with Eio.Exn.Io _ as exn ->

     

       191
       191
       +
           Error

     

       192
       192
       +
             (`Msg

     

       193
       193
       +
                (Fmt.str "Failed to write file %s: %a\n%!" (snd file) Eio.Exn.pp exn))

     

       223
       194
        
       

     

       224
       224
       -
       let get_path t = t.path

     

       195
       195
       +
       let get_path t = t

+23 -17

lib/calendar_dir.mli

···

       1
       1
       -
       (** Functions for managing calendar directories with Collection.ts of .ics files

     

       2
       2
       -
       *)

     

       1
       1
       +
       (** Functions for managing calendar directories with strings of .ics files *)

     

       3
       2
        
       

     

       4
       3
        
       type t

     

       5
       5
       -
       (** A directory of Collection.ts, where each collection is a subdirectory

     

       4
       4
       +
       (** A directory of strings, where each calendar_name is a subdirectory

     

       6
       5
        
           containing .ics files *)

     

       7
       6
        
       

     

       8
       7
        
       val create :

     
···

       11
       10
        
           calendar_dir if successful, or Error with a message if the directory cannot

     

       12
       11
        
           be created or accessed. *)

     

       13
       12
        
       

     

       14
       14
       -
       val list_collections :

     

       15
       15
       -
         fs:Eio.Fs.dir_ty Eio.Path.t ->

     

       16
       16
       -
         t ->

     

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

     

       18
       18
       -
       (** List available Collection.ts in the calendar_dir. Returns Ok with the list

     

       19
       19
       -
           of Collection.t names if successful, or Error with a message if the

     

       20
       20
       -
           directory cannot be read. *)

     

       13
       13
       +
       val list_calendar_names :

     

       14
       14
       +
         fs:Eio.Fs.dir_ty Eio.Path.t -> t -> (string list, [> `Msg of string ]) result

     

       15
       15
       +
       (** List available strings in the calendar_dir. Returns Ok with the list of

     

       16
       16
       +
           string names if successful, or Error with a message if the directory cannot

     

       17
       17
       +
           be read. *)

     

       21
       18
        
       

     

       22
       22
       -
       val get_collection :

     

       19
       19
       +
       val get_calendar_events :

     

       23
       20
        
         fs:Eio.Fs.dir_ty Eio.Path.t ->

     

       24
       21
        
         t ->

     

       25
       25
       -
         Collection.t ->

     

       22
       22
       +
         string ->

     

       26
       23
        
         (Event.t list, [> `Msg of string | `Not_found ]) result

     

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

     

       24
       24
       +
       (** Get all calendar files in a string. If the calendar_name doesn't exist in

     

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

     

       29
       26
        
       

     

       30
       27
        
       val get_events :

     

       31
       28
        
         fs:Eio.Fs.dir_ty Eio.Path.t -> t -> (Event.t list, [> `Msg of string ]) result

     

       32
       32
       -
       (** Get all events in all collections. This will load any Collection.ts that

     

       29
       29
       +
       (** Get all events in all calendar_names. This will load any strings that

     

       33
       30
        
           haven't been loaded yet. *)

     

       34
       31
        
       

     

       35
       32
        
       val add_event :

     

       36
       33
        
         fs:Eio.Fs.dir_ty Eio.Path.t ->

     

       37
       34
        
         t ->

     

       35
       35
       +
         Event.t list ->

     

       38
       36
        
         Event.t ->

     

       39
       39
       -
         (unit, [> `Msg of string ]) result

     

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

     

       38
       38
       +
       (** Add an event to the calendar directory. Takes the current events list and returns

     

       39
       39
       +
           an updated events list with the new event added. *)

     

       40
       40
        
       

     

       41
       41
        
       val edit_event :

     

       42
       42
        
         fs:Eio.Fs.dir_ty Eio.Path.t ->

     

       43
       43
        
         t ->

     

       44
       44
       +
         Event.t list ->

     

       44
       45
        
         Event.t ->

     

       45
       45
       -
         (unit, [> `Msg of string ]) result

     

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

     

       47
       47
       +
       (** Edit an event in the calendar directory. Takes the current events list and returns

     

       48
       48
       +
           an updated events list with the event updated. *)

     

       46
       49
        
       

     

       47
       50
        
       val delete_event :

     

       48
       51
        
         fs:Eio.Fs.dir_ty Eio.Path.t ->

     

       49
       52
        
         t ->

     

       53
       53
       +
         Event.t list ->

     

       50
       54
        
         Event.t ->

     

       51
       51
       -
         (unit, [> `Msg of string ]) result

     

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

     

       56
       56
       +
       (** Delete an event from the calendar directory. Takes the current events list and returns

     

       57
       57
       +
           an updated events list with the event removed. *)

     

       52
       58
        
       

     

       53
       59
        
       val get_path : t -> string

-1

lib/collection.ml

···

       1
       1
       -
       type t = Col of string

-3

lib/collection.mli

···

       1
       1
       -
       (** A collection is a directory of `ics` files *)

     

       2
       2
       -
       

     

       3
       3
       -
       type t = Col of string  (** The name of the collection. *)

+167 -70

lib/date.ml

···

       165
       165
        
       let get_end_of_next_month ?(tz = !default_timezone ()) () =

     

       166
       166
        
         get_end_of_month (get_start_of_next_month ~tz ())

     

       167
       167
        
       

     

       168
       168
       +
       let get_start_of_year date =

     

       169
       169
       +
         let dt = ptime_to_timedesc date in

     

       170
       170
       +
         let year = Timedesc.year dt in

     

       171
       171
       +
       

     

       172
       172
       +
         (* Create a date for the first of January *)

     

       173
       173
       +
         match Timedesc.Date.Ymd.make ~year ~month:1 ~day:1 with

     

       174
       174
       +
         | Ok first_day ->

     

       175
       175
       +
             let midnight = Timedesc.Time.make_exn ~hour:0 ~minute:0 ~second:0 () in

     

       176
       176
       +
             let first_of_year = Timedesc.of_date_and_time_exn first_day midnight in

     

       177
       177
       +
             timedesc_to_ptime first_of_year

     

       178
       178
       +
         | Error _ -> failwith "Invalid date for start of year"

     

       179
       179
       +
       

     

       180
       180
       +
       let get_start_of_current_year ?(tz = !default_timezone ()) () =

     

       181
       181
       +
         get_start_of_year (!get_today ~tz ())

     

       182
       182
       +
       

     

       183
       183
       +
       let get_start_of_next_year ?(tz = !default_timezone ()) () =

     

       184
       184
       +
         add_years (get_start_of_current_year ~tz ()) 1

     

       185
       185
       +
       

     

       186
       186
       +
       let get_end_of_year date =

     

       187
       187
       +
         let dt = ptime_to_timedesc date in

     

       188
       188
       +
         let year = Timedesc.year dt in

     

       189
       189
       +
       

     

       190
       190
       +
         (* Create a date for the last day of the year (December 31) *)

     

       191
       191
       +
         match Timedesc.Date.Ymd.make ~year ~month:12 ~day:31 with

     

       192
       192
       +
         | Ok last_day ->

     

       193
       193
       +
             let end_of_day =

     

       194
       194
       +
               Timedesc.Time.make_exn ~hour:23 ~minute:59 ~second:59 ()

     

       195
       195
       +
             in

     

       196
       196
       +
             let end_of_year = Timedesc.of_date_and_time_exn last_day end_of_day in

     

       197
       197
       +
             timedesc_to_ptime end_of_year

     

       198
       198
       +
         | Error _ -> failwith "Invalid date for end of year"

     

       199
       199
       +
       

     

       200
       200
       +
       let get_end_of_current_year ?(tz = !default_timezone ()) () =

     

       201
       201
       +
         get_end_of_year (!get_today ~tz ())

     

       202
       202
       +
       

     

       203
       203
       +
       let get_end_of_next_year ?(tz = !default_timezone ()) () =

     

       204
       204
       +
         get_end_of_year (get_start_of_next_year ~tz ())

     

       205
       205
       +
       

     

       168
       206
        
       let convert_relative_date_formats ?(tz = !default_timezone ()) ~today ~tomorrow

     

       169
       207
        
           ~week ~month () =

     

       170
       208
        
         if today then

     
···

       193
       231
        
       

     

       194
       232
        
       let ( let* ) = Result.bind

     

       195
       233
        
       

     

       196
       196
       -
       (* Parse a date string that could be ISO format or a relative expression *)

     

       234
       234
       +
       let parse_full_iso_datet ~tz expr =

     

       235
       235
       +
         let regex = Re.Pcre.regexp "^(\\d{4})-(\\d{1,2})-(\\d{1,2})$" in

     

       236
       236
       +
         if Re.Pcre.pmatch ~rex:regex expr then

     

       237
       237
       +
           let match_result = Re.Pcre.exec ~rex:regex expr in

     

       238
       238
       +
           let year = int_of_string (Re.Pcre.get_substring match_result 1) in

     

       239
       239
       +
           let month = int_of_string (Re.Pcre.get_substring match_result 2) in

     

       240
       240
       +
           let day = int_of_string (Re.Pcre.get_substring match_result 3) in

     

       241
       241
       +
           match Timedesc.Date.Ymd.make ~year ~month ~day with

     

       242
       242
       +
           | Ok date ->

     

       243
       243
       +
               let midnight = Timedesc.Time.make_exn ~hour:0 ~minute:0 ~second:0 () in

     

       244
       244
       +
               let dt = Timedesc.of_date_and_time_exn ~tz date midnight in

     

       245
       245
       +
               Some (Ok (timedesc_to_ptime dt))

     

       246
       246
       +
           | Error _ -> Some (Error (`Msg (Printf.sprintf "Invalid date: %s" expr)))

     

       247
       247
       +
         else None

     

       248
       248
       +
       

     

       249
       249
       +
       let parse_year_only ~tz expr parameter =

     

       250
       250
       +
         let regex = Re.Pcre.regexp "^(\\d{4})$" in

     

       251
       251
       +
         if Re.Pcre.pmatch ~rex:regex expr then

     

       252
       252
       +
           let match_result = Re.Pcre.exec ~rex:regex expr in

     

       253
       253
       +
           let year = int_of_string (Re.Pcre.get_substring match_result 1) in

     

       254
       254
       +
           match parameter with

     

       255
       255
       +
           | `From -> (

     

       256
       256
       +
               match Timedesc.Date.Ymd.make ~year ~month:1 ~day:1 with

     

       257
       257
       +
               | Ok date ->

     

       258
       258
       +
                   let time = Timedesc.Time.make_exn ~hour:0 ~minute:0 ~second:0 () in

     

       259
       259
       +
                   let dt = Timedesc.of_date_and_time_exn ~tz date time in

     

       260
       260
       +
                   Some (Ok (timedesc_to_ptime dt))

     

       261
       261
       +
               | Error _ ->

     

       262
       262
       +
                   Some (Error (`Msg (Printf.sprintf "Invalid year: %s" expr))))

     

       263
       263
       +
           | `To -> (

     

       264
       264
       +
               match Timedesc.Date.Ymd.make ~year ~month:12 ~day:31 with

     

       265
       265
       +
               | Ok date ->

     

       266
       266
       +
                   let time =

     

       267
       267
       +
                     Timedesc.Time.make_exn ~hour:23 ~minute:59 ~second:59 ()

     

       268
       268
       +
                   in

     

       269
       269
       +
                   let dt = Timedesc.of_date_and_time_exn ~tz date time in

     

       270
       270
       +
                   Some (Ok (timedesc_to_ptime dt))

     

       271
       271
       +
               | Error _ ->

     

       272
       272
       +
                   Some (Error (`Msg (Printf.sprintf "Invalid year: %s" expr))))

     

       273
       273
       +
         else None

     

       274
       274
       +
       

     

       275
       275
       +
       let parse_year_month ~tz expr parameter =

     

       276
       276
       +
         let regex = Re.Pcre.regexp "^(\\d{4})-(\\d{1,2})$" in

     

       277
       277
       +
         if Re.Pcre.pmatch ~rex:regex expr then

     

       278
       278
       +
           let match_result = Re.Pcre.exec ~rex:regex expr in

     

       279
       279
       +
           let year = int_of_string (Re.Pcre.get_substring match_result 1) in

     

       280
       280
       +
           let month = int_of_string (Re.Pcre.get_substring match_result 2) in

     

       281
       281
       +
           match parameter with

     

       282
       282
       +
           | `From -> (

     

       283
       283
       +
               match Timedesc.Date.Ymd.make ~year ~month ~day:1 with

     

       284
       284
       +
               | Ok date ->

     

       285
       285
       +
                   let time = Timedesc.Time.make_exn ~hour:0 ~minute:0 ~second:0 () in

     

       286
       286
       +
                   let dt = Timedesc.of_date_and_time_exn ~tz date time in

     

       287
       287
       +
                   Some (Ok (timedesc_to_ptime dt))

     

       288
       288
       +
               | Error _ ->

     

       289
       289
       +
                   Some (Error (`Msg (Printf.sprintf "Invalid year-month: %s" expr))))

     

       290
       290
       +
           | `To -> (

     

       291
       291
       +
               let next_month = if month = 12 then 1 else month + 1 in

     

       292
       292
       +
               let next_month_year = if month = 12 then year + 1 else year in

     

       293
       293
       +
               match

     

       294
       294
       +
                 Timedesc.Date.Ymd.make ~year:next_month_year ~month:next_month ~day:1

     

       295
       295
       +
               with

     

       296
       296
       +
               | Ok next_month_date ->

     

       297
       297
       +
                   let last_day_of_month = Timedesc.Date.sub ~days:1 next_month_date in

     

       298
       298
       +
                   let end_of_day =

     

       299
       299
       +
                     Timedesc.Time.make_exn ~hour:23 ~minute:59 ~second:59 ()

     

       300
       300
       +
                   in

     

       301
       301
       +
                   let dt =

     

       302
       302
       +
                     Timedesc.of_date_and_time_exn ~tz last_day_of_month end_of_day

     

       303
       303
       +
                   in

     

       304
       304
       +
                   Some (Ok (timedesc_to_ptime dt))

     

       305
       305
       +
               | Error _ ->

     

       306
       306
       +
                   Some (Error (`Msg (Printf.sprintf "Invalid year-month: %s" expr))))

     

       307
       307
       +
         else None

     

       308
       308
       +
       

     

       309
       309
       +
       let parse_relative ~tz expr parameter =

     

       310
       310
       +
         let regex = Re.Pcre.regexp "^([+-])(\\d+)([dwmy])$" in

     

       311
       311
       +
         if Re.Pcre.pmatch ~rex:regex expr then

     

       312
       312
       +
           let match_result = Re.Pcre.exec ~rex:regex expr in

     

       313
       313
       +
           let sign = Re.Pcre.get_substring match_result 1 in

     

       314
       314
       +
           let num = int_of_string (Re.Pcre.get_substring match_result 2) in

     

       315
       315
       +
           let unit = Re.Pcre.get_substring match_result 3 in

     

       316
       316
       +
           let multiplier = if sign = "+" then 1 else -1 in

     

       317
       317
       +
           let value = num * multiplier in

     

       318
       318
       +
           let today = !get_today ~tz () in

     

       319
       319
       +
           match unit with

     

       320
       320
       +
           | "d" -> Some (Ok (add_days today value))

     

       321
       321
       +
           | "w" -> (

     

       322
       322
       +
               let date = add_weeks today value in

     

       323
       323
       +
               match parameter with

     

       324
       324
       +
               | `From -> Some (Ok (get_start_of_week date))

     

       325
       325
       +
               | `To -> Some (Ok (get_end_of_week date)))

     

       326
       326
       +
           | "m" -> (

     

       327
       327
       +
               let date = add_months today value in

     

       328
       328
       +
               match parameter with

     

       329
       329
       +
               | `From -> Some (Ok (get_start_of_month date))

     

       330
       330
       +
               | `To -> Some (Ok (get_end_of_month date)))

     

       331
       331
       +
           | "y" -> (

     

       332
       332
       +
               let date = add_years today value in

     

       333
       333
       +
               match parameter with

     

       334
       334
       +
               | `From -> Some (Ok (get_start_of_year date))

     

       335
       335
       +
               | `To -> Some (Ok (get_end_of_year date)))

     

       336
       336
       +
           | _ -> Some (Error (`Msg (Printf.sprintf "Invalid date unit: %s" unit)))

     

       337
       337
       +
         else None

     

       338
       338
       +
       

     

       197
       339
        
       let parse_date ?(tz = !default_timezone ()) expr parameter =

     

       198
       198
       -
         let iso_date_regex = Re.Pcre.regexp "^(\\d{4})-(\\d{2})-(\\d{2})$" in

     

       199
       199
       -
         let relative_regex = Re.Pcre.regexp "^([+-])(\\d+)([dwm])$" in

     

       200
       340
        
         match expr with

     

       201
       341
        
         | "today" -> Ok (!get_today ~tz ())

     

       202
       342
        
         | "tomorrow" -> Ok (add_days (!get_today ~tz ()) 1)

     
···

       217
       357
        
             match parameter with

     

       218
       358
        
             | `From -> Ok (get_start_of_next_month ~tz ())

     

       219
       359
        
             | `To -> Ok (get_end_of_next_month ~tz ()))

     

       220
       220
       -
         | _ ->

     

       221
       221
       -
             (* Try to parse as ISO date *)

     

       222
       222
       -
             if Re.Pcre.pmatch ~rex:iso_date_regex expr then

     

       223
       223
       -
               let year =

     

       224
       224
       -
                 int_of_string

     

       225
       225
       -
                   (Re.Pcre.get_substring (Re.Pcre.exec ~rex:iso_date_regex expr) 1)

     

       226
       226
       -
               in

     

       227
       227
       -
               let month =

     

       228
       228
       -
                 int_of_string

     

       229
       229
       -
                   (Re.Pcre.get_substring (Re.Pcre.exec ~rex:iso_date_regex expr) 2)

     

       230
       230
       -
               in

     

       231
       231
       -
               let day =

     

       232
       232
       -
                 int_of_string

     

       233
       233
       -
                   (Re.Pcre.get_substring (Re.Pcre.exec ~rex:iso_date_regex expr) 3)

     

       234
       234
       -
               in

     

       235
       235
       -
               match Timedesc.Date.Ymd.make ~year ~month ~day with

     

       236
       236
       -
               | Ok date ->

     

       237
       237
       -
                   let midnight =

     

       238
       238
       -
                     Timedesc.Time.make_exn ~hour:0 ~minute:0 ~second:0 ()

     

       239
       239
       -
                   in

     

       240
       240
       -
                   let dt = Timedesc.of_date_and_time_exn ~tz date midnight in

     

       241
       241
       -
                   Ok (timedesc_to_ptime dt)

     

       242
       242
       -
               | Error _ -> Error (`Msg (Printf.sprintf "Invalid date: %s" expr))

     

       243
       243
       -
               (* Try to parse as relative expression +Nd, -Nd, etc. *)

     

       244
       244
       -
             else if Re.Pcre.pmatch ~rex:relative_regex expr then

     

       245
       245
       -
               let sign =

     

       246
       246
       -
                 Re.Pcre.get_substring (Re.Pcre.exec ~rex:relative_regex expr) 1

     

       247
       247
       -
               in

     

       248
       248
       -
               let num =

     

       249
       249
       -
                 int_of_string

     

       250
       250
       -
                   (Re.Pcre.get_substring (Re.Pcre.exec ~rex:relative_regex expr) 2)

     

       251
       251
       -
               in

     

       252
       252
       -
               let unit =

     

       253
       253
       -
                 Re.Pcre.get_substring (Re.Pcre.exec ~rex:relative_regex expr) 3

     

       254
       254
       -
               in

     

       255
       255
       -
               let multiplier = if sign = "+" then 1 else -1 in

     

       256
       256
       -
               let value = num * multiplier in

     

       257
       257
       -
               let today = !get_today ~tz () in

     

       258
       258
       -
               match unit with

     

       259
       259
       -
               | "d" -> Ok (add_days today value)

     

       260
       260
       -
               | "w" -> (

     

       261
       261
       -
                   let date = add_weeks today value in

     

       262
       262
       -
                   match parameter with

     

       263
       263
       -
                   | `From -> Ok (get_start_of_week date)

     

       264
       264
       -
                   | `To -> Ok (get_end_of_week date))

     

       265
       265
       -
               | "m" -> (

     

       266
       266
       -
                   let date = add_months today value in

     

       267
       267
       -
                   match parameter with

     

       268
       268
       -
                   | `From -> Ok (get_start_of_month date)

     

       269
       269
       -
                   | `To -> Ok (get_end_of_month date))

     

       270
       270
       -
               | _ -> Error (`Msg (Printf.sprintf "Invalid date unit: %s" unit))

     

       271
       271
       -
             else Error (`Msg (Printf.sprintf "Invalid date format: %s" expr))

     

       360
       360
       +
         | _ -> (

     

       361
       361
       +
             (* Option alternative operator *)

     

       362
       362
       +
             let ( |>? ) opt f = match opt with None -> f () | Some x -> Some x in

     

       363
       363
       +
             ( ( ( parse_full_iso_datet ~tz expr |>? fun () ->

     

       364
       364
       +
                   parse_year_only ~tz expr parameter )

     

       365
       365
       +
               |>? fun () -> parse_year_month ~tz expr parameter )

     

       366
       366
       +
             |>? fun () -> parse_relative ~tz expr parameter )

     

       367
       367
       +
             |> function

     

       368
       368
       +
             | Some result -> result

     

       369
       369
       +
             | None -> Error (`Msg (Printf.sprintf "Invalid date format: %s" expr)))

     

       272
       370
        
       

     

       273
       371
        
       let parse_time str =

     

       274
       372
        
         try

     
···

       313
       411
        
       let ptime_of_ical = function

     

       314
       412
        
         | `Datetime (`Utc t) -> t

     

       315
       413
        
         | `Datetime (`Local t) ->

     

       316
       316
       -
             let system_tz =

     

       317
       317
       -
               match Timedesc.Time_zone.local () with

     

       318
       318
       -
               | Some tz -> tz

     

       319
       319
       -
               | None -> Timedesc.Time_zone.utc

     

       320
       320
       -
             in

     

       414
       414
       +
             let tz = Timedesc.Time_zone.local_exn () in

     

       321
       415
        
             let ts = Timedesc.Utils.timestamp_of_ptime t in

     

       416
       416
       +
             (* Icalendar gives us the Ptime in UTC, which we parse to a Timedesc *)

     

       322
       417
        
             let dt =

     

       323
       323
       -
               match Timedesc.of_timestamp ~tz_of_date_time:system_tz ts with

     

       324
       324
       -
               | Some dt -> dt

     

       325
       325
       -
               | None -> failwith "Invalid local date conversion"

     

       418
       418
       +
               Timedesc.of_timestamp_exn ~tz_of_date_time:Timedesc.Time_zone.utc ts

     

       326
       419
        
             in

     

       420
       420
       +
             (* We extract the datetime, and reinterpret it in the appropriate timezone *)

     

       421
       421
       +
             let date = Timedesc.date dt in

     

       422
       422
       +
             let time = Timedesc.time dt in

     

       423
       423
       +
             let dt = Timedesc.of_date_and_time_exn ~tz date time in

     

       327
       424
        
             timedesc_to_ptime dt

     

       328
       425
        
         | `Datetime (`With_tzid (t, (_, tzid))) ->

     

       329
       426
        
             let tz =

     

       330
       427
        
               match Timedesc.Time_zone.make tzid with

     

       331
       428
        
               | Some tz -> tz

     

       332
       332
       -
               | None ->

     

       333
       333
       -
                   failwith

     

       334
       334
       -
                     (Printf.sprintf

     

       335
       335
       -
                        "Warning: Unknown timezone %s, falling back to UTC\n" tzid)

     

       429
       429
       +
               | None -> failwith (Printf.sprintf "Warning: Unknown timezone %s" tzid)

     

       336
       430
        
             in

     

       431
       431
       +
             (* Icalendar gives us the Ptime in UTC, which we parse to a Timedesc *)

     

       337
       432
        
             let ts = Timedesc.Utils.timestamp_of_ptime t in

     

       338
       433
        
             let dt =

     

       339
       339
       -
               match Timedesc.of_timestamp ~tz_of_date_time:tz ts with

     

       340
       340
       -
               | Some dt -> dt

     

       341
       341
       -
               | None -> failwith "Invalid timezone date conversion"

     

       434
       434
       +
               Timedesc.of_timestamp_exn ~tz_of_date_time:Timedesc.Time_zone.utc ts

     

       342
       435
        
             in

     

       436
       436
       +
             (* We extract the datetime, and reinterpret it in the appropriate timezone *)

     

       437
       437
       +
             let date = Timedesc.date dt in

     

       438
       438
       +
             let time = Timedesc.time dt in

     

       439
       439
       +
             let dt = Timedesc.of_date_and_time_exn ~tz date time in

     

       343
       440
        
             timedesc_to_ptime dt

     

       344
       441
        
         | `Date date -> (

     

       345
       442
        
             let y, m, d = date in

+38 -2

lib/date.mli

···

       94
       94
        
       (** Get the end of the month for the given date. Raises an exception if the date

     

       95
       95
        
           cannot be calculated. *)

     

       96
       96
        
       

     

       97
       97
       +
       val get_start_of_year : Ptime.t -> Ptime.t

     

       98
       98
       +
       (** Get the start of the year (Jan 1) for the given date. Raises an exception if

     

       99
       99
       +
           the date cannot be calculated. *)

     

       100
       100
       +
       

     

       101
       101
       +
       val get_start_of_current_year : ?tz:Timedesc.Time_zone.t -> unit -> Ptime.t

     

       102
       102
       +
       (** Get the start of the current year in the specified timezone. If no timezone

     

       103
       103
       +
           is provided, uses the default_timezone. Raises an exception if the date

     

       104
       104
       +
           cannot be calculated. *)

     

       105
       105
       +
       

     

       106
       106
       +
       val get_start_of_next_year : ?tz:Timedesc.Time_zone.t -> unit -> Ptime.t

     

       107
       107
       +
       (** Get the start of next year in the specified timezone. If no timezone is

     

       108
       108
       +
           provided, uses the default_timezone. Raises an exception if the date cannot

     

       109
       109
       +
           be calculated. *)

     

       110
       110
       +
       

     

       111
       111
       +
       val get_end_of_year : Ptime.t -> Ptime.t

     

       112
       112
       +
       (** Get the end of the year (Dec 31, 23:59:59) for the given date. Raises an

     

       113
       113
       +
           exception if the date cannot be calculated. *)

     

       114
       114
       +
       

     

       115
       115
       +
       val get_end_of_current_year : ?tz:Timedesc.Time_zone.t -> unit -> Ptime.t

     

       116
       116
       +
       (** Get the end of the current year in the specified timezone. If no timezone is

     

       117
       117
       +
           provided, uses the default_timezone. Raises an exception if the date cannot

     

       118
       118
       +
           be calculated. *)

     

       119
       119
       +
       

     

       120
       120
       +
       val get_end_of_next_year : ?tz:Timedesc.Time_zone.t -> unit -> Ptime.t

     

       121
       121
       +
       (** Get the end of next year in the specified timezone. If no timezone is

     

       122
       122
       +
           provided, uses the default_timezone. Raises an exception if the date cannot

     

       123
       123
       +
           be calculated. *)

     

       124
       124
       +
       

     

       97
       125
        
       val convert_relative_date_formats :

     

       98
       126
        
         ?tz:Timedesc.Time_zone.t ->

     

       99
       127
        
         today:bool ->

     
···

       117
       145
        
           default_timezone.

     

       118
       146
        
       

     

       119
       147
        
           Supported formats:

     

       120
       120
       -
           - ISO format: "YYYY-MM-DD"

     

       148
       148
       +
           - ISO format:

     

       149
       149
       +
           - "YYYY-MM-DD" (full date)

     

       150
       150
       +
           - "YYYY-MM" (partial date)

     

       151
       151
       +
           - For --from: defaults to first day of month

     

       152
       152
       +
           - For --to: defaults to last day of month

     

       153
       153
       +
           - "YYYY" (partial date)

     

       154
       154
       +
           - For --from: defaults to January 1st of year

     

       155
       155
       +
           - For --to: defaults to December 31st of year

     

       121
       156
        
           - Relative expressions:

     

       122
       157
        
           - "today" - Current day

     

       123
       158
        
           - "tomorrow" - Next day

     
···

       129
       164
        
           - "+Nd" - N days from today (e.g., "+7d" for a week from today)

     

       130
       165
        
           - "-Nd" - N days before today (e.g., "-7d" for a week ago)

     

       131
       166
        
           - "+Nw" - N weeks from today

     

       132
       132
       -
           - "+Nm" - N months from today *)

     

       167
       167
       +
           - "+Nm" - N months from today

     

       168
       168
       +
           - "+Ny" - N years from today *)

     

       133
       169
        
       

     

       134
       170
        
       val parse_time : string -> (int * int * int, [> `Msg of string ]) result

     

       135
       171
        
       (** Parse a time string in HH:MM or HH:MM:SS format. Returns Ok with (hour,

+4 -2

lib/dune

···

       13
       13
        
         yojson

     

       14
       14
        
         uuidm

     

       15
       15
        
         eio

     

       16
       16
       -
         eio_main)

     

       16
       16
       +
         eio_main

     

       17
       17
       +
         cmdliner

     

       18
       18
       +
         sexplib)

     

       17
       19
        
        (preprocess

     

       18
       18
       -
         (pps ppx_deriving.show ppx_deriving.eq)))

     

       20
       20
       +
         (pps ppx_deriving.show ppx_deriving.eq ppx_sexp_conv)))

+292 -105

lib/event.ml

···

       3
       3
        
       type event_id = string

     

       4
       4
        
       

     

       5
       5
        
       type t = {

     

       6
       6
       -
         collection : Collection.t;

     

       6
       6
       +
         calendar_name : string;

     

       7
       7
        
         file : Eio.Fs.dir_ty Eio.Path.t;

     

       8
       8
        
         event : event;

     

       9
       9
        
         calendar : calendar;

     
···

       16
       16
        
         Uuidm.to_string uuid

     

       17
       17
        
       

     

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

     

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

     

       19
       20
        
       

     

       20
       21
        
       let create ~(fs : Eio.Fs.dir_ty Eio.Path.t) ~calendar_dir_path ~summary ~start

     

       21
       21
       -
           ?end_ ?location ?description ?recurrence collection =

     

       22
       22
       +
           ?end_ ?location ?description ?recurrence calendar_name =

     

       22
       23
        
         let uuid = generate_uuid () in

     

       23
       24
        
         let uid = (Params.empty, uuid) in

     

       24
       25
        
         let file_name = uuid ^ ".ics" in

     

       25
       26
        
         let file =

     

       26
       27
        
           Eio.Path.(

     

       27
       27
       -
             fs / calendar_dir_path

     

       28
       28
       -
             / (match collection with Collection.Col s -> s)

     

       29
       29
       -
             / file_name)

     

       28
       28
       +
             fs / calendar_dir_path / (match calendar_name with s -> s) / file_name)

     

       30
       29
        
         in

     

       31
       31
       -
         let dtstart = (Params.empty, start) in

     

       30
       30
       +
         let dtstart = start in

     

       32
       31
        
         let dtend_or_duration = end_ in

     

       32
       32
       +
         let* _ =

     

       33
       33
       +
           match (dtstart, dtend_or_duration) with

     

       34
       34
       +
           | (_, `Date _), Some (`Dtend (_, `Datetime _)) ->

     

       35
       35
       +
               Error (`Msg "If the start is a date the end must also be a date.")

     

       36
       36
       +
           | (_, `Datetime _), Some (`Dtend (_, `Date _)) ->

     

       37
       37
       +
               Error

     

       38
       38
       +
                 (`Msg "If the start is a datetime the end must also be a datetime.")

     

       39
       39
       +
           | _ -> Ok ()

     

       40
       40
       +
         in

     

       33
       41
        
         let rrule = Option.map (fun r -> (Params.empty, r)) recurrence in

     

       34
       42
        
         let now = Ptime_clock.now () in

     

       35
       43
        
         let props = [ `Summary (Params.empty, summary) ] in

     
···

       59
       67
        
           let components = [ `Event event ] in

     

       60
       68
        
           (props, components)

     

       61
       69
        
         in

     

       62
       62
       -
         { collection; file; event; calendar }

     

       70
       70
       +
         Ok { calendar_name; file; event; calendar }

     

       63
       71
        
       

     

       64
       72
        
       let edit ?summary ?start ?end_ ?location ?description ?recurrence t =

     

       65
       73
        
         let now = Ptime_clock.now () in

     

       66
       74
        
         let uid = t.event.uid in

     

       67
       67
       -
         let dtstart =

     

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

     

       69
       69
       -
         in

     

       75
       75
       +
         let dtstart = match start with None -> t.event.dtstart | Some s -> s in

     

       70
       76
        
         let dtend_or_duration =

     

       71
       77
        
           match end_ with None -> t.event.dtend_or_duration | Some _ -> end_

     

       78
       78
       +
         in

     

       79
       79
       +
         let* _ =

     

       80
       80
       +
           match (dtstart, dtend_or_duration) with

     

       81
       81
       +
           | (_, `Date _), Some (`Dtend (_, `Datetime _)) ->

     

       82
       82
       +
               Error (`Msg "If the start is a date the end must also be a date.")

     

       83
       83
       +
           | (_, `Datetime _), Some (`Dtend (_, `Date _)) ->

     

       84
       84
       +
               Error

     

       85
       85
       +
                 (`Msg "If the start is a datetime the end must also be a datetime.")

     

       86
       86
       +
           | _ -> Ok ()

     

       72
       87
        
         in

     

       73
       88
        
         let rrule =

     

       74
       89
        
           match recurrence with

     
···

       112
       127
        
             alarms;

     

       113
       128
        
           }

     

       114
       129
        
         in

     

       115
       115
       -
         let collection = t.collection in

     

       130
       130
       +
         let calendar_name = t.calendar_name in

     

       116
       131
        
         let file = t.file in

     

       117
       132
        
         let calendar = t.calendar in

     

       118
       118
       -
         { collection; file; event; calendar }

     

       133
       133
       +
         Ok { calendar_name; file; event; calendar }

     

       119
       134
        
       

     

       120
       120
       -
       let events_of_icalendar collection ~file calendar =

     

       135
       135
       +
       let events_of_icalendar calendar_name ~file calendar =

     

       121
       136
        
         let remove_dup_ids lst =

     

       122
       137
        
           let rec aux acc = function

     

       123
       138
        
             | [] -> acc

     
···

       133
       148
        
             (snd calendar)

     

       134
       149
        
         in

     

       135
       150
        
         let events = remove_dup_ids events in

     

       136
       136
       -
         List.map (function event -> { collection; file; event; calendar }) events

     

       151
       151
       +
         List.map (function event -> { calendar_name; file; event; calendar }) events

     

       137
       152
        
       

     

       138
       153
        
       let to_ical_event t = t.event

     

       139
       154
        
       let to_ical_calendar t = t.calendar

     
···

       170
       185
        
       let get_start_timezone t =

     

       171
       186
        
         match t.event.dtstart with

     

       172
       187
        
         | _, `Datetime (`With_tzid (_, (_, tzid))) -> Some tzid

     

       188
       188
       +
         | _, `Datetime (`Utc _) -> Some "UTC"

     

       173
       189
        
         | _ -> None

     

       174
       190
        
       

     

       175
       191
        
       let get_end_timezone t =

     

       176
       192
        
         match t.event.dtend_or_duration with

     

       177
       193
        
         | Some (`Dtend (_, `Datetime (`With_tzid (_, (_, tzid))))) -> Some tzid

     

       194
       194
       +
         | Some (`Dtend (_, `Datetime (`Utc _))) -> Some "UTC"

     

       178
       195
        
         | _ -> None

     

       179
       196
        
       

     

       180
       197
        
       let get_duration t =

     
···

       210
       227
        
         | _ -> None

     

       211
       228
        
       

     

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

     

       213
       213
       -
       let get_collection t = t.collection

     

       230
       230
       +
       let get_calendar_name t = t.calendar_name

     

       214
       231
        
       let get_file t = t.file

     

       215
       232
        
       

     

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

     
···

       241
       258
        
         | None, Some _ -> -1

     

       242
       259
        
         | None, None -> 0

     

       243
       260
        
       

     

       244
       244
       -
       let by_collection e1 e2 =

     

       245
       245
       -
         match (get_collection e1, get_collection e2) with

     

       246
       246
       -
         | Collection.Col c1, Collection.Col c2 -> String.compare c1 c2

     

       261
       261
       +
       let by_calendar_name e1 e2 =

     

       262
       262
       +
         match (get_calendar_name e1, get_calendar_name e2) with

     

       263
       263
       +
         | c1, c2 -> String.compare c1 c2

     

       247
       264
        
       

     

       248
       265
        
       let descending comp e1 e2 = -1 * comp e1 e2

     

       249
       266
        
       

     
···

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

     

       253
       270
        
       

     

       254
       271
        
       let clone_with_event t event =

     

       255
       255
       -
         let collection = t.collection in

     

       272
       272
       +
         let calendar_name = t.calendar_name in

     

       256
       273
        
         let file = t.file in

     

       257
       274
        
         let calendar = t.calendar in

     

       258
       258
       -
         { collection; file; event; calendar }

     

       275
       275
       +
         { calendar_name; file; event; calendar }

     

       259
       276
        
       

     

       260
       277
        
       type format = [ `Text | `Entries | `Json | `Csv | `Ics | `Sexp ]

     

       261
       278
        
       

     
···

       290
       307
        
         in

     

       291
       308
        
         Printf.sprintf "%s %s%s" (format_date ?tz date) (format_time ?tz date) tz_str

     

       292
       309
        
       

     

       293
       293
       -
       let same_day day other =

     

       294
       294
       -
         let y1, m1, d1 = Ptime.to_date day in

     

       295
       295
       -
         let y2, m2, d2 = Ptime.to_date other in

     

       296
       296
       -
         y1 == y2 && m1 == m2 && d1 == d2

     

       297
       297
       -
       

     

       298
       298
       -
       let next_day day ~next =

     

       299
       299
       -
         let y1, m1, d1 = Ptime.to_date day in

     

       300
       300
       -
         let y2, m2, d2 = Ptime.to_date next in

     

       301
       301
       -
         y1 == y2 && m1 == m2 && d1 == d2 - 1

     

       310
       310
       +
       let day_diff day ~next =

     

       311
       311
       +
         let span = Ptime.diff next day in

     

       312
       312
       +
         let d, _ = Ptime.Span.to_d_ps span in

     

       313
       313
       +
         d

     

       302
       314
        
       

     

       303
       315
        
       (* exosed from icalendar *)

     

       304
       316
        
       

     
···

       388
       400
        
             recur_to_ics recur)

     

       389
       401
        
           l

     

       390
       402
        
       

     

       403
       403
       +
       let text_event_data ?tz event =

     

       404
       404
       +
         let id = get_id event in

     

       405
       405
       +
         let start = get_start event in

     

       406
       406
       +
         let end_ = get_end event in

     

       407
       407
       +
         let start_date = format_date ?tz start in

     

       408
       408
       +
         let start_timezone = get_start_timezone event in

     

       409
       409
       +
         let end_timezone = get_end_timezone event in

     

       410
       410
       +
         let same_timezone =

     

       411
       411
       +
           match (start_timezone, end_timezone) with

     

       412
       412
       +
           | Some tz1, Some tz2 when tz1 = tz2 -> true

     

       413
       413
       +
           | _ -> false

     

       414
       414
       +
         in

     

       415
       415
       +
         let start_time =

     

       416
       416
       +
           match is_date event with

     

       417
       417
       +
           | true -> ""

     

       418
       418
       +
           | false ->

     

       419
       419
       +
               let tz_str =

     

       420
       420
       +
                 if same_timezone then " " ^ format_time ?tz start

     

       421
       421
       +
                 else

     

       422
       422
       +
                   match start_timezone with

     

       423
       423
       +
                   | Some tzid -> " " ^ format_time ?tz start ^ " (" ^ tzid ^ ")"

     

       424
       424
       +
                   | None -> " " ^ format_time ?tz start

     

       425
       425
       +
               in

     

       426
       426
       +
               tz_str

     

       427
       427
       +
         in

     

       428
       428
       +
         let end_date, end_time =

     

       429
       429
       +
           match end_ with

     

       430
       430
       +
           | None -> ("", "")

     

       431
       431
       +
           | Some end_ -> (

     

       432
       432
       +
               match is_date event with

     

       433
       433
       +
               | true -> (

     

       434
       434
       +
                   match day_diff start ~next:end_ <= 1 with

     

       435
       435
       +
                   | true -> ("", "")

     

       436
       436
       +
                   | false -> (" - " ^ format_date ?tz end_, ""))

     

       437
       437
       +
               | false -> (

     

       438
       438
       +
                   match day_diff start ~next:end_ == 0 with

     

       439
       439
       +
                   | true ->

     

       440
       440
       +
                       let tz_str =

     

       441
       441
       +
                         match end_timezone with

     

       442
       442
       +
                         | Some tzid when same_timezone ->

     

       443
       443
       +
                             ("", " - " ^ format_time ?tz end_ ^ " (" ^ tzid ^ ")")

     

       444
       444
       +
                         | Some tzid ->

     

       445
       445
       +
                             ("", " - " ^ format_time ?tz end_ ^ " (" ^ tzid ^ ")")

     

       446
       446
       +
                         | None -> ("", " - " ^ format_time ?tz end_)

     

       447
       447
       +
                       in

     

       448
       448
       +
                       tz_str

     

       449
       449
       +
                   | false ->

     

       450
       450
       +
                       let tz_str =

     

       451
       451
       +
                         match end_timezone with

     

       452
       452
       +
                         | Some tzid when same_timezone ->

     

       453
       453
       +
                             ( " - " ^ format_date ?tz end_,

     

       454
       454
       +
                               " " ^ format_time ?tz end_ ^ " (" ^ tzid ^ ")" )

     

       455
       455
       +
                         | Some tzid ->

     

       456
       456
       +
                             ( " - " ^ format_date ?tz end_,

     

       457
       457
       +
                               " " ^ format_time ?tz end_ ^ " (" ^ tzid ^ ")" )

     

       458
       458
       +
                         | None ->

     

       459
       459
       +
                             (" - " ^ format_date ?tz end_, " " ^ format_time ?tz end_)

     

       460
       460
       +
                       in

     

       461
       461
       +
                       tz_str))

     

       462
       462
       +
         in

     

       463
       463
       +
         let summary =

     

       464
       464
       +
           match get_summary event with

     

       465
       465
       +
           | Some summary when summary <> "" -> summary

     

       466
       466
       +
           | _ -> ""

     

       467
       467
       +
         in

     

       468
       468
       +
         let location =

     

       469
       469
       +
           match get_location event with

     

       470
       470
       +
           | Some loc when loc <> "" -> "@" ^ loc

     

       471
       471
       +
           | _ -> ""

     

       472
       472
       +
         in

     

       473
       473
       +
         let calendar_name = get_calendar_name event in

     

       474
       474
       +
         let date_time = start_date ^ start_time ^ end_date ^ end_time in

     

       475
       475
       +
         (id, calendar_name, date_time, summary, location)

     

       476
       476
       +
       

     

       391
       477
        
       let format_event ?(format = `Text) ?tz event =

     

       392
       478
        
         let start = get_start event in

     

       393
       479
        
         let end_ = get_end event in

     

       394
       480
        
         match format with

     

       395
       481
        
         | `Text ->

     

       396
       396
       -
             let id = get_id event in

     

       397
       397
       -
             let start_date = " " ^ format_date ?tz start in

     

       398
       398
       -
             let start_time =

     

       399
       399
       -
               match is_date event with

     

       400
       400
       -
               | true -> ""

     

       401
       401
       -
               | false -> " " ^ format_time ?tz start

     

       482
       482
       +
             let id, calendar_name, date_time, summary, location =

     

       483
       483
       +
               text_event_data ?tz event

     

       402
       484
        
             in

     

       403
       403
       -
             let end_date, end_time =

     

       404
       404
       -
               match end_ with

     

       405
       405
       -
               | None -> ("", "")

     

       406
       406
       -
               | Some end_ -> (

     

       407
       407
       -
                   match is_date event with

     

       408
       408
       -
                   | true -> (

     

       409
       409
       -
                       match next_day start ~next:end_ with

     

       410
       410
       -
                       | true -> ("", "")

     

       411
       411
       -
                       | false -> (" - " ^ format_date ?tz end_, ""))

     

       412
       412
       -
                   | false -> (

     

       413
       413
       -
                       match same_day start end_ with

     

       414
       414
       -
                       | true -> ("", " - " ^ format_time ?tz end_)

     

       415
       415
       -
                       | false ->

     

       416
       416
       -
                           (" - " ^ format_date ?tz end_, " " ^ format_time ?tz end_)))

     

       417
       417
       -
             in

     

       418
       418
       -
             let summary =

     

       419
       419
       -
               match get_summary event with

     

       420
       420
       -
               | Some summary when summary <> "" -> " " ^ summary

     

       421
       421
       -
               | _ -> ""

     

       422
       422
       -
             in

     

       423
       423
       -
             let location =

     

       424
       424
       -
               match get_location event with

     

       425
       425
       -
               | Some loc when loc <> "" -> " @" ^ loc

     

       426
       426
       -
               | _ -> ""

     

       427
       427
       -
             in

     

       428
       428
       -
             let collection = match get_collection event with Col s -> s in

     

       429
       429
       -
             Printf.sprintf "%-45s\t%s\t%s%s%s%s%s%s" id collection start_date

     

       430
       430
       -
               start_time end_date end_time summary location

     

       485
       485
       +
             Printf.sprintf "%s\t%s\t%s\t%s\t%s" calendar_name date_time summary

     

       486
       486
       +
               location id

     

       431
       487
        
         | `Entries ->

     

       432
       488
        
             let format_opt label f opt =

     

       433
       489
        
               Option.map (fun x -> Printf.sprintf "%s: %s\n" label (f x)) opt

     

       434
       490
        
               |> Option.value ~default:""

     

       435
       491
        
             in

     

       436
       436
       -
             let format timezone datetime =

     

       492
       492
       +
             let start_timezone = get_start_timezone event in

     

       493
       493
       +
             let end_timezone = get_end_timezone event in

     

       494
       494
       +
             let same_timezone =

     

       495
       495
       +
               match (start_timezone, end_timezone) with

     

       496
       496
       +
               | Some tz1, Some tz2 when tz1 = tz2 -> true

     

       497
       497
       +
               | _ -> false

     

       498
       498
       +
             in

     

       499
       499
       +
             let format timezone datetime is_end =

     

       437
       500
        
               match is_date event with

     

       438
       501
        
               | true -> format_date ?tz datetime

     

       439
       439
       -
               | false -> (

     

       440
       440
       -
                   format_datetime ?tz datetime

     

       441
       441
       -
                   ^ match timezone with None -> "" | Some t -> " (" ^ t ^ ")")

     

       502
       502
       +
               | false ->

     

       503
       503
       +
                   let tz_suffix =

     

       504
       504
       +
                     if (not is_end) && same_timezone then ""

     

       505
       505
       +
                     else match timezone with None -> "" | Some t -> " (" ^ t ^ ")"

     

       506
       506
       +
                   in

     

       507
       507
       +
                   format_datetime ?tz datetime ^ tz_suffix

     

       442
       508
        
             in

     

       443
       509
        
             let start_str =

     

       444
       444
       -
               format_opt "Start" (format (get_start_timezone event)) (Some start)

     

       510
       510
       +
               format_opt "Start" (fun d -> format start_timezone d false) (Some start)

     

       511
       511
       +
             in

     

       512
       512
       +
             let end_str =

     

       513
       513
       +
               format_opt "End" (fun d -> format end_timezone d true) end_

     

       445
       514
        
             in

     

       446
       446
       -
             let end_str = format_opt "End" (format (get_end_timezone event)) end_ in

     

       447
       515
        
             let location_str = format_opt "Location" Fun.id (get_location event) in

     

       448
       516
        
             let description_str =

     

       449
       517
        
               format_opt "Description" Fun.id (get_description event)

     
···

       484
       552
        
                     match get_description event with

     

       485
       553
        
                     | Some desc -> `String desc

     

       486
       554
        
                     | None -> `Null );

     

       487
       487
       -
                   ( "calendar",

     

       488
       488
       -
                     match get_collection event with

     

       489
       489
       -
                     | Collection.Col cal -> `String cal );

     

       555
       555
       +
                   ("calendar", match get_calendar_name event with cal -> `String cal);

     

       490
       556
        
                 ]

     

       491
       557
        
             in

     

       492
       558
        
             to_string json

     
···

       501
       567
        
             let location =

     

       502
       568
        
               match get_location event with Some loc -> loc | None -> ""

     

       503
       569
        
             in

     

       504
       504
       -
             let cal_id =

     

       505
       505
       -
               match get_collection event with Collection.Col cal -> cal

     

       506
       506
       -
             in

     

       570
       570
       +
             let cal_id = match get_calendar_name event with cal -> cal in

     

       507
       571
        
             Printf.sprintf "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\"" summary start end_str

     

       508
       572
        
               location cal_id

     

       509
       573
        
         | `Ics ->

     
···

       513
       577
        
             let summary =

     

       514
       578
        
               match get_summary event with Some summary -> summary | None -> ""

     

       515
       579
        
             in

     

       516
       516
       -
             let start_date, start_time =

     

       580
       580
       +
             let start_str =

     

       517
       581
        
               let dt = Date.ptime_to_timedesc ?tz start in

     

       518
       582
        
               let y = Timedesc.year dt in

     

       519
       583
        
               let m = Timedesc.month dt in

     
···

       521
       585
        
               let h = Timedesc.hour dt in

     

       522
       586
        
               let min = Timedesc.minute dt in

     

       523
       587
        
               let s = Timedesc.second dt in

     

       524
       524
       -
               let dow =

     

       525
       525
       -
                 match Timedesc.weekday dt with

     

       526
       526
       -
                 | `Mon -> "monday"

     

       527
       527
       -
                 | `Tue -> "tuesday"

     

       528
       528
       -
                 | `Wed -> "wednesday"

     

       529
       529
       -
                 | `Thu -> "thursday"

     

       530
       530
       -
                 | `Fri -> "friday"

     

       531
       531
       -
                 | `Sat -> "saturday"

     

       532
       532
       -
                 | `Sun -> "sunday"

     

       533
       533
       -
               in

     

       534
       534
       -
               ( Printf.sprintf "(%04d %02d %02d %s)" y m d dow,

     

       535
       535
       -
                 Printf.sprintf "(%02d %02d %02d)" h min s )

     

       588
       588
       +
               (* Format as a single timestamp string that's easy for Emacs to parse *)

     

       589
       589
       +
               Printf.sprintf "\"%04d-%02d-%02dT%02d:%02d:%02d\"" y m d h min s

     

       536
       590
        
             in

     

       537
       591
        
             let end_str =

     

       538
       592
        
               match end_ with

     
···

       544
       598
        
                   let h = Timedesc.hour dt in

     

       545
       599
        
                   let min = Timedesc.minute dt in

     

       546
       600
        
                   let s = Timedesc.second dt in

     

       547
       547
       -
                   let dow =

     

       548
       548
       -
                     match Timedesc.weekday dt with

     

       549
       549
       -
                     | `Mon -> "monday"

     

       550
       550
       -
                     | `Tue -> "tuesday"

     

       551
       551
       -
                     | `Wed -> "wednesday"

     

       552
       552
       -
                     | `Thu -> "thursday"

     

       553
       553
       -
                     | `Fri -> "friday"

     

       554
       554
       -
                     | `Sat -> "saturday"

     

       555
       555
       -
                     | `Sun -> "sunday"

     

       556
       556
       -
                   in

     

       557
       557
       -
                   Printf.sprintf "((%04d %02d %02d %s) (%02d %02d %02d))" y m d dow h

     

       558
       558
       -
                     min s

     

       601
       601
       +
                   Printf.sprintf "\"%04d-%02d-%02dT%02d:%02d:%02d\"" y m d h min s

     

       559
       602
        
               | None -> "nil"

     

       560
       603
        
             in

     

       561
       604
        
             let location =

     
···

       569
       612
        
               | None -> "nil"

     

       570
       613
        
             in

     

       571
       614
        
             let calendar =

     

       572
       572
       -
               match get_collection event with

     

       573
       573
       -
               | Collection.Col cal -> Printf.sprintf "\"%s\"" (String.escaped cal)

     

       615
       615
       +
               match get_calendar_name event with

     

       616
       616
       +
               | cal -> Printf.sprintf "\"%s\"" (String.escaped cal)

     

       574
       617
        
             in

     

       575
       618
        
             let id = get_id event in

     

       576
       619
        
             Printf.sprintf

     

       577
       577
       -
               "((:id \"%s\" :summary \"%s\" :start (%s %s) :end %s :location %s \

     

       620
       620
       +
               "((:id \"%s\" :summary \"%s\" :start %s :end %s :location %s \

     

       578
       621
        
                :description %s :calendar %s))"

     

       579
       579
       -
               (String.escaped id) (String.escaped summary) start_date start_time

     

       580
       580
       -
               end_str location description calendar

     

       622
       622
       +
               (String.escaped id) (String.escaped summary) start_str end_str location

     

       623
       623
       +
               description calendar

     

       624
       624
       +
       

     

       625
       625
       +
       let format_events_with_dynamic_columns ?tz events =

     

       626
       626
       +
         if events = [] then ""

     

       627
       627
       +
         else

     

       628
       628
       +
           let event_data = List.map (text_event_data ?tz) events in

     

       629
       629
       +
           (* Calculate max width for each column *)

     

       630
       630
       +
           let max_id_width =

     

       631
       631
       +
             List.fold_left

     

       632
       632
       +
               (fun acc (id, _, _, _, _) -> max acc (String.length id))

     

       633
       633
       +
               0 event_data

     

       634
       634
       +
           in

     

       635
       635
       +
           let max_cal_width =

     

       636
       636
       +
             List.fold_left

     

       637
       637
       +
               (fun acc (_, cal, _, _, _) -> max acc (String.length cal))

     

       638
       638
       +
               0 event_data

     

       639
       639
       +
           in

     

       640
       640
       +
           let max_date_width =

     

       641
       641
       +
             List.fold_left

     

       642
       642
       +
               (fun acc (_, _, date, _, _) -> max acc (String.length date))

     

       643
       643
       +
               0 event_data

     

       644
       644
       +
           in

     

       645
       645
       +
           (* Calculate max width for summary+location *)

     

       646
       646
       +
           let max_summary_loc_width =

     

       647
       647
       +
             List.fold_left

     

       648
       648
       +
               (fun acc (_, _, _, summary, location) ->

     

       649
       649
       +
                 let full_length =

     

       650
       650
       +
                   String.length summary

     

       651
       651
       +
                   + if location <> "" then String.length location + 1 else 0

     

       652
       652
       +
                 in

     

       653
       653
       +
                 max acc full_length)

     

       654
       654
       +
               0 event_data

     

       655
       655
       +
           in

     

       656
       656
       +
           (* Format each event with calculated widths *)

     

       657
       657
       +
           let formatted_events =

     

       658
       658
       +
             List.map

     

       659
       659
       +
               (fun (id, cal, date, summary, location) ->

     

       660
       660
       +
                 let summary_loc =

     

       661
       661
       +
                   summary ^ if location <> "" then " " ^ location else ""

     

       662
       662
       +
                 in

     

       663
       663
       +
                 Printf.sprintf "%-*s  %-*s  %-*s  %-*s" max_cal_width cal

     

       664
       664
       +
                   max_date_width date max_summary_loc_width summary_loc max_id_width

     

       665
       665
       +
                   id)

     

       666
       666
       +
               event_data

     

       667
       667
       +
           in

     

       668
       668
       +
           String.concat "\n" formatted_events

     

       581
       669
        
       

     

       582
       670
        
       let format_events ?(format = `Text) ?tz events =

     

       583
       671
        
         match format with

     
···

       596
       684
        
             ^ String.concat "\n "

     

       597
       685
        
                 (List.map (fun e -> format_event ~format:`Sexp ?tz e) events)

     

       598
       686
        
             ^ ")"

     

       687
       687
       +
         | `Text -> format_events_with_dynamic_columns ?tz events

     

       599
       688
        
         | _ ->

     

       600
       689
        
             String.concat "\n" (List.map (fun e -> format_event ~format ?tz e) events)

     

       601
       690
        
       

     
···

       652
       741
        
               recur_events ~recurrence_ids:other_events ical_event

     

       653
       742
        
             in

     

       654
       743
        
             collect generator []

     

       744
       744
       +
       

     

       745
       745
       +
       let sexp_of_t event =

     

       746
       746
       +
         let open Sexplib.Sexp in

     

       747
       747
       +
         let start = get_start event in

     

       748
       748
       +
         let end_ = get_end event in

     

       749
       749
       +
         let format_ptime_iso p =

     

       750
       750
       +
           let dt = Date.ptime_to_timedesc p in

     

       751
       751
       +
           let y = Timedesc.year dt in

     

       752
       752
       +
           let m = Timedesc.month dt in

     

       753
       753
       +
           let d = Timedesc.day dt in

     

       754
       754
       +
           let h = Timedesc.hour dt in

     

       755
       755
       +
           let min = Timedesc.minute dt in

     

       756
       756
       +
           let s = Timedesc.second dt in

     

       757
       757
       +
           Printf.sprintf "%04d-%02d-%02dT%02d:%02d:%02d" y m d h min s

     

       758
       758
       +
         in

     

       759
       759
       +
         let entries =

     

       760
       760
       +
           [

     

       761
       761
       +
             Some (List [ Atom "id"; Atom (get_id event) ]);

     

       762
       762
       +
             (match get_summary event with

     

       763
       763
       +
             | Some s -> Some (List [ Atom "summary"; Atom s ])

     

       764
       764
       +
             | None -> None);

     

       765
       765
       +
             Some (List [ Atom "start"; Atom (format_ptime_iso start) ]);

     

       766
       766
       +
             (match end_ with

     

       767
       767
       +
             | Some e -> Some (List [ Atom "end"; Atom (format_ptime_iso e) ])

     

       768
       768
       +
             | None -> None);

     

       769
       769
       +
             (match get_location event with

     

       770
       770
       +
             | Some l -> Some (List [ Atom "location"; Atom l ])

     

       771
       771
       +
             | None -> None);

     

       772
       772
       +
             (match get_description event with

     

       773
       773
       +
             | Some d -> Some (List [ Atom "description"; Atom d ])

     

       774
       774
       +
             | None -> None);

     

       775
       775
       +
             Some (List [ Atom "file"; Atom (snd (get_file event)) ]);

     

       776
       776
       +
             Some (List [ Atom "calendar"; Atom (get_calendar_name event) ]);

     

       777
       777
       +
           ]

     

       778
       778
       +
         in

     

       779
       779
       +
         let filtered_entries = List.filter_map Fun.id entries in

     

       780
       780
       +
         List filtered_entries

     

       781
       781
       +
       

     

       782
       782
       +
       type filter = t -> bool

     

       783
       783
       +
       

     

       784
       784
       +
       let text_matches pattern text =

     

       785
       785
       +
         let re = Re.Pcre.regexp ~flags:[ `CASELESS ] (Re.Pcre.quote pattern) in

     

       786
       786
       +
         Re.Pcre.pmatch ~rex:re text

     

       787
       787
       +
       

     

       788
       788
       +
       let summary_contains text event =

     

       789
       789
       +
         match get_summary event with

     

       790
       790
       +
         | Some summary -> text_matches text summary

     

       791
       791
       +
         | None -> false

     

       792
       792
       +
       

     

       793
       793
       +
       let description_contains text event =

     

       794
       794
       +
         match get_description event with

     

       795
       795
       +
         | Some desc -> text_matches text desc

     

       796
       796
       +
         | None -> false

     

       797
       797
       +
       

     

       798
       798
       +
       let location_contains text event =

     

       799
       799
       +
         match get_location event with

     

       800
       800
       +
         | Some loc -> text_matches text loc

     

       801
       801
       +
         | None -> false

     

       802
       802
       +
       

     

       803
       803
       +
       let in_calendars ids event =

     

       804
       804
       +
         let id = get_calendar_name event in

     

       805
       805
       +
         List.exists (fun col -> col = id) ids

     

       806
       806
       +
       

     

       807
       807
       +
       let recurring_only () event = get_recurrence event <> None

     

       808
       808
       +
       let non_recurring_only () event = get_recurrence event = None

     

       809
       809
       +
       let with_id id event = get_id event = id

     

       810
       810
       +
       let and_filter filters event = List.for_all (fun filter -> filter event) filters

     

       811
       811
       +
       let or_filter filters event = List.exists (fun filter -> filter event) filters

     

       812
       812
       +
       let not_filter filter event = not (filter event)

     

       813
       813
       +
       let matches_filter event filter = filter event

     

       814
       814
       +
       

     

       815
       815
       +
       let take n list =

     

       816
       816
       +
         let rec aux n lst acc =

     

       817
       817
       +
           match (lst, n) with

     

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

     

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

     

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

     

       821
       821
       +
         in

     

       822
       822
       +
         aux n list []

     

       823
       823
       +
       

     

       824
       824
       +
       let query_without_recurrence events ?filter ?(comparator = by_start) ?limit () =

     

       825
       825
       +
         let events =

     

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

     

       827
       827
       +
         in

     

       828
       828
       +
         let events = List.sort comparator events in

     

       829
       829
       +
         match limit with Some n when n > 0 -> take n events | _ -> events

     

       830
       830
       +
       

     

       831
       831
       +
       let query events ?filter ~from ~to_ ?comparator ?limit () =

     

       832
       832
       +
         let events =

     

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

     

       834
       834
       +
         in

     

       835
       835
       +
         let events =

     

       836
       836
       +
           List.concat_map (fun event -> expand_recurrences event ~from ~to_) events

     

       837
       837
       +
         in

     

       838
       838
       +
         let events =

     

       839
       839
       +
           match comparator with None -> events | Some c -> List.sort c events

     

       840
       840
       +
         in

     

       841
       841
       +
         match limit with Some n when n > 0 -> take n events | _ -> events

+59 -12

lib/event.mli

···

       8
       8
        
       

     

       9
       9
        
       type date_error = [ `Msg of string ]

     

       10
       10
        
       

     

       11
       11
       +
       (** {2 Events} *)

     

       12
       12
       +
       

     

       11
       13
        
       val create :

     

       12
       14
        
         fs:Eio.Fs.dir_ty Eio.Path.t ->

     

       13
       15
        
         calendar_dir_path:string ->

     

       14
       16
        
         summary:string ->

     

       15
       15
       -
         start:Icalendar.date_or_datetime ->

     

       17
       17
       +
         start:Icalendar.params * Icalendar.date_or_datetime ->

     

       16
       18
        
         ?end_:

     

       17
       19
        
           [ `Duration of Icalendar.params * Ptime.Span.t

     

       18
       20
        
           | `Dtend of Icalendar.params * Icalendar.date_or_datetime ] ->

     

       19
       21
        
         ?location:string ->

     

       20
       22
        
         ?description:string ->

     

       21
       23
        
         ?recurrence:Icalendar.recurrence ->

     

       22
       22
       -
         Collection.t ->

     

       23
       23
       -
         t

     

       24
       24
       +
         string ->

     

       25
       25
       +
         (t, [> `Msg of string ]) result

     

       24
       26
        
       (** Create a new event with required properties.

     

       25
       27
        
       

     

       26
       28
        
           The start and end times can be specified as Icalendar.timestamp values,

     
···

       31
       33
        
       

     

       32
       34
        
       val edit :

     

       33
       35
        
         ?summary:string ->

     

       34
       34
       -
         ?start:Icalendar.date_or_datetime ->

     

       36
       36
       +
         ?start:Icalendar.params * Icalendar.date_or_datetime ->

     

       35
       37
        
         ?end_:

     

       36
       38
        
           [ `Duration of Icalendar.params * Ptime.Span.t

     

       37
       39
        
           | `Dtend of Icalendar.params * Icalendar.date_or_datetime ] ->

     
···

       39
       41
        
         ?description:string ->

     

       40
       42
        
         ?recurrence:Icalendar.recurrence ->

     

       41
       43
        
         t ->

     

       42
       42
       -
         t

     

       44
       44
       +
         (t, [> `Msg of string ]) result

     

       43
       45
        
       (** Edit an existing event. *)

     

       44
       46
        
       

     

       45
       47
        
       val events_of_icalendar :

     

       46
       46
       -
         Collection.t -> file:Eio.Fs.dir_ty Eio.Path.t -> Icalendar.calendar -> t list

     

       48
       48
       +
         string -> file:Eio.Fs.dir_ty Eio.Path.t -> Icalendar.calendar -> t list

     

       47
       49
        
       

     

       48
       50
        
       val to_ical_event : t -> Icalendar.event

     

       49
       51
        
       val to_ical_calendar : t -> Icalendar.calendar

     
···

       70
       72
        
       val get_location : t -> string option

     

       71
       73
        
       val get_description : t -> string option

     

       72
       74
        
       val get_recurrence : t -> Icalendar.recurrence option

     

       73
       73
       -
       val get_collection : t -> Collection.t

     

       75
       75
       +
       val get_calendar_name : t -> string

     

       74
       76
        
       val get_file : t -> Eio.Fs.dir_ty Eio.Path.t

     

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

     

       78
       78
       +
       

     

       79
       79
       +
       (** {2 Comparators} *)

     

       75
       80
        
       

     

       76
       81
        
       type comparator = t -> t -> int

     

       77
       82
        
       (** Event comparator function type *)

     
···

       91
       96
        
       (** Compare events by location alphabetically. Events with locations come before

     

       92
       97
        
           those without *)

     

       93
       98
        
       

     

       94
       94
       -
       val by_collection : comparator

     

       95
       95
       -
       (** Compare events by collection name alphabetically *)

     

       99
       99
       +
       val by_calendar_name : comparator

     

       100
       100
       +
       (** Compare events by calendar_name name alphabetically *)

     

       96
       101
        
       

     

       97
       102
        
       val descending : comparator -> comparator

     

       98
       103
        
       (** Reverse the order of a comparator *)

     
···

       101
       106
        
       (** Chain two comparators together, using the second one as a tiebreaker when

     

       102
       107
        
           the first one returns equality (0) *)

     

       103
       108
        
       

     

       104
       104
       -
       (** Functions for formatting various data structures as strings *)

     

       109
       109
       +
       (** 2 Formatting *)

     

       105
       110
        
       

     

       106
       111
        
       type format = [ `Text | `Entries | `Json | `Csv | `Ics | `Sexp ]

     

       107
       112
        
       (** Format type for output *)

     

       108
       113
        
       

     

       109
       109
       -
       (** Functions for formatting specific event types *)

     

       110
       114
        
       val format_event : ?format:format -> ?tz:Timedesc.Time_zone.t -> t -> string

     

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

     

       112
       116
        
       

     
···

       114
       118
        
         ?format:format -> ?tz:Timedesc.Time_zone.t -> t list -> string

     

       115
       119
        
       (** Format a list of events, optionally using the specified timezone *)

     

       116
       120
        
       

     

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

     

       121
       121
       +
       val sexp_of_t : t -> Sexplib0.Sexp.t

     

       122
       122
       +
       

     

       123
       123
       +
       (** 3 Queries *)

     

       124
       124
       +
       

     

       125
       125
       +
       (** Filter-based searching and querying of calendar events *)

     

       126
       126
       +
       

     

       127
       127
       +
       type filter = t -> bool

     

       128
       128
       +
       

     

       129
       129
       +
       val summary_contains : string -> filter

     

       130
       130
       +
       val description_contains : string -> filter

     

       131
       131
       +
       val location_contains : string -> filter

     

       132
       132
       +
       val in_calendars : string list -> filter

     

       133
       133
       +
       val recurring_only : unit -> filter

     

       134
       134
       +
       val non_recurring_only : unit -> filter

     

       135
       135
       +
       val with_id : event_id -> filter

     

       136
       136
       +
       val and_filter : filter list -> filter

     

       137
       137
       +
       val or_filter : filter list -> filter

     

       138
       138
       +
       val not_filter : filter -> filter

     

       139
       139
       +
       

     

       140
       140
       +
       val query_without_recurrence :

     

       141
       141
       +
         t list ->

     

       142
       142
       +
         ?filter:filter ->

     

       143
       143
       +
         ?comparator:comparator ->

     

       144
       144
       +
         ?limit:int ->

     

       145
       145
       +
         unit ->

     

       146
       146
       +
         t list

     

       147
       147
       +
       (** Find events without expansion of recurring events. Returns Ok with the list

     

       148
       148
       +
           of events, or Error with a message. *)

     

       149
       149
       +
       

     

       150
       150
       +
       val query :

     

       151
       151
       +
         t list ->

     

       152
       152
       +
         ?filter:filter ->

     

       153
       153
       +
         from:Ptime.t option ->

     

       154
       154
       +
         to_:Ptime.t ->

     

       155
       155
       +
         ?comparator:comparator ->

     

       156
       156
       +
         ?limit:int ->

     

       157
       157
       +
         unit ->

     

       158
       158
       +
         t list

     

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

     

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

     

       161
       161
       +
       

     

       162
       162
       +
       (* Test-only helper functions *)

     

       163
       163
       +
       val matches_filter : t -> filter -> bool

     

       164
       164
       +
       (** Check if an event matches the given filter *)

-70

lib/query.ml

···

       1
       1
       -
       type filter = Event.t -> bool

     

       2
       2
       -
       

     

       3
       3
       -
       let text_matches pattern text =

     

       4
       4
       -
         let re = Re.Pcre.regexp ~flags:[ `CASELESS ] (Re.Pcre.quote pattern) in

     

       5
       5
       -
         Re.Pcre.pmatch ~rex:re text

     

       6
       6
       -
       

     

       7
       7
       -
       let summary_contains text event =

     

       8
       8
       -
         match Event.get_summary event with

     

       9
       9
       -
         | Some summary -> text_matches text summary

     

       10
       10
       -
         | None -> false

     

       11
       11
       -
       

     

       12
       12
       -
       let description_contains text event =

     

       13
       13
       -
         match Event.get_description event with

     

       14
       14
       -
         | Some desc -> text_matches text desc

     

       15
       15
       -
         | None -> false

     

       16
       16
       -
       

     

       17
       17
       -
       let location_contains text event =

     

       18
       18
       -
         match Event.get_location event with

     

       19
       19
       -
         | Some loc -> text_matches text loc

     

       20
       20
       -
         | None -> false

     

       21
       21
       -
       

     

       22
       22
       -
       let in_collections ids event =

     

       23
       23
       -
         let id = Event.get_collection event in

     

       24
       24
       -
         List.exists (fun col -> col = id) ids

     

       25
       25
       -
       

     

       26
       26
       -
       let recurring_only () event = Event.get_recurrence event <> None

     

       27
       27
       -
       let non_recurring_only () event = Event.get_recurrence event = None

     

       28
       28
       -
       let with_id id event = Event.get_id event = id

     

       29
       29
       -
       let and_filter filters event = List.for_all (fun filter -> filter event) filters

     

       30
       30
       -
       let or_filter filters event = List.exists (fun filter -> filter event) filters

     

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

     

       32
       32
       -
       let matches_filter event filter = filter event

     

       33
       33
       -
       

     

       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

     

       48
       48
       -
         let filtered_events =

     

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

     

       50
       50
       -
         in

     

       51
       51
       -
         let sorted_events = List.sort comparator filtered_events in

     

       52
       52
       -
         Ok

     

       53
       53
       -
           (match limit with

     

       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_ ?(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)

-42

lib/query.mli

···

       1
       1
       -
       (** Filter-based searching and querying of calendar events *)

     

       2
       2
       -
       

     

       3
       3
       -
       type filter = Event.t -> bool

     

       4
       4
       -
       

     

       5
       5
       -
       val summary_contains : string -> filter

     

       6
       6
       -
       val description_contains : string -> filter

     

       7
       7
       -
       val location_contains : string -> filter

     

       8
       8
       -
       val in_collections : Collection.t list -> filter

     

       9
       9
       -
       val recurring_only : unit -> filter

     

       10
       10
       -
       val non_recurring_only : unit -> filter

     

       11
       11
       -
       val with_id : Event.event_id -> filter

     

       12
       12
       -
       val and_filter : filter list -> filter

     

       13
       13
       -
       val or_filter : filter list -> filter

     

       14
       14
       -
       val not_filter : filter -> filter

     

       15
       15
       -
       

     

       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 ->

     

       20
       20
       -
         ?comparator:Event.comparator ->

     

       21
       21
       -
         ?limit:int ->

     

       22
       22
       -
         unit ->

     

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

     

       24
       24
       -
       (** Find events without expansion of recurring events. Returns Ok with the list

     

       25
       25
       -
           of events, or Error with a message. *)

     

       26
       26
       -
       

     

       27
       27
       -
       val query :

     

       28
       28
       -
         fs:Eio.Fs.dir_ty Eio.Path.t ->

     

       29
       29
       -
         Calendar_dir.t ->

     

       30
       30
       -
         ?filter:filter ->

     

       31
       31
       -
         from:Ptime.t option ->

     

       32
       32
       -
         to_:Ptime.t ->

     

       33
       33
       -
         ?comparator:Event.comparator ->

     

       34
       34
       -
         ?limit:int ->

     

       35
       35
       -
         unit ->

     

       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
       -
           events, or Error with a message. *)

     

       39
       39
       -
       

     

       40
       40
       -
       (* Test-only helper functions *)

     

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

     

       42
       42
       -
       (** Check if an event matches the given filter *)

+120

lib/sexp.ml

···

       1
       1
       +
       open Sexplib.Std

     

       2
       2
       +
       

     

       3
       3
       +
       type search_field = Summary | Description | Location [@@deriving sexp]

     

       4
       4
       +
       

     

       5
       5
       +
       type query_request = {

     

       6
       6
       +
         from : string option; [@sexp.option]

     

       7
       7
       +
         to_ : string; (* Required field, not optional *)

     

       8
       8
       +
         timezone : string option; [@sexp.option]

     

       9
       9
       +
         calendars : string list; [@default []]

     

       10
       10
       +
         text : string option; [@sexp.option]

     

       11
       11
       +
         search_in : search_field list; [@default []]

     

       12
       12
       +
         id : string option; [@sexp.option]

     

       13
       13
       +
         recurring : bool option; [@sexp.option]

     

       14
       14
       +
         limit : int option; [@sexp.option]

     

       15
       15
       +
       }

     

       16
       16
       +
       [@@deriving sexp]

     

       17
       17
       +
       

     

       18
       18
       +
       (* workaround https://github.com/janestreet/ppx_sexp_conv/issues/18#issuecomment-2792574295 *)

     

       19
       19
       +
       let query_request_of_sexp sexp =

     

       20
       20
       +
         let open Sexplib.Sexp in

     

       21
       21
       +
         let sexp = match sexp with

     

       22
       22
       +
           | List ss ->

     

       23
       23
       +
             List (List.map (function List (Atom "to" :: v) -> List (Atom "to_" :: v) | v -> v) ss)

     

       24
       24
       +
           | v -> v

     

       25
       25
       +
         in

     

       26
       26
       +
         query_request_of_sexp sexp

     

       27
       27
       +
       

     

       28
       28
       +
       let sexp_of_query_request q =

     

       29
       29
       +
         let open Sexplib.Sexp in

     

       30
       30
       +
         let sexp = sexp_of_query_request q in

     

       31
       31
       +
         let sexp = match sexp with

     

       32
       32
       +
           | List ss ->

     

       33
       33
       +
             List (List.map (function List (Atom "to_" :: v) -> List (Atom "to" :: v) | v -> v) ss)

     

       34
       34
       +
           | v -> v

     

       35
       35
       +
         in

     

       36
       36
       +
         sexp

     

       37
       37
       +
       

     

       38
       38
       +
       type request = ListCalendars | Query of query_request | Refresh [@@deriving sexp]

     

       39
       39
       +
       

     

       40
       40
       +
       type response_payload = Calendars of string list | Events of Event.t list | Empty

     

       41
       41
       +
       [@@deriving sexp_of]

     

       42
       42
       +
       

     

       43
       43
       +
       type response = Ok of response_payload | Error of string [@@deriving sexp_of]

     

       44
       44
       +
       

     

       45
       45
       +
       let filter_func_of_search_field text = function

     

       46
       46
       +
         | Summary -> Event.summary_contains text

     

       47
       47
       +
         | Description -> Event.description_contains text

     

       48
       48
       +
         | Location -> Event.location_contains text

     

       49
       49
       +
       

     

       50
       50
       +
       let parse_timezone ~timezone =

     

       51
       51
       +
         match timezone with

     

       52
       52
       +
         | Some tzid -> (

     

       53
       53
       +
             match Timedesc.Time_zone.make tzid with

     

       54
       54
       +
             | Some tz -> tz

     

       55
       55
       +
             | None -> failwith ("Invalid timezone: " ^ tzid))

     

       56
       56
       +
         | None -> !Date.default_timezone ()

     

       57
       57
       +
       

     

       58
       58
       +
       let generate_query_params (req : query_request) =

     

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

     

       60
       60
       +
         let tz = parse_timezone ~timezone:req.timezone in

     

       61
       61
       +
         let* from =

     

       62
       62
       +
           match req.from with

     

       63
       63
       +
           | None -> Ok None

     

       64
       64
       +
           | Some s -> Result.map Option.some (Date.parse_date ~tz s `From)

     

       65
       65
       +
         in

     

       66
       66
       +
         let* to_ =

     

       67
       67
       +
           let* to_date = Date.parse_date ~tz req.to_ `To in

     

       68
       68
       +
           Ok (Date.to_end_of_day to_date)

     

       69
       69
       +
         in

     

       70
       70
       +
         let filters = ref [] in

     

       71
       71
       +
         (match req.calendars with

     

       72
       72
       +
         | [] -> ()

     

       73
       73
       +
         | cals -> filters := Event.in_calendars cals :: !filters);

     

       74
       74
       +
         (match req.text with

     

       75
       75
       +
         | Some text ->

     

       76
       76
       +
             let search_fields =

     

       77
       77
       +
               match req.search_in with

     

       78
       78
       +
               | [] -> [ Summary; Description; Location ]

     

       79
       79
       +
               | fields -> fields

     

       80
       80
       +
             in

     

       81
       81
       +
             let text_filters =

     

       82
       82
       +
               List.map (filter_func_of_search_field text) search_fields

     

       83
       83
       +
             in

     

       84
       84
       +
             filters := Event.or_filter text_filters :: !filters

     

       85
       85
       +
         | None -> ());

     

       86
       86
       +
         (match req.id with

     

       87
       87
       +
         | Some id -> filters := Event.with_id id :: !filters

     

       88
       88
       +
         | None -> ());

     

       89
       89
       +
         (match req.recurring with

     

       90
       90
       +
         | Some true -> filters := Event.recurring_only () :: !filters

     

       91
       91
       +
         | Some false -> filters := Event.non_recurring_only () :: !filters

     

       92
       92
       +
         | _ -> ());

     

       93
       93
       +
         let final_filter = Event.and_filter !filters in

     

       94
       94
       +
         let limit = req.limit in

     

       95
       95
       +
         Ok (final_filter, from, to_, limit, tz)

     

       96
       96
       +
       

     

       97
       97
       +
       let is_whitespace = function ' ' | '\t' | '\n' | '\r' -> true | _ -> false

     

       98
       98
       +
       

     

       99
       99
       +
       let needs_quotes s =

     

       100
       100
       +
         String.exists

     

       101
       101
       +
           (fun c -> is_whitespace c || c = '(' || c = ')' || c = '"' || c = '\'')

     

       102
       102
       +
           s

     

       103
       103
       +
       

     

       104
       104
       +
       let escape s =

     

       105
       105
       +
         let buf = Buffer.create (String.length s) in

     

       106
       106
       +
         String.iter

     

       107
       107
       +
           (function

     

       108
       108
       +
             | '"' -> Buffer.add_string buf "\\\""

     

       109
       109
       +
             | '\\' -> Buffer.add_string buf "\\\\"

     

       110
       110
       +
             | '\n' -> Buffer.add_string buf "\\n"

     

       111
       111
       +
             | '\r' -> Buffer.add_string buf "\\r"

     

       112
       112
       +
             | '\t' -> Buffer.add_string buf "\\t"

     

       113
       113
       +
             | c -> Buffer.add_char buf c)

     

       114
       114
       +
           s;

     

       115
       115
       +
         "\"" ^ Buffer.contents buf ^ "\""

     

       116
       116
       +
       

     

       117
       117
       +
       let rec to_string = function

     

       118
       118
       +
         | Sexplib.Sexp.Atom str -> if needs_quotes str then escape str else str

     

       119
       119
       +
         | Sexplib.Sexp.List lst ->

     

       120
       120
       +
             "(" ^ String.concat " " (List.map to_string lst) ^ ")"

+1 -1

test/dune

···

       1
       1
        
       (tests

     

       2
       2
       -
        (names test_calendar_dir test_query)

     

       2
       2
       +
        (names test_calendar_dir test_date test_event)

     

       3
       3
        
        (libraries caledonia_lib alcotest str ptime)

     

       4
       4
        
        (deps

     

       5
       5
        
         (source_tree calendar)))

+17 -18

test/test_calendar_dir.ml

···

       4
       4
        
       

     

       5
       5
        
       let calendar_dir_path = Filename.concat (Sys.getcwd ()) "calendar"

     

       6
       6
        
       

     

       7
       7
       -
       let test_list_collections ~fs () =

     

       7
       7
       +
       let test_list_calendar_names ~fs () =

     

       8
       8
        
         let calendar_dir =

     

       9
       9
        
           match Calendar_dir.create ~fs calendar_dir_path with

     

       10
       10
        
           | Ok dir -> dir

     

       11
       11
        
           | Error (`Msg msg) ->

     

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

     

       13
       13
        
         in

     

       14
       14
       -
         match Calendar_dir.list_collections ~fs calendar_dir with

     

       15
       15
       -
         | Error (`Msg msg) -> Alcotest.fail ("List collections failed: " ^ msg)

     

       16
       16
       -
         | Ok collections ->

     

       14
       14
       +
         match Calendar_dir.list_calendar_names ~fs calendar_dir with

     

       15
       15
       +
         | Error (`Msg msg) -> Alcotest.fail ("List calendar_names failed: " ^ msg)

     

       16
       16
       +
         | Ok calendar_names ->

     

       17
       17
        
             Alcotest.(check int)

     

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

     

       18
       18
       +
               "Should find two calendar_names" 2

     

       19
       19
       +
               (List.length calendar_names);

     

       19
       20
        
             Alcotest.(check bool)

     

       20
       21
        
               "example should be in the list" true

     

       21
       21
       -
               (List.exists (fun c -> c = Collection.Col "example") collections);

     

       22
       22
       +
               (List.exists (fun c -> c = "example") calendar_names);

     

       22
       23
        
             Alcotest.(check bool)

     

       23
       24
        
               "recurrence should be in the list" true

     

       24
       24
       -
               (List.exists (fun c -> c = Collection.Col "recurrence") collections);

     

       25
       25
       +
               (List.exists (fun c -> c = "recurrence") calendar_names);

     

       25
       26
        
             ()

     

       26
       27
        
       

     

       27
       27
       -
       let test_get_collection ~fs () =

     

       28
       28
       +
       let test_get_calendar_events ~fs () =

     

       28
       29
        
         let calendar_dir =

     

       29
       30
        
           match Calendar_dir.create ~fs calendar_dir_path with

     

       30
       31
        
           | Ok dir -> dir

     

       31
       32
        
           | Error (`Msg msg) ->

     

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

     

       33
       34
        
         in

     

       34
       34
       -
         let result =

     

       35
       35
       -
           Calendar_dir.get_collection ~fs calendar_dir (Collection.Col "example")

     

       36
       36
       -
         in

     

       35
       35
       +
         let result = Calendar_dir.get_calendar_events ~fs calendar_dir "example" in

     

       37
       36
        
         match result with

     

       38
       38
       -
         | Ok _ -> Alcotest.(check pass) "Should find example collection" () ()

     

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

     

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

     

       37
       37
       +
         | Ok _ -> Alcotest.(check pass) "Should find example calendar_name" () ()

     

       38
       38
       +
         | Error `Not_found -> Alcotest.fail "Failed to find example calendar_name"

     

       39
       39
       +
         | Error (`Msg msg) -> Alcotest.fail ("Error getting calendar_name: " ^ msg)

     

       41
       40
        
       

     

       42
       41
        
       let test_get_events ~fs () =

     

       43
       42
        
         let calendar_dir =

     
···

       52
       51
        
             ()

     

       53
       52
        
         | Error e ->

     

       54
       53
        
             let msg = match e with `Msg m -> m in

     

       55
       55
       -
             Alcotest.fail ("Error getting collections: " ^ msg)

     

       54
       54
       +
             Alcotest.fail ("Error getting calendar_names: " ^ msg)

     

       56
       55
        
       

     

       57
       56
        
       let calendar_tests fs =

     

       58
       57
        
         [

     

       59
       59
       -
           ("list collections", `Quick, test_list_collections ~fs);

     

       60
       60
       -
           ("get collection", `Quick, test_get_collection ~fs);

     

       61
       61
       -
           ("get all collections", `Quick, test_get_events ~fs);

     

       58
       58
       +
           ("list calendar_names", `Quick, test_list_calendar_names ~fs);

     

       59
       59
       +
           ("get calendar_name", `Quick, test_get_calendar_events ~fs);

     

       60
       60
       +
           ("get all calendar_names", `Quick, test_get_events ~fs);

     

       62
       61
        
         ]

     

       63
       62
        
       

     

       64
       63
        
       let () =

+13 -7

test/test_date.ml

···

       1
       1
        
       (* Test the Date module *)

     

       2
       2
        
       

     

       3
       3
       +
       open Caledonia_lib

     

       4
       4
       +
       

     

       3
       5
        
       (* Setup a fixed date for testing *)

     

       4
       6
        
       let fixed_date = Option.get @@ Ptime.of_date_time ((2025, 3, 27), ((0, 0, 0), 0))

     

       5
       7
        
       

     

       6
       8
        
       let setup_fixed_date () =

     

       7
       7
       -
         (Date.get_today := fun () -> fixed_date);

     

       9
       9
       +
         (Date.get_today := fun ?tz:_ () -> fixed_date);

     

       8
       10
        
         fixed_date

     

       9
       11
        
       

     

       10
       12
        
       let test_parse_date () =

     

       11
       13
        
         let test_expr expr parameter expected =

     

       12
       14
        
           try

     

       13
       13
       -
             let result = Query.parse_date expr parameter in

     

       15
       15
       +
             let result = Result.get_ok @@ Date.parse_date expr parameter in

     

       14
       16
        
             let result_str =

     

       15
       17
        
               let y, m, d = Ptime.to_date result in

     

       16
       18
        
               Printf.sprintf "%04d-%02d-%02d" y m d

     
···

       47
       49
        
         test_expr "+1m" `To "2025-04-30";

     

       48
       50
        
         test_expr "2025-01-01" `From "2025-01-01";

     

       49
       51
        
         test_expr "2025-01-01" `To "2025-01-01";

     

       52
       52
       +
         test_expr "2025-01" `From "2025-01-01";

     

       53
       53
       +
         test_expr "2025-01" `To "2025-01-01";

     

       54
       54
       +
         test_expr "2025" `From "2025-01-01";

     

       55
       55
       +
         test_expr "2025" `To "2025-01-01";

     

       56
       56
       +
         test_expr "2025-3-1" `From "2025-03-01";

     

       57
       57
       +
         test_expr "2025-3-1" `To "2025-03-01";

     

       50
       58
        
         (try

     

       51
       51
       -
            let _ = Query.parse_date "invalid-format" `From in

     

       59
       59
       +
            let _ = Result.get_ok @@ Date.parse_date "invalid-format" `From in

     

       52
       60
        
            Alcotest.fail "Should have raised an exception for invalid format"

     

       53
       61
        
          with Failure msg ->

     

       54
       62
        
            Alcotest.(check bool)

     
···

       56
       64
        
              (String.length msg > 0));

     

       57
       65
        
         ()

     

       58
       66
        
       

     

       59
       59
       -
       let date_tests fs = [ ("date expression parsing", `Quick, test_parse_date) ]

     

       67
       67
       +
       let date_tests = [ ("date expression parsing", `Quick, test_parse_date) ]

     

       60
       68
        
       

     

       61
       69
        
       let () =

     

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

     

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

     

       64
       70
        
         let _ = setup_fixed_date () in

     

       65
       65
       -
         Alcotest.run "Query Tests" [ ("query", date_tests fs) ]

     

       71
       71
       +
         Alcotest.run "Query Tests" [ ("query", date_tests) ]

+322

test/test_event.ml

···

       1
       1
       +
       (* Test the Query module *)

     

       2
       2
       +
       

     

       3
       3
       +
       open Caledonia_lib

     

       4
       4
       +
       

     

       5
       5
       +
       (* Setup a fixed date for testing *)

     

       6
       6
       +
       let fixed_date = Option.get @@ Ptime.of_date_time ((2025, 3, 27), ((0, 0, 0), 0))

     

       7
       7
       +
       

     

       8
       8
       +
       let setup_fixed_date () =

     

       9
       9
       +
         (Date.get_today := fun ?tz:_ () -> fixed_date);

     

       10
       10
       +
         fixed_date

     

       11
       11
       +
       

     

       12
       12
       +
       let calendar_dir_path = Filename.concat (Sys.getcwd ()) "calendar"

     

       13
       13
       +
       

     

       14
       14
       +
       let test_query_all ~fs () =

     

       15
       15
       +
         let calendar_dir =

     

       16
       16
       +
           Result.get_ok @@ Calendar_dir.create ~fs calendar_dir_path

     

       17
       17
       +
         in

     

       18
       18
       +
         let from =

     

       19
       19
       +
           Some (Option.get @@ Ptime.of_date_time ((2025, 01, 01), ((0, 0, 0), 0)))

     

       20
       20
       +
         in

     

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

     

       22
       22
       +
         let events = Result.get_ok @@ Calendar_dir.get_events ~fs calendar_dir in

     

       23
       23
       +
         let events = Event.query events ~from ~to_ () in

     

       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 event -> Option.get @@ Event.get_summary event = "Test Event")

     

       28
       28
       +
             events

     

       29
       29
       +
         in

     

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

     

       31
       31
       +
       

     

       32
       32
       +
       let test_recurrence_expansion ~fs () =

     

       33
       33
       +
         let calendar_dir =

     

       34
       34
       +
           Result.get_ok @@ Calendar_dir.create ~fs calendar_dir_path

     

       35
       35
       +
         in

     

       36
       36
       +
         let from =

     

       37
       37
       +
           Some (Option.get @@ Ptime.of_date_time ((2025, 3, 1), ((0, 0, 0), 0)))

     

       38
       38
       +
         in

     

       39
       39
       +
         let to_ =

     

       40
       40
       +
           Option.get @@ Ptime.of_date_time ((2025, 5, 31), ((23, 59, 59), 0))

     

       41
       41
       +
         in

     

       42
       42
       +
         let events = Result.get_ok @@ Calendar_dir.get_events ~fs calendar_dir in

     

       43
       43
       +
         let events = Event.query events ~from ~to_ () in

     

       44
       44
       +
         let recurring_events =

     

       45
       45
       +
           List.filter

     

       46
       46
       +
             (fun event -> Option.get @@ Event.get_summary event = "Recurring Event")

     

       47
       47
       +
             events

     

       48
       48
       +
         in

     

       49
       49
       +
         Alcotest.(check bool)

     

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

     

       51
       51
       +
           (List.length recurring_events > 1)

     

       52
       52
       +
       

     

       53
       53
       +
       let test_text_search ~fs () =

     

       54
       54
       +
         let calendar_dir =

     

       55
       55
       +
           Result.get_ok @@ Calendar_dir.create ~fs calendar_dir_path

     

       56
       56
       +
         in

     

       57
       57
       +
         let filter = Event.summary_contains "Test" in

     

       58
       58
       +
         let from =

     

       59
       59
       +
           Some (Option.get @@ Ptime.of_date_time ((2025, 01, 01), ((0, 0, 0), 0)))

     

       60
       60
       +
         in

     

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

     

       62
       62
       +
         let events = Result.get_ok @@ Calendar_dir.get_events ~fs calendar_dir in

     

       63
       63
       +
         (let events = Event.query events ~from ~to_ ~filter () in

     

       64
       64
       +
          Alcotest.(check int)

     

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

     

       66
       66
       +
         let filter = Event.location_contains "Weekly" in

     

       67
       67
       +
         (let events = Event.query events ~from ~to_ ~filter () in

     

       68
       68
       +
          Alcotest.(check int)

     

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

     

       70
       70
       +
         let filter =

     

       71
       71
       +
           Event.and_filter

     

       72
       72
       +
             [ Event.summary_contains "Test"; Event.description_contains "test" ]

     

       73
       73
       +
         in

     

       74
       74
       +
         (let events = Event.query events ~from ~to_ ~filter () in

     

       75
       75
       +
          Alcotest.(check int)

     

       76
       76
       +
            "Should find events matching combined and criteria" 2 (List.length events));

     

       77
       77
       +
         let filter =

     

       78
       78
       +
           Event.or_filter

     

       79
       79
       +
             [ Event.summary_contains "Test"; Event.location_contains "Weekly" ]

     

       80
       80
       +
         in

     

       81
       81
       +
         (let events = Event.query events ~from ~to_ ~filter () in

     

       82
       82
       +
          Alcotest.(check int)

     

       83
       83
       +
            "Should find events matching combined or criteria" 12 (List.length events));

     

       84
       84
       +
         ()

     

       85
       85
       +
       

     

       86
       86
       +
       let test_calendar_filter ~fs () =

     

       87
       87
       +
         let calendar_dir =

     

       88
       88
       +
           Result.get_ok @@ Calendar_dir.create ~fs calendar_dir_path

     

       89
       89
       +
         in

     

       90
       90
       +
         let from =

     

       91
       91
       +
           Some (Option.get @@ Ptime.of_date_time ((2025, 01, 01), ((0, 0, 0), 0)))

     

       92
       92
       +
         in

     

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

     

       94
       94
       +
         let calendar_name = "example" in

     

       95
       95
       +
         let filter = Event.in_calendars [ calendar_name ] in

     

       96
       96
       +
         let events = Result.get_ok @@ Calendar_dir.get_events ~fs calendar_dir in

     

       97
       97
       +
         (let events = Event.query events ~from ~to_ ~filter () in

     

       98
       98
       +
          let all_match_calendar =

     

       99
       99
       +
            List.for_all

     

       100
       100
       +
              (fun e ->

     

       101
       101
       +
                match Event.get_calendar_name e with id -> id = calendar_name)

     

       102
       102
       +
              events

     

       103
       103
       +
          in

     

       104
       104
       +
          Alcotest.(check bool)

     

       105
       105
       +
            (Printf.sprintf "All events should be from calendar '%s'" calendar_name)

     

       106
       106
       +
            true all_match_calendar;

     

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

     

       108
       108
       +
         let calendar_names = [ "example"; "recurrence" ] in

     

       109
       109
       +
         let filter = Event.in_calendars calendar_names in

     

       110
       110
       +
         (let events = Event.query events ~from ~to_ ~filter () in

     

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

     

       112
       112
       +
         let filter = Event.in_calendars [ "non-existent-calendar" ] in

     

       113
       113
       +
         (let events = Event.query events ~from ~to_ ~filter () in

     

       114
       114
       +
          Alcotest.(check int)

     

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

     

       116
       116
       +
         ()

     

       117
       117
       +
       

     

       118
       118
       +
       let test_events ~fs =

     

       119
       119
       +
         (* Create a test event with specific text in all fields *)

     

       120
       120
       +
         let create_test_event ~calendar_name ~summary ~description ~location ~start =

     

       121
       121
       +
           Event.create ~fs ~calendar_dir_path ~summary ~start

     

       122
       122
       +
             ?description:(if description = "" then None else Some description)

     

       123
       123
       +
             ?location:(if location = "" then None else Some location)

     

       124
       124
       +
             calendar_name

     

       125
       125
       +
         in

     

       126
       126
       +
         [

     

       127
       127
       +
           (* Event with text in all fields *)

     

       128
       128
       +
           Result.get_ok

     

       129
       129
       +
           @@ create_test_event ~calendar_name:"search_test" ~summary:"Project Meeting"

     

       130
       130
       +
                ~description:"Weekly project status meeting with team"

     

       131
       131
       +
                ~location:"Conference Room A"

     

       132
       132
       +
                ~start:(Icalendar.Params.empty, `Datetime (`Utc fixed_date));

     

       133
       133
       +
           (* Event with mixed case to test case insensitivity *)

     

       134
       134
       +
           Result.get_ok

     

       135
       135
       +
           @@ create_test_event ~calendar_name:"search_test"

     

       136
       136
       +
                ~summary:"IMPORTANT Meeting"

     

       137
       137
       +
                ~description:"Critical project review with stakeholders"

     

       138
       138
       +
                ~location:"Executive Suite"

     

       139
       139
       +
                ~start:(Icalendar.Params.empty, `Datetime (`Utc fixed_date));

     

       140
       140
       +
           (* Event with word fragments *)

     

       141
       141
       +
           Result.get_ok

     

       142
       142
       +
           @@ create_test_event ~calendar_name:"search_test" ~summary:"Conference Call"

     

       143
       143
       +
                ~description:"International conference preparation"

     

       144
       144
       +
                ~location:"Remote Meeting Room"

     

       145
       145
       +
                ~start:(Icalendar.Params.empty, `Datetime (`Utc fixed_date));

     

       146
       146
       +
           (* Event with unique text in each field *)

     

       147
       147
       +
           Result.get_ok

     

       148
       148
       +
           @@ create_test_event ~calendar_name:"search_test"

     

       149
       149
       +
                ~summary:"Workshop on Testing"

     

       150
       150
       +
                ~description:"Quality Assurance techniques and practices"

     

       151
       151
       +
                ~location:"Training Center"

     

       152
       152
       +
                ~start:(Icalendar.Params.empty, `Datetime (`Utc fixed_date));

     

       153
       153
       +
         ]

     

       154
       154
       +
       

     

       155
       155
       +
       (* Test helper to verify if a list of events contains an event with a given summary *)

     

       156
       156
       +
       let contains_summary events summary =

     

       157
       157
       +
         List.exists

     

       158
       158
       +
           (fun e -> String.equal (Option.get @@ Event.get_summary e) summary)

     

       159
       159
       +
           events

     

       160
       160
       +
       

     

       161
       161
       +
       let test_case_insensitive_search ~fs () =

     

       162
       162
       +
         (* Test lowercase query for an uppercase word *)

     

       163
       163
       +
         let lowercase_filter = Event.summary_contains "important" in

     

       164
       164
       +
         let matches =

     

       165
       165
       +
           List.filter

     

       166
       166
       +
             (fun e -> Event.matches_filter e lowercase_filter)

     

       167
       167
       +
             (test_events ~fs)

     

       168
       168
       +
         in

     

       169
       169
       +
         Alcotest.(check bool)

     

       170
       170
       +
           "Lowercase query should match uppercase text in summary" true

     

       171
       171
       +
           (contains_summary matches "IMPORTANT Meeting");

     

       172
       172
       +
         (* Test uppercase query for a lowercase word *)

     

       173
       173
       +
         let uppercase_filter = Event.description_contains "WEEKLY" in

     

       174
       174
       +
         let matches =

     

       175
       175
       +
           List.filter

     

       176
       176
       +
             (fun e -> Event.matches_filter e uppercase_filter)

     

       177
       177
       +
             (test_events ~fs)

     

       178
       178
       +
         in

     

       179
       179
       +
         Alcotest.(check bool)

     

       180
       180
       +
           "Uppercase query should match lowercase text in description" true

     

       181
       181
       +
           (contains_summary matches "Project Meeting")

     

       182
       182
       +
       

     

       183
       183
       +
       let test_partial_word_matching ~fs () =

     

       184
       184
       +
         (* Test searching for part of a word *)

     

       185
       185
       +
         let partial_filter = Event.summary_contains "Conf" in

     

       186
       186
       +
         (* Should match "Conference" *)

     

       187
       187
       +
         let matches =

     

       188
       188
       +
           List.filter

     

       189
       189
       +
             (fun e -> Event.matches_filter e partial_filter)

     

       190
       190
       +
             (test_events ~fs)

     

       191
       191
       +
         in

     

       192
       192
       +
         Alcotest.(check bool)

     

       193
       193
       +
           "Partial query should match full word in summary" true

     

       194
       194
       +
           (contains_summary matches "Conference Call");

     

       195
       195
       +
         (* Test another partial word in description *)

     

       196
       196
       +
         let partial_filter = Event.description_contains "nation" in

     

       197
       197
       +
         (* Should match "International" *)

     

       198
       198
       +
         let matches =

     

       199
       199
       +
           List.filter

     

       200
       200
       +
             (fun e -> Event.matches_filter e partial_filter)

     

       201
       201
       +
             (test_events ~fs)

     

       202
       202
       +
         in

     

       203
       203
       +
         Alcotest.(check bool)

     

       204
       204
       +
           "Partial query should match within word in description" true

     

       205
       205
       +
           (contains_summary matches "Conference Call");

     

       206
       206
       +
       

     

       207
       207
       +
         Alcotest.(check bool)

     

       208
       208
       +
           "Partial query should match within word in description" true

     

       209
       209
       +
           (contains_summary matches "Conference Call")

     

       210
       210
       +
       

     

       211
       211
       +
       let test_boolean_logic ~fs () =

     

       212
       212
       +
         (* Test AND filter *)

     

       213
       213
       +
         let and_filter =

     

       214
       214
       +
           Event.and_filter

     

       215
       215
       +
             [ Event.summary_contains "Meeting"; Event.description_contains "project" ]

     

       216
       216
       +
         in

     

       217
       217
       +
         let matches =

     

       218
       218
       +
           List.filter (fun e -> Event.matches_filter e and_filter) (test_events ~fs)

     

       219
       219
       +
         in

     

       220
       220
       +
         Alcotest.(check int)

     

       221
       221
       +
           "AND filter should match events with both terms" 2

     

       222
       222
       +
           (* Two events have both "Meeting" in summary and "project" in description *)

     

       223
       223
       +
           (List.length matches);

     

       224
       224
       +
         (* Test OR filter *)

     

       225
       225
       +
         let or_filter =

     

       226
       226
       +
           Event.or_filter

     

       227
       227
       +
             [ Event.summary_contains "Workshop"; Event.summary_contains "Conference" ]

     

       228
       228
       +
         in

     

       229
       229
       +
         let matches =

     

       230
       230
       +
           List.filter (fun e -> Event.matches_filter e or_filter) (test_events ~fs)

     

       231
       231
       +
         in

     

       232
       232
       +
         Alcotest.(check int)

     

       233
       233
       +
           "OR filter should match events with either term"

     

       234
       234
       +
           2 (* One event has "Workshop", one has "Conference" *)

     

       235
       235
       +
           (List.length matches);

     

       236
       236
       +
       

     

       237
       237
       +
         (* Test NOT filter *)

     

       238
       238
       +
         let not_filter = Event.not_filter (Event.summary_contains "Meeting") in

     

       239
       239
       +
         let matches =

     

       240
       240
       +
           List.filter (fun e -> Event.matches_filter e not_filter) (test_events ~fs)

     

       241
       241
       +
         in

     

       242
       242
       +
         Alcotest.(check int)

     

       243
       243
       +
           "NOT filter should match events without the term"

     

       244
       244
       +
           2 (* Two events don't have "Meeting" in the summary *)

     

       245
       245
       +
           (List.length matches);

     

       246
       246
       +
         (* Test complex combination: (Meeting AND project) OR Workshop BUT NOT Conference *)

     

       247
       247
       +
         let complex_filter =

     

       248
       248
       +
           Event.and_filter

     

       249
       249
       +
             [

     

       250
       250
       +
               Event.or_filter

     

       251
       251
       +
                 [

     

       252
       252
       +
                   Event.and_filter

     

       253
       253
       +
                     [

     

       254
       254
       +
                       Event.summary_contains "Meeting";

     

       255
       255
       +
                       Event.description_contains "project";

     

       256
       256
       +
                     ];

     

       257
       257
       +
                   Event.summary_contains "Workshop";

     

       258
       258
       +
                 ];

     

       259
       259
       +
               Event.not_filter (Event.summary_contains "Conference");

     

       260
       260
       +
             ]

     

       261
       261
       +
         in

     

       262
       262
       +
         let matches =

     

       263
       263
       +
           List.filter

     

       264
       264
       +
             (fun e -> Event.matches_filter e complex_filter)

     

       265
       265
       +
             (test_events ~fs)

     

       266
       266
       +
         in

     

       267
       267
       +
         Alcotest.(check int)

     

       268
       268
       +
           "Complex filter should match correctly"

     

       269
       269
       +
           3 (* Three events should match the complex criteria *)

     

       270
       270
       +
           (List.length matches)

     

       271
       271
       +
       

     

       272
       272
       +
       let test_cross_field_search ~fs () =

     

       273
       273
       +
         (* Search for a term that appears in multiple fields across different events *)

     

       274
       274
       +
         let term_filter =

     

       275
       275
       +
           Event.or_filter

     

       276
       276
       +
             [

     

       277
       277
       +
               Event.summary_contains "meeting";

     

       278
       278
       +
               Event.description_contains "meeting";

     

       279
       279
       +
               Event.location_contains "meeting";

     

       280
       280
       +
             ]

     

       281
       281
       +
         in

     

       282
       282
       +
         let matches =

     

       283
       283
       +
           List.filter (fun e -> Event.matches_filter e term_filter) (test_events ~fs)

     

       284
       284
       +
         in

     

       285
       285
       +
         Alcotest.(check int)

     

       286
       286
       +
           "Cross-field search should find all occurrences"

     

       287
       287
       +
           3 (* "meeting" appears in 3 events across different fields *)

     

       288
       288
       +
           (List.length matches);

     

       289
       289
       +
         (* Another test with a different term *)

     

       290
       290
       +
         let term_filter =

     

       291
       291
       +
           Event.or_filter

     

       292
       292
       +
             [

     

       293
       293
       +
               Event.summary_contains "conference";

     

       294
       294
       +
               Event.description_contains "conference";

     

       295
       295
       +
               Event.location_contains "conference";

     

       296
       296
       +
             ]

     

       297
       297
       +
         in

     

       298
       298
       +
         let matches =

     

       299
       299
       +
           List.filter (fun e -> Event.matches_filter e term_filter) (test_events ~fs)

     

       300
       300
       +
         in

     

       301
       301
       +
         Alcotest.(check int)

     

       302
       302
       +
           "Cross-field search should find all occurrences of 'conference'"

     

       303
       303
       +
           2 (* "conference" appears in 2 events across different fields *)

     

       304
       304
       +
           (List.length matches)

     

       305
       305
       +
       

     

       306
       306
       +
       let query_tests fs =

     

       307
       307
       +
         [

     

       308
       308
       +
           ("query all events", `Quick, test_query_all ~fs);

     

       309
       309
       +
           ("recurrence expansion", `Quick, test_recurrence_expansion ~fs);

     

       310
       310
       +
           ("text search", `Quick, test_text_search ~fs);

     

       311
       311
       +
           ("calendar filter", `Quick, test_calendar_filter ~fs);

     

       312
       312
       +
           ("case insensitive search", `Quick, test_case_insensitive_search ~fs);

     

       313
       313
       +
           ("partial word matching", `Quick, test_partial_word_matching ~fs);

     

       314
       314
       +
           ("boolean logic filters", `Quick, test_boolean_logic ~fs);

     

       315
       315
       +
           ("cross-field searching", `Quick, test_cross_field_search ~fs);

     

       316
       316
       +
         ]

     

       317
       317
       +
       

     

       318
       318
       +
       let () =

     

       319
       319
       +
         Eio_main.run @@ fun env ->

     

       320
       320
       +
         let fs = Eio.Stdenv.fs env in

     

       321
       321
       +
         let _ = setup_fixed_date () in

     

       322
       322
       +
         Alcotest.run "Query Tests" [ ("query", query_tests fs) ]

-335

test/test_query.ml

···

       1
       1
       -
       (* Test the Query module *)

     

       2
       2
       -
       

     

       3
       3
       -
       open Caledonia_lib

     

       4
       4
       -
       

     

       5
       5
       -
       (* Setup a fixed date for testing *)

     

       6
       6
       -
       let fixed_date = Option.get @@ Ptime.of_date_time ((2025, 3, 27), ((0, 0, 0), 0))

     

       7
       7
       -
       

     

       8
       8
       -
       let setup_fixed_date () =

     

       9
       9
       -
         (Date.get_today := fun ?tz:_ () -> fixed_date);

     

       10
       10
       -
         fixed_date

     

       11
       11
       -
       

     

       12
       12
       -
       let calendar_dir_path = Filename.concat (Sys.getcwd ()) "calendar"

     

       13
       13
       -
       

     

       14
       14
       -
       let test_query_all ~fs () =

     

       15
       15
       -
         let calendar_dir =

     

       16
       16
       -
           Result.get_ok @@ Calendar_dir.create ~fs calendar_dir_path

     

       17
       17
       -
         in

     

       18
       18
       -
         let from =

     

       19
       19
       -
           Some (Option.get @@ Ptime.of_date_time ((2025, 01, 01), ((0, 0, 0), 0)))

     

       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 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 event -> Option.get @@ Event.get_summary event = "Test Event")

     

       28
       28
       -
                 events

     

       29
       29
       -
             in

     

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

     

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

     

       32
       32
       -
       

     

       33
       33
       -
       let test_recurrence_expansion ~fs () =

     

       34
       34
       -
         let calendar_dir =

     

       35
       35
       -
           Result.get_ok @@ Calendar_dir.create ~fs calendar_dir_path

     

       36
       36
       -
         in

     

       37
       37
       -
         let from =

     

       38
       38
       -
           Some (Option.get @@ Ptime.of_date_time ((2025, 3, 1), ((0, 0, 0), 0)))

     

       39
       39
       -
         in

     

       40
       40
       -
         let to_ =

     

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

     

       42
       42
       -
         in

     

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

     

       44
       44
       -
         | Ok events ->

     

       45
       45
       -
             let recurring_events =

     

       46
       46
       -
               List.filter

     

       47
       47
       -
                 (fun event ->

     

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

     

       49
       49
       -
                 events

     

       50
       50
       -
             in

     

       51
       51
       -
             Alcotest.(check bool)

     

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

     

       53
       53
       -
               (List.length recurring_events > 1)

     

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

     

       55
       55
       -
       

     

       56
       56
       -
       let test_text_search ~fs () =

     

       57
       57
       -
         let calendar_dir =

     

       58
       58
       -
           Result.get_ok @@ Calendar_dir.create ~fs calendar_dir_path

     

       59
       59
       -
         in

     

       60
       60
       -
         let filter = Query.summary_contains "Test" in

     

       61
       61
       -
         let from =

     

       62
       62
       -
           Some (Option.get @@ Ptime.of_date_time ((2025, 01, 01), ((0, 0, 0), 0)))

     

       63
       63
       -
         in

     

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

     

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

     

       66
       66
       -
         | Ok events ->

     

       67
       67
       -
             Alcotest.(check int)

     

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

     

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

     

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

     

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

     

       72
       72
       -
         | Ok events ->

     

       73
       73
       -
             Alcotest.(check int)

     

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

     

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

     

       76
       76
       -
         let filter =

     

       77
       77
       -
           Query.and_filter

     

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

     

       79
       79
       -
         in

     

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

     

       81
       81
       -
         | Ok events ->

     

       82
       82
       -
             Alcotest.(check int)

     

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

     

       84
       84
       -
               (List.length events)

     

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

     

       86
       86
       -
         let filter =

     

       87
       87
       -
           Query.or_filter

     

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

     

       89
       89
       -
         in

     

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

     

       91
       91
       -
         | Ok events ->

     

       92
       92
       -
             Alcotest.(check int)

     

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

     

       94
       94
       -
               (List.length events)

     

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

     

       96
       96
       -
         ()

     

       97
       97
       -
       

     

       98
       98
       -
       let test_calendar_filter ~fs () =

     

       99
       99
       -
         let calendar_dir =

     

       100
       100
       -
           Result.get_ok @@ Calendar_dir.create ~fs calendar_dir_path

     

       101
       101
       -
         in

     

       102
       102
       -
         let from =

     

       103
       103
       -
           Some (Option.get @@ Ptime.of_date_time ((2025, 01, 01), ((0, 0, 0), 0)))

     

       104
       104
       -
         in

     

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

     

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

     

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

     

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

     

       109
       109
       -
         | Ok events ->

     

       110
       110
       -
             let all_match_calendar =

     

       111
       111
       -
               List.for_all

     

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

     

       113
       113
       -
                 events

     

       114
       114
       -
             in

     

       115
       115
       -
             Alcotest.(check bool)

     

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

     

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

     

       118
       118
       -
               true all_match_calendar;

     

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

     

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

     

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

     

       122
       122
       -
         let filter = Query.in_collections collections in

     

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

     

       124
       124
       -
         | Ok events ->

     

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

     

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

     

       127
       127
       -
         let filter =

     

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

     

       129
       129
       -
         in

     

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

     

       131
       131
       -
         | Ok events ->

     

       132
       132
       -
             Alcotest.(check int)

     

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

     

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

     

       135
       135
       -
         ()

     

       136
       136
       -
       

     

       137
       137
       -
       let test_events ~fs =

     

       138
       138
       -
         (* Create a test event with specific text in all fields *)

     

       139
       139
       -
         let create_test_event ~collection ~summary ~description ~location ~start =

     

       140
       140
       -
           Event.create ~fs ~calendar_dir_path ~summary ~start

     

       141
       141
       -
             ?description:(if description = "" then None else Some description)

     

       142
       142
       -
             ?location:(if location = "" then None else Some location)

     

       143
       143
       -
             (Collection.Col collection)

     

       144
       144
       -
         in

     

       145
       145
       -
         [

     

       146
       146
       -
           (* Event with text in all fields *)

     

       147
       147
       -
           create_test_event ~collection:"search_test" ~summary:"Project Meeting"

     

       148
       148
       -
             ~description:"Weekly project status meeting with team"

     

       149
       149
       -
             ~location:"Conference Room A"

     

       150
       150
       -
             ~start:(`Datetime (`Utc fixed_date));

     

       151
       151
       -
           (* Event with mixed case to test case insensitivity *)

     

       152
       152
       -
           create_test_event ~collection:"search_test" ~summary:"IMPORTANT Meeting"

     

       153
       153
       -
             ~description:"Critical project review with stakeholders"

     

       154
       154
       -
             ~location:"Executive Suite"

     

       155
       155
       -
             ~start:(`Datetime (`Utc fixed_date));

     

       156
       156
       -
           (* Event with word fragments *)

     

       157
       157
       -
           create_test_event ~collection:"search_test" ~summary:"Conference Call"

     

       158
       158
       -
             ~description:"International conference preparation"

     

       159
       159
       -
             ~location:"Remote Meeting Room"

     

       160
       160
       -
             ~start:(`Datetime (`Utc fixed_date));

     

       161
       161
       -
           (* Event with unique text in each field *)

     

       162
       162
       -
           create_test_event ~collection:"search_test" ~summary:"Workshop on Testing"

     

       163
       163
       -
             ~description:"Quality Assurance techniques and practices"

     

       164
       164
       -
             ~location:"Training Center"

     

       165
       165
       -
             ~start:(`Datetime (`Utc fixed_date));

     

       166
       166
       -
         ]

     

       167
       167
       -
       

     

       168
       168
       -
       (* Test helper to verify if a list of events contains an event with a given summary *)

     

       169
       169
       -
       let contains_summary events summary =

     

       170
       170
       -
         List.exists

     

       171
       171
       -
           (fun e -> String.equal (Option.get @@ Event.get_summary e) summary)

     

       172
       172
       -
           events

     

       173
       173
       -
       

     

       174
       174
       -
       let test_case_insensitive_search ~fs () =

     

       175
       175
       -
         (* Test lowercase query for an uppercase word *)

     

       176
       176
       -
         let lowercase_filter = Query.summary_contains "important" in

     

       177
       177
       -
         let matches =

     

       178
       178
       -
           List.filter

     

       179
       179
       -
             (fun e -> Query.matches_filter e lowercase_filter)

     

       180
       180
       -
             (test_events ~fs)

     

       181
       181
       -
         in

     

       182
       182
       -
         Alcotest.(check bool)

     

       183
       183
       -
           "Lowercase query should match uppercase text in summary" true

     

       184
       184
       -
           (contains_summary matches "IMPORTANT Meeting");

     

       185
       185
       -
         (* Test uppercase query for a lowercase word *)

     

       186
       186
       -
         let uppercase_filter = Query.description_contains "WEEKLY" in

     

       187
       187
       -
         let matches =

     

       188
       188
       -
           List.filter

     

       189
       189
       -
             (fun e -> Query.matches_filter e uppercase_filter)

     

       190
       190
       -
             (test_events ~fs)

     

       191
       191
       -
         in

     

       192
       192
       -
         Alcotest.(check bool)

     

       193
       193
       -
           "Uppercase query should match lowercase text in description" true

     

       194
       194
       -
           (contains_summary matches "Project Meeting")

     

       195
       195
       -
       

     

       196
       196
       -
       let test_partial_word_matching ~fs () =

     

       197
       197
       -
         (* Test searching for part of a word *)

     

       198
       198
       -
         let partial_filter = Query.summary_contains "Conf" in

     

       199
       199
       -
         (* Should match "Conference" *)

     

       200
       200
       -
         let matches =

     

       201
       201
       -
           List.filter

     

       202
       202
       -
             (fun e -> Query.matches_filter e partial_filter)

     

       203
       203
       -
             (test_events ~fs)

     

       204
       204
       -
         in

     

       205
       205
       -
         Alcotest.(check bool)

     

       206
       206
       -
           "Partial query should match full word in summary" true

     

       207
       207
       -
           (contains_summary matches "Conference Call");

     

       208
       208
       -
         (* Test another partial word in description *)

     

       209
       209
       -
         let partial_filter = Query.description_contains "nation" in

     

       210
       210
       -
         (* Should match "International" *)

     

       211
       211
       -
         let matches =

     

       212
       212
       -
           List.filter

     

       213
       213
       -
             (fun e -> Query.matches_filter e partial_filter)

     

       214
       214
       -
             (test_events ~fs)

     

       215
       215
       -
         in

     

       216
       216
       -
         Alcotest.(check bool)

     

       217
       217
       -
           "Partial query should match within word in description" true

     

       218
       218
       -
           (contains_summary matches "Conference Call");

     

       219
       219
       -
       

     

       220
       220
       -
         Alcotest.(check bool)

     

       221
       221
       -
           "Partial query should match within word in description" true

     

       222
       222
       -
           (contains_summary matches "Conference Call")

     

       223
       223
       -
       

     

       224
       224
       -
       let test_boolean_logic ~fs () =

     

       225
       225
       -
         (* Test AND filter *)

     

       226
       226
       -
         let and_filter =

     

       227
       227
       -
           Query.and_filter

     

       228
       228
       -
             [ Query.summary_contains "Meeting"; Query.description_contains "project" ]

     

       229
       229
       -
         in

     

       230
       230
       -
         let matches =

     

       231
       231
       -
           List.filter (fun e -> Query.matches_filter e and_filter) (test_events ~fs)

     

       232
       232
       -
         in

     

       233
       233
       -
         Alcotest.(check int)

     

       234
       234
       -
           "AND filter should match events with both terms" 2

     

       235
       235
       -
           (* Two events have both "Meeting" in summary and "project" in description *)

     

       236
       236
       -
           (List.length matches);

     

       237
       237
       -
         (* Test OR filter *)

     

       238
       238
       -
         let or_filter =

     

       239
       239
       -
           Query.or_filter

     

       240
       240
       -
             [ Query.summary_contains "Workshop"; Query.summary_contains "Conference" ]

     

       241
       241
       -
         in

     

       242
       242
       -
         let matches =

     

       243
       243
       -
           List.filter (fun e -> Query.matches_filter e or_filter) (test_events ~fs)

     

       244
       244
       -
         in

     

       245
       245
       -
         Alcotest.(check int)

     

       246
       246
       -
           "OR filter should match events with either term"

     

       247
       247
       -
           2 (* One event has "Workshop", one has "Conference" *)

     

       248
       248
       -
           (List.length matches);

     

       249
       249
       -
       

     

       250
       250
       -
         (* Test NOT filter *)

     

       251
       251
       -
         let not_filter = Query.not_filter (Query.summary_contains "Meeting") in

     

       252
       252
       -
         let matches =

     

       253
       253
       -
           List.filter (fun e -> Query.matches_filter e not_filter) (test_events ~fs)

     

       254
       254
       -
         in

     

       255
       255
       -
         Alcotest.(check int)

     

       256
       256
       -
           "NOT filter should match events without the term"

     

       257
       257
       -
           2 (* Two events don't have "Meeting" in the summary *)

     

       258
       258
       -
           (List.length matches);

     

       259
       259
       -
         (* Test complex combination: (Meeting AND project) OR Workshop BUT NOT Conference *)

     

       260
       260
       -
         let complex_filter =

     

       261
       261
       -
           Query.and_filter

     

       262
       262
       -
             [

     

       263
       263
       -
               Query.or_filter

     

       264
       264
       -
                 [

     

       265
       265
       -
                   Query.and_filter

     

       266
       266
       -
                     [

     

       267
       267
       -
                       Query.summary_contains "Meeting";

     

       268
       268
       -
                       Query.description_contains "project";

     

       269
       269
       -
                     ];

     

       270
       270
       -
                   Query.summary_contains "Workshop";

     

       271
       271
       -
                 ];

     

       272
       272
       -
               Query.not_filter (Query.summary_contains "Conference");

     

       273
       273
       -
             ]

     

       274
       274
       -
         in

     

       275
       275
       -
         let matches =

     

       276
       276
       -
           List.filter

     

       277
       277
       -
             (fun e -> Query.matches_filter e complex_filter)

     

       278
       278
       -
             (test_events ~fs)

     

       279
       279
       -
         in

     

       280
       280
       -
         Alcotest.(check int)

     

       281
       281
       -
           "Complex filter should match correctly"

     

       282
       282
       -
           3 (* Three events should match the complex criteria *)

     

       283
       283
       -
           (List.length matches)

     

       284
       284
       -
       

     

       285
       285
       -
       let test_cross_field_search ~fs () =

     

       286
       286
       -
         (* Search for a term that appears in multiple fields across different events *)

     

       287
       287
       -
         let term_filter =

     

       288
       288
       -
           Query.or_filter

     

       289
       289
       -
             [

     

       290
       290
       -
               Query.summary_contains "meeting";

     

       291
       291
       -
               Query.description_contains "meeting";

     

       292
       292
       -
               Query.location_contains "meeting";

     

       293
       293
       -
             ]

     

       294
       294
       -
         in

     

       295
       295
       -
         let matches =

     

       296
       296
       -
           List.filter (fun e -> Query.matches_filter e term_filter) (test_events ~fs)

     

       297
       297
       -
         in

     

       298
       298
       -
         Alcotest.(check int)

     

       299
       299
       -
           "Cross-field search should find all occurrences"

     

       300
       300
       -
           3 (* "meeting" appears in 3 events across different fields *)

     

       301
       301
       -
           (List.length matches);

     

       302
       302
       -
         (* Another test with a different term *)

     

       303
       303
       -
         let term_filter =

     

       304
       304
       -
           Query.or_filter

     

       305
       305
       -
             [

     

       306
       306
       -
               Query.summary_contains "conference";

     

       307
       307
       -
               Query.description_contains "conference";

     

       308
       308
       -
               Query.location_contains "conference";

     

       309
       309
       -
             ]

     

       310
       310
       -
         in

     

       311
       311
       -
         let matches =

     

       312
       312
       -
           List.filter (fun e -> Query.matches_filter e term_filter) (test_events ~fs)

     

       313
       313
       -
         in

     

       314
       314
       -
         Alcotest.(check int)

     

       315
       315
       -
           "Cross-field search should find all occurrences of 'conference'"

     

       316
       316
       -
           2 (* "conference" appears in 2 events across different fields *)

     

       317
       317
       -
           (List.length matches)

     

       318
       318
       -
       

     

       319
       319
       -
       let query_tests fs =

     

       320
       320
       -
         [

     

       321
       321
       -
           ("query all events", `Quick, test_query_all ~fs);

     

       322
       322
       -
           ("recurrence expansion", `Quick, test_recurrence_expansion ~fs);

     

       323
       323
       -
           ("text search", `Quick, test_text_search ~fs);

     

       324
       324
       -
           ("calendar filter", `Quick, test_calendar_filter ~fs);

     

       325
       325
       -
           ("case insensitive search", `Quick, test_case_insensitive_search ~fs);

     

       326
       326
       -
           ("partial word matching", `Quick, test_partial_word_matching ~fs);

     

       327
       327
       -
           ("boolean logic filters", `Quick, test_boolean_logic ~fs);

     

       328
       328
       -
           ("cross-field searching", `Quick, test_cross_field_search ~fs);

     

       329
       329
       -
         ]

     

       330
       330
       -
       

     

       331
       331
       -
       let () =

     

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

     

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

     

       334
       334
       -
         let _ = setup_fixed_date () in

     

       335
       335
       -
         Alcotest.run "Query Tests" [ ("query", query_tests fs) ]

Compare changes