Jonathan/calibre-web
1
0
Fork 0
mirror of https://github.com/JonathanHerrewijnen/calibre-web.git synced 2024-11-11 05:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1992 handle invalid numbers of books seriesindex

Browse Source
This commit is contained in:
Ozzie Isaacs 2021-05-19 19:54:44 +02:00
parent c85cfa90a4
commit bd4fde9e63
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cps/editbooks.py
View File

@ -439,6 +439,9 @@ def edit_book_series_index(series_index, book):
# Add default series_index to book # Add default series_index to book
modif_date = False modif_date = False
series_index = series_index or '1' series_index = series_index or '1'
if not series_index.replace('.', '', 1).isdigit():
flash(_("%(seriesindex)s is not a valid number, skipping", seriesindex=series_index), category="warning")
return False
if book.series_index != series_index: if book.series_index != series_index:
book.series_index = series_index book.series_index = series_index
modif_date = True modif_date = True

9
cps/jinjia.py
View File

@ -122,9 +122,12 @@ def formatfloat(value, decimals=1):
@jinjia.app_template_filter('formatseriesindex') @jinjia.app_template_filter('formatseriesindex')
def formatseriesindex_filter(series_index): def formatseriesindex_filter(series_index):
if series_index: if series_index:
if int(series_index) - series_index == 0: try:
return int(series_index) if int(series_index) - series_index == 0:
else: return int(series_index)
else:
return series_index
except ValueError:
return series_index return series_index
return 0 return 0