X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=slave.ml;h=034bbdf77202b3cd6d59f94068c58fedbc17fd0d;hb=1d7c4274827064c684d831c9ef51b198ba8798a2;hp=412d1830b78fcd0fd6e99999816abde6e9b7b879;hpb=a4317d06454daae173209204137998838c73807a;p=guestfs-browser.git

diff --git a/slave.ml b/slave.ml
index 412d183..034bbdf 100644
--- a/slave.ml
+++ b/slave.ml
@@ -47,6 +47,7 @@ type command =
   | Download_dir_tarball of source * string * download_dir_tarball_format * string * unit callback
   | Download_file of source * string * string * bool * unit callback
   | File_information of source * string * string callback
+  | List_applications of inspection_os * G.application array callback
   | Open_domain of string * inspection_data callback
   | Open_images of (string * string option) list * inspection_data callback
   | Read_directory of source * string * direntry list callback
@@ -73,6 +74,8 @@ let rec string_of_command = function
         (string_of_source src) remotefile localfile check
   | File_information (src, pathname, _) ->
       sprintf "File_information (%s, %s)" (string_of_source src) pathname
+  | List_applications (os, _) ->
+      sprintf "List_applications %s" os.insp_root
   | Open_domain (name, _) -> sprintf "Open_domain %s" name
   | Open_images (images, _) ->
       sprintf "Open_images %s" (string_of_images images)
@@ -165,6 +168,8 @@ let download_file_if_not_exist ?fail src remotefile localfile cb =
   send_to_slave ?fail (Download_file (src, remotefile, localfile, true, cb))
 let file_information ?fail src pathname cb =
   send_to_slave ?fail (File_information (src, pathname, cb))
+let list_applications ?fail os cb =
+  send_to_slave ?fail (List_applications (os, cb))
 let open_domain ?fail name cb = send_to_slave ?fail (Open_domain (name, cb))
 let open_images ?fail images cb = send_to_slave ?fail (Open_images (images, cb))
 let read_directory ?fail src path cb =
@@ -338,6 +343,19 @@ and execute_command = function
       status "Finished calculating file information for %s" pathname;
       callback_if_not_discarded cb r
 
+  | List_applications (os, cb) ->
+      status "Listing applications ...";
+
+      let g = get_g () in
+      let r =
+        with_mount_ro g (OS os) (
+          fun () ->
+            g#inspect_list_applications os.insp_root
+        ) in
+
+      status "Finished listing applications";
+      callback_if_not_discarded cb r
+
   | Open_domain (name, cb) ->
       status "Opening %s ..." name;
 
@@ -561,6 +579,7 @@ and open_disk_images images cb =
         insp_package_format = g#inspect_get_package_format root;
         insp_package_management = g#inspect_get_package_management root;
         insp_product_name = g#inspect_get_product_name root;
+        insp_product_variant = g#inspect_get_product_variant root;
         insp_type = typ;
         insp_windows_current_control_set = windows_current_control_set;
         insp_windows_systemroot = windows_systemroot;