Changed get_system_library_path to return None if could not get system library

This commit is contained in:
Rhet Turnbull
2020-01-17 15:31:07 -08:00
parent 99d3069530
commit 646ea4f24c
3 changed files with 6 additions and 6 deletions

View File

@@ -692,7 +692,7 @@ The following functions are located in osxphotos.utils
#### ```get_system_library_path()``` #### ```get_system_library_path()```
**MacOS 10.15 Only** Returns path to System Photo Library as string. On MacOS version < 10.15, raises Exception. **MacOS 10.15 Only** Returns path to System Photo Library as string. On MacOS version < 10.15, returns None.
#### ```get_last_library_path()``` #### ```get_last_library_path()```

View File

@@ -169,12 +169,13 @@ def dd_to_dms_str(lat, lon):
def get_system_library_path(): def get_system_library_path():
""" return the path to the system Photos library as string """ """ return the path to the system Photos library as string """
""" only works on MacOS 10.15+ """ """ only works on MacOS 10.15+ """
""" on earlier versions, will raise exception """ """ on earlier versions, returns None """
_, major, _ = _get_os_version() _, major, _ = _get_os_version()
if int(major) < 15: if int(major) < 15:
raise Exception( logging.debug(
"get_system_library_path not implemented for MacOS < 10.15", major f"get_system_library_path not implemented for MacOS < 10.15: you have {major}"
) )
return None
plist_file = Path( plist_file = Path(
str(Path.home()) str(Path.home())

View File

@@ -31,8 +31,7 @@ def test_get_system_library_path():
_, major, _ = osxphotos.utils._get_os_version() _, major, _ = osxphotos.utils._get_os_version()
if int(major) < 15: if int(major) < 15:
with pytest.raises(Exception): assert osxphotos.utils.get_system_library_path() is None
assert osxphotos.utils.get_system_library_path()
else: else:
assert osxphotos.utils.get_system_library_path() is not None assert osxphotos.utils.get_system_library_path() is not None