Partial fix for issue #213

osxphotos/__main__.py

@@ -1423,7 +1423,7 @@ def export(
         (export_as_hardlink, exiftool),
         (any(place), no_place),
         (deleted, deleted_only),
-        (skip_edited, skip_original_if_edited)
+        (skip_edited, skip_original_if_edited),
     ]
     if any(all(bb) for bb in exclusive):
         click.echo("Incompatible export options", err=True)

osxphotos/_version.py

@@ -1,3 +1,3 @@
 """ version info """
 
-__version__ = "0.34.1"
+__version__ = "0.34.2"

osxphotos/phototemplate.py

@@ -621,6 +621,9 @@ class PhotoTemplate:
         """ return list of values for a multi-valued template field """
         if field == "album":
             values = self.photo.albums
+            values = [
+                value.replace("/", ":") for value in values
+            ]  # TODO: temp fix for issue #213
         elif field == "keyword":
             values = self.photo.keywords
         elif field == "person":
@@ -638,11 +641,13 @@ class PhotoTemplate:
                 if album.folder_names:
                     # album in folder
                     folder = path_sep.join(album.folder_names)
-                    folder += path_sep + album.title
+                    folder += path_sep + album.title.replace(
+                        "/", ":"
+                    )  # TODO: temp fix for issue #213
                     values.append(folder)
                 else:
                     # album not in folder
-                    values.append(album.title)
+                    values.append(album.title.replace("/", ":"))
         else:
             raise ValueError(f"Unhandleded template value: {field}")
 

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>1942</integer>
+	<integer>80508</integer>
 	<key>processname</key>
 	<string>photolibraryd</string>
 	<key>uid</key>

tests/Test-10.15.6.photoslibrary/database/search/searchMetadata.plist

@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BlacklistedMeaningsByMeaning</key>
-	<dict/>
-	<key>MePersonUUID</key>
-	<string>39488755-78C0-40B2-B378-EDA280E1823C</string>
-	<key>SceneWhitelist</key>
-	<array>
-		<string>Graduation</string>
-		<string>Aquarium</string>
-		<string>Food</string>
-		<string>Ice Skating</string>
-		<string>Mountain</string>
-		<string>Cliff</string>
-		<string>Basketball</string>
-		<string>Tennis</string>
-		<string>Jewelry</string>
-		<string>Cheese</string>
-		<string>Softball</string>
-		<string>Football</string>
-		<string>Circus</string>
-		<string>Jet Ski</string>
-		<string>Playground</string>
-		<string>Carousel</string>
-		<string>Paint Ball</string>
-		<string>Windsurfing</string>
-		<string>Sailboat</string>
-		<string>Sunbathing</string>
-		<string>Dam</string>
-		<string>Fireplace</string>
-		<string>Flower</string>
-		<string>Scuba</string>
-		<string>Hiking</string>
-		<string>Cetacean</string>
-		<string>Pier</string>
-		<string>Bowling</string>
-		<string>Snowboarding</string>
-		<string>Zoo</string>
-		<string>Snowmobile</string>
-		<string>Theater</string>
-		<string>Boat</string>
-		<string>Casino</string>
-		<string>Car</string>
-		<string>Diving</string>
-		<string>Cycling</string>
-		<string>Musical Instrument</string>
-		<string>Board Game</string>
-		<string>Castle</string>
-		<string>Sunset Sunrise</string>
-		<string>Martial Arts</string>
-		<string>Motocross</string>
-		<string>Submarine</string>
-		<string>Cat</string>
-		<string>Snow</string>
-		<string>Kiteboarding</string>
-		<string>Squash</string>
-		<string>Geyser</string>
-		<string>Music</string>
-		<string>Archery</string>
-		<string>Desert</string>
-		<string>Blackjack</string>
-		<string>Fireworks</string>
-		<string>Sportscar</string>
-		<string>Feline</string>
-		<string>Soccer</string>
-		<string>Museum</string>
-		<string>Baby</string>
-		<string>Fencing</string>
-		<string>Railroad</string>
-		<string>Nascar</string>
-		<string>Sky Surfing</string>
-		<string>Bird</string>
-		<string>Games</string>
-		<string>Baseball</string>
-		<string>Dressage</string>
-		<string>Snorkeling</string>
-		<string>Pyramid</string>
-		<string>Kite</string>
-		<string>Rowboat</string>
-		<string>Golf</string>
-		<string>Watersports</string>
-		<string>Lightning</string>
-		<string>Canyon</string>
-		<string>Auditorium</string>
-		<string>Night Sky</string>
-		<string>Karaoke</string>
-		<string>Skiing</string>
-		<string>Parade</string>
-		<string>Forest</string>
-		<string>Hot Air Balloon</string>
-		<string>Dragon Parade</string>
-		<string>Easter Egg</string>
-		<string>Monument</string>
-		<string>Jungle</string>
-		<string>Thanksgiving</string>
-		<string>Jockey Horse</string>
-		<string>Stadium</string>
-		<string>Airplane</string>
-		<string>Ballet</string>
-		<string>Yoga</string>
-		<string>Coral Reef</string>
-		<string>Skating</string>
-		<string>Wrestling</string>
-		<string>Bicycle</string>
-		<string>Tattoo</string>
-		<string>Amusement Park</string>
-		<string>Canoe</string>
-		<string>Cheerleading</string>
-		<string>Ping Pong</string>
-		<string>Fishing</string>
-		<string>Magic</string>
-		<string>Reptile</string>
-		<string>Winter Sport</string>
-		<string>Waterfall</string>
-		<string>Train</string>
-		<string>Bonsai</string>
-		<string>Surfing</string>
-		<string>Dog</string>
-		<string>Cake</string>
-		<string>Sledding</string>
-		<string>Sandcastle</string>
-		<string>Glacier</string>
-		<string>Lighthouse</string>
-		<string>Equestrian</string>
-		<string>Rafting</string>
-		<string>Shore</string>
-		<string>Hockey</string>
-		<string>Santa Claus</string>
-		<string>Formula One Car</string>
-		<string>Sport</string>
-		<string>Vehicle</string>
-		<string>Boxing</string>
-		<string>Rollerskating</string>
-		<string>Underwater</string>
-		<string>Orchestra</string>
-		<string>Carnival</string>
-		<string>Rocket</string>
-		<string>Skateboarding</string>
-		<string>Helicopter</string>
-		<string>Performance</string>
-		<string>Oktoberfest</string>
-		<string>Water Polo</string>
-		<string>Skate Park</string>
-		<string>Animal</string>
-		<string>Nightclub</string>
-		<string>String Instrument</string>
-		<string>Dinosaur</string>
-		<string>Gymnastics</string>
-		<string>Cricket</string>
-		<string>Volcano</string>
-		<string>Lake</string>
-		<string>Aurora</string>
-		<string>Dancing</string>
-		<string>Concert</string>
-		<string>Rock Climbing</string>
-		<string>Hang Glider</string>
-		<string>Rodeo</string>
-		<string>Fish</string>
-		<string>Art</string>
-		<string>Motorcycle</string>
-		<string>Volleyball</string>
-		<string>Wake Boarding</string>
-		<string>Badminton</string>
-		<string>Motor Sport</string>
-		<string>Sumo</string>
-		<string>Parasailing</string>
-		<string>Skydiving</string>
-		<string>Kickboxing</string>
-		<string>Pinata</string>
-		<string>Foosball</string>
-		<string>Go Kart</string>
-		<string>Poker</string>
-		<string>Kayak</string>
-		<string>Swimming</string>
-		<string>Atv</string>
-		<string>Beach</string>
-		<string>Dartboard</string>
-		<string>Athletics</string>
-		<string>Camping</string>
-		<string>Tornado</string>
-		<string>Billiards</string>
-		<string>Rugby</string>
-		<string>Airshow</string>
-	</array>
-</dict>
-</plist>

tests/test_catalina_10_15_6.py

@@ -34,6 +34,7 @@ ALBUMS = [
     "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",
+    "2019-10/11 Paris Clermont",
 ]
 KEYWORDS_DICT = {
     "Kids": 4,
@@ -55,6 +56,7 @@ ALBUM_DICT = {
     "I have a deleted twin": 1,
     "EmptyAlbum": 0,
     "2018-10 - Sponsion, Museum, Frühstück, Römermuseum": 1,
+    "2019-10/11 Paris Clermont": 1,
 }  # Note: there are 2 albums named "Test Album" for testing duplicate album names
 
 UUID_DICT = {

tests/test_cli.py

@@ -182,7 +182,14 @@ CLI_EXPORTED_FILENAME_TEMPLATE_FILENAMES2 = [
     "I have a deleted twin-wedding_edited.jpeg",
 ]
 
+CLI_EXPORTED_FILENAME_TEMPLATE_FILENAMES_PATHSEP = [
+"2018-10 - Sponsion, Museum, Frühstück, Römermuseum/IMG_4547.jpg",
+"Folder1/SubFolder2/AlbumInFolder/IMG_4547.jpg",
+"2019-10:11 Paris Clermont/IMG_4547.jpg",
+]
+
 CLI_EXPORT_UUID = "D79B8D77-BFFC-460B-9312-034F2877D35B"
+CLI_EXPORT_UUID_STATUE = "3DD2C897-F19E-4CA6-8C22-B027D5A71907"
 
 CLI_EXPORT_UUID_FILENAME = "Pumkins2.jpg"
 
@@ -311,6 +318,7 @@ ALBUMS_JSON = {
         "AlbumInFolder": 2,
         "I have a deleted twin": 1,
         "2018-10 - Sponsion, Museum, Frühstück, Römermuseum": 1,
+        "2019-10/11 Paris Clermont": 1,
         "EmptyAlbum": 0,
     },
     "shared albums": {},
@@ -1818,6 +1826,37 @@ def test_export_filename_template_2():
         files = glob.glob("*.*")
         assert sorted(files) == sorted(CLI_EXPORTED_FILENAME_TEMPLATE_FILENAMES2)
 
+def test_export_filename_template_pathsep_in_name():
+    """ export photos using filename template with folder_album and "/" in album name """
+    import locale
+    import os
+    import os.path
+    import pathlib
+    import osxphotos
+    from osxphotos.__main__ import export
+
+    locale.setlocale(locale.LC_ALL, "en_US")
+
+    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),
+                ".",
+                "-V",
+                "--directory",
+                "{folder_album,None}",
+                "--uuid",
+                CLI_EXPORT_UUID_STATUE 
+            ],
+        )
+        assert result.exit_code == 0
+        for fname in CLI_EXPORTED_FILENAME_TEMPLATE_FILENAMES_PATHSEP:
+            # assert fname in result.output
+            assert pathlib.Path(fname).is_file()
 
 def test_export_filename_template_3():
     """ test --filename with invalid template """