From a36eb416b19284477922b6a5f837f4040327138b Mon Sep 17 00:00:00 2001
From: Rhet Turnbull <rturnbull+git@gmail.com>
Date: Mon, 31 Aug 2020 05:24:54 -0700
Subject: [PATCH] Normalize unicode for issue #208

---
 osxphotos/__main__.py                         |  24 ++++++++++++++-
 osxphotos/_constants.py                       |   3 ++
 osxphotos/_version.py                         |   2 +-
 .../photosdb/_photosdb_process_faceinfo.py    |   6 ++--
 .../photosdb/_photosdb_process_searchinfo.py  |   9 +++---
 osxphotos/photosdb/photosdb.py                |  20 ++++++------
 osxphotos/placeinfo.py                        |  29 ++++++++++--------
 osxphotos/utils.py                            |  12 ++++++++
 .../database/Photos.sqlite-shm                | Bin 32768 -> 32768 bytes
 .../database/Photos.sqlite-wal                | Bin 580952 -> 1174232 bytes
 .../database/Photos.sqlite.lock               |   2 +-
 .../caches/graph/CLSLocationCache.sqlite-shm  | Bin 32768 -> 32768 bytes
 .../caches/graph/changetoken.plist            | Bin 606 -> 606 bytes
 .../87554DE2-780A-4ED2-83B2-324CCE3DEE45      | Bin 0 -> 8 bytes
 .../resources/journals/Album-change.plj       | Bin 1833 -> 2345 bytes
 .../resources/journals/Folder-change.plj      | Bin 1214 -> 1478 bytes
 .../resources/journals/HistoryToken.plist     | Bin 553 -> 553 bytes
 tests/test_catalina_10_15_6.py                |   2 ++
 tests/test_cli.py                             |  23 +++++++++++++-
 19 files changed, 99 insertions(+), 33 deletions(-)
 create mode 100644 tests/Test-10.15.6.photoslibrary/private/com.apple.photolibraryd/caches/clientservertransaction/87554DE2-780A-4ED2-83B2-324CCE3DEE45

diff --git a/osxphotos/__main__.py b/osxphotos/__main__.py
index 8e4749f4..023c401a 100644
--- a/osxphotos/__main__.py
+++ b/osxphotos/__main__.py
@@ -10,6 +10,7 @@ import pathlib
 import pprint
 import sys
 import time
+import unicodedata
 
 import click
 import yaml
@@ -22,7 +23,7 @@ from pathvalidate import (
 
 import osxphotos
 
-from ._constants import _EXIF_TOOL_URL, _PHOTOS_4_VERSION, _UNKNOWN_PLACE
+from ._constants import _EXIF_TOOL_URL, _PHOTOS_4_VERSION, _UNKNOWN_PLACE, UNICODE_FORMAT
 from ._export_db import ExportDB, ExportDBInMemory
 from ._version import __version__
 from .datetime_formatter import DateTimeFormatter
@@ -40,9 +41,21 @@ OSXPHOTOS_EXPORT_DB = ".osxphotos_export.db"
 
 
 def verbose(*args, **kwargs):
+    """ print output if verbose flag set """
     if VERBOSE:
         click.echo(*args, **kwargs)
 
+def normalize_unicode(value):
+    """ normalize unicode data """
+    if value is not None:
+        if isinstance(value, tuple):
+            return tuple(unicodedata.normalize(UNICODE_FORMAT, v) for v in value)
+        elif isinstance(value, str):
+            return unicodedata.normalize(UNICODE_FORMAT, value)
+        else:
+            return value
+    else:
+        return None
 
 def get_photos_db(*db_options):
     """ Return path to photos db, select first non-None db_options
@@ -1863,6 +1876,15 @@ def _query(
             to_date=to_date,
         )
 
+    person = normalize_unicode(person)
+    keyword = normalize_unicode(keyword)
+    album = normalize_unicode(album)
+    folder = normalize_unicode(folder)
+    title = normalize_unicode(title)
+    description = normalize_unicode(description)
+    place = normalize_unicode(place)
+    label = normalize_unicode(label)
+    
     if album:
         photos = get_photos_by_attribute(photos, "albums", album, ignore_case)
 
diff --git a/osxphotos/_constants.py b/osxphotos/_constants.py
index 82b0c578..fde74c14 100644
--- a/osxphotos/_constants.py
+++ b/osxphotos/_constants.py
@@ -9,6 +9,9 @@ from datetime import datetime
 # Apple Epoch is Jan 1, 2001
 TIME_DELTA = (datetime(2001, 1, 1, 0, 0) - datetime(1970, 1, 1, 0, 0)).total_seconds()
 
+# Unicode format to use for comparing strings
+UNICODE_FORMAT = "NFC"
+
 # which Photos library database versions have been tested
 # Photos 2.0 (10.12.6) == 2622
 # Photos 3.0 (10.13.6) == 3301
diff --git a/osxphotos/_version.py b/osxphotos/_version.py
index 80d20f8d..22cb5725 100644
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,3 @@
 """ version info """
 
-__version__ = "0.33.6"
+__version__ = "0.33.7"
diff --git a/osxphotos/photosdb/_photosdb_process_faceinfo.py b/osxphotos/photosdb/_photosdb_process_faceinfo.py
index 53212ce5..7f386f64 100644
--- a/osxphotos/photosdb/_photosdb_process_faceinfo.py
+++ b/osxphotos/photosdb/_photosdb_process_faceinfo.py
@@ -4,7 +4,7 @@
 import logging
 
 from .._constants import _DB_TABLE_NAMES, _PHOTOS_4_VERSION
-from ..utils import _open_sql_file
+from ..utils import _open_sql_file, normalize_unicode
 from .photosdb_utils import get_db_version
 
 
@@ -121,7 +121,7 @@ def _process_faceinfo_4(photosdb):
         face["asset_uuid"] = asset_uuid
         face["uuid"] = row[2]
         face["person"] = person_id
-        face["fullname"] = row[3]
+        face["fullname"] = normalize_unicode(row[3])
         face["sourcewidth"] = row[7]
         face["sourceheight"] = row[8]
         face["centerx"] = row[9]
@@ -282,7 +282,7 @@ def _process_faceinfo_5(photosdb):
         face["asset_uuid"] = asset_uuid
         face["uuid"] = row[2]
         face["person"] = person_pk
-        face["fullname"] = row[4]
+        face["fullname"] = normalize_unicode(row[4])
         face["agetype"] = row[5]
         face["baldtype"] = row[6]
         face["eyemakeuptype"] = row[7]
diff --git a/osxphotos/photosdb/_photosdb_process_searchinfo.py b/osxphotos/photosdb/_photosdb_process_searchinfo.py
index fd948c87..6f5aec08 100644
--- a/osxphotos/photosdb/_photosdb_process_searchinfo.py
+++ b/osxphotos/photosdb/_photosdb_process_searchinfo.py
@@ -10,7 +10,7 @@ import uuid as uuidlib
 from pprint import pformat
 
 from .._constants import _PHOTOS_4_VERSION, SEARCH_CATEGORY_LABEL
-from ..utils import _db_is_locked, _debug, _open_sql_file
+from ..utils import _db_is_locked, _debug, _open_sql_file, normalize_unicode
 
 """
     This module should be imported in the class defintion of PhotosDB in photosdb.py
@@ -112,8 +112,8 @@ def _process_searchinfo(self):
         record["groupid"] = row[3]
         record["category"] = row[4]
         record["owning_groupid"] = row[5]
-        record["content_string"] = row[6].replace("\x00", "")
-        record["normalized_string"] = row[7].replace("\x00", "")
+        record["content_string"] = normalize_unicode(row[6].replace("\x00", ""))
+        record["normalized_string"] = normalize_unicode(row[7].replace("\x00", ""))
         record["lookup_identifier"] = row[8]
 
         try:
@@ -147,9 +147,10 @@ def _process_searchinfo(self):
             "_db_searchinfo_labels_normalized: \n"
             + pformat(self._db_searchinfo_labels_normalized)
         )
-    
+
     conn.close()
 
+
 @property
 def labels(self):
     """ return list of all search info labels found in the library """
diff --git a/osxphotos/photosdb/photosdb.py b/osxphotos/photosdb/photosdb.py
index ed178b50..144898ae 100644
--- a/osxphotos/photosdb/photosdb.py
+++ b/osxphotos/photosdb/photosdb.py
@@ -44,6 +44,7 @@ from ..utils import (
     _get_os_version,
     _open_sql_file,
     get_last_library_path,
+    normalize_unicode,
 )
 from .photosdb_utils import get_db_model_version, get_db_version
 
@@ -713,7 +714,7 @@ class PhotosDB:
         for album in c:
             self._dbalbum_details[album[0]] = {
                 "_uuid": album[0],
-                "title": album[1],
+                "title": normalize_unicode(album[1]),
                 "cloudlibrarystate": album[2],
                 "cloudidentifier": album[3],
                 "intrash": False if album[4] == 0 else True,
@@ -760,7 +761,7 @@ class PhotosDB:
             self._dbfolder_details[uuid] = {
                 "_uuid": row[0],
                 "modelId": row[1],
-                "name": row[2],
+                "name": normalize_unicode(row[2]),
                 "isMagic": row[3],
                 "intrash": row[4],
                 "folderType": row[5],
@@ -963,7 +964,7 @@ class PhotosDB:
             self._dbphotos[uuid]["volumeId"] = row[10]
             self._dbphotos[uuid]["imagePath"] = row[11]
             self._dbphotos[uuid]["extendedDescription"] = row[12]
-            self._dbphotos[uuid]["name"] = row[13]
+            self._dbphotos[uuid]["name"] = normalize_unicode(row[13])
             self._dbphotos[uuid]["isMissing"] = row[14]
             self._dbphotos[uuid]["originalFilename"] = row[15]
             self._dbphotos[uuid]["favorite"] = row[16]
@@ -1608,7 +1609,7 @@ class PhotosDB:
         for album in c:
             self._dbalbum_details[album[0]] = {
                 "_uuid": album[0],
-                "title": album[1],
+                "title": normalize_unicode(album[1]),
                 "cloudlocalstate": album[2],
                 "cloudownerfirstname": album[3],
                 "cloudownderlastname": album[4],
@@ -1683,12 +1684,13 @@ class PhotosDB:
                 JOIN ZKEYWORD ON ZKEYWORD.Z_PK = {keyword_join} """
         )
         for keyword in c:
+            keyword_title = normalize_unicode(keyword[0])
             if not keyword[1] in self._dbkeywords_uuid:
                 self._dbkeywords_uuid[keyword[1]] = []
-            if not keyword[0] in self._dbkeywords_keyword:
-                self._dbkeywords_keyword[keyword[0]] = []
+            if not keyword_title in self._dbkeywords_keyword:
+                self._dbkeywords_keyword[keyword_title] = []
             self._dbkeywords_uuid[keyword[1]].append(keyword[0])
-            self._dbkeywords_keyword[keyword[0]].append(keyword[1])
+            self._dbkeywords_keyword[keyword_title].append(keyword[1])
 
         if _debug():
             logging.debug(f"Finished walking through keywords")
@@ -1795,7 +1797,7 @@ class PhotosDB:
             info["modelID"] = None
             info["masterUuid"] = None
             info["masterFingerprint"] = row[1]
-            info["name"] = row[2]
+            info["name"] = normalize_unicode(row[2])
 
             # There are sometimes negative values for lastmodifieddate in the database
             # I don't know what these mean but they will raise exception in datetime if
@@ -2027,7 +2029,7 @@ class PhotosDB:
         for row in c:
             uuid = row[0]
             if uuid in self._dbphotos:
-                self._dbphotos[uuid]["extendedDescription"] = row[1]
+                self._dbphotos[uuid]["extendedDescription"] = normalize_unicode(row[1])
             else:
                 if _debug():
                     logging.debug(
diff --git a/osxphotos/placeinfo.py b/osxphotos/placeinfo.py
index 7c52d987..18de2a0c 100644
--- a/osxphotos/placeinfo.py
+++ b/osxphotos/placeinfo.py
@@ -11,6 +11,9 @@ from collections import namedtuple  # pylint: disable=syntax-error
 import yaml
 from bpylist import archiver
 
+from ._constants import UNICODE_FORMAT
+from .utils import normalize_unicode
+
 # postal address information, returned by PlaceInfo.address
 PostalAddress = namedtuple(
     "PostalAddress",
@@ -76,12 +79,12 @@ class PLRevGeoLocationInfo:
         geoServiceProvider,
         postalAddress,
     ):
-        self.addressString = addressString
+        self.addressString = normalize_unicode(addressString)
         self.countryCode = countryCode
         self.mapItem = mapItem
         self.isHome = isHome
-        self.compoundNames = compoundNames
-        self.compoundSecondaryNames = compoundSecondaryNames
+        self.compoundNames = normalize_unicode(compoundNames)
+        self.compoundSecondaryNames = normalize_unicode(compoundSecondaryNames)
         self.version = version
         self.geoServiceProvider = geoServiceProvider
         self.postalAddress = postalAddress
@@ -183,7 +186,7 @@ class PLRevGeoMapItemAdditionalPlaceInfo:
 
     def __init__(self, area, name, placeType, dominantOrderType):
         self.area = area
-        self.name = name
+        self.name = normalize_unicode(name)
         self.placeType = placeType
         self.dominantOrderType = dominantOrderType
 
@@ -232,13 +235,13 @@ class CNPostalAddress:
         _subLocality,
     ):
         self._ISOCountryCode = _ISOCountryCode
-        self._city = _city
-        self._country = _country
-        self._postalCode = _postalCode
-        self._state = _state
-        self._street = _street
-        self._subAdministrativeArea = _subAdministrativeArea
-        self._subLocality = _subLocality
+        self._city = normalize_unicode(_city)
+        self._country = normalize_unicode(_country)
+        self._postalCode = normalize_unicode(_postalCode)
+        self._state = normalize_unicode(_state)
+        self._street = normalize_unicode(_street)
+        self._subAdministrativeArea = normalize_unicode(_subAdministrativeArea)
+        self._subLocality = normalize_unicode(_subLocality)
 
     def __eq__(self, other):
         return all(
@@ -414,9 +417,9 @@ class PlaceInfo4(PlaceInfo):
             #   2: type
             #   3: area
             try:
-                places_dict[p[2]].append((p[1], p[3]))
+                places_dict[p[2]].append((normalize_unicode(p[1]), p[3]))
             except KeyError:
-                places_dict[p[2]] = [(p[1], p[3])]
+                places_dict[p[2]] = [(normalize_unicode(p[1]), p[3])]
 
         # build list to populate PlaceNames tuple
         # initialize with empty lists for each field in PlaceNames
diff --git a/osxphotos/utils.py b/osxphotos/utils.py
index 28f7bb83..2ec3f4bb 100644
--- a/osxphotos/utils.py
+++ b/osxphotos/utils.py
@@ -10,6 +10,7 @@ import sqlite3
 import subprocess
 import sys
 import tempfile
+import unicodedata
 import urllib.parse
 from plistlib import load as plistload
 
@@ -18,6 +19,7 @@ import CoreServices
 import objc
 from Foundation import *
 
+from ._constants import UNICODE_FORMAT
 from .fileutil import FileUtil
 
 _DEBUG = False
@@ -352,3 +354,13 @@ def _db_is_locked(dbname):
 #     attr = xattr.xattr(filepath)
 #     uuid_bytes = bytes(uuid, 'utf-8')
 #     attr.set(OSXPHOTOS_XATTR_UUID, uuid_bytes)
+
+
+def normalize_unicode(value):
+    """ normalize unicode data """
+    if value is not None:
+        if not isinstance(value, str):
+            raise ValueError("value must be str")
+        return unicodedata.normalize(UNICODE_FORMAT, value)
+    else:
+        return None
diff --git a/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite-shm b/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite-shm
index 49f2dac9ef31b2780e238fb467d14953e4a22381..a5e29bd3ca58eeab60b58beced2b310884d374e1 100644
GIT binary patch
literal 32768
zcmeI5cXU)$5XQe3APGGX2%%XJ?AQ@SK!hkFb^)W<yI8=21w{}6D~MvRU`HVI9(wOB
zRC^S$pkgnm@C{_o(LHW5&wa_wOJ>gbWy9|GX6AnH?(WGS%uUa242eYI0V(zQqkjU>
zDPddt&Y3w4n+zJ<bbI!|9b3H29%)%!nx*^H?@rDik~f9y%!|nL1M+_1OL&<qB#X%s
zvXm?%%SjGdPrfG^?5`W?PI{5vqz~y!8uImmuJ6EN9m#*?ksPlu#}G19kt<dXSx<A4
zOs<T2l;={3yxxMeB>l;Qq@eZZQu8U<O2msF$e-jd@;7P8!mUVK63e6LzNDZ0ddknw
zNI&`Y65WS*EdKBz-}QE-K(39x$Nl)6>`}=f`yz=nAo~&7LvsIKB}2$i@)~)ayg}Y1
zZ;`jjJ7gG%wY~-{(44d;ZAb=bM~0ITWF*NVqsVA7hKwcS$ape=OeB-YWHN<JCDTYY
znNDVqnPe83P3DlfWFDDM7LbKx5m`)@kfmf9Sx#1vm1GrJP1caLB!{dc>&XVPk!&KH
zNo3FVq=(Voim$Q!kbCjZYvex4`>hdqHy<A(@7u`xF0vn@bIE;+RXdU+*0r&&i|#q{
zIU(z`FbB*5bHE%h2h0I;z#K3K%mH)2954sW0dv3{FbB*5bHE%h2h0I;z#K3K%mH)2
z954sW0dv3{FbB*5bHE%h2h0I;z#K3K%mH)2954sW0dv3{FbB*5bHE%h2h0I;z#K3K
zN`nIxPzQ~18g9mKD9`_I97K!^B1u$^YPb-O;1kphsK-6&H%3*lf5viPZmbuI?0FAO
z&=UiTtlqy1$@~FbWa(tZK((nD^bn2~<~eWkKBpZFQ&%6QR_cY-IW6QEbjH1S6uI~o
zo|od)i~D<Ev$}yw*b9f_eYM`5P$ts^AM=Ax8LEsjFGUxlbuwS7$9$=^;`g+|5a}vo
zZybS6xQo-7KEPL;wN%lo75C@Ff)F|2w$(9(P<{X>XvsV>3pWnPj57<317kHJ)A)4Y
zBwVAsq9W?zFr0~7@H;95^og-ZS-YglI;s~oPOS`+ungLum&1lz<633)vv8|Ysh7!|
zKDRN*ZFzO|@oJ?^(j4qVZBkbb$W&Xm(G<ty1Wum47?<KQTwcV@3|H5ipjOHZ(x;FR
z(6_UXvj0O`7Bz4HGH@Mwb2{y3oZef;t5ys<uY!GWB+kd(oGV-@u>NG8vxUZii5gL!
z=4l^Vx6*Q`i34#muE+hH%e)0YqO4avu-)Z$Z3S1CN#+(B2PSDmd74Ie#)sOaG!bby
z2&bS6`fwuo=lBWbywp;&`(=i|g~ox&8d08Re?03$?NXYAS~wVOaRVOUEdH(d8Hrwv
zQnUM46pHn7j)BW)kFJ52pW-9qb3U|grO8OgAvhH`qAyRO_yWHm$*URn?tjAVqSVz_
zs+D09o{nyTw>#BG#^-%#3qyJwn&FbdNUY5Hq*CWvw#sz_p{YO3N2f3N(3V7LD!vQF
zvQ~$p%i_>vwvQ%W^r0<@((NHx)S8g=>AubBK3aImhc+xyIgid=e2BAg8@}cVf|b4W
zxc@GRtYdBDmlE}OMj@<b29D(^kQePfDYBsSa>AiSunwGq+k;KWY;rQCg~oxII1yKA
zgw)6xktHq8!yOKnR2BQ;D4dH-bVm<7gpaTdJ5j}}9oP53I)^LTQ@RDNaM(jV{GqHq
z3$1XqQY)w0h9k<OHV#EQ+=PC3oTu)7iC>ZIrNy<U3S;FdJURGiT!4G<Fh0gNJXE-<
vS10Z+<+R$;9QCn7x%}Bmoyg>j>5>*5aHn!fBa}M#vJLKA2uTNXocFm4N9a+7

delta 503
zcmb7;-7CXk6vxkbem%=rnxvK@$x9m&c`1YxW|Cq3h8AJ6v|M;;Ugt-0p|<4QDpxL)
z8|~H~Fn5$(xOC&f&6G5aah}bETc@6$=X{^f_j`_E2*VJ&wx>E!h1p|`@O>x%+@X%5
z*W2fp=3{D2Tt`z=GnV`QkNt}O@+w=E%KiRR84*Ch_SIgyh-q@9J!X~t!ki1mPzNqp
zB9v#c04CumhVlz3-D8RgnH2Qd8z!p^Q?k!OLas^+ltMkz=Tz?0IV6nqKA<ylPi2D^
z_QVk*obj#Eo4bj77t->mgMkNH9!s-BM-&X$1tq*HTgM8{yP%~BHR05p4`t8*Uf5u0
zNKnwHQk?=TGt}brZ(EgV1GCwg)ZzE28F@KigBox`5DwUXgVeU5J}#*(VDRv?z(UrC
zO`024_)(42xZ*Jbv_L2LV2-5_l4;GuY%OYC;3t$RItWF1w>Ukn8+<#oZkT8Nj>b1L
VJD+T+EnJ8t?6)HsI}Y~i;s?0nl^g&7

diff --git a/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite-wal b/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite-wal
index 0bf6febbb612c80198aac6bfdc3714752ccd5501..a7b9270293e8f39c32043fd0391ccfec6432d5ab 100644
GIT binary patch
delta 49087
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

delta 25
gcmca{)&0gU<%Sl<7N!>F7M2#)7Pc1lEgTVd0ghP-(*OVf

diff --git a/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite.lock b/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite.lock
index 5b4d48b7..5b9b78f5 100644
--- a/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite.lock
+++ b/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite.lock
@@ -7,7 +7,7 @@
 	<key>hostuuid</key>
 	<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
 	<key>pid</key>
-	<integer>1847</integer>
+	<integer>1942</integer>
 	<key>processname</key>
 	<string>photolibraryd</string>
 	<key>uid</key>
diff --git a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm
index 8f27ed5ef816dfda3362eeb1ac1f56f1deabc3be..eb0386c29202af47f189447fa24b2a936a19c47d 100644
GIT binary patch
delta 205
zcmZo@U}|V!VwQNMJNYA1>&6ZX#?4=tw%KlC?qHt$&q-wSC#F|SlmEE#02!Z{n6(%@
zH-BWRW|~~#Eim~LQ^DjP-VhmX4hB&MMFt%Pdj@ZyiqA~koD5<NN({OT4h%jJ0WJn{
z24x0421f>8u)yRG;UK+5Oq27Xx`2!?Osp&n3Jlgj$+IlX(hNpGhB7;|6ocX9k4(!q
m_ho4@ZerG8+58~?3Xt)Kb@GOC7NE9YOq<tL=`aFWYAgU>ut-M$

delta 725
zcmb7>OH7kd5QWcN+Z1RuK=Bb8q^O9rg~Z3s7{tgzi&3cpA}Zn=m7<6sKKSv8AP8RM
zVHd2}NMa;SOjwyNUAQo~H8Cda-Kp_;?yV$ly~&rEIdkUzH}gA=avasO>QfmOj{w;T
z7C|!c=J`T(-(XE;dq>lUs@;Lc$u?K`^{bix^)KFS?*0AG`Kv1=W_v3{4~wg88MOde
zO$ten6p;<YJhGhZBzz|Fb&-Tib4^AHh?!bT){*t3goH?#Y&PzK9A?ICoW&$UHj*tQ
zi;fbv=?0B=X&y6E*>5FNGPh0Q3^ApD?a1>spb?jF2Sa$KQ!*eu>DG@bpXUfJ<1QXk
z9+x^RdqdcTqiDxH3{#$xddl;nyQ0~0Xe1}DzeatYW4MC*7-1(R-orS98+e3CBq$V$
zKLg9Ti3lnXMH4#k08gw__A``<KNBmkhCAAhY8=N^^g(O$0Eg|E@@HWsS5uBk>_Ia+
z@erfw@w0YZf3EX+PM{0@cxuPmtn9AAIozZ$ty>%VGxy>ou3-RU*3xS&60^bM;=kI8
z+brJ7k^>lI@?E(D*o1>jzqqBv`n>tv_dc9LH^wzLksN9XiJWKer;=ONlKdEdFLJ@=
ja-Csb<YKxyZ7cn<(<QY`zp3Pl?uf_)^LHYx3^DZwiL1Ew

diff --git a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist
index 8eb87588859eca01e2cbf9f4a2b87ecd48fe3c55..3af2e280a7569ea88708c558cd69a6d4cb26cd67 100644
GIT binary patch
delta 14
Vcmcb|a*t($Fe9VHW)Vg&MgSv=1GNAE

delta 14
Vcmcb|a*t($Fe9VTW)Vg&MgSvc1Frx8

diff --git a/tests/Test-10.15.6.photoslibrary/private/com.apple.photolibraryd/caches/clientservertransaction/87554DE2-780A-4ED2-83B2-324CCE3DEE45 b/tests/Test-10.15.6.photoslibrary/private/com.apple.photolibraryd/caches/clientservertransaction/87554DE2-780A-4ED2-83B2-324CCE3DEE45
new file mode 100644
index 0000000000000000000000000000000000000000..5142c798fef8e9d0c125e588c5b73fa4ec2baab0
GIT binary patch
literal 8
Kcmd;JfB*mhNB{`{

literal 0
HcmV?d00001

diff --git a/tests/Test-10.15.6.photoslibrary/resources/journals/Album-change.plj b/tests/Test-10.15.6.photoslibrary/resources/journals/Album-change.plj
index b20737cde140d87262ceb7acf67cc69b3095d7a1..5ef0bce4bfc443efc89ac8f1dbea74872ecfc1d2 100644
GIT binary patch
delta 287
zcmZ3<w^C?>CcBD**KP)R4hA8CE_(?*g)2S=>;KNae(r!wsRE<MCPsr9-5>w5PkzIc
z%~ls~y`Jgl<XC2>dKn3z7DlXEW-}UWUe`aJKdB%mv$({-;36YaXh~*CPHMh@5rYwf
z0fQlf1%ob-G+<Bw(h3a03<V7N40#O244GhB2Po#tPzvOy0?Awk5Z{fVh~W=I22iX7
zNGHoMWP^o+7`_1&qyi;#5gI1HVpdYAaLC)kAcw<=9tPXL9JtOp`8=zru<fN2(?8Dh
XS=OVpLH+7-Np=oyp~-KV<r!50)lXK@

delta 7
OcmZ1}w32UwCOZHN00L70

diff --git a/tests/Test-10.15.6.photoslibrary/resources/journals/Folder-change.plj b/tests/Test-10.15.6.photoslibrary/resources/journals/Folder-change.plj
index bfc0debb95671364ee53c5c34db4c518ca5a51a3..f70ba70157ebd05b66ddc7fc8aaa87d0ab9050cf 100644
GIT binary patch
delta 66
zcmV-I0KNad3C0Vsz61k6PzsUD83^P7FvP)<+XRv9AR(X#kJ=aDR7b~zHUoywLGNga
YKNv0`)J!n1{hQa$z#Mgxw*#U9!Km{cZvX%Q

delta 7
OcmX@cy^nLlJ{ABC9Rmvh

diff --git a/tests/Test-10.15.6.photoslibrary/resources/journals/HistoryToken.plist b/tests/Test-10.15.6.photoslibrary/resources/journals/HistoryToken.plist
index 8b132c68876c7b659928c8bda6ca6309d7bda9b9..55617142aea7d5e55918fab4216247078854e3fb 100644
GIT binary patch
delta 14
VcmZ3<vXW&32P31zW==*0MgSc~0}B8E

delta 14
VcmZ3<vXW&32P31<W==*0MgScm0|fv8

diff --git a/tests/test_catalina_10_15_6.py b/tests/test_catalina_10_15_6.py
index 0ae421d4..ca942446 100644
--- a/tests/test_catalina_10_15_6.py
+++ b/tests/test_catalina_10_15_6.py
@@ -33,6 +33,7 @@ ALBUMS = [
     "Raw",
     "I have a deleted twin",  # there's an empty album with same name that has been deleted
     "EmptyAlbum",
+    "2018-10 - Sponsion, Museum, Frühstück, Römermuseum",
 ]
 KEYWORDS_DICT = {
     "Kids": 4,
@@ -53,6 +54,7 @@ ALBUM_DICT = {
     "Raw": 4,
     "I have a deleted twin": 1,
     "EmptyAlbum": 0,
+    "2018-10 - Sponsion, Museum, Frühstück, Römermuseum": 1,
 }  # Note: there are 2 albums named "Test Album" for testing duplicate album names
 
 UUID_DICT = {
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 065f932d..b9d672b9 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -58,6 +58,8 @@ CLI_EXPORT_FILENAMES = [
 
 CLI_EXPORT_FILENAMES_ALBUM = ["Pumkins1.jpg", "Pumkins2.jpg", "Pumpkins3.jpg"]
 
+CLI_EXPORT_FILENAMES_ALBUM_UNICODE = ["IMG_4547.jpg"]
+
 CLI_EXPORT_FILENAMES_DELETED_TWIN = ["wedding.jpg", "wedding_edited.jpeg"]
 
 CLI_EXPORT_EDITED_SUFFIX = "_bearbeiten"
@@ -451,7 +453,6 @@ def test_query_uuid():
             "--json",
             "--db",
             os.path.join(cwd, CLI_PHOTOS_DB),
-            # "./tests/Test-10.15.1.photoslibrary",
             "--uuid",
             "D79B8D77-BFFC-460B-9312-034F2877D35B",
         ],
@@ -1816,6 +1817,26 @@ def test_export_album():
         files = glob.glob("*")
         assert sorted(files) == sorted(CLI_EXPORT_FILENAMES_ALBUM)
 
+def test_export_album_unicode_name():
+    """Test export of an album with non-English characters in name """
+    import glob
+    import os
+    import os.path
+    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_6), ".", "--album", "2018-10 - Sponsion, Museum, Frühstück, Römermuseum", "-V"],
+        )
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert sorted(files) == sorted(CLI_EXPORT_FILENAMES_ALBUM_UNICODE)
+
+
 
 def test_export_album_deleted_twin():
     """Test export of an album where album of same name has been deleted """