!squash more

Author: tony

src/tmuxp/cli/__init__.py

@@ -88,11 +88,18 @@ def cli(args=None):
     if args.subparser_name is None:
         parser.print_help()
         return
-    elif args.subparser_name == "sync":
-        sync(
-            repo_terms=args.repo_terms,
+    elif args.subparser_name == "load":
+        command_load(
             config=args.config,
-            exit_on_error=args.exit_on_error,
+            socket_name=args.socket_name,
+            socket_path=args.socket_path,
+            tmux_config_file=args.tmux_config_file,
+            new_session_name=args.new_session_name,
+            answer_yes=args.answer_yes,
+            detached=args.detached,
+            append=args.append,
+            colors=args.colors,
+            log_file=args.log_file,
             parser=parser,
         )
 

src/tmuxp/cli/load.py

@@ -11,7 +11,7 @@
 import pathlib
 import shutil
 import sys
-from typing import List
+import typing as t
 
 import click
 
@@ -444,7 +444,7 @@ def load_workspace(
 
 def config_file_completion(ctx, params, incomplete):
     config_dir = pathlib.Path(get_config_dir())
-    choices: List[pathlib.Path] = []
+    choices: t.List[pathlib.Path] = []
 
     # CWD Paths
     choices += sorted(
@@ -467,7 +467,6 @@ def config_file_completion(ctx, params, incomplete):
 def create_load_subparser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
     parser.add_argument(
         "config",
-        nargs=-1,
         help="Filepath to session or filename of session if in tmuxp config directory",
     )
     parser.add_argument(
@@ -512,6 +511,7 @@ def create_load_subparser(parser: argparse.ArgumentParser) -> argparse.ArgumentP
     )
     parser.add_argument(
         "-a",
+        "--append",
         dest="append",
         action="store_true",
         help="load configuration, appending windows to the current session",
@@ -552,7 +552,6 @@ def create_load_subparser(parser: argparse.ArgumentParser) -> argparse.ArgumentP
 
 
 def command_load(
-    ctx,
     config,
     socket_name,
     socket_path,
@@ -563,6 +562,7 @@ def command_load(
     append,
     colors,
     log_file,
+    parser: t.Optional[argparse.ArgumentParser] = None,
 ):
     """Load a tmux workspace from each CONFIG.
 
@@ -606,14 +606,14 @@ def command_load(
         "append": append,
     }
 
-    if not config:
-        tmuxp_echo("Enter at least one CONFIG")
-        tmuxp_echo(ctx.get_help(), color=ctx.color)
-        ctx.exit()
+    if config is None:
+        tmuxp_echo("Enter at least one config")
+        if parser is not None:
+            parser.print_help()
+        sys.exit()
 
     if isinstance(config, str):
         load_workspace(config, **tmux_options)
-
     elif isinstance(config, tuple):
         config = list(config)
         # Load each configuration but the last to the background
@@ -624,3 +624,5 @@ def command_load(
 
         # todo: obey the -d in the cli args only if user specifies
         load_workspace(config[-1], **tmux_options)
+    else:
+        raise NotImplementedError(f"config {type(config)} with {config} not valid")