andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve fix for #256

Browse Source 
- Forgot to decode result from glib.get_user_config_dir()
- glib.USER_DIRECTORY_MUSIC isn't always defined
This commit is contained in:
Stein Magnus Jodal 2012-11-21 10:30:06 +01:00
parent 26e6b2e730
commit 6cb2d6293d
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mopidy/utils/path.py
View File

@ -13,15 +13,21 @@ import glib
logger = logging.getLogger('mopidy.utils.path') logger = logging.getLogger('mopidy.utils.path')
DATA_PATH = os.path.join(str(glib.get_user_data_dir()), 'mopidy') XDG_CACHE_DIR = glib.get_user_cache_dir().decode('utf-8'),
SETTINGS_PATH = os.path.join(str(glib.get_user_config_dir()), 'mopidy') XDG_CONFIG_DIR = glib.get_user_config_dir().decode('utf-8'),
SETTINGS_FILE = os.path.join(SETTINGS_PATH, 'settings.py') XDG_DATA_DIR = glib.get_user_data_dir().decode('utf-8'),
XDG_MUSIC_DIR = glib.get_user_special_dir(glib.USER_DIRECTORY_MUSIC)
if XDG_MUSIC_DIR:
XDG_MUSIC_DIR = XDG_MUSIC_DIR.decode('utf-8')
XDG_DIRS = { XDG_DIRS = {
'XDG_CACHE_DIR': glib.get_user_cache_dir().decode('utf-8'), 'XDG_CACHE_DIR': XDG_CACHE_DIR,
'XDG_DATA_DIR': glib.get_user_data_dir().decode('utf-8'), 'XDG_CONFIG_DIR': XDG_CONFIG_DIR,
'XDG_MUSIC_DIR': ( 'XDG_DATA_DIR': XDG_DATA_DIR,
glib.get_user_special_dir(glib.USER_DIRECTORY_MUSIC).decode('utf-8')), 'XDG_MUSIC_DIR': XDG_MUSIC_DIR,
} }
DATA_PATH = os.path.join(XDG_DATA_DIR, 'mopidy')
SETTINGS_PATH = os.path.join(XDG_CONFIG_DIR, 'mopidy')
SETTINGS_FILE = os.path.join(SETTINGS_PATH, 'settings.py')
def get_or_create_folder(folder): def get_or_create_folder(folder):