Skip to content

cli: simplify server URL handling #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ackerleytng wants to merge 1 commit into
base: main
Choose a base branch
from
Open

cli: simplify server URL handling #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/bin/sashiko-cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ use chrono::{DateTime, Local, TimeZone, Utc};
use clap::{Parser, Subcommand, ValueEnum};
use reqwest::Client;
use sashiko::api::{PatchsetsResponse, SubmitRequest, SubmitResponse};
use sashiko::settings::Settings;
use serde_json::Value;
use std::io::{IsTerminal, Read, Write};
use std::path::PathBuf;
Expand All @@ -32,7 +31,12 @@ struct Cli {
command: Commands,

/// Override server URL (default: from settings or http://127.0.0.1:8080)
#[arg(long, global = true, env = "SASHIKO_SERVER")]
#[arg(
long,
global = true,
env = "SASHIKO_SERVER",
default_value = "http://127.0.0.1:8080"
)]
server: Option<String>,

/// Output format (text, json)
Expand Down Expand Up @@ -112,14 +116,7 @@ enum SubmitType {
#[tokio::main]
async fn main() -> Result<()> {
let cli = Cli::parse();

// Load settings, falling back to defaults if file missing/invalid
let settings = Settings::new()
.unwrap_or_else(|_| Settings::new().expect("Failed to load default settings"));

let base_url = cli
.server
.unwrap_or_else(|| format!("http://{}:{}", settings.server.host, settings.server.port));
let base_url = cli.server.unwrap();

let client = Client::new();

Expand Down