From 72f034ef85010544a158d8301b898b5d0d865b05 Mon Sep 17 00:00:00 2001
From: Rhet Turnbull <rturnbull+git@gmail.com>
Date: Sun, 7 Jun 2020 08:14:02 -0700
Subject: [PATCH] Fix for bug in handling of deleted albums to address issue
 #156

---
 osxphotos/_version.py                         |   2 +-
 osxphotos/photosdb/photosdb.py                |   6 +-
 .../database/Photos.sqlite-shm                | Bin 32768 -> 32768 bytes
 .../database/Photos.sqlite-wal                | Bin 2270152 -> 3683312 bytes
 .../database/Photos.sqlite.lock               |   2 +-
 .../database/search/psi.sqlite                | Bin 167936 -> 167936 bytes
 .../CLSBusinessCategoryCache.POI.sqlite-shm   | Bin 32768 -> 32768 bytes
 .../CLSBusinessCategoryCache.POI.sqlite-wal   | Bin 2958192 -> 2966432 bytes
 .../caches/graph/changetoken.plist            | Bin 605 -> 605 bytes
 .../resources/journals/Album-change.plj       | Bin 400 -> 1559 bytes
 .../resources/journals/Folder-change.plj      | Bin 0 -> 648 bytes
 .../resources/journals/HistoryToken.plist     | Bin 552 -> 552 bytes
 tests/test_catalina_10_15_5.py                |   8 ++-
 tests/test_cli.py                             |  54 ++++++++++++++++++
 14 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 tests/Test-10.15.5.photoslibrary/resources/journals/Folder-change.plj

diff --git a/osxphotos/_version.py b/osxphotos/_version.py
index 639f6176..a7ef9074 100644
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,3 @@
 """ version info """
 
-__version__ = "0.29.11"
+__version__ = "0.29.12"
diff --git a/osxphotos/photosdb/photosdb.py b/osxphotos/photosdb/photosdb.py
index 2079fb7f..22208e02 100644
--- a/osxphotos/photosdb/photosdb.py
+++ b/osxphotos/photosdb/photosdb.py
@@ -2133,7 +2133,11 @@ class PhotosDB:
                     if album in self._dbalbum_titles:
                         title_set = set()
                         for album_id in self._dbalbum_titles[album]:
-                            title_set.update(self._dbalbums_album[album_id])
+                            try:
+                                title_set.update(self._dbalbums_album[album_id])
+                            except KeyError:
+                                # an empty album will be in _dbalbum_titles but not _dbalbums_album
+                                pass
                         album_set.update(title_set)
                     else:
                         logging.debug(f"Could not find album '{album}' in database")
diff --git a/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite-shm b/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite-shm
index 7c919e5758a272666d844c1f07e9e9fa322d829e..3b514a9559af77b7027ef13d7ceeab3a2449e8e1 100644
GIT binary patch
delta 2037
zcmb`I3s6->7{~Yg_p)#i5ET^Vkz5pciQ)rah;X?GA|T2`K?DWG7Yd@FBIwnK%&f#U
zGE-DkB1^=sk5V%-GgC87qpO)2K6+YdrCFBk*<+2&G|e>AnfcD_x8MK&+i&;onQJz~
zY{n9|mYzg?97QOEI4`DzltILtoD)0h5ByM+boQ#B>z&&z_h#O*KW4i7U-c3$UMlzg
zL(hYGN_t?|vRb=#Vr_CxgsljJ2%oBL1Nd&{!SC7Hah>AEyD3fWO`@@A5rra(M3kZG
zl9y-enSa1kP&aP2)BQWfsWs;R19xr>CZwC#UUw1O`BLgG8guYW5xY+n@vyR3?vId~
zzf_K`s{Fidp#JX}i>H2P2=|MK&}Gn>luwEbv-c<NN*wCZj`GNPn;cR|6&bD+<1E4`
z-xU?d>m#jfA`YR4DmU<YW2WNAz4hMQH!6cgV+$PALRb3$;-QShOK2}SJjujZ3C>}t
zMyWHkut|6meyZ4w*F{^|aBPL6<_#pCN<6lsgXT?)VQfA=LbzJ>vP&lm@i8J)P$EAS
z)4+1j1b?+=;9Fy@EC$=)q=ABnmy&>&;i7@!<LuZ1G-H@r^>E7|rAjFtgB4fs9U^Hw
z&7!mDBDEOKPsZiBFG3~G<0`&~ktWb=I-8b>>!?0ggvQ_ANct(ccnbll#bBu&356x%
z6}YO))mq{cf)q9xhY_gNHzkVtDC|H-Sy!sX4$Aqlq{X3SxJDkw1zf`qh@y#fJe^4M
zX#p*Nu$;E2_BN4FWeVO#kc28b1tgi@8r{H>(11?rWLJK4%x>La6sboP%a0~EvOF9?
zPp!5-Wt>d_R^UhZt941OV56}UZjz?glMSRNp2BTWEas*(qstI1#yVWY7oaqnCez7u
zt||@SN75SDRJ?;=>E!FiT3IaW&{nSE6hbP9k8(sAgGO{#r@S2ONev0c)3}3NwXq^@
zOgFlOVF_Nqr}z>&I-I7^DRiEOKb)San?wsGjT<w1vuQYrUNW_;%@7Bfj9uuW<_3Km
zvXS({Gx$Yz9g%5t9SSqn;}X7t4UM6xG>;b3J^YNxpEqSTvgvpiy){(z1c6Gyt8kYn
z-jt=Y>5WymD^cOuM%QpG#Rhzaufb?6O`}t33EeAEhq4>l3>-s<hFUXGpi*Ihht`!N
z*-S!Eg<mBqEXU|N49if1%lHPibOaqsr_uRzpF|zZX=F3;9{NZWU!5DwqOckET6#UV
zfu&(LJSEuHiS)s0{3ftI{QBf-mk2zHjrbhj!j8t#adbLeK>4aE!8U<-5<dx90(Z{K
zVEH(Xz7l9zm8VnKSnPq9%=K+aE$Iu6dqV8ZuTHhv1Ysq9R;|iu^@2IXlNBUfnS~SR
zCoRf8dGA`LH?ncqi$^q$GucA=VGVwloR%5Ob&*&oZz1cf*pei5Sjt25gV}7HM1R#}
zu&m4%=a!Cr=qhu4JF=DZ$FulDLN3p;VzlZ@<aPxeJC$QOKEZX|go%!#Idl$H{~>M&
zkU!5VV5|V|BUCnHSy3Rk8F&re8n->!MnX}I`;vR9uz{ISi#F=Fc-&zWSxF+5LY%??
z&Aq%xxX0sl7^K^-1F0he@ErKf6ocjB+zN%w!3P+qi7ShRI1~HfBgMS2M8^hVEflSM
zp+v}wa2kVT&MOu)BU2sv+J})~WdaVMn>5<Hl6o=-&jXs!y0FH>A4XK*32Z_O_A57V
z3wk<|rqda;R27+cb7>`;i!&Ikd6q3|#sqcf%gtpvmW6}puBHZEM>0m6Z!WX45qJ^K
en&Vt~C7Xv2F+`>o^J1}?Y`g(qY2(|Mr2PrrKrb@@

delta 1234
zcmd^<T}TvB6vxlqSwAu?`%ubC%4}TCmW=SpWOv+Bw#`;oEtgeG%Pb1RHYq=HkVQm%
zuuh0XTB+I6gQ>R?Btk@dim(r4iHO+DHwk*km!R&svqY~wcVT9@_x$Gn|KG!%(RGuq
zo7%U8_W_M~aWQ~|bQ3_UxK;=BZ`#zMqDJ?-B}?M!kLk+H{*~(Co&U;9ad9KvUw@6r
zx&n<b(J>T@bM;Q{_Q$dR{DyA-BwB1XoUOMh8L$nr{g0wb;U*lxU9Msb+C%u(VZos0
z6VFss^SxMOSCvfIP9(Y=(U|IT<ESHyC50(CdN?HOdtryH7ZpT{_tIDePUM&2>w+<<
zHd1I%S&$+rmot{s6)!XkR}a2&)(N#__61MdGZYOD;u}W>A3ADcc)%azu47q@bol)u
zV+Eb=p9;WNi8~;NaP~x4dhmNOS*kc+@>B$M;k;*D&hM6<L~c_txhz0Z${H9Dd<#0t
zHPMPZoGUk?-Z>$o#$-bPcC$I5yhn+HLCI<r20L5f6LHf}^X?~Y-tQH$NOUdSlc3F~
z31BmOM!|5#CnNB_N&~~0Dl<;zH)CG4fjyVl%W4C=eJY|B4-ceTZjFIWN$f?9v7uYF
zR_Z)1*UI2*9W?`&&-9Tq_MWv0ixNzz^U8?5b!LjFD(hiLfa$n&E<^xZ5Eh;&7j#3O
zkWXh*G{^9HX`&>+u%yEmx~QAVRu&`bZJ2Y>N*m@q7b96Wz=#AtUm{sI#x^9097$|N
zrmAY7Q=#(ih6uh99!mVv<uTO!3sJ|R2khj}yBZ_NCKx4zf4mZq$$95hqk`j2X4*Ob
z&}39FaBWd6Sd?6_Qj3&C2uk(P^+EdU{29~ouq`%sQW)%Lk#C{iYNoxgBpG$Fl|BF!
Q-?vGM>o+2<kK4<C1Ilm1zyJUM

diff --git a/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite-wal b/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite-wal
index 0a0274a513f7a6a79ea0d10743e5ad873b4adf90..db3b7d87d5f6b9fc3e7d93b040986bd21041e194 100644
GIT binary patch
delta 34175
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
R90k6L;7MTr{~zbL{2%y}P@(_;

delta 79
zcmV~$OB#V-006-6PspoC%A*n|wV0J_xI%ZRW7xHI1T(+s8^+-sUV_L>Y;IvGv9h+Y
cwUf&19psJ*C#A~S#nnx%(YotA`seuh16iLM$p8QV

diff --git a/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite.lock b/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite.lock
index 2f5f3463..d96edccc 100644
--- a/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite.lock
+++ b/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite.lock
@@ -7,7 +7,7 @@
 	<key>hostuuid</key>
 	<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
 	<key>pid</key>
-	<integer>452</integer>
+	<integer>703</integer>
 	<key>processname</key>
 	<string>photolibraryd</string>
 	<key>uid</key>
diff --git a/tests/Test-10.15.5.photoslibrary/database/search/psi.sqlite b/tests/Test-10.15.5.photoslibrary/database/search/psi.sqlite
index 091b63fbef1e43161cf138e47a04a9455edf1d73..1ac292776b487272144913baf52b8be5ab132b20 100644
GIT binary patch
delta 826
zcmb7?T}V_x6vyYBJ9n<$yLaXqR4ZxRjY7~Av9PwHuDK*y%K9M2DygswE`%V+T43Q8
zffZDX;O#-mq7M)QH>n{|%AmIhd#DE?q#lIC2O*HCm*z$ggh3scIcJ!||D5yV3{RND
z6XrBs(}dMLYOIx_)jU(=mRTp;E_GRqQ5q%cHl|~Z<?ChFR-Q)=y{sr7oQ3myMQ|G3
z-kwa#?QxT-)2V?}(j6E~_mMl^+o9Ud+0U)#c1&HrTJew)0(J8>7hhW#nz{eIi<*Lu
z5iulM_}G&WjPR{nC}a3%5nPgwIJAK_P9nbUKn&ut$pL1Y##2*6B#SB|Q3{g?>feQW
zw9|gvg%-ct1txE~@HpguWLWG^R{_&i_BK-vRKg7m>3TmA>-;QV<)hN6hAEr!cVup~
z$bEJyY-*&IC_^pVO*97rLjXb!jtnaUjSQ*ZJy_k7O&|s1*X-({0}XhnNCQYKhd=`&
zDpC+t-{O-Wsl&~3^)NW#lw8n=DQ*%?<cRntzW9y@#d4Pi837%+eETLwAq0pzEmY37
z2FbY8;}8Y3mZaAT2TbVA<&%b<O=!f?<#GpXPyRdGH_#3NxrKn-oNQWvKHDw`CN~t_
zpR`_mfFnoYgrbZ6Xk7L)F4o9N7kviDbNPn-`xr)}0*&R37a_gjdJwWG=gY7@499%k
z3xxaqjE6hrxQCKKB$qF(sw}{Qs9^Y4X<`(DK@kWoQgXK&FcmHd@h}nZ#RG9h#Kmr5
k@)iDq-{n_$Cl9Nw{%XhSvWY-AQ2x)Jf0vV;eRwbO0}o%_*Z=?k

delta 415
zcmZwDKS&%=5C-t~z1uzYtvhcO4m{(LCj^2L;jpvO#Zv?g@lFVVc*GE5ClW=_Le#@X
ztXwUg|4<PX2?(AdgPkeT1_>mcO`3pMSfxms?8P=;G0g`v{AOWKE$pdN=RQH+;ab&w
z=Dg07yz|39BThBZiO{q9#RXxBqN_BY5MCmY7sk2)dT`180g}G*w}le_!ml&<C=vGt
zIXh(V+`ctXykl@yYri`32~V|QMJmUg5c(H=qdOa9(ZsD;ton}rfpmO7g;Yu<M7FY0
z%F>9C0V?6!PSk@QmF9%f>q6>C=-)O7k+zRRB)KKTq{h3b{Kj*gnp#NTn-*K_=FtJ$
zT|leN7vS(%0i^IDDv$BcVPxL_$N2@XP*GeXC&}mjYmEDT@L+tH{P_l5-57|aa>C9S
z+0MsCZX~g|R%hn<(^HviK(BSfN*l)R%}`z@F&LExc(+fEHZ*!v6#Bb9(la`*pJ_$6
TbVd8LOvU&Goy5g)dC>e9PvL5P

diff --git a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm
index c9b73deacc250da135258136b0ebfcf7e2a525d2..7c42481d2d019b2292644a8bb539140e2c4f9417 100644
GIT binary patch
delta 169
zcmZo@U}|V!s+V}A%K!q55G-(kiGe`?$llwg`I2)s=i+tNQP)qd-M4z%&vTb<#kRze
zsvcxE2!PD}j|3p13``8?H#XXHPh7yU`2e?>`R0F4vshWqGhJZXe308sW%HvPIbi@*
Cu{}`$

delta 165
zcmZo@U}|V!s+V}A%K!q55G-(xiGe`?$lknBOMGo{#<_LYQP)qd-M89C!yxKQzpFi|
x>Op3M0La|`NB|<rz{GHNW1~Iy<`djz=93?Ab8P<SG>difMQ$&Z&5v^AgaPA^H_-q9

diff --git a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal
index ac1e064c6151565b663bdabcff3eaeac307d14ad..f841cc00aac38e344b586ef0ecc35a7eb7413c94 100644
GIT binary patch
delta 161
zcmXBJyAHun0D$2fs#>?!{Z6S{T@sHV@j@P<!yg{N&_N<6G1(*-#bz<pWVG5WHUo)o
z{a%-Ykc*>m5d;XL5JDx4hE9YiG2$dJFiDakO@=Hv@)RgiqD+M<HR@P2Xkyc%O@}T$
z9Qq6x9!4{J=}t^ddEeFbd3*I9(kctz`$%gl{QYCRGqk5OKW+4t{=eJ*ZoiYp7qsp?
AnE(I)

delta 101
zcmV~$*%84|006*wi2FX{4sk{3O$k1BMjMKV7Sy8zyYJU0{Juqa3QEc<B2_hY4NWa=
n9bG+r14AQY6H_y>xrL>bwT-RB&R*)^=;Z7obCtUl_ec5%uo584

diff --git a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist
index 22a2691af864f602991833ef5a3c5b2ecbf2a1da..842aacf224e0026786bca956a77970946f07db00 100644
GIT binary patch
delta 14
Vcmcc1a+hU;5F_J<&BBaci~uNf1c?9u

delta 14
Vcmcc1a+hU;5F_KW&BBaci~uM&1b+Yk

diff --git a/tests/Test-10.15.5.photoslibrary/resources/journals/Album-change.plj b/tests/Test-10.15.5.photoslibrary/resources/journals/Album-change.plj
index 748b16808d622d7443f8d8f85dfbbde61904809d..87e13f53bbdf361aac64219d80b03a5641ce4a1a 100644
GIT binary patch
literal 1559
zcmZ?BXJL@%U=R|>V30a@&(Cf9;vd$!%$MgzDllsNU^Mu0=>J9Dq=KBx;t~Uc8;nfM
zEUawo9GqO-JiL7T0<p=Z#U=T<!TCic-l>&giN(dKCB^Xq!U$o<;^fr4l+3*Ju!79I
zywsGK<f7EXlFa-(m&B6P(2~rOoYe5lypW>A;*5~&%)Ar<Mt=c^3sLcpMSpuPTo}9B
zcG-^&87p<?s96O#PM_RyI=*)2uZg}vLX4BvI6v*LiQMCOxN2ITZ1u^>iY`BUemgXO
z+o`N2z$n0A?087;u4?1uw_yPp`6c<q90E)nlInUc-Vt$W*|{4wZP|O|C<7QUGD2tu
zK`0HQjytHlWsu`w#2Pjh1{=S&U*v)X%|%8gh;M>}63aQbp+>=tW`>ywr9~ZnRx^lj
zFbN5iy-Iv)b;s{{Tc-TVfIkUy9Ns;F#K)C8CF%0QZZF#Qgz#^Obh81*$0kODB@=cp
z<%d~%9W_4CVgnN3*kglmGzc&VFapESZFZf7l~!D69yqE}6dZGsN^?PBDXyyH<R2QF
zl#-TF*w6^^7Tml1Xx?phxMBneNi4pyH@JG`)I)BVr{EzO<(gYiQVFq;V1UXvTsa5{
zH;(>W;txXHkGGgHx1D!<p8*NCWqW6Tf?GkCaO+;0a)I)2JKF&XH!QyLG1#zTdlM^0
zxWx;IdMacjmZd5rDx{?5q?V+nD3p|E<`GVnnhx^$IIS}`n0WEjVt82qj3!vd<>cTN
zMoR$b>0QKO)iFr)yy{c`rse6fVNbc1_8}X^{gCK6zVp#vcwVAQ^vpPQA)fN+Su6_)
zFD$;IMf7~$iPJg{gRWVJPx2w92552YFCg%8PmEd3MTdpUwY&S*DAfjXa0?NLFI4~$
C#Jslv

delta 7
OcmbQvGl6--1V#V~eFAs@

diff --git a/tests/Test-10.15.5.photoslibrary/resources/journals/Folder-change.plj b/tests/Test-10.15.5.photoslibrary/resources/journals/Folder-change.plj
new file mode 100644
index 0000000000000000000000000000000000000000..bdec336d64b95c9540acf6514f3cb766397cc128
GIT binary patch
literal 648
zcmZ>`=*l3^!6+m!=~^TEw&SkW(=JWl@F_RCTY*ty38TTH##e7ylL~S&i%Sd)E;2I3
z3kW1<Wagwe=jY_4CYNO9=N0=4BwV>uk}fao_M&Z12>*siH=9+Cu3tHOJo6?_-yY!^
z@qhN4otsxxzjybY@M|H<8>hEQJb_*_s>}WS8>G#=t5aY7>R9??NAxV`<GWiegLa5E
zyw=hBD7shH#bmkr#S?q`6kIvD<ru(#kr6^OFhgk=)#$(wj?*7o7!4lG`|y{IkUt7I
z`frIp2ys8&V#eHd-tm3L!24^WgJlCwe;r{oxb@-BIc7rsYC!kbt3LH_TAnT&_LOUB
NAF@&0Kk)us2mlZo^W^{l

literal 0
HcmV?d00001

diff --git a/tests/Test-10.15.5.photoslibrary/resources/journals/HistoryToken.plist b/tests/Test-10.15.5.photoslibrary/resources/journals/HistoryToken.plist
index 2621d7f70129b608c2f8011f585e91b2571f78e4..9b4deea4847c3ee360c052d31c158637fb797a07 100644
GIT binary patch
delta 14
VcmZ3%vVvs;J0s(V%^Zvhi~u4p1K$7u

delta 14
VcmZ3%vVvs;J0s(>%^Zvhi~u3?1JwWk

diff --git a/tests/test_catalina_10_15_5.py b/tests/test_catalina_10_15_5.py
index 2831952d..8504f1f5 100644
--- a/tests/test_catalina_10_15_5.py
+++ b/tests/test_catalina_10_15_5.py
@@ -24,10 +24,11 @@ KEYWORDS = [
 PERSONS = ["Katie", "Suzy", "Maria", _UNKNOWN_PERSON]
 ALBUMS = [
     "Pumpkin Farm",
-    "Test Album",
+    "Test Album",  # there are 2 albums named "Test Album" for testing duplicate album names
     "AlbumInFolder",
     "Raw",
-]  # Note: there are 2 albums named "Test Album" for testing duplicate album names
+    "I have a deleted twin",  # there's an empty album with same name that has been deleted
+]
 KEYWORDS_DICT = {
     "Kids": 4,
     "wedding": 2,
@@ -45,6 +46,7 @@ ALBUM_DICT = {
     "Test Album": 2,
     "AlbumInFolder": 2,
     "Raw": 4,
+    "I have a deleted twin": 1,
 }  # Note: there are 2 albums named "Test Album" for testing duplicate album names
 
 UUID_DICT = {
@@ -232,7 +234,7 @@ def test_missing():
     photos = photosdb.photos(uuid=[UUID_DICT["missing"]])
     assert len(photos) == 1
     p = photos[0]
-    assert p.path == None
+    assert p.path is None
     assert p.ismissing == True
 
 
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 384137e9..cda217e0 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -49,6 +49,10 @@ CLI_EXPORT_FILENAMES = [
     "wedding_edited.jpeg",
 ]
 
+CLI_EXPORT_FILENAMES_ALBUM = ["Pumkins1.jpg", "Pumkins2.jpg", "Pumpkins3.jpg"]
+
+CLI_EXPORT_FILENAMES_DELETED_TWIN = ["wedding.jpg", "wedding_edited.jpeg"]
+
 CLI_EXPORT_EDITED_SUFFIX = "_bearbeiten"
 
 CLI_EXPORT_FILENAMES_EDITED_SUFFIX = [
@@ -165,6 +169,8 @@ CLI_EXPORTED_FILENAME_TEMPLATE_FILENAMES2 = [
     "Test Album-Pumkins1.jpg",
     "Test Album-Pumkins2.jpg",
     "None-IMG_1693.tif",
+    "I have a deleted twin-wedding.jpg",
+    "I have a deleted twin-wedding_edited.jpeg",
 ]
 
 CLI_EXPORT_UUID = "D79B8D77-BFFC-460B-9312-034F2877D35B"
@@ -947,6 +953,54 @@ def test_export_filename_template_3():
         assert "Error: Invalid template" in result.output
 
 
+def test_export_album():
+    """Test export of an album """
+    import glob
+    import os
+    import os.path
+    import osxphotos
+    from osxphotos.__main__ import export
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            export,
+            [os.path.join(cwd, PHOTOS_DB_15_5), ".", "--album", "Pumpkin Farm", "-V"],
+        )
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert sorted(files) == sorted(CLI_EXPORT_FILENAMES_ALBUM)
+
+
+def test_export_album_deleted_twin():
+    """Test export of an album where album of same name has been deleted """
+    import glob
+    import os
+    import os.path
+    import osxphotos
+    from osxphotos.__main__ import export
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            export,
+            [
+                os.path.join(cwd, PHOTOS_DB_15_5),
+                ".",
+                "--album",
+                "I have a deleted twin",
+                "-V",
+            ],
+        )
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert sorted(files) == sorted(CLI_EXPORT_FILENAMES_DELETED_TWIN)
+
+
 def test_places():
     import json
     import os