rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-23 14:15:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move subcommand branching into Options struct

Browse Source
This commit is contained in:
Lucien Greathouse
2021-06-08 16:53:03 -04:00
parent 1413f8c0b6
commit 158dac5e1c
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin.rs
View File

@@ -3,21 +3,7 @@ use std::{env, panic, process};
use backtrace::Backtrace; use backtrace::Backtrace;
use structopt::StructOpt; use structopt::StructOpt;
use librojo::cli::{self, GlobalOptions, Options, Subcommand}; use librojo::cli::Options;
fn run(global: GlobalOptions, subcommand: Subcommand) -> anyhow::Result<()> {
match subcommand {
Subcommand::Init(subcommand) => subcommand.run()?,
Subcommand::Serve(serve_options) => cli::serve(global, serve_options)?,
Subcommand::Build(subcommand) => subcommand.run()?,
Subcommand::Upload(upload_options) => cli::upload(upload_options)?,
Subcommand::FmtProject(subcommand) => subcommand.run()?,
Subcommand::Doc(subcommand) => subcommand.run()?,
Subcommand::Plugin(subcommand) => subcommand.run()?,
}
Ok(())
}
fn main() { fn main() {
panic::set_hook(Box::new(|panic_info| { panic::set_hook(Box::new(|panic_info| {
@@ -82,7 +68,7 @@ fn main() {
.write_style(options.global.color.into()) .write_style(options.global.color.into())
.init(); .init();
if let Err(err) = run(options.global, options.subcommand) { if let Err(err) = options.run() {
log::error!("{:?}", err); log::error!("{:?}", err);
process::exit(1); process::exit(1);
} }

14
src/cli/mod.rs
View File

@@ -41,6 +41,20 @@ pub struct Options {
pub subcommand: Subcommand, pub subcommand: Subcommand,
} }
impl Options {
pub fn run(self) -> anyhow::Result<()> {
match self.subcommand {
Subcommand::Init(subcommand) => subcommand.run(),
Subcommand::Serve(serve_options) => serve(self.global, serve_options),
Subcommand::Build(subcommand) => subcommand.run(),
Subcommand::Upload(upload_options) => upload(upload_options),
Subcommand::FmtProject(subcommand) => subcommand.run(),
Subcommand::Doc(subcommand) => subcommand.run(),
Subcommand::Plugin(subcommand) => subcommand.run(),
}
}
}
#[derive(Debug, StructOpt)] #[derive(Debug, StructOpt)]
pub struct GlobalOptions { pub struct GlobalOptions {
/// Sets verbosity level. Can be specified multiple times. /// Sets verbosity level. Can be specified multiple times.