From 1841ca2177b1cc0f79c051b2a529153068f60602 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Mon, 24 Oct 2016 23:38:59 +0200 Subject: [PATCH] file: Fix minor style issues --- mopidy/file/ext.conf | 4 ++-- mopidy/file/library.py | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/mopidy/file/ext.conf b/mopidy/file/ext.conf index 64721a26..5470a8ec 100644 --- a/mopidy/file/ext.conf +++ b/mopidy/file/ext.conf @@ -4,8 +4,8 @@ media_dirs = $XDG_MUSIC_DIR|Music ~/|Home show_dotfiles = false -follow_symlinks = false -metadata_timeout = 1000 excluded_file_extensions = .jpg .jpeg +follow_symlinks = false +metadata_timeout = 1000 diff --git a/mopidy/file/library.py b/mopidy/file/library.py index 6a2db5f9..6d426b85 100644 --- a/mopidy/file/library.py +++ b/mopidy/file/library.py @@ -34,13 +34,11 @@ class FileLibraryProvider(backend.LibraryProvider): def __init__(self, backend, config): super(FileLibraryProvider, self).__init__(backend) self._media_dirs = list(self._get_media_dirs(config)) - self._follow_symlinks = config['file']['follow_symlinks'] self._show_dotfiles = config['file']['show_dotfiles'] - self._excluded_file_extensions = \ - config['file']['excluded_file_extensions'] self._excluded_file_extensions = tuple( - bytes(file_ext.lower()) for file_ext in - self._excluded_file_extensions) + bytes(file_ext.lower()) + for file_ext in config['file']['excluded_file_extensions']) + self._follow_symlinks = config['file']['follow_symlinks'] self._scanner = scan.Scanner( timeout=config['file']['metadata_timeout']) @@ -66,8 +64,8 @@ class FileLibraryProvider(backend.LibraryProvider): if not self._show_dotfiles and dir_entry.startswith(b'.'): continue - if self._excluded_file_extensions and \ - dir_entry.endswith(self._excluded_file_extensions): + if (self._excluded_file_extensions and + dir_entry.endswith(self._excluded_file_extensions)): continue if os.path.islink(child_path) and not self._follow_symlinks: