#fix 1060 Add 'con' to featuring artists markers #1143
Conversation
| 1, # Only split on the first "feat". | ||
| ) | ||
| feat_tokens(extended=True).translate(None, '()'), | ||
| artist, 1, flags=re.IGNORECASE) |
There was a problem hiding this comment.
Looks like Python 2.6 doesn't like the flags= keyword argument. 😢 I guess the way to work around this is to use re.compile.
|
Wouldn't it be useful to have a .py file somewhere to share beets-specific logic like that between plugins ? |
|
Yes, perhaps it would—and that's more or less what we have already with the artresizer stuff. In this case, though, the data is so simple that config options would almost be easier... |
|
I prefer the function approach that ties the two regexes definitions as opposed to having to declare the two regexes. But I have no precise idea of what you intended by "global config option" so if you think it's the way to go, feel free to edit the code. |
|
Well, I actually tried putting together my regex-config-option idea and I didn't end up liking that much either. 😃 You're right that there's so much duplication that it feels futile.
Sadly, that's the problem—we don't currently have a place for such things. I think you're right that this needs to go in util unless we invent something new: some kind of global beets context module. Bright ideas would be appreciated here… Thanks for your patience. There are a few minor things I'd like to fiddle with—would you mind pushing this to a branch that I can commit to? |
| regex = r'(%s)' % '|'.join(['\\b%s\\b' % re.escape(x) for x in FEAT_WORDS]) | ||
| if for_artist: | ||
| regex = r'(%s|%s)' % \ | ||
| ('|'.join([re.escape(x) for x in FEAT_SPECIAL_CHARS]), regex) |
There was a problem hiding this comment.
Is there a reason that these "special chars" get treated differently? It seems to me like they should get the same \b treatment as the other words.
There was a problem hiding this comment.
I thought too at first sight but
\b Matches the empty string, but only at the beginning or end of a word. A word is defined as a sequence of alphanumeric or underscore characters [...]
so these tokens are not words, and \b don't work with them.
|
Awesome; thank you for the extra effort!! 🐟 |
|
Okay; I just made a few small changes and pushed. Thanks for pointing out the issue with \b; I've switched to using look-ahead and look-behind to sidestep the problem. |
No description provided.