Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tag browser: When using the Find function have unaccented characters match their accented equivalents, if the setting for it is set in Preferences->Searching

Browse Source
This commit is contained in:
Kovid Goyal 2019-01-16 10:43:36 +05:30
parent 57724b67b6
commit 4344028bfc
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/gui2/tag_browser/model.py
View File

@ -18,8 +18,8 @@ from calibre.constants import config_dir
from calibre.ebooks.metadata import rating_to_stars from calibre.ebooks.metadata import rating_to_stars
from calibre.gui2 import gprefs, config, error_dialog, file_icon_provider from calibre.gui2 import gprefs, config, error_dialog, file_icon_provider
from calibre.db.categories import Tag from calibre.db.categories import Tag
from calibre.utils.config import tweaks from calibre.utils.config import tweaks, prefs
from calibre.utils.icu import sort_key, lower, strcmp, collation_order from calibre.utils.icu import sort_key, lower, strcmp, collation_order, primary_strcmp, primary_contains, contains
from calibre.library.field_metadata import category_icon_map from calibre.library.field_metadata import category_icon_map
from calibre.gui2.dialogs.confirm_delete import confirm from calibre.gui2.dialogs.confirm_delete import confirm
from calibre.utils.formatter import EvalFormatter from calibre.utils.formatter import EvalFormatter
@ -1460,6 +1460,12 @@ class TagsModel(QAbstractItemModel): # {{{
self.path_found = None self.path_found = None
if start_path is None: if start_path is None:
start_path = [] start_path = []
if prefs['use_primary_find_in_search']:
final_strcmp = primary_strcmp
final_contains = primary_contains
else:
final_strcmp = strcmp
final_contains = contains
def process_tag(depth, tag_index, tag_item, start_path): def process_tag(depth, tag_index, tag_item, start_path):
path = self.path_for_index(tag_index) path = self.path_for_index(tag_index)
@ -1469,8 +1475,8 @@ class TagsModel(QAbstractItemModel): # {{{
if tag is None: if tag is None:
return False return False
name = tag.original_name name = tag.original_name
if (equals_match and strcmp(name, txt) == 0) or \ if (equals_match and final_strcmp(name, txt) == 0) or \
(not equals_match and lower(name).find(txt) >= 0): (not equals_match and final_contains(txt, name)):
self.path_found = path self.path_found = path
return True return True
for i,c in enumerate(tag_item.children): for i,c in enumerate(tag_item.children):