commit 710ddc17e6fc4c6ef53e1328e5dc45ffa14f9bb2 · ryan.freumh.org/caledonia

+32 -14
bin/event_args.ml
···

       44
       44
        
       let timezone_arg =

     

       45
       45
        
         let doc =

     

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

     

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

     

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

     

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

     

       48
       49
        
         in

     

       49
       50
        
         Arg.(

     

       50
       51
        
           value

     
···

       133
       134
        
             | Some start_time -> (

     

       134
       135
        
                 match timezone with

     

       135
       136
        
                 | None ->

     

       137
       137
       +
                     let* tzid =

     

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

     

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

     

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

     

       141
       141
       +
                     in

     

       142
       142
       +
                     let* datetime =

     

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

     

       144
       144
       +
                         ~time:start_time `From

     

       145
       145
       +
                     in

     

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

     

       147
       147
       +
                 | Some "FLOATING" ->

     

       136
       148
        
                     let* datetime =

     

       137
       149
        
                       Date.parse_date_time ~tz:Timedesc.Time_zone.utc ~date:start_date

     

       138
       150
        
                         ~time:start_time `From

     
···

       145
       157
        
                     in

     

       146
       158
        
                     Ok (Some (`Datetime (`Utc datetime)))

     

       147
       159
        
                 | Some tzid ->

     

       148
       148
       -
                     let* tz =

     

       149
       149
       -
                       match Timedesc.Time_zone.make tzid with

     

       150
       150
       -
                       | Some tz_obj -> Ok tz_obj

     

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

     

       152
       152
       -
                     in

     

       153
       160
        
                     let* datetime =

     

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

     

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

     

       162
       162
       +
                         ~time:start_time `From

     

       155
       163
        
                     in

     

       156
       164
        
                     Ok (Some (`Datetime (`With_tzid (datetime, (false, tzid)))))))

     

       157
       165
        
       

     
···

       189
       197
        
             | Some end_time -> (

     

       190
       198
        
                 match (timezone, end_timezone) with

     

       191
       199
        
                 | None, None ->

     

       200
       200
       +
                     let* tzid =

     

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

     

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

     

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

     

       204
       204
       +
                     in

     

       205
       205
       +
                     let* datetime =

     

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

     

       207
       207
       +
                         ~time:end_time `From

     

       208
       208
       +
                     in

     

       209
       209
       +
                     Ok

     

       210
       210
       +
                       (Some

     

       211
       211
       +
                          (`Dtend

     

       212
       212
       +
                             ( Icalendar.Params.empty,

     

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

     

       214
       214
       +
                 | _, Some "FLOATING" | Some "FLOATING", None ->

     

       192
       215
        
                     let* datetime =

     

       193
       216
        
                       Date.parse_date_time ~tz:Timedesc.Time_zone.utc ~date:end_date

     

       194
       217
        
                         ~time:end_time `From

     
···

       205
       228
        
                       (Some

     

       206
       229
        
                          (`Dtend (Icalendar.Params.empty, `Datetime (`Utc datetime))))

     

       207
       230
        
                 | _, Some tzid | Some tzid, _ ->

     

       208
       208
       -
                     let* tz =

     

       209
       209
       -
                       match Timedesc.Time_zone.make tzid with

     

       210
       210
       -
                       | Some tz_obj -> Ok tz_obj

     

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

     

       212
       212
       -
                     in

     

       213
       231
        
                     let* datetime =

     

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

     

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

     

       233
       233
       +
                         ~time:end_time `From

     

       215
       234
        
                     in

     

       216
       216
       -
       

     

       217
       235
        
                     Ok

     

       218
       236
        
                       (Some

     

       219
       237
        
                          (`Dtend