Duplicates plugin: tiebreak album vs items fix #2758
Conversation
…nsidered, otherwise use default (eg, if only items is specified, and -a is being used, use default order of priority
There was a problem hiding this comment.
Thanks for catching this! It does indeed look like a problem.
It seems like there may be another potential problem with calling all_keys on kind if that variable is now going to be a string instead of a class object. Maybe we should come up with a separate variable name for that?
Also, would you mind adding a brief changelog entry describing the problem that was fixed?
beetsplug/duplicates.py
Outdated
| key = lambda x: tuple(getattr(x, k) for k in tiebreak[kind]) | ||
| else: | ||
| kind = Item if all(isinstance(o, Item) for o in objs) else Album | ||
| if kind is Item: | ||
| if kind is 'items': |
There was a problem hiding this comment.
I think the proper comparison operator on strings is ==, not is.
There was a problem hiding this comment.
Yes, it is... oops.
| key = lambda x: tuple(getattr(x, k) for k in tiebreak[kind]) | ||
| else: | ||
| kind = Item if all(isinstance(o, Item) for o in objs) else Album |
There was a problem hiding this comment.
Line 269, below, assumes that kind is a Model class, not a string.
There was a problem hiding this comment.
Oops... that code is never run in my specific configuration, but line 269 just needs Item.all_keys(), so it's an easy change.
|
Those issues should be fixed now, thanks. |
|
Perfect; thank you! ✨ |
Duplicates plugin: tiebreak album vs items fix
At present, if tiebreak is specified to give keys for the order of priority in determining duplicates, it must be specified for both items and albums, or an error will be raised when the unspecified one is used. This is particularly bad because the default order of priority appears to be impossible to specify in tiebreak, so if the user wants (as in my case) a tiebreak specification for items, and the default order for albums, this is impossible.
This small change makes it so that tiebreak is only used if it specifies keys for ordering the kind (track/album) being considered; otherwise, the default is used.