Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

Shorten download dir variable for consistency

Browse source
This commit is contained in:
Zestyr 2017-06-18 07:12:51 +02:00
parent 5db5d20f77
commit 28613f1990
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lbrynet/conf.py
View file

@ -46,14 +46,14 @@ settings_encoders = {
if 'darwin' in sys.platform: if 'darwin' in sys.platform:
platform = DARWIN platform = DARWIN
default_download_directory = os.path.expanduser('~/Downloads') default_download_dir = os.path.expanduser('~/Downloads')
default_data_dir = user_data_dir('LBRY') default_data_dir = user_data_dir('LBRY')
default_lbryum_dir = os.path.expanduser('~/.lbryum') default_lbryum_dir = os.path.expanduser('~/.lbryum')
elif 'nt' in sys.platform: elif 'nt' in sys.platform:
platform = WINDOWS platform = WINDOWS
from lbrynet.winhelpers.knownpaths import get_path, FOLDERID, UserHandle from lbrynet.winhelpers.knownpaths import get_path, FOLDERID, UserHandle
default_download_directory = get_path(FOLDERID.Downloads, UserHandle.current) default_download_dir = get_path(FOLDERID.Downloads, UserHandle.current)
default_data_dir = user_data_dir('lbrynet', 'LBRY', roaming=True) default_data_dir = user_data_dir('lbrynet', 'LBRY', roaming=True)
default_lbryum_dir = user_data_dir('lbryum', 'LBRY', roaming=True) default_lbryum_dir = user_data_dir('lbryum', 'LBRY', roaming=True)
else: else:
@ -63,12 +63,12 @@ else:
with open(os.path.join(user_config_dir(), "/user-dirs.dirs"), 'r') as xdg: with open(os.path.join(user_config_dir(), "/user-dirs.dirs"), 'r') as xdg:
down_dir = re.search(r'XDG_DOWNLOAD_DIR=(.+)', xdg.read()).group(1) down_dir = re.search(r'XDG_DOWNLOAD_DIR=(.+)', xdg.read()).group(1)
down_dir = re.sub('\$HOME', os.getenv('HOME'), down_dir) down_dir = re.sub('\$HOME', os.getenv('HOME'), down_dir)
default_download_directory = re.sub('\"', "", down_dir) default_download_dir = re.sub('\"', "", down_dir)
except: except:
default_download_directory = os.getenv('XDG_DOWNLOAD_DIR') default_download_dir = os.getenv('XDG_DOWNLOAD_DIR')
finally: finally:
if not default_download_directory: if not default_download_dir:
default_download_directory = os.path.join(os.getenv('HOME'), 'Downloads') default_download_dir = os.path.join(os.getenv('HOME'), 'Downloads')
default_data_dir = user_data_dir('LBRY') default_data_dir = user_data_dir('LBRY')
default_lbryum_dir = user_config_dir('LBRY') default_lbryum_dir = user_config_dir('LBRY')
@ -173,7 +173,7 @@ ADJUSTABLE_SETTINGS = {
'default_ui_branch': (str, 'master'), 'default_ui_branch': (str, 'master'),
'delete_blobs_on_remove': (bool, True), 'delete_blobs_on_remove': (bool, True),
'dht_node_port': (int, 4444), 'dht_node_port': (int, 4444),
'download_directory': (str, default_download_directory), 'download_directory': (str, default_download_dir),
'download_timeout': (int, 180), 'download_timeout': (int, 180),
'host_ui': (bool, True), 'host_ui': (bool, True),
'is_generous_host': (bool, True), 'is_generous_host': (bool, True),