diff --git a/README.md b/README.md index 2c0b4ced..01167376 100644 --- a/README.md +++ b/README.md @@ -1732,7 +1732,7 @@ Substitution Description {lf} A line feed: '\n', alias for {newline} {cr} A carriage return: '\r' {crlf} a carriage return + line feed: '\r\n' -{osxphotos_version} The osxphotos version, e.g. '0.45.11' +{osxphotos_version} The osxphotos version, e.g. '0.45.12' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified for @@ -3636,7 +3636,7 @@ The following template field substitutions are availabe for use the templating s |{lf}|A line feed: '\n', alias for {newline}| |{cr}|A carriage return: '\r'| |{crlf}|a carriage return + line feed: '\r\n'| -|{osxphotos_version}|The osxphotos version, e.g. '0.45.11'| +|{osxphotos_version}|The osxphotos version, e.g. '0.45.12'| |{osxphotos_cmd_line}|The full command line used to run osxphotos| |{album}|Album(s) photo is contained in| |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder| diff --git a/docs/.buildinfo b/docs/.buildinfo index d24ed73e..c310cc0e 100644 --- a/docs/.buildinfo +++ b/docs/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 4096293689c0c969f1ec21d5ea133ab2 +config: 30f35e310e3c2ebf8f561c37c515c685 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index 385a81ba..8d356e17 100644 --- a/docs/_static/documentation_options.js +++ b/docs/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '0.45.11', + VERSION: '0.45.12', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/cli.html b/docs/cli.html index 2b5a98e9..a938ec4c 100644 --- a/docs/cli.html +++ b/docs/cli.html @@ -6,7 +6,7 @@ - osxphotos command line interface (CLI) — osxphotos 0.45.11 documentation + osxphotos command line interface (CLI) — osxphotos 0.45.12 documentation diff --git a/docs/genindex.html b/docs/genindex.html index 089be9cc..b1d9c556 100644 --- a/docs/genindex.html +++ b/docs/genindex.html @@ -5,7 +5,7 @@ - Index — osxphotos 0.45.11 documentation + Index — osxphotos 0.45.12 documentation diff --git a/docs/index.html b/docs/index.html index 177a3b71..bac94ce1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ - Welcome to osxphotos’s documentation! — osxphotos 0.45.11 documentation + Welcome to osxphotos’s documentation! — osxphotos 0.45.12 documentation diff --git a/docs/modules.html b/docs/modules.html index e7222b6a..ac89b12a 100644 --- a/docs/modules.html +++ b/docs/modules.html @@ -6,7 +6,7 @@ - osxphotos — osxphotos 0.45.11 documentation + osxphotos — osxphotos 0.45.12 documentation diff --git a/docs/reference.html b/docs/reference.html index 76189ec4..566dc0bf 100644 --- a/docs/reference.html +++ b/docs/reference.html @@ -6,7 +6,7 @@ - osxphotos package — osxphotos 0.45.11 documentation + osxphotos package — osxphotos 0.45.12 documentation diff --git a/docs/search.html b/docs/search.html index 3480f01d..b965cf3f 100644 --- a/docs/search.html +++ b/docs/search.html @@ -5,7 +5,7 @@ - Search — osxphotos 0.45.11 documentation + Search — osxphotos 0.45.12 documentation diff --git a/osxphotos/_version.py b/osxphotos/_version.py index e0f1f7a8..0e28e942 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.45.11" +__version__ = "0.45.12" diff --git a/osxphotos/photoexporter.py b/osxphotos/photoexporter.py index 50708a9d..b94e0ab2 100644 --- a/osxphotos/photoexporter.py +++ b/osxphotos/photoexporter.py @@ -1541,7 +1541,7 @@ class PhotoExporter: person_list = sorted(list(set(person_list))) exif["XMP:PersonInImage"] = person_list.copy() - if options.face_regions and self.photo.face_info and self.photo._db._beta: + if options.face_regions and self.photo.face_info: exif.update(self._get_mwg_face_regions_exiftool()) # if self.favorite(): diff --git a/osxphotos/phototemplate.tx b/osxphotos/phototemplate.tx index 7824c1af..97b2c8e6 100644 --- a/osxphotos/phototemplate.tx +++ b/osxphotos/phototemplate.tx @@ -99,7 +99,7 @@ OPERATOR: PathSep: ( "(" - (value=/[^\(\)\{\}]{0,1}/)? + (value=/[^\(\)\{\}]+/)? ")" )? ; diff --git a/osxphotos/templates/xmp_sidecar.mako b/osxphotos/templates/xmp_sidecar.mako index dc96f640..6263b05b 100644 --- a/osxphotos/templates/xmp_sidecar.mako +++ b/osxphotos/templates/xmp_sidecar.mako @@ -103,6 +103,8 @@ % if photo.face_info: + ${photo.width if photo.orientation in [5, 6, 7, 8] else photo.height} + ${photo.height if photo.orientation in [5, 6, 7, 8] else photo.width} pixel diff --git a/tests/generate_sidecars_for_test.py b/tests/generate_sidecars_for_test.py index 6f0c2605..8f038908 100644 --- a/tests/generate_sidecars_for_test.py +++ b/tests/generate_sidecars_for_test.py @@ -7,6 +7,7 @@ import pathlib import osxphotos +from osxphotos.photoexporter import PhotoExporter, ExportOptions PHOTOS_DB_15_7 = "./tests/Test-10.15.7.photoslibrary/database/photos.db" PHOTOS_DB_14_6 = "./tests/Test-10.14.6.photoslibrary/database/photos.db" @@ -31,7 +32,7 @@ SIDECAR_DIR = "tests/sidecars" def generate_sidecars(dbname, uuid_dict): - """ generate XMP and JSON sidecars for testing """ + """generate XMP and JSON sidecars for testing""" photosdb = osxphotos.PhotosDB(dbname) for _, uuid in uuid_dict.items(): @@ -39,7 +40,8 @@ def generate_sidecars(dbname, uuid_dict): # plain xmp sidecar = str(pathlib.Path(SIDECAR_DIR) / f"{uuid}.xmp") - xmp = photo._xmp_sidecar() + exporter = PhotoExporter(photo) + xmp = exporter._xmp_sidecar() with open(sidecar, "w") as file: file.write(xmp) @@ -47,63 +49,76 @@ def generate_sidecars(dbname, uuid_dict): ext = osxphotos.uti.get_preferred_uti_extension(photo.uti) ext = "jpg" if ext == "jpeg" else ext sidecar = str(pathlib.Path(SIDECAR_DIR) / f"{uuid}_ext.xmp") - xmp = photo._xmp_sidecar(extension=ext) + xmp = exporter._xmp_sidecar(extension=ext) with open(sidecar, "w") as file: file.write(xmp) # persons_as_keywords sidecar = str(pathlib.Path(SIDECAR_DIR) / f"{uuid}_persons_as_keywords.xmp") - xmp = photo._xmp_sidecar(use_persons_as_keywords=True, extension=ext) + xmp = exporter._xmp_sidecar( + ExportOptions(use_persons_as_keywords=True), extension=ext + ) with open(sidecar, "w") as file: file.write(xmp) # albums_as_keywords sidecar = str(pathlib.Path(SIDECAR_DIR) / f"{uuid}_albums_as_keywords.xmp") - xmp = photo._xmp_sidecar(use_albums_as_keywords=True, extension=ext) + xmp = exporter._xmp_sidecar( + ExportOptions(use_albums_as_keywords=True), extension=ext + ) with open(sidecar, "w") as file: file.write(xmp) # keyword_template sidecar = str(pathlib.Path(SIDECAR_DIR) / f"{uuid}_keyword_template.xmp") - xmp = photo._xmp_sidecar( - keyword_template=["{created.year}", "{folder_album}"], extension=ext + xmp = exporter._xmp_sidecar( + ExportOptions(keyword_template=["{created.year}", "{folder_album}"]), + extension=ext, ) with open(sidecar, "w") as file: file.write(xmp) # generate JSON files sidecar = str(pathlib.Path(SIDECAR_DIR) / f"{uuid}.json") - json_ = photo._exiftool_json_sidecar() + json_ = exporter._exiftool_json_sidecar() with open(sidecar, "w") as file: file.write(json_) # no tag groups sidecar = str(pathlib.Path(SIDECAR_DIR) / f"{uuid}_no_tag_groups.json") - json_ = photo._exiftool_json_sidecar(tag_groups=False) + json_ = exporter._exiftool_json_sidecar(tag_groups=False) with open(sidecar, "w") as file: file.write(json_) # ignore_date_modified sidecar = str(pathlib.Path(SIDECAR_DIR) / f"{uuid}_ignore_date_modified.json") - json_ = photo._exiftool_json_sidecar(ignore_date_modified=True) + json_ = exporter._exiftool_json_sidecar( + ExportOptions(ignore_date_modified=True) + ) with open(sidecar, "w") as file: file.write(json_) # keyword_template sidecar = str(pathlib.Path(SIDECAR_DIR) / f"{uuid}_keyword_template.json") - json_ = photo._exiftool_json_sidecar(keyword_template=["{folder_album}"]) + json_ = exporter._exiftool_json_sidecar( + ExportOptions(keyword_template=["{folder_album}"]) + ) with open(sidecar, "w") as file: file.write(json_) # persons_as_keywords sidecar = str(pathlib.Path(SIDECAR_DIR) / f"{uuid}_persons_as_keywords.json") - json_ = photo._exiftool_json_sidecar(use_persons_as_keywords=True) + json_ = exporter._exiftool_json_sidecar( + ExportOptions(use_persons_as_keywords=True) + ) with open(sidecar, "w") as file: file.write(json_) # albums_as_keywords sidecar = str(pathlib.Path(SIDECAR_DIR) / f"{uuid}_albums_as_keywords.json") - json_ = photo._exiftool_json_sidecar(use_albums_as_keywords=True) + json_ = exporter._exiftool_json_sidecar( + ExportOptions(use_albums_as_keywords=True) + ) with open(sidecar, "w") as file: file.write(json_) diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.json b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.json index 601a4605..8dee9262 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.json +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "XMP:RegionAppliedToDimensionsW": 1365, "XMP:RegionAppliedToDimensionsH": 2048, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Katie"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.5832663178443909], "XMP:RegionAreaY": [0.27730926126241684], "XMP:RegionAreaW": [0.24365156888961792], "XMP:RegionAreaH": [0.16239472242887132], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp index 99935825..7ca34c51 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp @@ -52,6 +52,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 2048 + 1365 pixel diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.json b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.json index f6df6866..6ceed690 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.json +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:Subject": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:TagsList": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:Subject": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:TagsList": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:PersonInImage": ["Katie"], "XMP:RegionAppliedToDimensionsW": 1365, "XMP:RegionAppliedToDimensionsH": 2048, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Katie"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.5832663178443909], "XMP:RegionAreaY": [0.27730926126241684], "XMP:RegionAreaW": [0.24365156888961792], "XMP:RegionAreaH": [0.16239472242887132], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp index 2318c01e..ea040b00 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp @@ -58,6 +58,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 2048 + 1365 pixel diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp index 99935825..7ca34c51 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp @@ -52,6 +52,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 2048 + 1365 pixel diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ignore_date_modified.json b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ignore_date_modified.json index 601a4605..8dee9262 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ignore_date_modified.json +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ignore_date_modified.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "XMP:RegionAppliedToDimensionsW": 1365, "XMP:RegionAppliedToDimensionsH": 2048, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Katie"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.5832663178443909], "XMP:RegionAreaY": [0.27730926126241684], "XMP:RegionAreaW": [0.24365156888961792], "XMP:RegionAreaH": [0.16239472242887132], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.json b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.json index e3baa8ef..a63a7bbc 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.json +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:Subject": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:TagsList": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:Subject": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:TagsList": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:PersonInImage": ["Katie"], "XMP:RegionAppliedToDimensionsW": 1365, "XMP:RegionAppliedToDimensionsH": 2048, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Katie"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.5832663178443909], "XMP:RegionAreaY": [0.27730926126241684], "XMP:RegionAreaW": [0.24365156888961792], "XMP:RegionAreaH": [0.16239472242887132], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp index 9ee05df6..a211f565 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp @@ -60,6 +60,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 2048 + 1365 pixel diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_no_tag_groups.json b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_no_tag_groups.json index 1e2e5be2..52bf7222 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_no_tag_groups.json +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_no_tag_groups.json @@ -1 +1 @@ -[{"ImageDescription": "Girl holding pumpkin", "Description": "Girl holding pumpkin", "Caption-Abstract": "Girl holding pumpkin", "Title": "I found one!", "ObjectName": "I found one!", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie"], "DateTimeOriginal": "2018:09:28 16:07:07", "CreateDate": "2018:09:28 16:07:07", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "16:07:07-04:00", "ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file +[{"ImageDescription": "Girl holding pumpkin", "Description": "Girl holding pumpkin", "Caption-Abstract": "Girl holding pumpkin", "Title": "I found one!", "ObjectName": "I found one!", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie"], "RegionAppliedToDimensionsW": 1365, "RegionAppliedToDimensionsH": 2048, "RegionAppliedToDimensionsUnit": "pixel", "RegionName": ["Katie"], "RegionType": ["Face"], "RegionAreaX": [0.5832663178443909], "RegionAreaY": [0.27730926126241684], "RegionAreaW": [0.24365156888961792], "RegionAreaH": [0.16239472242887132], "RegionAreaUnit": ["normalized"], "RegionPersonDisplayName": ["Katie"], "DateTimeOriginal": "2018:09:28 16:07:07", "CreateDate": "2018:09:28 16:07:07", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "16:07:07-04:00", "ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.json b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.json index 64f31517..f9ff6492 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.json +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Katie", "Kids"], "XMP:Subject": ["Katie", "Kids"], "XMP:TagsList": ["Katie", "Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Katie", "Kids"], "XMP:Subject": ["Katie", "Kids"], "XMP:TagsList": ["Katie", "Kids"], "XMP:PersonInImage": ["Katie"], "XMP:RegionAppliedToDimensionsW": 1365, "XMP:RegionAppliedToDimensionsH": 2048, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Katie"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.5832663178443909], "XMP:RegionAreaY": [0.27730926126241684], "XMP:RegionAreaW": [0.24365156888961792], "XMP:RegionAreaH": [0.16239472242887132], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp index 7cea239e..029c22d9 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp @@ -54,6 +54,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 2048 + 1365 pixel diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.json b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.json index 8ce0b4cf..8bde019a 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.json +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "XMP:RegionAppliedToDimensionsW": 1526, "XMP:RegionAppliedToDimensionsH": 1325, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Maria"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.40229974687099457], "XMP:RegionAreaY": [0.41379398107528687], "XMP:RegionAreaW": [0.3420099108278517], "XMP:RegionAreaH": [0.39389216899871826], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}] \ No newline at end of file diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp index 496b4189..f96b728e 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp @@ -52,6 +52,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1325 + 1526 pixel diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.json b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.json index 8ce0b4cf..8bde019a 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.json +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "XMP:RegionAppliedToDimensionsW": 1526, "XMP:RegionAppliedToDimensionsH": 1325, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Maria"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.40229974687099457], "XMP:RegionAreaY": [0.41379398107528687], "XMP:RegionAreaW": [0.3420099108278517], "XMP:RegionAreaH": [0.39389216899871826], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}] \ No newline at end of file diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp index 496b4189..f96b728e 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp @@ -52,6 +52,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1325 + 1526 pixel diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp index 496b4189..f96b728e 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp @@ -52,6 +52,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1325 + 1526 pixel diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ignore_date_modified.json b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ignore_date_modified.json index c2c3ed52..b3fdb9bb 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ignore_date_modified.json +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ignore_date_modified.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:04:15 14:40:24"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "XMP:RegionAppliedToDimensionsW": 1526, "XMP:RegionAppliedToDimensionsH": 1325, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Maria"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.40229974687099457], "XMP:RegionAreaY": [0.41379398107528687], "XMP:RegionAreaW": [0.3420099108278517], "XMP:RegionAreaH": [0.39389216899871826], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:04:15 14:40:24"}] \ No newline at end of file diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.json b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.json index 8ce0b4cf..8bde019a 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.json +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "XMP:RegionAppliedToDimensionsW": 1526, "XMP:RegionAppliedToDimensionsH": 1325, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Maria"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.40229974687099457], "XMP:RegionAreaY": [0.41379398107528687], "XMP:RegionAreaW": [0.3420099108278517], "XMP:RegionAreaH": [0.39389216899871826], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}] \ No newline at end of file diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp index e8eca8dd..5e18d0c4 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp @@ -54,6 +54,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1325 + 1526 pixel diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_no_tag_groups.json b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_no_tag_groups.json index 32aacb63..656763e5 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_no_tag_groups.json +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_no_tag_groups.json @@ -1 +1 @@ -[{"ImageDescription": "Bride Wedding day", "Description": "Bride Wedding day", "Caption-Abstract": "Bride Wedding day", "Keywords": ["wedding"], "Subject": ["wedding"], "TagsList": ["wedding"], "PersonInImage": ["Maria"], "DateTimeOriginal": "2019:04:15 14:40:24", "CreateDate": "2019:04:15 14:40:24", "OffsetTimeOriginal": "-04:00", "DateCreated": "2019:04:15", "TimeCreated": "14:40:24-04:00", "ModifyDate": "2019:11:27 01:30:16"}] \ No newline at end of file +[{"ImageDescription": "Bride Wedding day", "Description": "Bride Wedding day", "Caption-Abstract": "Bride Wedding day", "Keywords": ["wedding"], "Subject": ["wedding"], "TagsList": ["wedding"], "PersonInImage": ["Maria"], "RegionAppliedToDimensionsW": 1526, "RegionAppliedToDimensionsH": 1325, "RegionAppliedToDimensionsUnit": "pixel", "RegionName": ["Maria"], "RegionType": ["Face"], "RegionAreaX": [0.40229974687099457], "RegionAreaY": [0.41379398107528687], "RegionAreaW": [0.3420099108278517], "RegionAreaH": [0.39389216899871826], "RegionAreaUnit": ["normalized"], "RegionPersonDisplayName": ["Maria"], "DateTimeOriginal": "2019:04:15 14:40:24", "CreateDate": "2019:04:15 14:40:24", "OffsetTimeOriginal": "-04:00", "DateCreated": "2019:04:15", "TimeCreated": "14:40:24-04:00", "ModifyDate": "2019:11:27 01:30:16"}] \ No newline at end of file diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.json b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.json index 4575ce63..7c63a5a2 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.json +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["Maria", "wedding"], "XMP:Subject": ["Maria", "wedding"], "XMP:TagsList": ["Maria", "wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["Maria", "wedding"], "XMP:Subject": ["Maria", "wedding"], "XMP:TagsList": ["Maria", "wedding"], "XMP:PersonInImage": ["Maria"], "XMP:RegionAppliedToDimensionsW": 1526, "XMP:RegionAppliedToDimensionsH": 1325, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Maria"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.40229974687099457], "XMP:RegionAreaY": [0.41379398107528687], "XMP:RegionAreaW": [0.3420099108278517], "XMP:RegionAreaH": [0.39389216899871826], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}] \ No newline at end of file diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp index 579025a3..64e04ab6 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp @@ -54,6 +54,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1325 + 1526 pixel diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.json b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.json index 315aadd2..d201750e 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.json +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie", "Suzy"], "XMP:RegionAppliedToDimensionsW": 2048, "XMP:RegionAppliedToDimensionsH": 1365, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Suzy", "Katie"], "XMP:RegionType": ["Face", "Face"], "XMP:RegionAreaX": [0.3097837567329407, 0.7126731872558595], "XMP:RegionAreaY": [0.33553561195731163, 0.4239872685185184], "XMP:RegionAreaW": [0.07461518356649322, 0.05], "XMP:RegionAreaH": [0.1119501069188118, 0.07501831501831502], "XMP:RegionAreaUnit": ["normalized", "normalized"], "XMP:RegionPersonDisplayName": ["Suzy", "Katie"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp index 75ec8cd2..e0114bbb 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp @@ -53,6 +53,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1365 + 2048 pixel diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.json b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.json index e5bb887b..5728edc6 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.json +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "XMP:RegionAppliedToDimensionsW": 2048, "XMP:RegionAppliedToDimensionsH": 1365, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Suzy", "Katie"], "XMP:RegionType": ["Face", "Face"], "XMP:RegionAreaX": [0.3097837567329407, 0.7126731872558595], "XMP:RegionAreaY": [0.33553561195731163, 0.4239872685185184], "XMP:RegionAreaW": [0.07461518356649322, 0.05], "XMP:RegionAreaH": [0.1119501069188118, 0.07501831501831502], "XMP:RegionAreaUnit": ["normalized", "normalized"], "XMP:RegionPersonDisplayName": ["Suzy", "Katie"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp index dd4a493b..4b244971 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp @@ -57,6 +57,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1365 + 2048 pixel diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp index 75ec8cd2..e0114bbb 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp @@ -53,6 +53,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1365 + 2048 pixel diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ignore_date_modified.json b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ignore_date_modified.json index 315aadd2..d201750e 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ignore_date_modified.json +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ignore_date_modified.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie", "Suzy"], "XMP:RegionAppliedToDimensionsW": 2048, "XMP:RegionAppliedToDimensionsH": 1365, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Suzy", "Katie"], "XMP:RegionType": ["Face", "Face"], "XMP:RegionAreaX": [0.3097837567329407, 0.7126731872558595], "XMP:RegionAreaY": [0.33553561195731163, 0.4239872685185184], "XMP:RegionAreaW": [0.07461518356649322, 0.05], "XMP:RegionAreaH": [0.1119501069188118, 0.07501831501831502], "XMP:RegionAreaUnit": ["normalized", "normalized"], "XMP:RegionPersonDisplayName": ["Suzy", "Katie"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.json b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.json index e5bb887b..5728edc6 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.json +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "XMP:RegionAppliedToDimensionsW": 2048, "XMP:RegionAppliedToDimensionsH": 1365, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Suzy", "Katie"], "XMP:RegionType": ["Face", "Face"], "XMP:RegionAreaX": [0.3097837567329407, 0.7126731872558595], "XMP:RegionAreaY": [0.33553561195731163, 0.4239872685185184], "XMP:RegionAreaW": [0.07461518356649322, 0.05], "XMP:RegionAreaH": [0.1119501069188118, 0.07501831501831502], "XMP:RegionAreaUnit": ["normalized", "normalized"], "XMP:RegionPersonDisplayName": ["Suzy", "Katie"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp index 104fa4f7..7ae16fe5 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp @@ -59,6 +59,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1365 + 2048 pixel diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_no_tag_groups.json b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_no_tag_groups.json index 130b3cd7..17721e1d 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_no_tag_groups.json +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_no_tag_groups.json @@ -1 +1 @@ -[{"ImageDescription": "Girls with pumpkins", "Description": "Girls with pumpkins", "Caption-Abstract": "Girls with pumpkins", "Title": "Can we carry this?", "ObjectName": "Can we carry this?", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie", "Suzy"], "DateTimeOriginal": "2018:09:28 15:35:49", "CreateDate": "2018:09:28 15:35:49", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "15:35:49-04:00", "ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file +[{"ImageDescription": "Girls with pumpkins", "Description": "Girls with pumpkins", "Caption-Abstract": "Girls with pumpkins", "Title": "Can we carry this?", "ObjectName": "Can we carry this?", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie", "Suzy"], "RegionAppliedToDimensionsW": 2048, "RegionAppliedToDimensionsH": 1365, "RegionAppliedToDimensionsUnit": "pixel", "RegionName": ["Suzy", "Katie"], "RegionType": ["Face", "Face"], "RegionAreaX": [0.3097837567329407, 0.7126731872558595], "RegionAreaY": [0.33553561195731163, 0.4239872685185184], "RegionAreaW": [0.07461518356649322, 0.05], "RegionAreaH": [0.1119501069188118, 0.07501831501831502], "RegionAreaUnit": ["normalized", "normalized"], "RegionPersonDisplayName": ["Suzy", "Katie"], "DateTimeOriginal": "2018:09:28 15:35:49", "CreateDate": "2018:09:28 15:35:49", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "15:35:49-04:00", "ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.json b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.json index 93ee46d1..2337c469 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.json +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Katie", "Kids", "Suzy"], "XMP:Subject": ["Katie", "Kids", "Suzy"], "XMP:TagsList": ["Katie", "Kids", "Suzy"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Katie", "Kids", "Suzy"], "XMP:Subject": ["Katie", "Kids", "Suzy"], "XMP:TagsList": ["Katie", "Kids", "Suzy"], "XMP:PersonInImage": ["Katie", "Suzy"], "XMP:RegionAppliedToDimensionsW": 2048, "XMP:RegionAppliedToDimensionsH": 1365, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Suzy", "Katie"], "XMP:RegionType": ["Face", "Face"], "XMP:RegionAreaX": [0.3097837567329407, 0.7126731872558595], "XMP:RegionAreaY": [0.33553561195731163, 0.4239872685185184], "XMP:RegionAreaW": [0.07461518356649322, 0.05], "XMP:RegionAreaH": [0.1119501069188118, 0.07501831501831502], "XMP:RegionAreaUnit": ["normalized", "normalized"], "XMP:RegionPersonDisplayName": ["Suzy", "Katie"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp index 00a50ad8..d1eb88e0 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp @@ -57,6 +57,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1365 + 2048 pixel diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.json b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.json index fed5921b..d7ccd41b 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.json +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:GPSLatitude": 41.256566, "EXIF:GPSLongitude": -95.940257, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "XMP:RegionAppliedToDimensionsW": 1365, "XMP:RegionAppliedToDimensionsH": 2048, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Katie"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.5898191407322884], "XMP:RegionAreaY": [0.28164292871952057], "XMP:RegionAreaW": [0.22411711513996124], "XMP:RegionAreaH": [0.14937493269826518], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Katie"], "EXIF:GPSLatitude": 41.256566, "EXIF:GPSLongitude": -95.940257, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.xmp b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.xmp index 6e6e4072..89b9632f 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.xmp +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.xmp @@ -54,6 +54,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 2048 + 1365 pixel diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.json b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.json index 463cc403..9c1e76bb 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.json +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie"], "EXIF:GPSLatitude": 41.256566, "EXIF:GPSLongitude": -95.940257, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie"], "XMP:RegionAppliedToDimensionsW": 1365, "XMP:RegionAppliedToDimensionsH": 2048, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Katie"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.5898191407322884], "XMP:RegionAreaY": [0.28164292871952057], "XMP:RegionAreaW": [0.22411711513996124], "XMP:RegionAreaH": [0.14937493269826518], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Katie"], "EXIF:GPSLatitude": 41.256566, "EXIF:GPSLongitude": -95.940257, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.xmp b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.xmp index 65c2bd8f..02f01a0c 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.xmp +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.xmp @@ -60,6 +60,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 2048 + 1365 pixel diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ext.xmp b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ext.xmp index 6e6e4072..89b9632f 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ext.xmp +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ext.xmp @@ -54,6 +54,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 2048 + 1365 pixel diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ignore_date_modified.json b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ignore_date_modified.json index fed5921b..d7ccd41b 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ignore_date_modified.json +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ignore_date_modified.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:GPSLatitude": 41.256566, "EXIF:GPSLongitude": -95.940257, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "XMP:RegionAppliedToDimensionsW": 1365, "XMP:RegionAppliedToDimensionsH": 2048, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Katie"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.5898191407322884], "XMP:RegionAreaY": [0.28164292871952057], "XMP:RegionAreaW": [0.22411711513996124], "XMP:RegionAreaH": [0.14937493269826518], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Katie"], "EXIF:GPSLatitude": 41.256566, "EXIF:GPSLongitude": -95.940257, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.json b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.json index 463cc403..9c1e76bb 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.json +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie"], "EXIF:GPSLatitude": 41.256566, "EXIF:GPSLongitude": -95.940257, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie"], "XMP:RegionAppliedToDimensionsW": 1365, "XMP:RegionAppliedToDimensionsH": 2048, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Katie"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.5898191407322884], "XMP:RegionAreaY": [0.28164292871952057], "XMP:RegionAreaW": [0.22411711513996124], "XMP:RegionAreaH": [0.14937493269826518], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Katie"], "EXIF:GPSLatitude": 41.256566, "EXIF:GPSLongitude": -95.940257, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.xmp b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.xmp index 82d1ccfe..19849276 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.xmp +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.xmp @@ -62,6 +62,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 2048 + 1365 pixel diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_no_tag_groups.json b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_no_tag_groups.json index 6b5ac850..6bc74c87 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_no_tag_groups.json +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_no_tag_groups.json @@ -1 +1 @@ -[{"ImageDescription": "Girl holding pumpkin", "Description": "Girl holding pumpkin", "Caption-Abstract": "Girl holding pumpkin", "Title": "I found one!", "ObjectName": "I found one!", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie"], "GPSLatitude": 41.256566, "GPSLongitude": -95.940257, "GPSLatitudeRef": "N", "GPSLongitudeRef": "W", "DateTimeOriginal": "2018:09:28 16:07:07", "CreateDate": "2018:09:28 16:07:07", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "16:07:07-04:00", "ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file +[{"ImageDescription": "Girl holding pumpkin", "Description": "Girl holding pumpkin", "Caption-Abstract": "Girl holding pumpkin", "Title": "I found one!", "ObjectName": "I found one!", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie"], "RegionAppliedToDimensionsW": 1365, "RegionAppliedToDimensionsH": 2048, "RegionAppliedToDimensionsUnit": "pixel", "RegionName": ["Katie"], "RegionType": ["Face"], "RegionAreaX": [0.5898191407322884], "RegionAreaY": [0.28164292871952057], "RegionAreaW": [0.22411711513996124], "RegionAreaH": [0.14937493269826518], "RegionAreaUnit": ["normalized"], "RegionPersonDisplayName": ["Katie"], "GPSLatitude": 41.256566, "GPSLongitude": -95.940257, "GPSLatitudeRef": "N", "GPSLongitudeRef": "W", "DateTimeOriginal": "2018:09:28 16:07:07", "CreateDate": "2018:09:28 16:07:07", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "16:07:07-04:00", "ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.json b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.json index b1c8e930..657fc660 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.json +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Katie", "Kids"], "XMP:Subject": ["Katie", "Kids"], "XMP:TagsList": ["Katie", "Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:GPSLatitude": 41.256566, "EXIF:GPSLongitude": -95.940257, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Katie", "Kids"], "XMP:Subject": ["Katie", "Kids"], "XMP:TagsList": ["Katie", "Kids"], "XMP:PersonInImage": ["Katie"], "XMP:RegionAppliedToDimensionsW": 1365, "XMP:RegionAppliedToDimensionsH": 2048, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Katie"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.5898191407322884], "XMP:RegionAreaY": [0.28164292871952057], "XMP:RegionAreaW": [0.22411711513996124], "XMP:RegionAreaH": [0.14937493269826518], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Katie"], "EXIF:GPSLatitude": 41.256566, "EXIF:GPSLongitude": -95.940257, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}] \ No newline at end of file diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.xmp b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.xmp index 5639af9f..1ce96742 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.xmp +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.xmp @@ -56,6 +56,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 2048 + 1365 pixel diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.json b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.json index 90a658c8..d8c74138 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.json +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["Maria", "wedding"], "XMP:Subject": ["Maria", "wedding"], "XMP:TagsList": ["Maria", "wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:07:27 17:33:28"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["Maria", "wedding"], "XMP:Subject": ["Maria", "wedding"], "XMP:TagsList": ["Maria", "wedding"], "XMP:PersonInImage": ["Maria"], "XMP:RegionAppliedToDimensionsW": 1526, "XMP:RegionAppliedToDimensionsH": 1325, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Maria"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.41222959756851196], "XMP:RegionAreaY": [0.4221687614917755], "XMP:RegionAreaW": [0.3333342373371124], "XMP:RegionAreaH": [0.3839004122086291], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:07:27 17:33:28"}] \ No newline at end of file diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.xmp b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.xmp index 664b0a7c..27c285cc 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.xmp +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.xmp @@ -54,6 +54,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1325 + 1526 pixel diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.json b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.json index 534c9977..49feb743 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.json +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["AlbumInFolder", "I have a deleted twin", "Maria", "Multi Keyword", "wedding"], "XMP:Subject": ["AlbumInFolder", "I have a deleted twin", "Maria", "Multi Keyword", "wedding"], "XMP:TagsList": ["AlbumInFolder", "I have a deleted twin", "Maria", "Multi Keyword", "wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:07:27 17:33:28"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["AlbumInFolder", "I have a deleted twin", "Maria", "Multi Keyword", "wedding"], "XMP:Subject": ["AlbumInFolder", "I have a deleted twin", "Maria", "Multi Keyword", "wedding"], "XMP:TagsList": ["AlbumInFolder", "I have a deleted twin", "Maria", "Multi Keyword", "wedding"], "XMP:PersonInImage": ["Maria"], "XMP:RegionAppliedToDimensionsW": 1526, "XMP:RegionAppliedToDimensionsH": 1325, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Maria"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.41222959756851196], "XMP:RegionAreaY": [0.4221687614917755], "XMP:RegionAreaW": [0.3333342373371124], "XMP:RegionAreaH": [0.3839004122086291], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:07:27 17:33:28"}] \ No newline at end of file diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.xmp b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.xmp index 09d38a88..5932176b 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.xmp +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.xmp @@ -60,6 +60,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1325 + 1526 pixel diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ext.xmp b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ext.xmp index 664b0a7c..27c285cc 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ext.xmp +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ext.xmp @@ -54,6 +54,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1325 + 1526 pixel diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ignore_date_modified.json b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ignore_date_modified.json index ad5be657..48816ce4 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ignore_date_modified.json +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ignore_date_modified.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["Maria", "wedding"], "XMP:Subject": ["Maria", "wedding"], "XMP:TagsList": ["Maria", "wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:04:15 14:40:24"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["Maria", "wedding"], "XMP:Subject": ["Maria", "wedding"], "XMP:TagsList": ["Maria", "wedding"], "XMP:PersonInImage": ["Maria"], "XMP:RegionAppliedToDimensionsW": 1526, "XMP:RegionAppliedToDimensionsH": 1325, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Maria"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.41222959756851196], "XMP:RegionAreaY": [0.4221687614917755], "XMP:RegionAreaW": [0.3333342373371124], "XMP:RegionAreaH": [0.3839004122086291], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:04:15 14:40:24"}] \ No newline at end of file diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.json b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.json index f3acb67e..8e75bfe2 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.json +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["Folder1/SubFolder2/AlbumInFolder", "I have a deleted twin", "Maria", "Multi Keyword", "wedding"], "XMP:Subject": ["Folder1/SubFolder2/AlbumInFolder", "I have a deleted twin", "Maria", "Multi Keyword", "wedding"], "XMP:TagsList": ["Folder1/SubFolder2/AlbumInFolder", "I have a deleted twin", "Maria", "Multi Keyword", "wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:07:27 17:33:28"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["Folder1/SubFolder2/AlbumInFolder", "I have a deleted twin", "Maria", "Multi Keyword", "wedding"], "XMP:Subject": ["Folder1/SubFolder2/AlbumInFolder", "I have a deleted twin", "Maria", "Multi Keyword", "wedding"], "XMP:TagsList": ["Folder1/SubFolder2/AlbumInFolder", "I have a deleted twin", "Maria", "Multi Keyword", "wedding"], "XMP:PersonInImage": ["Maria"], "XMP:RegionAppliedToDimensionsW": 1526, "XMP:RegionAppliedToDimensionsH": 1325, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Maria"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.41222959756851196], "XMP:RegionAreaY": [0.4221687614917755], "XMP:RegionAreaW": [0.3333342373371124], "XMP:RegionAreaH": [0.3839004122086291], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:07:27 17:33:28"}] \ No newline at end of file diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.xmp b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.xmp index 14fb8cad..d0560674 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.xmp +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.xmp @@ -62,6 +62,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1325 + 1526 pixel diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_no_tag_groups.json b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_no_tag_groups.json index 4a5b1967..9fe0a998 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_no_tag_groups.json +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_no_tag_groups.json @@ -1 +1 @@ -[{"ImageDescription": "Bride Wedding day", "Description": "Bride Wedding day", "Caption-Abstract": "Bride Wedding day", "Keywords": ["Maria", "wedding"], "Subject": ["Maria", "wedding"], "TagsList": ["Maria", "wedding"], "PersonInImage": ["Maria"], "DateTimeOriginal": "2019:04:15 14:40:24", "CreateDate": "2019:04:15 14:40:24", "OffsetTimeOriginal": "-04:00", "DateCreated": "2019:04:15", "TimeCreated": "14:40:24-04:00", "ModifyDate": "2019:07:27 17:33:28"}] \ No newline at end of file +[{"ImageDescription": "Bride Wedding day", "Description": "Bride Wedding day", "Caption-Abstract": "Bride Wedding day", "Keywords": ["Maria", "wedding"], "Subject": ["Maria", "wedding"], "TagsList": ["Maria", "wedding"], "PersonInImage": ["Maria"], "RegionAppliedToDimensionsW": 1526, "RegionAppliedToDimensionsH": 1325, "RegionAppliedToDimensionsUnit": "pixel", "RegionName": ["Maria"], "RegionType": ["Face"], "RegionAreaX": [0.41222959756851196], "RegionAreaY": [0.4221687614917755], "RegionAreaW": [0.3333342373371124], "RegionAreaH": [0.3839004122086291], "RegionAreaUnit": ["normalized"], "RegionPersonDisplayName": ["Maria"], "DateTimeOriginal": "2019:04:15 14:40:24", "CreateDate": "2019:04:15 14:40:24", "OffsetTimeOriginal": "-04:00", "DateCreated": "2019:04:15", "TimeCreated": "14:40:24-04:00", "ModifyDate": "2019:07:27 17:33:28"}] \ No newline at end of file diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.json b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.json index 90a658c8..d8c74138 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.json +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["Maria", "wedding"], "XMP:Subject": ["Maria", "wedding"], "XMP:TagsList": ["Maria", "wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:07:27 17:33:28"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["Maria", "wedding"], "XMP:Subject": ["Maria", "wedding"], "XMP:TagsList": ["Maria", "wedding"], "XMP:PersonInImage": ["Maria"], "XMP:RegionAppliedToDimensionsW": 1526, "XMP:RegionAppliedToDimensionsH": 1325, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Maria"], "XMP:RegionType": ["Face"], "XMP:RegionAreaX": [0.41222959756851196], "XMP:RegionAreaY": [0.4221687614917755], "XMP:RegionAreaW": [0.3333342373371124], "XMP:RegionAreaH": [0.3839004122086291], "XMP:RegionAreaUnit": ["normalized"], "XMP:RegionPersonDisplayName": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:07:27 17:33:28"}] \ No newline at end of file diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.xmp b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.xmp index 664b0a7c..27c285cc 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.xmp +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.xmp @@ -54,6 +54,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1325 + 1526 pixel diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.json b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.json index 315aadd2..fcb3ad0b 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.json +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie", "Suzy"], "XMP:RegionAppliedToDimensionsW": 2048, "XMP:RegionAppliedToDimensionsH": 1365, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Suzy", "Katie"], "XMP:RegionType": ["Face", "Face"], "XMP:RegionAreaX": [0.3205035626888275, 0.7158178221434355], "XMP:RegionAreaY": [0.33566537871956825, 0.4209024980664253], "XMP:RegionAreaW": [0.07409769326841342, 0.06201007632625988], "XMP:RegionAreaH": [0.11117368191480637, 0.09303782880306244], "XMP:RegionAreaUnit": ["normalized", "normalized"], "XMP:RegionPersonDisplayName": ["Suzy", "Katie"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.xmp b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.xmp index 6556bb68..60d80afb 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.xmp +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.xmp @@ -53,6 +53,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1365 + 2048 pixel diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.json b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.json index bee366b0..97fc48d5 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.json +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "XMP:RegionAppliedToDimensionsW": 2048, "XMP:RegionAppliedToDimensionsH": 1365, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Suzy", "Katie"], "XMP:RegionType": ["Face", "Face"], "XMP:RegionAreaX": [0.3205035626888275, 0.7158178221434355], "XMP:RegionAreaY": [0.33566537871956825, 0.4209024980664253], "XMP:RegionAreaW": [0.07409769326841342, 0.06201007632625988], "XMP:RegionAreaH": [0.11117368191480637, 0.09303782880306244], "XMP:RegionAreaUnit": ["normalized", "normalized"], "XMP:RegionPersonDisplayName": ["Suzy", "Katie"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.xmp b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.xmp index 728bf135..2028753c 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.xmp +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.xmp @@ -65,6 +65,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1365 + 2048 pixel diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ext.xmp b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ext.xmp index 6556bb68..60d80afb 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ext.xmp +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ext.xmp @@ -53,6 +53,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1365 + 2048 pixel diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ignore_date_modified.json b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ignore_date_modified.json index 315aadd2..fcb3ad0b 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ignore_date_modified.json +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ignore_date_modified.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie", "Suzy"], "XMP:RegionAppliedToDimensionsW": 2048, "XMP:RegionAppliedToDimensionsH": 1365, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Suzy", "Katie"], "XMP:RegionType": ["Face", "Face"], "XMP:RegionAreaX": [0.3205035626888275, 0.7158178221434355], "XMP:RegionAreaY": [0.33566537871956825, 0.4209024980664253], "XMP:RegionAreaW": [0.07409769326841342, 0.06201007632625988], "XMP:RegionAreaH": [0.11117368191480637, 0.09303782880306244], "XMP:RegionAreaUnit": ["normalized", "normalized"], "XMP:RegionPersonDisplayName": ["Suzy", "Katie"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.json b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.json index bee366b0..97fc48d5 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.json +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "XMP:RegionAppliedToDimensionsW": 2048, "XMP:RegionAppliedToDimensionsH": 1365, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Suzy", "Katie"], "XMP:RegionType": ["Face", "Face"], "XMP:RegionAreaX": [0.3205035626888275, 0.7158178221434355], "XMP:RegionAreaY": [0.33566537871956825, 0.4209024980664253], "XMP:RegionAreaW": [0.07409769326841342, 0.06201007632625988], "XMP:RegionAreaH": [0.11117368191480637, 0.09303782880306244], "XMP:RegionAreaUnit": ["normalized", "normalized"], "XMP:RegionPersonDisplayName": ["Suzy", "Katie"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.xmp b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.xmp index ad97e68c..bd20b1d2 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.xmp +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.xmp @@ -67,6 +67,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1365 + 2048 pixel diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_no_tag_groups.json b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_no_tag_groups.json index 130b3cd7..e8ce5d72 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_no_tag_groups.json +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_no_tag_groups.json @@ -1 +1 @@ -[{"ImageDescription": "Girls with pumpkins", "Description": "Girls with pumpkins", "Caption-Abstract": "Girls with pumpkins", "Title": "Can we carry this?", "ObjectName": "Can we carry this?", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie", "Suzy"], "DateTimeOriginal": "2018:09:28 15:35:49", "CreateDate": "2018:09:28 15:35:49", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "15:35:49-04:00", "ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file +[{"ImageDescription": "Girls with pumpkins", "Description": "Girls with pumpkins", "Caption-Abstract": "Girls with pumpkins", "Title": "Can we carry this?", "ObjectName": "Can we carry this?", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie", "Suzy"], "RegionAppliedToDimensionsW": 2048, "RegionAppliedToDimensionsH": 1365, "RegionAppliedToDimensionsUnit": "pixel", "RegionName": ["Suzy", "Katie"], "RegionType": ["Face", "Face"], "RegionAreaX": [0.3205035626888275, 0.7158178221434355], "RegionAreaY": [0.33566537871956825, 0.4209024980664253], "RegionAreaW": [0.07409769326841342, 0.06201007632625988], "RegionAreaH": [0.11117368191480637, 0.09303782880306244], "RegionAreaUnit": ["normalized", "normalized"], "RegionPersonDisplayName": ["Suzy", "Katie"], "DateTimeOriginal": "2018:09:28 15:35:49", "CreateDate": "2018:09:28 15:35:49", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "15:35:49-04:00", "ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.json b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.json index 93ee46d1..b931211c 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.json +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.json @@ -1 +1 @@ -[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Katie", "Kids", "Suzy"], "XMP:Subject": ["Katie", "Kids", "Suzy"], "XMP:TagsList": ["Katie", "Kids", "Suzy"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file +[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Katie", "Kids", "Suzy"], "XMP:Subject": ["Katie", "Kids", "Suzy"], "XMP:TagsList": ["Katie", "Kids", "Suzy"], "XMP:PersonInImage": ["Katie", "Suzy"], "XMP:RegionAppliedToDimensionsW": 2048, "XMP:RegionAppliedToDimensionsH": 1365, "XMP:RegionAppliedToDimensionsUnit": "pixel", "XMP:RegionName": ["Suzy", "Katie"], "XMP:RegionType": ["Face", "Face"], "XMP:RegionAreaX": [0.3205035626888275, 0.7158178221434355], "XMP:RegionAreaY": [0.33566537871956825, 0.4209024980664253], "XMP:RegionAreaW": [0.07409769326841342, 0.06201007632625988], "XMP:RegionAreaH": [0.11117368191480637, 0.09303782880306244], "XMP:RegionAreaUnit": ["normalized", "normalized"], "XMP:RegionPersonDisplayName": ["Suzy", "Katie"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}] \ No newline at end of file diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.xmp b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.xmp index c6ae5c58..b3a77667 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.xmp +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.xmp @@ -57,6 +57,8 @@ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"> + 1365 + 2048 pixel diff --git a/tests/test_cli.py b/tests/test_cli.py index aa513fc1..d7717c02 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -4738,29 +4738,74 @@ def test_export_sidecar_keyword_template(): json_expected = json.loads( """ - [{"SourceFile": "Pumkins2.jpg", - "ExifTool:ExifToolVersion": "12.00", - "File:FileName": "Pumkins2.jpg", - "EXIF:ImageDescription": "Girl holding pumpkin", - "IPTC:Caption-Abstract": "Girl holding pumpkin", - "XMP:Description": "Girl holding pumpkin", - "XMP:Title": "I found one!", - "IPTC:ObjectName": "I found one!", - "XMP:TagsList": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], - "IPTC:Keywords": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], - "XMP:PersonInImage": ["Katie"], - "XMP:Subject": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], - "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", - "EXIF:CreateDate": "2018:09:28 16:07:07", - "EXIF:OffsetTimeOriginal": "-04:00", - "IPTC:DateCreated": "2018:09:28", - "IPTC:TimeCreated": "16:07:07-04:00", - "EXIF:ModifyDate": "2018:09:28 16:07:07", - "EXIF:GPSLatitude": 41.256566, - "EXIF:GPSLongitude": -95.940257, - "EXIF:GPSLatitudeRef": "N", - "EXIF:GPSLongitudeRef": "W"}] - """ + [{ + "SourceFile": "Pumkins2.jpg", + "ExifTool:ExifToolVersion": "12.00", + "File:FileName": "Pumkins2.jpg", + "EXIF:ImageDescription": "Girl holding pumpkin", + "XMP:Description": "Girl holding pumpkin", + "IPTC:Caption-Abstract": "Girl holding pumpkin", + "XMP:Title": "I found one!", + "IPTC:ObjectName": "I found one!", + "IPTC:Keywords": [ + "Kids", + "Multi Keyword", + "Pumpkin Farm", + "Test Album" + ], + "XMP:Subject": [ + "Kids", + "Multi Keyword", + "Pumpkin Farm", + "Test Album" + ], + "XMP:TagsList": [ + "Kids", + "Multi Keyword", + "Pumpkin Farm", + "Test Album" + ], + "XMP:PersonInImage": [ + "Katie" + ], + "XMP:RegionAppliedToDimensionsW": 1365, + "XMP:RegionAppliedToDimensionsH": 2048, + "XMP:RegionAppliedToDimensionsUnit": "pixel", + "XMP:RegionName": [ + "Katie" + ], + "XMP:RegionType": [ + "Face" + ], + "XMP:RegionAreaX": [ + 0.5898191407322884 + ], + "XMP:RegionAreaY": [ + 0.28164292871952057 + ], + "XMP:RegionAreaW": [ + 0.22411711513996124 + ], + "XMP:RegionAreaH": [ + 0.14937493269826518 + ], + "XMP:RegionAreaUnit": [ + "normalized" + ], + "XMP:RegionPersonDisplayName": [ + "Katie" + ], + "EXIF:GPSLatitude": 41.256566, + "EXIF:GPSLongitude": -95.940257, + "EXIF:GPSLatitudeRef": "N", + "EXIF:GPSLongitudeRef": "W", + "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", + "EXIF:CreateDate": "2018:09:28 16:07:07", + "EXIF:OffsetTimeOriginal": "-04:00", + "IPTC:DateCreated": "2018:09:28", + "IPTC:TimeCreated": "16:07:07-04:00", + "EXIF:ModifyDate": "2018:09:28 16:07:07" + }]""" )[0] with open("Pumkins2.jpg.json", "r") as json_file: diff --git a/tests/test_export_catalina_10_15_7.py b/tests/test_export_catalina_10_15_7.py index 89d3daf4..7114d366 100644 --- a/tests/test_export_catalina_10_15_7.py +++ b/tests/test_export_catalina_10_15_7.py @@ -462,23 +462,12 @@ def test_exiftool_json_sidecar_keyword_template_long(capsys, photosdb): assert "some keywords exceed max IPTC Keyword length" in captured.out # some gymnastics to account for different sort order in different pythons - for k, v in json_got.items(): - if type(v) in (list, tuple): - assert sorted(json_expected[k]) == sorted(v) - else: - assert json_expected[k] == v - for k, v in json_expected.items(): if type(v) in (list, tuple): assert sorted(json_got[k]) == sorted(v) else: assert json_got[k] == v - for k, v in json_expected.items(): - if type(v) in (list, tuple): - assert sorted(json_got[k]) == sorted(v) - else: - assert json_got[k] == v def test_exiftool_json_sidecar_keyword_template(photosdb): diff --git a/tests/test_template.py b/tests/test_template.py index cd873257..2a3ea5e6 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -332,6 +332,7 @@ UUID_CONDITIONAL = { "{photo.score.overall >= 0.7?YES,NO}": ["NO"], "{photo.score.overall not < 0.7?YES,NO}": ["NO"], "{folder_album(-) contains Folder1-SubFolder2-AlbumInFolder?YES,NO}": ["YES"], + "{folder_album( - ) contains Folder1 - SubFolder2 - AlbumInFolder?YES,NO}": ["YES"], "{folder_album(-)[In,] contains Folder1-SubFolder2-AlbumFolder?YES,NO}": [ "YES" ],