Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #86 from gazpachoking/subdirs

Browse source 
Preliminary subdirectory support. refs #50
This commit is contained in:
Matthew Scragg 2015-12-09 17:09:08 -06:00
parent 917cc5b967 9108f82149
commit 7d9cc29223
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
realms/lib/util.py
View file

@ -85,10 +85,10 @@ def to_canonical(s):
""" """
Double space -> single dash Double space -> single dash
Double dash -> single dash Double dash -> single dash
Remove all non alphanumeric and dash Remove all non alphanumeric and dash except path separatos (/)
Limit to first 128 chars Limit to first 128 chars
""" """
reserved_chars = "&$+,/:;=?@#" reserved_chars = "&$+,:;=?@#"
unsafe_chars = "?<>[]{}|\^~%" unsafe_chars = "?<>[]{}|\^~%"
s = s.encode('utf8') s = s.encode('utf8')

5
realms/modules/wiki/models.py
View file

@ -1,4 +1,5 @@
import os import os
import posixpath
import re import re
import ghdiff import ghdiff
import gittle.utils import gittle.utils
@ -82,6 +83,10 @@ class Wiki(HookMixin):
cname = to_canonical(name) cname = to_canonical(name)
filename = cname_to_filename(cname) filename = cname_to_filename(cname)
dirname = posixpath.join(self.path, posixpath.dirname(filename))
if not os.path.exists(dirname):
os.makedirs(dirname)
with open(self.path + "/" + filename, 'w') as f: with open(self.path + "/" + filename, 'w') as f:
f.write(content) f.write(content)

14
realms/modules/wiki/views.py
View file

@ -6,7 +6,7 @@ from .models import PageNotFound
blueprint = Blueprint('wiki', __name__) blueprint = Blueprint('wiki', __name__)
@blueprint.route("/_commit/<sha>/<name>") @blueprint.route("/_commit/<sha>/<path:name>")
def commit(name, sha): def commit(name, sha):
if current_app.config.get('PRIVATE_WIKI') and current_user.is_anonymous(): if current_app.config.get('PRIVATE_WIKI') and current_user.is_anonymous():
return current_app.login_manager.unauthorized() return current_app.login_manager.unauthorized()
@ -21,7 +21,7 @@ def commit(name, sha):
return render_template('wiki/page.html', name=name, page=data, commit=sha) return render_template('wiki/page.html', name=name, page=data, commit=sha)
@blueprint.route("/_compare/<name>/<regex('[^.]+'):fsha><regex('\.{2,3}'):dots><regex('.+'):lsha>") @blueprint.route(r"/_compare/<path:name>/<regex('\w+'):fsha><regex('\.{2,3}'):dots><regex('\w+'):lsha>")
def compare(name, fsha, dots, lsha): def compare(name, fsha, dots, lsha):
if current_app.config.get('PRIVATE_WIKI') and current_user.is_anonymous(): if current_app.config.get('PRIVATE_WIKI') and current_user.is_anonymous():
return current_app.login_manager.unauthorized() return current_app.login_manager.unauthorized()
@ -59,7 +59,7 @@ def revert():
return dict(sha=sha) return dict(sha=sha)
@blueprint.route("/_history/<name>") @blueprint.route("/_history/<path:name>")
def history(name): def history(name):
if current_app.config.get('PRIVATE_WIKI') and current_user.is_anonymous(): if current_app.config.get('PRIVATE_WIKI') and current_user.is_anonymous():
return current_app.login_manager.unauthorized() return current_app.login_manager.unauthorized()
@ -67,7 +67,7 @@ def history(name):
return render_template('wiki/history.html', name=name, history=g.current_wiki.get_history(name)) return render_template('wiki/history.html', name=name, history=g.current_wiki.get_history(name))
@blueprint.route("/_edit/<name>") @blueprint.route("/_edit/<path:name>")
@login_required @login_required
def edit(name): def edit(name):
cname = to_canonical(name) cname = to_canonical(name)
@ -88,7 +88,7 @@ def edit(name):
@blueprint.route("/_create/", defaults={'name': None}) @blueprint.route("/_create/", defaults={'name': None})
@blueprint.route("/_create/<name>") @blueprint.route("/_create/<path:name>")
@login_required @login_required
def create(name): def create(name):
cname = to_canonical(name) if name else "" cname = to_canonical(name) if name else ""
@ -111,7 +111,7 @@ def index():
return render_template('wiki/index.html', index=g.current_wiki.get_index()) return render_template('wiki/index.html', index=g.current_wiki.get_index())
@blueprint.route("/<name>", methods=['POST', 'PUT', 'DELETE']) @blueprint.route("/<path:name>", methods=['POST', 'PUT', 'DELETE'])
@login_required @login_required
def page_write(name): def page_write(name):
cname = to_canonical(name) cname = to_canonical(name)
@ -164,7 +164,7 @@ def page_write(name):
@blueprint.route("/", defaults={'name': 'home'}) @blueprint.route("/", defaults={'name': 'home'})
@blueprint.route("/<name>") @blueprint.route("/<path:name>")
def page(name): def page(name):
if current_app.config.get('PRIVATE_WIKI') and current_user.is_anonymous(): if current_app.config.get('PRIVATE_WIKI') and current_user.is_anonymous():
return current_app.login_manager.unauthorized() return current_app.login_manager.unauthorized()