fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2025-12-22 09:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed "item" attribute to "ui_item"

Browse Source
This commit is contained in:
Philipp Wolfer
2024-06-03 08:09:46 +02:00
parent 321637b6d6
commit d4ba9fc989
7 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
picard/album.py
View File

@@ -510,7 +510,7 @@ class Album(MetadataItem):
for func, always in self._after_load_callbacks:
func()
self._after_load_callbacks = []
if self.item.isSelected():
if self.ui_item.isSelected():
self.tagger.window.refresh_metadatabox()
self.tagger.window.cover_art_box.update_metadata()
@@ -630,8 +630,8 @@ class Album(MetadataItem):
self.load_task = None
def update(self, update_tracks=True, update_selection=True):
if self.item:
self.item.update(update_tracks, update_selection=update_selection)
if self.ui_item:
self.ui_item.update(update_tracks, update_selection=update_selection)
def add_file(self, track, file, new_album=True):
self._files_count += 1

8
picard/cluster.py
View File

@@ -142,7 +142,7 @@ class Cluster(FileList):
self.update(signal=False)
if self.can_show_coverart:
self.add_metadata_images_from_children(added_files)
self.item.add_files(added_files)
self.ui_item.add_files(added_files)
if new_album:
self._update_related_album(added_files=added_files)
@@ -154,7 +154,7 @@ class Cluster(FileList):
self.metadata.length -= file.metadata.length
self.files.remove(file)
self.update(signal=False)
self.item.remove_file(file)
self.ui_item.remove_file(file)
if self.can_show_coverart:
file.metadata_images_changed.disconnect(self.update_metadata_images)
self.remove_metadata_images_from_children([file])
@@ -166,8 +166,8 @@ class Cluster(FileList):
def update(self, signal=True):
self.metadata['~totalalbumtracks'] = self.metadata['totaltracks'] = len(self.files)
if signal and self.item:
self.item.update()
if signal and self.ui_item:
self.ui_item.update()
def get_num_files(self):
return len(self.files)

4
picard/file.py
View File

@@ -946,8 +946,8 @@ class File(MetadataItem):
self.update_item(update_selection=False)
def update_item(self, update_selection=True):
if self.item:
self.item.update(update_selection=update_selection)
if self.ui_item:
self.ui_item.update(update_selection=update_selection)
def iterfiles(self, save=False):
yield self

5
picard/item.py
View File

@@ -39,6 +39,9 @@ from picard.util.imagelist import ImageList
class Item:
def __init__(self):
self.ui_item = None
@property
def can_save(self):
"""Return if this object can be saved."""
@@ -185,8 +188,6 @@ class MetadataItem(QtCore.QObject, Item):
def __init__(self, obj_id=None):
super().__init__()
self.id = obj_id
# FIXME: Rename to ui_item
self.item = None
self.metadata = Metadata()
self.orig_metadata = Metadata()
self.update_children_metadata_attrs = {}

2
picard/tagger.py
View File

@@ -726,7 +726,7 @@ class Tagger(QtWidgets.QApplication):
self.nats = NatAlbum()
self.albums['NATS'] = self.nats
self.album_added.emit(self.nats)
self.nats.item.setExpanded(True)
self.nats.ui_item.setExpanded(True)
return self.nats
def move_file_to_nat(self, file, recordingid, node=None):

6
picard/track.py
View File

@@ -196,7 +196,7 @@ class Track(FileListItem):
self.metadata.images = self._orig_images.copy()
run_file_post_removal_from_track_processors(self, file)
self.update()
if self.item.isSelected():
if self.ui_item.isSelected():
self.tagger.window.refresh_metadatabox()
@staticmethod
@@ -211,8 +211,8 @@ class Track(FileListItem):
metadata.strip_whitespace()
def update(self):
if self.item:
self.item.update()
if self.ui_item:
self.ui_item.update()
def is_linked(self):
return self.num_linked_files > 0

26
picard/ui/itemviews/__init__.py
View File

@@ -223,7 +223,7 @@ class MainPanel(QtWidgets.QSplitter):
view.setSortingEnabled(sort)
def select_object(self, obj):
item = obj.item
item = obj.ui_item
for view in self._views:
if view.indexFromItem(item).isValid():
view.setCurrentItem(item)
@@ -255,8 +255,8 @@ class FileTreeView(BaseTreeView):
self.set_clusters_text()
def remove_file_cluster(self, cluster):
cluster.item.setSelected(False)
self.clusters.removeChild(cluster.item)
cluster.ui_item.setSelected(False)
self.clusters.removeChild(cluster.ui_item)
self.set_clusters_text()
def set_clusters_text(self):
@@ -295,8 +295,8 @@ class AlbumTreeView(BaseTreeView):
self.add_cluster(album.unmatched_files, item)
def remove_album(self, album):
album.item.setSelected(False)
self.takeTopLevelItem(self.indexOfTopLevelItem(album.item))
album.ui_item.setSelected(False)
self.takeTopLevelItem(self.indexOfTopLevelItem(album.ui_item))
class TreeItem(QtWidgets.QTreeWidgetItem):
@@ -305,7 +305,7 @@ class TreeItem(QtWidgets.QTreeWidgetItem):
super().__init__(parent)
self.obj = obj
if obj is not None:
obj.item = self
obj.ui_item = self
self.sortable = sortable
self._sortkeys = {}
self.post_init()
@@ -363,7 +363,7 @@ class ClusterItem(TreeItem):
self.update_colums_text()
album = self.obj.related_album
if self.obj.special and album and album.loaded:
album.item.update(update_tracks=False)
album.ui_item.update(update_tracks=False)
if update_selection and self.isSelected():
TreeItem.window.update_selection(new_selection=False)
@@ -383,8 +383,8 @@ class ClusterItem(TreeItem):
item.update()
def remove_file(self, file):
file.item.setSelected(False)
self.removeChild(file.item)
file.ui_item.setSelected(False)
self.removeChild(file.ui_item)
self.update()
if self.obj.hide_if_empty and not self.obj.files:
self.setHidden(True)
@@ -410,7 +410,7 @@ class AlbumItem(TreeItem):
track = album.tracks[i]
selection_changed |= item.isSelected() and item.obj != track
item.obj = track
track.item = item
track.ui_item = item
item.update(update_album=False)
if newnum > oldnum: # add new items
items = []
@@ -479,7 +479,7 @@ class TrackItem(TreeItem):
fingerprint_column = DEFAULT_COLUMNS.pos('~fingerprint')
if num_linked_files == 1:
file = track.files[0]
file.item = self
file.ui_item = self
color = TrackItem.track_colors[file.state]
bgcolor = get_match_color(file.similarity, TreeItem.base_color)
icon, icon_tooltip = FileItem.decide_file_icon_info(file)
@@ -512,13 +512,13 @@ class TrackItem(TreeItem):
newnum = track.num_linked_files
if oldnum > newnum: # remove old items
for i in range(oldnum - newnum):
self.takeChild(newnum - 1).obj.item = None
self.takeChild(newnum - 1).obj.ui_item = None
oldnum = newnum
for i in range(oldnum): # update existing items
item = self.child(i)
file = track.files[i]
item.obj = file
file.item = item
file.ui_item = item
item.update(update_track=False)
if newnum > oldnum: # add new items
items = []