passthrough args for launch and choose

Author: pvsr

qbpm/main.py

@@ -100,8 +100,9 @@ def desktop(
     exit_with(operations.desktop(profile))
 
 
-@main.command()
+@main.command(context_settings=dict(ignore_unknown_options=True))
 @click.argument("profile_name")
+@click.argument("qb_args", nargs=-1, type=click.UNPROCESSED)
 @click.option(
     "-f", "--foreground", is_flag=True, help="Run qutebrowser in the foreground."
 )
@@ -110,13 +111,13 @@ def desktop(
 )
 @click.pass_obj
 def launch(profile_dir: Path, profile_name: str, **kwargs: Any) -> None:
-    """Launch qutebrowser with a specific profile."""
+    """Launch qutebrowser with a specific profile. All QB_ARGS are passed on to qutebrowser."""
     profile = Profile(profile_name, profile_dir)
-    # TODO qb args
-    exit_with(operations.launch(profile, qb_args=[], **kwargs))
+    exit_with(operations.launch(profile, **kwargs))
 
 
-@main.command()
+@main.command(context_settings=dict(ignore_unknown_options=True))
+@click.argument("qb_args", nargs=-1, type=click.UNPROCESSED)
 @click.option(
     "-m",
     "--menu",
@@ -128,9 +129,9 @@ def launch(profile_dir: Path, profile_name: str, **kwargs: Any) -> None:
 def choose(profile_dir: Path, **kwargs: Any) -> None:
     """Choose a profile to launch.
     Support is built in for many X and Wayland launchers, as well as applescript dialogs.
+    All QB_ARGS are passed on to qutebrowser."
     """
-    # TODO qb args
-    exit_with(operations.choose(profile_dir=profile_dir, qb_args=[], **kwargs))
+    exit_with(operations.choose(profile_dir=profile_dir, **kwargs))
 
 
 @main.command()
@@ -158,7 +159,7 @@ def then_launch(
     profile: Profile,
     launch: bool,
     foreground: bool,
-    qb_args: list[str] = [],
+    qb_args: tuple[str, ...],
     **kwargs: Any,
 ) -> None:
     exit_with(

qbpm/operations.py

@@ -29,12 +29,12 @@ def from_session(
 
 
 def launch(
-    profile: Profile, create: bool, foreground: bool, qb_args: list[str]
+    profile: Profile, create: bool, foreground: bool, qb_args: tuple[str, ...]
 ) -> bool:
     if not profiles.ensure_profile_exists(profile, create):
         return False
 
-    args = profile.cmdline() + qb_args
+    args = profile.cmdline() + list(qb_args)
     if not shutil.which(args[0]):
         error("qutebrowser is not installed")
         return False
@@ -65,7 +65,9 @@ def desktop(profile: Profile) -> bool:
     return exists
 
 
-def choose(profile_dir: Path, menu: str, foreground: bool, qb_args: list[str]) -> bool:
+def choose(
+    profile_dir: Path, menu: str, foreground: bool, qb_args: tuple[str, ...]
+) -> bool:
     menu = menu or next(installed_menus())
     if not menu:
         error(f"No menu program found, please install one of: {AUTO_MENUS}")
@@ -100,7 +102,9 @@ def choose(profile_dir: Path, menu: str, foreground: bool, qb_args: list[str]) -
     return True
 
 
-def menu_command(menu: str, profiles: list[str], qb_args: list[str]) -> Optional[str]:
+def menu_command(
+    menu: str, profiles: list[str], qb_args: tuple[str, ...]
+) -> Optional[str]:
     arg_string = " ".join(qb_args)
     if menu == "applescript":
         profile_list = '", "'.join(profiles)