diff --git a/build/lib/ciclostile/__init__.py b/build/lib/ciclostile/__init__.py new file mode 100644 index 0000000..f428529 --- /dev/null +++ b/build/lib/ciclostile/__init__.py @@ -0,0 +1,47 @@ +import os +import markdown +import jinja2 + + +def read_markdown(page_name, markdown_path): + md_file = os.path.join(markdown_path, page_name + '.md') + + with open(md_file) as f: + md_text = f.read() + + return md_text + + +def render_from_text(md_text, template_path): + md = markdown.Markdown(extensions=['meta'], output_format='html5') + html = md.convert(md_text) + + # get markdown metadata + data = {key: md.Meta[key][0] for key in md.Meta.keys()} + + data.update({ + 'content': html, + # 'page_name': page_name, # Needed? + }) + + template_name = data.get('template', 'default') + template_file = os.path.join(template_path, template_name + '.html') + + with open(template_file) as f: + template = f.read() + + page = jinja2.Template(template).render(**data) + return page + + +def render(page_name, markdown_path, template_path): + md_text = read_markdown(page_name, markdown_path) + page = render_from_text(md_text, template_path) + return page + + +def save(md_text, page_name, markdown_path): + md_file = os.path.join(markdown_path, page_name + '.md') + + with open(md_file, 'w') as f: + f.write(md_text) diff --git a/src/ciclostile_render b/build/scripts-3.6/ciclostile_render similarity index 93% rename from src/ciclostile_render rename to build/scripts-3.6/ciclostile_render index fe9482c..c885860 100755 --- a/src/ciclostile_render +++ b/build/scripts-3.6/ciclostile_render @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/home/subnixr/.virtualenvs/ciclostile/bin/python3 import os import ciclostile diff --git a/build/scripts-3.6/ciclostile_web b/build/scripts-3.6/ciclostile_web new file mode 100755 index 0000000..b26f57f --- /dev/null +++ b/build/scripts-3.6/ciclostile_web @@ -0,0 +1,64 @@ +#!/home/subnixr/.virtualenvs/ciclostile/bin/python3 +import os +from flask import Flask, send_from_directory, render_template, request +from flask_httpauth import HTTPDigestAuth +import ciclostile + +working_dir = os.getcwd() + +target_path, template_path, markdown_path = [ + os.path.join(working_dir, folder_name) + for folder_name in ['target', 'templates', 'markdown'] +] + +app = Flask(__name__) +app.config['SECRET_KEY'] = 'secret key here' +auth = HTTPDigestAuth() + +users = { + 'admin': 'password', +} + + +@auth.get_password +def get_pw(username): + if username in users: + return users.get(username) + return None + + +@app.route('/assets/') +def assets(path): + assets_path = os.path.join(target_path, 'assets') + return send_from_directory(assets_path, path) + + +@app.route('/') +@app.route('/.html') +def page(page_name): + return ciclostile.render(page_name, markdown_path, template_path) + + +@app.route('//edit') +@auth.login_required +def edit(page_name): + md_text = ciclostile.read_markdown(page_name, markdown_path) + return render_template('edit.html', **locals()) + + +@app.route('/edit', methods=['POST']) +@auth.login_required +def edit_actions(): + page_name = request.form['page_name'] + md_text = request.form['md_text'] + + if request.form['action'] == 'preview': + return ciclostile.render_from_text(md_text, template_path) + + if request.form['action'] == 'save': + ciclostile.save(md_text, page_name, markdown_path) + return page(page_name) + + +if __name__ == '__main__': + app.run() diff --git a/example/templates/index.html b/example/templates/index.html new file mode 100644 index 0000000..da31da3 --- /dev/null +++ b/example/templates/index.html @@ -0,0 +1,16 @@ + + + + + INDEX + + + +
    + {% for page in pages %} +
  • {{page['title']}}
    • + {% endfor %} +
+ + + \ No newline at end of file diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index e7ba29d..470e14e --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -from distutils.core import setup +from setuptools import setup from os import path here = path.abspath(path.dirname(__file__)) @@ -16,7 +16,7 @@ setup( package_dir={'': 'src'}, packages=['ciclostile'], - scripts=['src/ciclostile_render', 'src/ciclostile_web'], + scripts=['src/ciclostile_cli'], install_requires=['markdown', 'jinja2', 'flask', 'flask-httpauth'] - ) +) diff --git a/src/ciclostile/__init__.py b/src/ciclostile/__init__.py index f428529..4be690c 100644 --- a/src/ciclostile/__init__.py +++ b/src/ciclostile/__init__.py @@ -1,47 +1,38 @@ +#!/usr/bin/env python3 import os import markdown import jinja2 -def read_markdown(page_name, markdown_path): - md_file = os.path.join(markdown_path, page_name + '.md') - - with open(md_file) as f: - md_text = f.read() - - return md_text - - -def render_from_text(md_text, template_path): - md = markdown.Markdown(extensions=['meta'], output_format='html5') - html = md.convert(md_text) - +def parse(mdtext, parser=None): + if parser is None: + parser = markdown.Markdown(extensions=['meta'], output_format='html5') + html = parser.convert(mdtext) # get markdown metadata - data = {key: md.Meta[key][0] for key in md.Meta.keys()} - + data = {key: parser.Meta[key][0] for key in parser.Meta.keys()} data.update({ 'content': html, - # 'page_name': page_name, # Needed? }) - - template_name = data.get('template', 'default') - template_file = os.path.join(template_path, template_name + '.html') - - with open(template_file) as f: - template = f.read() - - page = jinja2.Template(template).render(**data) - return page + return data -def render(page_name, markdown_path, template_path): - md_text = read_markdown(page_name, markdown_path) - page = render_from_text(md_text, template_path) - return page +def parse_file(filepath, parser=None): + with open(filepath) as fh: + return parse(fh.read(), parser=parser) -def save(md_text, page_name, markdown_path): - md_file = os.path.join(markdown_path, page_name + '.md') +def index(folder): + data = {'pages': []} + parser = markdown.Markdown(extensions=['meta'], output_format='html5') + for dirpath, _, files in os.walk(folder): + valid_files = (os.path.join(dirpath, f) + for f in files + if f.endswith('.md')) + for fpath in valid_files: + data['pages'].append(parse_file(fpath, parser=parser)) + return data - with open(md_file, 'w') as f: - f.write(md_text) + +def compile(template, data): + t = jinja2.Template(template) + return t.render(**data) diff --git a/src/ciclostile_cli b/src/ciclostile_cli new file mode 100755 index 0000000..5f4bb12 --- /dev/null +++ b/src/ciclostile_cli @@ -0,0 +1,34 @@ +#!/usr/bin/env python3 +import sys +import click +import ciclostile + + +@click.group() +def cli(): + pass + + +@cli.command() +@click.option('-t', '--template', type=click.File('r')) +@click.option('-o', '--output', type=click.File('w'), default=sys.stdout) +@click.argument('markdown', type=click.File('r'), default=sys.stdin) +def compile(template, output, markdown): + data = ciclostile.parse(markdown.read()) + html = ciclostile.compile(template.read(), data) + output.write(html) + + +@cli.command() +@click.option('-t', '--template', type=click.File('r')) +@click.option('-o', '--output', type=click.File('w'), default=sys.stdout) +@click.argument('folder', type=click.Path(exists=True, + file_okay=False)) +def index(template, output, folder): + data = ciclostile.index(folder) + html = ciclostile.compile(template.read(), data) + output.write(html) + + +if __name__ == "__main__": + cli() diff --git a/src/ciclostile_web b/src/ciclostile_web index 709a550..973b8d5 100755 --- a/src/ciclostile_web +++ b/src/ciclostile_web @@ -1,64 +1,64 @@ -#!/usr/bin/env python3 -import os -from flask import Flask, send_from_directory, render_template, request -from flask_httpauth import HTTPDigestAuth -import ciclostile +# #!/usr/bin/env python3 +# import os +# from flask import Flask, send_from_directory, render_template, request +# from flask_httpauth import HTTPDigestAuth +# import ciclostile -working_dir = os.getcwd() +# working_dir = os.getcwd() -target_path, template_path, markdown_path = [ - os.path.join(working_dir, folder_name) - for folder_name in ['target', 'templates', 'markdown'] -] +# target_path, template_path, markdown_path = [ +# os.path.join(working_dir, folder_name) +# for folder_name in ['target', 'templates', 'markdown'] +# ] -app = Flask(__name__) -app.config['SECRET_KEY'] = 'secret key here' -auth = HTTPDigestAuth() +# app = Flask(__name__) +# app.config['SECRET_KEY'] = 'secret key here' +# auth = HTTPDigestAuth() -users = { - 'admin': 'password', -} +# users = { +# 'admin': 'password', +# } -@auth.get_password -def get_pw(username): - if username in users: - return users.get(username) - return None +# @auth.get_password +# def get_pw(username): +# if username in users: +# return users.get(username) +# return None -@app.route('/assets/') -def assets(path): - assets_path = os.path.join(target_path, 'assets') - return send_from_directory(assets_path, path) +# @app.route('/assets/') +# def assets(path): +# assets_path = os.path.join(target_path, 'assets') +# return send_from_directory(assets_path, path) -@app.route('/') -@app.route('/.html') -def page(page_name): - return ciclostile.render(page_name, markdown_path, template_path) +# @app.route('/') +# @app.route('/.html') +# def page(page_name): +# return ciclostile.render(page_name, markdown_path, template_path) -@app.route('//edit') -@auth.login_required -def edit(page_name): - md_text = ciclostile.read_markdown(page_name, markdown_path) - return render_template('edit.html', **locals()) +# @app.route('//edit') +# @auth.login_required +# def edit(page_name): +# md_text = ciclostile.read_markdown(page_name, markdown_path) +# return render_template('edit.html', **locals()) -@app.route('/edit', methods=['POST']) -@auth.login_required -def edit_actions(): - page_name = request.form['page_name'] - md_text = request.form['md_text'] +# @app.route('/edit', methods=['POST']) +# @auth.login_required +# def edit_actions(): +# page_name = request.form['page_name'] +# md_text = request.form['md_text'] - if request.form['action'] == 'preview': - return ciclostile.render_from_text(md_text, template_path) +# if request.form['action'] == 'preview': +# return ciclostile.render_from_text(md_text, template_path) - if request.form['action'] == 'save': - ciclostile.save(md_text, page_name, markdown_path) - return page(page_name) +# if request.form['action'] == 'save': +# ciclostile.save(md_text, page_name, markdown_path) +# return page(page_name) -if __name__ == '__main__': - app.run() +# if __name__ == '__main__': +# app.run()