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

Fix for timewarp failure on Ventura, #841

Browse Source
This commit is contained in:
Rhet Turnbull 2022-11-16 20:47:19 -08:00
parent f610d3cc65
commit 40de05c5fd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osxphotos/photosdb/photosdb_utils.py
View File

@ -21,7 +21,6 @@ __all__ = [
"get_db_version", "get_db_version",
"get_model_version", "get_model_version",
"get_db_model_version", "get_db_model_version",
"UnknownLibraryVersion",
"get_photos_library_version", "get_photos_library_version",
] ]
@ -115,10 +114,6 @@ def get_db_model_version(db_file: str) -> int:
return 8 return 8
class UnknownLibraryVersion(Exception):
pass
def get_photos_library_version(library_path): def get_photos_library_version(library_path):
"""Return int indicating which Photos version a library was created with""" """Return int indicating which Photos version a library was created with"""
library_path = pathlib.Path(library_path) library_path = pathlib.Path(library_path)
@ -140,4 +135,9 @@ def get_photos_library_version(library_path):
return 6 return 6
if _PHOTOS_7_MODEL_VERSION[0] <= model_ver <= _PHOTOS_7_MODEL_VERSION[1]: if _PHOTOS_7_MODEL_VERSION[0] <= model_ver <= _PHOTOS_7_MODEL_VERSION[1]:
return 7 return 7
raise UnknownLibraryVersion(f"db_ver = {db_ver}, model_ver = {model_ver}") if _PHOTOS_8_MODEL_VERSION[0] <= model_ver <= _PHOTOS_8_MODEL_VERSION[1]:
return 8
logging.warning(
f"Unknown db / model version: db_ver={db_ver}, model_ver={model_ver}; assuming Photos 8"
)
return 8