commit 7283654e2d452e91eb99d39b991cde0b4d23b37e · anil.recoil.org/slop

+14 -7

stack/bushel/bin/bushel_main.ml

···

       4
       4
        
       

     

       5
       5
        
       (* Import actual command implementations from submodules *)

     

       6
       6
        
       

     

       7
       7
       -
       (* Obsidian command *)

     

       7
       7
       +
       (* Obsidian command - no API keys needed *)

     

       8
       8
        
       let obsidian_cmd =

     

       9
       9
        
         let doc = "Convert Bushel entries to Obsidian format" in

     

       10
       10
        
         Eiocmd.run

     

       11
       11
       +
           ~use_keyeio:false

     

       11
       12
        
           ~info:(Cmd.info "obsidian" ~version ~doc)

     

       12
       13
        
           ~app_name:"bushel"

     

       13
       14
        
           ~service:"bushel"

     
···

       19
       20
        
       (* Paper tex command *)

     

       20
       21
        
       let paper_tex_cmd = Bushel_paper_tex.cmd

     

       21
       22
        
       

     

       22
       22
       -
       (* Thumbs command *)

     

       23
       23
       +
       (* Thumbs command - no API keys needed *)

     

       23
       24
        
       let thumbs_cmd =

     

       24
       25
        
         let doc = "Generate thumbnails from paper PDFs" in

     

       25
       26
        
         Eiocmd.run

     

       27
       27
       +
           ~use_keyeio:false

     

       26
       28
        
           ~info:(Cmd.info "thumbs" ~version ~doc)

     

       27
       29
        
           ~app_name:"bushel"

     

       28
       30
        
           ~service:"bushel"

     

       29
       31
        
           Bushel_thumbs.term

     

       30
       32
        
       

     

       31
       31
       -
       (* Query command *)

     

       33
       33
       +
       (* Query command - needs Typesense API key *)

     

       32
       34
        
       let query_cmd =

     

       33
       35
        
         let doc = "Query Bushel collections using multisearch" in

     

       34
       36
        
         Eiocmd.run

     

       37
       37
       +
           ~use_keyeio:true

     

       35
       38
        
           ~info:(Cmd.info "query" ~version ~doc)

     

       36
       39
        
           ~app_name:"bushel"

     

       37
       40
        
           ~service:"bushel"

     

       38
       41
        
           Bushel_search.term

     

       39
       42
        
       

     

       40
       40
       -
       (* Bibtex command *)

     

       43
       43
       +
       (* Bibtex command - no API keys needed *)

     

       41
       44
        
       let bibtex_cmd =

     

       42
       45
        
         let doc = "Export bibtex for all papers" in

     

       43
       46
        
         Eiocmd.run

     

       47
       47
       +
           ~use_keyeio:false

     

       44
       48
        
           ~info:(Cmd.info "bibtex" ~version ~doc)

     

       45
       49
        
           ~app_name:"bushel"

     

       46
       50
        
           ~service:"bushel"

     
···

       49
       53
        
       (* Ideas command *)

     

       50
       54
        
       let ideas_cmd = Bushel_ideas.cmd

     

       51
       55
        
       

     

       52
       52
       -
       (* Info command *)

     

       56
       56
       +
       (* Info command - no API keys needed *)

     

       53
       57
        
       let info_cmd =

     

       54
       58
        
         let doc = "Display all information for a given slug" in

     

       55
       59
        
         Eiocmd.run

     

       60
       60
       +
           ~use_keyeio:false

     

       56
       61
        
           ~info:(Cmd.info "info" ~version ~doc)

     

       57
       62
        
           ~app_name:"bushel"

     

       58
       63
        
           ~service:"bushel"

     

       59
       64
        
           Bushel_info.term

     

       60
       65
        
       

     

       61
       61
       -
       (* Missing command *)

     

       66
       66
       +
       (* Missing command - no API keys needed *)

     

       62
       67
        
       let missing_cmd =

     

       63
       68
        
         let doc = "Check for missing metadata in entries" in

     

       64
       69
        
         Eiocmd.run

     

       70
       70
       +
           ~use_keyeio:false

     

       65
       71
        
           ~info:(Cmd.info "missing" ~version ~doc)

     

       66
       72
        
           ~app_name:"bushel"

     

       67
       73
        
           ~service:"bushel"

     

       68
       74
        
           Bushel_missing.term

     

       69
       75
        
       

     

       70
       70
       -
       (* Note DOI command *)

     

       76
       76
       +
       (* Note DOI command - no API keys needed *)

     

       71
       77
        
       let note_doi_cmd =

     

       72
       78
        
         let doc = "Assign DOIs to notes with perma:true" in

     

       73
       79
        
         Eiocmd.run

     

       80
       80
       +
           ~use_keyeio:false

     

       74
       81
        
           ~info:(Cmd.info "note-doi" ~version ~doc)

     

       75
       82
        
           ~app_name:"bushel"

     

       76
       83
        
           ~service:"bushel"

+36 -24

stack/eiocmd/lib/eiocmd.ml

···

       2
       2
        
       

     

       3
       3
        
       (** {1 Running Applications} *)

     

       4
       4
        
       

     

       5
       5
       -
       (* Batteries-included run with XDG and keyeio *)

     

       6
       6
       -
       let run ~info ~app_name ~service main_term =

     

       5
       5
       +
       (* Batteries-included run with XDG and optional keyeio *)

     

       6
       6
       +
       let run ?(use_keyeio=true) ~info ~app_name ~service main_term =

     

       7
       7
        
         let open Cmdliner in

     

       8
       8
        
       

     

       9
       9
        
         let run_main main profile_name_opt key_file_opt =

     
···

       15
       15
        
           (* Create xdg context *)

     

       16
       16
        
           let xdg = Xdge.create env#fs app_name in

     

       17
       17
        
       

     

       18
       18
       -
           (* Load keyeio profile *)

     

       19
       19
       -
           let keyeio_ctx = Keyeio.create xdg in

     

       20
       20
       -
           let profile_name = Option.value profile_name_opt ~default:"default" in

     

       18
       18
       +
           (* Load keyeio profile if requested *)

     

       19
       19
       +
           let profile =

     

       20
       20
       +
             if not use_keyeio then

     

       21
       21
       +
               (* Create empty profile when keyeio is not needed *)

     

       22
       22
       +
               Keyeio.Profile.empty

     

       23
       23
       +
             else

     

       24
       24
       +
               (* Load from keyeio *)

     

       25
       25
       +
               let keyeio_ctx = Keyeio.create xdg in

     

       26
       26
       +
               let profile_name = Option.value profile_name_opt ~default:"default" in

     

       21
       27
        
       

     

       22
       22
       -
           let profile = match key_file_opt with

     

       23
       23
       -
             | Some _path ->

     

       24
       24
       -
                 (* TODO: Load from specified file *)

     

       25
       25
       -
                 failwith "Direct file loading not yet supported in eiocmd (use --profile instead)"

     

       26
       26
       -
             | None ->

     

       27
       27
       -
                 (* Load from XDG directory *)

     

       28
       28
       -
                 match Keyeio.load_service keyeio_ctx ~service with

     

       29
       29
       -
                 | Ok svc ->

     

       30
       30
       -
                     (match Keyeio.Service.get_profile svc profile_name with

     

       31
       31
       -
                     | Some prof -> prof

     

       32
       32
       -
                     | None ->

     

       33
       33
       -
                         failwith (Printf.sprintf "Profile '%s' not found in service '%s'"

     

       34
       34
       -
                           profile_name service))

     

       35
       35
       -
                 | Error (`Msg msg) -> failwith msg

     

       28
       28
       +
               match key_file_opt with

     

       29
       29
       +
               | Some _path ->

     

       30
       30
       +
                   (* TODO: Load from specified file *)

     

       31
       31
       +
                   failwith "Direct file loading not yet supported in eiocmd (use --profile instead)"

     

       32
       32
       +
               | None ->

     

       33
       33
       +
                   (* Load from XDG directory *)

     

       34
       34
       +
                   match Keyeio.load_service keyeio_ctx ~service with

     

       35
       35
       +
                   | Ok svc ->

     

       36
       36
       +
                       (match Keyeio.Service.get_profile svc profile_name with

     

       37
       37
       +
                       | Some prof -> prof

     

       38
       38
       +
                       | None ->

     

       39
       39
       +
                           failwith (Printf.sprintf "Profile '%s' not found in service '%s'"

     

       40
       40
       +
                             profile_name service))

     

       41
       41
       +
                   | Error (`Msg msg) -> failwith msg

     

       36
       42
        
           in

     

       37
       43
        
       

     

       38
       44
        
           main env xdg profile

     

       39
       45
        
         in

     

       40
       46
        
       

     

       41
       41
       -
         (* Add profile and key-file flags *)

     

       47
       47
       +
         (* Add profile and key-file flags only if using keyeio *)

     

       42
       48
        
         let profile_flag =

     

       43
       43
       -
           let doc = Printf.sprintf "Profile name to use for %s service" service in

     

       44
       44
       -
           Arg.(value & opt (some string) None & info [ "profile" ] ~docv:"NAME" ~doc)

     

       49
       49
       +
           if use_keyeio then

     

       50
       50
       +
             let doc = Printf.sprintf "Profile name to use for %s service" service in

     

       51
       51
       +
             Arg.(value & opt (some string) None & info [ "profile" ] ~docv:"NAME" ~doc)

     

       52
       52
       +
           else

     

       53
       53
       +
             Term.const None

     

       45
       54
        
         in

     

       46
       55
        
         let key_file_flag =

     

       47
       47
       -
           let doc = Printf.sprintf "Override with direct path to %s key file" service in

     

       48
       48
       -
           Arg.(value & opt (some file) None & info [ "key-file" ] ~docv:"FILE" ~doc)

     

       56
       56
       +
           if use_keyeio then

     

       57
       57
       +
             let doc = Printf.sprintf "Override with direct path to %s key file" service in

     

       58
       58
       +
             Arg.(value & opt (some file) None & info [ "key-file" ] ~docv:"FILE" ~doc)

     

       59
       59
       +
           else

     

       60
       60
       +
             Term.const None

     

       49
       61
        
         in

     

       50
       62
        
       

     

       51
       63
        
         (* Compose with main term and add logging setup *)

+15 -2

stack/eiocmd/lib/eiocmd.mli

···

       13
       13
        
           - Logging (via Logs_cli with standard flags)

     

       14
       14
        
           - Cmdliner argument parsing

     

       15
       15
        
           - XDG directory structure (all directories created)

     

       16
       16
       -
           - API key management via keyeio

     

       16
       16
       +
           - API key management via keyeio (optional)

     

       17
       17
       +
       

     

       18
       18
       +
           @param use_keyeio

     

       19
       19
       +
             Controls whether to initialize keyeio for API key management.

     

       20
       20
       +
             - [true] (default): Load keyeio service and profile, add --profile and --key-file flags

     

       21
       21
       +
             - [false]: Skip keyeio, provide empty profile, no keyeio-related flags

     

       22
       22
       +
       

     

       23
       23
       +
             Use [~use_keyeio:false] for commands that don't need API keys to avoid

     

       24
       24
       +
             creating unnecessary config directories and service files.

     

       25
       25
       +
       

     

       26
       26
       +
           @param info Command info for Cmdliner

     

       27
       27
       +
           @param app_name Application name for XDG directories

     

       28
       28
       +
           @param service Service name for keyeio profile lookup (ignored if use_keyeio=false)

     

       29
       29
       +
           @param main_term The main command term that receives (env, xdg, profile) parameters

     

       17
       30
        
           ]} *)

     

       18
       31
        
       val run :

     

       32
       32
       +
         ?use_keyeio:bool ->

     

       19
       33
        
         info:Cmdliner.Cmd.info ->

     

       20
       34
        
         app_name:string ->

     

       21
       35
        
         service:string ->

     

       22
       36
        
         (Eio_unix.Stdenv.base -> Xdge.t -> Keyeio.Profile.t -> int) Cmdliner.Term.t ->

     

       23
       37
        
         Cmdliner.Cmd.Exit.code Cmdliner.Cmd.t

     

       24
       24
       -

stack/keyeio/lib/keyeio.ml

···

       31
       31
        
       

     

       32
       32
        
         let keys t = List.map fst t.data

     

       33
       33
        
       

     

       34
       34
       +
         let empty = { service = ""; name = ""; data = [] }

     

       35
       35
       +
       

     

       34
       36
        
         let to_toml t =

     

       35
       37
        
           let table = Toml.Types.Table.empty in

     

       36
       38
        
           List.fold_left

stack/keyeio/lib/keyeio.mli

···

       152
       152
        
             ]} *)

     

       153
       153
        
         val keys : t -> string list

     

       154
       154
        
       

     

       155
       155
       +
         (** [empty] creates an empty profile with no data.

     

       156
       156
       +
       

     

       157
       157
       +
             This is useful when a command doesn't need API keys but must

     

       158
       158
       +
             conform to an interface that expects a profile parameter.

     

       159
       159
       +
       

     

       160
       160
       +
             @return An empty profile with empty service name, empty profile name, and no data *)

     

       161
       161
       +
         val empty : t

     

       162
       162
       +
       

     

       155
       163
        
         (** [to_toml t] converts the profile to a TOML table representation.

     

       156
       164
        
       

     

       157
       165
        
             Returns a TOML table containing all key-value pairs in the profile.

stack/river/bin/river_cli.ml

···

       528
       528
        
       let user_add_cmd =

     

       529
       529
        
         let doc = "Add a new user" in

     

       530
       530
        
         Eiocmd.run

     

       531
       531
       +
           ~use_keyeio:false

     

       531
       532
        
           ~info:(Cmd.info "add" ~doc)

     

       532
       533
        
           ~app_name:"river"

     

       533
       534
        
           ~service:"river"

     
···

       540
       541
        
       let user_remove_cmd =

     

       541
       542
        
         let doc = "Remove a user" in

     

       542
       543
        
         Eiocmd.run

     

       544
       544
       +
           ~use_keyeio:false

     

       543
       545
        
           ~info:(Cmd.info "remove" ~doc)

     

       544
       546
        
           ~app_name:"river"

     

       545
       547
        
           ~service:"river"

     
···

       551
       553
        
       let user_list_cmd =

     

       552
       554
        
         let doc = "List all users" in

     

       553
       555
        
         Eiocmd.run

     

       556
       556
       +
           ~use_keyeio:false

     

       554
       557
        
           ~info:(Cmd.info "list" ~doc)

     

       555
       558
        
           ~app_name:"river"

     

       556
       559
        
           ~service:"river"

     
···

       562
       565
        
       let user_show_cmd =

     

       563
       566
        
         let doc = "Show user details" in

     

       564
       567
        
         Eiocmd.run

     

       568
       568
       +
           ~use_keyeio:false

     

       565
       569
        
           ~info:(Cmd.info "show" ~doc)

     

       566
       570
        
           ~app_name:"river"

     

       567
       571
        
           ~service:"river"

     
···

       573
       577
        
       let user_add_feed_cmd =

     

       574
       578
        
         let doc = "Add a feed to a user" in

     

       575
       579
        
         Eiocmd.run

     

       580
       580
       +
           ~use_keyeio:false

     

       576
       581
        
           ~info:(Cmd.info "add-feed" ~doc)

     

       577
       582
        
           ~app_name:"river"

     

       578
       583
        
           ~service:"river"

     
···

       584
       589
        
       let user_remove_feed_cmd =

     

       585
       590
        
         let doc = "Remove a feed from a user" in

     

       586
       591
        
         Eiocmd.run

     

       592
       592
       +
           ~use_keyeio:false

     

       587
       593
        
           ~info:(Cmd.info "remove-feed" ~doc)

     

       588
       594
        
           ~app_name:"river"

     

       589
       595
        
           ~service:"river"

     
···

       612
       618
        
           Arg.(value & pos 0 (some string) None & info [] ~docv:"USERNAME" ~doc)

     

       613
       619
        
         in

     

       614
       620
        
         Eiocmd.run

     

       621
       621
       +
           ~use_keyeio:false

     

       615
       622
        
           ~info:(Cmd.info "sync" ~doc)

     

       616
       623
        
           ~app_name:"river"

     

       617
       624
        
           ~service:"river"

     
···

       642
       649
        
           Arg.(value & opt (some int) None & info ["limit"; "n"] ~doc)

     

       643
       650
        
         in

     

       644
       651
        
         Eiocmd.run

     

       652
       652
       +
           ~use_keyeio:false

     

       645
       653
        
           ~info:(Cmd.info "list" ~doc)

     

       646
       654
        
           ~app_name:"river"

     

       647
       655
        
           ~service:"river"