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

Updated use of _PHOTOS_4_VERSION, closes #106

Browse Source
This commit is contained in:
Rhet Turnbull
2020-04-18 23:33:02 -07:00
parent 15a3736b74
commit 87eb84fddd
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osxphotos/__main__.py
View File

@@ -18,7 +18,7 @@ from pathvalidate import (
import osxphotos import osxphotos
from ._constants import _EXIF_TOOL_URL, _PHOTOS_5_VERSION, _UNKNOWN_PLACE from ._constants import _EXIF_TOOL_URL, _PHOTOS_4_VERSION, _UNKNOWN_PLACE
from ._version import __version__ from ._version import __version__
from .exiftool import get_exiftool_path from .exiftool import get_exiftool_path
from .template import ( from .template import (
@@ -428,7 +428,7 @@ def albums(ctx, cli_obj, db, json_, photos_library):
photosdb = osxphotos.PhotosDB(dbfile=db) photosdb = osxphotos.PhotosDB(dbfile=db)
albums = {"albums": photosdb.albums_as_dict} albums = {"albums": photosdb.albums_as_dict}
if photosdb.db_version >= _PHOTOS_5_VERSION: if photosdb.db_version > _PHOTOS_4_VERSION:
albums["shared albums"] = photosdb.albums_shared_as_dict albums["shared albums"] = photosdb.albums_shared_as_dict
if json_ or cli_obj.json: if json_ or cli_obj.json:
@@ -493,7 +493,7 @@ def info(ctx, cli_obj, db, json_, photos_library):
not_shared_movies = [p for p in movies if not p.shared] not_shared_movies = [p for p in movies if not p.shared]
info["movie_count"] = len(not_shared_movies) info["movie_count"] = len(not_shared_movies)
if pdb.db_version >= _PHOTOS_5_VERSION: if pdb.db_version > _PHOTOS_4_VERSION:
shared_photos = [p for p in photos if p.shared] shared_photos = [p for p in photos if p.shared]
info["shared_photo_count"] = len(shared_photos) info["shared_photo_count"] = len(shared_photos)
@@ -508,7 +508,7 @@ def info(ctx, cli_obj, db, json_, photos_library):
info["albums_count"] = len(albums) info["albums_count"] = len(albums)
info["albums"] = albums info["albums"] = albums
if pdb.db_version >= _PHOTOS_5_VERSION: if pdb.db_version > _PHOTOS_4_VERSION:
albums_shared = pdb.albums_shared_as_dict albums_shared = pdb.albums_shared_as_dict
info["shared_albums_count"] = len(albums_shared) info["shared_albums_count"] = len(albums_shared)
info["shared_albums"] = albums_shared info["shared_albums"] = albums_shared

6
osxphotos/photosdb.py
View File

@@ -240,7 +240,7 @@ class PhotosDB:
self._db_version = self._get_db_version() self._db_version = self._get_db_version()
# If Photos >= 5, actual data isn't in photos.db but in Photos.sqlite # If Photos >= 5, actual data isn't in photos.db but in Photos.sqlite
if int(self._db_version) >= int(_PHOTOS_5_VERSION): if int(self._db_version) > int(_PHOTOS_4_VERSION):
dbpath = pathlib.Path(self._dbfile).parent dbpath = pathlib.Path(self._dbfile).parent
dbfile = dbpath / "Photos.sqlite" dbfile = dbpath / "Photos.sqlite"
if not _check_file_exists(dbfile): if not _check_file_exists(dbfile):
@@ -259,7 +259,7 @@ class PhotosDB:
library_path = os.path.dirname(os.path.abspath(dbfile)) library_path = os.path.dirname(os.path.abspath(dbfile))
(library_path, _) = os.path.split(library_path) # drop /database from path (library_path, _) = os.path.split(library_path) # drop /database from path
self._library_path = library_path self._library_path = library_path
if int(self._db_version) < int(_PHOTOS_5_VERSION): if int(self._db_version) <= int(_PHOTOS_4_VERSION):
masters_path = os.path.join(library_path, "Masters") masters_path = os.path.join(library_path, "Masters")
self._masters_path = masters_path self._masters_path = masters_path
else: else:
@@ -1878,7 +1878,7 @@ class PhotosDB:
# folder with no parent (e.g. shared iCloud folders) # folder with no parent (e.g. shared iCloud folders)
return folders return folders
if self._db_version >= _PHOTOS_5_VERSION and parent == self._folder_root_pk: if self._db_version > _PHOTOS_4_VERSION and parent == self._folder_root_pk:
# at the top of the folder hierarchy, we're done # at the top of the folder hierarchy, we're done
return folders return folders