move code to __init__

__init__.py

@@ -0,0 +1,89 @@
+import sys
+from flask import Flask, render_template, send_from_directory
+from flask_flatpages import FlatPages, pygments_style_defs
+from flask_frozen import Freezer
+from config import Config
+import os
+import re
+from os.path import isfile, abspath
+
+cfg = Config(file('config.cfg'))
+
+FLATPAGES_AUTO_RELOAD = cfg.pages_reload
+FLATPAGES_EXTENSION = '.md'
+FLATPAGES_ROOT = cfg.pages_root
+
+app = Flask(__name__)
+flatpages = FlatPages(app)
+freezer = Freezer(app)
+#app.config.from_object(__name__)
+
+def list_dir(mypath):
+    return [f for f in os.listdir(mypath) if isfile(os.path.join(mypath, f)) and re.match('.*\.md.*',f) is None]
+
+def get_sub_pages(path, page):
+    ppath=page.path
+    cc=len(path.split('/'))
+    return [p for p in flatpages if p.path.startswith(path) and ( re.match('.*index',p.path) is None) and len(p.path.split('/'))<cc+2 ]
+
+
+def get_sub_ipages(path, page):
+    ppath=page.path
+    ps=[p for p in flatpages if p.path.startswith(path) and not ( re.match('.*index',p.path) is None) and  ( re.match(ppath,p.path) is None)]
+    return ps 
+
+def get_flatpage(path):
+    is_index=False
+    if path.split('/')[-1]=='index':
+        is_index=True
+        path='/'.join(path.split('/')[0:-1])
+    pathi = u'{}/{}'.format(path, 'index')
+    page = flatpages.get(pathi)
+    if not page is None:
+        is_index=True
+    else:
+        page=flatpages.get(path)
+    return (is_index, path, page) 
+
+def pjoin (rt,pth):
+     return u'{}/{}'.format(rt,pth)
+
+
+def misskey(a,key):
+    if not a.has_key(key):
+        return True
+    return  a[key] is None
+
+def page_defaults(page, is_index, path):
+    if misskey(page.meta,"title"):
+        page.meta["title"]=path.split('/')[-1]
+    if misskey(page.meta, "template"):
+        page.meta["template"]='post.html'
+    return page
+    
+
+@app.route('/<path:name>/')
+def post(name='index'):
+    is_index, path, page = get_flatpage(name)
+    app.logger.info('render'+name)
+    path2 = pjoin(FLATPAGES_ROOT,path)
+    
+    if is_index == True and not page is None:
+        ld=list_dir(path2)
+        sp=get_sub_pages(path,page)
+        spi=get_sub_ipages(path,page)
+    else:
+        ld=[]
+        sp=[]
+        spi=[]
+
+    if not page is None:
+        page_defaults(page,is_index,path)
+        app.logger.info("Render Template"+page["template"] +"for "+path)
+        return render_template(page.meta["template"], ld=ld, post=page, sp=sp, spi=spi, pth=path)
+    
+    if os.path.exists(u'{}/{}'.format(FLATPAGES_ROOT,path)):
+        return send_from_directory(FLATPAGES_ROOT,path)
+    else:
+        return send_from_directory('static',path)
+

cont.py

@@ -1,95 +0,0 @@
-import sys
-from flask import Flask, render_template, send_from_directory
-from flask_flatpages import FlatPages, pygments_style_defs
-from flask_frozen import Freezer
-from config import Config
-import os
-import re
-from os.path import isfile, abspath
-
-cfg = Config(file('config.cfg'))
-
-FLATPAGES_AUTO_RELOAD = cfg.pages_reload
-FLATPAGES_EXTENSION = '.md'
-FLATPAGES_ROOT = cfg.pages_root
-
-app = Flask(__name__)
-flatpages = FlatPages(app)
-freezer = Freezer(app)
-app.config.from_object(__name__)
-
-def list_dir(mypath):
-    return [f for f in os.listdir(mypath) if isfile(os.path.join(mypath, f)) and re.match('.*\.md.*',f) is None]
-
-def get_sub_pages(path, page):
-    ppath=page.path
-    cc=len(path.split('/'))
-    return [p for p in flatpages if p.path.startswith(path) and ( re.match('.*index',p.path) is None) and len(p.path.split('/'))<cc+2 ]
-
-
-def get_sub_ipages(path, page):
-    ppath=page.path
-    ps=[p for p in flatpages if p.path.startswith(path) and not ( re.match('.*index',p.path) is None) and  ( re.match(ppath,p.path) is None)]
-    return ps 
-
-def get_flatpage(path):
-    is_index=False
-    if path.split('/')[-1]=='index':
-        is_index=True
-        path='/'.join(path.split('/')[0:-1])
-    pathi = u'{}/{}'.format(path, 'index')
-    page = flatpages.get(pathi)
-    if not page is None:
-        is_index=True
-    else:
-        page=flatpages.get(path)
-    return (is_index, path, page) 
-
-def pjoin (rt,pth):
-     return u'{}/{}'.format(rt,pth)
-
-
-def misskey(a,key):
-    if not a.has_key(key):
-        return True
-    return  a[key] is None
-
-def page_defaults(page, is_index, path):
-    if misskey(page.meta,"title"):
-        page.meta["title"]=path.split('/')[-1]
-    if misskey(page.meta, "template"):
-        page.meta["template"]='post.html'
-    return page
-    
-
-@app.route('/<path:name>/')
-def post(name='index'):
-    is_index, path, page = get_flatpage(name)
-    
-    path2 = pjoin(FLATPAGES_ROOT,path)
-    
-    if is_index == True and not page is None:
-        ld=list_dir(path2)
-        sp=get_sub_pages(path,page)
-        spi=get_sub_ipages(path,page)
-    else:
-        ld=[]
-        sp=[]
-        spi=[]
-
-    if not page is None:
-        page_defaults(page,is_index,path)
-        app.logger.info("Render Template"+page["template"] +"for "+path)
-        return render_template(page["template"], ld=ld, post=page, sp=sp, spi=spi, pth=path)
-    
-    if os.path.exists('{}/{}'.format(FLATPAGES_ROOT,path)):
-        return send_from_directory(FLATPAGES_ROOT,path)
-    else:
-        return send_from_directory('static',path)
-
-
-if __name__ == "__main__":
-    if len(sys.argv) > 1 and sys.argv[1] == "build":
-        freezer.freeze()
-    else:
-        app.run(host='0.0.0.0',port=4444, debug=True)