Changeset 43 in code for trunk/cli/convert.ml

Timestamp:

Dec 18, 2022, 2:49:25 PM (2 years ago)

Author:

fox

Message:

Relation dates, with conversion condition upon it

File:

• trunk/cli/convert.ml (modified) (3 diffs)

trunk/cli/convert.ml

@@ -8 +8 @@
                 let source = List.hd files in
                 let dest = Filename.concat r.Conversion.dir (Text.short_id text) in
-                List.fold_left
-                        (fun a f ->
-                                match f.Conversion.page with None -> false || a
-                                | Some page ->
-                                        let dest = dest ^ f.Conversion.ext in
-                                        (if is_older source dest then (File_store.file dest (page r text); true) else false)
-                                        || a)
+                List.fold_left (fun a f ->
+                        match f.Conversion.page with None -> false || a
+                        | Some page ->
+                                let dest = dest ^ f.Conversion.ext in
+                                (if is_older source dest || Conversion.Rel.Id_map.mem text.Text.id r.relations
+                                 then (File_store.file dest (page r text); true) else false)
+                                || a)
                         false cs
         | x -> Printf.eprintf "Can't convert Content-Type: %s file: %s" x text.Text.title; false
@@ -27 +27 @@
         t
 
-let acc_rel source target a =
-        prerr_endline source;
-        Conversion.Id_map.update target
-        (function Some set -> Some (Conversion.Ref_set.add source set)
-                | None -> Some (Conversion.Ref_set.singleton source))
-        a
-
-let empty_rels () = Conversion.Id_map.empty, Conversion.Id_map.empty
-
-let acc_txt_refs text refs = String_set.fold (acc_rel text.Text.id) (Text.set "references" text) refs
-let acc_txt_reps text reps = String_set.fold (acc_rel text.Text.id) (Text.set "in-reply-to" text) reps
-let acc_txt_rels (refs, reps) (elt, _paths) =
-        acc_txt_refs elt refs, acc_txt_reps elt reps
-
-let acc_pck_refs id refs_ls refs = String_set.fold (acc_rel id) (String_set.of_list refs_ls) refs
-let acc_pck_reps id reps_ls reps = String_set.fold (acc_rel id) (String_set.of_list reps_ls) reps
-let acc_pck_rels refs_reps peer =
-        let path = try List.hd peer.Peers.pack.Header_pack.info.locations with Failure _ -> "" in
-        try Header_pack.fold
-                (fun (refs, reps) id _t _title _authors _topics refs_ls reps_ls ->
-                        let id = Filename.concat path id in
-                        acc_pck_refs id refs_ls refs, acc_pck_reps id reps_ls reps)
-                refs_reps peer.Peers.pack
-        with e -> prerr_endline "acc_pck_rels"; raise e
-
 let directory converters noindex repo =
         let order = File_store.oldest in
         let repo =
-                let references, replies =
-                        File_store.fold ~dir:repo.Conversion.dir ~order acc_txt_rels (empty_rels ()) in
-                let references, replies = Peers.fold acc_pck_rels (references, replies) in
-                Printf.eprintf "%s %d\n" repo.Conversion.dir (Conversion.Id_map.cardinal replies);
-                { repo with references; replies } in
+                let open Conversion in
+                let rels = File_store.fold ~dir:repo.dir ~order Rel.acc_txt Rel.empty_map in
+                let relations = Peers.fold Rel.acc_pck rels in
+                { repo with relations } in
         let acc (ts,ls,acc) ((elt,_) as r) = Topic_set.to_map ts (Text.set "topics" elt), elt::ls,
                 if convert converters repo r then acc+1 else acc in
@@ -96 +70 @@
                         | Ok text ->
                                 let dir = "." in
-                                let references, replies = File_store.(fold ~dir ~order:newest acc_txt_rels (empty_rels ())) in
-                                let repo = { (Conversion.empty ()) with dir; kv = load_kv ""; references; replies } in
+                                let open Conversion in
+                                let relations = File_store.(fold ~dir ~order:newest Rel.acc_txt Rel.empty_map) in
+                                let repo = { (Conversion.empty ()) with dir; kv = load_kv ""; relations } in
                                 ignore @@ convert (converters types repo.kv) repo (text, [path])
                 )