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

Fix #2025 (Many LIT file covers detected sideways)

Browse Source
This commit is contained in:
Kovid Goyal 2009-03-09 18:40:34 -07:00
parent 9edb807322
commit aedb2cf959
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/ebooks/metadata/lit.py
View File

@ -19,15 +19,23 @@ def get_metadata(stream):
for item in opf.iterguide(): for item in opf.iterguide():
if 'cover' not in item.get('type', '').lower(): if 'cover' not in item.get('type', '').lower():
continue continue
ctype = item.get('type')
href = item.get('href', '') href = item.get('href', '')
candidates = [href, href.replace('&', '%26')] candidates = [href, href.replace('&', '%26')]
for item in litfile.manifest.values(): for item in litfile.manifest.values():
if item.path in candidates: if item.path in candidates:
covers.append(item.internal) try:
covers.append((litfile.get_file('/data/'+item.internal),
ctype))
except:
pass
break break
covers = [litfile.get_file('/data/' + i) for i in covers] covers.sort(cmp=lambda x, y:cmp(len(x[0]), len(y[0])), reverse=True)
covers.sort(cmp=lambda x, y:cmp(len(x), len(y))) idx = 0
mi.cover_data = ('jpg', covers[-1]) if len(covers) > 1:
if covers[1][1] == covers[1][0]+'-standard':
idx = 1
mi.cover_data = ('jpg', covers[idx][0])
return mi return mi
def main(args=sys.argv): def main(args=sys.argv):

2
src/calibre/gui2/dialogs/config.py
View File

@ -196,7 +196,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
self.language.addItem(language_codes[lang], QVariant(lang)) self.language.addItem(language_codes[lang], QVariant(lang))
else: else:
lang = 'en' lang = 'en'
self.language.addItem('English', 'en') self.language.addItem('English', QVariant('en'))
items = [(l, language_codes[l]) for l in translations.keys() \ items = [(l, language_codes[l]) for l in translations.keys() \
if l != lang] if l != lang]
if lang != 'en': if lang != 'en':