Merge pull request #2759 from Vrihub/2738-filename-tracknumber

First tentative fix for issue 2738.

Author: sampsyo

beetsplug/fromfilename.py

@@ -27,30 +27,21 @@
 
 # Filename field extraction patterns.
 PATTERNS = [
-    # "01 - Track 01" and "01": do nothing
-    r'^(\d+)\s*-\s*track\s*\d$',
-    r'^\d+$',
-
-    # Useful patterns.
-    r'^(?P<artist>.+)-(?P<title>.+)-(?P<tag>.*)$',
-    r'^(?P<track>\d+)\s*-(?P<artist>.+)-(?P<title>.+)-(?P<tag>.*)$',
-    r'^(?P<track>\d+)\s(?P<artist>.+)-(?P<title>.+)-(?P<tag>.*)$',
-    r'^(?P<artist>.+)-(?P<title>.+)$',
-    r'^(?P<track>\d+)\.\s*(?P<artist>.+)-(?P<title>.+)$',
-    r'^(?P<track>\d+)\s*-\s*(?P<artist>.+)-(?P<title>.+)$',
-    r'^(?P<track>\d+)\s*-(?P<artist>.+)-(?P<title>.+)$',
-    r'^(?P<track>\d+)\s(?P<artist>.+)-(?P<title>.+)$',
-    r'^(?P<title>.+)$',
-    r'^(?P<track>\d+)\.\s*(?P<title>.+)$',
-    r'^(?P<track>\d+)\s*-\s*(?P<title>.+)$',
-    r'^(?P<track>\d+)\s(?P<title>.+)$',
-    r'^(?P<title>.+) by (?P<artist>.+)$',
+  # Useful patterns.
+  r'^(?P<artist>.+)[\-_](?P<title>.+)[\-_](?P<tag>.*)$',
+  r'^(?P<track>\d+)[\s.\-_]+(?P<artist>.+)[\-_](?P<title>.+)[\-_](?P<tag>.*)$',
+  r'^(?P<artist>.+)[\-_](?P<title>.+)$',
+  r'^(?P<track>\d+)[\s.\-_]+(?P<artist>.+)[\-_](?P<title>.+)$',
+  r'^(?P<title>.+)$',
+  r'^(?P<track>\d+)[\s.\-_]+(?P<title>.+)$',
+  r'^(?P<track>\d+)\s+(?P<title>.+)$',
+  r'^(?P<title>.+) by (?P<artist>.+)$',
+  r'^(?P<track>\d+).*$',
 ]
 
 # Titles considered "empty" and in need of replacement.
 BAD_TITLE_PATTERNS = [
     r'^$',
-    r'\d+?\s?-?\s*track\s*\d+',
 ]
 
 

docs/changelog.rst

@@ -88,9 +88,12 @@ Fixes:
   "Edit Candidates" option is used. :bug:`2734`
 * Fix a crash when numeric metadata fields contain just a minus or plus sign
   with no following numbers. Thanks to :user:`eigengrau`. :bug:`2741`
+* :doc:`/plugins/fromfilename`: Allow file names such as "01.mp3" to extract the track number.
+  Also allow "_" as a separator. Refactor some regular expressions. :bug:`2738`
 * Fixed an issue where images would be resized according to their longest edge,
   instead of their width. Thanks to :user:`sekjun9878`. :bug:`2729`
 
+
 For developers:
 
 * Fixed fields in Album and Item objects are now more strict about translating