X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhttp_getter%2Fhttp_getter_misc.ml;h=880ddd46e4cb71060d28a2932e128d47b98b518a;hb=b077aa16b12755c2bace508154773efc9fa2320c;hp=1bd5522134448245e3865297b20f45bbb117354d;hpb=d599c257fed6a37da72494676ed24315a6d8b2fb;p=helm.git

diff --git a/helm/http_getter/http_getter_misc.ml b/helm/http_getter/http_getter_misc.ml
index 1bd552213..880ddd46e 100644
--- a/helm/http_getter/http_getter_misc.ml
+++ b/helm/http_getter/http_getter_misc.ml
@@ -1,5 +1,5 @@
 (*
- *  Copyright (C) 2000, HELM Team.
+ *  Copyright (C) 2003, HELM Team.
  *
  *  This file is part of HELM, an Hypertextual, Electronic
  *  Library of Mathematics, developed at the Computer Science
@@ -24,6 +24,7 @@
  *  http://cs.unibo.it/helm/.
  *)
 
+open Http_getter_debugger;;
 open Printf;;
 
 let fold_file f init fname =
@@ -45,37 +46,61 @@ let hashtbl_sorted_fold f tbl init =
   in
   List.fold_left (fun acc k -> f k (Hashtbl.find tbl k) acc) init sorted_keys
 
-let wget ?output url =
-  let flags =
-    (match output with Some file -> ["-O"; file] | None -> []) @ [url]
-  in
+let cp src dst =
   Shell.call
     ~stdout:Shell.to_dev_null ~stderr:Shell.to_dev_null
-    [Shell.cmd "wget" flags]
+    [Shell.cmd "cp" [src; dst]]
 
-  (* TODO gzip and gunzip create executables file, but umask seems to be
-  correctly inherited from the shell .... boh *)
+let file_scheme_RE = Pcre.regexp "^file://"
+let wget ?output url =
+  let use_wget () =
+    let flags =
+      (match output with Some file -> ["-O"; file] | None -> []) @ [url]
+    in
+    debug_print ("wget " ^ String.concat " " flags);
+    Shell.call
+      ~stdout:Shell.to_dev_null ~stderr:Shell.to_dev_null
+      [Shell.cmd "wget" flags]
+  in
+  if Pcre.pmatch ~rex:file_scheme_RE url then begin (* file:// URL *)
+    let src_fname = Pcre.replace ~rex:file_scheme_RE url in
+    match output with
+    | Some dst_fname -> cp src_fname dst_fname
+    | None ->
+        let dst_fname = Filename.basename src_fname in
+        if src_fname <> dst_fname then
+          cp src_fname dst_fname
+        else  (* src and dst are the same: do nothing *)
+          ()
+  end else  (* other URL, pass it to wget *)
+    use_wget ()
 
   (* stderr shown as usual *)
 let gzip ?(keep = false) fname =
-  if keep then  (* keep original file *)
+  if keep then begin  (* keep original file *)
+    debug_print ("gzip -f -c " ^ fname);
     Shell.call
       ~stdout:(Shell.to_file (fname ^ ".gz"))
       [Shell.cmd "gzip" ["-f"; "-c"; fname]]
-  else  (* don't keep original file *)
+  end else begin  (* don't keep original file *)
+    debug_print ("gzip -f " ^ fname);
     Shell.call [Shell.cmd "gzip" ["-f"; fname]]
+  end
 
   (* stderr shown as usual *)
 let gunzip ?(keep = false) fname =
   if not (Pcre.pmatch ~pat:"\\.gz$" fname) then
     failwith "gunzip: source file doesn't end with '.gz'";
   let basename = Pcre.replace ~pat:"\\.gz$" fname in
-  if keep then  (* keep original file *)
+  if keep then begin  (* keep original file *)
+    debug_print ("gunzip -f -c " ^ fname);
     Shell.call
       ~stdout:(Shell.to_file basename)
       [Shell.cmd "gunzip" ["-f"; "-c"; fname]]
-  else  (* don't keep original file *)
+  end else begin  (* don't keep original file *)
+    debug_print ("gunzip -f " ^ fname);
     Shell.call [Shell.cmd "gunzip" ["-f"; fname]]
+  end
 
 let tempfile () =
   let buf = Buffer.create 28 in (* strlen("/tmp/fileSzb3Mw_http_getter") *)
@@ -84,8 +109,20 @@ let tempfile () =
     [Shell.cmd "tempfile" ["--suffix=_http_getter"]];
   Pcre.replace ~pat:"\n" (Buffer.contents buf)
 
+let mkdir ?(parents = false) dirname =
+  if not (Sys.file_exists dirname) then begin
+    let flags = if parents then ["-p"; dirname] else [dirname] in
+    debug_print ("mkdir " ^ String.concat " " flags);
+    Shell.call [Shell.cmd "mkdir" flags]
+  end
+
 let string_of_proc_status = function
   | Unix.WEXITED code -> sprintf "[Exited: %d]" code
   | Unix.WSIGNALED sg -> sprintf "[Killed: %d]" sg
   | Unix.WSTOPPED sg -> sprintf "[Stopped: %d]" sg
 
+let http_get url =
+  try
+    Some (Http_client.Convenience.http_get url)
+  with Http_client.Http_error (code, _) -> None
+