From 0ae1391095892b67625e889215d3f7493262d9a1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 18 Nov 2015 12:56:03 +0530
Subject: [PATCH] Remove unneeded fields from JSON rep of categories

---
 src/calibre/srv/metadata.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/calibre/srv/metadata.py b/src/calibre/srv/metadata.py
index 3bac924387..33237211e6 100644
--- a/src/calibre/srv/metadata.py
+++ b/src/calibre/srv/metadata.py
@@ -6,6 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
 from datetime import datetime, time
 
+from calibre.db.categories import Tag
 from calibre.utils.date import isoformat, UNDEFINED_DATE, local_tz
 from calibre.utils.icu import sort_key, collation_order
 
@@ -43,17 +44,23 @@ def book_as_json(db, book_id):
                 add_field(field, db, book_id, ans, fm[field])
     return ans
 
+_include_fields = frozenset(Tag.__slots__) - frozenset({
+    'state', 'is_editable', 'is_searchable', 'original_name', 'use_sort_as_name', 'is_hierarchical'
+})
+
 def category_item_as_json(x):
     sname = x.sort or x.name
     ans = {'sort_key': tuple(bytearray(sort_key(sname))), 'first_letter_sort_key': collation_order(icu_upper(sname or ' '))}
-    for k in x.__slots__:
-        if k != 'state':
-            val = getattr(x, k)
-            if isinstance(val, set):
-                val = tuple(val)
-            if val is not None:
-                ans[k] = val
-    if ans.get('sort', False) == ans['name']:
+    for k in _include_fields:
+        val = getattr(x, k)
+        if isinstance(val, set):
+            val = tuple(val)
+        if val is not None:
+            ans[k] = val
+    if x.use_sort_as_name:
+        ans['original_name'], ans['name'] = ans['name'], ans['sort']
+        del ans['sort']
+    elif x.sort == x.name:
         del ans['sort']
     return ans