guy176251/markdown-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11 from VictorCabello/master

Browse Source 
minor maintenance
This commit is contained in:
Masato Ohba
2019-10-11 23:56:52 +09:00
committed by GitHub
parent 57c2012cd9 70ece88089
commit 72ba82b09e
4 changed files with 92 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
markdownserver/__init__.py
+16 -7
View File
@@ -1,23 +1,32 @@
from bottle import route,run,template,static_file from __future__ import absolute_import
from markdown_converter import MarkdownConverter from bottle import route, run, static_file
from env import * from .markdown_converter import MarkdownConverter
from .env import root_path, ms_host, ms_port, ms_debug
import os import os
converter = MarkdownConverter() converter = MarkdownConverter()
@route('/<resource:re:.*\.md>') @route(r'/<resource:re:.*\.md>')
def gfmize(resource): def gfmize(resource):
if resource == 'favicon.ico': if resource == 'favicon.ico':
return '' return ''
html_file_name = os.path.basename(converter.convert(resource)) html_file_name = os.path.basename(converter.convert(resource))
if '/' in resource: if '/' in resource:
html_file_name = '/'.join(resource.split('/')[:-1]) + '/' + html_file_name html_file_name = '/'.join(resource.split('/')[:-1]) + \
return static_file(os.path.join('resources/html', html_file_name), root=root_path) '/' + html_file_name
return static_file(os.path.join('resources/html',
html_file_name),
root=root_path)
def main(): def main():
run(host=ms_host,port=ms_port,debug=ms_debug,reloader=ms_reloader) run(host=ms_host,
port=ms_port,
debug=ms_debug,
reloader=False)
if __name__ == '__main__': if __name__ == '__main__':
main() main()
markdownserver/env.py
+10 -10
View File
@@ -1,16 +1,16 @@
import os import os
ms_encoding = 'utf-8' ms_encoding = "utf-8"
ms_port = '8009' ms_port = "8009"
ms_host = 'localhost' ms_host = "localhost"
ms_debug = True ms_debug = True
ms_reloader = True ms_reloader = True
html_extension = '.html' html_extension = ".html"
root_path = os.path.dirname(__file__) root_path = os.path.dirname(__file__)
resource_dir = os.path.join(root_path,'resources') resource_dir = os.path.join(root_path, "resources")
markdown_dir = os.path.join(resource_dir,'markdown') markdown_dir = os.path.join(resource_dir, "markdown")
html_dir = os.path.join(resource_dir,'html') html_dir = os.path.join(resource_dir, "html")
css_dir = os.path.join(resource_dir,'css') css_dir = os.path.join(resource_dir, "css")
css_name = 'github.css' css_name = "github.css"
css_path = os.path.join(css_dir, css_name) css_path = os.path.join(css_dir, css_name)
markdown_type = 'gfm' markdown_type = "gfm"
markdownserver/markdown_converter.py
+29 -15
View File
@@ -1,38 +1,50 @@
from __future__ import print_function
from __future__ import absolute_import
from builtins import object
import markdown as md import markdown as md
import codecs import codecs
import sys import sys
import os import os
from env import * from .env import css_path, ms_encoding, markdown_type, \
html_dir, html_extension
class MarkdownConverter(object): class MarkdownConverter(object):
def __init__(self): def __init__(self):
css = codecs.open(css_path,encoding=ms_encoding,mode='r') css = codecs.open(css_path, encoding=ms_encoding, mode="r")
self.html_header = ''' self.html_header = (
"""
<html> <html>
<head> <head>
<style type='text/css'> <style type='text/css'>
<!-- <!--
''' + css.read() + \ """
''' + css.read()
+ """
//--> //-->
</style> </style>
</head> </head>
<body> <body>
<div class='markdown-body'> <div class='markdown-body'>
''' """
self.html_footer = ''' )
self.html_footer = """
</div> </div>
</body> </body>
</html> </html>
''' """
def convert(self, src, dst=""): def convert(self, src, dst=""):
code = md.markdown(self.read_md(src), extensions=[markdown_type]) code = md.markdown(self.read_md(src), extensions=[markdown_type])
return self.write_html(code, src, dst) return self.write_html(code, src, dst)
def read_md(self, file_name): def read_md(self, file_name):
md_file = codecs.open(os.path.join(markdown_dir, file_name),encoding=ms_encoding,mode='r') workingdir = os.getcwd()
md_file = codecs.open(
os.path.join(workingdir, file_name),
encoding=ms_encoding,
mode="r"
)
return md_file.read() return md_file.read()
def write_html(self, body, file_name, dst): def write_html(self, body, file_name, dst):
@@ -41,21 +53,23 @@ class MarkdownConverter(object):
if dst != "": if dst != "":
html_path = dst html_path = dst
try: try:
os.makedirs('/'.join(html_path.replace('\\', '/').split('/')[:-1])) os.makedirs("/".join(html_path.replace("\\", "/").split("/")[:-1]))
except OSError as exc: except OSError:
pass pass
html_file = codecs.open(html_path,encoding=ms_encoding,mode='w') html_file = codecs.open(html_path, encoding=ms_encoding, mode="w")
html_file.write(self.html_header + body + self.html_footer) html_file.write(self.html_header + body + self.html_footer)
return html_path return html_path
def main(): def main():
args = sys.argv args = sys.argv
if len(args) != 3: if len(args) != 3:
print('usage: convert source_md_file target_html_file') print("usage: convert source_md_file target_html_file")
else: else:
converter = MarkdownConverter() converter = MarkdownConverter()
converter.convert(args[1], args[2]) converter.convert(args[1], args[2])
if __name__ == '__main__':
if __name__ == "__main__":
main() main()
setup.py
+23 -25
View File
@@ -1,44 +1,42 @@
import os import os
from setuptools import setup, find_packages from setuptools import setup, find_packages
def read_file(filename): def read_file(filename):
basepath = os.path.dirname(os.path.dirname(__file__)) basepath = os.path.dirname(os.path.dirname(__file__))
filepath = os.path.join(basepath, filename) filepath = os.path.join(basepath, filename)
if os.path.exists(filepath): if os.path.exists(filepath):
return open(filepath).read() return open(filepath).read()
else: else:
return '' return ""
setup( setup(
name = 'markdown-server', name="markdown-server",
version = '0.1.3', version="0.1.4",
description = 'A simple markdown server.', description="A simple markdown server.",
long_description = read_file('README.rst'), long_description=read_file("README.rst"),
author = 'Masato Ohba', author="Masato Ohba",
author_email = 'over.rye@gmail.com', author_email="over.rye@gmail.com",
url = 'https://github.com/ohbarye/markdown-server', url="https://github.com/ohbarye/markdown-server",
classifiers=[ classifiers=[
'Topic :: Utilities', "Topic :: Utilities",
'Development Status :: 4 - Beta', "Development Status :: 4 - Beta",
'Framework :: Bottle', "Framework :: Bottle",
'License :: OSI Approved :: MIT License', "License :: OSI Approved :: MIT License",
'Programming Language :: Python', "Programming Language :: Python",
'Programming Language :: Python :: 2.7', "Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
], ],
packages=find_packages(), packages=find_packages(),
include_package_data=True, include_package_data=True,
keywords = ['web', 'markdown'], keywords=["web", "markdown"],
license = 'MIT License', license="MIT License",
install_requires = [ install_requires=["bottle", "Markdown==2.6.11", "Pygments", "py-gfm"],
'bottle',
'Markdown',
'Pygments',
'py-gfm',
],
entry_points={ entry_points={
'console_scripts': [ "console_scripts": [
'markdownserver = markdownserver:main', "markdownserver=markdownserver:main",
'convert = markdownserver.markdown_converter:main' "convert=markdownserver.markdown_converter:main",
] ]
}, },
) )