shinyoukai/kosuzu
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Begin unifying conf and pck code; inline CSS; optional CSS & Atom

Browse Source 
git-svn-id: file:///srv/svn/repo/kosuzu/trunk@20 eb64cd80-c68d-6f47-b6a3-0ada418499da
This commit is contained in:
fox
2022-10-30 14:48:02 +00:00
parent 39e9796a6e
commit 0021ae508f
3 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
cli/convert.ml
View File

@@ -1,7 +1,7 @@
open Logarion
let is_older source dest = try
Unix.((stat dest).st_mtime < (stat source).st_mtime) with _-> true
(*TODO: move to converters (style, feed checks)*)
let is_older s d = try Unix.((stat d).st_mtime < (stat s).st_mtime) with _-> true
let convert cs r (text, files) = match Text.str "Content-Type" text with
| "" | "text/plain" ->
@@ -26,47 +26,52 @@ let converters types kv =
let t = if List.(mem "all" n || mem "gmi-atom" n) then (Atom.converter "text/gemini")::t else t in
t
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
let directory converters noindex repo =
let fn (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
let topics, texts, count = File_store.(fold ~dir ~order:newest fn (empty,[],0)) in
let topic_roots = try List.rev @@ String_set.list_of_csv (Store.KV.find "Topics" kv)
let topics, texts, count =
File_store.(fold ~dir:repo.Conversion.dir ~order:newest fn (Topic_set.Map.empty,[],0)) in
let topic_roots = try List.rev @@ String_set.list_of_csv (Store.KV.find "Topics" repo.kv)
with Not_found -> Topic_set.roots topics in
let repo = Conversion.{ repo with topic_roots; topics; texts } in
if not noindex then List.iter (fun c -> match c.Conversion.indices with None -> () | Some f -> f repo) converters;
Printf.printf "Converted: %d Indexed: %d\n" count (List.length texts)
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
| Error s -> prerr_endline s
let load_kv dir =
let conf = Filename.concat dir ".convert.conf" in (* TODO: better name? *)
let kv = if Sys.file_exists conf then File_store.of_kv_file conf else Store.KV.empty in
let idx = Filename.concat dir "index.pck" in
if not (Sys.file_exists idx) then kv else
match Header_pack.of_string @@ File_store.to_string (idx) with
| Error s -> prerr_endline s; kv
| Ok { info; peers; _ } ->
let kv = let f = Filename.concat dir ".convert.conf" in (* TODO: better place to store convert conf? *)
if Sys.file_exists f then File_store.of_kv_file f else Store.KV.empty in
let kv = if Store.KV.mem "Id" kv then kv else Store.KV.add "Id" info.Header_pack.id kv in
let kv = if Store.KV.mem "Title" kv then kv else Store.KV.add "Title" info.Header_pack.title kv in
let kv = Store.KV.add "Locations" (String.concat ";\n" info.Header_pack.locations) kv in
let kv = Store.KV.add "Peers" (String.concat ";\n" Header_pack.(to_str_list peers)) kv in
let cs = converters types kv in
directory cs noindex dir info.Header_pack.id kv)
kv
let at_path types noindex path = match path with
| "" -> prerr_endline "unspecified text file or directory"
| 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)
if Sys.is_directory path then (
let kv = load_kv path in
let repo = { (Conversion.empty ()) with dir = path; kv } in
directory (converters types kv) noindex repo
) else (
match File_store.to_text path with
| Error s -> prerr_endline s
| Ok text ->
let repo = { (Conversion.empty ()) with dir = ""; kv = load_kv "" } in
ignore @@ convert (converters types repo.kv) repo (text, [path])
)
| path -> Printf.eprintf "Path doesn't exist: %s" path
open Cmdliner
let term =
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
~doc:"Text file or directory to convert. If 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"]