From 9bfde48f43c15f4b6ebf0db75dd5554a6ddff9fb Mon Sep 17 00:00:00 2001
From: Hannes Mehnert <hannes@mehnert.org>
Date: Thu, 24 Oct 2024 15:03:35 +0200
Subject: [PATCH] also handle extra-source, fixes #8

---
 mirage/opam_file.ml | 30 +++++++++++++++++++++---------
 mirage/unikernel.ml |  4 ++--
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/mirage/opam_file.ml b/mirage/opam_file.ml
index ce1665e..e08f252 100644
--- a/mirage/opam_file.ml
+++ b/mirage/opam_file.ml
@@ -82,6 +82,25 @@ let extract_url_checksum filename items =
   | Some url, Some cs -> Some (url, cs)
   | _ -> None
 
+let extract_checksums_and_urls filename opam =
+  let open OpamParserTypes.FullPos in
+  List.fold_left (fun acc ->
+      function
+      | { pelem = Section ({ section_kind = { pelem = "url" ; _ } ; section_items = { pelem = items ; _ } ; _ }) ; _} ->
+        begin match extract_url_checksum filename items with
+          | None -> acc
+          | Some url -> url :: acc
+        end
+      | { pelem = Section ({ section_kind = { pelem = "extra-source" ; _ } ; section_name = Some { pelem ; _ } ;  section_items = { pelem = items ; _ };  _ }) ; _} ->
+        begin
+          Log.debug (fun m -> m "extracting for extra-source %s in %s" filename pelem);
+          match extract_url_checksum filename items with
+          | None -> acc
+          | Some url -> url :: acc
+        end
+      | _ -> acc)
+    [] opam.file_contents
+
 let extract_urls filename str =
   (* in an opam file, there may be:
      url { src: <string> checksum: [ STRING ] } <- list of hash
@@ -102,13 +121,6 @@ let extract_urls filename str =
   in
   if unavailable then
     (Log.debug (fun m -> m "%s is marked unavailable, skipping" filename);
-     None)
+     [])
   else
-    match
-      List.find_opt (function
-          | { pelem = Section ({ section_kind = { pelem = "url" ; _ } ; _ }) ; _} -> true | _ -> false)
-        opamfile.file_contents
-    with
-    | Some { pelem = Section ({ section_items = { pelem = items ; _ }; _}) ; _ } ->
-      extract_url_checksum filename items
-    | _ -> Log.debug (fun m -> m "no url section for %s" filename); None
+    extract_checksums_and_urls filename opamfile
diff --git a/mirage/unikernel.ml b/mirage/unikernel.ml
index 9141774..51da59a 100644
--- a/mirage/unikernel.ml
+++ b/mirage/unikernel.ml
@@ -129,7 +129,7 @@ module Make
             (* TODO report parser errors *)
             (try
                let url_csums = Opam_file.extract_urls (Mirage_kv.Key.to_string path) data in
-               Option.fold ~none:acc ~some:(fun (url, csums) ->
+               List.fold_left (fun acc (url, csums) ->
                    if HM.cardinal csums = 0 then
                      (Logs.warn (fun m -> m "no checksums for %s, ignoring" url); acc)
                    else
@@ -146,7 +146,7 @@ module Make
                              Logs.warn (fun m -> m "mismatching hashes for %s: %s vs %s"
                                            url (hm_to_s csums') (hm_to_s csums));
                              None
-                           end) acc) url_csums
+                           end) acc) acc url_csums
              with _ ->
                Logs.warn (fun m -> m "some error in %a, ignoring" Mirage_kv.Key.pp path);
                acc)