X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=filetree.ml;h=a68dd8b0cb1f68520ae29701159fa3a11e803496;hb=refs%2Ftags%2F0.1.7;hp=a007d975c0492a43d222ff57164007f15b559b47;hpb=e0047b09f88dcfa6dd9e771caf57a744095321f2;p=guestfs-browser.git
diff --git a/filetree.ml b/filetree.ml
index a007d97..a68dd8b 100644
--- a/filetree.ml
+++ b/filetree.ml
@@ -23,17 +23,19 @@ open Printf
open Utils
open DeviceSet
+open Slave_types
open Filetree_type
open Filetree_markup
open Filetree_ops
module G = Guestfs
+module UTF8 = CamomileLibraryDefault.Camomile.UTF8
type t = Filetree_type.t
-(* Temporary directory for shared use by all instances of this widget,
- * cleaned up when the program exits.
+(* Temporary directory for shared use by any function in this file.
+ * It is cleaned up when the program exits.
*)
let tmpdir = tmpdir ()
@@ -155,9 +157,9 @@ and button_press ({ model = model; view = view } as t) ev =
(* Based on number of selected rows and what is selected, construct
* the context menu.
*)
- if paths <> [] then (
- let menu = make_context_menu t paths in
- menu#popup ~button ~time
+ (match make_context_menu t paths with
+ | Some menu -> menu#popup ~button ~time
+ | None -> ()
);
(* Return true so no other handler will run. *)
@@ -170,14 +172,20 @@ and make_context_menu t paths =
let menu = GMenu.menu () in
let factory = new GMenu.factory menu in
- let item = factory#add_item "Open" in
- item#misc#set_sensitive false;
-
let rec add_file_items path =
+ let item = factory#add_item "View ..." in
+ (match Config.opener with
+ | Some opener ->
+ ignore (item#connect#activate ~callback:(view_file t path opener));
+ | None ->
+ item#misc#set_sensitive false
+ );
let item = factory#add_item "File information" in
- item#misc#set_sensitive false;
- let item = factory#add_item "Checksum" in
- item#misc#set_sensitive false;
+ ignore (item#connect#activate ~callback:(file_information t path));
+ let item = factory#add_item "MD5 checksum" in
+ ignore (item#connect#activate ~callback:(checksum_file t path "md5"));
+ let item = factory#add_item "SHA1 checksum" in
+ ignore (item#connect#activate ~callback:(checksum_file t path "sha1"));
ignore (factory#add_separator ());
let item = factory#add_item "Download ..." in
ignore (item#connect#activate ~callback:(download_file t path));
@@ -192,56 +200,86 @@ and make_context_menu t paths =
item#misc#set_sensitive false;
let item = factory#add_item "Download as .tar ..." in
ignore (item#connect#activate
- ~callback:(download_dir_tarball t Slave.Tar path));
+ ~callback:(download_dir_tarball t Tar path));
let item = factory#add_item "Download as .tar.gz ..." in
ignore (item#connect#activate
- ~callback:(download_dir_tarball t Slave.TGZ path));
+ ~callback:(download_dir_tarball t TGZ path));
let item = factory#add_item "Download as .tar.xz ..." in
ignore (item#connect#activate
- ~callback:(download_dir_tarball t Slave.TXZ path));
+ ~callback:(download_dir_tarball t TXZ path));
let item = factory#add_item "Download list of filenames ..." in
ignore (item#connect#activate ~callback:(download_dir_find0 t path));
- and add_os_items path =
+ and add_top_os_items path =
let item = factory#add_item "Operating system information" in
ignore (item#connect#activate ~callback:(display_inspection_data t path));
ignore (factory#add_separator ());
- add_volume_items path
+ add_top_volume_items path
- and add_volume_items path =
+ and add_top_volume_items path =
let item = factory#add_item "Filesystem used & free" in
item#misc#set_sensitive false;
let item = factory#add_item "Block device information" in
item#misc#set_sensitive false;
ignore (factory#add_separator ());
add_directory_items path
+
+ and add_topwinreg_items path =
+ let item = factory#add_item "Download hive file ..." in
+ item#misc#set_sensitive false;
+ ignore (factory#add_separator ());
+ add_regkey_items path
+
+ and add_regkey_items path =
+ let item = factory#add_item "Download as .reg file ..." in
+ (match Config.hivexregedit with
+ | Some hivexregedit ->
+ ignore (item#connect#activate
+ ~callback:(download_as_reg t path hivexregedit));
+ | None ->
+ item#misc#set_sensitive false
+ )
+
+ and add_regvalue_items path =
+ let item = factory#add_item "Copy value to clipboard" in
+ ignore (item#connect#activate ~callback:(copy_regvalue t path));
+
in
- (match paths with
- (* single selection *)
- | [path, { content=Top (Slave.OS os)} ] -> (* top level operating system *)
- add_os_items path
+ let has_menu =
+ match paths with
+ | [] -> false
- | [path, { content=Top (Slave.Volume dev) }] -> (* top level volume *)
- add_volume_items path
+ (* single selection *)
+ | [path, { content=Top (OS os)} ] -> (* top level operating system *)
+ add_top_os_items path; true
- | [path, { content=Directory direntry }] -> (* directory *)
- add_directory_items path
+ | [path, { content=Top (Volume dev) }] -> (* top level volume *)
+ add_top_volume_items path; true
- | [path, { content=File direntry }] -> (* file *)
- add_file_items path
+ | [path, { content=Directory _ }] -> (* directory *)
+ add_directory_items path; true
- | [_, { content=Loading }]
- | [_, { content=ErrorMessage _ }] -> ()
+ | [path, { content=File _ }] -> (* file *)
+ add_file_items path; true
- | _ ->
- (* At the moment multiple selection is disabled. When/if we
- * enable it we should do something intelligent here. XXX
- *)
- ()
- );
+ | [path, { content=TopWinReg _ }] -> (* top level registry node *)
+ add_topwinreg_items path; true
- menu
+ | [path, { content=RegKey _ }] -> (* registry node *)
+ add_regkey_items path; true
+
+ | [path, { content=RegValue _ }] -> (* registry key/value pair *)
+ add_regvalue_items path; true
+
+ | [_, { content=(Loading|ErrorMessage _|Info _) }] -> false
+
+ | _::_::_ ->
+ (* At the moment multiple selection is disabled. When/if we
+ * enable it we should do something intelligent here. XXX
+ *)
+ false in
+ if has_menu then Some menu else None
let clear { model = model; hash = hash } =
model#clear ();
@@ -257,14 +295,14 @@ let rec add ({ model = model } as t) name data =
* filesystems.
*)
let other_filesystems =
- DeviceSet.of_list (List.map fst data.Slave.insp_all_filesystems) in
+ DeviceSet.of_list (List.map fst data.insp_all_filesystems) in
let other_filesystems =
- List.fold_left (fun set { Slave.insp_filesystems = fses } ->
+ List.fold_left (fun set { insp_filesystems = fses } ->
DeviceSet.subtract set (DeviceSet.of_array fses))
- other_filesystems data.Slave.insp_oses in
+ other_filesystems data.insp_oses in
(* Add top level operating systems. *)
- List.iter (add_top_level_os t name) data.Slave.insp_oses;
+ List.iter (add_top_level_os t name) data.insp_oses;
(* Add top level left-over filesystems. *)
DeviceSet.iter (add_top_level_vol t name) other_filesystems;
@@ -274,35 +312,35 @@ let rec add ({ model = model } as t) name data =
*)
List.iter (
fun os ->
- (match os.Slave.insp_winreg_SAM with
+ (match os.insp_winreg_SAM with
| Some filename ->
add_top_level_winreg t name os "HKEY_LOCAL_MACHINE\\SAM" filename
| None -> ()
);
- (match os.Slave.insp_winreg_SECURITY with
+ (match os.insp_winreg_SECURITY with
| Some filename ->
add_top_level_winreg t name os "HKEY_LOCAL_MACHINE\\SECURITY"
filename
| None -> ()
);
- (match os.Slave.insp_winreg_SOFTWARE with
+ (match os.insp_winreg_SOFTWARE with
| Some filename ->
add_top_level_winreg t name os "HKEY_LOCAL_MACHINE\\SOFTWARE"
filename
| None -> ()
);
- (match os.Slave.insp_winreg_SYSTEM with
+ (match os.insp_winreg_SYSTEM with
| Some filename ->
add_top_level_winreg t name os "HKEY_LOCAL_MACHINE\\SYSTEM"
filename
| None -> ()
);
- (match os.Slave.insp_winreg_DEFAULT with
+ (match os.insp_winreg_DEFAULT with
| Some filename ->
add_top_level_winreg t name os "HKEY_USERS\\.DEFAULT" filename
| None -> ()
);
- ) data.Slave.insp_oses;
+ ) data.insp_oses;
(* Expand the first top level node. *)
match model#get_iter_first with
@@ -314,11 +352,11 @@ let rec add ({ model = model } as t) name data =
and add_top_level_os ({ model = model } as t) name os =
let markup =
sprintf "%s\n%s\n%s"
- (markup_escape name) (markup_escape os.Slave.insp_hostname)
- (markup_escape os.Slave.insp_product_name) in
+ (markup_escape name) (markup_escape os.insp_hostname)
+ (markup_escape os.insp_product_name) in
let row = model#append () in
- make_node t row (Top (Slave.OS os)) None;
+ make_node t row (Top (OS os)) None;
model#set ~row ~column:t.name_col markup
(* Add a top level volume (left over filesystem) node. *)
@@ -328,7 +366,7 @@ and add_top_level_vol ({ model = model } as t) name dev =
(markup_escape dev) (markup_escape name) in
let row = model#append () in
- make_node t row (Top (Slave.Volume dev)) None;
+ make_node t row (Top (Volume dev)) None;
model#set ~row ~column:t.name_col markup
(* Add a top level Windows Registry node. *)
@@ -342,7 +380,7 @@ and add_top_level_winreg ({ model = model } as t) name os rootkey
let row = model#append () in
make_node t row
- (TopWinReg (Slave.OS os, rootkey, remotefile, cachefile)) None;
+ (TopWinReg (OS os, rootkey, remotefile, cachefile)) None;
model#set ~row ~column:t.name_col markup
(* Generic function to make an openable node to the tree. *)
@@ -408,8 +446,8 @@ and expand_row ({ model = model } as t) row _ =
(* Since the user has opened this top level registry node for the
* first time, we now need to download the hive.
*)
- Slave.download_file ~fail:(when_downloaded_registry_fail t path)
- src remotefile cachefile (when_downloaded_registry t path)
+ cache_registry_file ~fail:(when_downloaded_registry_fail t path)
+ t path src remotefile cachefile (when_downloaded_registry t path)
| { state=NodeNotStarted; content=RegKey node } as hdata ->
(* User has opened a Windows Registry key node not previously opened. *)
@@ -422,8 +460,10 @@ and expand_row ({ model = model } as t) row _ =
(* Ignore when a user opens a node which is loading or has been loaded. *)
| { state=(NodeLoading|IsNode) } -> ()
- (* These are not nodes so it should never be possible to open them. *)
- | { content=(File _ | RegValue _) } | { state=IsLeaf } -> assert false
+ (* In some circumstances these can be nodes, eg. if we have added Info
+ * nodes below them. Just ignore them if opened.
+ *)
+ | { content=(File _ | RegValue _) } | { state=IsLeaf } -> ()
(* Node should not exist in the tree. *)
| { state=NodeNotStarted; content=(Loading | ErrorMessage _ | Info _) } ->
@@ -435,10 +475,16 @@ and when_read_directory ({ model = model } as t) path entries =
let row = model#get_iter path in
+ (* Sort the entries by lexicographic ordering. *)
+ let cmp { dent_name = n1 } { dent_name = n2 } =
+ UTF8.compare n1 n2
+ in
+ let entries = List.sort ~cmp entries in
+
(* Add the entries. *)
List.iter (
fun direntry ->
- let { Slave.dent_name = name; dent_stat = stat; dent_link = link } =
+ let { dent_name = name; dent_stat = stat; dent_link = link } =
direntry in
let row = model#append ~parent:row () in
if is_directory stat.G.mode then
@@ -495,23 +541,12 @@ and when_read_directory_fail ({ model = model } as t) path exn =
and when_downloaded_registry ({ model = model } as t) path () =
debug "when_downloaded_registry";
let row = model#get_iter path in
-
let hdata = get_hdata t row in
- match hdata.content with
- | TopWinReg (src, rootkey, remotefile, cachefile) ->
- (try
- (* Open the hive and save the hive handle in the row hdata. *)
- let flags = if verbose () then [ Hivex.OPEN_VERBOSE ] else [] in
- let h = Hivex.open_file cachefile flags in
- hdata.hiveh <- Some h;
-
- (* Continue as if expanding any other hive node. *)
- let root = Hivex.root h in
- expand_hive_node t row root
- with
- Hivex.Error _ as exn -> when_downloaded_registry_fail t path exn
- )
- | _ -> assert false
+ let h = Option.get hdata.hiveh in
+
+ (* Continue as if expanding any other hive node. *)
+ let root = Hivex.root h in
+ expand_hive_node t row root
(* Called instead of {!when_downloaded_registry} if the download failed. *)
and when_downloaded_registry_fail ({ model = model } as t) path exn =
@@ -543,7 +578,7 @@ and expand_hive_node ({ model = model } as t) row node =
* to the tree.
*)
let values = Hivex.node_values h node in
- let cmp v1 v2 = compare (Hivex.value_key h v1) (Hivex.value_key h v2) in
+ let cmp v1 v2 = UTF8.compare (Hivex.value_key h v1) (Hivex.value_key h v2) in
Array.sort cmp values;
Array.iter (
fun value ->
@@ -555,7 +590,7 @@ and expand_hive_node ({ model = model } as t) row node =
) values;
let children = Hivex.node_children h node in
- let cmp n1 n2 = compare (Hivex.node_name h n1) (Hivex.node_name h n2) in
+ let cmp n1 n2 = UTF8.compare (Hivex.node_name h n1) (Hivex.node_name h n2) in
Array.sort cmp children;
Array.iter (
fun node ->