diff --git a/README.md b/README.md index ee0c11fd..0e5134d9 100644 --- a/README.md +++ b/README.md @@ -1704,7 +1704,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.42.94' +{osxphotos_version} The osxphotos version, e.g. '0.43.0' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified for @@ -3271,7 +3271,6 @@ The following additional properties are also available but are not yet fully doc - `manual`: - `face_type`: - `age_type`: -- `bald_type`: - `eye_makeup_type`: - `eye_state`: - `facial_hair_type`: @@ -3575,7 +3574,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.42.94'| +|{osxphotos_version}|The osxphotos version, e.g. '0.43.0'| |{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/osxphotos/_version.py b/osxphotos/_version.py index 0c54375f..abbd5ab1 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.42.94" +__version__ = "0.43.0" diff --git a/osxphotos/personinfo.py b/osxphotos/personinfo.py index a6148d20..bf631f2b 100644 --- a/osxphotos/personinfo.py +++ b/osxphotos/personinfo.py @@ -141,7 +141,7 @@ class FaceInfo: self.manual = face["manual"] self.face_type = face["facetype"] self.age_type = face["agetype"] - self.bald_type = face["baldtype"] + # self.bald_type = face["baldtype"] self.eye_makeup_type = face["eyemakeuptype"] self.eye_state = face["eyestate"] self.facial_hair_type = face["facialhairtype"] @@ -438,7 +438,7 @@ class FaceInfo: "manual": self.manual, "face_type": self.face_type, "age_type": self.age_type, - "bald_type": self.bald_type, + # "bald_type": self.bald_type, "eye_makeup_type": self.eye_makeup_type, "eye_state": self.eye_state, "facial_hair_type": self.facial_hair_type, diff --git a/osxphotos/photosdb/_photosdb_process_faceinfo.py b/osxphotos/photosdb/_photosdb_process_faceinfo.py index 7f386f64..fbd1dece 100644 --- a/osxphotos/photosdb/_photosdb_process_faceinfo.py +++ b/osxphotos/photosdb/_photosdb_process_faceinfo.py @@ -146,7 +146,6 @@ def _process_faceinfo_4(photosdb): # Photos 5 only face["agetype"] = None - face["baldtype"] = None face["eyemakeuptype"] = None face["eyestate"] = None face["facialhairtype"] = None @@ -194,7 +193,7 @@ def _process_faceinfo_5(photosdb): ZDETECTEDFACE.ZPERSON, ZPERSON.ZFULLNAME, ZDETECTEDFACE.ZAGETYPE, - ZDETECTEDFACE.ZBALDTYPE, + NULL, -- ZDETECTEDFACE.ZBALDTYPE (Removed in Monterey) ZDETECTEDFACE.ZEYEMAKEUPTYPE, ZDETECTEDFACE.ZEYESSTATE, ZDETECTEDFACE.ZFACIALHAIRTYPE, @@ -239,7 +238,7 @@ def _process_faceinfo_5(photosdb): # 3 ZDETECTEDFACE.ZPERSON, # 4 ZPERSON.ZFULLNAME, # 5 ZDETECTEDFACE.ZAGETYPE, - # 6 ZDETECTEDFACE.ZBALDTYPE, + # 6 ZDETECTEDFACE.ZBALDTYPE, (Not available on Monterey) # 7 ZDETECTEDFACE.ZEYEMAKEUPTYPE, # 8 ZDETECTEDFACE.ZEYESSTATE, # 9 ZDETECTEDFACE.ZFACIALHAIRTYPE, @@ -284,7 +283,6 @@ def _process_faceinfo_5(photosdb): face["person"] = person_pk face["fullname"] = normalize_unicode(row[4]) face["agetype"] = row[5] - face["baldtype"] = row[6] face["eyemakeuptype"] = row[7] face["eyestate"] = row[8] face["facialhairtype"] = row[9] diff --git a/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite b/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite index b283e77c..84eb7ef8 100644 Binary files a/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite and b/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite differ diff --git a/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite-shm b/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite-shm index eda9a66a..fe9ac284 100644 Binary files a/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite-shm and b/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite-shm differ diff --git a/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite-wal b/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite-wal index be542c0f..e69de29b 100644 Binary files a/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite-wal and b/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite-wal differ diff --git a/tests/test_faceinfo.py b/tests/test_faceinfo.py index 5e5b8f4d..5e34a2df 100644 --- a/tests/test_faceinfo.py +++ b/tests/test_faceinfo.py @@ -58,7 +58,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 1, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -120,7 +119,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 1, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -182,7 +180,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 0, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -244,7 +241,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 1, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -306,7 +302,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 0, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -368,7 +363,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 1, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -430,7 +424,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 0, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -492,7 +485,6 @@ UUID_LIST_4 = [ "manual": 1, "face_type": 2, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -554,7 +546,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 0, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -616,7 +607,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 2, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -678,7 +668,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 1, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -740,7 +729,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 1, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -802,7 +790,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 0, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -864,7 +851,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 2, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -926,7 +912,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 2, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -988,7 +973,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 0, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -1050,7 +1034,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 1, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -1108,7 +1091,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 1, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -1170,7 +1152,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 2, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -1232,7 +1213,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 0, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -1294,7 +1274,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 1, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -1356,7 +1335,6 @@ UUID_LIST_4 = [ "manual": 0, "face_type": 0, "age_type": None, - "bald_type": None, "eye_makeup_type": None, "eye_state": None, "facial_hair_type": None, @@ -1421,7 +1399,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 3, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 1, @@ -1483,7 +1460,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 5, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 2, @@ -1545,7 +1521,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -1603,7 +1578,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -1665,7 +1639,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 3, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 1, @@ -1727,7 +1700,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 3, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 1, "facial_hair_type": 1, @@ -1789,7 +1761,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -1851,7 +1822,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 3, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 1, @@ -1913,7 +1883,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -1975,7 +1944,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 3, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 1, @@ -2037,7 +2005,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -2099,7 +2066,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 5, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 2, @@ -2161,7 +2127,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -2219,7 +2184,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -2281,7 +2245,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 2, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 1, @@ -2343,7 +2306,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -2405,7 +2367,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -2463,7 +2424,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -2525,7 +2485,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -2587,7 +2546,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -2645,7 +2603,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -2707,7 +2664,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 5, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 1, @@ -2769,7 +2725,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 3, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 1, @@ -2831,7 +2786,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -2893,7 +2847,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -2951,7 +2904,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -3013,7 +2965,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -3075,7 +3026,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -3133,7 +3083,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -3195,7 +3144,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -3257,7 +3205,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -3315,7 +3262,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -3377,7 +3323,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -3435,7 +3380,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -3497,7 +3441,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 3, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 1, @@ -3559,7 +3502,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 5, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 3, @@ -3621,7 +3563,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -3679,7 +3620,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -3741,7 +3681,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -3803,7 +3742,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 3, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 1, @@ -3865,7 +3803,6 @@ UUID_LIST_5 = [ "manual": 1, "face_type": None, "age_type": 0, - "bald_type": 0, "eye_makeup_type": 0, "eye_state": 0, "facial_hair_type": 0, @@ -3927,7 +3864,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 5, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 1, @@ -3985,7 +3921,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 4, - "bald_type": 2, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 2, @@ -4047,7 +3982,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 5, - "bald_type": 2, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 2, @@ -4109,7 +4043,6 @@ UUID_LIST_5 = [ "manual": 0, "face_type": None, "age_type": 3, - "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 1,