Added media type specials, closes #60

CHANGELOG.md

@@ -4,6 +4,48 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.22.12](https://github.com/RhetTbull/osxphotos/compare/0.22.10...v0.22.12)
+
+> 7 March 2020
+
+- Added exiftool [`8dea419`](https://github.com/RhetTbull/osxphotos/commit/8dea41961bad285be7058a68e5f7199e5cfb740e)
+- Added --exiftool to CLI export [`ef79961`](https://github.com/RhetTbull/osxphotos/commit/ef799610aea67b703a7d056b7eee227534ba78a5)
+- Updated test library [`9a0fc0d`](https://github.com/RhetTbull/osxphotos/commit/9a0fc0db3e79359610fd0f124a97b03fcf97d8a7)
+
+#### [0.22.10](https://github.com/RhetTbull/osxphotos/compare/v0.22.9...0.22.10)
+
+> 8 February 2020
+
+- Fixed bug in --download-missing to fix issue #64 [`c654e3d`](https://github.com/RhetTbull/osxphotos/commit/c654e3dc61283382b37b6892dab1516ec517143a)
+- removed commented out code [`69addc3`](https://github.com/RhetTbull/osxphotos/commit/69addc34649f992c6a4a0e0e334754a72530f0ba)
+- Updated CHANGELOG.md [`1e013b6`](https://github.com/RhetTbull/osxphotos/commit/1e013b6802e49e26ec5a94eb702e841b2eb68395)
+
+#### [v0.22.9](https://github.com/RhetTbull/osxphotos/compare/v0.22.7...v0.22.9)
+
+> 1 February 2020
+
+- Updated PhotosDB to only copy database if locked, speed improvement for cases where DB not locked; closes #34 [`#34`](https://github.com/RhetTbull/osxphotos/issues/34)
+- Changed temp file handling to use tempfile.TemporaryDirectory, closes #59 [`#59`](https://github.com/RhetTbull/osxphotos/issues/59)
+- Slight refactor to PhotosDB.photos() [`91d5729`](https://github.com/RhetTbull/osxphotos/commit/91d5729beaa0f0c2583e6320b18d958429e66075)
+- Test library updates [`6e563e2`](https://github.com/RhetTbull/osxphotos/commit/6e563e214c569ba7838f7464de9258c3bba5db23)
+- Removed _tmp_file code that's no longer needed [`27994c9`](https://github.com/RhetTbull/osxphotos/commit/27994c9fd372303833a5794f1de9815f425c762e)
+- Updated photos_repl.py [`fdf636a`](https://github.com/RhetTbull/osxphotos/commit/fdf636ac8864ebb2cc324b1f9d3c6c82ee3910f9)
+- Updated CHANGELOG.md [`f910124`](https://github.com/RhetTbull/osxphotos/commit/f910124fe1fbf75d44c09c79607374bf000733a1)
+
+#### [v0.22.7](https://github.com/RhetTbull/osxphotos/compare/v0.22.4...v0.22.7)
+
+> 27 January 2020
+
+- Corrected Panorama Flag [`#58`](https://github.com/RhetTbull/osxphotos/pull/58)
+- Jan 20 Updates [`#1`](https://github.com/RhetTbull/osxphotos/pull/1)
+- Added XMP sidecar option to export, closes #51 [`#51`](https://github.com/RhetTbull/osxphotos/issues/51)
+- Test library updates, closes #52 [`#52`](https://github.com/RhetTbull/osxphotos/issues/52)
+- Added XMP sidecar to export [`4dfb131`](https://github.com/RhetTbull/osxphotos/commit/4dfb131a21b1b1efefe3b918ecb06fc6fcb03f2c)
+- Added date_modified to PhotoInfo [`67b0ae0`](https://github.com/RhetTbull/osxphotos/commit/67b0ae0bf679815372d415c3064e21d46a5b8718)
+- Added date_modified to PhotoInfo [`4d36b3b`](https://github.com/RhetTbull/osxphotos/commit/4d36b3b31f3e0e74d9d111b6b691771e19f94086)
+- Updated CLI options with more descriptive metavar names [`e79cb92`](https://github.com/RhetTbull/osxphotos/commit/e79cb92693758c984dc789d5fa5d2e87e381e921)
+- CLI now looks for photos library to use if non specified by user [`50b7e69`](https://github.com/RhetTbull/osxphotos/commit/50b7e6920a694aa45f478d1131868525c9147919)
+
 #### [v0.22.4](https://github.com/RhetTbull/osxphotos/compare/v0.22.0...v0.22.4)
 
 > 20 January 2020

README.md

@@ -175,6 +175,11 @@ Options:
                                   require internet connection. This obviously
                                   only works if the Photos library is synched
                                   to iCloud.
+  --exiftool                      Use exiftool to write metadata directly to
+                                  exported photos. To use this option,
+                                  exiftool must be installed and in the path.
+                                  exiftool may be installed from
+                                  https://exiftool.org/
   -h, --help                      Show this message and exit.
 ```
 
@@ -268,6 +273,7 @@ if __name__ == "__main__":
 #### Read a Photos library database
 
 ```python
+osxphotos.PhotosDB() # not recommended, see Note below
 osxphotos.PhotosDB(path)
 osxphotos.PhotosDB(dbfile=path)
 ```
@@ -276,9 +282,13 @@ 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)
 
-If an invalid path is passed, PhotosDB will raise `ValueError` exception.
+If an invalid path is passed, PhotosDB will raise `FileNotFoundError` exception.
 
-Open the default (last opened) Photos library. (E.g. this is the library that would open if the user opened Photos.app)
+**Note**: If neither path or dbfile is passed, PhotosDB will use get_last_library_path to open the last opened Photos library.  This usually works but is not 100% reliable.  It can also lead to loading a different library than expected if the user has held down *option* key when opening Photos to switch libraries.  It is therefore recommended you explicitely pass the path to `PhotosDB()`.  
+
+#### Open the default (last opened) Photos library
+
+The default library is the library that would open if the user opened Photos.app.
 
 ```python
 import osxphotos
@@ -647,21 +657,42 @@ Returns the path to the live video component of a [live photo](#live_photo). If
 
 **Note**: will also return None if the live video component is missing on disk. It's possible that the original photo may be on disk ([ismissing](#ismissing)==False) but the video component is missing, likely because it has not been downloaded from iCloud.
 
+#### `portrait`
+Returns True if photo was taken in iPhone portrait mode, otherwise False.
+
+#### `hdr`
+Returns True if photo was taken in High Dynamic Range (HDR) mode, otherwise False.
+
+#### `selfie`
+Returns True if photo is a selfie (taken with front-facing camera), otherwise False.  
+
+**Note**: Only implemented for Photos version 3.0+.  On Photos version < 3.0, returns None.
+
+#### `time_lapse`
+Returns True if photo is a time lapse video, otherwise False.
+
+#### `panorama`
+Returns True if photo is a panorama, otherwise False.
+
+**Note**: The result of `PhotoInfo.panorama` will differ from the "Panoramas" Media Types smart album in that it will also identify panorama photos from older phones that Photos does not recognize as panoramas. 
+
 #### `json()`
 Returns a JSON representation of all photo info 
 
-#### `export(dest, *filename, edited=False, overwrite=False, increment=True, sidecar_json=False, sidecar_xmp=False, use_photos_export=False, timeout=120,)`
+#### `export(dest, *filename, edited=False, live_photo=False, overwrite=False, increment=True, sidecar_json=False, sidecar_xmp=False, use_photos_export=False, timeout=120, exiftool=False)`
 
 Export photo from the Photos library to another destination on disk.  
 - dest: must be valid destination path as str (or exception raised).
 - *filename (optional): name of picture as str; if not provided, will use current filename
 - edited: boolean; if True (default=False), will export the edited version of the photo (or raise exception if no edited version)
 - overwrite: boolean; if True (default=False), will overwrite files if they alreay exist
+- live_photo: boolean; if True (default=False), will also export the associted .mov for live photos; exported live photo will be named filename.mov
 - increment: boolean; if True (default=True), will increment file name until a non-existent name is found
-- sidecar_json: (boolean, default = False); if True will also write a json sidecar with IPTC data in format readable by exiftool; sidecar filename will be dest/filename.ext.json where ext is suffix of the image file (e.g. jpeg or jpg) 
-- sidecar_xmp: (boolean, default = False); if True will also write a XMP sidecar with IPTC data; sidecar filename will be dest/filename.ext.xmp where ext is suffix of the image file (e.g. jpeg or jpg)
+- sidecar_json: (boolean, default = False); if True will also write a json sidecar with metadata in format readable by exiftool; sidecar filename will be dest/filename.json where filename is the stem of the photo name
+- sidecar_xmp: (boolean, default = False); if True will also write a XMP sidecar with metadata; sidecar filename will be dest/filename.xmp where filename is the stem of the photo name
 - use_photos_export: boolean; (default=False), if True will attempt to export photo via applescript interaction with Photos; useful for forcing download of missing photos.  This only works if the Photos library being used is the default library (last opened by Photos) as applescript will directly interact with whichever library Photos is currently using.
 - timeout: (int, default=120) timeout in seconds used with use_photos_export
+- exiftool: (boolean, default = False) if True, will use [exiftool](https://exiftool.org/) to write metadata directly to the exported photo; exiftool must be installed and in the system path
 
 The json sidecar file can be used by exiftool to apply the metadata from the json file to the image.  For example: 
 
@@ -790,6 +821,7 @@ Apple does provide a framework ([PhotoKit](https://developer.apple.com/documenta
 - [PyObjC](https://pythonhosted.org/pyobjc/)
 - [PyYAML](https://pypi.org/project/PyYAML/)
 - [Click](https://pypi.org/project/click/)
+- [Mako](https://www.makotemplates.org/)
 
 ## Acknowledgements
 This project was originally inspired by [photo-export](https://github.com/patrikhson/photo-export) by Patrick Fältström,  Copyright (c) 2015 Patrik Fältström paf@frobbit.se

examples/photos_repl.py

@@ -8,6 +8,7 @@
 # python3 -i examples/photos_repl.py
 
 import sys
+import time
 
 # click needed since this uses a couple of functions from CLI (__main__.py)
 import click
@@ -25,13 +26,23 @@ def main():
         db = get_photos_db()
 
     if db:
-        return osxphotos.PhotosDB(dbfile=db)
+        print("loading database")
+        tic = time.perf_counter()
+        photosdb = osxphotos.PhotosDB(dbfile=db)
+        toc = time.perf_counter()
+        print(f"done: took {toc-tic} seconds")
+        return photosdb
     else:
         _list_libraries()
         sys.exit()
 
 
 if __name__ == "__main__":
-    print(f"Version: {osxphotos._version.__version__}")
+    print(f"osxphotos version: {osxphotos._version.__version__}")
     photosdb = main()
+    print(f"database version: {photosdb.db_version}")
+    print("getting photos")
+    tic = time.perf_counter()
     photos = photosdb.photos(images=True, movies=True)
+    toc = time.perf_counter()
+    print(f"found {len(photos)} photos in {toc-tic} seconds")

osxphotos/__main__.py

@@ -14,6 +14,7 @@ import osxphotos
 from ._constants import _EXIF_TOOL_URL, _PHOTOS_5_VERSION
 from ._version import __version__
 from .utils import create_path_by_date, _copy_file
+from .exiftool import get_exiftool_path
 
 
 def get_photos_db(*db_options):
@@ -94,21 +95,24 @@ def query_options(f):
             metavar="KEYWORD",
             default=None,
             multiple=True,
-            help="Search for keyword(s).",
+            help="Search for keyword KEYWORD. "
+            'If more than one keyword, treated as "OR", e.g. find photos match any keyword',
         ),
         o(
             "--person",
             metavar="PERSON",
             default=None,
             multiple=True,
-            help="Search for person(s).",
+            help="Search for person PERSON. "
+            'If more than one person, treated as "OR", e.g. find photos match any person',
         ),
         o(
             "--album",
             metavar="ALBUM",
             default=None,
             multiple=True,
-            help="Search for album(s).",
+            help="Search for album ALBUM. "
+            'If more than one album, treated as "OR", e.g. find photos match any album',
         ),
         o(
             "--uuid",
@@ -355,16 +359,6 @@ def info(ctx, cli_obj, db, json_, photos_library):
 
     persons = pdb.persons_as_dict
 
-    # handle empty person names (added by Photos 5.0+ when face detected but not identified)
-    # TODO: remove this
-    # noperson = "UNKNOWN"
-    # if "" in persons:
-    #     if noperson in persons:
-    #         persons[noperson].append(persons[""])
-    #     else:
-    #         persons[noperson] = persons[""]
-    #     persons.pop("", None)
-
     info["persons_count"] = len(persons)
     info["persons"] = persons
 
@@ -669,6 +663,13 @@ def query(
     "the photo does not exist on disk.  This will be slow and will require internet connection. "
     "This obviously only works if the Photos library is synched to iCloud.",
 )
+@click.option(
+    "--exiftool",
+    is_flag=True,
+    help="Use exiftool to write metadata directly to exported photos. "
+    "To use this option, exiftool must be installed and in the path.  "
+    "exiftool may be installed from https://exiftool.org/",
+)
 @DB_ARGUMENT
 @click.argument("dest", nargs=1, type=click.Path(exists=True))
 @click.pass_obj
@@ -714,6 +715,7 @@ def export(
     not_live,
     download_missing,
     dest,
+    exiftool,
 ):
     """ Export photos from the Photos database.
         Export path DEST is required.
@@ -740,6 +742,18 @@ def export(
         click.echo(cli.commands["export"].get_help(ctx), err=True)
         return
 
+    # verify exiftool installed an in path
+    if exiftool:
+        try:
+            _ = get_exiftool_path()
+        except FileNotFoundError:
+            click.echo(
+                "Could not find exiftool. Please download and install"
+                " from https://exiftool.org/",
+                err=True,
+            )
+            ctx.exit(2)
+
     isphoto = ismovie = True  # default searches for everything
     if only_movies:
         isphoto = False
@@ -817,6 +831,7 @@ def export(
                         original_name,
                         export_live,
                         download_missing,
+                        exiftool,
                     )
         else:
             for p in photos:
@@ -831,6 +846,7 @@ def export(
                     original_name,
                     export_live,
                     download_missing,
+                    exiftool,
                 )
                 if export_path:
                     click.echo(f"Exported {p.filename} to {export_path}")
@@ -1085,6 +1101,7 @@ def export_photo(
     original_name,
     export_live,
     download_missing,
+    exiftool,
 ):
     """ Helper function for export that does the actual export
         photo: PhotoInfo object
@@ -1097,6 +1114,7 @@ def export_photo(
         export_live: boolean; also export live video component if photo is a live photo
                      live video will have same name as photo but with .mov extension
         download_missing: attempt download of missing iCloud photos
+        exiftool: use exiftool to write EXIF metadata directly to exported photo
         returns destination path of exported photo or None if photo was missing 
     """
 
@@ -1143,8 +1161,10 @@ def export_photo(
         filename,
         sidecar_json=sidecar_json,
         sidecar_xmp=sidecar_xmp,
+        live_photo=export_live,
         overwrite=overwrite,
         use_photos_export=download_missing,
+        exiftool=exiftool,
     )
 
     # if export-edited, also export the edited version
@@ -1163,27 +1183,11 @@ def export_photo(
                 overwrite=overwrite,
                 edited=True,
                 use_photos_export=download_missing,
+                exiftool=exiftool,
             )
         else:
             click.echo(f"Skipping missing edited photo for {filename}")
 
-    if export_live and photo.live_photo and photo.path_live_photo is not None:
-        # if destination exists, will be overwritten regardless of overwrite
-        # so that name matches name of live photo
-        live_name = pathlib.Path(photo_path)
-        live_name = f"{live_name.stem}.mov"
-
-        src_live = photo.path_live_photo
-        dest_live = pathlib.Path(photo_path).parent / pathlib.Path(live_name)
-
-        if src_live is not None:
-            if verbose:
-                click.echo(f"Exporting live photo video of {filename} as {live_name}")
-
-            _copy_file(src_live, str(dest_live))
-        else:
-            click.echo(f"Skipping missing live movie for {filename}")
-
     return photo_path
 
 

osxphotos/_constants.py

@@ -13,6 +13,9 @@ import os.path
 # TODO: Should this also use compatibleBackToVersion from LiGlobals?
 _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"
 

osxphotos/_version.py

@@ -1,3 +1,3 @@
 """ version info """
 
-__version__ = "0.22.7"
+__version__ = "0.22.13"

osxphotos/exiftool.py

@@ -0,0 +1,251 @@
+""" Yet another simple exiftool wrapper 
+    I rolled my own for following reasons: 
+    1. I wanted something under MIT license (best alternative was licensed under GPL/BSD)
+    2. I wanted singleton behavior so only a single exiftool process was ever running
+    If these aren't important to you, I highly recommend you use Sven Marnach's excellent 
+    pyexiftool: https://github.com/smarnach/pyexiftool which provides more functionality """
+
+import json
+import logging
+import os
+import subprocess
+import sys
+from functools import lru_cache
+
+from .utils import _debug
+
+# exiftool -stay_open commands outputs this EOF marker after command is run
+EXIFTOOL_STAYOPEN_EOF = "{ready}"
+EXIFTOOL_STAYOPEN_EOF_LEN = len(EXIFTOOL_STAYOPEN_EOF)
+
+
+@lru_cache(maxsize=1)
+def get_exiftool_path():
+    """ return path of exiftool, cache result """
+    result = subprocess.run(["which", "exiftool"], stdout=subprocess.PIPE)
+    exiftool_path = result.stdout.decode("utf-8")
+    if _debug():
+        logging.debug("exiftool path = %s" % (exiftool_path))
+    if exiftool_path:
+        return exiftool_path.rstrip()
+    else:
+        raise FileNotFoundError(
+            "Could not find exiftool. Please download and install from "
+            "https://exiftool.org/"
+        )
+
+
+class _ExifToolProc:
+    """ Runs exiftool in a subprocess via Popen
+        Creates a singleton object """
+
+    def __new__(cls, *args, **kwargs):
+        """ create new object or return instance of already created singleton """
+        if not hasattr(cls, "instance") or not cls.instance:
+            cls.instance = super().__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, exiftool=None):
+        """ construct _ExifToolProc singleton object or return instance of already created object
+            exiftool: optional path to exiftool binary (if not provided, will search path to find it) """
+
+        if hasattr(self, "_process_running") and self._process_running:
+            # already running
+            if exiftool is not None:
+                logging.warning(
+                    f"exiftool subprocess already running, "
+                    f"ignoring exiftool={exiftool}"
+                )
+            return
+
+        if exiftool:
+            self._exiftool = exiftool
+        else:
+            self._exiftool = get_exiftool_path()
+
+        self._process_running = False
+        self._start_proc()
+
+    @property
+    def process(self):
+        """ return the exiftool subprocess """
+        if self._process_running:
+            return self._process
+        else:
+            raise ValueError("exiftool process is not running")
+
+    @property
+    def pid(self):
+        """ return process id (PID) of the exiftool process """
+        return self._process.pid
+
+    @property
+    def exiftool(self):
+        """ return path to exiftool process """
+        return self._exiftool
+
+    def _start_proc(self):
+        """ start exiftool in batch mode """
+
+        if self._process_running:
+            logging.warning("exiftool already running: {self._process}")
+            return
+
+        # open exiftool process
+        self._process = subprocess.Popen(
+            [
+                self._exiftool,
+                "-stay_open",  # keep process open in batch mode
+                "True",  # -stay_open=True, keep process open in batch mode
+                "-@",  # read command-line arguments from file
+                "-",  # read from stdin
+                "-common_args",  # specifies args common to all commands subsequently run
+                "-n",  # no print conversion (e.g. print tag values in machine readable format)
+                "-G",  # print group name for each tag
+            ],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.DEVNULL,
+        )
+        self._process_running = True
+
+    def _stop_proc(self):
+        """ stop the exiftool process if it's running, otherwise, do nothing """
+        if not self._process_running:
+            logging.warning("exiftool process is not running")
+            return
+
+        self._process.stdin.write(b"-stay_open\n")
+        self._process.stdin.write(b"False\n")
+        self._process.stdin.flush()
+        try:
+            self._process.communicate(timeout=5)
+        except subprocess.TimeoutExpired:
+            logging.warning(
+                f"exiftool pid {self._process.pid} did not exit, killing it"
+            )
+            self._process.kill()
+            self._process.communicate()
+
+        del self._process
+        self._process_running = False
+
+    def __del__(self):
+        self._stop_proc()
+
+
+class ExifTool:
+    """ Basic exiftool interface for reading and writing EXIF tags """
+
+    def __init__(self, filepath, exiftool=None, overwrite=True):
+        """ Return ExifTool object
+            file: path to image file
+            exiftool: path to exiftool, if not specified will look in path
+            overwrite: if True, will overwrite image file without creating backup, default=False """
+        self.file = filepath
+        self.overwrite = overwrite
+        self.data = {}
+        self._exiftoolproc = _ExifToolProc(exiftool=exiftool)
+        self._process = self._exiftoolproc.process
+        self._read_exif()
+
+    def setvalue(self, tag, value):
+        """ Set tag to value(s) 
+            if value is None, will delete tag """
+
+        if value is None:
+            value = ""
+        command = []
+        command.append(f"-{tag}={value}")
+        if self.overwrite:
+            command.append("-overwrite_original")
+        self.run_commands(*command)
+
+    def addvalues(self, tag, *values):
+        """ Add one or more value(s) to tag
+            If more than one value is passed, each value will be added to the tag
+            Notes: exiftool may add duplicate values for some tags so the caller must ensure
+                   the values being added are not already in the EXIF data
+                   For some tags, such as IPTC:Keywords, this will add a new value to the list of keywords, 
+                   but for others, such as EXIF:ISO, this will literally add a value to the existing value.
+                   It's up to the caller to know what exiftool will do for each tag
+                   If setvalue called before addvalues, exiftool does not appear to add duplicates, 
+                   but if addvalues called without first calling setvalue, exiftool will add duplicate values
+        """
+        if not values:
+            raise ValueError("Must pass at least one value")
+
+        command = []
+        for value in values:
+            if value is None:
+                raise ValueError("Can't add None value to tag")
+            command.append(f"-{tag}+={value}")
+
+        if self.overwrite:
+            command.append("-overwrite_original")
+
+        if command:
+            self.run_commands(*command)
+
+    def run_commands(self, *commands, no_file=False):
+        """ run commands in the exiftool process and return result 
+            no_file: (bool) do not pass the filename to exiftool (default=False)
+                     by default, all commands will be run against self.file
+                     use no_file=True to run a command without passing the filename """
+        if not hasattr(self, "_process") or not self._process:
+            raise ValueError("exiftool process is not running")
+
+        if not commands:
+            raise TypeError("must provide one or more command to run")
+
+        filename = os.fsencode(self.file) if not no_file else b""
+        command_str = (
+            b"\n".join([c.encode("utf-8") for c in commands])
+            + b"\n"
+            + filename
+            + b"\n"
+            + b"-execute\n"
+        )
+
+        if _debug():
+            logging.debug(command_str)
+
+        # send the command
+        self._process.stdin.write(command_str)
+        self._process.stdin.flush()
+
+        # read the output
+        output = b""
+        while EXIFTOOL_STAYOPEN_EOF not in str(output):
+            output += self._process.stdout.readline().strip()
+        return output[:-EXIFTOOL_STAYOPEN_EOF_LEN]
+
+    @property
+    def pid(self):
+        """ return process id (PID) of the exiftool process """
+        return self._process.pid
+
+    @property
+    def version(self):
+        """ returns exiftool version """
+        ver = self.run_commands("-ver", no_file=True)
+        return ver.decode("utf-8")
+
+    def json(self):
+        """ return JSON dictionary from exiftool as dict """
+        json_str = self.run_commands("-json")
+        if json_str:
+            return json.loads(json_str)
+        else:
+            return None
+
+    def _read_exif(self):
+        """ read exif data from file """
+        json = self.json()
+        self.data = {k: v for k, v in json[0].items()}
+
+    def __str__(self):
+        str_ = f"file: {self.file}\nexiftool: {self._exiftoolproc._exiftool}"
+        return str_
+

osxphotos/photoinfo.py

@@ -32,6 +32,7 @@ from .utils import (
     _get_resource_loc,
     dd_to_dms_str,
 )
+from .exiftool import ExifTool
 
 
 class PhotoInfo:
@@ -453,37 +454,79 @@ class PhotoInfo:
 
         return photopath
 
+    @property
+    def panorama(self):
+        """ Returns True if photo is a panorama, otherwise False """
+        return self._info["panorama"]
+
+    @property
+    def slow_mo(self):
+        """ Returns True if photo is a slow motion video, otherwise False """
+        return self._info["slow_mo"]
+
+    @property
+    def time_lapse(self):
+        """ Returns True if photo is a time lapse video, otherwise False """
+        return self._info["time_lapse"]
+
+    @property
+    def hdr(self):
+        """ Returns True if photo is an HDR photo, otherwise False """
+        return self._info["hdr"]
+
+    @property
+    def screenshot(self):
+        """ Returns True if photo is an HDR photo, otherwise False """
+        return self._info["screenshot"]
+
+    @property
+    def portrait(self):
+        """ Returns True if photo is a portrait, otherwise False """
+        return self._info["portrait"]
+
+    @property
+    def selfie(self):
+        """ Returns True if photo is a selfie (front facing camera), otherwise False """
+        return self._info["selfie"]
+
     def export(
         self,
         dest,
         *filename,
         edited=False,
+        live_photo=False,
         overwrite=False,
         increment=True,
         sidecar_json=False,
         sidecar_xmp=False,
         use_photos_export=False,
         timeout=120,
+        exiftool=False,
     ):
         """ export photo 
             dest: must be valid destination path (or exception raised) 
             filename: (optional): name of picture; if not provided, will use current filename 
             edited: (boolean, default=False); if True will export the edited version of the photo 
                     (or raise exception if no edited version) 
+            live_photo: (boolean, default=False); if True, will also export the associted .mov for live photos
             overwrite: (boolean, default=False); if True will overwrite files if they alreay exist 
             increment: (boolean, default=True); if True, will increment file name until a non-existant name is found 
                        if overwrite=False and increment=False, export will fail if destination file already exists 
             sidecar_json: (boolean, default = False); if True will also write a json sidecar with IPTC data in format readable by exiftool
-                      sidecar filename will be dest/filename.ext.json where ext is suffix of the image file (e.g. jpeg or jpg)
+                      sidecar filename will be dest/filename.json 
             sidecar_xmp: (boolean, default = False); if True will also write a XMP sidecar with IPTC data 
-                      sidecar filename will be dest/filename.ext.xmp where ext is suffix of the image file (e.g. jpeg or jpg)
+                      sidecar filename will be dest/filename.xmp 
             use_photos_export: (boolean, default=False); if True will attempt to export photo via applescript interaction with Photos
             timeout: (int, default=120) timeout in seconds used with use_photos_export
+            exiftool: (boolean, default = False); if True, will use exiftool to write metadata to export file
             returns the full path to the exported file """
 
         # TODO: add this docs:
         #  ( for jpeg in *.jpeg; do exiftool -v -json=$jpeg.json $jpeg; done )
 
+        # list of all files exported during this call to export
+        exported_files = []
+
         # check arguments and get destination path and filename (if provided)
         if filename and len(filename) > 2:
             raise TypeError(
@@ -503,7 +546,7 @@ class PhotoInfo:
                 # no filename provided so use the default
                 # if edited file requested, use filename but add _edited
                 # need to use file extension from edited file as Photos saves a jpeg once edited
-                if edited:
+                if edited and not use_photos_export:
                     # verify we have a valid path_edited and use that to get filename
                     if not self.path_edited:
                         raise FileNotFoundError(
@@ -584,21 +627,59 @@ class PhotoInfo:
 
             # copy the file, _copy_file uses ditto to preserve Mac extended attributes
             _copy_file(src, dest)
+            exported_files.append(str(dest))
+
+            # copy live photo associated .mov if requested
+            if live_photo and self.live_photo:
+                live_name = dest.parent / f"{dest.stem}.mov"
+                src_live = self.path_live_photo
+
+                if src_live is not None:
+                    logging.debug(
+                        f"Exporting live photo video of {filename} as {live_name.name}"
+                    )
+                    _copy_file(src_live, str(live_name))
+                    exported_files.append(str(live_name))
+                else:
+                    logging.warning(f"Skipping missing live movie for {filename}")
         else:
             # use_photo_export
             exported = None
+            # export live_photo .mov file?
+            live_photo = True if live_photo and self.live_photo else False
             if edited:
                 # exported edited version and not original
-                exported = _export_photo_uuid_applescript(
-                    self.uuid, dest, original=False, edited=True, timeout=timeout
-                )
+                if filename:
+                    # use filename stem provided
+                    filestem = dest.stem
+                else:
+                    # didn't get passed a filename, add _edited
+                    filestem = f"{dest.stem}_edited"
+                    exported = _export_photo_uuid_applescript(
+                        self.uuid,
+                        dest.parent,
+                        filestem=filestem,
+                        original=False,
+                        edited=True,
+                        live_photo=live_photo,
+                        timeout=timeout,
+                    )
             else:
                 # export original version and not edited
+                filestem = dest.stem
                 exported = _export_photo_uuid_applescript(
-                    self.uuid, dest, original=True, edited=False, timeout=timeout
+                    self.uuid,
+                    dest.parent,
+                    filestem=filestem,
+                    original=True,
+                    edited=False,
+                    live_photo=live_photo,
+                    timeout=timeout,
                 )
 
-            if exported is None:
+            if exported is not None:
+                exported_files.extend(exported)
+            else:
                 logging.warning(f"Error exporting photo {self.uuid} to {dest}")
 
         if sidecar_json:
@@ -621,8 +702,32 @@ class PhotoInfo:
                 logging.warning(f"Error writing xmp sidecar to {sidecar_filename}")
                 raise e
 
+        logging.debug(f"export exported_files: {exported_files}")
+
+        # if exiftool, write the metadata
+        if exiftool and exported_files:
+            for exported_file in exported_files:
+                self._write_exif_data(exported_file)
+
         return str(dest)
 
+    def _write_exif_data(self, filepath):
+        """ write exif data to image file at filepath
+        filepath: full path to the image file """
+        if not os.path.exists(filepath):
+            raise FileNotFoundError(f"Could not find file {filepath}")
+        exiftool = ExifTool(filepath)
+        exif_info = json.loads(self._exiftool_json_sidecar())[0]
+        for exiftag, val in exif_info.items():
+            if type(val) == list:
+                # more than one, set first value the add additional values
+                exiftool.setvalue(exiftag, val.pop(0))
+                if val:
+                    # add any remaining items
+                    exiftool.addvalues(exiftag, *val)
+            else:
+                exiftool.setvalue(exiftag, val)
+
     def _exiftool_json_sidecar(self):
         """ return json string of EXIF details in exiftool sidecar format
             Does not include all the EXIF fields as those are likely already in the image
@@ -644,27 +749,27 @@ class PhotoInfo:
 
         exif = {}
         exif["_CreatedBy"] = "osxphotos, https://github.com/RhetTbull/osxphotos"
-        exif["FileName"] = self.filename
+        exif["File:FileName"] = self.filename
 
         if self.description:
-            exif["ImageDescription"] = self.description
-            exif["Description"] = self.description
+            exif["EXIF:ImageDescription"] = self.description
+            exif["XMP:Description"] = self.description
 
         if self.title:
-            exif["Title"] = self.title
+            exif["XMP:Title"] = self.title
 
         if self.keywords:
-            exif["TagsList"] = exif["Keywords"] = list(self.keywords)
+            exif["XMP:TagsList"] = exif["IPTC:Keywords"] = list(self.keywords)
             # Photos puts both keywords and persons in Subject when using "Export IPTC as XMP"
-            exif["Subject"] = list(self.keywords)
+            exif["XMP:Subject"] = list(self.keywords)
 
         if self.persons:
-            exif["PersonInImage"] = self.persons
+            exif["XMP:PersonInImage"] = self.persons
             # Photos puts both keywords and persons in Subject when using "Export IPTC as XMP"
-            if "Subject" in exif:
-                exif["Subject"].extend(self.persons)
+            if "XMP:Subject" in exif:
+                exif["XMP:Subject"].extend(self.persons)
             else:
-                exif["Subject"] = self.persons
+                exif["XMP:Subject"] = self.persons
 
         # if self.favorite():
         #     exif["Rating"] = 5
@@ -672,13 +777,13 @@ class PhotoInfo:
         (lat, lon) = self.location
         if lat is not None and lon is not None:
             lat_str, lon_str = dd_to_dms_str(lat, lon)
-            exif["GPSLatitude"] = lat_str
-            exif["GPSLongitude"] = lon_str
-            exif["GPSPosition"] = f"{lat_str}, {lon_str}"
+            exif["EXIF:GPSLatitude"] = lat_str
+            exif["EXIF:GPSLongitude"] = lon_str
+            exif["Composite:GPSPosition"] = f"{lat_str}, {lon_str}"
             lat_ref = "North" if lat >= 0 else "South"
             lon_ref = "East" if lon >= 0 else "West"
-            exif["GPSLatitudeRef"] = lat_ref
-            exif["GPSLongitudeRef"] = lon_ref
+            exif["EXIF:GPSLatitudeRef"] = lat_ref
+            exif["EXIF:GPSLongitudeRef"] = lon_ref
 
         # process date/time and timezone offset
         date = self.date
@@ -689,11 +794,11 @@ class PhotoInfo:
         offset = re.findall(r"([+-]?)([\d]{2})([\d]{2})", offsettime)
         offset = offset[0]  # findall returns list of tuples
         offsettime = f"{offset[0]}{offset[1]}:{offset[2]}"
-        exif["DateTimeOriginal"] = datetimeoriginal
-        exif["OffsetTimeOriginal"] = offsettime
+        exif["EXIF:DateTimeOriginal"] = datetimeoriginal
+        exif["EXIF:OffsetTimeOriginal"] = offsettime
 
         if self.date_modified is not None:
-            exif["ModifyDate"] = self.date_modified.strftime("%Y:%m:%d %H:%M:%S")
+            exif["EXIF:ModifyDate"] = self.date_modified.strftime("%Y:%m:%d %H:%M:%S")
 
         json_str = json.dumps([exif])
         return json_str
@@ -701,13 +806,15 @@ class PhotoInfo:
     def _xmp_sidecar(self):
         """ returns string for XMP sidecar """
         # TODO: add additional fields to XMP file?
-        
+
         xmp_template = Template(
             filename=os.path.join(_TEMPLATE_DIR, _XMP_TEMPLATE_NAME)
         )
         xmp_str = xmp_template.render(photo=self)
         # remove extra lines that mako inserts from template
-        xmp_str = "\n".join([line for line in xmp_str.split("\n") if line.strip() != ""])
+        xmp_str = "\n".join(
+            [line for line in xmp_str.split("\n") if line.strip() != ""]
+        )
         return xmp_str
 
     def _write_sidecar(self, filename, sidecar_str):

osxphotos/utils.py

@@ -2,10 +2,11 @@ import glob
 import logging
 import os.path
 import platform
+import sqlite3
 import subprocess
 import tempfile
 import urllib.parse
-from pathlib import Path
+import pathlib
 from plistlib import load as plistload
 
 import CoreFoundation
@@ -177,8 +178,8 @@ def get_system_library_path():
         )
         return None
 
-    plist_file = Path(
-        str(Path.home())
+    plist_file = pathlib.Path(
+        str(pathlib.Path.home())
         + "/Library/Containers/com.apple.photolibraryd/Data/Library/Preferences/com.apple.photolibraryd.plist"
     )
     if plist_file.is_file():
@@ -200,8 +201,8 @@ def get_system_library_path():
 def get_last_library_path():
     """ returns the path to the last opened Photos library 
         If a library has never been opened, returns None """
-    plist_file = Path(
-        str(Path.home())
+    plist_file = pathlib.Path(
+        str(pathlib.Path.home())
         + "/Library/Containers/com.apple.Photos/Data/Library/Preferences/com.apple.Photos.plist"
     )
     if plist_file.is_file():
@@ -308,17 +309,32 @@ def create_path_by_date(dest, dt):
 
 
 def _export_photo_uuid_applescript(
-    uuid, dest, original=True, edited=False, timeout=120
+    uuid,
+    dest,
+    filestem=None,
+    original=True,
+    edited=False,
+    live_photo=False,
+    timeout=120,
 ):
     """ Export photo to dest path using applescript to control Photos
+        If photo is a live photo, exports both the photo and associated .mov file
         uuid: UUID of photo to export
-        dest: destination path to export to; may be either a directory or a filename
-              if filename provided and file exists, exiting file will be overwritten
+        dest: destination path to export to
+        filestem: (string) if provided, exported filename will be named stem.ext 
+                  where ext is extension of the file exported by photos (e.g. .jpeg, .mov, etc)
+                  If not provided, file will be named with whatever name Photos uses
+                  If filestem.ext exists, it wil be overwritten
         original: (boolean) if True, export original image; default = True
         edited: (boolean) if True, export edited photo; default = False
-                will produce an error if image does not have edits/adjustments  
+                will produce an error if image does not have edits/adjustments 
+        *Note*: must be called with either edited or original but not both, 
+                will raise error if called with both edited and original = True
+        live_photo: (boolean) if True, export associated .mov live photo; default = False
         timeout: timeout value in seconds; export will fail if applescript run time exceeds timeout
-        Returns: path to exported file or None if export failed
+        Returns: list of paths to exported file(s) or None if export failed
+        Note: For Live Photos, if edited=True, will export a jpeg but not the movie, even if photo
+              has not been edited. This is due to how Photos Applescript interface works.
     """
 
     # setup the applescript to do the export
@@ -351,6 +367,13 @@ def _export_photo_uuid_applescript(
 		"""
     )
 
+    dest = pathlib.Path(dest)
+    if not dest.is_dir:
+        raise ValueError(f"dest {dest} must be a directory")
+
+    if not original ^ edited:
+        raise ValueError(f"edited or original must be True but not both")
+
     tmpdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
 
     # export original
@@ -365,14 +388,63 @@ def _export_photo_uuid_applescript(
 
     if filename is not None:
         # need to find actual filename as sometimes Photos renames JPG to jpeg on export
-        # this assumes only a single file in export folder, which should be true as
+        # may be more than one file exported (e.g. if Live Photo, Photos exports both .jpeg and .mov)
         # TemporaryDirectory will cleanup on return
-        path = glob.glob(os.path.join(tmpdir.name, "*"))[0]
-        _copy_file(path, dest)
-        if os.path.isdir(dest):
-            new_path = os.path.join(dest, filename)
-        else:
-            new_path = dest
-        return new_path
+        files = glob.glob(os.path.join(tmpdir.name, "*"))
+        exported_paths = []
+        for fname in files:
+            path = pathlib.Path(fname)
+            if len(files) > 1 and not live_photo and path.suffix.lower() == ".mov":
+                # it's the .mov part of live photo but not requested, so don't export
+                logging.debug(f"Skipping live photo file {path}")
+                continue
+            if filestem:
+                # rename the file based on filestem, keeping original extension
+                dest_new = dest / f"{filestem}{path.suffix}"
+            else:
+                # use the name Photos provided
+                dest_new = dest / path.name
+            logging.debug(f"exporting {path} to dest_new: {dest_new}")
+            _copy_file(str(path), str(dest_new))
+            exported_paths.append(str(dest_new))
+        return exported_paths
     else:
         return None
+
+
+def _open_sql_file(dbname):
+    """ opens sqlite file dbname in read-only mode
+        returns tuple of (connection, cursor) """
+    try:
+        dbpath = pathlib.Path(dbname).resolve()
+        conn = sqlite3.connect(f"{dbpath.as_uri()}?mode=ro", timeout=1, uri=True)
+        c = conn.cursor()
+    except sqlite3.Error as e:
+        sys.exit(f"An error occurred opening sqlite file: {e.args[0]} {dbname}")
+    return (conn, c)
+
+
+def _db_is_locked(dbname):
+    """ check to see if a sqlite3 db is locked
+        returns True if database is locked, otherwise False
+        dbname: name of database to test """
+
+    # first, check to see if lock file exists, if so, assume the file is locked
+    lock_name = f"{dbname}.lock"
+    if os.path.exists(lock_name):
+        logging.debug(f"{dbname} is locked")
+        return True
+
+    # no lock file so try to read from the database to see if it's locked
+    locked = None
+    try:
+        (conn, c) = _open_sql_file(dbname)
+        c.execute("SELECT name FROM sqlite_master WHERE type='table' ORDER BY name;")
+        conn.close()
+        logging.debug(f"{dbname} is not locked")
+        locked = False
+    except Exception as e:
+        logging.debug(f"{dbname} is locked")
+        locked = True
+
+    return locked

tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotoAnalysisServicePreferences.plist

@@ -3,8 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
-	<date>2020-01-19T20:09:13Z</date>
+	<date>2020-01-29T06:24:15Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2020-01-20T17:01:52Z</date>
+	<date>2020-01-29T13:44:20Z</date>
 </dict>
 </plist>

tests/Test-10.14.6.photoslibrary/resources/moments/analysismetadata.plist

@@ -11,6 +11,6 @@
 	<key>PLLastRevGeoForcedProviderOutOfDateCheckVersionKey</key>
 	<integer>1</integer>
 	<key>PLLastRevGeoVerFileFetchDateKey</key>
-	<date>2020-01-18T15:43:32Z</date>
+	<date>2020-01-29T06:24:08Z</date>
 </dict>
 </plist>

tests/Test-10.14.6.photoslibrary/resources/recovery/Info.plist

@@ -24,7 +24,7 @@
 	<key>SnapshotCompletedDate</key>
 	<date>2019-07-27T13:16:43Z</date>
 	<key>SnapshotLastValidated</key>
-	<date>2020-01-20T03:53:02Z</date>
+	<date>2020-01-29T06:26:14Z</date>
 	<key>SnapshotTables</key>
 	<dict/>
 </dict>

tests/Test-10.15.1.photoslibrary/database/Photos.sqlite.lock

@@ -7,7 +7,7 @@
 	<key>hostuuid</key>
 	<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
 	<key>pid</key>
-	<integer>444</integer>
+	<integer>1134</integer>
 	<key>processname</key>
 	<string>photolibraryd</string>
 	<key>uid</key>

tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist

@@ -3,24 +3,24 @@
 <plist version="1.0">
 <dict>
 	<key>BackgroundHighlightCollection</key>
-	<date>2020-01-25T16:51:27Z</date>
+	<date>2020-03-07T16:11:53Z</date>
 	<key>BackgroundHighlightEnrichment</key>
-	<date>2020-01-25T16:51:27Z</date>
+	<date>2020-03-07T16:11:53Z</date>
 	<key>BackgroundJobAssetRevGeocode</key>
-	<date>2020-01-25T16:51:27Z</date>
+	<date>2020-03-07T18:15:22Z</date>
 	<key>BackgroundJobSearch</key>
-	<date>2020-01-25T16:51:27Z</date>
+	<date>2020-03-07T16:11:53Z</date>
 	<key>BackgroundPeopleSuggestion</key>
-	<date>2020-01-25T16:51:26Z</date>
+	<date>2020-03-07T16:11:52Z</date>
 	<key>BackgroundUserBehaviorProcessor</key>
-	<date>2020-01-25T06:18:22Z</date>
+	<date>2020-03-07T08:11:00Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey</key>
-	<date>2020-01-25T16:51:37Z</date>
+	<date>2020-03-07T18:15:23Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
-	<date>2020-01-25T06:18:20Z</date>
+	<date>2020-03-07T08:10:59Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2020-01-25T16:51:27Z</date>
+	<date>2020-03-07T18:15:22Z</date>
 	<key>SiriPortraitDonation</key>
-	<date>2020-01-25T06:18:22Z</date>
+	<date>2020-03-07T08:11:00Z</date>
 </dict>
 </plist>

tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PhotoAnalysisServicePreferences.plist

@@ -3,8 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>FaceIDModelLastGenerationKey</key>
-	<date>2020-01-25T06:18:24Z</date>
+	<date>2020-03-07T08:11:01Z</date>
 	<key>LastContactClassificationKey</key>
-	<date>2020-01-25T06:18:26Z</date>
+	<date>2020-03-07T08:11:02Z</date>
 </dict>
 </plist>

tests/Test-Lock-10_12.photoslibrary/database/DataModelVersion.plist

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>DatabaseMinorVersion</key>
+	<integer>1</integer>
+	<key>DatabaseVersion</key>
+	<integer>112</integer>
+	<key>LastOpenMode</key>
+	<integer>2</integer>
+	<key>LibrarySchemaVersion</key>
+	<integer>2622</integer>
+	<key>MetaSchemaVersion</key>
+	<integer>2</integer>
+	<key>createDate</key>
+	<date>2020-01-30T00:26:31Z</date>
+</dict>
+</plist>

tests/Test-Lock-10_12.photoslibrary/database/photos.db.lock

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>hostname</key>
+	<string>Rhet-and-Sarahs-iMac.local</string>
+	<key>hostuuid</key>
+	<string>A91B9F4C-F77A-565D-A8E1-B550C8F012AF</string>
+	<key>pid</key>
+	<integer>741</integer>
+	<key>processname</key>
+	<string>photolibraryd</string>
+	<key>uid</key>
+	<integer>501</integer>
+</dict>
+</plist>

tests/Test-Lock-10_12.photoslibrary/private/com.apple.Photos/appPrivateData.plist

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>LithiumMessageTracer</key>
+	<dict>
+		<key>LastReportedDate</key>
+		<date>2020-01-30T00:26:31Z</date>
+	</dict>
+</dict>
+</plist>

tests/Test-Lock-10_12.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotoAnalysisServicePreferences.plist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
+	<date>2020-01-30T00:26:32Z</date>
+	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
+	<date>2020-01-30T00:26:32Z</date>
+</dict>
+</plist>

tests/Test-Lock-10_12.photoslibrary/resources/moments/analysismetadata.plist

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PLLanguageAndLocaleKey</key>
+	<string>en-US:en_US</string>
+	<key>PLLastGeoProviderIdKey</key>
+	<string>7618</string>
+	<key>PLLastLocationInfoFormatVer</key>
+	<integer>12</integer>
+	<key>PLLastRevGeoForcedProviderOutOfDateCheckVersionKey</key>
+	<integer>1</integer>
+	<key>PLLastRevGeoVerFileFetchDateKey</key>
+	<date>2020-01-30T00:26:31Z</date>
+</dict>
+</plist>

tests/Test-Lock-10_12.photoslibrary/resources/moments/historicalmarker.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>LastHistoryRowId</key>
+	<integer>83</integer>
+	<key>LibraryBuildTag</key>
+	<string>FF4B0E6D-6231-4212-91F6-7397F96959BD</string>
+	<key>LibrarySchemaVersion</key>
+	<integer>2622</integer>
+</dict>
+</plist>

tests/Test-Lock-10_12.photoslibrary/resources/moments/serverinfo.plist

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>FileVersion</key>
+	<integer>11</integer>
+	<key>Source</key>
+	<dict>
+		<key>35230</key>
+		<dict>
+			<key>CountryMinVersions</key>
+			<dict>
+				<key>OTHER</key>
+				<integer>1</integer>
+			</dict>
+			<key>CurrentVersion</key>
+			<integer>1</integer>
+			<key>NoResultErrorIsSuccess</key>
+			<true/>
+		</dict>
+		<key>57879</key>
+		<dict>
+			<key>CountryMinVersions</key>
+			<dict>
+				<key>OTHER</key>
+				<integer>1</integer>
+			</dict>
+			<key>CurrentVersion</key>
+			<integer>1</integer>
+			<key>NoResultErrorIsSuccess</key>
+			<true/>
+		</dict>
+		<key>7618</key>
+		<dict>
+			<key>AddCountyIfNeeded</key>
+			<true/>
+			<key>CountryMinVersions</key>
+			<dict>
+				<key>OTHER</key>
+				<integer>10</integer>
+			</dict>
+			<key>CurrentVersion</key>
+			<integer>10</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

tests/Test-Lock-10_12.photoslibrary/resources/recovery/Info.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>DatabaseMinorVersion</key>
+	<integer>1</integer>
+	<key>DatabaseVersion</key>
+	<integer>112</integer>
+	<key>LibrarySchemaVersion</key>
+	<integer>2622</integer>
+	<key>MetaSchemaVersion</key>
+	<integer>2</integer>
+	<key>SnapshotComplete</key>
+	<true/>
+	<key>SnapshotCompletedDate</key>
+	<date>2020-01-30T00:26:31Z</date>
+	<key>SnapshotTables</key>
+	<dict/>
+</dict>
+</plist>