From 5b94406fcc390caf17d2ddbdd4cd8e08a45c1375 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 26 Aug 2022 15:01:18 +0530 Subject: [PATCH] Content server: Migrate usage of tag_browser_category_order to use the new db based preference Am not bothering with migration since th eGUI takes care of that. THis will affect peopl who run standalone servers, but the intersection of such people with those who have set the tweak is too small to bother. --- src/calibre/srv/metadata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/srv/metadata.py b/src/calibre/srv/metadata.py index fd90019155..f2a59eb705 100644 --- a/src/calibre/srv/metadata.py +++ b/src/calibre/srv/metadata.py @@ -216,13 +216,13 @@ def categories_settings(query, db, gst_container=GroupedSearchTerms): 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, db): # Create the basic tree, containing all top level categories , user # categories and grouped search terms last_category_node, category_node_map, root = None, {}, {'id':None, 'children':[]} node_id_map = {} category_nodes, recount_nodes = [], [] - order = tweaks['tag_browser_category_order'] + order = db.pref('tag_browser_category_order') or {} defvalue = order.get('*', 100) categories = [category for category in field_metadata if category in category_data] scats = sorted(categories, key=lambda x: order.get(x, defvalue)) @@ -522,7 +522,7 @@ def fillout_tree(root, items, node_id_map, category_nodes, category_data, field_ def render_categories(opts, db, category_data): items = {} with db.safe_read_lock: - root, node_id_map, category_nodes, recount_nodes = create_toplevel_tree(category_data, items, db.field_metadata, opts) + root, node_id_map, category_nodes, recount_nodes = create_toplevel_tree(category_data, items, db.field_metadata, opts, db) fillout_tree(root, items, node_id_map, category_nodes, category_data, db.field_metadata, opts, db.fields['rating'].book_value_map) for node in recount_nodes: item = items[node['id']]