From cf21b66da4e55e671aeeefab814ab7b3c2081428 Mon Sep 17 00:00:00 2001 From: vanzhiganov Date: Mon, 18 Jan 2016 17:25:53 +0300 Subject: [PATCH] update kb --- app/cloud/controllers/kb/__init__.py | 20 +++++++++++++++++++- app/cloud/views/kb/__init__.py | 13 +++++-------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/app/cloud/controllers/kb/__init__.py b/app/cloud/controllers/kb/__init__.py index 089ed36..e24de7d 100644 --- a/app/cloud/controllers/kb/__init__.py +++ b/app/cloud/controllers/kb/__init__.py @@ -1 +1,19 @@ -__author__ = 'vanzhiganov' +# coding: utf-8 + +import os + + +class ControllerKB: + def __init__(self): + pass + + def is_exists(self, document): + if os.path.exists('kb/%s.md' % document): + return True + return False + + def get(self, document): + kb_markdown = u'' + for ss in file('kb/%s.md' % document, 'r'): + kb_markdown += ss.decode('UTF-8') + return kb_markdown diff --git a/app/cloud/views/kb/__init__.py b/app/cloud/views/kb/__init__.py index 5e40984..3342a18 100644 --- a/app/cloud/views/kb/__init__.py +++ b/app/cloud/views/kb/__init__.py @@ -1,9 +1,9 @@ # coding: utf-8 -import os from flask import render_template from flask import Blueprint from flask import abort +from app.cloud.controllers.kb import ControllerKB viewKB = Blueprint('kb', __name__, url_prefix='/kb') @@ -11,14 +11,11 @@ viewKB = Blueprint('kb', __name__, url_prefix='/kb') @viewKB.route('/') @viewKB.route('/') def index(document='README'): - # - if not os.path.exists('kb/%s.md' % document): + # Check exists document + if not ControllerKB().is_exists(document): return abort(404) - # - kb_markdown = u'' - for ss in file('kb/%s.md' % document, 'r'): - kb_markdown += ss.decode('UTF-8') + # Return document return render_template( 'default/kb/index.html', - kb_markdown=kb_markdown + kb_markdown=ControllerKB().get(document) )