mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-28 20:39:59 +00:00
Code Issues Releases Wiki Activity

Fix for similar names (upper case, umlauts, emphasis mark) in tags and so on

Browse Source
This commit is contained in:
Ozzie Isaacs 2024-07-09 19:36:40 +02:00
parent 0fe12fe598
commit a2ceeb678f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cps/editbooks.py
View File

@ -1369,10 +1369,10 @@ def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
# check if an element with that name exists # check if an element with that name exists
changed = True changed = True
# db_session.query(db.Tags).filter((func.lower(db.Tags.name).ilike("GênOt"))).all() # db_session.query(db.Tags).filter((func.lower(db.Tags.name).ilike("GênOt"))).all()
db_element = db_session.query(db_object).filter((func.lower(db_filter).ilike(add_element))).first() db_element = db_session.query(db_object).filter((func.lower(db_filter).ilike(add_element))).all()
# db_element = db_session.query(db_object).filter(func.lower(db_filter) == add_element.lower()).first() # db_element = db_session.query(db_object).filter(func.lower(db_filter) == add_element.lower()).first()
# if no element is found add it # if no element is found add it
if db_element is None: if not db_element:
if db_type == 'author': if db_type == 'author':
new_element = db_object(add_element, helper.get_sorted_author(add_element.replace('|', ','))) new_element = db_object(add_element, helper.get_sorted_author(add_element.replace('|', ',')))
elif db_type == 'series': elif db_type == 'series':
@ -1386,10 +1386,14 @@ def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
db_session.add(new_element) db_session.add(new_element)
db_book_object.append(new_element) db_book_object.append(new_element)
else: else:
db_no_case = db_session.query(db_object).filter(db_filter == add_element).first() if len(db_element) == 1:
if db_no_case: #db_no_case = db_session.query(db_object).filter(db_filter == add_element).first()
#if db_no_case:
# check for new case of element # check for new case of element
db_element = create_objects_for_addition(db_element, add_element, db_type) db_element = create_objects_for_addition(db_element[0], add_element, db_type)
else:
db_el = db_session.query(db_object).filter(db_filter == add_element).first()
db_element = db_element[0] if not db_el else db_el
#else: #else:
# db_element = create_objects_for_addition(db_element, add_element, db_type) # db_element = create_objects_for_addition(db_element, add_element, db_type)
# add element to book # add element to book