When grouping tags, update tagged photos to prefer child.
I am also considering applying the opposite effect when ungrouping. Should a photo with A.B get A when A and B are ungrouped? There are some cases where the answer is yes, and others no, depending on the reason you're ungrouping the tags. Whereas this change is non- controversial and simply enforces the existing standard of adding more specific tags to a photo.
This commit is contained in:
		
							parent
							
								
									f1d17350a7
								
							
						
					
					
						commit
						cf64c79809
					
				
					 1 changed files with 22 additions and 0 deletions
				
			
		|  | @ -1217,6 +1217,28 @@ class Tag(ObjectBase, GroupableMixin): | |||
|     def _uncache(self): | ||||
|         self.photodb.caches['tag'].remove(self.id) | ||||
| 
 | ||||
|     def _add_child(self, member): | ||||
|         ret = super()._add_child(member) | ||||
|         if ret is BAIL: | ||||
|             return BAIL | ||||
| 
 | ||||
|         # Suppose a photo has tags A and B. Then, B is added as a child of A. | ||||
|         # We should remove A from the photo leaving only the more specific B. | ||||
|         # We must walk all ancestors, not just the immediate parent, because | ||||
|         # the same situation could apply to a photo that has tag A, where A | ||||
|         # already has children B.C.D, and then E is added as a child of D, | ||||
|         # obsoleting A. | ||||
|         # I expect that this method, which calls `search`, will be inefficient | ||||
|         # when used in a large `add_children` loop. I would consider batching | ||||
|         # up all the ancestors and doing it all at once. Just need to make sure | ||||
|         # I don't cause any collateral damage e.g. removing A from a photo that | ||||
|         # only has A because some other photo with A and B thinks A is obsolete. | ||||
|         # This technique is nice and simple to understand for now. | ||||
|         ancestors = list(member.walk_parents()) | ||||
|         photos = self.photodb.search(tag_musts=[member], is_searchhidden=None, yield_albums=False) | ||||
|         for photo in photos: | ||||
|             photo.remove_tags(ancestors) | ||||
| 
 | ||||
|     @decorators.required_feature('tag.edit') | ||||
|     @decorators.transaction | ||||
|     def add_child(self, *args, **kwargs): | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue