fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-16 04:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ImageListState.process_images_*(): pass metadata instead of parent object

Browse Source
This commit is contained in:
Laurent Monin
2024-05-23 11:11:47 +02:00
parent bef084ffcc
commit 1b8294da9b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
picard/item.py
View File

@@ -264,9 +264,9 @@ class MetadataItem(Item):
changed = False
for src_obj in sources:
state.process_images_new(src_obj)
state.process_images_new(src_obj.metadata)
if not isinstance(src_obj, Track):
state.process_images_orig(src_obj)
state.process_images_orig(src_obj.orig_metadata)
if self.update_new_metadata:
updated_images = ImageList(state.new_images.values())

8
picard/util/imagelist.py
View File

@@ -121,10 +121,10 @@ class ImageListState:
self.update_new_metadata = update_new_metadata
self.update_orig_metadata = update_orig_metadata
def process_images_new(self, src_obj):
def process_images_new(self, src_obj_metadata):
# Check new images
if self.update_new_metadata:
src_dict = src_obj.metadata.images.hash_dict()
src_dict = src_obj_metadata.images.hash_dict()
prev_len = len(self.new_images)
self.new_images.update(src_dict)
if len(self.new_images) != prev_len:
@@ -133,10 +133,10 @@ class ImageListState:
if self.first_new_obj:
self.first_new_obj = False
def process_images_orig(self, src_obj):
def process_images_orig(self, src_obj_metadata):
if self.update_orig_metadata:
# Check orig images, but not for Tracks (which don't have a useful orig_metadata)
src_dict = src_obj.orig_metadata.images.hash_dict()
src_dict = src_obj_metadata.images.hash_dict()
prev_len = len(self.orig_images)
self.orig_images.update(src_dict)
if len(self.orig_images) != prev_len: