X-Git-Url: https://git.xandkar.net/?p=dups.git;a=blobdiff_plain;f=dups.ml;h=3cfbee31847b99958b9900a81c48bbf6db9b181f;hp=b6782b68f9021bdbc81522d75ca236dc029a8a02;hb=1253df349226345e7596e77e9b0120094f0f1a34;hpb=e09dff7f9b5875b81cf50b33dcf97635518f7c28

diff --git a/dups.ml b/dups.ml
index b6782b6..3cfbee3 100644
--- a/dups.ml
+++ b/dups.ml
@@ -12,21 +12,57 @@ module Stream : sig
 
   val iter : 'a t -> f:('a -> unit) -> unit
 
+  val map : 'a t -> f:('a -> 'b) -> 'b t
+
+  val filter : 'a t -> f:('a -> bool) -> 'a t
+
   val concat : ('a t) list -> 'a t
 end = struct
   module S = Stream
 
   type 'a t =
-    ('a S.t) list
+    {mutable streams : ('a S.t) list}
 
   let create f =
-    [S.from (fun _ -> f ())]
+    {streams = [S.from (fun _ -> f ())]}
+
+  let rec next t =
+    match t.streams with
+    | [] ->
+        None
+    | s :: streams ->
+        (match S.next s with
+        | exception Stream.Failure ->
+            t.streams <- streams;
+            next t
+        | x ->
+            Some x
+        )
+
+  let map t ~f =
+    create (fun () ->
+      match next t with
+      | None   -> None
+      | Some x -> Some (f x)
+    )
+
+  let filter t ~f =
+    let rec filter () =
+      match next t with
+      | None ->
+          None
+      | Some x when f x ->
+          Some x
+      | Some _ ->
+          filter ()
+    in
+    create filter
 
   let iter t ~f =
-    List.iter t ~f:(S.iter f)
+    List.iter t.streams ~f:(S.iter f)
 
   let concat ts =
-    List.concat ts
+    {streams = List.concat (List.map ts ~f:(fun {streams} -> streams))}
 end
 
 module In_channel : sig
@@ -42,19 +78,40 @@ end = struct
     )
 end
 
-module Directory_tree : sig
-  val find_files : string -> string Stream.t
+module File : sig
+  type t =
+    { path : string
+    ; size : int
+    }
+
+  val find : string -> t Stream.t
+  (** Find all files in the directory tree, starting from the given root path *)
+
+  val lookup : string Stream.t -> t Stream.t
+  (** Lookup file info for given paths *)
 end = struct
-  let find_files root =
+  type t =
+    { path : string
+    ; size : int
+    }
+
+  let lookup paths =
+    Stream.map paths ~f:(fun path ->
+      let {Unix.st_size = size; _} = Unix.lstat path in
+      {path; size}
+    )
+
+  let find root =
     let dirs  = Queue.create () in
     let files = Queue.create () in
     let explore parent =
       Array.iter (Sys.readdir parent) ~f:(fun child ->
         let path = Filename.concat parent child in
-        let {Unix.st_kind = file_kind; _} = Unix.lstat path in
+        let {Unix.st_kind = file_kind; st_size; _} = Unix.lstat path in
         match file_kind with
         | Unix.S_REG ->
-            Queue.add path files
+            let file = {path; size = st_size} in
+            Queue.add file files
         | Unix.S_DIR ->
             Queue.add path dirs
         | Unix.S_CHR
@@ -78,19 +135,50 @@ end = struct
 end
 
 type input =
-  | Root_paths of string list
-  | Paths_on_stdin
+  | Stdin
+  | Directories of string list
 
 type output =
   | Stdout
   | Directory of string
 
-let make_input_stream = function
-  | Paths_on_stdin ->
-      In_channel.lines stdin
-  | Root_paths paths ->
-      let paths = StrSet.elements (StrSet.of_list paths) in
-      Stream.concat (List.map paths ~f:Directory_tree.find_files)
+type opt =
+  { input  : input
+  ; output : output
+  ; ignore : Str.regexp option
+  }
+
+type count =
+  { considered  : int ref
+  ; empty       : int ref
+  ; ignored     : int ref
+  ; unique_size : int ref
+  ; hashed      : int ref
+  }
+
+let make_input_stream input ignore count =
+  let input =
+    match input with
+    | Stdin ->
+        File.lookup (In_channel.lines stdin)
+    | Directories paths ->
+        let paths = StrSet.elements (StrSet.of_list paths) in
+        Stream.concat (List.map paths ~f:File.find)
+  in
+  Stream.filter input ~f:(fun {File.path; size} ->
+    incr count.considered;
+    let empty = size = 0 in
+    let ignored =
+      match ignore with
+      | Some regexp when (Str.string_match regexp path 0) ->
+          true
+      | Some _ | None ->
+          false
+    in
+    if empty   then incr count.empty;
+    if ignored then incr count.ignored;
+    (not empty) && (not ignored)
+  )
 
 let make_output_fun = function
   | Stdout ->
@@ -108,50 +196,73 @@ let make_output_fun = function
         );
         close_out oc
 
-let main input output =
+let main {input; output; ignore} =
+  let t0 = Sys.time () in
+  let count =
+    { considered  = ref 0
+    ; empty       = ref 0
+    ; ignored     = ref 0
+    ; unique_size = ref 0
+    ; hashed      = ref 0
+    }
+  in
   let output = make_output_fun  output in
-  let input  = make_input_stream input in
+  let input  = make_input_stream input ignore count in
+  let paths_by_size = Hashtbl.create 1_000_000 in
   let paths_by_digest = Hashtbl.create 1_000_000 in
-  let path_count = ref 0 in
-  let t0 = Sys.time () in
-  Stream.iter input ~f:(fun path ->
-    incr path_count;
-    try
-      let digest = Digest.file path in
-      let count, paths =
-        match Hashtbl.find_opt paths_by_digest digest with
-        | None ->
-            (0, StrSet.empty)
-        | Some (n, paths) ->
-            (n, paths)
-      in
-      Hashtbl.replace paths_by_digest digest (count + 1, StrSet.add path paths)
-    with Sys_error e ->
-      eprintf "WARNING: Failed to process %S: %S\n%!" path e
+  let process tbl path ~f =
+    let key = f path in
+    let count, paths =
+      match Hashtbl.find_opt tbl key with
+      | None ->
+          (0, StrSet.empty)
+      | Some (n, paths) ->
+          (n, paths)
+    in
+    Hashtbl.replace tbl key (count + 1, StrSet.add path paths)
+  in
+  Stream.iter input ~f:(fun {File.path; size} ->
+    process paths_by_size path ~f:(fun _ -> size)
   );
+  Hashtbl.iter
+    (fun _ (n, paths) ->
+      (* Skip files with unique sizes *)
+      if n > 1 then
+        StrSet.iter
+          (fun path ->
+            incr count.hashed;
+            process paths_by_digest path ~f:Digest.file
+          )
+          paths
+      else
+        incr count.unique_size;
+    )
+    paths_by_size;
   Hashtbl.iter (fun d (n, ps) -> if n > 1 then output d n ps) paths_by_digest;
   let t1 = Sys.time () in
-  eprintf "Processed %d files in %f seconds.\n%!" !path_count (t1 -. t0)
+  eprintf "Time                       : %f seconds\n%!" (t1 -. t0);
+  eprintf "Considered                 : %d\n%!" !(count.considered);
+  eprintf "Hashed                     : %d\n%!" !(count.hashed);
+  eprintf "Skipped due to 0      size : %d\n%!" !(count.empty);
+  eprintf "Skipped due to unique size : %d\n%!" !(count.unique_size);
+  eprintf "Ignored due to regex match : %d\n%!" !(count.ignored)
 
-let () =
-  let input  = ref Paths_on_stdin in
-  let output = ref Stdout in
-  let assert_file_exists path =
-    if Sys.file_exists path then
-      ()
-    else begin
-      eprintf "File does not exist: %S\n%!" path;
+let get_opt () : opt =
+  let assert_ test x msg =
+    if not (test x) then begin
+      eprintf "%s\n%!" msg;
       exit 1
     end
   in
+  let assert_file_exists path =
+    assert_ Sys.file_exists path (sprintf "File does not exist: %S" path)
+  in
   let assert_file_is_dir path =
-    if Sys.is_directory path then
-      ()
-    else begin
-      eprintf "File is not a directory: %S\n%!" path;
-      exit 1
-    end
+    assert_ Sys.is_directory path (sprintf "File is not a directory: %S" path)
   in
+  let input  = ref Stdin in
+  let output = ref Stdout in
+  let ignore = ref None in
   let spec =
     [ ( "-out"
       , Arg.String (fun path ->
@@ -161,6 +272,10 @@ let () =
         )
       , " Output to this directory instead of stdout."
       )
+    ; ( "-ignore"
+      , Arg.String (fun regexp -> ignore := Some (Str.regexp regexp))
+      , " Ignore file paths which match this regexp pattern (see Str module)."
+      )
     ]
   in
   Arg.parse
@@ -169,10 +284,16 @@ let () =
       assert_file_exists path;
       assert_file_is_dir path;
       match !input with
-      | Paths_on_stdin ->
-          input := Root_paths [path]
-      | Root_paths paths ->
-          input := Root_paths (path :: paths)
+      | Stdin ->
+          input := Directories [path]
+      | Directories paths ->
+          input := Directories (path :: paths)
     )
     "";
-  main !input !output
+  { input  = !input
+  ; output = !output
+  ; ignore = !ignore
+  }
+
+let () =
+  main (get_opt ())