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

Content server: Migrate usage of tag_browser_category_order to use the new db based preference

Browse Source 
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.
This commit is contained in:
Kovid Goyal 2022-08-26 15:01:18 +05:30
parent a87ef2d8a9
commit 5b94406fcc
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,13 +216,13 @@ def categories_settings(query, db, gst_container=GroupedSearchTerms):
hidden_categories, query.get('hide_empty_categories') == 'yes') 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 # Create the basic tree, containing all top level categories , user
# categories and grouped search terms # categories and grouped search terms
last_category_node, category_node_map, root = None, {}, {'id':None, 'children':[]} last_category_node, category_node_map, root = None, {}, {'id':None, 'children':[]}
node_id_map = {} node_id_map = {}
category_nodes, recount_nodes = [], [] category_nodes, recount_nodes = [], []
order = tweaks['tag_browser_category_order'] order = db.pref('tag_browser_category_order') or {}
defvalue = order.get('*', 100) defvalue = order.get('*', 100)
categories = [category for category in field_metadata if category in category_data] categories = [category for category in field_metadata if category in category_data]
scats = sorted(categories, key=lambda x: order.get(x, defvalue)) 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): def render_categories(opts, db, category_data):
items = {} items = {}
with db.safe_read_lock: 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) 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: for node in recount_nodes:
item = items[node['id']] item = items[node['id']]