NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #397

Browse Source
This commit is contained in:
OzzieIsaacs 2017-12-01 15:33:55 +01:00
parent cbb236ba7b
commit 152f7857c9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cps/helper.py
View File

@ -292,9 +292,9 @@ def get_valid_filename(value, replace_whitespace=True):
def get_sorted_author(value): def get_sorted_author(value):
regexes = ["^(JR|SR)\.?$", "^I{1,3}\.?$", "^IV\.?$"]
combined = "(" + ")|(".join(regexes) + ")"
try: try:
regexes = ["^(JR|SR)\.?$", "^I{1,3}\.?$", "^IV\.?$"]
combined = "(" + ")|(".join(regexes) + ")"
value = value.split(" ") value = value.split(" ")
if re.match(combined, value[-1].upper()): if re.match(combined, value[-1].upper()):
value2 = value[-2] + ", " + " ".join(value[:-2]) + " " + value[-1] value2 = value[-2] + ", " + " ".join(value[:-2]) + " " + value[-1]

10
cps/web.py
View File

@ -2931,7 +2931,7 @@ def edit_book(book_id):
edited_books_id.add(book.id) edited_books_id.add(book.id)
input_authors = to_save["author_name"].split('&') input_authors = to_save["author_name"].split('&')
input_authors = map(lambda it: it.strip().replace(',', '|'), input_authors) input_authors = list(map(lambda it: it.strip().replace(',', '|'), input_authors))
# we have all author names now # we have all author names now
if input_authors == ['']: if input_authors == ['']:
input_authors = [_(u'unknown')] # prevent empty Author input_authors = [_(u'unknown')] # prevent empty Author
@ -2969,7 +2969,7 @@ def edit_book(book_id):
book.comments.append(db.Comments(text=to_save["description"], book=book.id)) book.comments.append(db.Comments(text=to_save["description"], book=book.id))
input_tags = to_save["tags"].split(',') input_tags = to_save["tags"].split(',')
input_tags = map(lambda it: it.strip(), input_tags) input_tags = list(map(lambda it: it.strip(), input_tags))
modify_database_object(input_tags, book.tags, db.Tags, db.session, 'tags') modify_database_object(input_tags, book.tags, db.Tags, db.session, 'tags')
input_series = [to_save["series"].strip()] input_series = [to_save["series"].strip()]
@ -2977,7 +2977,7 @@ def edit_book(book_id):
modify_database_object(input_series, book.series, db.Series, db.session, 'series') modify_database_object(input_series, book.series, db.Series, db.session, 'series')
input_languages = to_save["languages"].split(',') input_languages = to_save["languages"].split(',')
input_languages = map(lambda it: it.strip().lower(), input_languages) input_languages = list(map(lambda it: it.strip().lower(), input_languages))
if to_save["pubdate"]: if to_save["pubdate"]:
try: try:
@ -3089,7 +3089,7 @@ def edit_book(book_id):
db.session.delete(del_cc) db.session.delete(del_cc)
else: else:
input_tags = to_save[cc_string].split(',') input_tags = to_save[cc_string].split(',')
input_tags = map(lambda it: it.strip(), input_tags) input_tags = list(map(lambda it: it.strip(), input_tags))
modify_database_object(input_tags, getattr(book, cc_string), db.cc_classes[c.id], db.session, 'custom') modify_database_object(input_tags, getattr(book, cc_string), db.cc_classes[c.id], db.session, 'custom')
db.session.commit() db.session.commit()
author_names = [] author_names = []
@ -3234,7 +3234,7 @@ def upload():
db.session.commit() db.session.commit()
input_tags = tags.split(',') input_tags = tags.split(',')
input_tags = map(lambda it: it.strip(), input_tags) input_tags = list(map(lambda it: it.strip(), input_tags))
modify_database_object(input_tags, db_book.tags, db.Tags, db.session, 'tags') modify_database_object(input_tags, db_book.tags, db.Tags, db.session, 'tags')
if db_language is not None: # display Full name instead of iso639.part3 if db_language is not None: # display Full name instead of iso639.part3