Changeset 6 in code

Timestamp:

Jun 16, 2022, 9:59:30 PM (3 years ago)

Author:

fox

Message:

txt publish <id>; file and convert to standard dirs

Location:

trunk

Files:

• cli/dune (modified) (1 diff)
• cli/file.ml (modified) (2 diffs)
• cli/publish.ml (added)
• cli/txt.ml (modified) (1 diff)
• lib/file_store.ml (modified) (6 diffs)

trunk/cli/dune

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

trunk/cli/file.ml

@@ -1 @@
-let split_filetypes files =
-        let acc (dirs, files) x = if Sys.is_directory x
-                then (x::dirs, files) else (dirs, x::files) in
-        List.fold_left acc ([],[]) files
-
 open Logarion
 let file files =
-        let dirs, files = split_filetypes files in
+        let dirs, files = File_store.split_filetypes files in
         let _link_as_named dir file = Unix.link file (Filename.concat dir file) in
         let link_with_id dir file =
@@ -15 +10 @@
 
 let unfile files =
-        let dirs, files = split_filetypes files in
+        let dirs, files = File_store.split_filetypes files in
         let unlink dir file = try Unix.unlink (Filename.concat dir file)
                 with Unix.(Unix_error(ENOENT,_,_))-> () in

trunk/cli/txt.ml

@@ -15 +15 @@
         Listing.term;
         New.term;
+        Publish.term;
         Pull.term;
         Topics.term;

trunk/lib/file_store.ml

@@ -4 +4 @@
 
 let extension = ".txt"
-let def_dir = try Sys.getenv "LOGARION_DIR" with Not_found -> "."
+let def_dir () =
+        let share = Sys.getenv "HOME" ^ "/.local/share/texts/" in
+        try Sys.getenv "txtdir" with Not_found ->
+                match Sys.is_directory share with
+                | true -> share
+                | false | exception (Sys_error _) -> "."
 
 let to_string f =
@@ -50 +55 @@
                 ) else it
 
+let split_filetypes files =
+        let acc (dirs, files) x = if Sys.is_directory x
+                then (x::dirs, files) else (dirs, x::files) in
+        List.fold_left acc ([],[]) files
+
 (* Compare file system nodes to skip reparsing? *)
 let list_fs ?(r=false) dir =
@@ -73 +83 @@
         @@ List.fold_left (fold_valid_text predicate) new_iteration flist
 
-let iter ?(r=false) ?(dir=def_dir) ?(predicate=fun _ -> true) ?order ?number fn =
+let iter ?(r=false) ?(dir=def_dir ()) ?(predicate=fun _ -> true) ?order ?number fn =
         let flist = list_fs ~r dir in match order with
         | Some comp -> List.iter fn @@ fold_sort_take ~predicate ~number comp flist
@@ -79 +89 @@
                 List.fold_left (fold_valid_text predicate) new_iteration flist
 
-let fold ?(r=false) ?(dir=def_dir) ?(predicate=fun _ -> true) ?order ?number fn acc =
+let fold ?(r=false) ?(dir=def_dir ()) ?(predicate=fun _ -> true) ?order ?number fn acc =
         let flist = list_fs ~r dir in match order with
         | Some comp -> List.fold_left fn acc @@ fold_sort_take ~predicate ~number comp flist
@@ -85 +95 @@
                 List.fold_left (fold_valid_text predicate) new_iteration flist
 
-let with_id ?(r=false) ?(dir=def_dir) id =
+let with_id ?(r=false) ?(dir=def_dir ()) id =
         let matched acc path =
                 match to_text path with
@@ -126 +136 @@
         if Sys.file_exists candidate then Error "Name clash, try again" else Ok candidate
 
-let with_text ?(dir=def_dir) new_text =
+let with_text ?(dir=def_dir ()) new_text =
         match id_filename dir extension new_text with
         | Error _ as e -> e