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

Content server and tag browser categories fixes

Browse Source
This commit is contained in:
Charles Haley 2011-02-25 11:13:20 +00:00
parent 976acd25a7
commit a1edb22898
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -882,7 +882,7 @@ class TagsModel(QAbstractItemModel): # {{{
idx = m.index_for_path(path) idx = m.index_for_path(path)
self.tags_view.setExpanded(idx, True) self.tags_view.setExpanded(idx, True)
if idx.internalPointer().type == TagTreeItem.TAG: if idx.internalPointer().type == TagTreeItem.TAG:
m.show_item_at_index(idx, boxed=True) m.show_item_at_index(idx, box=True)
else: else:
m.show_item_at_index(idx) m.show_item_at_index(idx)
return True return True

11
src/calibre/library/server/browse.py
View File

@ -424,15 +424,16 @@ class BrowseServer(object):
continue continue
cat_len += 1 cat_len += 1
icon = category_icon_map['user:'] icon = category_icon_map['user:']
dot = ucat[cat_len:].find('.') cat = ucat[cat_len:]
dot = cat.find('.')
if dot > 0: if dot > 0:
cat = ucat[cat_len:][:dot] cat = cat[:dot]
if cat not in uc_displayed: if cat not in uc_displayed:
cats.append((cat, ucat[:cat_len+dot], icon)) cats.append((cat, ucat[:cat_len+dot], icon))
uc_displayed.add(cat) uc_displayed.add(cat)
else: else:
cats.append((meta['name'], ucat, icon)) cats.append((cat, ucat, icon))
uc_displayed.add(ucat) uc_displayed.add(cat)
cats = u'\n\n'.join( cats = u'\n\n'.join(
[(u'<li><a title="{2} {0}" href="{3}/browse/category/{1}">&nbsp;</a>' [(u'<li><a title="{2} {0}" href="{3}/browse/category/{1}">&nbsp;</a>'
@ -452,7 +453,7 @@ class BrowseServer(object):
items = categories[category] items = categories[category]
sort = self.browse_sort_categories(items, sort) sort = self.browse_sort_categories(items, sort)
if len(items) == 1: if not cats and len(items) == 1:
# Only one item in category, go directly to book list # Only one item in category, go directly to book list
prefix = '' if self.is_wsgi else self.opts.url_prefix prefix = '' if self.is_wsgi else self.opts.url_prefix
html = get_category_items(category, items, html = get_category_items(category, items,