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

released 0.1.1.

Browse Source 
enabled to use conversion function alone.
This commit is contained in:
ohbarye
2015-05-04 10:24:29 +09:00
parent 718582426d
commit 993c7cbad5
6 changed files with 83 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.rst
+14 -2
View File
@@ -23,9 +23,12 @@ Library Dependencies
See `requirements.txt`. See `requirements.txt`.
-------------------- --------
Just try Just try
-------------------- --------
Start server
------------
You don't need any special preparation to try to start server. Just execute below comands. You don't need any special preparation to try to start server. Just execute below comands.
@@ -46,6 +49,15 @@ If server start up successfully, browse below URL and check the converted result
$ open http://localhost:8009/sample.md $ open http://localhost:8009/sample.md
Only Conversion
---------------
Additionally, You can use the conversion function alone.
::
(.venv)$ convert source_md_file target_html_file
-------------- --------------
Do as you like Do as you like
-------------- --------------
markdownserver/__init__.py
+2 -2
View File
@@ -1,5 +1,5 @@
from bottle import route,run,template,static_file from bottle import route,run,template,static_file
from md_to_html import MarkdownConverter from markdown_converter import MarkdownConverter
from env import * from env import *
converter = MarkdownConverter() converter = MarkdownConverter()
@@ -14,4 +14,4 @@ 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=ms_reloader)
if __name__ == '__main__': if __name__ == '__main__':
run(host=ms_host,port=ms_port,debug=ms_debug,reloader=ms_reloader) main()
markdownserver/md_to_html.py → markdownserver/markdown_converter.py
+15 -8
View File
@@ -26,24 +26,31 @@ class MarkdownConverter(object):
</html> </html>
''' '''
def convert(self,file_name): def convert(self,src,dst=""):
code = md.markdown(self.read_md(file_name), extensions=[markdown_type]) code = md.markdown(self.read_md(src), extensions=[markdown_type])
return self.write_html(file_name,code) return self.write_html(code,src,dst)
def read_md(self,file_name): def read_md(self,file_name):
md_file = codecs.open(markdown_root + file_name,encoding=ms_encoding,mode='r') md_file = codecs.open(markdown_root + file_name,encoding=ms_encoding,mode='r')
return md_file.read() return md_file.read()
def write_html(self,file_name,body): def write_html(self,body,file_name,dst):
html_path = html_root + file_name + html_extension html_path = html_root + file_name + html_extension
if dst != "":
html_path = dst
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
if __name__ == '__main__': def main():
args = sys.argv args = sys.argv
if len(args) == 1: if len(args) != 3:
print('specify *.md file name from command line.') print('usage: convert source_md_file target_html_file')
else: else:
converter = MarkdownConverter() converter = MarkdownConverter()
converter.convert(args[1]) converter.convert(args[1],args[2])
if __name__ == '__main__':
main()
markdownserver/resources/html/sample.md.html
+22 -20
View File
@@ -871,9 +871,9 @@ body .markdown-body
</head> </head>
<body> <body>
<div class='markdown-body'> <div class='markdown-body'>
<h1>PythonでMarkdownをHTML化</h1> <h1>Convert Markdown to HTML with Python</h1>
<p>Github flavored Markdown で HTML化します。</p> <p>Markdown-server is a simple web application. It converts markdown file to HTML and response by text/html.</p>
<h2>使用したライブラリ</h2> <h2>Library Dependencies</h2>
<table> <table>
<thead> <thead>
<tr> <tr>
@@ -886,26 +886,21 @@ body .markdown-body
<tr> <tr>
<td align="left">1</td> <td align="left">1</td>
<td align="left">markdown</td> <td align="left">markdown</td>
<td align="left">Markdown -&gt; HTML 変換ライブラリ</td> <td align="left">Convert Markdown -&gt; HTML</td>
</tr> </tr>
<tr> <tr>
<td align="left">2</td> <td align="left">2</td>
<td align="left">pygments</td> <td align="left">pygments</td>
<td align="left">シンタックスハイライト用</td> <td align="left">Syntax highlighter</td>
</tr> </tr>
<tr> <tr>
<td align="left">3</td> <td align="left">3</td>
<td align="left">bottle</td> <td align="left">bottle</td>
<td align="left">Webアプリケーションフレームワーク</td> <td align="left">Web application framework</td>
</tr>
<tr>
<td align="left">4</td>
<td align="left">codecs</td>
<td align="left">ファイル読み書き用</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<h2>コードのシンタックスハイライト</h2> <h2>Syntax Highlight</h2>
<div class="highlight"><pre><span class="kn">import</span> <span class="nn">markdown</span> <span class="kn">as</span> <span class="nn">md</span> <div class="highlight"><pre><span class="kn">import</span> <span class="nn">markdown</span> <span class="kn">as</span> <span class="nn">md</span>
<span class="kn">import</span> <span class="nn">codecs</span> <span class="kn">import</span> <span class="nn">codecs</span>
<span class="kn">import</span> <span class="nn">sys</span> <span class="kn">import</span> <span class="nn">sys</span>
@@ -934,27 +929,34 @@ body .markdown-body
<span class="s"> &lt;/html&gt;</span> <span class="s"> &lt;/html&gt;</span>
<span class="s"> &#39;&#39;&#39;</span> <span class="s"> &#39;&#39;&#39;</span>
<span class="k">def</span> <span class="nf">convert</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span><span class="n">file_name</span><span class="p">):</span> <span class="k">def</span> <span class="nf">convert</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span><span class="n">src</span><span class="p">,</span><span class="n">dst</span><span class="o">=</span><span class="s">&quot;&quot;</span><span class="p">):</span>
<span class="n">code</span> <span class="o">=</span> <span class="n">md</span><span class="o">.</span><span class="n">markdown</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">read_md</span><span class="p">(</span><span class="n">file_name</span><span class="p">),</span> <span class="n">extensions</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;gfm&#39;</span><span class="p">])</span> <span class="n">code</span> <span class="o">=</span> <span class="n">md</span><span class="o">.</span><span class="n">markdown</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">read_md</span><span class="p">(</span><span class="n">src</span><span class="p">),</span> <span class="n">extensions</span><span class="o">=</span><span class="p">[</span><span class="n">markdown_type</span><span class="p">])</span>
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">write_html</span><span class="p">(</span><span class="n">file_name</span><span class="p">,</span><span class="n">code</span><span class="p">)</span> <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">write_html</span><span class="p">(</span><span class="n">code</span><span class="p">,</span><span class="n">src</span><span class="p">,</span><span class="n">dst</span><span class="p">)</span>
<span class="k">def</span> <span class="nf">read_md</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span><span class="n">file_name</span><span class="p">):</span> <span class="k">def</span> <span class="nf">read_md</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span><span class="n">file_name</span><span class="p">):</span>
<span class="n">md_file</span> <span class="o">=</span> <span class="n">codecs</span><span class="o">.</span><span class="n">open</span><span class="p">(</span><span class="n">markdown_root</span> <span class="o">+</span> <span class="n">file_name</span><span class="p">,</span><span class="n">encoding</span><span class="o">=</span><span class="n">ms_encoding</span><span class="p">,</span><span class="n">mode</span><span class="o">=</span><span class="s">&#39;r&#39;</span><span class="p">)</span> <span class="n">md_file</span> <span class="o">=</span> <span class="n">codecs</span><span class="o">.</span><span class="n">open</span><span class="p">(</span><span class="n">markdown_root</span> <span class="o">+</span> <span class="n">file_name</span><span class="p">,</span><span class="n">encoding</span><span class="o">=</span><span class="n">ms_encoding</span><span class="p">,</span><span class="n">mode</span><span class="o">=</span><span class="s">&#39;r&#39;</span><span class="p">)</span>
<span class="k">return</span> <span class="n">md_file</span><span class="o">.</span><span class="n">read</span><span class="p">()</span> <span class="k">return</span> <span class="n">md_file</span><span class="o">.</span><span class="n">read</span><span class="p">()</span>
<span class="k">def</span> <span class="nf">write_html</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span><span class="n">file_name</span><span class="p">,</span><span class="n">body</span><span class="p">):</span> <span class="k">def</span> <span class="nf">write_html</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span><span class="n">body</span><span class="p">,</span><span class="n">file_name</span><span class="p">,</span><span class="n">dst</span><span class="p">):</span>
<span class="n">html_path</span> <span class="o">=</span> <span class="n">html_root</span> <span class="o">+</span> <span class="n">file_name</span> <span class="o">+</span> <span class="n">html_extension</span> <span class="n">html_path</span> <span class="o">=</span> <span class="n">html_root</span> <span class="o">+</span> <span class="n">file_name</span> <span class="o">+</span> <span class="n">html_extension</span>
<span class="k">if</span> <span class="n">dst</span> <span class="o">!=</span> <span class="s">&quot;&quot;</span><span class="p">:</span>
<span class="n">html_path</span> <span class="o">=</span> <span class="n">dst</span>
<span class="n">html_file</span> <span class="o">=</span> <span class="n">codecs</span><span class="o">.</span><span class="n">open</span><span class="p">(</span><span class="n">html_path</span><span class="p">,</span><span class="n">encoding</span><span class="o">=</span><span class="n">ms_encoding</span><span class="p">,</span><span class="n">mode</span><span class="o">=</span><span class="s">&#39;w&#39;</span><span class="p">)</span> <span class="n">html_file</span> <span class="o">=</span> <span class="n">codecs</span><span class="o">.</span><span class="n">open</span><span class="p">(</span><span class="n">html_path</span><span class="p">,</span><span class="n">encoding</span><span class="o">=</span><span class="n">ms_encoding</span><span class="p">,</span><span class="n">mode</span><span class="o">=</span><span class="s">&#39;w&#39;</span><span class="p">)</span>
<span class="n">html_file</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">html_header</span> <span class="o">+</span> <span class="n">body</span> <span class="o">+</span> <span class="bp">self</span><span class="o">.</span><span class="n">html_footer</span><span class="p">)</span> <span class="n">html_file</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">html_header</span> <span class="o">+</span> <span class="n">body</span> <span class="o">+</span> <span class="bp">self</span><span class="o">.</span><span class="n">html_footer</span><span class="p">)</span>
<span class="k">return</span> <span class="n">html_path</span> <span class="k">return</span> <span class="n">html_path</span>
<span class="k">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">&#39;__main__&#39;</span><span class="p">:</span> <span class="k">def</span> <span class="nf">main</span><span class="p">():</span>
<span class="n">args</span> <span class="o">=</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span> <span class="n">args</span> <span class="o">=</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span>
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">==</span> <span class="mi">1</span><span class="p">:</span> <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">!=</span> <span class="mi">3</span><span class="p">:</span>
<span class="k">print</span><span class="p">(</span><span class="s">&#39;specify *.md file name from command line.&#39;</span><span class="p">)</span> <span class="k">print</span><span class="p">(</span><span class="s">&#39;usage: convert source_md_file target_html_file&#39;</span><span class="p">)</span>
<span class="k">else</span><span class="p">:</span> <span class="k">else</span><span class="p">:</span>
<span class="n">converter</span> <span class="o">=</span> <span class="n">MarkdownConverter</span><span class="p">()</span> <span class="n">converter</span> <span class="o">=</span> <span class="n">MarkdownConverter</span><span class="p">()</span>
<span class="n">converter</span><span class="o">.</span><span class="n">convert</span><span class="p">(</span><span class="n">args</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span> <span class="n">converter</span><span class="o">.</span><span class="n">convert</span><span class="p">(</span><span class="n">args</span><span class="p">[</span><span class="mi">1</span><span class="p">],</span><span class="n">args</span><span class="p">[</span><span class="mi">2</span><span class="p">])</span>
<span class="k">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">&#39;__main__&#39;</span><span class="p">:</span>
<span class="n">main</span><span class="p">()</span>
</pre></div> </pre></div>
</div> </div>
</body> </body>
markdownserver/resources/markdown/sample.md
+23 -16
View File
@@ -1,18 +1,17 @@
# PythonでMarkdownをHTML化 # Convert Markdown to HTML with Python
Github flavored Markdown で HTML化します。 **Markdown-server** is a simple web application. It converts markdown file to HTML and response by text/html.
## 使用したライブラリ ## Library Dependencies
|No.|Name|Description| |No.|Name|Description|
|:-|:-|:-| |:-|:-|:-|
|1|markdown|Markdown -> HTML 変換ライブラリ| |1|markdown|Convert Markdown -> HTML|
|2|pygments|シンタックスハイライト用| |2|pygments|Syntax highlighter|
|3|bottle|Webアプリケーションフレームワーク| |3|bottle|Web application framework|
|4|codecs|ファイル読み書き用|
## コードのシンタックスハイライト ## Syntax Highlight
```python ```python
import markdown as md import markdown as md
@@ -43,25 +42,33 @@ class MarkdownConverter(object):
</html> </html>
''' '''
def convert(self,file_name): def convert(self,src,dst=""):
code = md.markdown(self.read_md(file_name), extensions=['gfm']) code = md.markdown(self.read_md(src), extensions=[markdown_type])
return self.write_html(file_name,code) return self.write_html(code,src,dst)
def read_md(self,file_name): def read_md(self,file_name):
md_file = codecs.open(markdown_root + file_name,encoding=ms_encoding,mode='r') md_file = codecs.open(markdown_root + file_name,encoding=ms_encoding,mode='r')
return md_file.read() return md_file.read()
def write_html(self,file_name,body): def write_html(self,body,file_name,dst):
html_path = html_root + file_name + html_extension html_path = html_root + file_name + html_extension
if dst != "":
html_path = dst
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
if __name__ == '__main__': def main():
args = sys.argv args = sys.argv
if len(args) == 1: if len(args) != 3:
print('specify *.md file name from command line.') print('usage: convert source_md_file target_html_file')
else: else:
converter = MarkdownConverter() converter = MarkdownConverter()
converter.convert(args[1]) converter.convert(args[1],args[2])
if __name__ == '__main__':
main()
``` ```
setup.py
+7 -5
View File
@@ -11,7 +11,7 @@ def read_file(filename):
setup( setup(
name = 'markdown-server', name = 'markdown-server',
version = '0.1.0', version = '0.1.1',
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',
@@ -35,8 +35,10 @@ setup(
'Pygments', 'Pygments',
'py-gfm', 'py-gfm',
], ],
entry_points = """ entry_points = {
[console_scripts] 'console_scripts': [
mdsvr = markdownserver:main 'mdsvr = markdownserver:main',
""", 'convert = markdownserver.markdown_converter:main'
]
},
) )