Compare commits

..

No commits in common. "53bbfd9501143cd0429fd4d55e2dcea69518a58a" and "ee23385af98be3e9bdf7a60d6230cb9c3df347d9" have entirely different histories.

2 changed files with 5 additions and 43 deletions

1
.gitignore vendored
View file

@ -17,4 +17,3 @@ target
# option (not recommended) you can uncomment the following to ignore the entire idea folder. # option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/ #.idea/
Cargo.lock Cargo.lock
.DS_Store

View file

@ -1,13 +1,12 @@
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use clap::Parser; use clap::Parser;
use serde::Deserialize; use serde::Deserialize;
use std::collections::HashMap;
use std::fs; use std::fs;
use std::path::Path; use std::path::Path;
use std::process::Command; use std::process::Command;
use tempfile::TempDir; use tempfile::TempDir;
#[derive(Debug, Deserialize, Clone)] #[derive(Debug, Deserialize)]
struct Settings { struct Settings {
nas_host: String, nas_host: String,
nas_user: String, nas_user: String,
@ -15,21 +14,12 @@ struct Settings {
cookies_file: String, cookies_file: String,
} }
#[derive(Debug, Deserialize)]
struct AppConfig {
profiles: HashMap<String, Settings>,
}
#[derive(Parser, Debug)] #[derive(Parser, Debug)]
#[command(author, version, about, long_about = None)] #[command(author, version, about, long_about = None)]
struct Args { struct Args {
/// The URL of the video/music to download /// The URL of the video/music to download
#[arg(name = "URL")] #[arg(name = "URL")]
url: String, url: String,
/// Profile name to use from config (falls back to 'default')
#[arg(short, long, default_value = "default")]
profile: String,
} }
fn main() -> Result<()> { fn main() -> Result<()> {
@ -58,37 +48,10 @@ fn main() -> Result<()> {
println!("[INFO] Using config file at: {}", config_path.display()); println!("[INFO] Using config file at: {}", config_path.display());
let cfg = config::Config::builder() let settings = config::Config::builder()
.add_source(config::File::from(config_path.clone())) .add_source(config::File::from(config_path))
.build()?; .build()?
.try_deserialize::<Settings>()?;
let selected_profile = args.profile.clone();
let settings: Settings = match cfg.clone().try_deserialize::<AppConfig>() {
Ok(app_cfg) => {
if let Some(s) = app_cfg.profiles.get(&selected_profile).cloned() {
println!("[INFO] Using profile: {}", selected_profile);
s
} else if let Some(s) = app_cfg.profiles.get("default").cloned() {
if selected_profile != "default" {
println!("[WARN] Profile '{}' not found. Falling back to 'default'.", selected_profile);
let available = app_cfg.profiles.keys().cloned().collect::<Vec<_>>().join(", ");
println!("[INFO] Available profiles: {}", available);
} else {
println!("[INFO] Using profile: default");
}
s
} else {
anyhow::bail!("No profile '{}' found and no 'default' profile defined in config.", selected_profile);
}
}
Err(_) => {
if selected_profile != "default" {
println!("[WARN] Requested profile '{}' but config file uses single-profile format. Using that single profile.", selected_profile);
}
println!("[INFO] Using legacy single-profile configuration.");
cfg.try_deserialize::<Settings>()?
}
};
// Create temp directory // Create temp directory
let temp_dir = TempDir::new().context("Failed to create temporary directory")?; let temp_dir = TempDir::new().context("Failed to create temporary directory")?;