From b1fd0191205c22db483ae267cf8a929134cabbe6 Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Sun, 24 Nov 2019 09:39:36 -0800 Subject: [PATCH] Added hidden and favorite and test for 10.15 --- osxphotos/__init__.py | 30 +++++++++++------- .../database/Photos.sqlite | Bin 2093056 -> 2093056 bytes .../database/Photos.sqlite-shm | Bin 32768 -> 32768 bytes .../database/Photos.sqlite-wal | Bin 494432 -> 70072 bytes .../database/Photos.sqlite.lock | 2 +- .../MediaAnalysis/mediaanalysis.db | Bin 65536 -> 65536 bytes .../MediaAnalysis/mediaanalysis.db-shm | Bin 32768 -> 32768 bytes .../CLSBusinessCategoryCache.AOI.sqlite-shm | Bin 32768 -> 32768 bytes .../CLSBusinessCategoryCache.AOI.sqlite-wal | Bin 181312 -> 185432 bytes ...CLSBusinessCategoryCache.Nature.sqlite-shm | Bin 32768 -> 32768 bytes ...CLSBusinessCategoryCache.Nature.sqlite-wal | Bin 152472 -> 156592 bytes .../CLSBusinessCategoryCache.POI.sqlite-shm | Bin 32768 -> 32768 bytes .../CLSBusinessCategoryCache.POI.sqlite-wal | Bin 82432 -> 86552 bytes .../CLSBusinessCategoryCache.ROI.sqlite-shm | Bin 32768 -> 32768 bytes .../CLSBusinessCategoryCache.ROI.sqlite-wal | Bin 234872 -> 238992 bytes .../graph/CLSPublicEventCache.sqlite-shm | Bin 32768 -> 32768 bytes .../graph/CLSPublicEventCache.sqlite-wal | Bin 156592 -> 160712 bytes .../graph/PGCurationCache.sqlite.sqlite-shm | Bin 32768 -> 32768 bytes .../caches/graph/changetoken.plist | Bin 605 -> 605 bytes .../resources/journals/Asset-change.plj | Bin 508 -> 1003 bytes .../resources/journals/HistoryToken.plist | Bin 552 -> 552 bytes tests/test_catalina_10_15_1.py | 20 ++++++++++++ 22 files changed, 39 insertions(+), 13 deletions(-) diff --git a/osxphotos/__init__.py b/osxphotos/__init__.py index 7a999cee..9a6f21e4 100644 --- a/osxphotos/__init__.py +++ b/osxphotos/__init__.py @@ -162,7 +162,6 @@ class PhotosDB: logging.debug(f"library = {library_path}, masters = {masters_path}") - if int(self._db_version) < int(_PHOTOS_5_VERSION): self._process_database4() else: @@ -487,7 +486,7 @@ class PhotosDB: + "RKVersion.lastmodifieddate, RKVersion.imageDate, RKVersion.mainRating, " + "RKVersion.hasAdjustments, RKVersion.hasKeywords, RKVersion.imageTimeZoneOffsetSeconds, " + "RKMaster.volumeId, RKMaster.imagePath, RKVersion.extendedDescription, RKVersion.name, " - + "RKMaster.isMissing, RKMaster.originalFileName " + + "RKMaster.isMissing, RKMaster.originalFileName, RKVersion.isFavorite, RKVersion.isHidden " + "from RKVersion, RKMaster where RKVersion.isInTrash = 0 and RKVersion.type = 2 and " + "RKVersion.masterUuid = RKMaster.uuid and RKVersion.filename not like '%.pdf'" ) @@ -523,6 +522,8 @@ class PhotosDB: self._dbphotos[uuid]["name"] = row[13] self._dbphotos[uuid]["isMissing"] = row[14] self._dbphotos[uuid]["originalFilename"] = row[15] + self._dbphotos[uuid]["favorite"] = row[16] + self._dbphotos[uuid]["hidden"] = row[17] conn.close() @@ -580,7 +581,6 @@ class PhotosDB: logging.debug("Photos:") logging.debug(pformat(self._dbphotos)) - def _process_database5(self): """ process the Photos database to extract info """ """ works on Photos version >= 5.0 """ @@ -639,7 +639,6 @@ class PhotosDB: logging.debug(pformat(self._dbfaces_person)) logging.debug(self._dbfaces_uuid) - i = 0 c.execute( "SELECT COUNT(*)" @@ -904,15 +903,13 @@ class PhotosDB: logging.debug("Photos:") logging.debug(pformat(self._dbphotos)) - - """ - Return a list of PhotoInfo objects - If called with no args, returns the entire database of photos - If called with args, returns photos matching the args (e.g. keywords, persons, etc.) - If more than one arg, returns photos matching all the criteria (e.g. keywords AND persons) - """ - def photos(self, keywords=[], uuid=[], persons=[], albums=[]): + """ + Return a list of PhotoInfo objects + If called with no args, returns the entire database of photos + If called with args, returns photos matching the args (e.g. keywords, persons, etc.) + If more than one arg, returns photos matching all the criteria (e.g. keywords AND persons) + """ photos_sets = [] # list of photo sets to perform intersection of if not keywords and not uuid and not persons and not albums: # return all the photos @@ -964,6 +961,7 @@ class PhotoInfo: Info about a specific photo, contains all the details about the photo including keywords, persons, albums, uuid, path, etc. """ + def __init__(self, db=None, uuid=None, info=None): self.__uuid = uuid self.__info = info @@ -1072,6 +1070,14 @@ class PhotoInfo: """ TODO: not accurate for Photos version >= 5 """ return True if self.__info["hasAdjustments"] == 1 else False + def favorite(self): + """ True if picture is marked as favorite """ + return True if self.__info["favorite"] == 1 else False + + def hidden(self): + """ True if picture is hidden """ + return True if self.__info["hidden"] == 1 else False + def __repr__(self): return f"osxphotos.PhotoInfo(db={self.__db}, uuid='{self.__uuid}', info={self.__info})" diff --git a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite index 8f1e7690deadc666ef7f21c22df2c3e103827b0f..1b4f53ff101113a846e26696d154551a4ca062b2 100644 GIT binary patch delta 2505 zcmZ`*3v3j}8Q$5sea!CM%$@OJU%ZYlaUQ~L0H@`oLj8dAozI62D8Zr@s5T@JB126K z6uGoLo2%tEO~GjqqteQuX(XabgkD~gmS7GE$*t1VoT@fTqZk7vr6K`BMH)yOIy2`3 z%Y;4sulZ)a|KHtzX0LxT-9MQgt^lRadNEKs&^6cvUhC3dT&_D&?yS(Ooo3C|3fHc6 z;BgHA+qP9~+eoEAn=G3wBO}Oa`fG8KhhY+T41GBc^L5la| zpWuGH6>q>DxD~T|ehesmn$}YHFYycJb0|77|gvAKawm4HJ56?)m#kj ze|T0&q8L;!UAi}33@T25Z!{Hy@T!sSSRpw2?)AE_ZC_Fhc1-Zm@8X20lk8zuKOPK_ zm&qaWBKb8LAwL(7XHPc&Z$Ha*65o9(AJjmLR7t6trAkN@m#Rss80Wij8xU-dGHVzQ zvL7~jfoz`p*>7pc_hp!pZyB~Iom9G6>4eg8rJIzF@yrMwkWB5&Iw0#xlRmPQY$i{T zwPZDE&*pzO#agFWqlz`ESfh$Hs#v3nHL6&nF+TVbPT#RULopeO$xuv&Vlotyp_mNC zWQh7k3-xs{D~J0$k|8_DQ>2@$C!KVdbkG`VlE0CICfWJOd?99^JJF_FoPG7*y zCATB|)CGLM52mcW%(^U|ti8cb+BG(|E?Ot8m#w|o{HJExOA(Pn92{zQYFhm+V${K6 zpL#7bQOAfDP|>(v@=mDiWUu*7sBCR7q0scS#6@b^>|Xp%i)HtFO*7H5sj}pD@M1I3 zBD35d-jeAkd-EE0_%A=jo0ot(<}C8JhRz57ryE+e4OTv~c-fHiDdppCXyL2yKlHyG_lG``$LRI(kdWE@`gqx_ zM)VOqPtS@|^U5p1%YUFOH;?$(nX1wffcVv((1ogllRcq;RFQ*|=}?4E?kS&hz<-rq zqW==>-ly--&&0~(l)cjsen2exydnIRdBQ&26Fwb*50R&``7**D8VM)Z)|bLbc4Q>{ zo;ZGO_N(#m-JCxcK1HX6hr?H?SbXSMI4?=km%@DkVXxf?@2di6Xt?SwAr*YM%G)*{ zUPW!(TH*Z_%tk*$&!9o{eY68@K~JJ}Xf;}i+Oql8R+|Zdo&x6!=AQ-gfix}PT*3T9 znj|QLh#_EOyj8TZl^8qEW9Bn7m`u zI}|j_G)hQWHop(>=kwlnY!7VHTQzyx!BH;+0EFU!dz|pnCIkbnQ$uF&*u?g)SH4qPX}i_?}Fs mg2e+V)&`pttcg2_D6b;(&07>=q<+ARDZs~H_)XQC`2PWoV_ISW delta 1145 zcmZvbe`s4p9Khe*z2yD6+$Cu<^V*jtw2r!}G!FKUh5kq0}12$URb9?a5P&u0?=6>V(~5*U{kNd zeZa@uhhVS!+RD&O{kQDoA$Svlx3h)Ap!&>P;7thtRaGTtsH!HG&VVZ0*8@$qasUR| zco*~=-Sr}%uKT!DN7!f&47xN;Ly%4Pz`Hl103360N7R^aS~oG?SmQg$BZ!FQ7~0Ww#*#4M0^< zlGU|pdN#di#$4?e-NoX^QnhOJ`aH>>2%dt4iE{SZ#sVVA%yPz0(#6X?ti z8@0G7DRdsuKj|I%BPS8#8@fYAK-1{olI%hNXfpjrauzz0kp>j;sv92a^#8fqqg=k! zVnn=8DF1j!+=xW=%_{drf1Ebv>3RTk`tzkxqc#^II4F^Aq^)Ov2wB^ttg6yTue zYfr!DIl7oFtQc&r7w=@tzhOUr_Z>WpPz-07aug3{3)PsloWgECaSFdCJmE|kaQw4` z<>Ewqstb5G5dJJv(vE-NVOMED=BW|dxMGUoWTO@Hny{NWShXE)-{F(rrlF-_A3 z>L%Zl44KXr9&RR|zl~4&5HU(jv2lp|6E*W7YyYnC(tW&DMltncrYt+%RuyQ)*wr<> zg^Xpr?8bXRJ@ zpaQSJC-4g@1eJWj2)sBYjz+*a8l`|>3%5&8Js;(sMBq+i#_kJvokt{NCj${~4+Xc4 zajmuL0lm>`zR(C%zP-=vF7tR)Tob({~wNL3o)IKUkM+0 F=|7FFaUlQz 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 284f2daed604e50e696a8721de89e43a095f9305..42a0273eaf1492d39eeab0fafe3ae20fb88f49a5 100644 GIT binary patch delta 276 zcmZo@U}|V!s+V}A%K!pQK+MR%ARq{&{{tE6mqMllO}KvcKoS?Mo&j2VZgV2jXWPvUOmi3+c{Ud^$@4Mt0jZTt zjJ!Z9n2C`INd0AEWQI^I5Q-H-u}ucbG4caB{}~zCAz~b0F#!;Vg^?3TEoWpD1X7`l Vj9fq}n3<6gNG;}I)6Gvh#f0-?7g5^Q0yr7zV` z{G#ev>T6Tcuj*7q>9>ONN9ioryR+TZa&B|$_4nJ>zgAMOEUztZEN?CEERB};mXDTC zmM@lM|7(x8zRA}7wA`}wcP(ze+uPngx9&p>)@IJS%I4US#mqI<|82`1 zi<|wPrNMIF^1$-Yk~ydITxeNjakU;>o>-n*o?HC>MxME6ZCkkzKmY**5I_I{1Q0*~ z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY** z5I_I{1Q0*~0R%!8NUKWMLas?UPhg+-hSzokhPyjna3K(pz$TrHs4`^{KmdVc35?MG zWDUeL2>2E_;Cp4%3;SxM-M4MFDzr|ux)F6d)K7rG!9ZphraihI$jKb~zY26!ed0#n zo4AP>C>VhP6>GGnYMz#Bi_Qj9BoU{cO2iZlktxtkDUH!Im1~8z>Rjf(a(-Wv^UgSL ztc!DV^p=xAcMZ^3m1@3LYMajIbVl1vhuVI@X9Qv?&_e@NqUl;-_f_An3$g4mxTcD< z-uL0BeXnF;XA$VBK^mtrd$z!8dw#*i4r%*vhn&J82m~!qsKFYq8TM3-O6}C8pv%SV z{K=Z5r8*L`uHxCw@p!gHR|te4a3X{nVVCHo%VC%7r1j23+IK&V(iF|rGHuY&mgkj4 z+D<}>_tp?i&`d4X8tu}RgiOU42t+5)UmJBSy7F06-kil+mLh-v0tg_Gzd&{VM{q(O c0(~@86E#aqv{t)yHII|niU0x#AP|JWAC{k;(EtDd 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 f1744bd722ff30cc437a3460cbdedab4f42685aa..f1260fa04ef79772792970f4af57b61a58bd5584 100644 GIT binary patch delta 1199 zcmaJ>T})g>6uxtRX7114U6z&t0gLMfLTTyBwvE&n$PG$=uIy@|KvES9NlRTxaD!O2 ziY>$kRA^kb^I)4|j1MIms<=D!CoPSk+h{GVN`#oEv>L#cjcp>vR9l>TXNiOd=V8v| zeBXDz$vKmmI=p)L6S4HM4tS6&zL~{wX&hZ(Wan`De8BtX?6LYE@IXfk%@tU{V*b-J zv%Bi#ZP!Ti8aOI~6_LPnBOKlL!apZZlP8XdKqAo%Z~{=ECmFJU2UW+(^-b`7AvdwK z&aTqWem=X^XjEy^t>t6i0L)gkeEoIpO?{o~$`J7Ut>U``R^Z||Oa})3n7|G8naswZ zDXz3{$$$9VIM_;Eu*jEIhMho9>EG~9X}Ks36qflohbl8y`TlE7qFH?OZO zY`NpHWzKHg@C}Ue&h8=O**P7bxC=yJl9>s(A252_S}j0VQ;psdR$JfWiYG0ViQ4h+MJURnb}E{H zt8+~!$8&%#L}89AJD4dMf^nX8p6vId*JRzESF*Nme(=}Y1=9ZquV{3t0}K4q8AD8#*y z_aQG70B?dM3v(>oX5khKzmaGgio=XcON;kh47}R=WLuI(&7p;C iQP}~BQAGNwa5E`#BJViNB{1Mpvttz~=w delta 11779 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 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 55e14341..52c35c51 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 @@ hostuuid 9575E48B-8D5F-5654-ABAC-4431B1167324 pid - 3490 + 1368 processname photolibraryd uid 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 ed183abf99f59b2d3c7c1f8602761e76b8d182c7..3508c5d849c75b886b4210f20767651cb9d2216f 100644 GIT binary patch delta 19 acmZo@U}s?_ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm index c1fbd76f1247248df393c766407a588f49070123..408e7171d669409fd0a446528e37c697f9095c76 100644 GIT binary patch delta 162 zcmZo@U}|V!s+V}A%K!q55G(-V2>@~W=gADmq@PJ`G8b~1v@@i4j+4a`_8F%hkg6VN r6c~Wa{f`8o!V~LvP8MKf*=)gh$Z_&NCpAXh&5n#$SvUXkU^52*9$GUE delta 160 zcmZo@U}|V!s+V}A%K!t63=9G~K#l+qA9$JUaHN=9b(6V})1;jty;kjib3baeZXs1Y o%xsXk|B(Pxd}961%{GjO947}bvP}Nxq_)|K@fz#qUmk4c0N|%HVgLXD diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal index 8eb5b8a93a17fd270e82241b7de8906c68bb6267..952b0d6cd26facf1ebbcb70bf945247b541cfd6f 100644 GIT binary patch delta 44 zcmV+{0Mq}#hzr=L3xI?Hv;siHm+;~N5C{O1^Jg078^)7x(Hj95lZ??r0T;8-(V!2r CL=!^* delta 13 Ucmcbyg8M)RcS8%~7AA)y04lWwo&W#< diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm index 463e95f5566111fd6aff20e8f424fd1c787c3461..174d7b47f93e19ca563ddf0469c3ab5366e46500 100644 GIT binary patch delta 164 zcmZo@U}|V!s+V}A%K!q55G(LI!>y3 upiy7|GWS0cfC@7)s7`F0J@Em{W*NqNj+6g6X)&s8R%E=)wE2%KixmLS_BTcV delta 163 zcmZo@U}|V!s+V}A%K!q55GQZ&jO2o_DQn*>#U=$pIp0d_2K6XncAv1OG#A^ sGzttr=Ke-yrJYY`Ja;-qv*zmdo?#d%8?TW0IdKuH2?qr delta 160 zcmZo@U}|V!s+V}A%K!q55G)`9qy>Q3(NB@l@mROmI_s$GC)e&RG5iDcw%Gt#yd(*6F;y_{^z8&@zFlb&5v^AgaOX6G@Aeb 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 766fb07d376d4ea052e52f102ef547fdfbfc2e3a..54516d7a22958c9dc24b81ed052eeabb5a4635fd 100644 GIT binary patch delta 40 wcmZo@VV$vrwP6XP)8qyR0gitb3;yuSCfQGJFpy>xpFGFFnNfW61A_(p05Dq)UH||9 delta 10 RcmbQSgteiCwP6XP695*+1F`@B diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm index f6099ab068503f5cd9ee31e74b7f0ac2b63fdbe3..bd30baab77e3d051849614cbadc506116e407c0e 100644 GIT binary patch delta 165 zcmZo@U}|V!s+V}A%K!q55G-H?q(y+Z;auOHOFu;C`^JS_+BWr3)1g1}H!OYjiiuS9 vK%>9_WbS_?02O9pu$RG5juVq)X#%>|5oj*}Z0StkE;(%W3bc!6p2A6FJD0QZeD=l}o! diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal index e722cefffae4ab93534cb3308df614d229ef805f..e5db69fccaf132fb2e9d46137402a0c738151d6e 100644 GIT binary patch delta 49 zcmV-10M7sTst%CL4uFIKgaWh!c$Jsng8~o;+>XwGpB4Dhm#|X;8vz-Y%u@nG0U5Ut HR05z67#0&{ delta 15 WcmbPmn(xOdzJ?aY7N#xC6;lB>@CIoB diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm index de51fe63d5b8aabecc078b8a5e3bd541fa3ebe45..ea472c6bb64144f6012e5c7f0e3372bbc7fb8f84 100644 GIT binary patch delta 164 zcmZo@U}|V!s+V}A%K!q55GSW7e@8Xii~STHh%~g&;S6U6*IK} delta 163 zcmZo@U}|V!s+V}A%K!q55GRG5iDbztx4)g%knUmmf8v!Ph{BT17CbK|spbxT# B5~=_I delta 13 UcmX@{oO8o*&W0AoEleAd0WQe~2LJ#7 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 4e63aaa0d6ceb53b1f18737502fa15ae8c5ed812..1c0ba8fa284c37a955c6a4d15158b21c6e804891 100644 GIT binary patch delta 55 ucmZo@U}|V!;*@x#%K!!wIpqbny>|~-XX0*$EXWELoEWRj$g{Drz8(OSdk?<= delta 55 vcmZo@U}|V!;*@x#%K!pQ6FKDtFT8gTxMAXMhb+hn7MvKX%*e2@vA!MvplJ|4 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 6831ef4df64ffb52089becb387eeaa7aac8fabfa..986763a80e6c0dea1f3598be284cf5e0bfb9d524 100644 GIT binary patch delta 14 Vcmcc1a+hU;5F?}aW?@DzMgSz11LObz delta 14 Vcmcc1a+hU;5F?}4W?@DzMgSy`1LFVy diff --git a/tests/Test-10.15.1.photoslibrary/resources/journals/Asset-change.plj b/tests/Test-10.15.1.photoslibrary/resources/journals/Asset-change.plj index 4d69103fb2403187319e0081c7e639cf7e7938e4..af24ba23927e83b844e8bffe3bef35ac95776d2d 100644 GIT binary patch delta 213 zcmeyv{F;5kA4VmIBv}So4n`q?mwRH&YA!k~T&~^SzecGxP=QOs%3#U4C#n-Ch)rf< zRAo`Q%OE%Lyd>+gYtPPb0R>suIJiY8`pPSdJFr$l%=oC>^6jj+W8j)y>-fw%g6E-| zq15QXAP2Gxi$X7hZC{t|;F_qc$ab_M?$6HM6TMWFR