diff --git a/osxphotos/_constants.py b/osxphotos/_constants.py index a1d58f26..11059831 100644 --- a/osxphotos/_constants.py +++ b/osxphotos/_constants.py @@ -16,8 +16,9 @@ _TESTED_DB_VERSIONS = ["6000", "4025", "4016", "3301", "2622"] # only version 3 - 4 have RKVersion.selfPortrait _PHOTOS_3_VERSION = "3301" -# versions later than this have a different database structure -_PHOTOS_5_VERSION = "6000" +# versions 5.0 and later have a different database structure +_PHOTOS_4_VERSION = "4025" # latest Mojove version on 10.14.6 +_PHOTOS_5_VERSION = "6000" # seems to be current on 10.15.1 through 10.14.4 # which major version operating systems have been tested _TESTED_OS_VERSIONS = ["12", "13", "14", "15"] diff --git a/osxphotos/_version.py b/osxphotos/_version.py index b52d5384..775b76b7 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.27.4" +__version__ = "0.27.5" diff --git a/osxphotos/photosdb.py b/osxphotos/photosdb.py index ab6ed467..1b9d6085 100644 --- a/osxphotos/photosdb.py +++ b/osxphotos/photosdb.py @@ -19,6 +19,7 @@ from ._constants import ( _MOVIE_TYPE, _PHOTO_TYPE, _PHOTOS_3_VERSION, + _PHOTOS_4_VERSION, _PHOTOS_5_VERSION, _TESTED_DB_VERSIONS, _TESTED_OS_VERSIONS, @@ -258,7 +259,7 @@ class PhotosDB: if _debug(): logging.debug(f"library = {library_path}, masters = {masters_path}") - if int(self._db_version) < int(_PHOTOS_5_VERSION): + if int(self._db_version) <= int(_PHOTOS_4_VERSION): self._process_database4() else: self._process_database5()