milka64/sphinx-d2lang
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix issue when no filename given

Browse source
This commit is contained in:
Michaël Ricart 2025-03-07 16:43:44 +01:00
parent 862c030c85
commit d1967ed144
3 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pyproject.toml
View file

@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "sphinxcontrib-d2lang" name = "sphinxcontrib-d2lang"
version = "0.0.4" version = "0.0.5"
authors = [ authors = [
{ name="Milka64", email="michael.ricart@0w.tf" }, { name="Milka64", email="michael.ricart@0w.tf" },
] ]

2
setup.py
View file

@ -14,7 +14,7 @@ with open('README.md', 'r', encoding='utf8') as file:
setup( setup(
name='sphinxcontrib-d2lang', name='sphinxcontrib-d2lang',
version='0.0.4', version='0.0.5',
author='Milka64', author='Milka64',
author_email='michael.ricart@0w.tf', author_email='michael.ricart@0w.tf',
url='https://git.0w.tf/Milka64/sphinx-d2lang/', url='https://git.0w.tf/Milka64/sphinx-d2lang/',

34
sphinxcontrib/d2lang/d2lang.py
View file

@ -13,20 +13,35 @@ import uuid
class D2langDirective(SphinxDirective): class D2langDirective(SphinxDirective):
required_arguments = 0 required_arguments = 0
has_content = True has_content = True
optional_arguments = 3 optional_arguments = 5
option_spec = { option_spec = {
'layout': directives.unchanged_required, 'layout': directives.unchanged_required,
'filename': directives.unchanged_required, 'filename': directives.unchanged_required,
'width': directives.unchanged_required,
'height': directives.unchanged_required,
} }
def run(self): def run(self):
d2_bin = which('d2') d2_bin = which('d2')
srcdir = self.state.document.settings.env.srcdir srcdir = self.state.document.settings.env.srcdir
diag_source = self.content diag_source = self.content
out_dir = self.state.document.current_source.rsplit("/",1)[0] #out_dir = self.state.document.current_source.rsplit("/",1)[0]
out_dir = self.state.document.current_source.replace(str(self.state.document.settings.env.srcdir)+"/", "").rsplit("/",1)[0]
print("############### " + out_dir)
width = "100%"
height = "100%"
if "width" in self.options:
width = self.options.get("width")
if "height" in self.options:
height = self.options.get("height")
if 'filename' in self.options: if 'filename' in self.options:
output_fname = out_dir + "/" + self.options.get('filename') output_fname = out_dir + "/" + self.options.get('filename')
else: else:
output_fname = out_dir + "/" + "d2lang_svg/" + str(uuid.uuid4()) + ".svg" if out_dir.endswith(".rst") or out_dir.endswith(".md"):
if "/" in out_dir:
out_dir = out_dir.rsplit("/",1)[0]
else:
out_dir = ""
output_fname = out_dir + "/" + str(uuid.uuid4()) + ".svg"
if 'layout' in self.options: if 'layout' in self.options:
layout = self.options.get('layout') layout = self.options.get('layout')
else: else:
@ -48,8 +63,17 @@ class D2langDirective(SphinxDirective):
fp.write(bytes(line,'utf-8')) fp.write(bytes(line,'utf-8'))
fp.write(bytes('\n','utf-8')) fp.write(bytes('\n','utf-8'))
fp.seek(0) fp.seek(0)
build_svg(fp.name, srcdir, output_fname, layout) build_svg(
image_node = nodes.image(uri=output_fname) fp.name,
srcdir,
output_fname,
layout
)
image_node = nodes.image(
uri=output_fname.replace(out_dir+"/",""),
width=width,
height=height,
)
return [image_node] return [image_node]
def build_svg(diag_src, out_dir, filename, layout): def build_svg(diag_src, out_dir, filename, layout):