From 69ddfe4eb0541fd784811becc10a778efd4a860c Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Thu, 25 Apr 2013 22:28:24 +0200 Subject: [PATCH] local: Do not create missing media/playlists dir --- mopidy/backends/local/actor.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/mopidy/backends/local/actor.py b/mopidy/backends/local/actor.py index 1817e133..75cc485f 100644 --- a/mopidy/backends/local/actor.py +++ b/mopidy/backends/local/actor.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals import logging +import os.path import pykka @@ -19,7 +20,7 @@ class LocalBackend(pykka.ThreadingActor, base.Backend): self.config = config - self.create_dirs_and_files() + self.check_dirs_and_files() self.library = LocalLibraryProvider(backend=self) self.playback = base.BasePlaybackProvider(audio=audio, backend=self) @@ -27,20 +28,14 @@ class LocalBackend(pykka.ThreadingActor, base.Backend): self.uri_schemes = ['file'] - def create_dirs_and_files(self): - try: - path.get_or_create_dir(self.config['local']['media_dir']) - except EnvironmentError as error: - logger.warning( - 'Could not create local media dir: %s', - encoding.locale_decode(error)) + def check_dirs_and_files(self): + if not os.path.isdir(self.config['local']['media_dir']): + logger.warning('Local media dir %s does not exist.' % + self.config['local']['media_dir']) - try: - path.get_or_create_dir(self.config['local']['playlists_dir']) - except EnvironmentError as error: - logger.warning( - 'Could not create local playlists dir: %s', - encoding.locale_decode(error)) + if not os.path.isdir(self.config['local']['playlists_dir']): + logger.warning('Local playlists dir %s does not exist.' % + self.config['local']['playlists_dir']) try: path.get_or_create_file(self.config['local']['tag_cache_file'])