Accept comma separated converter names, separate Atom from Html and Gemini converters.
Note: atom must be called separately now because of the separation. Example txt convert -t htm,atom xyz git-svn-id: file:///srv/svn/repo/kosuzu/trunk@19 eb64cd80-c68d-6f47-b6a3-0ada418499da
This commit is contained in:
@@ -90,19 +90,11 @@ let indices r =
|
||||
let file name = File_store.file (Filename.concat r.Conversion.dir name) in
|
||||
let index_name = try Store.KV.find "Gemini-index" r.kv with Not_found -> "index.gmi" in
|
||||
let title = try Store.KV.find "Title" r.Conversion.kv with Not_found -> "" in
|
||||
|
||||
if index_name <> "" then
|
||||
file index_name (topic_main_index r title r.topic_roots r.texts);
|
||||
|
||||
if index_name <> "" then file index_name (topic_main_index r title r.topic_roots r.texts);
|
||||
file "index.date.gmi" (date_index title r.texts);
|
||||
|
||||
List.iter
|
||||
(fun topic -> file ("index." ^ topic ^ ".gmi")
|
||||
(topic_sub_index title r.topics topic r.texts))
|
||||
r.topic_roots;
|
||||
r.topic_roots
|
||||
|
||||
let base_url = try
|
||||
let _i = Str.(search_forward (regexp "gemini?://[^;]*") (Store.KV.find "Locations" r.kv) 0) in
|
||||
Str.(matched_string (Store.KV.find "Locations" r.kv))
|
||||
with Not_found -> prerr_endline "Missing location for Gemini"; "" in
|
||||
file "gmi.atom" (Atom.feed title r.id base_url "text/gemini" r.texts)
|
||||
let converter = Conversion.{ ext; page = Some page; indices = Some indices}
|
||||
|
||||
Reference in New Issue
Block a user