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

Fixed cmd_line so it doesn't create PhotosDB object unless needed

Browse Source
This commit is contained in:
Rhet Turnbull
2019-12-07 20:44:15 -08:00
parent 906b6c0911
commit 591336673a
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osxphotos/_version.py
View File

@@ -1,4 +1,4 @@
""" version info """ """ version info """
__version__ = "0.14.16" __version__ = "0.14.17"

18
osxphotos/cmd_line.py
View File

@@ -16,7 +16,7 @@ class CLI_Obj:
def __init__(self, db=None, json=False, debug=False): def __init__(self, db=None, json=False, debug=False):
if debug: if debug:
osxphotos._debug(True) osxphotos._debug(True)
self.photosdb = osxphotos.PhotosDB(dbfile=db) self.db = db
self.json = json self.json = json
@@ -49,7 +49,8 @@ def cli(ctx, db, json, debug):
@click.pass_obj @click.pass_obj
def keywords(cli_obj): def keywords(cli_obj):
""" print out keywords found in the Photos library""" """ print out keywords found in the Photos library"""
keywords = {"keywords": cli_obj.photosdb.keywords_as_dict()} photosdb = osxphotos.PhotosDB(dbfile=cli_obj.db)
keywords = {"keywords": photosdb.keywords_as_dict()}
if cli_obj.json: if cli_obj.json:
print(json.dumps(keywords)) print(json.dumps(keywords))
else: else:
@@ -60,7 +61,8 @@ def keywords(cli_obj):
@click.pass_obj @click.pass_obj
def albums(cli_obj): def albums(cli_obj):
""" print out albums found in the Photos library """ """ print out albums found in the Photos library """
albums = {"albums": cli_obj.photosdb.albums_as_dict()} photosdb = osxphotos.PhotosDB(dbfile=cli_obj.db)
albums = {"albums": photosdb.albums_as_dict()}
if cli_obj.json: if cli_obj.json:
print(json.dumps(albums)) print(json.dumps(albums))
else: else:
@@ -71,7 +73,8 @@ def albums(cli_obj):
@click.pass_obj @click.pass_obj
def persons(cli_obj): def persons(cli_obj):
""" print out persons (faces) found in the Photos library """ """ print out persons (faces) found in the Photos library """
persons = {"persons": cli_obj.photosdb.persons_as_dict()} photosdb = osxphotos.PhotosDB(dbfile=cli_obj.db)
persons = {"persons": photosdb.persons_as_dict()}
if cli_obj.json: if cli_obj.json:
print(json.dumps(persons)) print(json.dumps(persons))
else: else:
@@ -82,7 +85,7 @@ def persons(cli_obj):
@click.pass_obj @click.pass_obj
def info(cli_obj): def info(cli_obj):
""" print out descriptive info of the Photos library database """ """ print out descriptive info of the Photos library database """
pdb = cli_obj.photosdb pdb = osxphotos.PhotosDB(dbfile=cli_obj.db)
info = {} info = {}
info["database_path"] = pdb.get_db_path() info["database_path"] = pdb.get_db_path()
info["database_version"] = pdb.get_db_version() info["database_version"] = pdb.get_db_version()
@@ -121,7 +124,7 @@ def info(cli_obj):
@click.pass_obj @click.pass_obj
def dump(cli_obj): 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 = osxphotos.PhotosDB(dbfile=cli_obj.db)
photos = pdb.photos() photos = pdb.photos()
print_photo_info(photos, cli_obj.json) print_photo_info(photos, cli_obj.json)
@@ -244,7 +247,8 @@ def query(
print(cli.commands["query"].get_help(ctx)) print(cli.commands["query"].get_help(ctx))
return return
else: else:
photos = cli_obj.photosdb.photos( photosdb = osxphotos.PhotosDB(dbfile=cli_obj.db)
photos = photosdb.photos(
keywords=keyword, persons=person, albums=album, uuid=uuid keywords=keyword, persons=person, albums=album, uuid=uuid
) )