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

Minor modifications

Browse Source
This commit is contained in:
Sengian 2010-12-15 01:07:40 +01:00
parent a469a02ce7
commit 08eb0e1a59
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/metadata/fictionwise.py
View File

@ -233,7 +233,7 @@ class ResultList(list):
description = self.reimg.sub('', description.group("desc")) description = self.reimg.sub('', description.group("desc"))
description = self.recomment.sub('', description) description = self.recomment.sub('', description)
description = self.resanitize.sub('', sanitize_comments_html(description)) description = self.resanitize.sub('', sanitize_comments_html(description))
return _('SUMMARY:\n %s') % re.sub(r'\n\s+</p>','\n</p>', description) return _('SUMMARY:\n%s') % re.sub(r'\n\s+</p>','\n</p>', description)
def get_publisher(self, entry): def get_publisher(self, entry):
publisher = self.output_entry(entry.xpath('./p')[1]) publisher = self.output_entry(entry.xpath('./p')[1])

11
src/calibre/ebooks/metadata/google_books.py
View File

@ -146,7 +146,7 @@ class Query(object):
# print etree.tostring(feed, pretty_print=True) # print etree.tostring(feed, pretty_print=True)
total = int(total_results(feed)[0].text) total = int(total_results(feed)[0].text)
nbresultstoget = total if total<self.maxresults else self.maxresults nbresultstoget = total if total < self.maxresults else self.maxresults
start = int(start_index(feed)[0].text) start = int(start_index(feed)[0].text)
entries = entry(feed) entries = entry(feed)
@ -156,7 +156,7 @@ class Query(object):
if feed is None: if feed is None:
break break
entries.extend(entry(feed)) entries.extend(entry(feed))
return entries return entries[:nbresultstoget]
class ResultList(list): class ResultList(list):
@ -164,7 +164,7 @@ class ResultList(list):
try: try:
desc = description(entry) desc = description(entry)
if desc: if desc:
return _('SUMMARY:\n %s') % desc[0].text return _('SUMMARY:\n%s') % desc[0].text
except: except:
report(verbose) report(verbose)
@ -183,7 +183,7 @@ class ResultList(list):
m = creator(entry) m = creator(entry)
return [x.text for x in m] if m else [] return [x.text for x in m] if m else []
def get_author_sort(self, entry, verbose): def get_author_sort(self, entry):
for x in creator(entry): for x in creator(entry):
for key, val in x.attrib.iteritems(): for key, val in x.attrib.iteritems():
if key.endswith('file-as'): if key.endswith('file-as'):
@ -216,6 +216,7 @@ class ResultList(list):
try: try:
return publisher(entry)[0].text return publisher(entry)[0].text
except: except:
report(verbose)
return None return None
def get_date(self, entry, verbose): def get_date(self, entry, verbose):
@ -241,7 +242,7 @@ class ResultList(list):
print e print e
authors = self.get_authors(x) authors = self.get_authors(x)
mi = MetaInformation(title, authors) mi = MetaInformation(title, authors)
tmpautsort = self.get_author_sort(x, verbose) tmpautsort = self.get_author_sort(x)
mi.author_sort = tmpautsort if tmpautsort \ mi.author_sort = tmpautsort if tmpautsort \
else authors_to_sort_string(authors) else authors_to_sort_string(authors)
mi.comments = self.get_description(x, verbose) mi.comments = self.get_description(x, verbose)

2
src/calibre/ebooks/metadata/nicebooks.py
View File

@ -203,7 +203,7 @@ class ResultList(list):
def get_description(self, entry, verbose): def get_description(self, entry, verbose):
try: try:
return u'RESUME:\n' + unicode(entry.getparent().xpath("//p[@id='book-description']")[0].text) return _(u'SUMMARY:\n%s') % unicode(entry.getparent().xpath("//p[@id='book-description']")[0].text)
except: except:
report(verbose) report(verbose)
return None return None