Merge pull request #8 from olemb/refactor

Refactoring of Python code

Author: bast

cicero.py

@@ -1,29 +1,4 @@
-import os
-import argparse
+import sys
+from cicero.main import main
 
-
-def parse_args():
-    parser = argparse.ArgumentParser()
-    arg = parser.add_argument
-
-    arg('--file', '-f', dest='filename', help='Serve local file')
-    arg('--debug', dest='debug', action='store_true', default=False)
-    arg('--host', dest='host', default=os.environ.get('HOST', '0.0.0.0'))
-    arg('--port', dest='port', type=int, default=int(os.environ.get('PORT', 5000)))
-
-    return parser.parse_args()
-
-
-if __name__ == '__main__':
-    args = parse_args()
-
-    if args.filename:
-        from preview_app import app
-        app.config['filename'] = args.filename
-        app.config['image_dir'] = os.path.dirname(args.filename)
-    else:
-        from github_app import app
-
-    app.debug = args.debug
-
-    app.run(host=args.host, port=args.port)
+sys.exit(main())

cicero/__init__.py

@@ -0,0 +1,15 @@
+import os
+import flask
+
+def _get_subdir(dirname):
+    return os.path.join(os.path.dirname(__file__), dirname)
+
+
+app = flask.Flask('Cicero',
+                  template_folder=_get_subdir('templates'),
+                  static_folder=_get_subdir('static'))
+
+
+@app.errorhandler(404)
+def page_not_found(e):
+    return flask.render_template('404.html'), 404

cicero/app.py

@@ -0,0 +1,28 @@
+import flask
+import urllib
+from .images import fix_images
+
+blueprint = flask.Blueprint('git', __name__)
+
+@blueprint.route('/')
+def home():
+    return flask.render_template('index.html')
+
+
+@blueprint.route('/v1/github/<user_name>/<repo_name>/<branch_name>/<file_name>/remark/')
+def talk(user_name, repo_name, branch_name, file_name):
+    try:
+        url = 'https://raw.githubusercontent.com/{}/{}/{}/{}'.format(
+                user_name, repo_name, branch_name, file_name)
+
+        response = urllib.urlopen(url)
+
+        markdown = response.readlines()
+        if markdown == 'Not Found':
+            return flask.render_template('404.html')
+
+            # we do not use https://raw.githubusercontent.com because it does not handle svg files
+        prefix = 'https://cdn.rawgit.com/{}/{}/{}/'.format(user_name, repo_name, branch_name)
+        return flask.render_template('slides.html', markdown=''.join(fix_images(markdown, prefix)))
+    except IOError:
+        return flask.render_template('404.html')

cicero/git.py

@@ -0,0 +1,32 @@
+import os
+import argparse
+from .app import app
+from . import git
+from . import preview
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    arg = parser.add_argument
+
+    arg('--file', '-f', dest='filename', help='Serve local file')
+    arg('--debug', dest='debug', action='store_true', default=False)
+    arg('--host', dest='host', default=os.environ.get('HOST', '0.0.0.0'))
+    arg('--port', dest='port', type=int, default=int(os.environ.get('PORT', 5000)))
+
+    return parser.parse_args()
+
+
+def main():
+    args = parse_args()
+
+    if args.filename:
+        app.config['filename'] = args.filename
+        app.config['imagedir'] = os.path.dirname(args.filename)
+        app.register_blueprint(preview.blueprint)
+    else:
+        app.register_blueprint(git.blueprint)
+
+    app.debug = args.debug
+
+    app.run(host=args.host, port=args.port)

images.py cicero/images.py

@@ -0,0 +1,28 @@
+import io
+import flask
+from .images import fix_images
+
+blueprint = flask.Blueprint('preview', __name__)
+
+
+@blueprint.route('/')
+def home():
+    config = flask.current_app.config
+
+    with io.open(config['filename'], 'r', encoding='utf-8') as mkdfile:
+        markdown = mkdfile.readlines()
+
+    markdown = ''.join(fix_images(markdown, 'images/'))
+
+    return flask.render_template('slides.html', markdown=markdown)
+
+
+@blueprint.route('/images/<path:path>')
+def serve_image(path):
+    config = flask.current_app.config
+    return flask.send_from_directory(config['imagedir'], path)
+
+
+@blueprint.errorhandler(404)
+def page_not_found(e):
+    return flask.render_template('404.html'), 404