Merge pull request #5 from ohbarye/fix-1

Fix / No such file or directory: 'markdownserver/resources/css/github.css'
2016-08-02 01:57:05 +09:00
parent 02d2fae853 b727c48db2
commit 2ced54f2ba
5 changed files with 18 additions and 12 deletions
@@ -1,14 +1,15 @@
 from bottle import route,run,template,static_file
 from markdown_converter import MarkdownConverter
 from env import *
+import os

 converter = MarkdownConverter()

@route('/<resource>')
 def gfmize(resource):

-    html_file_name = converter.convert(resource)
-    return static_file(html_file_name, root=ms_root)
+    html_file_name = os.path.basename(converter.convert(resource))
+    return static_file(os.path.join(html_dir, html_file_name), root=root_path)

 def main():
    run(host=ms_host,port=ms_port,debug=ms_debug,reloader=ms_reloader)
@@ -1,12 +1,16 @@
+import os
+
 ms_encoding    = 'utf-8'
 ms_port        = '8009'
 ms_host        = 'localhost'
-ms_root        = './'
 ms_debug       = True
 ms_reloader    = True
 html_extension = '.html'
-markdown_root  = 'markdownserver/resources/markdown/'
-html_root      = 'markdownserver/resources/html/'
-css_root       = 'markdownserver/resources/css/'
+root_path      = os.path.dirname(__file__)
+resource_dir   = os.path.join(root_path,'resources')
+markdown_dir   = os.path.join(resource_dir,'markdown')
+html_dir       = os.path.join(resource_dir,'html')
+css_dir        = os.path.join(resource_dir,'css')
 css_name       = 'github.css'
+css_path       = os.path.join(css_dir,css_name)
 markdown_type  = 'gfm'
@@ -1,12 +1,13 @@
 import markdown as md
 import codecs
 import sys
+import os
 from env import *

 class MarkdownConverter(object):

    def __init__(self):
-        css = codecs.open(css_root + css_name,encoding=ms_encoding,mode='r')
+        css = codecs.open(css_path,encoding=ms_encoding,mode='r')
        self.html_header = '''
            <html>
            <head>
@@ -31,11 +32,11 @@ class MarkdownConverter(object):
        return self.write_html(code,src,dst)

    def read_md(self,file_name):
-        md_file = codecs.open(markdown_root + file_name,encoding=ms_encoding,mode='r')
+        md_file = codecs.open(os.path.join(markdown_dir, file_name),encoding=ms_encoding,mode='r')
        return md_file.read()

    def write_html(self,body,file_name,dst):
-        html_path = html_root + file_name + html_extension
+        html_path = os.path.join(html_root, file_name + html_extension)

        if dst != "":
            html_path = dst
@@ -872,7 +872,7 @@ body .markdown-body
            <body>
            <div class='markdown-body'>
            <h1>Convert Markdown to HTML with Python</h1>
-<p>Markdown-server is a simple web application. It converts markdown file to HTML and response by text/html.</p>
+<p><strong>Markdown-server</strong> is a simple web application. It converts markdown file to HTML and response by text/html.</p>
 <h2>Library Dependencies</h2>
 <table>
 <thead>
@@ -37,7 +37,7 @@ setup(
    ],
    entry_points = {
        'console_scripts': [
-            'mdsvr = markdownserver:main',
+            'markdownserver = markdownserver:main',
            'convert = markdownserver.markdown_converter:main'
        ]
    },