LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

Add check for old folder locations

Browse source
This commit is contained in:
Zestyr 2017-06-19 19:21:59 +02:00
parent 75d1f7f897
commit ddde036e3a
2 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -13,9 +13,9 @@ at anytime.
* *
### Changed ### Changed
* Linux data folder changed from `.lbrynet` to `~/.local/share/LBRY` * Linux default downloads folder changed from `~/Downloads` to `XDG_DOWNLOAD_DIR`
* Linux config folder changed from `.lbryum` to `~/.config/LBRY` * Linux folders moved from the home directory to `~/.local/share/LBRY`
* Linux downloads folder changed from `~/Downloads` to `XDG_DOWNLOAD_DIR` * Windows folders moved from `%APPDATA%/Roaming/lbry` to `%APPDATA%/Local/LBRY`
### Fixed ### Fixed
* Fixed some log messages throwing exceptions * Fixed some log messages throwing exceptions

33
lbrynet/conf.py
View file

@ -54,24 +54,39 @@ elif 'nt' in sys.platform:
from lbrynet.winhelpers.knownpaths import get_path, FOLDERID, UserHandle from lbrynet.winhelpers.knownpaths import get_path, FOLDERID, UserHandle
default_download_dir = 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_lbryum_dir = user_data_dir('lbryum', 'LBRY', roaming=True) # This checks whether the folders are still in their old locations
if os.path.isdir(user_data_dir('lbryum', 'lbry', roaming=True)) and \
os.path.isdir(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)
else:
default_data_dir = user_data_dir('lbrynet', 'LBRY')
default_lbryum_dir = user_data_dir('lbryum', 'LBRY')
else: else:
platform = LINUX platform = LINUX
# This checks whether the folders are still in their old locations
if os.path.isdir(os.path.expanduser('~/.lbrynet')) and \
os.path.isdir(os.path.expanduser('~/.lbryum')):
default_data_dir = os.path.expanduser('~/.lbrynet')
default_lbryum_dir = os.path.expanduser('~/.lbryum')
default_download_dir = os.path.expanduser('~/Downloads')
else:
default_data_dir = user_data_dir('LBRY/lbrynet')
default_lbryum_dir = user_data_dir('LBRY/lbryum')
try: try:
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_dir = re.sub('\"', "", down_dir) default_download_dir = re.sub('\"', '', down_dir)
except: except:
default_download_dir = os.getenv('XDG_DOWNLOAD_DIR') default_download_dir = os.getenv('XDG_DOWNLOAD_DIR')
finally:
if not default_download_dir:
default_download_dir = os.path.join(os.getenv('HOME'), 'Downloads')
default_data_dir = user_data_dir('LBRY') if not default_download_dir:
default_lbryum_dir = user_config_dir('LBRY') default_download_dir = os.path.expanduser('~/Downloads')
ICON_PATH = 'icons' if platform is WINDOWS else 'app.icns' ICON_PATH = 'icons' if platform is WINDOWS else 'app.icns'