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

allow utf8 in page names

Browse source
This commit is contained in:
Matthew Scragg 2015-12-08 17:15:11 -06:00
parent 4b55ea0009
commit e3508e365f
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
realms/lib/util.py
View file

@ -86,14 +86,18 @@ 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
Limit to first 64 chars Limit to first 128 chars
""" """
s = s.encode('ascii', 'ignore') reserved_chars = "&$+,/:;=?@#"
unsafe_chars = "?<>[]{}|\^~%"
s = s.encode('utf8')
s = str(s) s = str(s)
s = re.sub(r"\s\s*", "-", s) s = s.strip()
s = re.sub(r"\-\-+", "-", s) s = re.sub(r"\s", "-", s)
s = re.sub(r"[^a-zA-Z0-9\-]", "", s) s = re.sub(r"[" + re.escape(reserved_chars) + "]", "", s)
s = s[:64] s = re.sub(r"[" + re.escape(unsafe_chars) + "]", "", s)
s = s[:128]
return s return s

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

@ -183,7 +183,7 @@ class Wiki(HookMixin):
return cached return cached
# commit = gittle.utils.git.commit_info(self.repo[sha]) # commit = gittle.utils.git.commit_info(self.repo[sha])
filename = cname_to_filename(name).encode('latin-1') filename = cname_to_filename(name).encode('utf8')
sha = sha.encode('latin-1') sha = sha.encode('latin-1')
try: try: