From 21e7020fec406b0f3926d7adc8a1451bfe77e75a Mon Sep 17 00:00:00 2001
From: Rhet Turnbull <rturnbull+git@gmail.com>
Date: Sun, 12 Apr 2020 14:52:35 -0700
Subject: [PATCH] Test library update

---
 osxphotos/template.py                         |  21 ++++++++++++------
 .../database/Photos.sqlite                    | Bin 2097152 -> 2097152 bytes
 .../database/Photos.sqlite-shm                | Bin 32768 -> 32768 bytes
 .../database/Photos.sqlite-wal                | Bin 57712 -> 4152 bytes
 .../database/Photos.sqlite.lock               |   2 +-
 .../database/search/psi.sqlite                | Bin 147456 -> 147456 bytes
 .../database/search/psi.sqlite-shm            | Bin 32768 -> 32768 bytes
 .../MediaAnalysis/mediaanalysis.db            | Bin 69632 -> 69632 bytes
 .../MediaAnalysis/mediaanalysis.db-shm        | Bin 32768 -> 32768 bytes
 .../CLSBusinessCategoryCache.POI.sqlite-shm   | Bin 32768 -> 32768 bytes
 .../CLSBusinessCategoryCache.POI.sqlite-wal   | Bin 2958192 -> 3028232 bytes
 .../caches/graph/CLSContactCache.sqlite-shm   | Bin 32768 -> 32768 bytes
 .../caches/graph/CLSContactCache.sqlite-wal   | Bin 2245432 -> 2253672 bytes
 .../caches/graph/CLSLocationCache.sqlite-shm  | Bin 32768 -> 32768 bytes
 .../caches/graph/CLSLocationCache.sqlite-wal  | Bin 3654472 -> 4066472 bytes
 .../graph/PGCurationCache.sqlite.sqlite-shm   | Bin 32768 -> 32768 bytes
 .../graph/PGCurationCache.sqlite.sqlite-wal   | Bin 193672 -> 181312 bytes
 .../PhotoAnalysisServicePreferences.plist     |  20 ++++++++---------
 .../caches/graph/PhotosGraph/photosgraph.kgdb | Bin 512000 -> 512000 bytes
 .../caches/graph/changetoken.plist            | Bin 605 -> 605 bytes
 .../PhotoAnalysisServicePreferences.plist     |   4 ++--
 .../caches/vision/vnpersonsmodel.bin          | Bin 7631 -> 7631 bytes
 22 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/osxphotos/template.py b/osxphotos/template.py
index d8a8a46c..1de4d96f 100644
--- a/osxphotos/template.py
+++ b/osxphotos/template.py
@@ -10,6 +10,7 @@
 # This code isn't elegant but it seems to work well.  PRs gladly accepted.
 
 import datetime
+import os
 import pathlib
 import re
 from typing import Tuple, List  # pylint: disable=syntax-error
@@ -55,7 +56,7 @@ TEMPLATE_SUBSTITUTIONS = {
 # Permitted multi-value substitutions (each of these returns None or 1 or more values)
 TEMPLATE_SUBSTITUTIONS_MULTI_VALUED = {
     "{album}": "Album(s) photo is contained in",
-    # "{folder}": "Folder path + album photo is contained in. e.g. Folder/Subfolder/Album",
+    "{folder_album}": "Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder",
     "{keyword}": "Keyword(s) assigned to photo",
     "{person}": "Person(s) / face(s) in a photo",
 }
@@ -322,12 +323,18 @@ def render_filepath_template(template, photo, none_str="_"):
             values = photo.persons
             # remove any _UNKNOWN_PERSON values
             values = [val for val in values if val != _UNKNOWN_PERSON]
-        # elif field == "folder":
-        #     folders = []
-        #     # photos must be in an album to be in a folder
-        #     albums = photo.albums
-        #     for album in albums:
-        #         zzz
+        elif field == "folder_album":
+            values = []
+            # photos must be in an album to be in a folder
+            for album in photo.album_info:
+                if album.folder_names:
+                    # album in folder
+                    folder = os.path.sep.join(album.folder_names)
+                    folder += os.path.sep + album.title
+                    values.append(folder)
+                else:
+                    # album not in folder
+                    values.append(album.title)
 
         else:
             raise ValueError(f"Unhandleded template value: {field}")
diff --git a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite
index f92fca084e6c9637e81dff8e2fad2cab471a70d3..941943588f1a3bac6cb760c42c4512e2043205bf 100644
GIT binary patch
delta 745
zcmZwDPe>F|90%}uZ)Wz*>YJI}+D&)&>1t+Bdr8A3F|2hrQV6qB$_^zR3fY4`JoM+%
zt{NMJV2Hhw5}mpP4HC}~b@ifz5p(F!!B!(Yb%_35Lh3gz-Fooh$D8l`X5RbdaygU(
zlQGosn59uie&E3XdNqLGUqRI(*^m1|tM#Gr%(2g>cD^Xys=v09%?SQ3a-^`{kL7y5
zI<$<Y#fgYEilkVGXuD`izK&`s1l!*+Z5v6s$)KQlv0SSapq!0sBS;n&;u_F_4-jAg
zKd1neav@H;dQ@JK5oDNd<BE*qUiF()B`D>c>CDT!Twb_G=X8~u8-nEE9dpBRKT%P<
zZfS^1cY+?r5Dp45>4k%id!LG-8LC4FW!ej~f;^?0x|y|_%(-B0l=^fPp-wLO3p(|m
z?!|KVV!4|OQlur#<kr077RtR<T;6_5Cl0Dy)dcwpe^xcejp91SEd?tG7TFtR`)HNk
zss6hR8x}o3Xjry>r!}47WN;VjN`rxVFQ&RLrP94!=exPcwwcZ7VPUq-1QxJC00hB4
zupfj#7#sjqpc+I#6vX6g8@m}&(<C8D4;#Z8X(kEBozX0xiZI8?a%qvRm)ZKAN*hjW
zHY#SLRqeP>kbLH{u}YjD7J(9riNGQYi_;}mV;lNf(MbI=6umFLR>UG(V$()`1fNs<
z$PmFLc1UDCvNsys`<pPASfr3BF;D|)Wug@S5C{_cuww7ntM+sIk$uZf+p=kk{xqB|
x<~tc3Pns}0zu%AQyxFzqxmOhUAX4hbTlPX2>{0Jwd%i(0$KI|^-1rlp{R<>U;i>=t

delta 531
zcmZ9}KWGzi6bJD8{qEu=%`bO7O>8dtwTDpz=^%=TF@p^)XhCYKEt;ifGDC-4=umOG
zSmi(|X%KxlSj5Ri%6ZC93H|331koEhbf{^Tg3zJRZc_9GHy?a>yf2TpJjZc}gBH?c
zsKJNHP_6X1L_U`2#vRfJ7mIW<zW)B8zI=M=%FeFTtrJu0(<4y*Zk};lMJifFxw1+c
zaLH625+9nTa!Bgpb4tk*9Dk>k4)Mhn$3{ND>VV>6yJ{&j#CMyPf<ovBQc)O1P!EcV
zro~1JvfVQds?9o(`C*yfb|E6hA22^8+pz#thjqN*7lXCCnj$vl*;$Ht1=NLZ?lMt%
z#h!PgDyXm7maLtN`G)g^iRwG{?Elr}f2*^guCX@NK6yc%iP>*#J|o+52GqUo&C8T>
z8wv+3A+r0d|61aLaY#eb$uOC?nIF5AAD$S!F=oSbE_R+gau;(kq#+&kA_E;o$50$4
z&~em<lE_3UlopFQelITP)vQnpe2#j-k|MIVdFy@@pFp*wq-$Ez3tkZMCg5|?#`b==
zHbbvV5fTPtg`a|vpZu#_s}Nu-Jmn6yIqF9PVz6y(_G%%$Ea^M?7yYgNR4@C+-lPuY
HKi12?&zrtL

diff --git a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-shm b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-shm
index acedbc37001317547af9e0feb629af2cab22dbe6..7e4321bd8c66721316bfe47fc7d4db3b86a6d9a3 100644
GIT binary patch
delta 162
zcmZo@U}|V!s+V}A%K!q55G(+q8JHLtF0C_oP|0gCtMGKv7D3s&GjBMHOto1n`<GPp
pAmcy)WbS_?02X9m;DXW&3{D#lPPX58A%S)Cmck_*8!tRC1OU(EF~<M^

delta 284
zcmZo@U}|V!s+V}A%K!t63=9H%APy4)!zw3rCo{g*1tv4p>NfaTB-vOBX?{-Ib&yo`
zFtb7C{zn2(aeD@^g+QJf5T5|zlR$h5h))CY86Z9j#20}03J_ld;*UUl4CvBxK+M3j
zapE+4My`z$<@p$SHcnj0#K^sIVjwFcQ2Z|wBQuy}0h6p?k_}9<Pn`Idk$2<7-|UPW
b8z%-cZ?17&!okS7apH1DM!t;`|1$#sW8X~a

diff --git a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-wal b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-wal
index f6f937c921243d69b8881b4c1b4300cb055bd2a2..9b8adabb3b6a0d6acfbe8e07038d9aced039d4f9 100644
GIT binary patch
literal 4152
zcmeHI&1+Ow6u<AonRzdn$p{TKia7WPbkW<~_wM_+uM3m=2^OJ?5_c^nnnfYaB*8+{
zQY5j93gSXaMgIYJ>cWNYMnqf~gLJEfw&K4bJ@-v#7GorZ1`1^kyvw^6-aY5{an36)
z*0vG;^9Vw1WMlp5(!ImSf4gz{^zM%@T8}=4BY}`RJpY~C{`DqnZZ^XJg+b^{)F<yw
z9i7+>t~PH?U2R<p!thFU(Rdj%FlJ!Pz?gwC17ilp4E%2y*m8mokmEWH2-krK8jcGO
zLJm9-u-5B!G`ooA&@bMTp6`0@!jqooMh)J(^W~fE=db5q(JEm7dH7R%>9ggvPQpIy
zBqU~33LSG!ahAstr-F0Lv@)0oqgbK1&^*~ZWJ|CWG#ZZ6a2i4NR%M5Z{w`tqeOtnP
z-*sIt@*<x<OfKzAxRdiQcWgWx>>+E(*EYUdQB*0G7=xuT1x^_$urOtUGr~;FawT=b
zCcZ_NDwzM>vKd<R6=V<~044SmV8){V+4AqUfqpMKGyptG0D$krnGm|5T%?#uOMIDU
zK)e)~YQa(|6fI5Gbs#k;4)Lzke%(iw__->x51H#x{p9ZTKjxqJDYNgNe6!L?i4u|+
zDRCmw5|maHa|OcFTxt;uLo$_3o<e62p6OM8#6Ojr`}VD}IgSq&o*w$g_o52I9?pr2
zRBBQfaEZ)tnlOdAwNF`?RB1(vQYB4{*1@M$yu+_R+qBJh(b^Rli~Lc}tWANpO_?S}
z3!$*c5^yQWB^F6s;FuH{H=q=udFy+31mWHta%_mO7S$q;_a3|#E_5Cbq#EpPUw(S-
zLU(C-BhyOeL={+xBDOtJVnH*B6)9<)Gr>e^S}FQ&AGk0fs`jkl9$a^Bg|&SR3aMvi
z7iZ=^YPEsug;v|EMeYFUDDpGi)$`p|z}|^ze?H}k7@on9P+EX%3Ct(1RgP6gcnLEC
z4s`#ksl(`tgZJ*>#vdC0NZ}J!;Rn`Ke&kw(_nyF3VVJ@fmcIs#1<#qJ9DKznK%_Fq
zj3*q&M&>!mbgX#_WdxPR8{SAAZ}*b@9aO#4ufvUoY>)g0Y!$}9v@NN^xyq`3g846)
c#sY>!nJA{XiP!2QIp22opr88l|6e!MU)hW?VgLXD

literal 57712
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
CIK^ZD

diff --git a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite.lock b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite.lock
index 64844ab0..38f5ab36 100644
--- a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite.lock
+++ b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite.lock
@@ -7,7 +7,7 @@
 	<key>hostuuid</key>
 	<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
 	<key>pid</key>
-	<integer>685</integer>
+	<integer>1486</integer>
 	<key>processname</key>
 	<string>photolibraryd</string>
 	<key>uid</key>
diff --git a/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite b/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite
index 32f437683ecc7963165e87fd4824e9b41c742d4b..d653ef69ff0bebfee6b61680555a218f5f2f133a 100644
GIT binary patch
delta 1538
zcmbW$%TE(q90%~8Q)ckM?Tp4(@{3%J(P#vO@=AQf7!&p4MFbJ#B_NNsw7ijZ8&@uj
z8=_qr7bf@8Vl*9t#^68T!o|J1GH8s6JL5u^KEA)-oP}$<`F{GFW@dW6=j3uGmopE~
zZB#cJCmmI)**KGkCgY?KEyhVA>Wz~?#Emn7XecdhY|@qcy;`r?bG+?dtaRhu^;o>o
zWXj7F-y$v9WF{qBOiHreBqie}A=ywm_9^eHL(BhtYgM(&Rp0Nbn&tKH-Kx5@^+)IC
zy26e!*VPlPyKV+YKR)|<WWDXli5Iu@s*G1oKHd0n-=BU^@#ap&tJe>7F~97qlWJw{
ze_s{7Y_JejdY@i(gR4MV7u{e4$S^tpqgUME0?@!{2kIE(K$3qm223zUfdr!qIHL=0
zkOBVW3D!$T8CWsBT^F4o6*Za%$t)(VEUcSOF|cy_EaQ>@_gMlC@EcwODjAEwe!Uur
zxWPQw&Oe_6_A+LH^NbmwjWG@EVN3zLb<y|TpdZw_kadDSeiuBZ7n8pkmw|JP9-x)c
z4g94GP7JNqI{esSOse_P5U`bT1#lUIfWsI7qKu0`C9hg1P@z{GANM(2?s!p^|F&Dz
zsG9ttJ?enJ*SqWe>)rM~czxcOce?aw^ZQu-)M2$PyGjeD3@?m+=&A?>(TM1*F3=?r
zR-L*;D2pzL&=$3eP#2Ah&=-w~P#BGh@b{=&gr+DhLRB=msm$ms%A%CaP!=UcXp0ge
z)I}5aYJqx0D2$dwXpF9jP#G;oB4Tt#^CFZ+b0V}xvm(?+Ga~dx(^(;!qbU(~6=i(?
zpNKDCvB)$aLXp(ZZ_MbE5h|r#5jv&Ia-wRTSOg!LqD2}Op+*`Kp+~wRLXk9Rs(9_u
zAYGIpDx^*kP6u_YeXdjYa<N~|xmShmcE<9L*HurvF+A<2IXvyADLn0_B|Pn>K0NIv
z9-em7uy*{pI=JPxkM&FS+RI{_lt-}&*d&tJA~w4uu{~_I+j)=8Zb=ksbKK^b%~45S
z$?*PZo0B$EoLM|LX$J{O>;apLHW%#md7E=KXKl{doVGb-Gvf=;kj+7x12+51qix{^
ju!CL)=Pj(9YnLf@r@cCCb4U^$+w8R2vG(Py`eWoLk>@R`

delta 1538
zcmbW$OKeP07zgk<XL@g)*4#_H@}Y>33i_C7r{2`Frdn?jJBjq6Vre}SD+{q{n55H2
zEF_3j>#8Z$dcRs)6e}qaiJe%m^!R_@Jqv5I`Typ-lY8%+|2dhA$z)7V{lv1kaoVCv
zRT}3gB4M0XM2&G;5Y@(MMpPN636Ts=Oia?nG0*X4cxB#VFBzQrbTSr?n`4Cqif_>-
znJ`BsYfP(TwP}&8GR>07V9mFzuV%N8|4ONn_LAS{)!g>M-v`v3VA`KOQz~*Z3tU$>
zrRJW#vHI)4&sBpB{p&~0=q?#wsl7Gv=c0eSyXeEYqId7Rb!WESSGB4m|JGMmy>zfQ
zs`Mh=<pvvpHr?q4wZJh(C17-i8&m)ZMmbQy*aEchZ#Dx>j7>l@qYBujb8fH$n8%ZP
zAj(JqGjyjDY>yhvgSs>(Db_Zim9Z75V^j-pp94TCzu|tMn6VF7th*u+H`oI%<e%>b
zb~1JWjf|Z@1EUdGz-R#G>rUTygVmtcxwI3k;&;JgR${V)u>z=P)Bq_)64<VDP7JM<
zIsDiSm@MN<>w#&Eb%4uQ3pk85K$MXHih0%IK#}fneB7tJ(D9-w`)j^ht`=sOE>NZZ
za__u%**oif@eX-Mysbg+l+Us3rgAks-9>Lq0bUsW(0vgKqI;q`oueBftU3iElttG>
zXp6c<sEZzn&=)-vp)h(N!r!Al5t^c55vro+lM0MZqbzzRGn7S7MQDqjh)@?jwpVj>
zQ-s3kod}K5TM;Uw@km6B&giuWrO_)9TB9)$YNJsRdZU+VA)2EXBJ3&}@%>8?U%q0I
zX+VS`={CPH<Cct2DfNrcDdpuvl{v8pJ~Bm%bXSBLX-I?~X;6eB>5eJkwMT<=U52QT
zdPO)L)RX^Sp)O=%|D1EL1l`SwW%~xz!FW78?WQt3?IsbPc2g6cc2gamc2gCec9YDn
z9a2lC{`avSQ}4Yrwn<?WtAI@+i7jF?ki_<|*=^@HZT3l`P@9izKD7Bjl2<ak|FF&H
zHlJ~(@!+R+@I(@Oz~;EkH}?8#o3Ct+*&Ma`(&h`BBfbC)*}P+Oz~=43XhXOG?4aMl
fc?&D&+GUE}X|LY3IV6dWZT8yi$^ZDMCLjI_gEKwx

diff --git a/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite-shm b/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite-shm
index 55e2e08ed5c73997ec36b1e0dd8cabfc78534a80..0fec9a5595adf9fe08c24bb1c6b4c95e72633394 100644
GIT binary patch
delta 64
wcmZo@U}|V!njj(ZHp?^fcbC!4S6`1Uy2adHw=-_Zl`l`SUgDA3n6RK809j8YtpET3

delta 64
wcmZo@U}|V!njj%j`Fb5o3iq!YD?UDaJ0W3%^^e<uVfXgu9mXTIF=0VH06BCccK`qY

diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db b/tests/Test-10.15.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db
index 57bb6e4671b5859203b310703832611fc2724b97..029f64834319752a0965702de0d9c3a4779f5dda 100644
GIT binary patch
delta 26
icmZozz|ydQWr8&0yNNQ+jPEuk_^e|r+`M*Oa3TPV$_oJi

delta 26
icmZozz|ydQWr8&0oryBejCVFB_^e|r*t~XKa3TPTx(eI?

diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-shm
index 59cf766542aa9b4ebc54d53c952edd2cf5059f7a..e043d1e29bafc8a55c0fdc4844f0e5bdc68aa177 100644
GIT binary patch
delta 64
vcmZo@U}|V!njj&OcGo7#WKC>bce}(VZl9z*9N*ZxuZN!q#v`>cVL?3rNx~a(

delta 64
vcmZo@U}|V!njj(JCb<5~s>kbnqOEo>o|&ZX%jfYh{-CzD6CSCJ2@C20X8#*o

diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm
index c9b73deacc250da135258136b0ebfcf7e2a525d2..d39c07134dabd0b2b85a2a9b9536bd00e74f4b9b 100644
GIT binary patch
delta 199
zcmZo@U}|V!s+V}A%K!q55G-(?iGe`?$i8;Tfob*nG>3K8QP)qd-M9McvZzH5vs<2!
zsvcxE2!PD}j|3p13``97Ha6OGPh8-#`2hDXv(5jUX0a-rXS%?2k?9iCWu_}kSDCIc
iU1z$%bd%{8(`}|ZOm~^?G2Lg{e2`m1W%HvPIbi^^?@M9;

delta 165
zcmZo@U}|V!s+V}A%K!q55G-(xiGe`?$lknBOMGo{#<_LYQP)qd-M89C!yxKQzpFi|
x>Op3M0La|`NB|<rz{GHNW1~IyW)_}bW|IYYTsHr6n#H=Ak;hAA^P?O&VF1taHg5m`

diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal
index ac1e064c6151565b663bdabcff3eaeac307d14ad..27ab92905d0ea7c14dd0559dba88ed6cf7b93ff1 100644
GIT binary patch
delta 581
zcmXBOODMwu0LO8Eo7uen^Pcy-8Hy+e2Me{7gHn_W2b6=zZBEk9Bjx1a;I(ogv3b;=
z(2^24V6%sL?5|jH&<>P?<X^w@r|+*{_<UcO`8W{9As`Yes1XGXqM?NjF^EMR;*kIm
zdL$wV$w)ye(vS`VGLVTZWFrT;$b%92C_o{KP>d3kq73CQp#qirRU?J-<7T~9{q5JR
zI5(~qWScQdxLx?Q8JmUMJ-ON;YTwJJPS$jbI+}~-k{oSiJ7Tonc~P?+VWGKcZgyi9
zf7fD$tDkm9yOZQ$lhW<F12@0x%`^|q!%nSI3A3+Xr!+6kE6Ls2O83)wY%fwfX+D~d
zT_e&PuK$*EXnvYs>TOR|x`fZq(4gUnc2B#Ps!fTCO<N~}lOZcDKnrlQbLl+%+F_}u
zJ<uL#(%VFj@3O)}d!#+mj{CNnGP{#&X-~8#+GtB|t8Bffp*_={CEG`d@<pucn;r|=
jX+c_$UBuzg*}<xJjwaJ&TBO<KH4oS~X)m-F#cbj~-$ekr

delta 101
zcmV~$$rZs+006-E5&OQz9%75on-U!6pr9O7pcp45n0bBQ;rA)RQ&3V?5vi)FYiMd|
n>*(s~8yFfHo0yu3%`GggtZi&1cJ@*SM<-_&nXBBbxIfZA&Tk<Z

diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm
index c9ac891a623cce79514f73c5a472538c552b090e..8289ac45968fcfcd27e22b0451946eb701b5ee7e 100644
GIT binary patch
delta 186
zcmZo@U}|V!s+V}A%K!q55G<g~#K52kWFOH~T;C~iw!7x)<2UCjt6w|`=8j#z$l?mA
z>Op3M0La|`NB|<rz{H@qv9X(j6=XfjW<k#1mW)c9KZajs+^oPU!?^j6D-#=|GE6{)
Kaq~AnE<*shOgxhS

delta 184
zcmZo@U}|V!s+V}A%K!rGK+MR%AfU*^z@P|Z2VS<{5FYeuNzK*AZ_ZU#zYutsT9F`p
zo|9DdAhSULWbS_?01;(iVvyX}*v+w7g!7f<WCc!+$^V@AHh&7g#JE|3Q;u=-A6F(e
N7*~yP^EW>(LjZh!K0N>c

diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-wal b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-wal
index b3a1788255ebd6f774f583b3b77dcb915a3a4f05..d06872c197d41bb977802b5a16e20a4bf3a04d94 100644
GIT binary patch
delta 154
zcmV;L0A>HUhKT{_#)$!dgaL#Cgad>Ggaw2Kga?EOgb9QSgbRcWgbjoagb#!egb{=i
zgcF1mgcXDqgcpPugc*bygd2n$gdKz)gdc<;gdwydI762>69Nzj6FH#42@GMumrxS|
z8wEiC001GEP+JE-0YSI$!XdB^2(KY2#EZ=siMJ4x0+I~@Hn%(AAwvNN77+z<5dkZ=
I?V<uB0hRqO?f?J)

delta 79
zcmV~$TM~g#007Xr6q0u#N@NxOZLE(o&D{O;VFlJ=8P55AWB3d)^n!`0L~3SkA+wZQ
cS=-p!**hqdj!w=h7gx2$P3!KV8=tTD9~r9|2LJ#7

diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm
index ef8a925c2042826e8b7c2d24790e0ab75e4eccb3..2a01057b3a3fd5a6a7100b989f28fc24be470ac7 100644
GIT binary patch
delta 669
zcmb7>Nla5w6o%h>AJo*+3aLhuE~*RTf|wB3F04dJ1Y;W17>xsa6E#8{Yab3cD|it^
zaR3n%r<TVgPAyPzKq(am#Kfe;EpBvUO!PDYA?`fMfA7iv|K~rsxu$8DrV*TzT&PWy
zu4$PgXj)7Nf9;wtxeaZ@zMUnT7k~Yg_kHVF;B$6Y;(z@U*{R&$Q)-+yw2^S>s8iQf
z)R?W}&djW8QECLOf`}lhd@ipZRr72MRCz|4-mU8JDASSZ1|8XYj|w}yaz^p0EzXSj
zy)rXhkS?$b{>@A2vJFpGm2^`##U_(uR*`EoM-44mI_(ON7~rGw7Zg#(8MzCsAz!8L
z+|6FfxlTLJc`5WpmB?M~ILJw=xJ8&A;qs}WPE{2DP}^OLRO7N1`#vgYpo3SUZd38)
zE2yR=HO(Db#Tl@E=FK%`9O4vLY34D##2FUDDxT6e8C9PjvhU{{H|V5a)E%n7pqaOf
zNMC66uT1LR0LM^VqLF(%Aj)gr$rt>sK5al=*rZ#<e$%EOkl45tTZiF3%xNxgjoVl}
zA;ut|B+;$L*0;|La-2$PY2rRzbn}MySe+Y^hI<c3Im<=rxl0=nUNDrJvLc%jv(in@
o6Os+ztg@0c!%@l!E_0KId=QVv3hj#9(vR?r#Q5WKRC93cA0a&HJpcdz

delta 325
zcmZo@U}|V!s+V}A%K!t63=9J0%nS_sfdcm))t605ZufR9E{(T&`o}$dyNKN5syo%B
zs)v~kGWS0cfQmCQly7W&%)9vu{{w?f0uvY~UvY4noaB}_Ng!bJ6~`%zKz7#TOU@x6
zu}uO(jFXqSZi2{jO}^mf1z{F#{^hQ~1W_WzIC+ux28cM%<TF02CJBUXKI8j{adMNR
z4D)e@^P4~NFK66b64<~7QIx#-XaqA8P*!d7yQpnIT5j{9=o?^x%?IKxi9%GhZEh=N
Tfe3CWzreOhK#Otms`@YhaW{O5

diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal
index f9fce346dd6e735f7cd946edc184a1d00c1d2ffb..24e3c4aa70a55bb13b81fd258bbab9b3402c7552 100644
GIT binary patch
delta 16694
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
SXC(hR?PJaPJ2WRT=l=jEU;AAE

delta 121
zcmV~$$CW_=006-E<s6n3R!%Fd%+i9g9Omgk2MW-Ei!QX`Xy$f(2hYnZI17Y?MMTBK
zB_yS!Wn|^#6%>6bDf?DYRa5t)p{b><qpPQHU})sm*u>P#pSgvlm9>qnoxOjD`|<Sn
E0GgyIga7~l

diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm
index 03e76b50109ffab10db31bd336caec15610d339f..d4f7c6ece46e174309ba05027f325d37f82c97bc 100644
GIT binary patch
delta 183
zcmZo@U}|V!s+V}A%K!t63=9G~Kn^z$n;l!7Xz3REcm9Nz+kY|%|E$bj_pgGzZ565N
zVP=EO{f`8o;!F%W6C1a0c46G*I5~ikhnbOqX|p5aZ>G(ETxB>nJ2Bp2+WaMuj}6Fr
L!?gKbl#nU_vf(^G

delta 196
zcmZo@U}|V!s+V}A%K!t63=9JLKn^z$zk2cc(v12B0mtGWr_$dhNPj$2!CtjqFp5<5
zFtb7C{zn2(aV7@+iH+M?fi^R+Zhjxa$h<j#@qitW&%~g+*^%)l)8;>}GMtQhK=y5>
V&0hlf*ckPJ?AJ`2-$e<j0ssX*KEVJ0

diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal
index 6e18e999a3e17d382edc2806f59892d1d5ea179e..b66b814708f7a427786267a22cb44a6c4a6f627e 100644
GIT binary patch
delta 1138
zcmeBp$$g-M+rqq_t%*VRkpu&S00RijpYU?~PbT4?Jr^c#vOS#_02E>bVVHOWAHP8S
z;hTDs0|ewZhQH(&fJyM~JfFok{rb<%0RkKXaM7!GcUIi_dbx6Pqk_of2@0&pc=H5>
z2MGO_rFX1ynRuXQbAthr{_A-`cdj_R%?64x3y88JyYRL8JH5*ITWy;+1aJrl!km$<
zS|=4_nI6NnxzT`0K$IO>hrI6QwC!iPyf!~5K+<8-pmHgqJl+7RgA-YYW<l9PahszH
zHw#Qea@12EA?fGOR=01~Sh$&2#l+d!(8R^SP1o4i(pA^Q+{jSZ$-vE2*V)m{)yT!j
z!raZseDnWxhD`84nU@q36IN|6x7lGMlBv6j?+bsv?sXk#*LnWQ>K85H>e<%ZT%a;n
z_vGe+i%9Aptt<M;Gr3l2bH_s@(TVG>hiE#^blbe(Ba-OCTSs{(`EGc=eFq~Wl5lrj
z<eI$ICuVHFAc!pdEA4%kU5E9~?JpFOg(qA7N#K0wB(u#3S=91M<ooLjGd=(<yvjfQ
zZ6KpD+}-*AWZe$rdVJh&5QMBFHLR>HqTKK8c8?@v;fxmyqM{#nv~Eu*LKeO%;}op*
z_q6-=iY8>?#n&2ImU8cWw0*)PWMS!0M%JemYfo-pu?Sgsxm{3mpu&yo+Yf9)7ItU&
zrgz`*e?G+RYcC<W-Aiu64VNMvt?eH!A?w&(<+><u&iW7AIUXYm$2e<w&N%$5WxK*>
zWZ_)<%O8^^J@vL*Ff$<qdrj}+QwAAdA8ij1Mizc*m43m}{_pqg8Oq4QFRl2QiXL6v
zu)V<;SvWTBw5E04TNjAibAy=>;r@}2=ikwZj^*1o1S9M4s${yQBi5<4{X{ad@RMlH
ziGs%a-L^j{Mi$;0eWPhHYv`-(Kbnz+{p~`({hmI1$##J$$ik<1!#{|nUwgG(V+pcw
S;_72&e?#3Ympg1>5&!^ZL;?^1

delta 1284
zcmY+^3rG`j90%~-oVi@vPSPG&s98Fz)gDfFS>cj}A>@39VP)Dw%wlLoS>&c+hE&sw
zO$u^lrHGH6r~OR}1w}NKoW01XtgM`5HMLR<>!h}R9sD`?-2Z$3-~G7%zpap0XyYkE
zbLZu;#BZ0dSU79$Qe{s)I5?K#UH1BTe6}bog&}NiIQ*QC`{*NE^g2?5`%pV<LfrA7
z+NfF<{yot~Yj7^^)cOalD~7*~Cy{zzPtxG)3I}cQ9r~9S>}&tza&}WPt&@N}XHxbw
zKKjBMMqO|(SEdqYg&{?D-RLeNgtln7xQC;R{WZPA{0{Wfoz_d(xR)DDTyfJ!#@y;0
zq=&R1(XSr-^ulGt@;5ObCSHn<k=o^x9yDGIiVE1Qu5MfJYNkckY5q#7B0{PnRB~~!
zL>4R#j!<nCE0sz@OsLgcBnoNhR+UOd|EiU;olRMvZ{CYnjHS`x6nJaGv|Dm`?5ZWq
zS`UR}pp|gWkH7YK)AxG`Mp|nH^Lx9n4PT}&_RxiIfG+y7v)iw#@&#?S13kD?TX3~4
zO^KQ?3@|@4kvOF<RiJ(k$gCaeQyv|6$I*x%<f$2r+JD<Hc1H%aQQKEqB$LE23qBE=
z#$qtJvu?xN;dc4wq}@mo3lmeF_P{{p<~t}d6*4P&f5t_HxEZBnK{j^D*DgEI(1cFp
zL0)*0XRoyf`yfLJ<aBH-v5dWM1**IO*?he@k|@hcMs4+wV>RbP$)z8^{;9oY0MtJD
zEJ(5CNOvguIsg+-TZYQ(nyt?f_Z?(yf#OVwd1(^zoq!x<ySBQ!`eiFpy0AgpD|1p8
z8*64;k!B&}g8Q%Zr#p38l<p6?$Xig6&L4e(baKdzN3A7#qU!yh+7HLE|MlJ4bR{gH
z{L)HfiGv9;C@YK{r{t(B4RT)H>}`2eR0|r)hCI8#;N6pP{wkWvhm2be`J0cL{1AQ_
zvS4i=)~P4*k?1Dm>`QxF-bD}2R)jaO@#0Lb^Vc}mSg|c6YLAsUM!Yc&nTbbW9NL1H
z3;*Bar9Y-~v>)c(GBMxo$q^6&f}%e1Il_mm4aHQ5<Bld&Yy;-SWp*ylaSjYjjEv&C
g+)@+MV^5BdC*)DoO#v2LOl>!99LGeanJjkSZ!j7jrT_o{

diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist
index 4b3dc9ad..64d16213 100644
--- a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist
+++ b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist
@@ -3,24 +3,24 @@
 <plist version="1.0">
 <dict>
 	<key>BackgroundHighlightCollection</key>
-	<date>2020-04-11T13:55:22Z</date>
+	<date>2020-04-12T19:50:22Z</date>
 	<key>BackgroundHighlightEnrichment</key>
-	<date>2020-04-11T13:55:21Z</date>
+	<date>2020-04-12T19:50:22Z</date>
 	<key>BackgroundJobAssetRevGeocode</key>
-	<date>2020-04-11T16:03:49Z</date>
+	<date>2020-04-12T21:11:06Z</date>
 	<key>BackgroundJobSearch</key>
-	<date>2020-04-11T13:55:22Z</date>
+	<date>2020-04-12T19:50:22Z</date>
 	<key>BackgroundPeopleSuggestion</key>
-	<date>2020-04-11T13:55:21Z</date>
+	<date>2020-04-12T19:50:22Z</date>
 	<key>BackgroundUserBehaviorProcessor</key>
-	<date>2020-04-11T06:27:26Z</date>
+	<date>2020-04-12T15:18:31Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey</key>
-	<date>2020-04-11T16:17:41Z</date>
+	<date>2020-04-12T21:11:07Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
-	<date>2020-04-11T06:27:24Z</date>
+	<date>2020-04-12T15:18:31Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2020-04-11T16:03:50Z</date>
+	<date>2020-04-12T19:50:23Z</date>
 	<key>SiriPortraitDonation</key>
-	<date>2020-04-11T06:27:26Z</date>
+	<date>2020-04-12T15:18:31Z</date>
 </dict>
 </plist>
diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb
index b6b6a676b91e2469af4d201b596cc6b12028c48c..5bad5158f157685c802a1d83d3a203641d26b980 100644
GIT binary patch
delta 3417
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

delta 3548
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
R#S_Ld_`Z~Qu$z$4{{m3LUXuU-

diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist
index f3cd0ecdda94b02c9749a61028adc4133de0590a..ef13e8d560043edac7cce59b5680f0e616ebb427 100644
GIT binary patch
delta 14
Vcmcc1a+hU;5F=yZW?@DzMgS#x1PTBE

delta 14
Vcmcc1a+hU;5F=yVW?@DzMgS$q1Q!4R

diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PhotoAnalysisServicePreferences.plist b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PhotoAnalysisServicePreferences.plist
index 0512fed2..125e913c 100644
--- a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PhotoAnalysisServicePreferences.plist
+++ b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PhotoAnalysisServicePreferences.plist
@@ -3,8 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>FaceIDModelLastGenerationKey</key>
-	<date>2020-04-11T06:27:27Z</date>
+	<date>2020-04-12T15:18:32Z</date>
 	<key>LastContactClassificationKey</key>
-	<date>2020-04-11T06:27:29Z</date>
+	<date>2020-04-12T15:18:34Z</date>
 </dict>
 </plist>
diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/vnpersonsmodel.bin b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/vnpersonsmodel.bin
index 50cdfa0ac70058294b5edbeefd9b253ae335ab3f..77ae920d0c05aaabe4b1bb06e35a4b5c764e9dcc 100644
GIT binary patch
delta 92
zcmX?aecpOP3!CDWlxUf@ja_`qI)~2lG88Z{FwQkK{$J0)khb`MDTv;%a91ygHgL8$
segjAcys15WWAYJZ6=tA<&99lSNDAbt%{p%Nq9J0<zIl}$D;E3$0J1VD4gdfE

delta 92
zcmX?aecpOP3!B2(^sCoyZ0zD=*7>Bt%uv9<z<4*p@_#)8L)zoV)*yPr!@H9~^o7M?
sd$$4U2?h=Ow@p66tilXbu=zFf6-j~jN6tQBPsxtfZIX}oyklbp0C^TENdN!<