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

Cleaned up constructor for PhotosDB

Browse Source
This commit is contained in:
Rhet Turnbull
2020-10-24 17:20:46 -07:00
parent f9cac05f0d
commit 667c89e32c
3 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -697,7 +697,7 @@ osxphotos.PhotosDB(dbfile=path)
Reads the Photos library database and returns a PhotosDB object. Reads the Photos library database and returns a PhotosDB object.
Pass the path to a Photos library or to a specific database file (e.g. "/Users/smith/Pictures/Photos Library.photoslibrary" or "/Users/smith/Pictures/Photos Library.photoslibrary/database/photos.db"). Normally, it's recommended you pass the path the .photoslibrary folder, not the actual database path. The latter option is provided for debugging -- e.g. for reading a database file if you don't have the entire library. Path to photos library may be passed **either** as first argument **or** as named argument `dbfile`. **Note**: In Photos, users may specify a different library to open by holding down the *option* key while opening Photos.app. See also [get_last_library_path](#get_last_library_path) and [get_system_library_path](#get_system_library_path) Pass the path to a Photos library or to a specific database file (e.g. "/Users/smith/Pictures/Photos Library.photoslibrary" or "/Users/smith/Pictures/Photos Library.photoslibrary/database/photos.db"). Normally, it's recommended you pass the path the .photoslibrary folder, not the actual database path. **Note**: In Photos, users may specify a different library to open by holding down the *option* key while opening Photos.app. See also [get_last_library_path](#get_last_library_path) and [get_system_library_path](#get_system_library_path)
If an invalid path is passed, PhotosDB will raise `FileNotFoundError` exception. If an invalid path is passed, PhotosDB will raise `FileNotFoundError` exception.

2
osxphotos/_version.py
View File

@@ -1,4 +1,4 @@
""" version info """ """ version info """
__version__ = "0.35.7" __version__ = "0.35.8"

31
osxphotos/photosdb/photosdb.py
View File

@@ -68,11 +68,12 @@ class PhotosDB:
) )
from ._photosdb_process_scoreinfo import _process_scoreinfo from ._photosdb_process_scoreinfo import _process_scoreinfo
def __init__(self, *dbfile_, dbfile=None): def __init__(self, dbfile=None):
""" create a new PhotosDB object """ Create a new PhotosDB object.
path to photos library or database may be specified EITHER as first argument or as named argument dbfile=path
specify full path to photos library or photos.db as first argument Args:
specify path to photos library or photos.db using named argument dbfile=path """ dbfile: specify full path to photos library or photos.db; if None, will attempt to locate last library opened by Photos.
"""
# Check OS version # Check OS version
system = platform.system() system = platform.system()
@@ -216,25 +217,7 @@ class PhotosDB:
if _debug(): if _debug():
logging.debug(f"dbfile = {dbfile}") logging.debug(f"dbfile = {dbfile}")
# get the path to photos library database if dbfile is None:
if dbfile_:
# got a library path as argument
if dbfile:
# shouldn't pass via both *args and dbfile=
raise TypeError(
f"photos database path must be specified as argument or "
f"named parameter dbfile but not both: args: {dbfile_}, dbfile: {dbfile}",
dbfile_,
dbfile,
)
elif len(dbfile_) == 1:
dbfile = dbfile_[0]
else:
raise TypeError(
f"__init__ takes only a single argument (photos database path): {dbfile_}",
dbfile_,
)
elif dbfile is None:
dbfile = get_last_library_path() dbfile = get_last_library_path()
if dbfile is None: if dbfile is None:
# get_last_library_path must have failed to find library # get_last_library_path must have failed to find library