More flexible title splitting (#1060)

These tokens should not be artist-exclusive.
beetbox · Dec 16, 2014 · af11ded · af11ded
1 parent c2c1e72
commit af11ded
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/beets/util/__init__.py b/beets/util/__init__.py
@@ -686,9 +686,9 @@ def feat_tokens(for_artist=True):
     The `for_artist` option determines whether the regex should be
     suitable for matching artist fields (the default) or title fields.
     """
-    feat_words = ['ft', 'featuring', 'feat']
+    feat_words = ['ft', 'featuring', 'feat', 'feat.', 'ft.']
     if for_artist:
-        feat_words += ['with', 'vs', 'and', 'con', '&', 'feat.', 'ft.']
+        feat_words += ['with', 'vs', 'and', 'con', '&']
     return '(?<=\s)(?:{0})(?=\s)'.format(
         '|'.join(re.escape(x) for x in feat_words)
     )