Merge branch 'master' into convert_to_jpeg

osxphotos/_version.py

@@ -1,3 +1,4 @@
 """ version info """
 
 __version__ = "0.35.0"
+

osxphotos/exiftool.py

@@ -98,6 +98,7 @@ class _ExifToolProc:
                 "-",  # 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)
+                "-P",  # Preserve file modification date/time (possible interfere w/ --touch-file)
                 "-G",  # print group name for each tag
             ],
             stdin=subprocess.PIPE,

osxphotos/photosdb/photosdb.py

@@ -1323,11 +1323,12 @@ class PhotosDB:
 
             # get the place info that matches the RKPlace modelIDs for this photo
             # (place_ids), sort by area (element 3 of the place_data tuple in places)
+            # area could be None so assume 0 if it is (issue #230)
             place_names = [
                 pname
                 for pname in sorted(
                     [places[p] for p in places if p in place_ids],
-                    key=lambda place: place[3],
+                    key=lambda place: place[3] if place[3] is not None else 0,
                 )
             ]