fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-04-05 03:55:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

album_artist_from_path(): simplify regex

Browse Source 
Use word boundaries and do not capture
This commit is contained in:
Laurent Monin
2020-02-22 15:48:32 +01:00
parent ef7e154c4f
commit dc77e652be
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
picard/util/__init__.py
View File

@@ -392,7 +392,7 @@ def album_artist_from_path(filename, album, artist):
if not album:
dirs = os.path.dirname(filename).replace('\\', '/').lstrip('/').split('/')
# Strip disc subdirectory from list
if re.search(r'(^|\s)(CD|DVD|Disc)\s*\d+(\s|$)', dirs[-1], re.I):
if re.search(r'\b(?:CD|DVD|Disc)\s*\d+\b', dirs[-1], re.I):
del dirs[-1]
if dirs:
# For clustering assume %artist%/%album%/file or %artist% - %album%/file