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

Two bugs in the new categorization stuff:

Browse Source 
1) if a user created a new user category but didn't rename it, the next create would throw an exception
2) it was possible to specify that invalid fields such as author contain hierarchies
This commit is contained in:
Charles Haley 2011-02-23 14:46:37 +00:00
parent a484341620
commit a71599ba7b
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/calibre/gui2/tag_view.py
View File

@ -880,11 +880,12 @@ class TagsModel(QAbstractItemModel): # {{{
if cat_len <= 0: if cat_len <= 0:
return ((collapse_letter, collapse_letter_sk)) return ((collapse_letter, collapse_letter_sk))
fm = self.db.field_metadata[key]
clear_rating = True if key not in self.categories_with_ratings and \ clear_rating = True if key not in self.categories_with_ratings and \
not self.db.field_metadata[key]['is_custom'] and \ not fm['is_custom'] and \
not self.db.field_metadata[key]['kind'] == 'user' \ not fm['kind'] == 'user' \
else False else False
tt = key if self.db.field_metadata[key]['kind'] == 'user' else None tt = key if fm['kind'] == 'user' else None
for idx,tag in enumerate(data[key]): for idx,tag in enumerate(data[key]):
if clear_rating: if clear_rating:
tag.avg_rating = None tag.avg_rating = None
@ -931,9 +932,11 @@ class TagsModel(QAbstractItemModel): # {{{
node_parent = category node_parent = category
components = [t for t in tag.name.split('.')] components = [t for t in tag.name.split('.')]
if key not in self.db.prefs.get('categories_using_hierarchy', []) \ if key in ['authors', 'publisher', 'news', 'formats'] or \
or len(components) == 1 or \ key not in self.db.prefs.get('categories_using_hierarchy', []) or\
self.db.field_metadata[key]['kind'] == 'user': len(components) == 1 or \
fm['kind'] == 'user' or \
fm['datatype'] not in ['text', 'series', 'enumeration']:
self.beginInsertRows(category_index, 999999, 1) self.beginInsertRows(category_index, 999999, 1)
TagTreeItem(parent=node_parent, data=tag, tooltip=tt, TagTreeItem(parent=node_parent, data=tag, tooltip=tt,
icon_map=self.icon_state_map) icon_map=self.icon_state_map)
@ -1365,13 +1368,25 @@ class TagBrowserMixin(object): # {{{
def do_add_subcategory(self, on_category=None): def do_add_subcategory(self, on_category=None):
db = self.library_view.model().db db = self.library_view.model().db
user_cats = db.prefs.get('user_categories', {}) user_cats = db.prefs.get('user_categories', {})
new_cat = on_category[1:] + '.' + _('New Category').replace('.', '')
# Ensure that the temporary name we will use is not already there
i = 0
new_name = _('New Category').replace('.', '')
n = new_name
while True:
new_cat = on_category[1:] + '.' + n
if new_cat not in user_cats:
break
i += 1
n = new_name + unicode(i)
# Add the new category
user_cats[new_cat] = [] user_cats[new_cat] = []
db.prefs.set('user_categories', user_cats) db.prefs.set('user_categories', user_cats)
self.tags_view.set_new_model() self.tags_view.set_new_model()
m = self.tags_view.model() m = self.tags_view.model()
idx = m.index_for_path(m.find_category_node('@' + new_cat)) idx = m.index_for_path(m.find_category_node('@' + new_cat))
m.show_item_at_index(idx) m.show_item_at_index(idx)
# Open the editor on the new item to rename it
self.tags_view.edit(idx) self.tags_view.edit(idx)
def do_user_categories_edit(self, on_category=None): def do_user_categories_edit(self, on_category=None):