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

imagelist._update_state() -> MetadataItem._update_imagelist_state()

Browse Source
This commit is contained in:
Laurent Monin
2024-05-22 21:34:22 +02:00
parent 18e8a24810
commit c6dde741a3
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
picard/item.py
View File

@@ -227,6 +227,31 @@ class MetadataItem(Item):
return changed
def _update_imagelist_state(self, state):
from picard.track import Track
from picard.util.imagelist import (
ImageList,
_process_images,
)
changed = False
for src_obj in state.sources:
_process_images(state, src_obj, Track)
if state.update_new_metadata:
updated_images = ImageList(state.new_images.values())
changed |= updated_images.hash_dict().keys() != self.metadata.images.hash_dict().keys()
self.metadata.images = updated_images
self.metadata.has_common_images = state.has_common_new_images
if state.update_orig_metadata:
updated_images = ImageList(state.orig_images.values())
changed |= updated_images.hash_dict().keys() != self.orig_metadata.images.hash_dict().keys()
self.orig_metadata.images = updated_images
self.orig_metadata.has_common_images = state.has_common_orig_images
return changed
def metadataitem_update_metadata_images(self):
"""Update the metadata images of the current object based on its children.
@@ -240,12 +265,9 @@ class MetadataItem(Item):
Returns:
bool: True, if images where changed, False otherwise
"""
from picard.util.imagelist import (
_get_state,
_update_state,
)
from picard.util.imagelist import _get_state
return _update_state(self, _get_state(self))
return self._update_imagelist_state(_get_state(self))
class FileListItem(MetadataItem):

22
picard/util/imagelist.py
View File

@@ -140,28 +140,6 @@ def _process_images(state, src_obj, Track):
state.first_orig_obj = False
def _update_state(obj, state):
from picard.track import Track
changed = False
for src_obj in state.sources:
_process_images(state, src_obj, Track)
if state.update_new_metadata:
updated_images = ImageList(state.new_images.values())
changed |= updated_images.hash_dict().keys() != obj.metadata.images.hash_dict().keys()
obj.metadata.images = updated_images
obj.metadata.has_common_images = state.has_common_new_images
if state.update_orig_metadata:
updated_images = ImageList(state.orig_images.values())
changed |= updated_images.hash_dict().keys() != obj.orig_metadata.images.hash_dict().keys()
obj.orig_metadata.images = updated_images
obj.orig_metadata.has_common_images = state.has_common_orig_images
return changed
# TODO: use functools.singledispatch when py3 is supported
def _get_state(obj):
from picard.album import Album