zyl/webdog
1
0
Fork 0
mirror of https://github.com/zyllian/webdog.git synced 2025-05-10 02:26:42 -07:00
Code Issues Projects Releases Packages Wiki Activity

rename cli --site-path argument to --site

Browse source
This commit is contained in:
zyl 2024-11-08 23:24:04 -08:00
parent 08c786faf2
commit e339bb20ea
Signed by: zyl
SSH key fingerprint: SHA256:uxxbSXbdroP/OnKBGnEDk5q7EKB2razvstC/KmzdXXs
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/main.rs
View file

@ -24,7 +24,7 @@ struct Cli {
/// The path to the site. /// The path to the site.
#[arg(global = true, long, default_value = ".")] #[arg(global = true, long, default_value = ".")]
site_path: PathBuf, site: PathBuf,
} }
#[derive(Debug, Subcommand)] #[derive(Debug, Subcommand)]
@ -116,7 +116,7 @@ fn main() -> eyre::Result<()> {
let cli = Cli::parse(); let cli = Cli::parse();
let site = || -> eyre::Result<Site> { Site::new(&Path::new(&cli.site_path).canonicalize()?) }; let site = || -> eyre::Result<Site> { Site::new(&Path::new(&cli.site).canonicalize()?) };
match cli.command { match cli.command {
Commands::Create { Commands::Create {
@ -124,22 +124,22 @@ fn main() -> eyre::Result<()> {
cdn_url, cdn_url,
title, title,
} => { } => {
if cli.site_path.exists() { if cli.site.exists() {
eprintln!("content exists in the given path! canceling!"); eprintln!("content exists in the given path! canceling!");
return Ok(()); return Ok(());
} }
std::fs::create_dir_all(&cli.site_path)?; std::fs::create_dir_all(&cli.site)?;
let config = SiteConfig::new(base_url.clone(), cdn_url.unwrap_or(base_url), title); let config = SiteConfig::new(base_url.clone(), cdn_url.unwrap_or(base_url), title);
std::fs::write( std::fs::write(
cli.site_path.join(SiteConfig::FILENAME), cli.site.join(SiteConfig::FILENAME),
serde_yml::to_string(&config)?, serde_yml::to_string(&config)?,
)?; )?;
DEFAULT_PROJECT.extract(&cli.site_path)?; DEFAULT_PROJECT.extract(&cli.site)?;
std::fs::create_dir(cli.site_path.join(webdog::ROOT_PATH))?; std::fs::create_dir(cli.site.join(webdog::ROOT_PATH))?;
println!( println!(
"Base site created at {:?}! Ready for editing, woof!", "Base site created at {:?}! Ready for editing, woof!",
cli.site_path cli.site
); );
Ok(()) Ok(())
@ -164,14 +164,14 @@ fn main() -> eyre::Result<()> {
} }
Commands::Resource { command } => match command { Commands::Resource { command } => match command {
ResourceCommands::Create { id, name, plural } => { ResourceCommands::Create { id, name, plural } => {
let config_path = cli.site_path.join(SiteConfig::FILENAME); let config_path = cli.site.join(SiteConfig::FILENAME);
let mut config = SiteConfig::read(&cli.site_path)?; let mut config = SiteConfig::read(&cli.site)?;
if config.resources.contains_key(&id) { if config.resources.contains_key(&id) {
eprintln!("resource type {id} already exists, canceling"); eprintln!("resource type {id} already exists, canceling");
return Ok(()); return Ok(());
} }
let resource_template_path = cli.site_path.join(webdog::TEMPLATES_PATH).join(&id); let resource_template_path = cli.site.join(webdog::TEMPLATES_PATH).join(&id);
if resource_template_path.exists() { if resource_template_path.exists() {
eprintln!( eprintln!(
"path for resource already exists at {resource_template_path:?}, canceling" "path for resource already exists at {resource_template_path:?}, canceling"
@ -216,7 +216,7 @@ fn main() -> eyre::Result<()> {
std::fs::write(config_path, serde_yml::to_string(&config)?)?; std::fs::write(config_path, serde_yml::to_string(&config)?)?;
let resource_path = cli.site_path.join(webdog::RESOURCES_PATH).join(&id); let resource_path = cli.site.join(webdog::RESOURCES_PATH).join(&id);
std::fs::create_dir_all(&resource_path)?; std::fs::create_dir_all(&resource_path)?;
create_resource( create_resource(
@ -244,7 +244,7 @@ fn main() -> eyre::Result<()> {
template, template,
} => { } => {
let page_path = cli let page_path = cli
.site_path .site
.join(webdog::PAGES_PATH) .join(webdog::PAGES_PATH)
.join(&id) .join(&id)
.with_extension("md"); .with_extension("md");
@ -276,10 +276,10 @@ fn main() -> eyre::Result<()> {
description, description,
skip_draft, skip_draft,
} => { } => {
let config = SiteConfig::read(&cli.site_path)?; let config = SiteConfig::read(&cli.site)?;
if let Some(resource) = config.resources.get(&resource_type) { if let Some(resource) = config.resources.get(&resource_type) {
let resource_path = cli let resource_path = cli
.site_path .site
.join(webdog::RESOURCES_PATH) .join(webdog::RESOURCES_PATH)
.join(&resource.source_path) .join(&resource.source_path)
.join(&id) .join(&id)