only download stuff that is not present
This commit is contained in:
parent
a61f944d4f
commit
cd3294ebe3
1 changed files with 45 additions and 13 deletions
|
@ -356,22 +356,45 @@ module Make
|
||||||
else
|
else
|
||||||
Lwt.return_unit
|
Lwt.return_unit
|
||||||
|
|
||||||
let read t h v =
|
let find_key t h v =
|
||||||
match hex_of_string v with
|
match hex_of_string v with
|
||||||
| Error `Msg msg ->
|
| Error `Msg msg ->
|
||||||
Logs.err (fun m -> m "error %s while decoding hex %s" msg v);
|
Logs.err (fun m -> m "error %s while decoding hex %s" msg v);
|
||||||
Lwt.return (Error `Bad_request)
|
Error `Bad_request
|
||||||
| Ok bin ->
|
| Ok bin ->
|
||||||
match
|
match
|
||||||
match h with
|
match h with
|
||||||
| `MD5 -> SM.find_opt bin t.md5s
|
| `MD5 -> SM.find_opt bin t.md5s
|
||||||
| `SHA512 -> SM.find_opt bin t.sha512s
|
| `SHA512 -> SM.find_opt bin t.sha512s
|
||||||
| `SHA256 -> Some bin
|
| `SHA256 -> Some bin
|
||||||
|
| _ -> None
|
||||||
with
|
with
|
||||||
| None ->
|
| None ->
|
||||||
Logs.err (fun m -> m "couldn't find %s" v);
|
Logs.err (fun m -> m "couldn't find %s" v);
|
||||||
Lwt.return (Error `Not_found)
|
Error `Not_found
|
||||||
| Some x ->
|
| Some x -> Ok x
|
||||||
|
|
||||||
|
let exists t h v =
|
||||||
|
match find_key t h v with
|
||||||
|
| Error _ -> Lwt.return false
|
||||||
|
| Ok x ->
|
||||||
|
KV.exists t.dev (Mirage_kv.Key.v x) >|= function
|
||||||
|
| Ok Some `Value -> true
|
||||||
|
| Ok Some `Dictionary ->
|
||||||
|
Logs.err (fun m -> m "unexpected dictionary for %s %s"
|
||||||
|
(hash_to_string h) (hex_to_string v));
|
||||||
|
false
|
||||||
|
| Ok None -> false
|
||||||
|
| Error e ->
|
||||||
|
Logs.err (fun m -> m "exists %s %s returned %a"
|
||||||
|
(hash_to_string h) (hex_to_string v)
|
||||||
|
KV.pp_error e);
|
||||||
|
false
|
||||||
|
|
||||||
|
let read t h v =
|
||||||
|
match find_key t h v with
|
||||||
|
| Error _ as e -> Lwt.return e
|
||||||
|
| Ok x ->
|
||||||
KV.get t.dev (Mirage_kv.Key.v x) >|= function
|
KV.get t.dev (Mirage_kv.Key.v x) >|= function
|
||||||
| Ok data -> Ok data
|
| Ok data -> Ok data
|
||||||
| Error e ->
|
| Error e ->
|
||||||
|
@ -443,6 +466,15 @@ module Make
|
||||||
end
|
end
|
||||||
in
|
in
|
||||||
Lwt_list.iter_p (fun (url, csums) ->
|
Lwt_list.iter_p (fun (url, csums) ->
|
||||||
|
HM.fold (fun h v r ->
|
||||||
|
r >>= function
|
||||||
|
| true -> Disk.exists disk h v
|
||||||
|
| false -> Lwt.return false)
|
||||||
|
csums (Lwt.return true) >>= function
|
||||||
|
| true ->
|
||||||
|
Logs.info (fun m -> m "ignoring %s (already present)" url);
|
||||||
|
Lwt.return_unit
|
||||||
|
| false ->
|
||||||
follow 20 url >>= function
|
follow 20 url >>= function
|
||||||
| Some str -> Disk.write disk str csums
|
| Some str -> Disk.write disk str csums
|
||||||
| None -> Lwt.return_unit)
|
| None -> Lwt.return_unit)
|
||||||
|
|
Loading…
Reference in a new issue