autocommit 2022-03-30 03:00:46 CEST

src/cli.rs

@@ -1,40 +1,108 @@
-use clap::{ArgEnum, Args, Parser, Subcommand};
+mod generate;
+mod log;
 
+use crate::compositor::start_compositor;
+use ::log::Level;
+use clap::{ArgEnum, Args, Parser, Subcommand};
+use clap_complete::Shell;
+
+/// A wayland compositor.
 #[derive(Parser, Debug)]
-pub struct Cli {
+struct Jay {
     #[clap(flatten)]
-    pub global: GlobalArgs,
+    global: GlobalArgs,
     #[clap(subcommand)]
-    pub command: Cmd,
+    command: Cmd,
 }
 
 #[derive(Args, Debug)]
 pub struct GlobalArgs {
-    #[clap(long)]
-    hurr: String,
+    /// The log level.
+    #[clap(arg_enum, long, default_value_t)]
+    pub log_level: CliLogLevel,
 }
 
 #[derive(Subcommand, Debug)]
 pub enum Cmd {
-    /// Run the compositor
-    Run,
-    Test(Test),
+    /// Run the compositor.
+    Run(RunArgs),
+    /// Generate shell completion scripts for jay.
+    GenerateCompletion(GenerateArgs),
+    /// Open the log file.
+    Log(LogArgs),
 }
 
 #[derive(Args, Debug)]
-pub struct Test {
-    /// a
+pub struct RunArgs {
+    /// The backends to try.
     ///
-    /// b
+    /// By default, jay will try to start the available backends in this order: x11,metal.
+    /// The first backend that can be started will be used.
     ///
-    /// c
-    #[clap(long, use_value_delimiter = true, arg_enum)]
-    shell: Vec<Hurr>,
+    /// Using this option, you can change which backends will be tried and change the order in
+    /// which they will be tried. Multiple backends can be supplied as a comma-separated list.
+    #[clap(arg_enum, use_value_delimiter = true, long)]
+    pub backends: Vec<CliBackend>,
 }
 
-#[derive(ArgEnum, Debug, Copy, Clone)]
-pub enum Hurr {
-    Bash,
-    Fish,
-    Zsh,
+#[derive(Args, Debug)]
+pub struct LogArgs {
+    /// Print the path of the log file.
+    #[clap(long)]
+    path: bool,
+    /// Follow the log.
+    #[clap(long, short)]
+    follow: bool,
+    /// Immediately jump to the end in the pager.
+    #[clap(long, short = 'e')]
+    pager_end: bool,
+}
+
+#[derive(ArgEnum, Debug, Copy, Clone, Hash)]
+pub enum CliBackend {
+    X11,
+    Metal,
+}
+
+#[derive(ArgEnum, Debug, Copy, Clone, Hash)]
+pub enum CliLogLevel {
+    Trace,
+    Debug,
+    Info,
+    Warn,
+    Error,
+}
+
+impl Into<Level> for CliLogLevel {
+    fn into(self) -> Level {
+        match self {
+            CliLogLevel::Trace => Level::Trace,
+            CliLogLevel::Debug => Level::Debug,
+            CliLogLevel::Info => Level::Info,
+            CliLogLevel::Warn => Level::Warn,
+            CliLogLevel::Error => Level::Error,
+        }
+    }
+}
+
+impl Default for CliLogLevel {
+    fn default() -> Self {
+        Self::Info
+    }
+}
+
+#[derive(Args, Debug)]
+pub struct GenerateArgs {
+    /// The shell to generate completions for
+    #[clap(arg_enum)]
+    shell: Shell,
+}
+
+pub fn main() {
+    let cli = Jay::parse();
+    match cli.command {
+        Cmd::Run(a) => start_compositor(cli.global, a),
+        Cmd::GenerateCompletion(g) => generate::main(g),
+        Cmd::Log(a) => log::main(cli.global, a),
+    }
 }