Skip to content
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

Jump to bottom

improve font loader #138

Draft
wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

improve font loader #138

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
85ca44e
improve font dir loader
diamant3 Jan 12, 2024
1c3da35
update logic to check all share directories
diamant3 Jan 13, 2024
5816150
implement `find_shared_dir` function
diamant3 Jan 17, 2024
233c5fd
prioritize have `local` paths
diamant3 Jan 17, 2024
f068696
fix path selection and add some tweaks
diamant3 Jan 19, 2024
c0ca820
improve font loader
diamant3 Jan 20, 2024
6f281a7
forgot win32 check
diamant3 Jan 20, 2024
2c06ca4
check all file extension
diamant3 Jan 20, 2024
b859863
fix file extension check
diamant3 Jan 20, 2024
afc37fe
remove excess file ext check
diamant3 Jan 21, 2024
293fb25
get the filename only
diamant3 Jan 21, 2024
970b0c4
fix win32 font file ext check
diamant3 Jan 21, 2024
afe03eb
fix cant detect fonts from pyfiglet fonts resources
diamant3 Jan 22, 2024
1e33639
simplify
diamant3 Jan 28, 2024
a8b0c1f
add win32 check
diamant3 Jan 28, 2024
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
62 changes: 48 additions & 14 deletions pyfiglet/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,13 @@

RESET_COLORS = b'\033[0m'

if sys.platform == 'win32':
SHARED_DIRECTORY = os.path.join(os.environ["APPDATA"], "pyfiglet")
else:
SHARED_DIRECTORY = '/usr/local/share/pyfiglet/'

SHARED_DIRECTORIES = [
'/usr/local/share/pyfiglet',
'/usr/share/pyfiglet',
'/usr/local/share/figlet',
'/usr/share/figlet',
# add figlet/pyfiglet shared directory path
]

def figlet_format(text, font=DEFAULT_FONT, **kwargs):
fig = Figlet(font, **kwargs)
Expand Down Expand Up @@ -142,12 +144,20 @@ def preloadFont(cls, font):
if path.exists():
font_path = path
break
else:
for location in ("./", SHARED_DIRECTORY):
Copy link
Owner

Choose a reason for hiding this comment

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

This previously checked $PWD as well as SHARED_DIRECTORY. I think we should preserve the existing behaviour.

full_name = os.path.join(location, fn)
if os.path.isfile(full_name):
font_path = pathlib.Path(full_name)
if sys.platform == 'win32':
path = os.path.join(os.environ["APPDATA"], "pyfiglet")
if os.path.exists(path):
path = os.path.join(path, fn)
if os.path.isfile(path):
font_path = pathlib.Path(path)
break
else:
for directory in SHARED_DIRECTORIES:
if os.path.isdir(directory):
path = os.path.join(directory, fn)
if os.path.isfile(path):
font_path = pathlib.Path(path)
break

# Unzip the first file if this file/stream looks like a ZIP file.
if font_path:
Expand All @@ -172,7 +182,20 @@ def isValidFont(cls, font):
if not font.endswith(('.flf', '.tlf')):
return False
f = None
full_file = os.path.join(SHARED_DIRECTORY, font)
full_file = ''
if sys.platform == 'win32':
path = os.path.join(os.environ["APPDATA"], "pyfiglet")
if os.path.isdir(path):
path = os.path.join(path, font)
if os.path.isfile(path):
full_file = pathlib.Path(path)
else:
for directory in SHARED_DIRECTORIES:
if os.path.isdir(directory):
path = os.path.join(directory, font)
if os.path.isfile(path):
full_file = pathlib.Path(path)
break
if os.path.isfile(font):
f = open(font, 'rb')
elif os.path.isfile(full_file):
Expand All @@ -197,8 +220,19 @@ def isValidFont(cls, font):
@classmethod
def getFonts(cls):
all_files = importlib.resources.files('pyfiglet.fonts').iterdir()
if os.path.isdir(SHARED_DIRECTORY):
all_files = itertools.chain(all_files, pathlib.Path(SHARED_DIRECTORY).iterdir())
shared_dir = set()
if sys.platform == 'win32':
path = os.path.join(os.environ["APPDATA"], "pyfiglet")
if os.path.isdir(path):
shared_dir.update(pathlib.Path(path).iterdir())
else:
for directory in SHARED_DIRECTORIES:
if os.path.isdir(directory):
shared_dir.update(pathlib.Path(directory).iterdir())
if shared_dir:
all_files = itertools.chain(all_files, shared_dir)
else:
all_files = itertools.chain(all_files)
return [font.name.split('.', 2)[0] for font
in all_files
if font.is_file() and cls.isValidFont(font.name)]
Expand Down Expand Up @@ -234,7 +268,7 @@ def installFonts(file_name):
location = str(importlib.resources.files('pyfiglet.fonts'))
else:
# Figlet is installed using a zipped resource - don't try to upload to it.
location = SHARED_DIRECTORY
location = '/usr/local/share/pyfiglet'

print("Installing {} to {}".format(file_name, location))

Expand Down
Loading