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

Implement hiding of empty categories for server

Browse Source
This commit is contained in:
Kovid Goyal 2015-12-21 17:45:25 +05:30
parent 203c783ed3
commit e300871797
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/srv/code.py
View File

@ -220,7 +220,7 @@ def tag_browser(ctx, rd):
''' '''
Get the Tag Browser serialized as JSON Get the Tag Browser serialized as JSON
Optional: ?library_id=<default library>&sort_tags_by=name&partition_method=first letter Optional: ?library_id=<default library>&sort_tags_by=name&partition_method=first letter
&collapse_at=25&dont_collapse= &collapse_at=25&dont_collapse=&hide_empty_categories=
''' '''
db, library_id = get_library_data(ctx, rd.query)[:2] db, library_id = get_library_data(ctx, rd.query)[:2]
etag = '%s||%s||%s' % (db.last_modified(), rd.username, library_id) etag = '%s||%s||%s' % (db.last_modified(), rd.username, library_id)

9
src/calibre/srv/metadata.py
View File

@ -102,7 +102,8 @@ def category_item_as_json(x, clear_rating=False):
return ans return ans
CategoriesSettings = namedtuple( CategoriesSettings = namedtuple(
'CategoriesSettings', 'dont_collapse collapse_model collapse_at sort_by template using_hierarchy grouped_search_terms hidden_categories') 'CategoriesSettings', 'dont_collapse collapse_model collapse_at sort_by'
' template using_hierarchy grouped_search_terms hidden_categories hide_empty_categories')
class GroupedSearchTerms(object): class GroupedSearchTerms(object):
@ -168,7 +169,7 @@ def categories_settings(query, db):
return CategoriesSettings( return CategoriesSettings(
dont_collapse, collapse_model, collapse_at, sort_by, template, dont_collapse, collapse_model, collapse_at, sort_by, template,
using_hierarchy, GroupedSearchTerms(db.pref('grouped_search_terms', {})), using_hierarchy, GroupedSearchTerms(db.pref('grouped_search_terms', {})),
hidden_categories) hidden_categories, query.get('hide_empty_categories') == 'yes')
def create_toplevel_tree(category_data, items, field_metadata, opts): def create_toplevel_tree(category_data, items, field_metadata, opts):
# Create the basic tree, containing all top level categories , user # Create the basic tree, containing all top level categories , user
@ -477,6 +478,8 @@ def render_categories(opts, db, category_data):
# We have to remove hidden categories after all processing is done as # We have to remove hidden categories after all processing is done as
# items from a hidden category could be in a user category # items from a hidden category could be in a user category
root['children'] = filter((lambda child:items[child['id']]['category'] not in opts.hidden_categories), root['children']) root['children'] = filter((lambda child:items[child['id']]['category'] not in opts.hidden_categories), root['children'])
if opts.hide_empty_categories:
root['children'] = filter((lambda child:items[child['id']]['count'] > 0), root['children'])
return {'root':root, 'item_map': items} return {'root':root, 'item_map': items}
def categories_as_json(ctx, rd, db): def categories_as_json(ctx, rd, db):
@ -525,6 +528,7 @@ def test_tag_browser(library_path=None):
db = olddb.new_api db = olddb.new_api
opts = categories_settings({}, db) opts = categories_settings({}, db)
# opts = opts._replace(hidden_categories={'publisher'}) # opts = opts._replace(hidden_categories={'publisher'})
opts = opts._replace(hide_empty_categories=True)
category_data = db.get_categories(sort=opts.sort_by, first_letter_sort=opts.collapse_model == 'first letter') category_data = db.get_categories(sort=opts.sort_by, first_letter_sort=opts.collapse_model == 'first letter')
data = render_categories(opts, db, category_data) data = render_categories(opts, db, category_data)
srv_data = dump_categories_tree(data) srv_data = dump_categories_tree(data)
@ -535,6 +539,7 @@ def test_tag_browser(library_path=None):
'tags_browser_collapse_at':opts.collapse_at, 'tags_browser_collapse_at':opts.collapse_at,
'tags_browser_partition_method': opts.collapse_model, 'tags_browser_partition_method': opts.collapse_model,
'tag_browser_dont_collapse': opts.dont_collapse, 'tag_browser_dont_collapse': opts.dont_collapse,
'tag_browser_hide_empty_categories': opts.hide_empty_categories,
} }
app = Application([]) app = Application([])
m = TagsModel(None, prefs) m = TagsModel(None, prefs)

1
src/pyj/session.pyj
View File

@ -13,6 +13,7 @@ defaults = {
'collapse_at': 25, # number of items at which sub-groups are created, 0 to disable 'collapse_at': 25, # number of items at which sub-groups are created, 0 to disable
'dont_collapse': '', # comma separated list of category names 'dont_collapse': '', # comma separated list of category names
'sort_tags_by': 'name', # other choices: popularity, rating 'sort_tags_by': 'name', # other choices: popularity, rating
'hide_empty_categories': 'no',
} }
def storage_available(which): def storage_available(which):