commit 794a1d15db71285c8ee5f707fb4b14c2edc2b16e · ryan.freumh.org/caledonia

+26 -59

bin/add_cmd.ml

···

       57
       57
        
             `P

     

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

     

       59
       59
        
                options to set other details.";

     

       60
       60
       +
             `S Manpage.s_examples;

     

       61
       61
       +
             `I

     

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

     

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

     

       64
       64
       +
             `I

     

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

     

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

     

       67
       67
       +
             `I

     

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

     

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

     

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

     

       71
       71
       +
             `I

     

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

     

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

     

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

     

       75
       75
       +
                  plans\"" );

     

       76
       76
       +
             `I

     

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

     

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

     

       79
       79
       +
                  --calendar work" );

     

       60
       80
        
             `S Manpage.s_options;

     

       61
       81
        
           ]

     

       62
       62
       -
           @ date_format_manpage_entries

     

       63
       63
       -
           @ [

     

       64
       64
       -
               `S Manpage.s_examples;

     

       65
       65
       -
               `I

     

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

     

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

     

       68
       68
       -
               `I

     

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

     

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

     

       71
       71
       -
                 );

     

       72
       72
       -
               `I

     

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

     

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

     

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

     

       76
       76
       -
               `I

     

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

     

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

     

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

     

       80
       80
       -
                    plans\"" );

     

       81
       81
       -
               `I

     

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

     

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

     

       84
       84
       -
                    --calendar work" );

     

       85
       85
       -
               `S "RECURRENCE";

     

       86
       86
       -
               `P

     

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

     

       88
       88
       -
                  required.";

     

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

     

       90
       90
       -
               `I

     

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

     

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

     

       93
       93
       -
                    UNTIL)" );

     

       94
       94
       -
               `I

     

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

     

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

     

       97
       97
       -
               `I

     

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

     

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

     

       100
       100
       -
                 );

     

       101
       101
       -
               `I

     

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

     

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

     

       104
       104
       -
               `I

     

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

     

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

     

       107
       107
       -
               `I

     

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

     

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

     

       110
       110
       -
               `P "Examples:";

     

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

     

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

     

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

     

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

     

       115
       115
       -
               `I

     

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

     

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

     

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

     

       119
       119
       -
             ]

     

       82
       82
       +
           @ date_format_manpage_entries @ recurrence_format_manpage_entries

     

       83
       83
       +
           @ [ `S Manpage.s_see_also ]

     

       84
       84
       +
         in

     

       85
       85
       +
         let exit_info =

     

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

     

       120
       87
        
         in

     

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

     

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

     

       122
       89
        
         Cmd.v info term

+6 -1

bin/delete_cmd.ml

···

       40
       40
        
             `S Manpage.s_examples;

     

       41
       41
        
             `P "Delete an event:";

     

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

     

       43
       43
       +
             `S Manpage.s_options;

     

       43
       44
        
           ]

     

       45
       45
       +
           @ [ `S Manpage.s_see_also ]

     

       44
       46
        
         in

     

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

     

       47
       47
       +
         let exit_info =

     

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

     

       49
       49
       +
         in

     

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

     

       46
       51
        
         Cmd.v info term

+23 -21

bin/edit_cmd.ml

···

       59
       59
        
             `P

     

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

     

       61
       61
        
                event details.";

     

       62
       62
       +
             `S Manpage.s_examples;

     

       63
       63
       +
             `I

     

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

     

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

     

       66
       66
       +
                  Title\"" );

     

       67
       67
       +
             `I

     

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

     

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

     

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

     

       71
       71
       +
             `I

     

       72
       72
       +
               ( "Update the location:",

     

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

     

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

     

       75
       75
       +
             `I

     

       76
       76
       +
               ( "Change the description:",

     

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

     

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

     

       62
       79
        
             `S Manpage.s_options;

     

       63
       80
        
           ]

     

       64
       64
       -
           @ date_format_manpage_entries

     

       65
       65
       -
           @ [

     

       66
       66
       -
               `S Manpage.s_examples;

     

       67
       67
       -
               `I

     

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

     

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

     

       70
       70
       -
                    Title\"" );

     

       71
       71
       -
               `I

     

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

     

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

     

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

     

       75
       75
       -
               `I

     

       76
       76
       -
                 ( "Update the location:",

     

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

     

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

     

       79
       79
       -
               `I

     

       80
       80
       -
                 ( "Change the description:",

     

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

     

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

     

       83
       83
       -
             ]

     

       81
       81
       +
           @ date_format_manpage_entries @ recurrence_format_manpage_entries

     

       82
       82
       +
           @ [ `S Manpage.s_see_also ]

     

       83
       83
       +
         in

     

       84
       84
       +
         let exit_info =

     

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

     

       84
       86
        
         in

     

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

     

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

     

       86
       88
        
         Cmd.v info term

+47 -5

bin/event_args.ml

···

       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:";

     

       83
       83
       +
           `P

     

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

     

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

     

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

     

       87
       87
       +
              month of March.";

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     
···

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

     

       346
       353
        
             Ok recurrence

     

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

     

       355
       355
       +
       

     

       356
       356
       +
       let recurrence_format_manpage_entries =

     

       357
       357
       +
         [

     

       358
       358
       +
           `S "RECURRENCE";

     

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

     

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

     

       361
       361
       +
           `I

     

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

     

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

     

       364
       364
       +
             );

     

       365
       365
       +
           `I

     

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

     

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

     

       368
       368
       +
           `I

     

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

     

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

     

       371
       371
       +
           `I

     

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

     

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

     

       374
       374
       +
           `I

     

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

     

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

     

       377
       377
       +
           `I

     

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

     

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

     

       380
       380
       +
           `P "Examples:";

     

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

     

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

     

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

     

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

     

       385
       385
       +
           `I

     

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

     

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

     

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

     

       389
       389
       +
         ]

+31 -33

bin/list_cmd.ml

···

       2
       2
        
       open Caledonia_lib

     

       3
       3
        
       open Query_args

     

       4
       4
        
       

     

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

     

       6
       6
       -
           ?timezone ~sort ~fs calendar_dir =

     

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

     

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

     

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

     

       8
       8
        
         let tz = Query_args.parse_timezone ~timezone in

     

       9
       9
        
         let* from, to_ =

     
···

       50
       50
        
                   Ok (Some today_date, one_month_later))

     

       51
       51
        
         in

     

       52
       52
        
         let filter =

     

       53
       53
       -
           match calendar with

     

       54
       54
       -
           | Some calendar_name -> Some (Query.in_calendar_names [ calendar_name ])

     

       55
       55
       -
           | None -> None

     

       53
       53
       +
           match calendars with

     

       54
       54
       +
           | [] -> None

     

       55
       55
       +
           | calendar -> Some (Query.in_calendars calendar)

     

       56
       56
        
         in

     

       57
       57
        
         let comparator = Query_args.create_event_comparator sort in

     

       58
       58
        
         let* results =

     
···

       63
       63
        
         Ok ()

     

       64
       64
        
       

     

       65
       65
        
       let cmd ~fs calendar_dir =

     

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

     

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

     

       67
       67
        
             timezone sort =

     

       68
       68
        
           match

     

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

     

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

     

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

     

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

     

       71
       71
        
           with

     

       72
       72
        
           | Error (`Msg msg) ->

     

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

     
···

       84
       84
        
         let man =

     

       85
       85
        
           [

     

       86
       86
        
             `S Manpage.s_description;

     

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

     

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

     

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

     

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

     

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

     

       87
       87
       +
             `P

     

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

     

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

     

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

     

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

     

       92
       92
       +
             `S Manpage.s_examples;

     

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

     

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

     

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

     

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

     

       97
       97
       +
             `I

     

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

     

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

     

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

     

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

     

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

     

       103
       103
       +
             `I

     

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

     

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

     

       106
       106
       +
             `I

     

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

     

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

     

       92
       109
        
             `S Manpage.s_options;

     

       93
       110
        
           ]

     

       94
       111
        
           @ date_format_manpage_entries

     

       95
       95
       -
           @ [

     

       96
       96
       -
               `S Manpage.s_examples;

     

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

     

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

     

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

     

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

     

       101
       101
       -
               `I

     

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

     

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

     

       104
       104
       -
               `I

     

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

     

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

     

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

     

       108
       108
       -
               `I

     

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

     

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

     

       111
       111
       -
               `I

     

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

     

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

     

       114
       114
       -
             ]

     

       112
       112
       +
           @ [ `S Manpage.s_see_also ]

     

       115
       113
        
         in

     

       116
       114
        
         let exit_info =

     

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

+27 -31

bin/query_args.ml

···

       3
       3
        
       

     

       4
       4
        
       let from_arg =

     

       5
       5
        
         let doc =

     

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

     

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

     

       8
       8
       -
            +Nm)"

     

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

     

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

     

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

     

       9
       9
        
         in

     

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

     

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

     

       12
       12
        
       

     

       13
       13
        
       let to_arg =

     

       14
       14
        
         let doc =

     

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

     

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

     

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

     

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

     

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

     

       17
       18
        
         in

     

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

     

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

     

       20
       21
        
       

     

       21
       22
        
       let calendar_arg =

     

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

     

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

     

       23
       24
        
         Arg.(

     

       24
       24
       -
           value

     

       25
       25
       -
           & opt (some string) None

     

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

     

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

     

       27
       26
        
       

     

       28
       27
        
       let format_enum =

     

       29
       28
        
         [

     
···

       176
       175
        
                in

     

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

     

       178
       177
        
       

     

       178
       178
       +
       let parse_timezone ~timezone =

     

       179
       179
       +
         match timezone with

     

       180
       180
       +
         | Some tzid -> (

     

       181
       181
       +
             match Timedesc.Time_zone.make tzid with

     

       182
       182
       +
             | Some tz -> tz

     

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

     

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

     

       185
       185
       +
       

     

       179
       186
        
       let date_format_manpage_entries =

     

       180
       187
        
         [

     

       181
       188
        
           `S "DATE FORMATS";

     

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

     

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

     

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

     

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

     

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

     

       187
       187
       -
           `I

     

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

     

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

     

       190
       190
       -
                'UTC')" );

     

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

     

       189
       189
       +
           `P

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       203
       207
        
         ]

     

       204
       204
       -
       

     

       205
       205
       -
       let parse_timezone ~timezone =

     

       206
       206
       -
         match timezone with

     

       207
       207
       -
         | Some tzid -> (

     

       208
       208
       -
             match Timedesc.Time_zone.make tzid with

     

       209
       209
       -
             | Some tz -> tz

     

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

     

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

+51 -63

bin/search_cmd.ml

···

       2
       2
        
       open Caledonia_lib

     

       3
       3
        
       open Query_args

     

       4
       4
        
       

     

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

     

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

     

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

     

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

     

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

     
···

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

     

       47
       47
        
         in

     

       48
       48
        
         (match calendar with

     

       49
       49
       -
         | Some calendar_name ->

     

       50
       50
       -
             filters := Query.in_calendar_names [ calendar_name ] :: !filters

     

       51
       51
       -
         | None -> ());

     

       49
       49
       +
         | [] -> ()

     

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

     

       52
       51
        
         (match query_text with

     

       53
       52
        
         | Some text ->

     

       54
       53
        
             if summary then filters := Query.summary_contains text :: !filters;

     
···

       79
       78
        
         Ok ()

     

       80
       79
        
       

     

       81
       80
        
       let query_text_arg =

     

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

     

       81
       81
       +
         let doc =

     

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

     

       83
       83
       +
         in

     

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

     

       84
       85
        
       

     

       85
       86
        
       let summary_arg =

     
···

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

     

       108
       109
        
       

     

       109
       110
        
       let cmd ~fs calendar_dir =

     

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

     

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

     

       111
       112
        
             location id today tomorrow week month recurring non_recurring timezone

     

       112
       113
        
             sort =

     

       113
       114
        
           match

     

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

     

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

     

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

     

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

     

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

     

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

     

       117
       118
        
           with

     

       118
       119
        
           | Error (`Msg msg) ->

     

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

     
···

       133
       134
        
             `S Manpage.s_description;

     

       134
       135
        
             `P

     

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

     

       136
       136
       -
                fields.";

     

       137
       137
       -
             `P

     

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

     

       139
       139
       -
                regardless of date.";

     

       140
       140
       -
             `P

     

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

     

       142
       142
       -
                --from and --to.";

     

       143
       143
       -
             `P

     

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

     

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

     

       146
       146
       -
             `P

     

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

     

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

     

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

     

       150
       150
       -
             `P

     

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

     

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

     

       153
       153
       -
                search text.";

     

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

     

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

     

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

     

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

     

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

     

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

     

       143
       143
       +
                to other query criteria.";

     

       144
       144
       +
             `S Manpage.s_examples;

     

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

     

       146
       146
       +
             `I

     

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

     

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

     

       149
       149
       +
             `I

     

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

     

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

     

       152
       152
       +
             `I

     

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

     

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

     

       155
       155
       +
             `I

     

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

     

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

     

       158
       158
       +
             `I

     

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

     

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

     

       161
       161
       +
                  workshop" );

     

       162
       162
       +
             `I

     

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

     

       164
       164
       +
             `I

     

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

     

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

     

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

     

       168
       168
       +
             `I

     

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

     

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

     

       171
       171
       +
             `I

     

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

     

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

     

       174
       174
       +
             `I

     

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

     

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

     

       154
       177
        
             `S Manpage.s_options;

     

       155
       178
        
           ]

     

       156
       179
        
           @ date_format_manpage_entries

     

       157
       157
       -
           @ [

     

       158
       158
       -
               `S Manpage.s_examples;

     

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

     

       160
       160
       -
               `I

     

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

     

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

     

       163
       163
       -
               `I

     

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

     

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

     

       166
       166
       -
               `I

     

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

     

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

     

       169
       169
       -
               `I

     

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

     

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

     

       172
       172
       -
               `I

     

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

     

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

     

       175
       175
       -
                    workshop" );

     

       176
       176
       -
               `I

     

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

     

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

     

       179
       179
       -
               `I

     

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

     

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

     

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

     

       183
       183
       -
               `I

     

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

     

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

     

       186
       186
       -
               `I

     

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

     

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

     

       189
       189
       -
               `I

     

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

     

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

     

       192
       192
       -
             ]

     

       180
       180
       +
           @ [ `S Manpage.s_see_also ]

     

       193
       181
        
         in

     

       194
       182
        
         let exit_info =

     

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

+6 -5

bin/show_cmd.ml

···

       34
       34
        
           [

     

       35
       35
        
             `S Manpage.s_description;

     

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

     

       37
       37
       -
             `P

     

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

     

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

     

       40
       40
       -
             `S Manpage.s_options;

     

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

     

       41
       38
        
             `S Manpage.s_examples;

     

       42
       39
        
             `P "Show event details:";

     

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

     

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

     

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

     

       43
       43
       +
             `S Manpage.s_options;

     

       46
       44
        
           ]

     

       47
       45
        
         in

     

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

     

       46
       46
       +
         let exit_info =

     

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

     

       48
       48
       +
         in

     

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

     

       49
       50
        
         Cmd.v info term

+110 -55

lib/date.ml

···

       193
       193
        
       

     

       194
       194
        
       let ( let* ) = Result.bind

     

       195
       195
        
       

     

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

     

       196
       196
       +
       let parse_full_iso_datet ~tz expr =

     

       197
       197
       +
         let regex = Re.Pcre.regexp "^(\\d{4})-(\\d{1,2})-(\\d{1,2})$" in

     

       198
       198
       +
         if Re.Pcre.pmatch ~rex:regex expr then

     

       199
       199
       +
           let match_result = Re.Pcre.exec ~rex:regex expr in

     

       200
       200
       +
           let year = int_of_string (Re.Pcre.get_substring match_result 1) in

     

       201
       201
       +
           let month = int_of_string (Re.Pcre.get_substring match_result 2) in

     

       202
       202
       +
           let day = int_of_string (Re.Pcre.get_substring match_result 3) in

     

       203
       203
       +
           match Timedesc.Date.Ymd.make ~year ~month ~day with

     

       204
       204
       +
           | Ok date ->

     

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

     

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

     

       207
       207
       +
               Some (Ok (timedesc_to_ptime dt))

     

       208
       208
       +
           | Error _ -> Some (Error (`Msg (Printf.sprintf "Invalid date: %s" expr)))

     

       209
       209
       +
         else None

     

       210
       210
       +
       

     

       211
       211
       +
       let parse_year_only ~tz expr parameter =

     

       212
       212
       +
         let regex = Re.Pcre.regexp "^(\\d{4})$" in

     

       213
       213
       +
         if Re.Pcre.pmatch ~rex:regex expr then

     

       214
       214
       +
           let match_result = Re.Pcre.exec ~rex:regex expr in

     

       215
       215
       +
           let year = int_of_string (Re.Pcre.get_substring match_result 1) in

     

       216
       216
       +
           match parameter with

     

       217
       217
       +
           | `From -> (

     

       218
       218
       +
               match Timedesc.Date.Ymd.make ~year ~month:1 ~day:1 with

     

       219
       219
       +
               | Ok date ->

     

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

     

       221
       221
       +
                   let dt = Timedesc.of_date_and_time_exn ~tz date time in

     

       222
       222
       +
                   Some (Ok (timedesc_to_ptime dt))

     

       223
       223
       +
               | Error _ ->

     

       224
       224
       +
                   Some (Error (`Msg (Printf.sprintf "Invalid year: %s" expr))))

     

       225
       225
       +
           | `To -> (

     

       226
       226
       +
               match Timedesc.Date.Ymd.make ~year ~month:12 ~day:31 with

     

       227
       227
       +
               | Ok date ->

     

       228
       228
       +
                   let time =

     

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

     

       230
       230
       +
                   in

     

       231
       231
       +
                   let dt = Timedesc.of_date_and_time_exn ~tz date time in

     

       232
       232
       +
                   Some (Ok (timedesc_to_ptime dt))

     

       233
       233
       +
               | Error _ ->

     

       234
       234
       +
                   Some (Error (`Msg (Printf.sprintf "Invalid year: %s" expr))))

     

       235
       235
       +
         else None

     

       236
       236
       +
       

     

       237
       237
       +
       let parse_year_month ~tz expr parameter =

     

       238
       238
       +
         let regex = Re.Pcre.regexp "^(\\d{4})-(\\d{1,2})$" in

     

       239
       239
       +
         if Re.Pcre.pmatch ~rex:regex expr then

     

       240
       240
       +
           let match_result = Re.Pcre.exec ~rex:regex expr in

     

       241
       241
       +
           let year = int_of_string (Re.Pcre.get_substring match_result 1) in

     

       242
       242
       +
           let month = int_of_string (Re.Pcre.get_substring match_result 2) in

     

       243
       243
       +
           match parameter with

     

       244
       244
       +
           | `From -> (

     

       245
       245
       +
               match Timedesc.Date.Ymd.make ~year ~month ~day:1 with

     

       246
       246
       +
               | Ok date ->

     

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

     

       248
       248
       +
                   let dt = Timedesc.of_date_and_time_exn ~tz date time in

     

       249
       249
       +
                   Some (Ok (timedesc_to_ptime dt))

     

       250
       250
       +
               | Error _ ->

     

       251
       251
       +
                   Some (Error (`Msg (Printf.sprintf "Invalid year-month: %s" expr))))

     

       252
       252
       +
           | `To -> (

     

       253
       253
       +
               let next_month = if month = 12 then 1 else month + 1 in

     

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

     

       255
       255
       +
               match

     

       256
       256
       +
                 Timedesc.Date.Ymd.make ~year:next_month_year ~month:next_month ~day:1

     

       257
       257
       +
               with

     

       258
       258
       +
               | Ok next_month_date ->

     

       259
       259
       +
                   let last_day_of_month = Timedesc.Date.sub ~days:1 next_month_date in

     

       260
       260
       +
                   let end_of_day =

     

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

     

       262
       262
       +
                   in

     

       263
       263
       +
                   let dt =

     

       264
       264
       +
                     Timedesc.of_date_and_time_exn ~tz last_day_of_month end_of_day

     

       265
       265
       +
                   in

     

       266
       266
       +
                   Some (Ok (timedesc_to_ptime dt))

     

       267
       267
       +
               | Error _ ->

     

       268
       268
       +
                   Some (Error (`Msg (Printf.sprintf "Invalid year-month: %s" expr))))

     

       269
       269
       +
         else None

     

       270
       270
       +
       

     

       271
       271
       +
       let parse_relative ~tz expr parameter =

     

       272
       272
       +
         let regex = Re.Pcre.regexp "^([+-])(\\d+)([dwm])$" in

     

       273
       273
       +
         if Re.Pcre.pmatch ~rex:regex expr then

     

       274
       274
       +
           let match_result = Re.Pcre.exec ~rex:regex expr in

     

       275
       275
       +
           let sign = Re.Pcre.get_substring match_result 1 in

     

       276
       276
       +
           let num = int_of_string (Re.Pcre.get_substring match_result 2) in

     

       277
       277
       +
           let unit = Re.Pcre.get_substring match_result 3 in

     

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

     

       279
       279
       +
           let value = num * multiplier in

     

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

     

       281
       281
       +
           match unit with

     

       282
       282
       +
           | "d" -> Some (Ok (add_days today value))

     

       283
       283
       +
           | "w" -> (

     

       284
       284
       +
               let date = add_weeks today value in

     

       285
       285
       +
               match parameter with

     

       286
       286
       +
               | `From -> Some (Ok (get_start_of_week date))

     

       287
       287
       +
               | `To -> Some (Ok (get_end_of_week date)))

     

       288
       288
       +
           | "m" -> (

     

       289
       289
       +
               let date = add_months today value in

     

       290
       290
       +
               match parameter with

     

       291
       291
       +
               | `From -> Some (Ok (get_start_of_month date))

     

       292
       292
       +
               | `To -> Some (Ok (get_end_of_month date)))

     

       293
       293
       +
           | _ -> Some (Error (`Msg (Printf.sprintf "Invalid date unit: %s" unit)))

     

       294
       294
       +
         else None

     

       295
       295
       +
       

     

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

     

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

     

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

     

       200
       297
        
         match expr with

     

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

     

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

     
···

       217
       314
        
             match parameter with

     

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

     

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

     

       220
       220
       -
         | _ ->

     

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

     

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

     

       223
       223
       -
               let year =

     

       224
       224
       -
                 int_of_string

     

       225
       225
       -
                   (Re.Pcre.get_substring (Re.Pcre.exec ~rex:iso_date_regex expr) 1)

     

       226
       226
       -
               in

     

       227
       227
       -
               let month =

     

       228
       228
       -
                 int_of_string

     

       229
       229
       -
                   (Re.Pcre.get_substring (Re.Pcre.exec ~rex:iso_date_regex expr) 2)

     

       230
       230
       -
               in

     

       231
       231
       -
               let day =

     

       232
       232
       -
                 int_of_string

     

       233
       233
       -
                   (Re.Pcre.get_substring (Re.Pcre.exec ~rex:iso_date_regex expr) 3)

     

       234
       234
       -
               in

     

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

     

       236
       236
       -
               | Ok date ->

     

       237
       237
       -
                   let midnight =

     

       238
       238
       -
                     Timedesc.Time.make_exn ~hour:0 ~minute:0 ~second:0 ()

     

       239
       239
       -
                   in

     

       240
       240
       -
                   let dt = Timedesc.of_date_and_time_exn ~tz date midnight in

     

       241
       241
       -
                   Ok (timedesc_to_ptime dt)

     

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

     

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

     

       244
       244
       -
             else if Re.Pcre.pmatch ~rex:relative_regex expr then

     

       245
       245
       -
               let sign =

     

       246
       246
       -
                 Re.Pcre.get_substring (Re.Pcre.exec ~rex:relative_regex expr) 1

     

       247
       247
       -
               in

     

       248
       248
       -
               let num =

     

       249
       249
       -
                 int_of_string

     

       250
       250
       -
                   (Re.Pcre.get_substring (Re.Pcre.exec ~rex:relative_regex expr) 2)

     

       251
       251
       -
               in

     

       252
       252
       -
               let unit =

     

       253
       253
       -
                 Re.Pcre.get_substring (Re.Pcre.exec ~rex:relative_regex expr) 3

     

       254
       254
       -
               in

     

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

     

       256
       256
       -
               let value = num * multiplier in

     

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

     

       258
       258
       -
               match unit with

     

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

     

       260
       260
       -
               | "w" -> (

     

       261
       261
       -
                   let date = add_weeks today value in

     

       262
       262
       -
                   match parameter with

     

       263
       263
       -
                   | `From -> Ok (get_start_of_week date)

     

       264
       264
       -
                   | `To -> Ok (get_end_of_week date))

     

       265
       265
       -
               | "m" -> (

     

       266
       266
       -
                   let date = add_months today value in

     

       267
       267
       -
                   match parameter with

     

       268
       268
       -
                   | `From -> Ok (get_start_of_month date)

     

       269
       269
       -
                   | `To -> Ok (get_end_of_month date))

     

       270
       270
       -
               | _ -> Error (`Msg (Printf.sprintf "Invalid date unit: %s" unit))

     

       271
       271
       -
             else Error (`Msg (Printf.sprintf "Invalid date format: %s" expr))

     

       317
       317
       +
         | _ -> (

     

       318
       318
       +
             (* Option alternative operator *)

     

       319
       319
       +
             let ( |>? ) opt f = match opt with None -> f () | Some x -> Some x in

     

       320
       320
       +
             ( ( ( parse_full_iso_datet ~tz expr |>? fun () ->

     

       321
       321
       +
                   parse_year_only ~tz expr parameter )

     

       322
       322
       +
               |>? fun () -> parse_year_month ~tz expr parameter )

     

       323
       323
       +
             |>? fun () -> parse_relative ~tz expr parameter )

     

       324
       324
       +
             |> function

     

       325
       325
       +
             | Some result -> result

     

       326
       326
       +
             | None -> Error (`Msg (Printf.sprintf "Invalid date format: %s" expr)))

     

       272
       327
        
       

     

       273
       328
        
       let parse_time str =

     

       274
       329
        
         try

+8 -1

lib/date.mli

···

       117
       117
        
           default_timezone.

     

       118
       118
        
       

     

       119
       119
        
           Supported formats:

     

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

     

       120
       120
       +
           - ISO format:

     

       121
       121
       +
           - "YYYY-MM-DD" (full date)

     

       122
       122
       +
           - "YYYY-MM" (partial date)

     

       123
       123
       +
           - For --from: defaults to first day of month

     

       124
       124
       +
           - For --to: defaults to last day of month

     

       125
       125
       +
           - "YYYY" (partial date)

     

       126
       126
       +
           - For --from: defaults to January 1st of year

     

       127
       127
       +
           - For --to: defaults to December 31st of year

     

       121
       128
        
           - Relative expressions:

     

       122
       129
        
           - "today" - Current day

     

       123
       130
        
           - "tomorrow" - Next day

+1 -1

lib/query.ml

···

       19
       19
        
         | Some loc -> text_matches text loc

     

       20
       20
        
         | None -> false

     

       21
       21
        
       

     

       22
       22
       -
       let in_calendar_names ids event =

     

       22
       22
       +
       let in_calendars ids event =

     

       23
       23
        
         let id = Event.get_calendar_name event in

     

       24
       24
        
         List.exists (fun col -> col = id) ids

     

       25
       25

+1 -1

lib/query.mli

···

       5
       5
        
       val summary_contains : string -> filter

     

       6
       6
        
       val description_contains : string -> filter

     

       7
       7
        
       val location_contains : string -> filter

     

       8
       8
       -
       val in_calendar_names : string list -> filter

     

       8
       8
       +
       val in_calendars : string list -> filter

     

       9
       9
        
       val recurring_only : unit -> filter

     

       10
       10
        
       val non_recurring_only : unit -> filter

     

       11
       11
        
       val with_id : Event.event_id -> filter

test/test_date.ml

···

       47
       47
        
         test_expr "+1m" `To "2025-04-30";

     

       48
       48
        
         test_expr "2025-01-01" `From "2025-01-01";

     

       49
       49
        
         test_expr "2025-01-01" `To "2025-01-01";

     

       50
       50
       +
         test_expr "2025-01" `From "2025-01-01";

     

       51
       51
       +
         test_expr "2025-01" `To "2025-01-01";

     

       52
       52
       +
         test_expr "2025" `From "2025-01-01";

     

       53
       53
       +
         test_expr "2025" `To "2025-01-01";

     

       54
       54
       +
         test_expr "2025-3-1" `From "2025-03-01";

     

       55
       55
       +
         test_expr "2025-3-1" `To "2025-03-01";

     

       50
       56
        
         (try

     

       51
       57
        
            let _ = Query.parse_date "invalid-format" `From in

     

       52
       58
        
            Alcotest.fail "Should have raised an exception for invalid format"

+3 -3

test/test_query.ml

···

       104
       104
        
         in

     

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

     

       106
       106
        
         let calendar_name = "example" in

     

       107
       107
       -
         let filter = Query.in_calendar_names [ calendar_name ] in

     

       107
       107
       +
         let filter = Query.in_calendars [ calendar_name ] in

     

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

     

       109
       109
        
         | Ok events ->

     

       110
       110
        
             let all_match_calendar =

     
···

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

     

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

     

       121
       121
        
         let calendar_names = [ "example"; "recurrence" ] in

     

       122
       122
       -
         let filter = Query.in_calendar_names calendar_names in

     

       122
       122
       +
         let filter = Query.in_calendars calendar_names in

     

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

     

       124
       124
        
         | Ok events ->

     

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

     

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

     

       127
       127
       -
         let filter = Query.in_calendar_names [ "non-existent-calendar" ] in

     

       127
       127
       +
         let filter = Query.in_calendars [ "non-existent-calendar" ] in

     

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

     

       129
       129
        
         | Ok events ->

     

       130
       130
        
             Alcotest.(check int)