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

Content Server OPDS feeds: Grouping of items is now case-insensitive. Also Fix #6371 (Catalog request "by author" fails in content server)

Browse Source
This commit is contained in:
Kovid Goyal 2010-08-06 11:26:54 -06:00
parent b96c8576e5
commit a6300af2ea
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -400,7 +400,9 @@ class OPDSServer(object):
owhich = hexlify('N'+which) owhich = hexlify('N'+which)
up_url = url_for('opdsnavcatalog', version, which=owhich) up_url = url_for('opdsnavcatalog', version, which=owhich)
items = categories[category] items = categories[category]
items = [x for x in items if getattr(x, 'sort', x.name).startswith(which)] def belongs(x, which):
return getattr(x, 'sort', x.name).lower().startswith(which.lower())
items = [x for x in items if belongs(x, which)]
if not items: if not items:
raise cherrypy.HTTPError(404, 'No items in group %r:%r'%(category, raise cherrypy.HTTPError(404, 'No items in group %r:%r'%(category,
which)) which))
@ -465,7 +467,12 @@ class OPDSServer(object):
def __init__(self, text, count): def __init__(self, text, count):
self.text, self.count = text, count self.text, self.count = text, count
starts = set([getattr(x, 'sort', x.name)[0] for x in items]) starts = set([])
for x in items:
val = getattr(x, 'sort', x.name)
if not val:
val = 'A'
starts.add(val[0].upper())
category_groups = OrderedDict() category_groups = OrderedDict()
for x in sorted(starts, cmp=lambda x,y:cmp(x.lower(), y.lower())): for x in sorted(starts, cmp=lambda x,y:cmp(x.lower(), y.lower())):
category_groups[x] = len([y for y in items if category_groups[x] = len([y for y in items if