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

fixed --json for query

Browse Source
This commit is contained in:
Rhet Turnbull 2019-08-18 16:02:06 -07:00
parent be3d6dee8d
commit 6b24706851
1 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
osxphotos/cmd_line.py
View File

@ -105,8 +105,44 @@ def dump(cli_obj):
""" print list of all photos & associated info from the Photos library """ """ print list of all photos & associated info from the Photos library """
pdb = cli_obj.photosdb pdb = cli_obj.photosdb
photos = pdb.photos() photos = pdb.photos()
print_photo_info(photos, cli_obj.json)
if cli_obj.json:
@cli.command()
@click.option("--keyword", default=None, multiple=True, help="search for keyword(s)")
@click.option("--person", default=None, multiple=True, help="search for person(s)")
@click.option("--album", default=None, multiple=True, help="search for album(s)")
@click.option("--uuid", default=None, multiple=True, help="search for UUID(s)")
@click.option(
"--json",
required=False,
is_flag=True,
default=False,
help="Print output in JSON format",
)
@click.pass_obj
@click.pass_context
def query(ctx, cli_obj, keyword, person, album, uuid, json):
""" query the Photos database using 1 or more search options """
photos = cli_obj.photosdb.photos(
keywords=keyword, persons=person, albums=album, uuid=uuid
)
print_photo_info(photos, cli_obj.json or json)
@cli.command()
@click.argument("topic", default=None, required=False, nargs=1)
@click.pass_context
def help(ctx, topic, **kw):
""" print help; for help on commands: help <command> """
if topic is None:
print(ctx.parent.get_help())
else:
print(cli.commands[topic].get_help(ctx))
def print_photo_info(photos, json=False):
if json:
dump = [] dump = []
for p in photos: for p in photos:
dump.append(p.to_json()) dump.append(p.to_json())
@ -153,32 +189,5 @@ def dump(cli_obj):
csv_writer.writerow(row) csv_writer.writerow(row)
@cli.command()
@click.option("--keyword", default=None, multiple=True, help="search for keyword(s)")
@click.option("--person", default=None, multiple=True, help="search for person(s)")
@click.option("--album", default=None, multiple=True, help="search for album(s)")
@click.option("--uuid", default=None, multiple=True, help="search for UUID(s)")
@click.pass_obj
@click.pass_context
def query(ctx, cli_obj, keyword, person, album, uuid):
""" query the Photos database using 1 or more search options """
photos = cli_obj.photosdb.photos(
keywords=keyword, persons=person, albums=album, uuid=uuid
)
print(photos)
pass
@cli.command()
@click.argument("topic", default=None, required=False, nargs=1)
@click.pass_context
def help(ctx, topic, **kw):
""" print help; for help on commands: help <command> """
if topic is None:
print(ctx.parent.get_help())
else:
print(cli.commands[topic].get_help(ctx))
if __name__ == "__main__": if __name__ == "__main__":
cli() cli()