Skip to content

Fonts: search for fonts in system/user paths #2424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
muesli wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fonts: search for fonts in system/user paths #2424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion src/displayapp/fonts/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,43 @@
import argparse
import subprocess

# Common system font locations to try when a font file is not found locally
COMMON_FONT_DIRS = [
'/usr/share/fonts',
'/usr/local/share/fonts',
os.path.expanduser('~/.local/share/fonts'),
os.path.expanduser('~/.fonts'),
]

class Source(object):
def __init__(self, d):
self.file = d['file']
if not os.path.exists(self.file):
self.file = os.path.join(os.path.dirname(sys.argv[0]), self.file)
# First try relative to the script directory (previous behavior)
candidate = os.path.join(os.path.dirname(sys.argv[0]), self.file)
if os.path.exists(candidate):
self.file = candidate
else:
# Fallback: search common system font directories for a matching basename
name = os.path.basename(self.file)
found = None
for font_dir in COMMON_FONT_DIRS:
if not font_dir:
continue
font_dir = os.path.expanduser(font_dir)
if not os.path.isdir(font_dir):
continue
for root, _, files in os.walk(font_dir):
for f in files:
if f.lower() == name.lower():
found = os.path.join(root, f)
Copy link
Member

@mark9064 mark9064 Mar 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nested function that you return from might be nicer than this break pattern

Copy link
Member

@mark9064 mark9064 Mar 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't need to be nested really actually, see what works

Also breaking out the font search to another function or method is probably a good idea structurally

break
if found:
break
if found:
break
if found:
self.file = found
self.range = d.get('range')
self.symbols = d.get('symbols')

Expand Down
34 changes: 33 additions & 1 deletion src/resources/generate-fonts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,43 @@
import argparse
import subprocess

# Common system font locations to try when a font file is not found locally
Copy link
Member

@mark9064 mark9064 Mar 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not ideal that these files are so similar. Might not be worth refactoring though

COMMON_FONT_DIRS = [
'/usr/share/fonts',
'/usr/local/share/fonts',
os.path.expanduser('~/.local/share/fonts'),
os.path.expanduser('~/.fonts'),
]

class Source(object):
def __init__(self, d):
self.file = d['file']
if not os.path.exists(self.file):
self.file = os.path.join(os.path.dirname(sys.argv[0]), self.file)
# First try relative to the script directory (previous behavior)
candidate = os.path.join(os.path.dirname(sys.argv[0]), self.file)
if os.path.exists(candidate):
self.file = candidate
else:
# Fallback: search common system font directories for a matching basename
name = os.path.basename(self.file)
found = None
for font_dir in COMMON_FONT_DIRS:
if not font_dir:
continue
font_dir = os.path.expanduser(font_dir)
if not os.path.isdir(font_dir):
continue
for root, _, files in os.walk(font_dir):
for f in files:
if f.lower() == name.lower():
found = os.path.join(root, f)
break
if found:
break
if found:
break
if found:
self.file = found
self.range = d.get('range')
self.symbols = d.get('symbols')

Expand Down
Loading