1
0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-19 01:27:40 +00:00

Merge branch 'master' into develop

# Conflicts:
#	.gitignore
#	cps/web.py
This commit is contained in:
Jack Darlington
2017-03-06 19:17:00 +00:00
10 changed files with 15539 additions and 23186 deletions

View File

@@ -240,7 +240,7 @@ def get_valid_filename(value, replace_whitespace=True):
value=value.replace(u'§',u'SS')
value=value.replace(u'ß',u'ss')
value = unicodedata.normalize('NFKD', value)
re_slugify = re.compile('[\W\s-]', re.UNICODE)
re_slugify = re.compile('[^\w\s-]', re.UNICODE)
value = unicode(re_slugify.sub('', value).strip())
if replace_whitespace:
#*+:\"/<>? werden durch _ ersetzt