fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-17 21:24:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expand "Use original values" to tracks and albums

Browse Source
This commit is contained in:
Gabriel Ferreira
2020-08-12 17:01:28 -03:00
committed by Philipp Wolfer
parent 259a68d4e0
commit 6aea0c068f
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
picard/album.py
View File

@@ -20,6 +20,7 @@
# Copyright (C) 2017 Antonio Larrosa
# Copyright (C) 2018 Vishal Choudhary
# Copyright (C) 2019 Joel Lintunen
# Copyright (C) 2020 Gabriel Ferreira
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -374,6 +375,7 @@ class Album(DataObject, Item):
for file in list(track.linked_files):
file.move(self.unmatched_files)
self.metadata = self._new_metadata
self.orig_metadata.copy(self.metadata)
self.tracks = self._new_tracks
del self._new_metadata
del self._new_tracks

19
picard/ui/metadatabox.py
View File

@@ -13,6 +13,7 @@
# Copyright (C) 2015, 2018-2020 Philipp Wolfer
# Copyright (C) 2016-2018 Sambhav Kothari
# Copyright (C) 2018 Vishal Choudhary
# Copyright (C) 2020 Gabriel Ferreira
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -352,12 +353,25 @@ class MetadataBox(QtWidgets.QTableWidget):
removals.append(partial(self.remove_tag, tag))
status = self.tag_diff.status[tag] & TagStatus.CHANGED
if status == TagStatus.CHANGED or status == TagStatus.REMOVED:
file_tracks = []
track_albums = set()
for file in self.files:
objects = [file]
if file.parent in self.tracks and len(self.files & set(file.parent.linked_files)) == 1:
objects.append(file.parent)
file_tracks.append(file.parent)
track_albums.add(file.parent.album)
orig_values = list(file.orig_metadata.getall(tag)) or [""]
useorigs.append(partial(self.set_tag_values, tag, orig_values, objects))
for track in set(self.tracks)-set(file_tracks):
objects = [track]
orig_values = list(track.orig_metadata.getall(tag)) or [""]
useorigs.append(partial(self.set_tag_values, tag, orig_values, objects))
track_albums.add(track.album)
for album in track_albums:
objects = [album]
orig_values = list(album.orig_metadata.getall(tag)) or [""]
useorigs.append(partial(self.set_tag_values, tag, orig_values, objects))
if removals:
remove_tag_action = QtWidgets.QAction(_("Remove"), self.parent)
remove_tag_action.triggered.connect(lambda: [f() for f in removals])
@@ -527,7 +541,10 @@ class MetadataBox(QtWidgets.QTableWidget):
if track.num_linked_files == 0:
for name, values in track.metadata.rawitems():
if not name.startswith("~"):
tag_diff.add(name, values, values, True)
if name in track.orig_metadata:
tag_diff.add(name, [track.orig_metadata[name]], values, True)
else:
tag_diff.add(name, values, values, True)
length = str(track.metadata.length)
tag_diff.add("~length", length, length, False)