Changeset 13 in code for trunk

Timestamp:

Jul 30, 2022, 12:58:02 PM (3 years ago)

Author:

fox

Message:

Accept files & directories for conversion

Location:

trunk/cli

Files:

• convert.ml (modified) (3 diffs)
• publish.ml (modified) (1 diff)

trunk/cli/convert.ml

@@ -26 +26 @@
         t
 
-let convert_all converters noindex dir id kv =
+let directory converters noindex dir id kv =
         let empty = Topic_set.Map.empty in
         let repo = Conversion.{ id; dir; kv; topic_roots = []; topics = empty; texts = [] } in
@@ -39 +39 @@
         Printf.printf "Converted: %d Indexed: %d\n" count (List.length texts)
 
-let convert_dir types noindex dir =
-        match dir with "" -> prerr_endline "unspecified dir"
-        | dir ->
+let at_path types noindex path =
+        match path with "" -> prerr_endline "unspecified text file or directory"
+        | dir when Sys.file_exists dir && Sys.is_directory dir ->
                 let fname = Filename.concat dir "index.pck" in
-                match Header_pack.of_string @@ File_store.to_string fname with
+                (match Header_pack.of_string @@ File_store.to_string fname with
                 | Error s -> prerr_endline s
                 | Ok { info; _ } ->
@@ -52 +52 @@
                         let kv = Store.KV.add "Locations" (String.concat ";\n" info.Header_pack.locations) kv in
                         let cs = converters types kv in
-                        convert_all cs noindex dir info.Header_pack.id kv
+                        directory cs noindex dir info.Header_pack.id kv)
+        | path when Sys.file_exists path ->
+                let repo = Conversion.{
+                        id = ""; dir = ""; kv = Store.KV.empty; topic_roots = [];
+                        topics = Topic_set.Map.empty; texts = [] } in
+                let cs = converters types repo.kv in
+                (match File_store.to_text path with
+                | Ok text -> ignore @@ convert cs repo (text, [path])
+                | Error s -> prerr_endline s)
+        | path -> Printf.eprintf "Path doesn't exist: %s" path
 
 open Cmdliner
 let term =
-        let directory = Arg.(value & pos 0 string "" & info [] ~docv:"target directory"
-                ~doc:"Directory to convert") in
-        let types = Arg.(value & opt string "all" & info ["t"; "type"] ~docv:"TYPES"
-         ~doc:"Convert to type") in
+        let path = Arg.(value & pos 0 string "" & info [] ~docv:"path"
+                ~doc:"Text file or directory to convert. Ff directory is provided, it must contain an index.pck (see: txt index)") in
+        let types = Arg.(value & opt string "all" & info ["t"; "type"] ~docv:"output type"
+                ~doc:"Convert to file type") in
         let noindex = Arg.(value & flag & info ["noindex"]
-                ~doc:"don't create indices in target format") in
-        Term.(const convert_dir $ types $ noindex $ directory),
+                ~doc:"Don't create indices in target format") in
+        Term.(const at_path $ types $ noindex $ path),
         Term.info "convert" ~doc:"convert texts"
-                ~man:[ `S "DESCRIPTION"; `P "Convert texts within a directory to another format.
-                Directory must contain an index.pck. Run `txt index` first." ]
+                ~man:[ `S "DESCRIPTION"; `P "Convert text or indexed texts within a directory to another format.
+                If path is a directory must contain an index.pck. Run `txt index` first." ]

trunk/cli/publish.ml

@@ -21 +21 @@
         List.iter (fun t ->
                 Index.((load (snd t)) false None None None None);
-                Convert.convert_dir (fst t) false (snd t))
+                Convert.at_path (fst t) false (snd t))
                 targets