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

Handle non-ascii binary strings in the author_name_prefix/suffix tweaks. Fixes #1701138 [Tweaks for Author Sort don't process extended ASCII properly](https://bugs.launchpad.net/calibre/+bug/1701138)

Browse Source
This commit is contained in:
Kovid Goyal 2017-07-06 19:57:15 +05:30
parent 59331d1c91
commit b3b2c36be1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/ebooks/metadata/__init__.py
View File

@ -11,7 +11,7 @@ import os, sys, re
from urlparse import urlparse from urlparse import urlparse
from calibre import relpath, guess_type, remove_bracketed_text, prints from calibre import relpath, guess_type, remove_bracketed_text, prints, force_unicode
from calibre.utils.config_base import tweaks from calibre.utils.config_base import tweaks
@ -57,8 +57,8 @@ def author_to_author_sort(author, method=None):
if method == u'copy': if method == u'copy':
return author return author
prefixes = set([y.lower() for y in tweaks['author_name_prefixes']]) prefixes = {force_unicode(y).lower() for y in tweaks['author_name_prefixes']}
prefixes |= set([y+u'.' for y in prefixes]) prefixes |= {y+u'.' for y in prefixes}
while True: while True:
if not tokens: if not tokens:
return author return author
@ -68,8 +68,8 @@ def author_to_author_sort(author, method=None):
else: else:
break break
suffixes = set([y.lower() for y in tweaks['author_name_suffixes']]) suffixes = {force_unicode(y).lower() for y in tweaks['author_name_suffixes']}
suffixes |= set([y+u'.' for y in suffixes]) suffixes |= {y+u'.' for y in suffixes}
suffix = u'' suffix = u''
while True: while True:
@ -100,6 +100,7 @@ def author_to_author_sort(author, method=None):
def authors_to_sort_string(authors): def authors_to_sort_string(authors):
return ' & '.join(map(author_to_author_sort, authors)) return ' & '.join(map(author_to_author_sort, authors))
_title_pats = {} _title_pats = {}
@ -132,6 +133,7 @@ def get_title_sort_pat(lang=None):
_title_pats[lang] = ans _title_pats[lang] = ans
return ans return ans
_ignore_starts = u'\'"'+u''.join(unichr(x) for x in _ignore_starts = u'\'"'+u''.join(unichr(x) for x in
range(0x2018, 0x201e)+[0x2032, 0x2033]) range(0x2018, 0x201e)+[0x2032, 0x2033])
@ -156,6 +158,7 @@ def title_sort(title, order=None, lang=None):
title = title[1:] title = title[1:]
return title.strip() return title.strip()
coding = zip( coding = zip(
[1000,900,500,400,100,90,50,40,10,9,5,4,1], [1000,900,500,400,100,90,50,40,10,9,5,4,1],
["M","CM","D","CD","C","XC","L","XL","X","IX","V","IV","I"] ["M","CM","D","CD","C","XC","L","XL","X","IX","V","IV","I"]