Bug fix in Album

photoscript/__init__.py

@@ -606,7 +606,7 @@ def export(self, export_path, original=False, overwrite=False, timeout=120):
         return exported_photos
 
     def remove_by_id(self, photo_ids):
-        """Remove photos from album.
+        """Remove photos from album. 
             Note: Photos does not provide a way to remove photos from an album via AppleScript.
             This method actually creates a new Album with the same name as the original album and
             copies all photos from original album with exception of those to remove to the new album
@@ -633,6 +633,7 @@ def remove_by_id(self, photo_ids):
         photoslib.delete_album(self)
         new_album.name = name
         self.id = new_album.id
+        self._uuid = new_album.uuid
         return new_album
 
     def remove(self, photos):

photoscript/photoscript.applescript

@@ -683,9 +683,16 @@ end _album_add
 on _album_set_name(_id, _title)
 	(* set name or title of album *)
 	_photoslibrary_waitforphotos(WAIT_FOR_PHOTOS)
-	tell application "Photos"
-		set name of album id (_id) to _title
-	end tell
+	set count_ to 0
+	repeat while count_ < MAX_RETRY
+		tell application "Photos"
+			set name of album id (_id) to _title
+			if name of album id (_id) = _title then
+				return _title
+			end if
+		end tell
+		set count_ to count_ + 1
+	end repeat
 end _album_set_name
 
 on _album_get_path(id_, path_delimiter_)

tests/test_2_album.py

@@ -238,8 +238,9 @@ def test_album_remove_by_id(photoslib):
     uuids = [photo.id for photo in new_album.photos()]
     assert sorted(uuids) == sorted(ALBUM_1_POST_REMOVE_UUIDS)
     assert new_album.title == ALBUM_1_NAME
-    assert new_album.id == album.id
     assert new_album.parent.id == parent_id
+    assert album.id == new_album.id
+    assert album.uuid == new_album.uuid
 
 
 def test_album_remove(photoslib):