Adds create option to attach

src/main.rs

@@ -57,52 +57,63 @@ pub fn main() {
                 process::exit(1);
             }
         };
-        if let Some(Command::Sessions(Sessions::Attach {
-            mut session_name,
-            force,
-        })) = opts.command.clone()
-        {
-            if let Some(session) = session_name.as_ref() {
-                assert_session(session);
-            } else {
-                session_name = Some(get_active_session());
-            }
-
-            start_client(
-                Box::new(os_input),
-                opts,
-                config,
-                ClientInfo::Attach(session_name.unwrap(), force, config_options),
-                None,
-            );
-        } else {
-            let session_name = opts
-                .session
-                .clone()
-                .unwrap_or_else(|| names::Generator::default().next().unwrap());
-            assert_session_ne(&session_name);
+
+        let client_info = match opts.command.clone() {
+            Some(Command::Sessions(Sessions::Attach {mut session_name, force, create})) => {
+                let is_new_session = match (session_name.as_ref(), create) {
+                    (Some(_), true) => true,
+                    (Some(session), false) => {
+                        assert_session(session);
+                        false
+                    },
+                    (None, _) => {
+                        session_name = Some(get_active_session());
+                        false 
+                    }
+                };
 
-            // Determine and initialize the data directory
-            let data_dir = opts.data_dir.clone().unwrap_or_else(get_default_data_dir);
-            #[cfg(not(disable_automatic_asset_installation))]
-            populate_data_dir(&data_dir);
+                if is_new_session {
+                    ClientInfo::New(session_name.unwrap())
+                } else {
+                    ClientInfo::Attach(session_name.unwrap(), force, config_options.clone())
+                }
+            }
+            _ => {
+                let session_name = opts
+                    .session
+                    .clone()
+                    .unwrap_or_else(|| names::Generator::default().next().unwrap());
+                assert_session_ne(&session_name);
+
+                ClientInfo::New(session_name)
+            }
+        };
+
+        let layout = match client_info {
+            ClientInfo::New(_) => {
+                // Determine and initialize the data directory
+                let data_dir = opts.data_dir.clone().unwrap_or_else(get_default_data_dir);
+                #[cfg(not(disable_automatic_asset_installation))]
+                populate_data_dir(&data_dir);
 
-            let layout_dir = config_options.layout_dir.or_else(|| {
-                get_layout_dir(opts.config_dir.clone().or_else(find_default_config_dir))
-            });
-            let layout = Layout::from_path_or_default(
-                opts.layout.as_ref(),
-                opts.layout_path.as_ref(),
-                layout_dir,
-            );
+                let layout_dir = config_options.layout_dir.or_else(|| {
+                    get_layout_dir(opts.config_dir.clone().or_else(find_default_config_dir))
+                });
+                Layout::from_path_or_default(
+                    opts.layout.as_ref(),
+                    opts.layout_path.as_ref(),
+                    layout_dir,
+                )
+            }
+            ClientInfo::Attach(..) => None
+        };
 
-            start_client(
-                Box::new(os_input),
-                opts,
-                config,
-                ClientInfo::New(session_name),
-                layout,
-            );
-        }
+        start_client(
+            Box::new(os_input),
+            opts,
+            config,
+            client_info,
+            layout,
+        );
     }
 }

zellij-utils/src/cli.rs

@@ -78,5 +78,10 @@ pub enum Sessions {
         /// zellij client (if any) and attach to this.
         #[structopt(long, short)]
         force: bool,
+
+        /// Creates the session if it doesn't already exists.
+        /// Will be ignored if session-name is not set.
+        #[structopt(long, short)]
+        create: bool,
     },
 }