commit d97b560f212ab780c0bdf6d4691ddd89cc43a46f · ryan.freumh.org/caledonia

+25 -21
lib/calendar_dir.ml
···

       42
       42
        
                (Fmt.str "Failed to list calendar directory %s: %a" calendar_dir.path

     

       43
       43
        
                   Eio.Exn.pp exn))

     

       44
       44
        
       

     

       45
       45
       -
       let load_events calendar_name calendar_name_path file_name =

     

       46
       46
       -
         let file = Eio.Path.(calendar_name_path / file_name) in

     

       47
       47
       -
         let _, file_path = file in

     

       48
       48
       -
         match Filename.check_suffix file_name ".ics" with

     

       49
       49
       -
         | false -> []

     

       50
       50
       -
         | true -> (

     

       51
       51
       -
             try

     

       52
       52
       -
               let content = Eio.Path.load file in

     

       53
       53
       -
               match parse content with

     

       54
       54
       -
               | Ok calendar -> Event.events_of_icalendar ~file calendar_name calendar

     

       55
       55
       -
               | Error err ->

     

       56
       56
       -
                   Printf.eprintf "Failed to parse %s: %s\n%!" file_path err;

     

       57
       57
       -
                   []

     

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

     

       59
       59
       -
               Fmt.epr "Failed to read file %s: %a\n%!" file_path Eio.Exn.pp exn;

     

       60
       60
       -
               [])

     

       45
       45
       +
       let rec load_events_recursive calendar_name dir_path =

     

       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
       +
             []

     

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

     

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

     

       68
       68
       +
           []

     

       61
       69
        
       

     

       62
       70
        
       let get_calendar_events ~fs calendar_dir calendar_name =

     

       63
       71
        
         match CalendarMap.find_opt calendar_name calendar_dir.calendar_names with

     
···

       69
       77
        
             if not (Eio.Path.is_directory calendar_name_path) then Error `Not_found

     

       70
       78
        
             else

     

       71
       79
        
               try

     

       72
       72
       -
                 let files = Eio.Path.read_dir calendar_name_path in

     

       73
       73
       -
                 let events =

     

       74
       74
       -
                   List.flatten

     

       75
       75
       -
                   @@ List.map (load_events calendar_name calendar_name_path) files

     

       76
       76
       -
                 in

     

       80
       80
       +
                 let events = load_events_recursive calendar_name calendar_name_path in

     

       77
       81
        
                 calendar_dir.calendar_names <-

     

       78
       82
        
                   CalendarMap.add calendar_name events calendar_dir.calendar_names;

     

       79
       83
        
                 Ok events