MISP
/
PyMISP
mirror of https://github.com/MISP/PyMISP
2
0
Fork 0
Code Issues Releases Wiki Activity

chg: remove fonts from submodules, on-demand download if needed

pull/1310/head
Raphaël Vinot 2024-11-11 12:31:14 +01:00
parent d5e472b95d
commit 0462ab62c0
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "pymisp/data/misp-objects"] [submodule "pymisp/data/misp-objects"]
path = pymisp/data/misp-objects path = pymisp/data/misp-objects
url = https://github.com/MISP/misp-objects url = https://github.com/MISP/misp-objects
[submodule "pymisp/tools/pdf_fonts"]
path = pymisp/tools/pdf_fonts
url = https://github.com/MISP/pdf_fonts

1
pymisp/tools/pdf_fonts

@ -1 +0,0 @@
Subproject commit 7ff222022e6ad99e11a201f62d57da4bff1337ee

16
pymisp/tools/reportlab_generator.py
View File

@ -12,6 +12,8 @@ from pathlib import Path
import sys import sys
import os import os
import requests
if sys.version_info.major >= 3: if sys.version_info.major >= 3:
from html import escape from html import escape
else: else:
@ -410,10 +412,20 @@ def internationalize_font(config=None):
NotoSansCJKtc - Medium.ttf NotoSansCJKtc - Medium.ttf
''' '''
font_path = Path(sys.modules['pymisp'].__file__).parent / 'tools' / 'pdf_fonts' / 'Noto_TTF' font_path = Path(sys.modules['pymisp'].__file__).parent / 'tools' / 'pdf_fonts' / 'Noto_TTF'
noto_bold = font_path / "NotoSansCJKtc-Bold.ttf" noto_bold = font_path / "NotoSansCJKtc-Bold.ttf"
noto = font_path / "NotoSansCJKtc-DemiLight.ttf" noto = font_path / "NotoSansCJKtc-DemiLight.ttf"
if not font_path.is_dir() or not noto_bold.is_file() or not noto.is_file():
font_path.mkdir(parents=True, exist_ok=True)
if not noto_bold.is_file():
bf = requests.get('https://github.com/MISP/pdf_fonts/raw/refs/heads/master/Noto_TTF/NotoSansCJKtc-Bold.ttf')
with open(noto_bold, 'wb') as f:
f.write(bf.content)
if not noto.is_file():
rf = requests.get('https://github.com/MISP/pdf_fonts/raw/refs/heads/master/Noto_TTF/NotoSansCJKtc-DemiLight.ttf')
with open(noto, 'wb') as f:
f.write(rf.content)
if noto_bold.is_file() and noto.is_file(): if noto_bold.is_file() and noto.is_file():
registerFont(TTFont("Noto", noto)) registerFont(TTFont("Noto", noto))
registerFont(TTFont("Noto-bold", noto_bold)) registerFont(TTFont("Noto-bold", noto_bold))
@ -421,7 +433,7 @@ def internationalize_font(config=None):
FIRST_COL_FONT = 'Noto-bold' FIRST_COL_FONT = 'Noto-bold'
SECOND_COL_FONT = 'Noto' SECOND_COL_FONT = 'Noto'
else: else:
logger.error(f"Trying to load a custom (internationalization) font, unable to access the file: {noto_bold}") logger.error(f"Trying to load a custom (internationalization) font, unable to access the file: {noto_bold} / {noto}")
def get_table_styles(): def get_table_styles():