Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

More places where SHGetFolder could fail

Browse Source
This commit is contained in:
Kovid Goyal 2015-11-04 21:51:45 +05:30
parent 2d71675fe1
commit b24d9ef07a
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/constants.py
View File

@ -92,7 +92,10 @@ def _get_cache_dir():
if iswindows: if iswindows:
w = plugins['winutil'][0] w = plugins['winutil'][0]
candidate = os.path.join(w.special_folder_path(w.CSIDL_LOCAL_APPDATA), u'%s-cache'%__appname__) try:
candidate = os.path.join(w.special_folder_path(w.CSIDL_LOCAL_APPDATA), u'%s-cache'%__appname__)
except ValueError:
return confcache
elif isosx: elif isosx:
candidate = os.path.join(os.path.expanduser(u'~/Library/Caches'), __appname__) candidate = os.path.join(os.path.expanduser(u'~/Library/Caches'), __appname__)
else: else:
@ -206,8 +209,11 @@ if 'CALIBRE_CONFIG_DIRECTORY' in os.environ:
elif iswindows: elif iswindows:
if plugins['winutil'][0] is None: if plugins['winutil'][0] is None:
raise Exception(plugins['winutil'][1]) raise Exception(plugins['winutil'][1])
config_dir = plugins['winutil'][0].special_folder_path(plugins['winutil'][0].CSIDL_APPDATA) try:
if not os.access(config_dir, os.W_OK|os.X_OK): config_dir = plugins['winutil'][0].special_folder_path(plugins['winutil'][0].CSIDL_APPDATA)
except ValueError:
config_dir = None
if not config_dir or not os.access(config_dir, os.W_OK|os.X_OK):
config_dir = os.path.expanduser('~') config_dir = os.path.expanduser('~')
config_dir = os.path.join(config_dir, 'calibre') config_dir = os.path.join(config_dir, 'calibre')
elif isosx: elif isosx:

5
src/calibre/utils/fonts/scanner.py
View File

@ -100,7 +100,10 @@ def font_dirs():
winutil, err = plugins['winutil'] winutil, err = plugins['winutil']
if err: if err:
raise RuntimeError('Failed to load winutil: %s'%err) raise RuntimeError('Failed to load winutil: %s'%err)
return [winutil.special_folder_path(winutil.CSIDL_FONTS)] try:
return [winutil.special_folder_path(winutil.CSIDL_FONTS)]
except ValueError:
return [r'C:\Windows\Fonts']
if isosx: if isosx:
return [ return [
'/Library/Fonts', '/Library/Fonts',