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

Font scanner: Also scan the new win 10 local font paths

Browse Source 
Fixes #1888798 [Additional Windows 10 font directory location (v 1809)](https://bugs.launchpad.net/calibre/+bug/1888798)
This commit is contained in:
Kovid Goyal 2020-07-24 13:03:52 +05:30
parent 742187742a
commit 9b386b6a46
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,10 +103,16 @@ 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)
try: paths = {os.path.normcase(r'C:\Windows\Fonts')}
return [winutil.special_folder_path(winutil.CSIDL_FONTS)] for which in (winutil.CSIDL_FONTS, winutil.CSIDL_LOCAL_APPDATA, winutil.CSIDL_APPDATA):
except ValueError: try:
return [r'C:\Windows\Fonts'] path = winutil.special_folder_path(winutil.CSIDL_FONTS)
except ValueError:
continue
if which != winutil.CSIDL_FONTS:
path = os.path.join(path, r'Microsoft\Windows\Fonts')
paths.add(os.path.normcase(path))
return list(paths)
if isosx: if isosx:
return [ return [
'/Library/Fonts', '/Library/Fonts',