codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change get_default_download_dir to use expanduser as fallback

This commit is contained in:
Calum Lind 2014-02-03 12:26:57 +00:00
parent dc0000059b
commit bddfb2a5c6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
deluge/common.py
View File

@ -165,21 +165,21 @@ def get_default_download_dir():
:rtype: string :rtype: string
""" """
if windows_check(): download_dir = ""
return os.path.join(os.path.expanduser("~"), 'Downloads') if not windows_check():
else:
from xdg.BaseDirectory import xdg_config_home from xdg.BaseDirectory import xdg_config_home
userdir_file = os.path.join(xdg_config_home, 'user-dirs.dirs')
try: try:
for line in open(userdir_file, 'r'): with open(os.path.join(xdg_config_home, 'user-dirs.dirs'), 'r') as _file:
if not line.startswith('#') and 'XDG_DOWNLOAD_DIR' in line: for line in _file:
if not line.startswith('#') and line.startswith('XDG_DOWNLOAD_DIR'):
download_dir = os.path.expandvars(line.partition("=")[2].rstrip().strip('"')) download_dir = os.path.expandvars(line.partition("=")[2].rstrip().strip('"'))
if os.path.isdir(download_dir): break
return download_dir
except IOError: except IOError:
pass pass
return os.environ.get("HOME") if not download_dir:
download_dir = os.path.join(os.path.expanduser("~"), 'Downloads')
return download_dir
def windows_check(): def windows_check():