From ef7e154c4fc31c2e10ee2f3cdf3b04e13d8b59c2 Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Sat, 22 Feb 2020 15:45:14 +0100 Subject: [PATCH] album_artist_from_path(): remove useless code len(dirs) == 0 cannot happen, because `whatever.split('/')` is always a list with at least 1 element. So simplify code and remove useless tests --- picard/util/__init__.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/picard/util/__init__.py b/picard/util/__init__.py index 8d6b9ec51..ab665d9f6 100644 --- a/picard/util/__init__.py +++ b/picard/util/__init__.py @@ -391,13 +391,10 @@ def album_artist_from_path(filename, album, artist): """ if not album: dirs = os.path.dirname(filename).replace('\\', '/').lstrip('/').split('/') - if len(dirs) == 0: - return album, artist # Strip disc subdirectory from list - if len(dirs) > 0: - if re.search(r'(^|\s)(CD|DVD|Disc)\s*\d+(\s|$)', dirs[-1], re.I): - del dirs[-1] - if len(dirs) > 0: + if re.search(r'(^|\s)(CD|DVD|Disc)\s*\d+(\s|$)', dirs[-1], re.I): + del dirs[-1] + if dirs: # For clustering assume %artist%/%album%/file or %artist% - %album%/file album = dirs[-1] if ' - ' in album: