commit 2607c460f903af7561adeb220a7455c3d9c10ea9 · ryan.freumh.org/caledonia

CHANGELOG.md

···

       1
       1
       +
       

     

       2
       2
       +
       ### 0.3.0

     

       3
       3
       +
       

     

       4
       4
       +
       - timezone support

     

       1
       5
        
       

     

       2
       6
        
       ### 0.2.0

     

       3
       7

+1 -1

README.md

···

       2
       2
        
       

     

       3
       3
        
       Caledonia is a command-line calendar client.

     

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

     

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

     

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

     

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

     

       7
       7
        
       

     

       8
       8
        
       ## Configuration

+22 -16

TODO.org

···

       1
       1
       -
       * DONE list/search events

     

       2
       2
       -
       * DONE add/remove events

     

       3
       3
       -
       ** TODO support more options in creating events, e.g. event duration

     

       4
       4
       -
       * DONE edit events

     

       5
       5
       -
       * TODO diagnose events failing to parse

     

       6
       6
       -
       * TODO timezones

     

       7
       7
       -
       timerer

     

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

     

       9
       9
       -
       * TODO CalDAV syncing

     

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

     

       11
       11
       -
       * TODO support a DSL of date queries (e.g. query for every event on a Monday)

     

       12
       12
       -
       * TODO support querying times as well as dates

     

       13
       13
       -
       * TODO custom date/time formatting

     

       14
       14
       -
       * TODO support querying regex

     

       15
       15
       -
       * TODO server mode

     

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

     

       1
       1
       +
       - [x] list/search events

     

       2
       2
       +
       - [x] add/remove events

     

       3
       3
       +
       - [x] edit events

     

       4
       4
       +
       - [x] timezones

     

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

     

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

     

       7
       7
       +
       - [ ] support specifying duration

     

       8
       8
       +
       - [ ] make query filter a lambda

     

       9
       9
       +
       - [ ] diagnose events failing to parse

     

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

     

       11
       11
       +
       - [ ] CalDAV syncing

     

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

     

       13
       13
       +
       - [ ] support querying times as well as dates

     

       14
       14
       +
       - [ ] custom date/time formatting

     

       15
       15
       +
       - [ ] support querying regex

     

       16
       16
       +
       - [ ] support VALARMS

     

       17
       17
       +
       - [ ] support VOTODS

     

       18
       18
       +
       - [ ] support VCARDS

     

       19
       19
       +
       - [ ] server mode

     

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

     

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

     

       22
       22
       +
       - [ ] implement an emacs client like mu4e

+20 -99

bin/add_cmd.ml

···

       1
       1
        
       open Cmdliner

     

       2
       2
        
       open Caledonia_lib

     

       3
       3
       -
       open Query_args

     

       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 ~today ~tomorrow ~week ~month ~fs

     

       7
       7
       -
           calendar_dir =

     

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

     

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

     

       9
       9
       -
         let* start_date =

     

       10
       10
       -
           match

     

       11
       11
       -
             ( Query_args.convert_relative_date ~today ~tomorrow ~week ~month,

     

       12
       12
       -
               start_date )

     

       13
       13
       -
           with

     

       14
       14
       -
           | Some date, _ -> Ok date

     

       15
       15
       -
           | None, Some date -> Ok date

     

       16
       16
       -
           | None, None -> Error (`Msg "Start date is required")

     

       17
       17
       -
         in

     

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

     

       18
       9
        
         let* start =

     

       19
       19
       -
           Date.parse_date_time_opt ~date:start_date ?time:start_time `From

     

       20
       20
       -
         in

     

       21
       21
       -
         let end_date =

     

       22
       22
       -
           match

     

       23
       23
       -
             (Query_args.convert_relative_date ~today ~tomorrow ~week ~month, end_date)

     

       24
       24
       -
           with

     

       25
       25
       -
           | Some date, _ -> Some date

     

       26
       26
       -
           | None, Some date -> Some date

     

       27
       27
       -
           | None, None -> None

     

       28
       28
       -
         in

     

       29
       29
       -
         let* end_ =

     

       30
       30
       -
           match end_date with

     

       31
       31
       -
           | None -> Ok None

     

       32
       32
       -
           | Some end_date ->

     

       33
       33
       -
               let* end_dt =

     

       34
       34
       -
                 Date.parse_date_time_opt ~date:end_date ?time:end_time `To

     

       35
       35
       -
               in

     

       36
       36
       -
               Ok (Some end_dt)

     

       10
       10
       +
           match start with

     

       11
       11
       +
           | Some s -> Ok s

     

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

     

       37
       13
        
         in

     

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

     

       38
       15
        
         let* recurrence =

     

       39
       16
        
           match recur with

     

       40
       17
        
           | Some r ->

     
···

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

     

       52
       29
        
         Ok ()

     

       53
       30
        
       

     

       54
       54
       -
       let collection_arg =

     

       55
       55
       -
         let doc = "Calendar to add the event to" in

     

       56
       56
       -
         Arg.(

     

       57
       57
       -
           required

     

       58
       58
       -
           & opt (some string) None

     

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

     

       60
       60
       -
       

     

       61
       61
       -
       let summary_arg =

     

       62
       62
       -
         let doc = "Event summary/title" in

     

       63
       63
       -
         Arg.(required & pos 0 (some string) None & info [] ~docv:"SUMMARY" ~doc)

     

       64
       64
       -
       

     

       65
       65
       -
       let start_date_arg =

     

       66
       66
       -
         let doc = "Event start date (YYYY-MM-DD)" in

     

       67
       67
       -
         Arg.(value & opt (some string) None & info [ "date" ] ~docv:"DATE" ~doc)

     

       68
       68
       -
       

     

       69
       69
       -
       let start_time_arg =

     

       70
       70
       -
         let doc = "Event start time (HH:MM)" in

     

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

     

       72
       72
       -
       

     

       73
       73
       -
       let end_date_arg =

     

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

     

       75
       75
       -
         Arg.(

     

       76
       76
       -
           value

     

       77
       77
       -
           & opt (some string) None

     

       78
       78
       -
           & info [ "end-date"; "e" ] ~docv:"END_DATE" ~doc)

     

       79
       79
       -
       

     

       80
       80
       -
       let end_time_arg =

     

       81
       81
       -
         let doc = "Event end time (HH:MM)" in

     

       82
       82
       -
         Arg.(

     

       83
       83
       -
           value & opt (some string) None & info [ "end-time" ] ~docv:"END_TIME" ~doc)

     

       84
       84
       -
       

     

       85
       85
       -
       let location_arg =

     

       86
       86
       -
         let doc = "Event location" in

     

       87
       87
       -
         Arg.(

     

       88
       88
       -
           value

     

       89
       89
       -
           & opt (some string) None

     

       90
       90
       -
           & info [ "location"; "l" ] ~docv:"LOCATION" ~doc)

     

       91
       91
       -
       

     

       92
       92
       -
       let description_arg =

     

       93
       93
       -
         let doc = "Event description" in

     

       94
       94
       -
         Arg.(

     

       95
       95
       -
           value

     

       96
       96
       -
           & opt (some string) None

     

       97
       97
       -
           & info [ "description"; "D" ] ~docv:"DESCRIPTION" ~doc)

     

       98
       98
       -
       

     

       99
       99
       -
       let recur_arg =

     

       100
       100
       -
         let doc = "See RECURRENCE section" in

     

       101
       101
       -
         Arg.(

     

       102
       102
       -
           value & opt (some string) None & info [ "recur"; "r" ] ~docv:"RECUR" ~doc)

     

       103
       103
       -
       

     

       104
       31
        
       let cmd ~fs calendar_dir =

     

       105
       32
        
         let run summary start_date start_time end_date end_time location description

     

       106
       106
       -
             recur collection today tomorrow week month =

     

       33
       33
       +
             recur collection timezone end_timezone =

     

       107
       34
        
           match

     

       108
       35
        
             run ~summary ~start_date ~start_time ~end_date ~end_time ~location

     

       109
       109
       -
               ~description ~recur ~collection ~today ~tomorrow ~week ~month ~fs

     

       110
       110
       -
               calendar_dir

     

       36
       36
       +
               ~description ~recur ~collection ?timezone ?end_timezone ~fs calendar_dir

     

       111
       37
        
           with

     

       112
       38
        
           | Error (`Msg msg) ->

     

       113
       39
        
               Printf.eprintf "Error: %s\n%!" msg;

     
···

       116
       42
        
         in

     

       117
       43
        
         let term =

     

       118
       44
        
           Term.(

     

       119
       119
       -
             const run $ summary_arg $ start_date_arg $ start_time_arg $ end_date_arg

     

       120
       120
       -
             $ end_time_arg $ location_arg $ description_arg $ recur_arg

     

       121
       121
       -
             $ collection_arg $ today_arg $ tomorrow_arg $ week_arg $ month_arg)

     

       45
       45
       +
             const run $ required_summary_arg $ start_date_arg $ start_time_arg

     

       46
       46
       +
             $ end_date_arg $ end_time_arg $ location_arg $ description_arg $ recur_arg

     

       47
       47
       +
             $ collection_arg $ timezone_arg $ end_time_arg)

     

       122
       48
        
         in

     

       123
       49
        
         let doc = "Add a new calendar event" in

     

       124
       50
        
         let man =

     
···

       128
       54
        
             `P

     

       129
       55
        
               "Specify the event summary (title) as the first argument, and use \

     

       130
       56
        
                options to set other details.";

     

       131
       131
       -
             `P "Note all times are in Coordinated Universal Time (UTC).";

     

       132
       57
        
             `S Manpage.s_options;

     

       133
       58
        
           ]

     

       134
       59
        
           @ date_format_manpage_entries

     

       135
       60
        
           @ [

     

       136
       61
        
               `S Manpage.s_examples;

     

       137
       137
       -
               `I

     

       138
       138
       -
                 ( "Add a simple event for today:",

     

       139
       139
       -
                   "caled add \"Team Meeting\" --today --time 14:00" );

     

       62
       62
       +
               `I ("Add a event for today:", "caled add \"Meeting\" -d today -t 14:00");

     

       140
       63
        
               `I

     

       141
       64
        
                 ( "Add an event with a specific date and time:",

     

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

     

       143
       143
       -
                 );

     

       65
       65
       +
                   "caled add \"Dentist Appointment\" -d 2025-04-15 -t 10:30" );

     

       144
       66
        
               `I

     

       145
       67
        
                 ( "Add an event with an end time:",

     

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

     

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

     

       68
       68
       +
                   "caled add \"Conference\" -d 2025-05-20 -t 09:00 -e 2025-05-22 -T \

     

       69
       69
       +
                    17:00" );

     

       148
       70
        
               `I

     

       149
       71
        
                 ( "Add an event with location and description:",

     

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

     

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

     

       152
       152
       -
                    plans\"" );

     

       72
       72
       +
                   "caled add \"Lunch with Bob\" -d 2025-04-02 -t 12:30 -l \"Pasta \

     

       73
       73
       +
                    Restaurant\" -D \"Discuss project plans\"" );

     

       153
       74
        
               `I

     

       154
       75
        
                 ( "Add an event to a specific calendar:",

     

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

     

       156
       156
       -
                    --calendar work" );

     

       76
       76
       +
                   "caled add \"Work Meeting\" -d 2025-04-03 -t 15:00 --calendar work"

     

       77
       77
       +
                 );

     

       157
       78
        
               `S "RECURRENCE";

     

       158
       79
        
               `P

     

       159
       80
        
                 "Recurrence rule in iCalendar RFC5545 format. The FREQ part is \

+6 -4

bin/dune

···

       13
       13
        
         ptime

     

       14
       14
        
         ptime.clock.os

     

       15
       15
        
         eio

     

       16
       16
       -
         eio_main)

     

       16
       16
       +
         eio_main

     

       17
       17
       +
         timere)

     

       17
       18
        
        (modules

     

       18
       19
        
         main

     

       20
       20
       +
         query_args

     

       21
       21
       +
         event_args

     

       19
       22
        
         list_cmd

     

       20
       23
        
         search_cmd

     

       21
       21
       -
         query_args

     

       24
       24
       +
         show_cmd

     

       22
       25
        
         add_cmd

     

       23
       23
       -
         edit_cmd

     

       24
       26
        
         delete_cmd

     

       25
       25
       -
         show_cmd))

     

       27
       27
       +
         edit_cmd))

+9 -112

bin/edit_cmd.ml

···

       1
       1
        
       open Cmdliner

     

       2
       2
        
       open Caledonia_lib

     

       3
       3
       -
       open Query_args

     

       3
       3
       +
       open Event_args

     

       4
       4
        
       

     

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

     

       6
       6
       -
           ~description ~recur ~today ~tomorrow ~week ~month ~fs calendar_dir =

     

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

     

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

     

       8
       8
        
         let filter = Query.with_id event_id in

     

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

     
···

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

     

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

     

       15
       15
        
         in

     

       16
       16
       -
         let start_date =

     

       17
       17
       -
           match

     

       18
       18
       -
             ( Query_args.convert_relative_date ~today ~tomorrow ~week ~month,

     

       19
       19
       -
               start_date )

     

       20
       20
       -
           with

     

       21
       21
       -
           | Some date, _ -> Some date

     

       22
       22
       -
           | None, Some date -> Some date

     

       23
       23
       -
           | None, None -> None

     

       24
       24
       -
         in

     

       25
       25
       -
         let* start =

     

       26
       26
       -
           match start_date with

     

       27
       27
       -
           | Some date ->

     

       28
       28
       -
               let* d = Date.parse_date_time_opt ~date ?time:start_time `From in

     

       29
       29
       -
               Ok (Some d)

     

       30
       30
       -
           | None -> Ok None

     

       31
       31
       -
         in

     

       32
       32
       -
         let end_date =

     

       33
       33
       -
           match

     

       34
       34
       -
             (Query_args.convert_relative_date ~today ~tomorrow ~week ~month, end_date)

     

       35
       35
       -
           with

     

       36
       36
       -
           | Some date, _ -> Some date

     

       37
       37
       -
           | None, Some date -> Some date

     

       38
       38
       -
           | None, None -> None

     

       39
       39
       -
         in

     

       40
       40
       -
         let* end_ =

     

       41
       41
       -
           match end_date with

     

       42
       42
       -
           | None -> Ok None

     

       43
       43
       -
           | Some end_date ->

     

       44
       44
       -
               let* end_dt =

     

       45
       45
       -
                 Date.parse_date_time_opt ~date:end_date ?time:end_time `To

     

       46
       46
       -
               in

     

       47
       47
       -
               Ok (Some end_dt)

     

       48
       48
       -
         in

     

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

     

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

     

       49
       18
        
         let* recurrence =

     

       50
       19
        
           match recur with

     

       51
       20
        
           | Some r ->

     
···

       64
       33
        
         let doc = "ID of the event to edit" in

     

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

     

       66
       35
        
       

     

       67
       67
       -
       let summary_arg =

     

       68
       68
       -
         let doc = "New event summary/title" in

     

       69
       69
       -
         Arg.(

     

       70
       70
       -
           value

     

       71
       71
       -
           & opt (some string) None

     

       72
       72
       -
           & info [ "summary"; "s" ] ~docv:"SUMMARY" ~doc)

     

       73
       73
       -
       

     

       74
       74
       -
       let start_date_arg =

     

       75
       75
       -
         let doc = "New event start date (YYYY-MM-DD)" in

     

       76
       76
       -
         Arg.(value & opt (some string) None & info [ "date" ] ~docv:"DATE" ~doc)

     

       77
       77
       -
       

     

       78
       78
       -
       let start_time_arg =

     

       79
       79
       -
         let doc = "New event start time (HH:MM)" in

     

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

     

       81
       81
       -
       

     

       82
       82
       -
       let end_date_arg =

     

       83
       83
       -
         let doc = "New event end date (YYYY-MM-DD)" in

     

       84
       84
       -
         Arg.(

     

       85
       85
       -
           value

     

       86
       86
       -
           & opt (some string) None

     

       87
       87
       -
           & info [ "end-date"; "e" ] ~docv:"END_DATE" ~doc)

     

       88
       88
       -
       

     

       89
       89
       -
       let end_time_arg =

     

       90
       90
       -
         let doc = "New event end time (HH:MM)" in

     

       91
       91
       -
         Arg.(

     

       92
       92
       -
           value & opt (some string) None & info [ "end-time" ] ~docv:"END_TIME" ~doc)

     

       93
       93
       -
       

     

       94
       94
       -
       let location_arg =

     

       95
       95
       -
         let doc = "New event location" in

     

       96
       96
       -
         Arg.(

     

       97
       97
       -
           value

     

       98
       98
       -
           & opt (some string) None

     

       99
       99
       -
           & info [ "location"; "l" ] ~docv:"LOCATION" ~doc)

     

       100
       100
       -
       

     

       101
       101
       -
       let description_arg =

     

       102
       102
       -
         let doc = "New event description" in

     

       103
       103
       -
         Arg.(

     

       104
       104
       -
           value

     

       105
       105
       -
           & opt (some string) None

     

       106
       106
       -
           & info [ "description"; "D" ] ~docv:"DESCRIPTION" ~doc)

     

       107
       107
       -
       

     

       108
       108
       -
       let recur_arg =

     

       109
       109
       -
         let doc =

     

       110
       110
       -
           "Recurrence rule in iCalendar RFC5545 format. The FREQ part is required.\n\

     

       111
       111
       -
           \    Use empty string to remove recurrence.\n\

     

       112
       112
       -
           \    \n\

     

       113
       113
       -
           \    FREQ=<frequency>: DAILY, WEEKLY, MONTHLY, or YEARLY (required)\n\

     

       114
       114
       -
           \    COUNT=<number>: Limit to this many occurrences (optional, cannot be \

     

       115
       115
       -
            used with UNTIL)\n\

     

       116
       116
       -
           \    UNTIL=<date>: Repeat until this date (optional, cannot be used with \

     

       117
       117
       -
            COUNT)\n\

     

       118
       118
       -
           \    INTERVAL=<number>: Interval between occurrences, e.g., 2 for every \

     

       119
       119
       -
            other (optional)\n\

     

       120
       120
       -
           \    BYDAY=<dayspec>: Specific days, e.g., MO,WE,FR or 1MO (first Monday) \

     

       121
       121
       -
            (optional)\n\

     

       122
       122
       -
           \    BYMONTHDAY=<daynum>: Day of month, e.g., 1,15 or -1 (last day) \

     

       123
       123
       -
            (optional)\n\

     

       124
       124
       -
           \    BYMONTH=<monthnum>: Month number, e.g., 1,6,12 for Jan,Jun,Dec \

     

       125
       125
       -
            (optional)\n\

     

       126
       126
       -
           \    \n\

     

       127
       127
       -
           \    Examples:\n\

     

       128
       128
       -
           \    FREQ=DAILY;COUNT=5         - Daily for 5 occurrences\n\

     

       129
       129
       -
           \    FREQ=WEEKLY;INTERVAL=2     - Every other week indefinitely\n\

     

       130
       130
       -
           \    FREQ=WEEKLY;BYDAY=MO,WE,FR - Every Monday, Wednesday, Friday\n\

     

       131
       131
       -
           \    FREQ=MONTHLY;BYDAY=1MO     - First Monday of every month\n\

     

       132
       132
       -
           \    FREQ=YEARLY;BYMONTH=1;BYMONTHDAY=1 - Every January 1st (New Year's Day)\n\

     

       133
       133
       -
           \    FREQ=MONTHLY;BYMONTHDAY=-1 - Last day of every month"

     

       134
       134
       -
         in

     

       135
       135
       -
         Arg.(

     

       136
       136
       -
           value & opt (some string) None & info [ "recur"; "r" ] ~docv:"RECUR" ~doc)

     

       137
       137
       -
       

     

       138
       36
        
       let cmd ~fs calendar_dir =

     

       139
       37
        
         let run event_id summary start_date start_time end_date end_time location

     

       140
       140
       -
             description recur today tomorrow week month =

     

       38
       38
       +
             description recur timezone end_timezone =

     

       141
       39
        
           match

     

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

     

       143
       143
       -
               ~location ~description ~recur ~today ~tomorrow ~week ~month ~fs

     

       144
       144
       -
               calendar_dir

     

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

     

       145
       42
        
           with

     

       146
       43
        
           | Error (`Msg msg) ->

     

       147
       44
        
               Printf.eprintf "Error: %s\n%!" msg;

     
···

       150
       47
        
         in

     

       151
       48
        
         let term =

     

       152
       49
        
           Term.(

     

       153
       153
       -
             const run $ event_id_arg $ summary_arg $ start_date_arg $ start_time_arg

     

       154
       154
       -
             $ end_date_arg $ end_time_arg $ location_arg $ description_arg $ recur_arg

     

       155
       155
       -
             $ today_arg $ tomorrow_arg $ week_arg $ month_arg)

     

       50
       50
       +
             const run $ event_id_arg $ optional_summary_arg $ start_date_arg

     

       51
       51
       +
             $ start_time_arg $ end_date_arg $ end_time_arg $ location_arg

     

       52
       52
       +
             $ description_arg $ recur_arg $ timezone_arg $ end_timezone_arg)

     

       156
       53
        
         in

     

       157
       54
        
         let doc = "Edit an existing calendar event" in

     

       158
       55
        
         let man =

+214

bin/event_args.ml

···

       1
       1
       +
       open Cmdliner

     

       2
       2
       +
       open Caledonia_lib

     

       3
       3
       +
       

     

       4
       4
       +
       let collection_arg =

     

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

     

       6
       6
       +
         Arg.(

     

       7
       7
       +
           required

     

       8
       8
       +
           & opt (some string) None

     

       9
       9
       +
           & info [ "calendar"; "c" ] ~docv:"CALENDAR" ~doc)

     

       10
       10
       +
       

     

       11
       11
       +
       let required_summary_arg =

     

       12
       12
       +
         let doc = "Event summary/title" in

     

       13
       13
       +
         Arg.(required & pos 0 (some string) None & info [] ~docv:"SUMMARY" ~doc)

     

       14
       14
       +
       

     

       15
       15
       +
       let optional_summary_arg =

     

       16
       16
       +
         let doc = "Event summary/title" in

     

       17
       17
       +
         Arg.(

     

       18
       18
       +
           value

     

       19
       19
       +
           & opt (some string) None

     

       20
       20
       +
           & info [ "summary"; "s" ] ~docv:"SUMMARY" ~doc)

     

       21
       21
       +
       

     

       22
       22
       +
       let start_date_arg =

     

       23
       23
       +
         let doc = "Event start date (YYYY-MM-DD)" in

     

       24
       24
       +
         Arg.(value & opt (some string) None & info [ "date"; "d" ] ~docv:"DATE" ~doc)

     

       25
       25
       +
       

     

       26
       26
       +
       let start_time_arg =

     

       27
       27
       +
         let doc = "Event start time (HH:MM)" in

     

       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

     

       32
       32
       +
         Arg.(

     

       33
       33
       +
           value

     

       34
       34
       +
           & opt (some string) None

     

       35
       35
       +
           & info [ "end-date"; "e" ] ~docv:"END_DATE" ~doc)

     

       36
       36
       +
       

     

       37
       37
       +
       let end_time_arg =

     

       38
       38
       +
         let doc = "Event end time (HH:MM)" in

     

       39
       39
       +
         Arg.(

     

       40
       40
       +
           value

     

       41
       41
       +
           & opt (some string) None

     

       42
       42
       +
           & info [ "end-time"; "T" ] ~docv:"END_TIME" ~doc)

     

       43
       43
       +
       

     

       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."

     

       48
       48
       +
         in

     

       49
       49
       +
         Arg.(

     

       50
       50
       +
           value

     

       51
       51
       +
           & opt (some string) None

     

       52
       52
       +
           & info [ "timezone"; "z" ] ~docv:"TIMEZONE" ~doc)

     

       53
       53
       +
       

     

       54
       54
       +
       let end_timezone_arg =

     

       55
       55
       +
         let doc = "The timezone of the end of the event. Defaults to TIMEZONE." in

     

       56
       56
       +
         Arg.(

     

       57
       57
       +
           value

     

       58
       58
       +
           & opt (some string) None

     

       59
       59
       +
           & info [ "end-timezone"; "Z" ] ~docv:"END_TIMEZONE" ~doc)

     

       60
       60
       +
       

     

       61
       61
       +
       let location_arg =

     

       62
       62
       +
         let doc = "Event location" in

     

       63
       63
       +
         Arg.(

     

       64
       64
       +
           value

     

       65
       65
       +
           & opt (some string) None

     

       66
       66
       +
           & info [ "location"; "l" ] ~docv:"LOCATION" ~doc)

     

       67
       67
       +
       

     

       68
       68
       +
       let description_arg =

     

       69
       69
       +
         let doc = "Event description" in

     

       70
       70
       +
         Arg.(

     

       71
       71
       +
           value

     

       72
       72
       +
           & opt (some string) None

     

       73
       73
       +
           & info [ "description"; "D" ] ~docv:"DESCRIPTION" ~doc)

     

       74
       74
       +
       

     

       75
       75
       +
       let recur_arg =

     

       76
       76
       +
         let doc = "See RECURRENCE section" in

     

       77
       77
       +
         Arg.(

     

       78
       78
       +
           value & opt (some string) None & info [ "recur"; "r" ] ~docv:"RECUR" ~doc)

     

       79
       79
       +
       

     

       80
       80
       +
       let date_format_manpage_entries =

     

       81
       81
       +
         [

     

       82
       82
       +
           `S "DATE FORMATS";

     

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

     

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

     

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

     

       86
       86
       +
           `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");

     

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

     

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

     

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

     

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

     

       95
       95
       +
         ]

     

       96
       96
       +
       

     

       97
       97
       +
       let parse_start ~start_date ~start_time ~timezone =

     

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

     

       99
       99
       +
         match start_date with

     

       100
       100
       +
         | None ->

     

       101
       101
       +
             let* _ =

     

       102
       102
       +
               match start_time with

     

       103
       103
       +
               | None -> Ok ()

     

       104
       104
       +
               | Some _ ->

     

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

     

       106
       106
       +
             in

     

       107
       107
       +
             let* _ =

     

       108
       108
       +
               match timezone with

     

       109
       109
       +
               | None -> Ok ()

     

       110
       110
       +
               | _ -> Error (`Msg "Can't specify a timezone without a start date")

     

       111
       111
       +
             in

     

       112
       112
       +
             Ok None

     

       113
       113
       +
         | Some start_date -> (

     

       114
       114
       +
             match start_time with

     

       115
       115
       +
             | None ->

     

       116
       116
       +
                 let* _ =

     

       117
       117
       +
                   match timezone with

     

       118
       118
       +
                   | None -> Ok ()

     

       119
       119
       +
                   | _ -> Error (`Msg "Can't specify a timezone without a start time")

     

       120
       120
       +
                 in

     

       121
       121
       +
                 let* ptime =

     

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

     

       123
       123
       +
                 in

     

       124
       124
       +
                 let date = Ptime.to_date ptime in

     

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

     

       126
       126
       +
             | Some start_time -> (

     

       127
       127
       +
                 match timezone with

     

       128
       128
       +
                 | None ->

     

       129
       129
       +
                     let* datetime =

     

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

     

       131
       131
       +
                         ~time:start_time `From

     

       132
       132
       +
                     in

     

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

     

       134
       134
       +
                 | Some "UTC" ->

     

       135
       135
       +
                     let* datetime =

     

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

     

       137
       137
       +
                         ~time:start_time `From

     

       138
       138
       +
                     in

     

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

     

       140
       140
       +
                 | 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
       146
       +
                     let* datetime =

     

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

     

       148
       148
       +
                     in

     

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

     

       150
       150
       +
       

     

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

     

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

     

       153
       153
       +
         match end_date with

     

       154
       154
       +
         | None ->

     

       155
       155
       +
             let* _ =

     

       156
       156
       +
               match end_time with

     

       157
       157
       +
               | None -> Ok ()

     

       158
       158
       +
               | Some _ -> Error (`Msg "Can't specify an end time without an end date")

     

       159
       159
       +
             in

     

       160
       160
       +
             let* _ =

     

       161
       161
       +
               match end_timezone with

     

       162
       162
       +
               | None -> Ok ()

     

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

     

       164
       164
       +
             in

     

       165
       165
       +
             Ok None

     

       166
       166
       +
         | Some end_date -> (

     

       167
       167
       +
             match end_time with

     

       168
       168
       +
             | None ->

     

       169
       169
       +
                 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
       +
                   | _ ->

     

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

     

       176
       176
       +
                 in

     

       177
       177
       +
                 let* ptime =

     

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

     

       179
       179
       +
                 in

     

       180
       180
       +
                 let date = Ptime.to_date ptime in

     

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

     

       182
       182
       +
             | Some end_time -> (

     

       183
       183
       +
                 match (timezone, end_timezone) with

     

       184
       184
       +
                 | None, None ->

     

       185
       185
       +
                     let* datetime =

     

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

     

       187
       187
       +
                         ~time:end_time `From

     

       188
       188
       +
                     in

     

       189
       189
       +
                     Ok

     

       190
       190
       +
                       (Some

     

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

     

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

     

       193
       193
       +
                     let* datetime =

     

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

     

       195
       195
       +
                         ~time:end_time `From

     

       196
       196
       +
                     in

     

       197
       197
       +
                     Ok

     

       198
       198
       +
                       (Some

     

       199
       199
       +
                          (`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

     

       206
       206
       +
                     let* datetime =

     

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

     

       208
       208
       +
                     in

     

       209
       209
       +
       

     

       210
       210
       +
                     Ok

     

       211
       211
       +
                       (Some

     

       212
       212
       +
                          (`Dtend

     

       213
       213
       +
                             ( Icalendar.Params.empty,

     

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

+44 -16

bin/list_cmd.ml

···

       2
       2
        
       open Caledonia_lib

     

       3
       3
        
       open Query_args

     

       4
       4
        
       

     

       5
       5
       -
       let run ?from ?to_ ?calendar ?count ~format ~today ~tomorrow ~week ~month ~fs

     

       6
       6
       -
           calendar_dir =

     

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

     

       6
       6
       +
           ?timezone ~fs calendar_dir =

     

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

     

       8
       8
       -
         let from, to_ =

     

       9
       9
       -
           match Date.convert_relative_date_formats ~today ~tomorrow ~week ~month with

     

       10
       10
       -
           | Some (from, to_) -> (Some from, to_)

     

       8
       8
       +
         let tz = Query_args.parse_timezone ~timezone in

     

       9
       9
       +
         let* from, to_ =

     

       10
       10
       +
           match

     

       11
       11
       +
             Date.convert_relative_date_formats ~tz ~today ~tomorrow ~week ~month ()

     

       12
       12
       +
           with

     

       13
       13
       +
           | Some (from, to_) ->

     

       14
       14
       +
               let* _ =

     

       15
       15
       +
                 match (from_str, to_str) with

     

       16
       16
       +
                 | None, None -> Ok ()

     

       17
       17
       +
                 | _ ->

     

       18
       18
       +
                     Error

     

       19
       19
       +
                       (`Msg

     

       20
       20
       +
                          "Can't specify --from / --to when using --today, --week, \

     

       21
       21
       +
                           --month")

     

       22
       22
       +
               in

     

       23
       23
       +
               Ok (Some from, to_)

     

       11
       24
        
           | None -> (

     

       25
       25
       +
               let* from =

     

       26
       26
       +
                 match from_str with

     

       27
       27
       +
                 | None -> Ok None

     

       28
       28
       +
                 | Some s ->

     

       29
       29
       +
                     let* d = Date.parse_date ~tz s `From in

     

       30
       30
       +
                     Ok (Some d)

     

       31
       31
       +
               in

     

       32
       32
       +
               let* 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

     

       37
       37
       +
                     Ok (Some d)

     

       38
       38
       +
               in

     

       12
       39
        
               match (from, to_) with

     

       13
       13
       -
               | Some f, Some t -> (Some f, Date.to_end_of_day t)

     

       40
       40
       +
               | Some f, Some t -> Ok (Some f, Date.to_end_of_day t)

     

       14
       41
        
               | Some f, None ->

     

       15
       42
        
                   let one_month_later = Date.add_months f 1 in

     

       16
       16
       -
                   (Some f, one_month_later)

     

       43
       43
       +
                   Ok (Some f, one_month_later)

     

       17
       44
        
               | None, Some t ->

     

       18
       18
       -
                   let today_date = !Date.get_today () in

     

       19
       19
       -
                   (Some today_date, Date.to_end_of_day t)

     

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

     

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

     

       20
       47
        
               | None, None ->

     

       21
       21
       -
                   let today_date = !Date.get_today () in

     

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

     

       22
       49
        
                   let one_month_later = Date.add_months today_date 1 in

     

       23
       23
       -
                   (Some today_date, one_month_later))

     

       50
       50
       +
                   Ok (Some today_date, one_month_later))

     

       24
       51
        
         in

     

       25
       52
        
         let filter =

     

       26
       53
        
           match calendar with

     
···

       32
       59
        
           Query.query ~fs calendar_dir ?filter ~from ~to_ ?limit:count ()

     

       33
       60
        
         in

     

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

     

       35
       35
       -
         else print_endline (Format.format_instances ~format results);

     

       62
       62
       +
         else print_endline (Format.format_instances ~format ~tz results);

     

       36
       63
        
         Ok ()

     

       37
       64
        
       

     

       38
       65
        
       let cmd ~fs calendar_dir =

     

       39
       39
       -
         let run from to_ calendar count format today tomorrow week month =

     

       66
       66
       +
         let run from_str to_str calendar count format today tomorrow week month

     

       67
       67
       +
             timezone =

     

       40
       68
        
           match

     

       41
       41
       -
             run ?from ?to_ ?calendar ?count ~format ~today ~tomorrow ~week ~month ~fs

     

       42
       42
       -
               calendar_dir

     

       69
       69
       +
             run ?from_str ?to_str ?calendar ?count ~format ~today ~tomorrow ~week

     

       70
       70
       +
               ~month ?timezone ~fs calendar_dir

     

       43
       71
        
           with

     

       44
       72
        
           | Error (`Msg msg) ->

     

       45
       73
        
               Printf.eprintf "Error: %s\n%!" msg;

     
···

       49
       77
        
         let term =

     

       50
       78
        
           Term.(

     

       51
       79
        
             const run $ from_arg $ to_arg $ calendar_arg $ count_arg $ format_arg

     

       52
       52
       -
             $ today_arg $ tomorrow_arg $ week_arg $ month_arg)

     

       80
       80
       +
             $ today_arg $ tomorrow_arg $ week_arg $ month_arg $ timezone_arg)

     

       53
       81
        
         in

     

       54
       82
        
         let doc = "List calendar events" in

     

       55
       83
        
         let man =

+25 -12

bin/query_args.ml

···

       8
       8
        
            +Nm)"

     

       9
       9
        
         in

     

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

     

       11
       11
       -
         let parse_date s = Date.parse_date s `From in

     

       12
       12
       -
         Arg.(value @@ opt (some (Cmdliner.Arg.conv (parse_date, Ptime.pp))) None i)

     

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

     

       13
       12
        
       

     

       14
       13
        
       let to_arg =

     

       15
       14
        
         let doc =

     
···

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

     

       18
       17
        
         in

     

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

     

       20
       20
       -
         let parse_date s = Date.parse_date s `From in

     

       21
       21
       -
         Arg.(value @@ opt (some (Cmdliner.Arg.conv (parse_date, Ptime.pp))) None i)

     

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

     

       22
       20
        
       

     

       23
       21
        
       let calendar_arg =

     

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

     
···

       30
       28
        
       let format_enum =

     

       31
       29
        
         [

     

       32
       30
        
           ("text", `Text);

     

       31
       31
       +
           ("entries", `Entries);

     

       33
       32
        
           ("json", `Json);

     

       34
       33
        
           ("csv", `Csv);

     

       35
       34
        
           ("ics", `Ics);

     

       36
       36
       -
           ("records", `Entries);

     

       37
       35
        
           ("sexp", `Sexp);

     

       38
       36
        
         ]

     

       39
       37
        
       

     

       40
       38
        
       let format_arg =

     

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

     

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

     

       42
       40
        
         Arg.(

     

       43
       41
        
           value

     

       44
       42
        
           & opt (enum format_enum) `Text

     
···

       64
       62
        
         let doc = "Show events for the current month" in

     

       65
       63
        
         Arg.(value & flag & info [ "month"; "m" ] ~doc)

     

       66
       64
        
       

     

       65
       65
       +
       let timezone_arg =

     

       66
       66
       +
         let doc =

     

       67
       67
       +
           "Timezone to use for date calculations (e.g., 'America/New_York', 'UTC', \

     

       68
       68
       +
            'Europe/London') defaulting to the system timezone"

     

       69
       69
       +
         in

     

       70
       70
       +
         Arg.(

     

       71
       71
       +
           value

     

       72
       72
       +
           & opt (some string) None

     

       73
       73
       +
           & info [ "timezone"; "z" ] ~docv:"TIMEZONE" ~doc)

     

       74
       74
       +
       

     

       67
       75
        
       let date_format_manpage_entries =

     

       68
       76
        
         [

     

       69
       77
        
           `S "DATE FORMATS";

     
···

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

     

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

     

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

     

       83
       83
       +
           `I

     

       84
       84
       +
             ( "--timezone, -z",

     

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

     

       86
       86
       +
                'UTC')" );

     

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

     

       76
       88
        
           `I ("today", "Current day");

     

       77
       89
        
           `I ("tomorrow", "Next day");

     
···

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

     

       87
       99
        
         ]

     

       88
       100
        
       

     

       89
       89
       -
       let convert_relative_date ~today ~tomorrow ~week ~month =

     

       90
       90
       -
         if today then Some "today"

     

       91
       91
       -
         else if tomorrow then Some "tomorrow"

     

       92
       92
       -
         else if week then Some "this-week"

     

       93
       93
       -
         else if month then Some "this-month"

     

       94
       94
       -
         else None

     

       101
       101
       +
       let parse_timezone ~timezone =

     

       102
       102
       +
         match timezone with

     

       103
       103
       +
         | Some tzid -> (

     

       104
       104
       +
             match Timedesc.Time_zone.make tzid with

     

       105
       105
       +
             | Some tz -> tz

     

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

     

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

+43 -15

bin/search_cmd.ml

···

       2
       2
        
       open Caledonia_lib

     

       3
       3
        
       open Query_args

     

       4
       4
        
       

     

       5
       5
       -
       let run ?from ?to_ ?calendar ?count ?query_text ~summary ~description ~location

     

       6
       6
       -
           ~format ~today ~tomorrow ~week ~month ~recurring ~non_recurring ~fs

     

       7
       7
       -
           calendar_dir =

     

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

     

       6
       6
       +
           ~location ~format ~today ~tomorrow ~week ~month ~recurring ~non_recurring

     

       7
       7
       +
           ?timezone ~fs calendar_dir =

     

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

     

       9
       9
        
         let filters = ref [] in

     

       10
       10
       -
         let from, to_ =

     

       11
       11
       -
           match Date.convert_relative_date_formats ~today ~tomorrow ~week ~month with

     

       12
       12
       -
           | Some (from, to_) -> (Some from, to_)

     

       10
       10
       +
         let tz = Query_args.parse_timezone ~timezone in

     

       11
       11
       +
         let* from, to_ =

     

       12
       12
       +
           match

     

       13
       13
       +
             Date.convert_relative_date_formats ~tz ~today ~tomorrow ~week ~month ()

     

       14
       14
       +
           with

     

       15
       15
       +
           | Some (from, to_) ->

     

       16
       16
       +
               let* _ =

     

       17
       17
       +
                 match (from_str, to_str) with

     

       18
       18
       +
                 | None, None -> Ok ()

     

       19
       19
       +
                 | _ ->

     

       20
       20
       +
                     Error

     

       21
       21
       +
                       (`Msg

     

       22
       22
       +
                          "Can't specify --from / --to when using --today, --week, \

     

       23
       23
       +
                           --month")

     

       24
       24
       +
               in

     

       25
       25
       +
               Ok (Some from, to_)

     

       13
       26
        
           | None -> (

     

       27
       27
       +
               let* from =

     

       28
       28
       +
                 match from_str with

     

       29
       29
       +
                 | None -> Ok None

     

       30
       30
       +
                 | Some s ->

     

       31
       31
       +
                     let* d = Date.parse_date s `From in

     

       32
       32
       +
                     Ok (Some d)

     

       33
       33
       +
               in

     

       34
       34
       +
               let* to_ =

     

       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

     

       39
       39
       +
                     Ok (Some d)

     

       40
       40
       +
               in

     

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

     

       15
       42
        
               match (from, to_) with

     

       16
       16
       -
               | Some f, Some t -> (Some f, Date.to_end_of_day t)

     

       17
       17
       -
               | Some f, None -> (Some f, Date.to_end_of_day max_date)

     

       18
       18
       -
               | None, Some t -> (None, Date.to_end_of_day t)

     

       19
       19
       -
               | None, None -> (None, Date.to_end_of_day max_date))

     

       43
       43
       +
               | Some f, Some t -> Ok (Some f, Date.to_end_of_day t)

     

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

     

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

     

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

     

       20
       47
        
         in

     

       21
       48
        
         (match calendar with

     

       22
       49
        
         | Some collection_id ->

     
···

       73
       100
        
         Arg.(value & flag & info [ "non-recurring"; "R" ] ~doc)

     

       74
       101
        
       

     

       75
       102
        
       let cmd ~fs calendar_dir =

     

       76
       76
       -
         let run query_text from to_ calendar count format summary description location

     

       77
       77
       -
             today tomorrow week month recurring non_recurring =

     

       103
       103
       +
         let run query_text from_str to_str calendar count format summary description

     

       104
       104
       +
             location today tomorrow week month recurring non_recurring timezone =

     

       78
       105
        
           match

     

       79
       79
       -
             run ?from ?to_ ?calendar ?count ?query_text ~summary ~description

     

       106
       106
       +
             run ?from_str ?to_str ?calendar ?count ?query_text ~summary ~description

     

       80
       107
        
               ~location ~format ~today ~tomorrow ~week ~month ~recurring

     

       81
       81
       -
               ~non_recurring ~fs calendar_dir

     

       108
       108
       +
               ~non_recurring ?timezone ~fs calendar_dir

     

       82
       109
        
           with

     

       83
       110
        
           | Error (`Msg msg) ->

     

       84
       111
        
               Printf.eprintf "Error: %s\n%!" msg;

     
···

       89
       116
        
           Term.(

     

       90
       117
        
             const run $ query_text_arg $ from_arg $ to_arg $ calendar_arg $ count_arg

     

       91
       118
        
             $ format_arg $ summary_arg $ description_arg $ location_arg $ today_arg

     

       92
       92
       -
             $ tomorrow_arg $ week_arg $ month_arg $ recurring_arg $ non_recurring_arg)

     

       119
       119
       +
             $ tomorrow_arg $ week_arg $ month_arg $ recurring_arg $ non_recurring_arg

     

       120
       120
       +
             $ timezone_arg)

     

       93
       121
        
         in

     

       94
       122
        
         let doc = "Search calendar events for specific text" in

     

       95
       123
        
         let man =

+1 -1

caledonia.opam

···

       1
       1
        
       opam-version: "2.0"

     

       2
       2
       -
       version: "0.1.0"

     

       2
       2
       +
       version: "0.3.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"

+1 -1

dune-project

···

       1
       1
        
       (lang dune 3.4)

     

       2
       2
        
       (name caledonia)

     

       3
       3
       -
       (version 0.1.0)

     

       3
       3
       +
       (version 0.3.0)

     

       4
       4
        
       (using directory-targets 0.1)

+1 -3

lib/calendar_dir.ml

···

       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
       -
             Printf.eprintf "Skipping non ics file %s\n%!" file_path;

     

       53
       53
       -
             []

     

       51
       51
       +
         | false -> []

     

       54
       52
        
         | true -> (

     

       55
       53
        
             try

     

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

+134 -65

lib/date.ml

···

       1
       1
        
       open Result

     

       2
       2
        
       

     

       3
       3
       +
       let default_timezone =

     

       4
       4
       +
         ref (fun () ->

     

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

     

       6
       6
       +
             | Some tz -> tz

     

       7
       7
       +
             | None -> Timedesc.Time_zone.utc)

     

       8
       8
       +
       

     

       3
       9
        
       let timedesc_to_ptime dt =

     

       4
       4
       -
         match Timedesc.to_timestamp_single dt |> Timedesc.Utils.ptime_of_timestamp with

     

       10
       10
       +
         match

     

       11
       11
       +
           Timedesc.to_timestamp_single dt |> Timedesc.Utils.ptime_of_timestamp

     

       12
       12
       +
         with

     

       5
       13
        
         | Some t -> t

     

       6
       14
        
         | None -> failwith "Invalid date conversion from Timedesc to Ptime"

     

       7
       15
        
       

     

       8
       8
       -
       let ptime_to_timedesc ptime =

     

       16
       16
       +
       let ptime_to_timedesc ?(tz = !default_timezone ()) ptime =

     

       9
       17
        
         let ts = Timedesc.Utils.timestamp_of_ptime ptime in

     

       10
       10
       -
         match Timedesc.of_timestamp ts with

     

       18
       18
       +
         match Timedesc.of_timestamp ~tz_of_date_time:tz ts with

     

       11
       19
        
         | Some dt -> dt

     

       12
       20
        
         | None -> failwith "Invalid date conversion from Ptime to Timedesc"

     

       13
       21
        
       

     

       14
       22
        
       let get_today =

     

       15
       15
       -
         ref (fun () ->

     

       16
       16
       -
             let now = Timedesc.now () in

     

       23
       23
       +
         ref (fun ?(tz = !default_timezone ()) () ->

     

       24
       24
       +
             let now = Timedesc.now ~tz_of_date_time:tz () in

     

       17
       25
        
             let date = Timedesc.date now in

     

       18
       26
        
             let midnight = Timedesc.Time.make_exn ~hour:0 ~minute:0 ~second:0 () in

     

       19
       19
       -
             let dt = Timedesc.of_date_and_time_exn date midnight in

     

       27
       27
       +
             let dt = Timedesc.of_date_and_time_exn ~tz date midnight in

     

       20
       28
        
             timedesc_to_ptime dt)

     

       21
       29
        
       

     

       22
       30
        
       (* Convert a midnight timestamp to end-of-day (23:59:59) *)

     

       23
       31
        
       let to_end_of_day date =

     

       24
       32
        
         let dt = ptime_to_timedesc date in

     

       25
       33
        
         let date = Timedesc.date dt in

     

       26
       26
       -
         let end_of_day_time = Timedesc.Time.make_exn ~hour:23 ~minute:59 ~second:59 () in

     

       34
       34
       +
         let end_of_day_time =

     

       35
       35
       +
           Timedesc.Time.make_exn ~hour:23 ~minute:59 ~second:59 ()

     

       36
       36
       +
         in

     

       27
       37
        
         let end_of_day = Timedesc.of_date_and_time_exn date end_of_day_time in

     

       28
       38
        
         timedesc_to_ptime end_of_day

     

       29
       39
        
       

     
···

       35
       45
        
         let new_dt = Timedesc.of_date_and_time_exn new_date time in

     

       36
       46
        
         timedesc_to_ptime new_dt

     

       37
       47
        
       

     

       38
       38
       -
       let add_weeks date weeks =

     

       39
       39
       -
         add_days date (weeks * 7)

     

       48
       48
       +
       let add_weeks date weeks = add_days date (weeks * 7)

     

       40
       49
        
       

     

       41
       50
        
       let add_months date months =

     

       42
       51
        
         let dt = ptime_to_timedesc date in

     
···

       44
       53
        
         let year = Timedesc.Ym.year old_ym in

     

       45
       54
        
         let month = Timedesc.Ym.month old_ym in

     

       46
       55
        
         let day = Timedesc.day dt in

     

       47
       47
       -
         

     

       56
       56
       +
       

     

       48
       57
        
         (* Calculate new year and month *)

     

       49
       58
        
         let total_month = (year * 12) + month - 1 + months in

     

       50
       59
        
         let new_year = total_month / 12 in

     

       51
       60
        
         let new_month = (total_month mod 12) + 1 in

     

       52
       52
       -
         

     

       61
       61
       +
       

     

       53
       62
        
         (* Try to create new date, handling end of month cases properly *)

     

       54
       63
        
         let rec adjust_day d =

     

       55
       64
        
           match Timedesc.Date.Ymd.make ~year:new_year ~month:new_month ~day:d with

     

       56
       56
       -
           | Ok new_date -> 

     

       65
       65
       +
           | Ok new_date ->

     

       57
       66
        
               let time = Timedesc.time dt in

     

       58
       67
        
               let new_dt = Timedesc.of_date_and_time_exn new_date time in

     

       59
       68
        
               timedesc_to_ptime new_dt

     

       60
       60
       -
           | Error _ -> 

     

       69
       69
       +
           | Error _ ->

     

       61
       70
        
               if d > 1 then adjust_day (d - 1)

     

       62
       71
        
               else failwith "Invalid date after adding months"

     

       63
       72
        
         in

     

       64
       73
        
         adjust_day day

     

       65
       74
        
       

     

       66
       66
       -
       let add_years date years =

     

       67
       67
       -
         add_months date (years * 12)

     

       75
       75
       +
       let add_years date years = add_months date (years * 12)

     

       68
       76
        
       

     

       69
       77
        
       let get_start_of_week date =

     

       70
       78
        
         let dt = ptime_to_timedesc date in

     
···

       79
       87
        
           | `Sat -> 5

     

       80
       88
        
           | `Sun -> 6

     

       81
       89
        
         in

     

       82
       82
       -
         let monday_date = Timedesc.Date.sub ~days:days_to_subtract (Timedesc.date dt) in

     

       90
       90
       +
         let monday_date =

     

       91
       91
       +
           Timedesc.Date.sub ~days:days_to_subtract (Timedesc.date dt)

     

       92
       92
       +
         in

     

       83
       93
        
         let midnight = Timedesc.Time.make_exn ~hour:0 ~minute:0 ~second:0 () in

     

       84
       84
       -
         let monday_with_midnight = Timedesc.of_date_and_time_exn monday_date midnight in

     

       94
       94
       +
         let monday_with_midnight =

     

       95
       95
       +
           Timedesc.of_date_and_time_exn monday_date midnight

     

       96
       96
       +
         in

     

       85
       97
        
         timedesc_to_ptime monday_with_midnight

     

       86
       98
        
       

     

       87
       87
       -
       let get_start_of_current_week () = get_start_of_week (!get_today ())

     

       88
       88
       -
       let get_start_of_next_week () = add_days (get_start_of_current_week ()) 7

     

       99
       99
       +
       let get_start_of_current_week ?(tz = !default_timezone ()) () =

     

       100
       100
       +
         get_start_of_week (!get_today ~tz ())

     

       101
       101
       +
       

     

       102
       102
       +
       let get_start_of_next_week ?(tz = !default_timezone ()) () =

     

       103
       103
       +
         add_days (get_start_of_current_week ~tz ()) 7

     

       104
       104
       +
       

     

       89
       105
        
       let get_end_of_week date = add_days (get_start_of_week date) 6

     

       90
       90
       -
       let get_end_of_current_week () = get_end_of_week (!get_today ())

     

       91
       91
       -
       let get_end_of_next_week () = get_end_of_week (get_start_of_next_week ())

     

       106
       106
       +
       

     

       107
       107
       +
       let get_end_of_current_week ?(tz = !default_timezone ()) () =

     

       108
       108
       +
         get_end_of_week (!get_today ~tz ())

     

       109
       109
       +
       

     

       110
       110
       +
       let get_end_of_next_week ?(tz = !default_timezone ()) () =

     

       111
       111
       +
         get_end_of_week (get_start_of_next_week ~tz ())

     

       92
       112
        
       

     

       93
       113
        
       let get_start_of_month date =

     

       94
       114
        
         let dt = ptime_to_timedesc date in

     

       95
       115
        
         let year = Timedesc.year dt in

     

       96
       116
        
         let month = Timedesc.month dt in

     

       97
       97
       -
         

     

       117
       117
       +
       

     

       98
       118
        
         (* Create a date for the first of the month *)

     

       99
       119
        
         match Timedesc.Date.Ymd.make ~year ~month ~day:1 with

     

       100
       120
        
         | Ok first_day ->

     
···

       103
       123
        
             timedesc_to_ptime first_of_month

     

       104
       124
        
         | Error _ -> failwith "Invalid date for start of month"

     

       105
       125
        
       

     

       106
       106
       -
       let get_start_of_current_month () = get_start_of_month (!get_today ())

     

       107
       107
       -
       let get_start_of_next_month () = add_months (get_start_of_current_month ()) 1

     

       126
       126
       +
       let get_start_of_current_month ?(tz = !default_timezone ()) () =

     

       127
       127
       +
         get_start_of_month (!get_today ~tz ())

     

       128
       128
       +
       

     

       129
       129
       +
       let get_start_of_next_month ?(tz = !default_timezone ()) () =

     

       130
       130
       +
         add_months (get_start_of_current_month ~tz ()) 1

     

       108
       131
        
       

     

       109
       132
        
       let get_end_of_month date =

     

       110
       133
        
         let dt = ptime_to_timedesc date in

     

       111
       134
        
         let year = Timedesc.year dt in

     

       112
       135
        
         let month = Timedesc.month dt in

     

       113
       113
       -
         

     

       136
       136
       +
       

     

       114
       137
        
         (* Determine next month and year *)

     

       115
       138
        
         let next_month_int = if month == 12 then 1 else month + 1 in

     

       116
       139
        
         let next_month_year = if month == 12 then year + 1 else year in

     

       117
       117
       -
         

     

       140
       140
       +
       

     

       118
       141
        
         (* Create a date for the first of next month *)

     

       119
       119
       -
         match Timedesc.Date.Ymd.make ~year:next_month_year ~month:next_month_int ~day:1 with

     

       120
       120
       -
         | Ok first_of_next_month ->

     

       142
       142
       +
         match

     

       143
       143
       +
           Timedesc.Date.Ymd.make ~year:next_month_year ~month:next_month_int ~day:1

     

       144
       144
       +
         with

     

       145
       145
       +
         | Ok first_of_next_month -> (

     

       121
       146
        
             (* Create the timestamp and subtract 1 second *)

     

       122
       147
        
             let midnight = Timedesc.Time.make_exn ~hour:0 ~minute:0 ~second:0 () in

     

       123
       123
       -
             let first_of_next_month_dt = Timedesc.of_date_and_time_exn first_of_next_month midnight in

     

       148
       148
       +
             let first_of_next_month_dt =

     

       149
       149
       +
               Timedesc.of_date_and_time_exn first_of_next_month midnight

     

       150
       150
       +
             in

     

       124
       151
        
             let one_second = Timedesc.Span.For_human.make_exn ~seconds:1 () in

     

       125
       125
       -
             let end_of_month_ts = 

     

       152
       152
       +
             let end_of_month_ts =

     

       126
       153
        
               match Timedesc.to_timestamp first_of_next_month_dt with

     

       127
       154
        
               | `Single ts -> Timedesc.Span.sub ts one_second

     

       128
       155
        
               | `Ambiguous (ts, _) -> Timedesc.Span.sub ts one_second

     

       129
       156
        
             in

     

       130
       130
       -
             (match Timedesc.of_timestamp end_of_month_ts with

     

       157
       157
       +
             match Timedesc.of_timestamp end_of_month_ts with

     

       131
       158
        
             | Some end_of_month -> timedesc_to_ptime end_of_month

     

       132
       159
        
             | None -> failwith "Invalid timestamp for end of month")

     

       133
       160
        
         | Error _ -> failwith "Invalid date for end of month"

     

       134
       161
        
       

     

       135
       135
       -
       let get_end_of_current_month () = get_end_of_month (!get_today ())

     

       136
       136
       -
       let get_end_of_next_month () = get_end_of_month (get_start_of_next_month ())

     

       162
       162
       +
       let get_end_of_current_month ?(tz = !default_timezone ()) () =

     

       163
       163
       +
         get_end_of_month (!get_today ~tz ())

     

       137
       164
        
       

     

       138
       138
       -
       let convert_relative_date_formats ~today ~tomorrow ~week ~month =

     

       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 convert_relative_date_formats ?(tz = !default_timezone ()) ~today ~tomorrow

     

       169
       169
       +
           ~week ~month () =

     

       139
       170
        
         if today then

     

       140
       140
       -
           let today_date = !get_today () in

     

       171
       171
       +
           let today_date = !get_today ~tz () in

     

       141
       172
        
           (* Set the end date to end-of-day to include all events on that day *)

     

       142
       173
        
           let end_of_today = to_end_of_day today_date in

     

       143
       174
        
           Some (today_date, end_of_today)

     

       144
       175
        
         else if tomorrow then

     

       145
       145
       -
           let today = !get_today () in

     

       176
       176
       +
           let today = !get_today ~tz () in

     

       146
       177
        
           let tomorrow_date = add_days today 1 in

     

       147
       178
        
           (* Set the end date to end-of-day to include all events on that day *)

     

       148
       179
        
           let end_of_tomorrow = to_end_of_day tomorrow_date in

     

       149
       180
        
           Some (tomorrow_date, end_of_tomorrow)

     

       150
       181
        
         else if week then

     

       151
       151
       -
           let week_start = get_start_of_current_week () in

     

       182
       182
       +
           let week_start = get_start_of_current_week ~tz () in

     

       152
       183
        
           let week_end_date = add_days week_start 6 in

     

       153
       184
        
           (* Sunday is 6 days from Monday *)

     

       154
       185
        
           (* Set the end date to end-of-day to include all events on Sunday *)

     

       155
       186
        
           let end_of_week = to_end_of_day week_end_date in

     

       156
       187
        
           Some (week_start, end_of_week)

     

       157
       188
        
         else if month then

     

       158
       158
       -
           let month_start = get_start_of_current_month () in

     

       189
       189
       +
           let month_start = get_start_of_current_month ~tz () in

     

       159
       190
        
           let month_end = get_end_of_month month_start in

     

       160
       191
        
           Some (month_start, month_end)

     

       161
       192
        
         else None

     
···

       163
       194
        
       let ( let* ) = Result.bind

     

       164
       195
        
       

     

       165
       196
        
       (* Parse a date string that could be ISO format or a relative expression *)

     

       166
       166
       -
       let parse_date expr parameter =

     

       197
       197
       +
       let parse_date ?(tz = !default_timezone ()) expr parameter =

     

       167
       198
        
         let iso_date_regex = Re.Pcre.regexp "^(\\d{4})-(\\d{2})-(\\d{2})$" in

     

       168
       199
        
         let relative_regex = Re.Pcre.regexp "^([+-])(\\d+)([dwm])$" in

     

       169
       200
        
         match expr with

     

       170
       170
       -
         | "today" -> Ok (!get_today ())

     

       171
       171
       -
         | "tomorrow" -> Ok (add_days (!get_today ()) 1)

     

       172
       172
       -
         | "yesterday" -> Ok (add_days (!get_today ()) (-1))

     

       201
       201
       +
         | "today" -> Ok (!get_today ~tz ())

     

       202
       202
       +
         | "tomorrow" -> Ok (add_days (!get_today ~tz ()) 1)

     

       203
       203
       +
         | "yesterday" -> Ok (add_days (!get_today ~tz ()) (-1))

     

       173
       204
        
         | "this-week" -> (

     

       174
       205
        
             match parameter with

     

       175
       175
       -
             | `From -> Ok (get_start_of_current_week ())

     

       176
       176
       -
             | `To -> Ok (get_end_of_current_week ()))

     

       206
       206
       +
             | `From -> Ok (get_start_of_current_week ~tz ())

     

       207
       207
       +
             | `To -> Ok (get_end_of_current_week ~tz ()))

     

       177
       208
        
         | "next-week" -> (

     

       178
       209
        
             match parameter with

     

       179
       179
       -
             | `From -> Ok (get_start_of_next_week ())

     

       180
       180
       -
             | `To -> Ok (get_end_of_next_week ()))

     

       210
       210
       +
             | `From -> Ok (get_start_of_next_week ~tz ())

     

       211
       211
       +
             | `To -> Ok (get_end_of_next_week ~tz ()))

     

       181
       212
        
         | "this-month" -> (

     

       182
       213
        
             match parameter with

     

       183
       183
       -
             | `From -> Ok (get_start_of_current_month ())

     

       184
       184
       -
             | `To -> Ok (get_end_of_current_month ()))

     

       214
       214
       +
             | `From -> Ok (get_start_of_current_month ~tz ())

     

       215
       215
       +
             | `To -> Ok (get_end_of_current_month ~tz ()))

     

       185
       216
        
         | "next-month" -> (

     

       186
       217
        
             match parameter with

     

       187
       187
       -
             | `From -> Ok (get_start_of_next_month ())

     

       188
       188
       -
             | `To -> Ok (get_end_of_next_month ()))

     

       218
       218
       +
             | `From -> Ok (get_start_of_next_month ~tz ())

     

       219
       219
       +
             | `To -> Ok (get_end_of_next_month ~tz ()))

     

       189
       220
        
         | _ ->

     

       190
       221
        
             (* Try to parse as ISO date *)

     

       191
       222
        
             if Re.Pcre.pmatch ~rex:iso_date_regex expr then

     
···

       203
       234
        
               in

     

       204
       235
        
               match Timedesc.Date.Ymd.make ~year ~month ~day with

     

       205
       236
        
               | Ok date ->

     

       206
       206
       -
                   let midnight = Timedesc.Time.make_exn ~hour:0 ~minute:0 ~second:0 () in

     

       207
       207
       -
                   let dt = Timedesc.of_date_and_time_exn date midnight in

     

       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

     

       208
       241
        
                   Ok (timedesc_to_ptime dt)

     

       209
       242
        
               | Error _ -> Error (`Msg (Printf.sprintf "Invalid date: %s" expr))

     

       210
       243
        
               (* Try to parse as relative expression +Nd, -Nd, etc. *)

     
···

       221
       254
        
               in

     

       222
       255
        
               let multiplier = if sign = "+" then 1 else -1 in

     

       223
       256
        
               let value = num * multiplier in

     

       224
       224
       -
               let today = !get_today () in

     

       257
       257
       +
               let today = !get_today ~tz () in

     

       225
       258
        
               match unit with

     

       226
       259
        
               | "d" -> Ok (add_days today value)

     

       227
       260
        
               | "w" -> (

     
···

       261
       294
        
           Error

     

       262
       295
        
             (`Msg (Printf.sprintf "Error parsing time: %s" (Printexc.to_string e)))

     

       263
       296
        
       

     

       264
       264
       -
       let parse_date_time ~date ~time parameter =

     

       265
       265
       -
         let* date_ptime = parse_date date parameter in

     

       266
       266
       -
         let* (h, min, s) = parse_time time in

     

       267
       267
       -
         

     

       268
       268
       -
         let dt = ptime_to_timedesc date_ptime in

     

       297
       297
       +
       let parse_date_time ?(tz = !default_timezone ()) ~date ~time parameter =

     

       298
       298
       +
         let* date_ptime = parse_date date parameter ~tz in

     

       299
       299
       +
         let* h, min, s = parse_time time in

     

       300
       300
       +
       

     

       301
       301
       +
         let dt = ptime_to_timedesc ~tz date_ptime in

     

       269
       302
        
         let date_part = Timedesc.date dt in

     

       270
       270
       -
         

     

       303
       303
       +
       

     

       271
       304
        
         (* Create time *)

     

       272
       305
        
         match Timedesc.Time.make ~hour:h ~minute:min ~second:s () with

     

       273
       273
       -
         | Ok time_part ->

     

       306
       306
       +
         | Ok time_part -> (

     

       274
       307
        
             (* Combine date and time *)

     

       275
       275
       -
             (match Timedesc.of_date_and_time date_part time_part with

     

       308
       308
       +
             match Timedesc.of_date_and_time ~tz date_part time_part with

     

       276
       309
        
             | Ok combined -> Ok (timedesc_to_ptime combined)

     

       277
       310
        
             | Error _ -> Error (`Msg "Invalid date-time combination"))

     

       278
       311
        
         | Error _ -> Error (`Msg "Invalid time for date-time combination")

     

       279
       312
        
       

     

       280
       280
       -
       let parse_date_time_opt ~date ?time parameter =

     

       281
       281
       -
         match time with

     

       282
       282
       -
         | None -> parse_date date parameter

     

       283
       283
       -
         | Some time -> parse_date_time ~date ~time parameter

     

       313
       313
       +
       let ptime_of_ical = function

     

       314
       314
       +
         | `Datetime (`Utc t) -> t

     

       315
       315
       +
         | `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

     

       321
       321
       +
             let ts = Timedesc.Utils.timestamp_of_ptime t in

     

       322
       322
       +
             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"

     

       326
       326
       +
             in

     

       327
       327
       +
             timedesc_to_ptime dt

     

       328
       328
       +
         | `Datetime (`With_tzid (t, (_, tzid))) ->

     

       329
       329
       +
             let tz =

     

       330
       330
       +
               match Timedesc.Time_zone.make tzid with

     

       331
       331
       +
               | 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)

     

       336
       336
       +
             in

     

       337
       337
       +
             let ts = Timedesc.Utils.timestamp_of_ptime t in

     

       338
       338
       +
             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"

     

       342
       342
       +
             in

     

       343
       343
       +
             timedesc_to_ptime dt

     

       344
       344
       +
         | `Date date -> (

     

       345
       345
       +
           let y, m, d = date in

     

       346
       346
       +
           match Timedesc.Date.Ymd.make ~year:y ~month:m ~day:d with

     

       347
       347
       +
           | Ok new_date ->

     

       348
       348
       +
             let midnight = Timedesc.Time.make_exn ~hour:0 ~minute:0 ~second:0 () in

     

       349
       349
       +
               let new_dt = Timedesc.of_date_and_time_exn new_date midnight in

     

       350
       350
       +
               timedesc_to_ptime new_dt

     

       351
       351
       +
           | Error _ -> 

     

       352
       352
       +
                 failwith (Printf.sprintf "Invalid date %d-%d-%d" y m d))

+65 -37

lib/date.mli

···

       1
       1
       -
       val get_today : (unit -> Ptime.t) ref

     

       2
       2
       -
       (** Get the current date at midnight. This is a reference to support testing.

     

       3
       3
       -
           Returns the date or raises an exception if the date cannot be determined. *)

     

       1
       1
       +
       val default_timezone : (unit -> Timedesc.Time_zone.t) ref

     

       2
       2
       +
       (** Default timezone to use for date operations. Defaults to the local timezone

     

       3
       3
       +
           of the system, falling back to UTC if local timezone cannot be determined.

     

       4
       4
       +
       *)

     

       5
       5
       +
       

     

       6
       6
       +
       val timedesc_to_ptime : Timedesc.t -> Ptime.t

     

       7
       7
       +
       (** Convert a Timedesc.t to a Ptime.t. *)

     

       8
       8
       +
       

     

       9
       9
       +
       val ptime_to_timedesc : ?tz:Timedesc.Time_zone.t -> Ptime.t -> Timedesc.t

     

       10
       10
       +
       (** Convert a Ptime.t to a Timedesc.t with the specified timezone. If no

     

       11
       11
       +
           timezone is provided, uses the default_timezone. *)

     

       12
       12
       +
       

     

       13
       13
       +
       val get_today : (?tz:Timedesc.Time_zone.t -> unit -> Ptime.t) ref

     

       14
       14
       +
       (** Get the current date at midnight in the specified timezone. If no timezone

     

       15
       15
       +
           is provided, uses the default_timezone. This is a reference to support

     

       16
       16
       +
           testing. Returns the date or raises an exception if the date cannot be

     

       17
       17
       +
           determined. *)

     

       4
       18
        
       

     

       5
       19
        
       val to_end_of_day : Ptime.t -> Ptime.t

     

       6
       20
        
       (** Converts a date with midnight time (00:00:00) to the same date with

     
···

       28
       42
        
       (** Get the start of the week (Monday) for the given date. Raises an exception

     

       29
       43
        
           if the date cannot be calculated. *)

     

       30
       44
        
       

     

       31
       31
       -
       val get_start_of_current_week : unit -> Ptime.t

     

       32
       32
       -
       (** Get the start of the current week. Raises an exception if the date cannot be

     

       33
       33
       -
           calculated. *)

     

       45
       45
       +
       val get_start_of_current_week : ?tz:Timedesc.Time_zone.t -> unit -> Ptime.t

     

       46
       46
       +
       (** Get the start of the current week in the specified timezone. If no timezone

     

       47
       47
       +
           is provided, uses the default_timezone. Raises an exception if the date

     

       48
       48
       +
           cannot be calculated. *)

     

       34
       49
        
       

     

       35
       35
       -
       val get_start_of_next_week : unit -> Ptime.t

     

       36
       36
       -
       (** Get the start of next week. Raises an exception if the date cannot be

     

       37
       37
       -
           calculated. *)

     

       50
       50
       +
       val get_start_of_next_week : ?tz:Timedesc.Time_zone.t -> unit -> Ptime.t

     

       51
       51
       +
       (** Get the start of next week in the specified timezone. If no timezone is

     

       52
       52
       +
           provided, uses the default_timezone. Raises an exception if the date cannot

     

       53
       53
       +
           be calculated. *)

     

       38
       54
        
       

     

       39
       55
        
       val get_end_of_week : Ptime.t -> Ptime.t

     

       40
       56
        
       (** Get the end of the week (Monday) for the given date. Raises an exception if

     

       41
       57
        
           the date cannot be calculated. *)

     

       42
       58
        
       

     

       43
       43
       -
       val get_end_of_current_week : unit -> Ptime.t

     

       44
       44
       -
       (** Get the end of the current week. Raises an exception if the date cannot be

     

       45
       45
       -
           calculated. *)

     

       59
       59
       +
       val get_end_of_current_week : ?tz:Timedesc.Time_zone.t -> unit -> Ptime.t

     

       60
       60
       +
       (** Get the end of the current week in the specified timezone. If no timezone is

     

       61
       61
       +
           provided, uses the default_timezone. Raises an exception if the date cannot

     

       62
       62
       +
           be calculated. *)

     

       46
       63
        
       

     

       47
       47
       -
       val get_end_of_next_week : unit -> Ptime.t

     

       48
       48
       -
       (** Get the end of next week. Raises an exception if the date cannot be

     

       49
       49
       -
           calculated. *)

     

       64
       64
       +
       val get_end_of_next_week : ?tz:Timedesc.Time_zone.t -> unit -> Ptime.t

     

       65
       65
       +
       (** Get the end of next week in the specified timezone. If no timezone is

     

       66
       66
       +
           provided, uses the default_timezone. Raises an exception if the date cannot

     

       67
       67
       +
           be calculated. *)

     

       50
       68
        
       

     

       51
       69
        
       val get_start_of_month : Ptime.t -> Ptime.t

     

       52
       70
        
       (** Get the start of the month for the given date. Raises an exception if the

     

       53
       71
        
           date cannot be calculated. *)

     

       54
       72
        
       

     

       55
       55
       -
       val get_start_of_current_month : unit -> Ptime.t

     

       56
       56
       -
       (** Get the start of the current month. Raises an exception if the date cannot

     

       57
       57
       -
           be calculated. *)

     

       73
       73
       +
       val get_start_of_current_month : ?tz:Timedesc.Time_zone.t -> unit -> Ptime.t

     

       74
       74
       +
       (** Get the start of the current month in the specified timezone. If no timezone

     

       75
       75
       +
           is provided, uses the default_timezone. Raises an exception if the date

     

       76
       76
       +
           cannot be calculated. *)

     

       58
       77
        
       

     

       59
       59
       -
       val get_start_of_next_month : unit -> Ptime.t

     

       60
       60
       -
       (** Get the start of next month. Raises an exception if the date cannot be

     

       61
       61
       -
           calculated. *)

     

       78
       78
       +
       val get_start_of_next_month : ?tz:Timedesc.Time_zone.t -> unit -> Ptime.t

     

       79
       79
       +
       (** Get the start of next month in the specified timezone. If no timezone is

     

       80
       80
       +
           provided, uses the default_timezone. Raises an exception if the date cannot

     

       81
       81
       +
           be calculated. *)

     

       62
       82
        
       

     

       63
       63
       -
       val get_end_of_current_month : unit -> Ptime.t

     

       64
       64
       -
       (** Get the end of the current month. Raises an exception if the date cannot be

     

       65
       65
       -
           calculated. *)

     

       83
       83
       +
       val get_end_of_current_month : ?tz:Timedesc.Time_zone.t -> unit -> Ptime.t

     

       84
       84
       +
       (** Get the end of the current month in the specified timezone. If no timezone

     

       85
       85
       +
           is provided, uses the default_timezone. Raises an exception if the date

     

       86
       86
       +
           cannot be calculated. *)

     

       66
       87
        
       

     

       67
       67
       -
       val get_end_of_next_month : unit -> Ptime.t

     

       68
       68
       -
       (** Get the end of next month. Raises an exception if the date cannot be

     

       69
       69
       -
           calculated. *)

     

       88
       88
       +
       val get_end_of_next_month : ?tz:Timedesc.Time_zone.t -> unit -> Ptime.t

     

       89
       89
       +
       (** Get the end of next month in the specified timezone. If no timezone is

     

       90
       90
       +
           provided, uses the default_timezone. Raises an exception if the date cannot

     

       91
       91
       +
           be calculated. *)

     

       70
       92
        
       

     

       71
       93
        
       val get_end_of_month : Ptime.t -> Ptime.t

     

       72
       94
        
       (** Get the end of the month for the given date. Raises an exception if the date

     

       73
       95
        
           cannot be calculated. *)

     

       74
       96
        
       

     

       75
       97
        
       val convert_relative_date_formats :

     

       98
       98
       +
         ?tz:Timedesc.Time_zone.t ->

     

       76
       99
        
         today:bool ->

     

       77
       100
        
         tomorrow:bool ->

     

       78
       101
        
         week:bool ->

     

       79
       102
        
         month:bool ->

     

       103
       103
       +
         unit ->

     

       80
       104
        
         (Ptime.t * Ptime.t) option

     

       81
       81
       -
       (** Converts relative date formats to determine from/to dates. Returns a tuple

     

       82
       82
       -
           of (start_date, end_date) or raises an exception if the dates could not be

     

       83
       83
       -
           determined. **)

     

       105
       105
       +
       (** Converts relative date formats to determine from/to dates in the specified

     

       106
       106
       +
           timezone. If no timezone is provided, uses the default_timezone. Returns a

     

       107
       107
       +
           tuple of (start_date, end_date) or raises an exception if the dates could

     

       108
       108
       +
           not be determined. **)

     

       84
       109
        
       

     

       85
       110
        
       val parse_date :

     

       86
       86
       -
         string -> [ `To | `From ] -> (Ptime.t, [> `Msg of string ]) result

     

       111
       111
       +
         ?tz:Timedesc.Time_zone.t ->

     

       112
       112
       +
         string ->

     

       113
       113
       +
         [ `To | `From ] ->

     

       114
       114
       +
         (Ptime.t, [> `Msg of string ]) result

     

       87
       115
        
       (** Parse a date string that could be ISO format (YYYY-MM-DD) or a relative

     

       88
       88
       -
           expression.

     

       116
       116
       +
           expression in the specified timezone. If no timezone is provided, uses the

     

       117
       117
       +
           default_timezone.

     

       89
       118
        
       

     

       90
       119
        
           Supported formats:

     

       91
       120
        
           - ISO format: "YYYY-MM-DD"

     
···

       107
       136
        
           minute, second) or Error with a message. **)

     

       108
       137
        
       

     

       109
       138
        
       val parse_date_time :

     

       139
       139
       +
         ?tz:Timedesc.Time_zone.t ->

     

       110
       140
        
         date:string ->

     

       111
       141
        
         time:string ->

     

       112
       142
        
         [ `To | `From ] ->

     

       113
       143
        
         (Ptime.t, [> `Msg of string ]) result

     

       144
       144
       +
       (** Parse a date and time string in the specified timezone. If no timezone is

     

       145
       145
       +
           provided, uses the default_timezone. *)

     

       114
       146
        
       

     

       115
       115
       -
       val parse_date_time_opt :

     

       116
       116
       -
         date:string ->

     

       117
       117
       -
         ?time:string ->

     

       118
       118
       -
         [ `To | `From ] ->

     

       119
       119
       -
         (Ptime.t, [> `Msg of string ]) result

     

       147
       147
       +
       val ptime_of_ical : Icalendar.date_or_datetime -> Ptime.t

+18 -26

lib/event.ml

···

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

     

       5
       5
        
       type date_error = [ `Msg of string ]

     

       6
       6
        
       

     

       7
       7
       -
       (* TODO handle timezones *)

     

       8
       8
       -
       let ptime_of_datetime = function

     

       9
       9
       -
         | `Datetime (`Utc t) -> t

     

       10
       10
       -
         | `Datetime (`Local t) -> t

     

       11
       11
       -
         | `Datetime (`With_tzid (t, _)) -> t

     

       12
       12
       -
         | `Date date -> (

     

       13
       13
       -
             match Ptime.of_date date with

     

       14
       14
       -
             | Some t -> t

     

       15
       15
       -
             | None ->

     

       16
       16
       -
                 let year, month, day = date in

     

       17
       17
       -
                 failwith (Printf.sprintf "Invalid date %d-%d-%d" year month day))

     

       18
       18
       -
       

     

       19
       7
        
       let generate_uuid () =

     

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

     

       21
       9
        
         Uuidm.to_string uuid

     
···

       24
       12
        
         let uuid = generate_uuid () in

     

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

     

       26
       14
        
         let file_name = uuid ^ ".ics" in

     

       27
       27
       -
         let dtstart = (Params.empty, `Datetime (`Utc start)) in

     

       28
       28
       -
         let dtend_or_duration =

     

       29
       29
       -
           Option.map (fun d -> `Dtend (Params.empty, `Datetime (`Utc d))) end_

     

       30
       30
       -
         in

     

       15
       15
       +
         let dtstart = (Params.empty, start) in

     

       16
       16
       +
         let dtend_or_duration = end_ in

     

       31
       17
        
         let rrule = Option.map (fun r -> (Params.empty, r)) recurrence in

     

       32
       18
        
         let now = Ptime_clock.now () in

     

       33
       19
        
         let props = [ `Summary (Params.empty, summary) ] in

     
···

       58
       44
        
         let now = Ptime_clock.now () in

     

       59
       45
        
         let uid = t.ical.uid in

     

       60
       46
        
         let dtstart =

     

       61
       61
       -
           match start with

     

       62
       62
       -
           | None -> t.ical.dtstart

     

       63
       63
       -
           | Some s -> (Params.empty, `Datetime (`Utc s))

     

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

     

       64
       48
        
         in

     

       65
       49
        
         let dtend_or_duration =

     

       66
       66
       -
           match end_ with

     

       67
       67
       -
           | None -> t.ical.dtend_or_duration

     

       68
       68
       -
           | Some d -> Some (`Dtend (Params.empty, `Datetime (`Utc d)))

     

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

     

       69
       51
        
         in

     

       70
       52
        
         let rrule =

     

       71
       53
        
           match recurrence with

     
···

       145
       127
        
         | s :: _ -> Some s

     

       146
       128
        
         | _ -> None

     

       147
       129
        
       

     

       148
       148
       -
       let get_start t = ptime_of_datetime (snd t.ical.dtstart)

     

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

     

       149
       131
        
       

     

       150
       132
        
       let get_end t =

     

       151
       133
        
         match t.ical.dtend_or_duration with

     

       152
       152
       -
         | Some (`Dtend (_, d)) -> Some (ptime_of_datetime d)

     

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

     

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

     

       154
       136
        
             let start = get_start t in

     

       155
       137
        
             match Ptime.add_span start span with

     
···

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

     

       162
       144
        
         | None -> None

     

       163
       145
        
       

     

       146
       146
       +
       let get_start_timezone t =

     

       147
       147
       +
         match t.ical.dtstart with

     

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

     

       149
       149
       +
         | _ -> None

     

       150
       150
       +
       

     

       151
       151
       +
       let get_end_timezone t =

     

       152
       152
       +
         match t.ical.dtend_or_duration with

     

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

     

       154
       154
       +
         | _ -> None

     

       155
       155
       +
       

     

       164
       156
        
       let get_duration t =

     

       165
       157
        
         match t.ical.dtend_or_duration with

     

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

     

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

     

       168
       168
       -
             let span = Ptime.diff (ptime_of_datetime e) (get_start t) in

     

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

     

       169
       161
        
             Some span

     

       170
       162
        
         | None -> None

     

       171
       163
        
       

     

       172
       172
       -
       let get_day_event t =

     

       164
       164
       +
       let is_date t =

     

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

     

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

     

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

+31 -8

lib/event.mli

···

       7
       7
        
       (** Event type representing a calendar event *)

     

       8
       8
        
       

     

       9
       9
        
       type date_error = [ `Msg of string ]

     

       10
       10
       -
       (** Type for date-related errors *)

     

       11
       10
        
       

     

       12
       11
        
       val create :

     

       13
       12
        
         summary:string ->

     

       14
       14
       -
         start:Ptime.t ->

     

       15
       15
       -
         ?end_:Ptime.t ->

     

       13
       13
       +
         start:Icalendar.date_or_datetime ->

     

       14
       14
       +
         ?end_:

     

       15
       15
       +
           [ `Duration of Icalendar.params * Ptime.Span.t

     

       16
       16
       +
           | `Dtend of Icalendar.params * Icalendar.date_or_datetime ] ->

     

       16
       17
        
         ?location:string ->

     

       17
       18
        
         ?description:string ->

     

       18
       19
        
         ?recurrence:Icalendar.recurrence ->

     

       19
       20
        
         Collection.t ->

     

       20
       21
        
         t

     

       21
       21
       -
       (** Create a new event with required properties *)

     

       22
       22
       +
       (** Create a new event with required properties.

     

       23
       23
       +
       

     

       24
       24
       +
           The start and end times can be specified as Icalendar.timestamp values,

     

       25
       25
       +
           which allows for directly using any of the three RFC5545 time formats:

     

       26
       26
       +
           - `Utc time: Fixed to absolute UTC time

     

       27
       27
       +
           - `Local time: Floating local time (follows user's timezone)

     

       28
       28
       +
           - `With_tzid (time, timezone): Local time with timezone reference *)

     

       22
       29
        
       

     

       23
       30
        
       val edit :

     

       24
       31
        
         ?summary:string ->

     

       25
       25
       -
         ?start:Ptime.t ->

     

       26
       26
       -
         ?end_:Ptime.t ->

     

       32
       32
       +
         ?start:Icalendar.date_or_datetime ->

     

       33
       33
       +
         ?end_:

     

       34
       34
       +
           [ `Duration of Icalendar.params * Ptime.Span.t

     

       35
       35
       +
           | `Dtend of Icalendar.params * Icalendar.date_or_datetime ] ->

     

       27
       36
        
         ?location:string ->

     

       28
       37
        
         ?description:string ->

     

       29
       38
        
         ?recurrence:Icalendar.recurrence ->

     

       30
       39
        
         t ->

     

       31
       40
        
         t

     

       32
       32
       -
       (** Edit an existing event *)

     

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

     

       33
       42
        
       

     

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

     

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

     
···

       39
       48
        
       

     

       40
       49
        
       val get_id : t -> event_id

     

       41
       50
        
       val get_summary : t -> string option

     

       51
       51
       +
       

     

       42
       52
        
       val get_start : t -> Ptime.t

     

       53
       53
       +
       (** Get the start time of an event. Note that local times are converted to UTC

     

       54
       54
       +
           based on their timezone information. If no timezone is specified, the system

     

       55
       55
       +
           timezone is used. *)

     

       56
       56
       +
       

     

       43
       57
        
       val get_end : t -> Ptime.t option

     

       58
       58
       +
       (** Get the end time of an event. Like get_start, times are converted to UTC

     

       59
       59
       +
           based on timezone information. Returns None if the event doesn't have an end

     

       60
       60
       +
           time. *)

     

       61
       61
       +
       

     

       62
       62
       +
       val is_date : t -> bool

     

       63
       63
       +
       (** Returns true if either the start or end timestamp is specified as a date

     

       64
       64
       +
           instead of a datetime. *)

     

       65
       65
       +
       

     

       66
       66
       +
       val get_start_timezone : t -> string option

     

       67
       67
       +
       val get_end_timezone : t -> string option

     

       44
       68
        
       val get_duration : t -> Ptime.span option

     

       45
       45
       -
       val get_day_event : t -> bool

     

       46
       69
        
       val get_location : t -> string option

     

       47
       70
        
       val get_description : t -> string option

     

       48
       71
        
       val get_recurrence : t -> Icalendar.recurrence option

+79 -66

lib/format.ml

···

       1
       1
       -
       type format = [ `Text | `Json | `Csv | `Ics | `Entries | `Sexp ]

     

       2
       2
       -
       

     

       3
       3
       -
       let ptime_to_timedesc ptime =

     

       4
       4
       -
         let ts = Timedesc.Utils.timestamp_of_ptime ptime in

     

       5
       5
       -
         match Timedesc.of_timestamp ts with

     

       6
       6
       -
         | Some dt -> dt

     

       7
       7
       -
         | None -> failwith "Invalid date conversion from Ptime to Timedesc"

     

       1
       1
       +
       type format = [ `Text | `Entries | `Json | `Csv | `Ics | `Sexp ]

     

       8
       2
        
       

     

       9
       9
       -
       let format_date date =

     

       10
       10
       -
         let dt = ptime_to_timedesc date in

     

       3
       3
       +
       let format_date ?tz date =

     

       4
       4
       +
         let dt = Date.ptime_to_timedesc ?tz date in

     

       11
       5
        
         let y = Timedesc.year dt in

     

       12
       6
        
         let m = Timedesc.month dt in

     

       13
       7
        
         let d = Timedesc.day dt in

     
···

       23
       17
        
         in

     

       24
       18
        
         Printf.sprintf "%04d-%02d-%02d %s" y m d weekday

     

       25
       19
        
       

     

       26
       26
       -
       let format_time date =

     

       27
       27
       -
         let _, ((h, m, _), _) = Ptime.to_date_time date in

     

       20
       20
       +
       let format_time ?tz date =

     

       21
       21
       +
         let dt = Date.ptime_to_timedesc ?tz date in

     

       22
       22
       +
         let h = Timedesc.hour dt in

     

       23
       23
       +
         let m = Timedesc.minute dt in

     

       28
       24
        
         Printf.sprintf "%02d:%02d" h m

     

       29
       25
        
       

     

       30
       30
       -
       let format_datetime date =

     

       31
       31
       -
         Printf.sprintf "%s %s" (format_date date) (format_time date)

     

       26
       26
       +
       let format_datetime ?tz date =

     

       27
       27
       +
         let tz_str =

     

       28
       28
       +
           match tz with

     

       29
       29
       +
           | Some tz -> Printf.sprintf "(%s)" (Timedesc.Time_zone.name tz)

     

       30
       30
       +
           | None -> ""

     

       31
       31
       +
         in

     

       32
       32
       +
         Printf.sprintf "%s %s%s" (format_date ?tz date) (format_time ?tz date) tz_str

     

       32
       33
        
       

     

       33
       34
        
       let next_day day ~next =

     

       34
       35
        
         let y1, m1, d1 = Ptime.to_date day in

     
···

       123
       124
        
             recur_to_ics recur)

     

       124
       125
        
           l

     

       125
       126
        
       

     

       126
       126
       -
       let format_alt ~format ~start ~end_ event =

     

       127
       127
       +
       let format_alt ~format ~start ~end_ ?tz event =

     

       127
       128
        
         let open Event in

     

       128
       129
        
         match format with

     

       129
       130
        
         | `Text ->

     

       130
       131
        
             let id = get_id event in

     

       131
       131
       -
             let start_date = " " ^ format_date start in

     

       132
       132
       +
             let start_date = " " ^ format_date ?tz start in

     

       132
       133
        
             let start_time =

     

       133
       133
       -
               match get_day_event event with

     

       134
       134
       +
               match is_date event with

     

       134
       135
        
               | true -> ""

     

       135
       135
       -
               | false -> " " ^ format_time start

     

       136
       136
       +
               | false -> " " ^ format_time ?tz start

     

       136
       137
        
             in

     

       137
       138
        
             let end_date, end_time =

     

       138
       139
        
               match end_ with

     

       139
       140
        
               | None -> ("", "")

     

       140
       141
        
               | Some end_ -> (

     

       141
       141
       -
                   match (get_day_event event, next_day start ~next:end_) with

     

       142
       142
       +
                   match (is_date event, next_day start ~next:end_) with

     

       142
       143
        
                   | true, true -> ("", "")

     

       143
       143
       -
                   | true, _ -> (" - " ^ format_date end_, "")

     

       144
       144
       -
                   | false, true -> ("", " - " ^ format_time end_)

     

       145
       145
       -
                   | false, _ -> (" - " ^ format_date end_, " " ^ format_time end_))

     

       144
       144
       +
                   | true, _ -> (" - " ^ format_date ?tz end_, "")

     

       145
       145
       +
                   | false, true -> ("", " - " ^ format_time ?tz end_)

     

       146
       146
       +
                   | false, _ ->

     

       147
       147
       +
                       (" - " ^ format_date ?tz end_, " " ^ format_time ?tz end_))

     

       146
       148
        
             in

     

       147
       149
        
             let summary =

     

       148
       150
        
               match get_summary event with

     
···

       156
       158
        
             in

     

       157
       159
        
             Printf.sprintf "%-45s%s%s%s%s%s%s" id start_date start_time end_date

     

       158
       160
        
               end_time summary location

     

       161
       161
       +
         | `Entries ->

     

       162
       162
       +
             let format_opt label f opt =

     

       163
       163
       +
               Option.map (fun x -> Printf.sprintf "%s: %s\n" label (f x)) opt

     

       164
       164
       +
               |> Option.value ~default:""

     

       165
       165
       +
             in

     

       166
       166
       +
             let format timezone datetime =

     

       167
       167
       +
               match is_date event with

     

       168
       168
       +
               | true -> format_date ?tz datetime

     

       169
       169
       +
               | false -> (

     

       170
       170
       +
                   format_datetime ?tz datetime

     

       171
       171
       +
                   ^ match timezone with None -> "" | Some t -> " (" ^ t ^ ")")

     

       172
       172
       +
             in

     

       173
       173
       +
             let start_str =

     

       174
       174
       +
               format_opt "Start" (format (get_start_timezone event)) (Some start)

     

       175
       175
       +
             in

     

       176
       176
       +
             let end_str = format_opt "End" (format (get_end_timezone event)) end_ in

     

       177
       177
       +
             let location_str = format_opt "Location" Fun.id (get_location event) in

     

       178
       178
       +
             let description_str =

     

       179
       179
       +
               format_opt "Description" Fun.id (get_description event)

     

       180
       180
       +
             in

     

       181
       181
       +
             let rrule_str =

     

       182
       182
       +
               Option.map

     

       183
       183
       +
                 (fun r ->

     

       184
       184
       +
                   let buf = Buffer.create 128 in

     

       185
       185
       +
                   recurs_to_ics r buf;

     

       186
       186
       +
                   Printf.sprintf "%s: %s\n" "Reccurence" (Buffer.contents buf))

     

       187
       187
       +
                 (get_recurrence event)

     

       188
       188
       +
               |> Option.value ~default:""

     

       189
       189
       +
             in

     

       190
       190
       +
             let summary_str = format_opt "Summary" Fun.id (get_summary event) in

     

       191
       191
       +
             Printf.sprintf "%s%s%s%s%s%s" summary_str start_str end_str location_str

     

       192
       192
       +
               description_str rrule_str

     

       159
       193
        
         | `Json ->

     

       160
       194
        
             let open Yojson.Safe in

     

       161
       195
        
             let json =

     
···

       166
       200
        
                     match get_summary event with

     

       167
       201
        
                     | Some summary -> `String summary

     

       168
       202
        
                     | None -> `Null );

     

       169
       169
       -
                   ("start", `String (format_datetime start));

     

       203
       203
       +
                   ("start", `String (format_datetime ?tz start));

     

       170
       204
        
                   ( "end",

     

       171
       205
        
                     match end_ with

     

       172
       172
       -
                     | Some e -> `String (format_datetime e)

     

       206
       206
       +
                     | Some e -> `String (format_datetime ?tz e)

     

       173
       207
        
                     | None -> `Null );

     

       174
       208
        
                   ( "location",

     

       175
       209
        
                     match get_location event with

     
···

       189
       223
        
             let summary =

     

       190
       224
        
               match get_summary event with Some summary -> summary | None -> ""

     

       191
       225
        
             in

     

       192
       192
       -
             let start = format_datetime start in

     

       226
       226
       +
             let start = format_datetime ?tz start in

     

       193
       227
        
             let end_str =

     

       194
       194
       -
               match end_ with Some e -> format_datetime e | None -> ""

     

       228
       228
       +
               match end_ with Some e -> format_datetime ?tz e | None -> ""

     

       195
       229
        
             in

     

       196
       230
        
             let location =

     

       197
       231
        
               match get_location event with Some loc -> loc | None -> ""

     
···

       205
       239
        
             let cal_props = [] in

     

       206
       240
        
             let event_ical = Event.to_icalendar event in

     

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

     

       208
       208
       -
         | `Entries ->

     

       209
       209
       -
             let summary =

     

       210
       210
       -
               match get_summary event with Some summary -> summary | None -> ""

     

       211
       211
       -
             in

     

       212
       212
       -
             let start = format_datetime start in

     

       213
       213
       -
             let end_str =

     

       214
       214
       -
               match end_ with Some e -> format_datetime e | None -> ""

     

       215
       215
       -
             in

     

       216
       216
       -
             let location =

     

       217
       217
       -
               match get_location event with Some loc -> loc | None -> ""

     

       218
       218
       -
             in

     

       219
       219
       -
             let description =

     

       220
       220
       -
               match get_description event with Some desc -> desc | None -> ""

     

       221
       221
       -
             in

     

       222
       222
       -
             let rrule =

     

       223
       223
       -
               match get_recurrence event with

     

       224
       224
       -
               | Some r ->

     

       225
       225
       -
                   let buf = Buffer.create 128 in

     

       226
       226
       -
                   recurs_to_ics r buf;

     

       227
       227
       -
                   Buffer.contents buf

     

       228
       228
       -
               | None -> ""

     

       229
       229
       -
             in

     

       230
       230
       -
             Printf.sprintf "%s: %s\n%s: %s\n%s: %s\n%s: %s\n%s: %s\n%s: %s" "Summary"

     

       231
       231
       -
               summary "Start" start "End" end_str "Location" location "Description"

     

       232
       232
       -
               description "Reccurence" rrule

     

       233
       242
        
         | `Sexp ->

     

       234
       243
        
             let summary =

     

       235
       244
        
               match get_summary event with Some summary -> summary | None -> ""

     

       236
       245
        
             in

     

       237
       246
        
             let start_date, start_time =

     

       238
       238
       -
               let dt = ptime_to_timedesc start in

     

       247
       247
       +
               let dt = Date.ptime_to_timedesc ?tz start in

     

       239
       248
        
               let y = Timedesc.year dt in

     

       240
       249
        
               let m = Timedesc.month dt in

     

       241
       250
        
               let d = Timedesc.day dt in

     
···

       258
       267
        
             let end_str =

     

       259
       268
        
               match end_ with

     

       260
       269
        
               | Some end_date ->

     

       261
       261
       -
                   let dt = ptime_to_timedesc end_date in

     

       270
       270
       +
                   let dt = Date.ptime_to_timedesc ?tz end_date in

     

       262
       271
        
                   let y = Timedesc.year dt in

     

       263
       272
        
                   let m = Timedesc.month dt in

     

       264
       273
        
                   let d = Timedesc.day dt in

     
···

       300
       309
        
               (String.escaped id) (String.escaped summary) start_date start_time

     

       301
       310
        
               end_str location description calendar

     

       302
       311
        
       

     

       303
       303
       -
       let format_event ?(format = `Text) event =

     

       312
       312
       +
       let format_event ?(format = `Text) ?tz event =

     

       304
       313
        
         format_alt ~format ~start:(Event.get_start event) ~end_:(Event.get_end event)

     

       305
       305
       -
           event

     

       314
       314
       +
           ?tz event

     

       306
       315
        
       

     

       307
       307
       -
       let format_instance ?(format = `Text) instance =

     

       316
       316
       +
       let format_instance ?(format = `Text) ?tz instance =

     

       308
       317
        
         let open Recur in

     

       309
       309
       -
         format_alt ~format ~start:instance.start ~end_:instance.end_ instance.event

     

       318
       318
       +
         format_alt ~format ~start:instance.start ~end_:instance.end_ ?tz

     

       319
       319
       +
           instance.event

     

       310
       320
        
       

     

       311
       311
       -
       let format_events ?(format = `Text) events =

     

       321
       321
       +
       let format_events ?(format = `Text) ?tz events =

     

       312
       322
        
         match format with

     

       313
       323
        
         | `Json ->

     

       314
       324
        
             let json_events =

     

       315
       325
        
               List.map

     

       316
       316
       -
                 (fun e -> Yojson.Safe.from_string (format_event ~format:`Json e))

     

       326
       326
       +
                 (fun e -> Yojson.Safe.from_string (format_event ~format:`Json ?tz e))

     

       317
       327
        
                 events

     

       318
       328
        
             in

     

       319
       329
        
             Yojson.Safe.to_string (`List json_events)

     

       320
       330
        
         | `Csv ->

     

       321
       331
        
             "\"Summary\",\"Start\",\"End\",\"Location\",\"Calendar\"\n"

     

       322
       322
       -
             ^ String.concat "\n" (List.map (format_event ~format:`Csv) events)

     

       332
       332
       +
             ^ String.concat "\n" (List.map (format_event ~format:`Csv ?tz) events)

     

       323
       333
        
         | `Sexp ->

     

       324
       334
        
             "("

     

       325
       335
        
             ^ String.concat "\n "

     

       326
       326
       -
                 (List.map (fun e -> format_event ~format:`Sexp e) events)

     

       336
       336
       +
                 (List.map (fun e -> format_event ~format:`Sexp ?tz e) events)

     

       327
       337
        
             ^ ")"

     

       328
       328
       -
         | _ -> String.concat "\n" (List.map (fun e -> format_event ~format e) events)

     

       338
       338
       +
         | _ ->

     

       339
       339
       +
             String.concat "\n" (List.map (fun e -> format_event ~format ?tz e) events)

     

       329
       340
        
       

     

       330
       330
       -
       let format_instances ?(format = `Text) instances =

     

       341
       341
       +
       let format_instances ?(format = `Text) ?tz instances =

     

       331
       342
        
         match format with

     

       332
       343
        
         | `Json ->

     

       333
       344
        
             let json_instances =

     

       334
       345
        
               List.map

     

       335
       335
       -
                 (fun e -> Yojson.Safe.from_string (format_instance ~format:`Json e))

     

       346
       346
       +
                 (fun e ->

     

       347
       347
       +
                   Yojson.Safe.from_string (format_instance ~format:`Json ?tz e))

     

       336
       348
        
                 instances

     

       337
       349
        
             in

     

       338
       350
        
             Yojson.Safe.to_string (`List json_instances)

     

       339
       351
        
         | `Csv ->

     

       340
       352
        
             "\"Summary\",\"Start\",\"End\",\"Location\",\"Calendar\"\n"

     

       341
       341
       -
             ^ String.concat "\n" (List.map (format_instance ~format:`Csv) instances)

     

       353
       353
       +
             ^ String.concat "\n"

     

       354
       354
       +
                 (List.map (format_instance ~format:`Csv ?tz) instances)

     

       342
       355
        
         | `Sexp ->

     

       343
       356
        
             "("

     

       344
       357
        
             ^ String.concat "\n "

     

       345
       345
       -
                 (List.map (fun e -> format_instance ~format:`Sexp e) instances)

     

       358
       358
       +
                 (List.map (fun e -> format_instance ~format:`Sexp ?tz e) instances)

     

       346
       359
        
             ^ ")"

     

       347
       360
        
         | _ ->

     

       348
       361
        
             String.concat "\n"

     

       349
       349
       -
               (List.map (fun e -> format_instance ~format e) instances)

     

       362
       362
       +
               (List.map (fun e -> format_instance ~format ?tz e) instances)

+13 -9

lib/format.mli

···

       1
       1
        
       (** Functions for formatting various data structures as strings *)

     

       2
       2
        
       

     

       3
       3
       -
       type format = [ `Text | `Json | `Csv | `Ics | `Entries | `Sexp ]

     

       3
       3
       +
       type format = [ `Text | `Entries | `Json | `Csv | `Ics | `Sexp ]

     

       4
       4
        
       (** Format type for output *)

     

       5
       5
        
       

     

       6
       6
        
       (** Functions for formatting specific event types *)

     

       7
       7
       -
       val format_event : ?format:format -> Event.t -> string

     

       8
       8
       -
       (** Format a single event *)

     

       7
       7
       +
       val format_event :

     

       8
       8
       +
         ?format:format -> ?tz:Timedesc.Time_zone.t -> Event.t -> string

     

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

     

       9
       10
        
       

     

       10
       10
       -
       val format_instance : ?format:format -> Recur.instance -> string

     

       11
       11
       -
       (** Format a single event instance *)

     

       11
       11
       +
       val format_instance :

     

       12
       12
       +
         ?format:format -> ?tz:Timedesc.Time_zone.t -> Recur.instance -> string

     

       13
       13
       +
       (** Format a single event instance, optionally using the specified timezone *)

     

       12
       14
        
       

     

       13
       13
       -
       val format_events : ?format:format -> Event.t list -> string

     

       14
       14
       -
       (** Format a list of events *)

     

       15
       15
       +
       val format_events :

     

       16
       16
       +
         ?format:format -> ?tz:Timedesc.Time_zone.t -> Event.t list -> string

     

       17
       17
       +
       (** Format a list of events, optionally using the specified timezone *)

     

       15
       18
        
       

     

       16
       16
       -
       val format_instances : ?format:format -> Recur.instance list -> string

     

       17
       17
       -
       (** Format a list of event instances *)

     

       19
       19
       +
       val format_instances :

     

       20
       20
       +
         ?format:format -> ?tz:Timedesc.Time_zone.t -> Recur.instance list -> string

     

       21
       21
       +
       (** Format a list of event instances, optionally using the specified timezone *)

lib/query.ml

···

       116
       116
        
           | _ -> sorted_events)

     

       117
       117
        
       

     

       118
       118
        
       let query ~fs calendar_dir ?filter ~from ~to_ ?sort_by ?order ?limit () =

     

       119
       119
       +
         Fmt.epr "Querying from %a to %a\n%!" Ptime.pp (Option.get from) Ptime.pp to_;

     

       119
       120
        
         match query_events ~fs calendar_dir ?filter ?sort_by ?order () with

     

       120
       121
        
         | Ok events ->

     

       121
       122
        
             let instances =

+5 -3

lib/recur.ml

···

       14
       14
        
         match rule with

     

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

     

       16
       16
        
         | None ->

     

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

     

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

     

       18
       18
        
             let start = Event.get_start event in

     

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

     

       20
       20
        
             if

     

       21
       21
       -
               Ptime.is_earlier start ~than:to_

     

       21
       21
       +
               Ptime.compare start to_ < 0

     

       22
       22
        
               &&

     

       23
       23
       -
               match from with Some f -> Ptime.is_later end_ ~than:f | None -> true

     

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

     

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

     

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

     

       24
       26
        
             then [ clone_with_time event start ]

     

       25
       27
        
             else []

     

       26
       28
        
         (* We return all instances within the range, regardless of whether the original

+9 -5

test/test_query.ml

···

       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 () -> 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"

     
···

       151
       151
        
           (* Event with text in all fields *)

     

       152
       152
        
           create_test_event ~collection:"search_test" ~summary:"Project Meeting"

     

       153
       153
        
             ~description:"Weekly project status meeting with team"

     

       154
       154
       -
             ~location:"Conference Room A" ~start:fixed_date;

     

       154
       154
       +
             ~location:"Conference Room A"

     

       155
       155
       +
             ~start:(`Datetime (`Utc fixed_date));

     

       155
       156
        
           (* Event with mixed case to test case insensitivity *)

     

       156
       157
        
           create_test_event ~collection:"search_test" ~summary:"IMPORTANT Meeting"

     

       157
       158
        
             ~description:"Critical project review with stakeholders"

     

       158
       158
       -
             ~location:"Executive Suite" ~start:fixed_date;

     

       159
       159
       +
             ~location:"Executive Suite"

     

       160
       160
       +
             ~start:(`Datetime (`Utc fixed_date));

     

       159
       161
        
           (* Event with word fragments *)

     

       160
       162
        
           create_test_event ~collection:"search_test" ~summary:"Conference Call"

     

       161
       163
        
             ~description:"International conference preparation"

     

       162
       162
       -
             ~location:"Remote Meeting Room" ~start:fixed_date;

     

       164
       164
       +
             ~location:"Remote Meeting Room"

     

       165
       165
       +
             ~start:(`Datetime (`Utc fixed_date));

     

       163
       166
        
           (* Event with unique text in each field *)

     

       164
       167
        
           create_test_event ~collection:"search_test" ~summary:"Workshop on Testing"

     

       165
       168
        
             ~description:"Quality Assurance techniques and practices"

     

       166
       166
       -
             ~location:"Training Center" ~start:fixed_date;

     

       169
       169
       +
             ~location:"Training Center"

     

       170
       170
       +
             ~start:(`Datetime (`Utc fixed_date));

     

       167
       171
        
         ]

     

       168
       172
        
       

     

       169
       173
        
       (* Test helper to verify if a list of events contains an event with a given summary *)

+2 -1

test/test_recur.ml

···

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

     

       12
       12
        
         (* Weekly recurrence *)

     

       13
       13
        
         let recurring_event =

     

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

     

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

     

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

     

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

     

       16
       17
        
         in

     

       17
       18
        
         let test_date_range from_str to_str expected_count =