Changeset 32 in code for trunk

Timestamp:

Nov 19, 2022, 11:37:52 AM (2 years ago)

Author:

fox

Message:

Use txt.conf:Authors for txt-new. Don't use Draft in filename

Location:

trunk

Files:

• cli/new.ml (modified) (1 diff)
• lib/file_store.ml (modified) (1 diff)

trunk/cli/new.ml

@@ -3 +3 @@
 
 let new_txt title topics_opt interactive =
-        let t = match title with "" -> "Draft" | _ -> title in
-        let authors = Person.Set.of_string (Sys.getenv "USER") in
-        let text = { (Text.blank ()) with title = t; authors } in
-        let text = try Text.with_str_set text "Topics" (Option.get topics_opt)
-                with _ -> text in
+        let kv = Logarion.File_store.of_kv_file () in
+        let authors = Person.Set.of_string (try Logarion.Store.KV.find "Authors" kv
+                with Not_found -> Sys.getenv "USER") in
+        let text = { (Text.blank ()) with title; authors } in
+        let text = try Text.with_str_set text "Topics" (Option.get topics_opt) with _->text in
         match File_store.with_text text with
         | Error s -> prerr_endline s
         | Ok (filepath, _note) ->
-                if not interactive then print_endline filepath
-                else
-                        (print_endline @@ "Created: " ^ filepath;
-                        Sys.command ("$EDITOR " ^ filepath) |> ignore)
+                if interactive then (Sys.command ("$EDITOR " ^ filepath) |> ignore);
+                print_endline filepath
 
 let term =

trunk/lib/file_store.ml

@@ -125 +125 @@
 
 let id_filename repo extension text =
-        let basename = Text.alias text in
-        let candidate = Filename.concat repo (text.id ^ "." ^ basename ^ extension) in
+        let description = match Text.alias text with "" -> "" | x -> "." ^ x in
+        let candidate = Filename.concat repo (text.id ^ description ^ extension) in
         if Sys.file_exists candidate then Error "Name clash, try again" else Ok candidate