forked/osxphotos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed CLI help to show correct command name in help text

Browse Source
This commit is contained in:
Rhet Turnbull
2020-01-18 08:14:56 -08:00
parent 44ac9d3c0c
commit a8934d24be
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -124,7 +124,7 @@ To get help on a specific command, use `osxphotos help <command_name>`
Example: `osxphotos help export` Example: `osxphotos help export`
``` ```
Usage: osxphotos help [OPTIONS] [PHOTOS_LIBRARY]... DEST Usage: osxphotos export [OPTIONS] [PHOTOS_LIBRARY]... DEST
Export photos from the Photos database. Export path DEST is required. Export photos from the Photos database. Export path DEST is required.
Optionally, query the Photos database using 1 or more search options; if Optionally, query the Photos database using 1 or more search options; if

29
osxphotos/__main__.py
View File

@@ -95,7 +95,9 @@ def cli(ctx, db, json, debug):
required=False, required=False,
metavar="<Photos database path>", metavar="<Photos database path>",
default=None, default=None,
help="Specify Photos database path.", help="Specify Photos database path. "
"Path to Photos library/database can be specified using either --db "
"or directly as PHOTOS_LIBRARY positional argument.",
type=click.Path(exists=True), type=click.Path(exists=True),
) )
@click.option( @click.option(
@@ -133,7 +135,9 @@ def keywords(ctx, cli_obj, db, json_, photos_library):
required=False, required=False,
metavar="<Photos database path>", metavar="<Photos database path>",
default=None, default=None,
help="Specify Photos database path.", help="Specify Photos database path. "
"Path to Photos library/database can be specified using either --db "
"or directly as PHOTOS_LIBRARY positional argument.",
type=click.Path(exists=True), type=click.Path(exists=True),
) )
@click.option( @click.option(
@@ -174,7 +178,9 @@ def albums(ctx, cli_obj, db, json_, photos_library):
required=False, required=False,
metavar="<Photos database path>", metavar="<Photos database path>",
default=None, default=None,
help="Specify Photos database path.", help="Specify Photos database path. "
"Path to Photos library/database can be specified using either --db "
"or directly as PHOTOS_LIBRARY positional argument.",
type=click.Path(exists=True), type=click.Path(exists=True),
) )
@click.option( @click.option(
@@ -212,7 +218,9 @@ def persons(ctx, cli_obj, db, json_, photos_library):
required=False, required=False,
metavar="<Photos database path>", metavar="<Photos database path>",
default=None, default=None,
help="Specify Photos database path.", help="Specify Photos database path. "
"Path to Photos library/database can be specified using either --db "
"or directly as PHOTOS_LIBRARY positional argument.",
type=click.Path(exists=True), type=click.Path(exists=True),
) )
@click.option( @click.option(
@@ -299,7 +307,9 @@ def info(ctx, cli_obj, db, json_, photos_library):
required=False, required=False,
metavar="<Photos database path>", metavar="<Photos database path>",
default=None, default=None,
help="Specify Photos database path.", help="Specify Photos database path. "
"Path to Photos library/database can be specified using either --db "
"or directly as PHOTOS_LIBRARY positional argument.",
type=click.Path(exists=True), type=click.Path(exists=True),
) )
@click.option( @click.option(
@@ -386,7 +396,9 @@ def _list_libraries(json_=False):
required=False, required=False,
metavar="<Photos database path>", metavar="<Photos database path>",
default=None, default=None,
help="Specify Photos database path.", help="Specify Photos database path. "
"Path to Photos library/database can be specified using either --db "
"or directly as PHOTOS_LIBRARY positional argument.",
type=click.Path(exists=True), type=click.Path(exists=True),
) )
@click.option( @click.option(
@@ -670,7 +682,9 @@ def query(
required=False, required=False,
metavar="<Photos database path>", metavar="<Photos database path>",
default=None, default=None,
help="Specify Photos database path.", help="Specify Photos database path. "
"Path to Photos library/database can be specified using either --db "
"or directly as PHOTOS_LIBRARY positional argument.",
type=click.Path(exists=True), type=click.Path(exists=True),
) )
@click.option("--keyword", default=None, multiple=True, help="Search for keyword(s).") @click.option("--keyword", default=None, multiple=True, help="Search for keyword(s).")
@@ -986,6 +1000,7 @@ def help(ctx, topic, **kw):
if topic is None: if topic is None:
click.echo(ctx.parent.get_help()) click.echo(ctx.parent.get_help())
else: else:
ctx.info_name = topic
click.echo(cli.commands[topic].get_help(ctx)) click.echo(cli.commands[topic].get_help(ctx))