mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-26 01:50:31 +00:00
Code Issues Releases Wiki Activity

Fix for the piping problem (#395)

Browse Source
This commit is contained in:
OzzieIsaacs 2017-11-28 08:54:21 +01:00
parent 6e714f3f16
commit b4aede78bc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cps/helper.py
View File

@ -281,7 +281,8 @@ def get_valid_filename(value, replace_whitespace=True):
if replace_whitespace: if replace_whitespace:
#*+:\"/<>? are replaced by _ #*+:\"/<>? are replaced by _
value = re.sub(r'[\*\+:\\\"/<>\?]+', u'_', value, flags=re.U) value = re.sub(r'[\*\+:\\\"/<>\?]+', u'_', value, flags=re.U)
# pipe has to be replaced with comma
value = re.sub(r'[\|]+', u',', value, flags=re.U)
value = value[:128] value = value[:128]
if not value: if not value:
raise ValueError("Filename cannot be empty") raise ValueError("Filename cannot be empty")

2
cps/web.py
View File

@ -600,7 +600,7 @@ def modify_database_object(input_elements, db_book_object, db_object, db_session
# if no element is found add it # if no element is found add it
if new_element is None: if new_element is None:
if db_type == 'author': if db_type == 'author':
new_element = db_object(add_element, add_element, "") new_element = db_object(add_element, add_element.replace('|',','), "")
elif db_type == 'series': elif db_type == 'series':
new_element = db_object(add_element, add_element) new_element = db_object(add_element, add_element)
elif db_type == 'custom': elif db_type == 'custom':