diff --git a/tool/ood-gen/lib/academic_institution.ml b/tool/ood-gen/lib/academic_institution.ml index a5bc59341f..52e39a19dd 100644 --- a/tool/ood-gen/lib/academic_institution.ml +++ b/tool/ood-gen/lib/academic_institution.ml @@ -22,7 +22,7 @@ let decode (fpath, (head, body_md)) = in Result.map (of_metadata ~body_md ~body_html) metadata -let all () = Utils.map_files decode "academic_institutions/*.md" +let all () = Utils.map_md_files decode "academic_institutions/*.md" let template () = Format.asprintf {| diff --git a/tool/ood-gen/lib/book.ml b/tool/ood-gen/lib/book.ml index 3d3e598366..15184d4e1f 100644 --- a/tool/ood-gen/lib/book.ml +++ b/tool/ood-gen/lib/book.ml @@ -29,7 +29,7 @@ let decode (fpath, (head, body)) = Result.map (of_metadata ~body_md ~body_html) metadata let all () = - Utils.map_files decode "books/*.md" + Utils.map_md_files decode "books/*.md" |> List.sort (fun (b1 : t) (b2 : t) -> (* Sort the books by reversed publication date. *) String.compare b2.published b1.published) diff --git a/tool/ood-gen/lib/changelog.ml b/tool/ood-gen/lib/changelog.ml index b9c80049b3..d137ad17f2 100644 --- a/tool/ood-gen/lib/changelog.ml +++ b/tool/ood-gen/lib/changelog.ml @@ -76,7 +76,7 @@ let decode (fname, (head, body)) = metadata let all () = - Utils.map_files decode "changelog/*/*.md" + Utils.map_md_files decode "changelog/*/*.md" |> List.sort (fun a b -> String.compare b.slug a.slug) module ChangelogFeed = struct diff --git a/tool/ood-gen/lib/cookbook.ml b/tool/ood-gen/lib/cookbook.ml index 34facb783e..9b7b06709d 100644 --- a/tool/ood-gen/lib/cookbook.ml +++ b/tool/ood-gen/lib/cookbook.ml @@ -117,7 +117,7 @@ let all_categories_and_tasks () = let tasks, top_categories = all_categories_and_tasks () let all () = - Utils.map_files (decode tasks) "cookbook/*/*.ml" + Utils.map_md_files (decode tasks) "cookbook/*/*.ml" |> List.sort (fun (a : t) (b : t) -> String.compare b.slug a.slug) |> List.rev diff --git a/tool/ood-gen/lib/event.ml b/tool/ood-gen/lib/event.ml index b137306e77..e96d5cdc72 100644 --- a/tool/ood-gen/lib/event.ml +++ b/tool/ood-gen/lib/event.ml @@ -128,7 +128,7 @@ let decode (recurring_events : RecurringEvent.t list) (fpath, (head, body_md)) = metadata let all () = - Utils.map_files (decode (RecurringEvent.all ())) "events/*.md" + Utils.map_md_files (decode (RecurringEvent.all ())) "events/*.md" |> List.sort (fun e1 e2 -> (* Sort the events by reversed start date. *) let t1 = diff --git a/tool/ood-gen/lib/exercise.ml b/tool/ood-gen/lib/exercise.ml index 8aad0d23b5..38519259c9 100644 --- a/tool/ood-gen/lib/exercise.ml +++ b/tool/ood-gen/lib/exercise.ml @@ -55,7 +55,7 @@ let compare_by_slug = fun (x : t) (y : t) -> compare (key x) (key y) let all () = - Utils.map_files decode "exercises/*.md" |> List.sort compare_by_slug + Utils.map_md_files decode "exercises/*.md" |> List.sort compare_by_slug let template () = Format.asprintf {| diff --git a/tool/ood-gen/lib/industrial_user.ml b/tool/ood-gen/lib/industrial_user.ml index ba63feb798..c915c4e06f 100644 --- a/tool/ood-gen/lib/industrial_user.ml +++ b/tool/ood-gen/lib/industrial_user.ml @@ -22,7 +22,7 @@ let decode (fpath, (head, body_md)) = in Result.map (of_metadata ~body_md ~body_html) metadata -let all () = Utils.map_files decode "industrial_users/*.md" +let all () = Utils.map_md_files decode "industrial_users/*.md" let template () = Format.asprintf {| diff --git a/tool/ood-gen/lib/is_ocaml_yet.ml b/tool/ood-gen/lib/is_ocaml_yet.ml index 3755af26fb..5e16d47fa6 100644 --- a/tool/ood-gen/lib/is_ocaml_yet.ml +++ b/tool/ood-gen/lib/is_ocaml_yet.ml @@ -43,7 +43,7 @@ let decode (fpath, (head, body_md)) = in Result.map (metadata_to_t ~body_html ~modify_categories) metadata -let all () = Utils.map_files decode "is_ocaml_yet/*.md" +let all () = Utils.map_md_files decode "is_ocaml_yet/*.md" let template () = Format.asprintf {| diff --git a/tool/ood-gen/lib/news.ml b/tool/ood-gen/lib/news.ml index 11f88b578a..202f77c8bf 100644 --- a/tool/ood-gen/lib/news.ml +++ b/tool/ood-gen/lib/news.ml @@ -35,7 +35,7 @@ let decode (fname, (head, body)) = Result.map (of_metadata ~slug ~body_html) metadata let all () = - Utils.map_files decode "news/*/*.md" + Utils.map_md_files decode "news/*/*.md" |> List.sort (fun a b -> String.compare b.date a.date) let template () = diff --git a/tool/ood-gen/lib/page.ml b/tool/ood-gen/lib/page.ml index a0ea116255..c9456450f8 100644 --- a/tool/ood-gen/lib/page.ml +++ b/tool/ood-gen/lib/page.ml @@ -31,7 +31,7 @@ let decode (file, (head, body_md)) = in Result.map (of_metadata ~slug ~body_md ~body_html) metadata -let all () = Utils.map_files decode "pages/*.md" +let all () = Utils.map_md_files decode "pages/*.md" let template () = Format.asprintf diff --git a/tool/ood-gen/lib/planet.ml b/tool/ood-gen/lib/planet.ml index 10f57337e5..8d7e972921 100644 --- a/tool/ood-gen/lib/planet.ml +++ b/tool/ood-gen/lib/planet.ml @@ -116,7 +116,7 @@ module Local = struct |> Result.map (of_metadata ~slug ~source ~body_html) let all () : post list = - Utils.map_files decode "planet-local-blogs/*/*.md" + Utils.map_md_files decode "planet-local-blogs/*/*.md" |> List.sort (fun (a : post) b -> String.compare b.date a.date) end end @@ -234,7 +234,7 @@ module External = struct |> Result.map (of_metadata ~source ~body_html) let all () : post list = - Utils.map_files decode "planet/*/*.md" + Utils.map_md_files decode "planet/*/*.md" |> List.sort (fun (a : post) b -> String.compare b.date a.date) end end diff --git a/tool/ood-gen/lib/release.ml b/tool/ood-gen/lib/release.ml index aac04626c9..48d09459ec 100644 --- a/tool/ood-gen/lib/release.ml +++ b/tool/ood-gen/lib/release.ml @@ -67,7 +67,8 @@ let decode (fpath, (head, body_md)) = Result.map (of_metadata ~body_md ~body_html) metadata let all () = - Utils.map_files decode "releases/*.md" |> List.sort sort_by_decreasing_version + Utils.map_md_files decode "releases/*.md" + |> List.sort sort_by_decreasing_version let template () = let all = all () in diff --git a/tool/ood-gen/lib/success_story.ml b/tool/ood-gen/lib/success_story.ml index 310ac16f34..05770496ac 100644 --- a/tool/ood-gen/lib/success_story.ml +++ b/tool/ood-gen/lib/success_story.ml @@ -34,7 +34,7 @@ let decode (fpath, (head, body_md)) = in Result.map (of_metadata ~body_md ~body_html) metadata -let all () = Utils.map_files decode "success_stories/*.md" +let all () = Utils.map_md_files decode "success_stories/*.md" let template () = Format.asprintf diff --git a/tool/ood-gen/lib/tool_page.ml b/tool/ood-gen/lib/tool_page.ml index d9754e53e7..889b32474b 100644 --- a/tool/ood-gen/lib/tool_page.ml +++ b/tool/ood-gen/lib/tool_page.ml @@ -43,7 +43,7 @@ let decode (fpath, (head, body_md)) = Result.map (of_metadata ~fpath ~toc ~body_md ~body_html) metadata let all () = - Utils.map_files decode "tool_pages/*/*.md" + Utils.map_md_files decode "tool_pages/*/*.md" |> List.sort (fun t1 t2 -> String.compare t1.fpath t2.fpath) let template () = diff --git a/tool/ood-gen/lib/tutorial.ml b/tool/ood-gen/lib/tutorial.ml index 936b646309..a2d66e287e 100644 --- a/tool/ood-gen/lib/tutorial.ml +++ b/tool/ood-gen/lib/tutorial.ml @@ -109,7 +109,7 @@ let decode (fpath, (head, body_md)) = Result.map (of_metadata ~fpath ~section ~toc ~body_md ~body_html) metadata let all () = - Utils.map_files decode "tutorials/*/*.md" + Utils.map_md_files decode "tutorials/*/*.md" |> List.sort (fun t1 t2 -> String.compare t1.fpath t2.fpath) module TutorialSearch = struct @@ -160,7 +160,7 @@ module TutorialSearch = struct | Error msg -> Error msg let all () : search_document list = - Utils.map_files decode_search_document "tutorials/*/*.md" |> List.flatten + Utils.map_md_files decode_search_document "tutorials/*/*.md" |> List.flatten end let template () = diff --git a/tool/ood-gen/lib/utils.ml b/tool/ood-gen/lib/utils.ml index 3fae5b1264..b85032151a 100644 --- a/tool/ood-gen/lib/utils.ml +++ b/tool/ood-gen/lib/utils.ml @@ -53,7 +53,7 @@ let read_from_dir glob = let where path (`Msg err) = `Msg (path ^ ": " ^ err) -let map_files f glob = +let map_md_files f glob = let f (path, data) = let* metadata = extract_metadata_body path data |> Result.map_error (where path) diff --git a/tool/ood-gen/lib/workshop.ml b/tool/ood-gen/lib/workshop.ml index 0fe37e7040..3e3e0cb0d6 100644 --- a/tool/ood-gen/lib/workshop.ml +++ b/tool/ood-gen/lib/workshop.ml @@ -92,7 +92,7 @@ let decode (fpath, (head, body_md)) = Result.map (of_metadata ~body_md ~body_html) metadata let all () = - Utils.map_files decode "workshops/*.md" + Utils.map_md_files decode "workshops/*.md" |> List.sort (fun w1 w2 -> String.compare w2.date w1.date) let template () =