Add limit option

sugyan · Apr 18, 2024 · ad15728 · ad15728
1 parent 7a1a070
commit ad15728
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/atrium-cli/README.md b/atrium-cli/README.md
@@ -29,6 +29,7 @@ Commands:
 
 Options:
   -p, --pds-host <PDS_HOST>  [default: https://bsky.social]
+  -l, --limit <LIMIT>        Limit the number of items returned [default: 10]
   -d, --debug                Debug print
   -h, --help                 Print help
   -V, --version              Print version

diff --git a/atrium-cli/src/bin/main.rs b/atrium-cli/src/bin/main.rs
@@ -7,6 +7,14 @@ use std::fmt::Debug;
 struct Args {
     #[arg(short, long, default_value = "https://bsky.social")]
     pds_host: String,
+    /// Limit the number of items returned
+    #[arg(
+        short,
+        long,
+        default_value = "10",
+        value_parser = clap::value_parser!(u8).range(1..=100)
+    )]
+    limit: u8,
     /// Debug print
     #[arg(short, long)]
     debug: bool,
@@ -18,8 +26,10 @@ struct Args {
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let args = Args::parse();
-    Ok(Runner::new(args.pds_host, args.debug)
-        .await?
-        .run(args.command)
-        .await?)
+    Ok(
+        Runner::new(args.pds_host, args.limit.try_into()?, args.debug)
+            .await?
+            .run(args.command)
+            .await?,
+    )
 }
diff --git a/atrium-cli/src/runner.rs b/atrium-cli/src/runner.rs
@@ -4,6 +4,7 @@ use anyhow::{Context, Result};
 use atrium_api::agent::{store::SessionStore, AtpAgent};
 use atrium_api::records::{KnownRecord, Record};
 use atrium_api::types::string::{AtIdentifier, Datetime, Handle};
+use atrium_api::types::LimitedNonZeroU8;
 use atrium_xrpc_client::reqwest::ReqwestClient;
 use serde::Serialize;
 use std::ffi::OsStr;
@@ -13,13 +14,14 @@ use tokio::io::AsyncReadExt;
 
 pub struct Runner {
     agent: AtpAgent<SimpleJsonFileSessionStore, ReqwestClient>,
+    limit: LimitedNonZeroU8<100>,
     debug: bool,
     session_path: PathBuf,
     handle: Option<Handle>,
 }
 
 impl Runner {
-    pub async fn new(pds_host: String, debug: bool) -> Result<Self> {
+    pub async fn new(pds_host: String, limit: LimitedNonZeroU8<100>, debug: bool) -> Result<Self> {
         let config_dir = dirs::config_dir()
             .with_context(|| format!("No config dir: {:?}", dirs::config_dir()))?;
         let dir = config_dir.join("atrium-cli");
@@ -34,13 +36,14 @@ impl Runner {
         }
         Ok(Self {
             agent,
+            limit,
             debug,
             session_path,
             handle,
         })
     }
     pub async fn run(&self, command: Command) -> Result<()> {
-        let limit = 10.try_into().expect("within limit");
+        let limit = self.limit;
         match command {
             Command::Login(args) => {
                 self.agent.login(args.identifier, args.password).await?;