From ccd4f82b3f01838588e2faba9d1bf08bc9684227 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Sun, 15 Sep 2024 12:26:47 +0100 Subject: [PATCH] Use the new get_item_id case_sensitive parameter in formatter functions and the tag browser. --- src/calibre/gui2/tag_browser/model.py | 2 +- src/calibre/gui2/tag_browser/view.py | 4 ++-- src/calibre/utils/formatter_functions.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/calibre/gui2/tag_browser/model.py b/src/calibre/gui2/tag_browser/model.py index ba9721e230..50073f6576 100644 --- a/src/calibre/gui2/tag_browser/model.py +++ b/src/calibre/gui2/tag_browser/model.py @@ -1619,7 +1619,7 @@ class TagsModel(QAbstractItemModel): # {{{ for val, key, _ in user_cats[cat]: datatype = cache.field_metadata.get(key, {}).get('datatype', '*****') if datatype != 'composite': - id_ = cache.get_item_id(key, val) + id_ = cache.get_item_id(key, val, case_sensitive=True) if id_ is not None: v = cache.books_for_field(key, id_) if v: diff --git a/src/calibre/gui2/tag_browser/view.py b/src/calibre/gui2/tag_browser/view.py index a00c513fb2..34bfabb89d 100644 --- a/src/calibre/gui2/tag_browser/view.py +++ b/src/calibre/gui2/tag_browser/view.py @@ -595,7 +595,7 @@ class TagsView(QTreeView): # {{{ x = self.mouse_clicked_point.x() if self.click_in_button_range(x, category, orig_name, 'notes'): from calibre.gui2.dialogs.show_category_note import ShowNoteDialog - item_id = db.get_item_id(category, orig_name) + item_id = db.get_item_id(category, orig_name, case_sensitive=True) if db.notes_for(category, item_id): ShowNoteDialog(category, item_id, db, parent=self).show() return @@ -941,7 +941,7 @@ class TagsView(QTreeView): # {{{ key=key)) if self.db.new_api.field_supports_notes(key): - item_id = self.db.new_api.get_item_id(tag.category, tag.original_name) + item_id = self.db.new_api.get_item_id(tag.category, tag.original_name, case_sensitive=True) has_note = self._model.item_has_note(key, tag.original_name) self.context_menu.addAction(self.edit_metadata_icon, (_('Edit note for %s') if has_note else _('Create note for %s'))%display_name(tag), diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py index e8a945ce65..2787a811eb 100644 --- a/src/calibre/utils/formatter_functions.py +++ b/src/calibre/utils/formatter_functions.py @@ -2064,7 +2064,7 @@ class BuiltinGetLink(BuiltinFormatterFunction): db = self.get_database(mi).new_api try: link = None - item_id = db.get_item_id(field_name, field_value) + item_id = db.get_item_id(field_name, field_value, case_sensitive=True) if item_id is not None: link = db.link_for(field_name, item_id) return link if link is not None else '' @@ -2587,7 +2587,7 @@ class BuiltinGetNote(BuiltinFormatterFunction): db = self.get_database(mi).new_api try: note = None - item_id = db.get_item_id(field_name, field_value) + item_id = db.get_item_id(field_name, field_value, case_sensitive=True) if item_id is not None: note = db.notes_data_for(field_name, item_id) if note is not None: @@ -2634,7 +2634,7 @@ class BuiltinHasNote(BuiltinFormatterFunction): db = self.get_database(mi).new_api note = None try: - item_id = db.get_item_id(field_name, field_value) + item_id = db.get_item_id(field_name, field_value, case_sensitive=True) if item_id is not None: note = db.notes_data_for(field_name, item_id) except Exception as e: