yakumo.izuru/kosuzu
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New edit <ID> command and updated readme

Browse Source 
git-svn-id: file:///srv/svn/repo/kosuzu/trunk@25 eb64cd80-c68d-6f47-b6a3-0ada418499da
This commit is contained in:
fox 2022-11-13 13:15:27 +00:00
parent 5fd7b2d389
commit d93e9479bc
7 changed files with 62 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/dune
View File

@ -1,5 +1,5 @@
(executable
(name txt)
(public_name txt)
(modules txt authors convert conversion file index last listing new topics html atom gemini publish pull read recent)
(modules txt authors convert conversion edit file index last listing new topics html atom gemini publish pull read recent)
(libraries text_parse.converter text_parse.parsers logarion msgpck curl str cmdliner))

16
cli/edit.ml Normal file
View File

@ -0,0 +1,16 @@
open Cmdliner
let term =
let id = Arg.(value & pos 0 string "" & info [] ~docv:"text ID") in
let recurse = Arg.(value & flag & info ["R"] ~doc:"recurse, include subdirs") in
let reverse = Arg.(value & flag & info ["r"] ~doc:"reverse order") in
let time = Arg.(value & flag & info ["t"] ~doc:"sort by time, newest first") in
let number = Arg.(value & opt (some int) None & info ["n"]
~docv:"number" ~doc:"number of entries to list") in
let authed = Arg.(value & opt (some string) None & info ["authored"]
~docv:"comma-separated names" ~doc:"texts by authors") in
let topics = Arg.(value & opt (some string) None & info ["topics"]
~docv:"comma-separated topics" ~doc:"texts with topics") in
Term.(const (Logarion.Archive.apply_sys_util "EDITOR" "nano") $ recurse $ time $ reverse $ number $ authed $ topics $ id),
Term.info "edit" ~doc: "edit a text" ~man:[ `S "DESCRIPTION";
`P "Launches $EDITOR with text path as parameter. If -R is used, the ID search space
includes texts found in subdirectories too" ]

22
cli/read.ml
View File

@ -1,24 +1,4 @@
open Logarion
module FS = File_store
module A = Archive
let print r order_opt reverse_opt number_opt authors_opt topics_opt id_opt =
let predicates = if id_opt <> "" then [ A.ided id_opt ] else []
@ A.predicate A.authored authors_opt
@ A.predicate A.topics topics_opt in
let predicate text = List.fold_left (fun a e -> a && e text) true predicates in
let pager = try Sys.getenv "PAGER" with Not_found -> "less" in
let print_text acc (_t, fnames) = Printf.sprintf "%s %s" acc (List.hd fnames) in
let paths = match order_opt with
| false -> FS.fold ~r ~predicate print_text ""
| true ->
let order = match reverse_opt with true -> FS.newest | false -> FS.oldest in
match number_opt with
| Some number -> FS.fold ~r ~predicate ~order ~number print_text ""
| None -> FS.fold ~r ~predicate ~order print_text ""
in if paths = "" then ()
else (ignore @@ Sys.command @@ Printf.sprintf "%s %s" pager paths)
open Cmdliner
let term =
@ -32,7 +12,7 @@ let term =
~docv:"comma-separated names" ~doc:"texts by authors") in
let topics = Arg.(value & opt (some string) None & info ["topics"]
~docv:"comma-separated topics" ~doc:"texts with topics") in
Term.(const print $ recurse $ time $ reverse $ number $ authed $ topics $ id),
Term.(const (Archive.apply_sys_util "PAGER" "less") $ recurse $ time $ reverse $ number $ authed $ topics $ id),
Term.info "read" ~doc: "read a text" ~man:[ `S "DESCRIPTION";
`P "List header information for current directory. If -R is used, list header
information for texts found in subdirectories too, along with their filepaths" ]

3
cli/txt.ml
View File

@ -3,12 +3,13 @@ let version = "%%VERSION%%"
open Cmdliner
let default_cmd =
let doc = "Discover, collect & exchange texts" in
let man = [ `S "Contact"; `P "<mailto:fox@orbitalfox.eu?subject=Logarion>" ] in
let man = [ `S "Contact"; `P "<mailto:logarion@lists.tildeverse.org?subject=Logarion>" ] in
Term.(ret (const (`Help (`Pager, None)))), Term.info "txt" ~version ~doc ~man
let () = match Term.eval_choice default_cmd [
Authors.term;
Convert.term;
Edit.term;
File.term; File.unfile_term;
Index.term;
Last.term;

17
lib/archive.ml
View File

@ -14,3 +14,20 @@ let keyworded query_string =
let topics query_string =
let q = String_set.query query_string in
fun n -> String_set.(predicate q (Text.set "Topics" n))
let apply_sys_util env def_env r order_opt reverse_opt number_opt authors_opt topics_opt id_opt =
let predicates = if id_opt <> "" then [ ided id_opt ] else []
@ predicate authored authors_opt
@ predicate topics topics_opt in
let predicate text = List.fold_left (fun a e -> a && e text) true predicates in
let util = try Sys.getenv env with Not_found -> def_env in
let print_text acc (_t, fnames) = Printf.sprintf "%s %s" acc (List.hd fnames) in
let paths = match order_opt with
| false -> File_store.fold ~r ~predicate print_text ""
| true ->
let order = match reverse_opt with true -> File_store.newest | false -> File_store.oldest in
match number_opt with
| Some number -> File_store.fold ~r ~predicate ~order ~number print_text ""
| None -> File_store.fold ~r ~predicate ~order print_text ""
in if paths = "" then ()
else (ignore @@ Sys.command @@ Printf.sprintf "%s %s" util paths)

10
readme
View File

@ -1,10 +0,0 @@
Logarion
discover, collect & exchange plain text files
Guide: <http://texts.orbitalfox.eu/11bcd8e9.htm>
Header format: <http://git.disroot.org/orbifx/logarion/raw/branch/master/header>
Source: <http://git.disroot.org/orbifx/logarion>
Licence: EUPL <http://joinup.ec.europa.eu/software/page/eupl>
IRC: <irc://tilde.chat/#logarion>

25
readme.txt Normal file
View File

@ -0,0 +1,25 @@
ID: ka4wtj
Title: Logarion
## Guides
Exploring & pulling texts from Logarion repositories.
<3sqd84.html>
Creating texts & publishing on the net.
<hvhhwf.html>
## Contacts
* Mailing list (anonymous) <https://lists.tildeverse.org/postorius/lists/logarion.lists.tildeverse.org/>
* <irc://tilde.chat/#logarion>
## References
### Header format
<http://git.disroot.org/orbifx/logarion/raw/branch/master/header>
### Source
<http://git.disroot.org/orbifx/logarion>