commit d7e8fd8410d50f87f1823eb3f00ad1142985d25e · ryan.freumh.org/caledonia

+20 -17

lib/calendar_dir.ml

···

       46
       46
        
         try

     

       47
       47
        
           Eio.Path.read_dir dir_path

     

       48
       48
        
           |> List.fold_left

     

       49
       49
       -
             (fun acc name ->

     

       50
       50
       -
               let path = Eio.Path.(dir_path / name) in

     

       51
       51
       -
               if Eio.Path.is_directory path then

     

       52
       52
       -
                 acc @ load_events_recursive calendar_name path

     

       53
       53
       -
               else if Filename.check_suffix name ".ics" then

     

       54
       54
       -
                 try

     

       55
       55
       -
                   let content = Eio.Path.load path in

     

       56
       56
       -
                   match parse content with

     

       57
       57
       -
                   | Ok calendar -> acc @ Event.events_of_icalendar ~file:path calendar_name calendar

     

       58
       58
       -
                   | Error err ->

     

       59
       59
       -
                       Printf.eprintf "Failed to parse %s: %s\n%!" (snd path) err;

     

       60
       60
       -
                       acc

     

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

     

       62
       62
       -
                   Fmt.epr "Failed to read file %s: %a\n%!" (snd path) Eio.Exn.pp exn;

     

       63
       63
       -
                   acc

     

       64
       64
       -
               else acc)

     

       65
       65
       -
             []

     

       49
       49
       +
                (fun acc name ->

     

       50
       50
       +
                  let path = Eio.Path.(dir_path / name) in

     

       51
       51
       +
                  if Eio.Path.is_directory path then

     

       52
       52
       +
                    acc @ load_events_recursive calendar_name path

     

       53
       53
       +
                  else if Filename.check_suffix name ".ics" then (

     

       54
       54
       +
                    try

     

       55
       55
       +
                      let content = Eio.Path.load path in

     

       56
       56
       +
                      match parse content with

     

       57
       57
       +
                      | Ok calendar ->

     

       58
       58
       +
                          acc

     

       59
       59
       +
                          @ Event.events_of_icalendar ~file:path calendar_name calendar

     

       60
       60
       +
                      | Error err ->

     

       61
       61
       +
                          Printf.eprintf "Failed to parse %s: %s\n%!" (snd path) err;

     

       62
       62
       +
                          acc

     

       63
       63
       +
                    with Eio.Exn.Io _ as exn ->

     

       64
       64
       +
                      Fmt.epr "Failed to read file %s: %a\n%!" (snd path) Eio.Exn.pp

     

       65
       65
       +
                        exn;

     

       66
       66
       +
                      acc)

     

       67
       67
       +
                  else acc)

     

       68
       68
       +
                []

     

       66
       69
        
         with Eio.Exn.Io _ as exn ->

     

       67
       70
        
           Fmt.epr "Failed to read directory %s: %a\n%!" (snd dir_path) Eio.Exn.pp exn;

     

       68
       71
        
           []

+74 -34

lib/event.ml

···

       386
       386
        
             recur_to_ics recur)

     

       387
       387
        
           l

     

       388
       388
        
       

     

       389
       389
       +
       let text_event_data ?tz event =

     

       390
       390
       +
         let id = get_id event in

     

       391
       391
       +
         let start = get_start event in

     

       392
       392
       +
         let end_ = get_end event in

     

       393
       393
       +
         let start_date = format_date ?tz start in

     

       394
       394
       +
         let start_time =

     

       395
       395
       +
           match is_date event with true -> "" | false -> " " ^ format_time ?tz start

     

       396
       396
       +
         in

     

       397
       397
       +
         let end_date, end_time =

     

       398
       398
       +
           match end_ with

     

       399
       399
       +
           | None -> ("", "")

     

       400
       400
       +
           | Some end_ -> (

     

       401
       401
       +
               match is_date event with

     

       402
       402
       +
               | true -> (

     

       403
       403
       +
                   match next_day start ~next:end_ with

     

       404
       404
       +
                   | true -> ("", "")

     

       405
       405
       +
                   | false -> (" - " ^ format_date ?tz end_, ""))

     

       406
       406
       +
               | false -> (

     

       407
       407
       +
                   match same_day start end_ with

     

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

     

       409
       409
       +
                   | false -> (" - " ^ format_date ?tz end_, " " ^ format_time ?tz end_)

     

       410
       410
       +
                   ))

     

       411
       411
       +
         in

     

       412
       412
       +
         let summary =

     

       413
       413
       +
           match get_summary event with

     

       414
       414
       +
           | Some summary when summary <> "" -> summary

     

       415
       415
       +
           | _ -> ""

     

       416
       416
       +
         in

     

       417
       417
       +
         let location =

     

       418
       418
       +
           match get_location event with

     

       419
       419
       +
           | Some loc when loc <> "" -> "@" ^ loc

     

       420
       420
       +
           | _ -> ""

     

       421
       421
       +
         in

     

       422
       422
       +
         let calendar_name = get_calendar_name event in

     

       423
       423
       +
         let date_time = start_date ^ start_time ^ end_date ^ end_time in

     

       424
       424
       +
         (id, calendar_name, date_time, summary, location)

     

       425
       425
       +
       

     

       389
       426
        
       let format_event ?(format = `Text) ?tz event =

     

       390
       427
        
         let start = get_start event in

     

       391
       428
        
         let end_ = get_end event in

     

       392
       429
        
         match format with

     

       393
       430
        
         | `Text ->

     

       394
       394
       -
             let id = get_id event in

     

       395
       395
       -
             let start_date = " " ^ format_date ?tz start in

     

       396
       396
       -
             let start_time =

     

       397
       397
       -
               match is_date event with

     

       398
       398
       -
               | true -> ""

     

       399
       399
       -
               | false -> " " ^ format_time ?tz start

     

       431
       431
       +
             let id, calendar_name, date_time, summary, location =

     

       432
       432
       +
               text_event_data ?tz event

     

       400
       433
        
             in

     

       401
       401
       -
             let end_date, end_time =

     

       402
       402
       -
               match end_ with

     

       403
       403
       -
               | None -> ("", "")

     

       404
       404
       -
               | Some end_ -> (

     

       405
       405
       -
                   match is_date event with

     

       406
       406
       -
                   | true -> (

     

       407
       407
       -
                       match next_day start ~next:end_ with

     

       408
       408
       -
                       | true -> ("", "")

     

       409
       409
       -
                       | false -> (" - " ^ format_date ?tz end_, ""))

     

       410
       410
       -
                   | false -> (

     

       411
       411
       -
                       match same_day start end_ with

     

       412
       412
       -
                       | true -> ("", " - " ^ format_time ?tz end_)

     

       413
       413
       -
                       | false ->

     

       414
       414
       -
                           (" - " ^ format_date ?tz end_, " " ^ format_time ?tz end_)))

     

       415
       415
       -
             in

     

       416
       416
       -
             let summary =

     

       417
       417
       -
               match get_summary event with

     

       418
       418
       -
               | Some summary when summary <> "" -> " " ^ summary

     

       419
       419
       -
               | _ -> ""

     

       420
       420
       -
             in

     

       421
       421
       -
             let location =

     

       422
       422
       -
               match get_location event with

     

       423
       423
       -
               | Some loc when loc <> "" -> " @" ^ loc

     

       424
       424
       -
               | _ -> ""

     

       425
       425
       -
             in

     

       426
       426
       -
             let calendar_name = get_calendar_name event in

     

       427
       427
       -
             Printf.sprintf "%-45s\t%s\t%s%s%s%s%s%s" id calendar_name start_date

     

       428
       428
       -
               start_time end_date end_time summary location

     

       434
       434
       +
             Printf.sprintf "%s\t%s\t%s\t%s\t%s" id calendar_name date_time summary

     

       435
       435
       +
               location

     

       429
       436
        
         | `Entries ->

     

       430
       437
        
             let format_opt label f opt =

     

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

     
···

       573
       580
        
               (String.escaped id) (String.escaped summary) start_date start_time

     

       574
       581
        
               end_str location description calendar

     

       575
       582
        
       

     

       583
       583
       +
       let format_events_with_dynamic_columns ?tz events =

     

       584
       584
       +
         if events = [] then ""

     

       585
       585
       +
         else

     

       586
       586
       +
           let event_data = List.map (text_event_data ?tz) events in

     

       587
       587
       +
           (* Calculate max width for each column *)

     

       588
       588
       +
           let max_id_width =

     

       589
       589
       +
             List.fold_left

     

       590
       590
       +
               (fun acc (id, _, _, _, _) -> max acc (String.length id))

     

       591
       591
       +
               0 event_data

     

       592
       592
       +
           in

     

       593
       593
       +
           let max_cal_width =

     

       594
       594
       +
             List.fold_left

     

       595
       595
       +
               (fun acc (_, cal, _, _, _) -> max acc (String.length cal))

     

       596
       596
       +
               0 event_data

     

       597
       597
       +
           in

     

       598
       598
       +
           let max_date_width =

     

       599
       599
       +
             List.fold_left

     

       600
       600
       +
               (fun acc (_, _, date, _, _) -> max acc (String.length date))

     

       601
       601
       +
               0 event_data

     

       602
       602
       +
           in

     

       603
       603
       +
       

     

       604
       604
       +
           (* Format each event with calculated widths *)

     

       605
       605
       +
           let formatted_events =

     

       606
       606
       +
             List.map

     

       607
       607
       +
               (fun (id, cal, date, summary, location) ->

     

       608
       608
       +
                 Printf.sprintf "%-*s  %-*s  %-*s  %s%s" max_id_width id max_cal_width

     

       609
       609
       +
                   cal max_date_width date summary

     

       610
       610
       +
                   (if location <> "" then " " ^ location else ""))

     

       611
       611
       +
               event_data

     

       612
       612
       +
           in

     

       613
       613
       +
           String.concat "\n" formatted_events

     

       614
       614
       +
       

     

       576
       615
        
       let format_events ?(format = `Text) ?tz events =

     

       577
       616
        
         match format with

     

       578
       617
        
         | `Json ->

     
···

       590
       629
        
             ^ String.concat "\n "

     

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

     

       592
       631
        
             ^ ")"

     

       632
       632
       +
         | `Text -> format_events_with_dynamic_columns ?tz events

     

       593
       633
        
         | _ ->

     

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

     

       595
       635