From 4b50e802d25fa0ca01d6dd69b4b66ef8306e8bce Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 31 Oct 2010 01:56:44 +0200 Subject: [PATCH] Expand ~ in LOCAL_TAG_CACHE and LOCAL_MUSIC_FOLDER before use --- mopidy/backends/local/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py index 04761e17..efcc3bbd 100644 --- a/mopidy/backends/local/__init__.py +++ b/mopidy/backends/local/__init__.py @@ -143,11 +143,12 @@ class LocalLibraryController(BaseLibraryController): self.refresh() def refresh(self, uri=None): - tracks = parse_mpd_tag_cache(settings.LOCAL_TAG_CACHE, - settings.LOCAL_MUSIC_FOLDER) + tag_cache = os.path.expanduser(settings.LOCAL_TAG_CACHE) + music_folder = os.path.expanduser(settings.LOCAL_MUSIC_FOLDER) - logger.info('Loading songs in %s from %s', - settings.LOCAL_MUSIC_FOLDER, settings.LOCAL_TAG_CACHE) + tracks = parse_mpd_tag_cache(tag_cache, music_folder) + + logger.info('Loading songs in %s from %s', music_folder, tag_cache) for track in tracks: self._uri_mapping[track.uri] = track