Use Boxes.description in the cli help and the web interface

This commit is contained in:
Florian Festi 2017-11-30 22:40:45 +01:00
parent 3dfd99c68a
commit 1b2f5791bd
3 changed files with 11 additions and 4 deletions

View File

@ -216,7 +216,10 @@ class Boxes:
def __init__(self): def __init__(self):
self.formats = formats.Formats() self.formats = formats.Formats()
self.argparser = ArgumentParser(description=self.__doc__) description = self.__doc__
if self.description:
description += "\n\n" + self.description
self.argparser = ArgumentParser(description=description)
self.edgesettings = {} self.edgesettings = {}
self.inkscapefile = None self.inkscapefile = None
self.argparser._action_groups[1].title = self.__class__.__name__ + " Settings" self.argparser._action_groups[1].title = self.__class__.__name__ + " Settings"

View File

@ -24,6 +24,7 @@ import time
import codecs import codecs
import mimetypes import mimetypes
import re import re
import markdown
# Python 2 vs Python 3 compat # Python 2 vs Python 3 compat
try: try:
@ -195,6 +196,10 @@ class BServer:
--> -->
<div class="clear"></div> <div class="clear"></div>
<hr /> <hr />
""")
if box.description:
result.append(markdown.markdown(box.description))
result.append("""
</div> </div>
</div> </div>
@ -211,7 +216,7 @@ class BServer:
</body> </body>
</html> </html>
""") """ )
return (s.encode("utf-8") for s in result) return (s.encode("utf-8") for s in result)
def menu(self): def menu(self):

View File

@ -23,7 +23,6 @@ class CustomBuildExtCommand(build_py):
[i for i in glob.glob(os.path.join("inkex", "*.inx"))])) [i for i in glob.glob(os.path.join("inkex", "*.inx"))]))
build_py.run(self) build_py.run(self)
setup( setup(
name='boxes', name='boxes',
version='0.1', version='0.1',
@ -32,7 +31,7 @@ setup(
author_email='florian@festi.info', author_email='florian@festi.info',
url='https://github.com/florianfesti/boxes', url='https://github.com/florianfesti/boxes',
packages=find_packages(), packages=find_packages(),
install_requires=['cairocffi==0.8.0'], install_requires=['cairocffi==0.8.0', 'markdown'],
scripts=['scripts/boxes', 'scripts/boxesserver'], scripts=['scripts/boxes', 'scripts/boxesserver'],
cmdclass={ cmdclass={
'build_py': CustomBuildExtCommand, 'build_py': CustomBuildExtCommand,