diff --git a/.bzrignore b/.bzrignore
index e2d1636ddd..a071a4f2f6 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -12,6 +12,7 @@ resources/images.qrc
resources/scripts.pickle
resources/ebook-convert-complete.pickle
resources/builtin_recipes.xml
+resources/builtin_recipes.zip
setup/installer/windows/calibre/build.log
src/calibre/translations/.errors
src/cssutils/.svn/
diff --git a/Changelog.yaml b/Changelog.yaml
index 8fecf3d95e..33ab86bc1d 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -19,6 +19,210 @@
# new recipes:
# - title:
+
+- version: 0.7.54
+ date: 2011-04-08
+
+ new features:
+ - title: "New output format, HTMLZ which is a single HTML file with its associated images/stylesheets in a zipped up file"
+ description: "Useful when you want to convert your ebook into a single HTML file for easy editing. Note that this output plugin is still new and needs testing"
+
+ - title: "When dealing with ZIP/RAR archives, use the file header rather than the file extension to detrmine the file type, when possible. This fixes the common case of CBZ files being actually cbr files and vice versa"
+
+ - title: "Support for the Motorola Atrix"
+
+ - title: "Allow the icons in the toolbar to be turned off completely via Preferences->Look & Feel"
+
+ - title: "When downloading metadata use the gzip transfer encoding when possible for a speedup."
+ tickets: [749304]
+
+ bug fixes:
+ - title: "Conversion pipeline: Workaround for bug in lxml that causes a massive mem leak on windows and OS X when the input document contains non ASCII CSS selectors."
+ tickets: [754555]
+
+ - title: "Conversion pipeline: Handle inline '
+ output = [u''] + [css] + [u''] + output + [u'']
+ return ''.join(output)
+
+ def dump_text(self, elem, stylizer, page):
+ '''
+ @elem: The element in the etree that we are working on.
+ @stylizer: The style information attached to the element.
+ '''
+
+ # We can only processes tags. If there isn't a tag return any text.
+ if not isinstance(elem.tag, basestring) \
+ or namespace(elem.tag) != XHTML_NS:
+ p = elem.getparent()
+ if p is not None and isinstance(p.tag, basestring) and namespace(p.tag) == XHTML_NS \
+ and elem.tail:
+ return [elem.tail]
+ return ['']
+
+ # Setup our variables.
+ text = ['']
+ tags = []
+ tag = barename(elem.tag)
+ attribs = elem.attrib
+
+ if tag == 'body':
+ tag = 'div'
+ tags.append(tag)
+
+ # Remove attributes we won't want.
+ if 'style' in attribs:
+ del attribs['style']
+
+ # Turn the rest of the attributes into a string we can write with the tag.
+ at = ''
+ for k, v in attribs.items():
+ at += ' %s="%s"' % (k, prepare_string_for_xml(v, attribute=True))
+
+ # Write the tag.
+ text.append('<%s%s>' % (tag, at))
+
+ # Process tags that contain text.
+ if hasattr(elem, 'text') and elem.text:
+ text.append(elem.text)
+
+ # Recurse down into tags within the tag we are in.
+ for item in elem:
+ text += self.dump_text(item, stylizer, page)
+
+ # Close all open tags.
+ tags.reverse()
+ for t in tags:
+ text.append('' % t)
+
+ # Add the text that is outside of the tag.
+ if hasattr(elem, 'tail') and elem.tail:
+ text.append(elem.tail)
+
+ return text
+
+
+def oeb2html_no_css(oeb_book, log, opts):
+ izer = OEB2HTMLNoCSSizer(log)
+ html = izer.oeb2html(oeb_book, opts)
+ images = izer.images
+ return (html, images)
+
+def oeb2html_inline_css(oeb_book, log, opts):
+ izer = OEB2HTMLInlineCSSizer(log)
+ html = izer.oeb2html(oeb_book, opts)
+ images = izer.images
+ return (html, images)
+
+def oeb2html_class_css(oeb_book, log, opts):
+ izer = OEB2HTMLClassCSSizer(log)
+ setattr(opts, 'class_style', 'inline')
+ html = izer.oeb2html(oeb_book, opts)
+ images = izer.images
+ return (html, images)
diff --git a/src/calibre/ebooks/htmlz/output.py b/src/calibre/ebooks/htmlz/output.py
new file mode 100644
index 0000000000..7cdf04bcdb
--- /dev/null
+++ b/src/calibre/ebooks/htmlz/output.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember '
+__docformat__ = 'restructuredtext en'
+
+import os
+
+from lxml import etree
+
+from calibre.customize.conversion import OutputFormatPlugin, \
+ OptionRecommendation
+from calibre.ebooks.oeb.base import OEB_IMAGES
+from calibre.ptempfile import TemporaryDirectory
+from calibre.utils.zipfile import ZipFile
+
+class HTMLZOutput(OutputFormatPlugin):
+
+ name = 'HTMLZ Output'
+ author = 'John Schember'
+ file_type = 'htmlz'
+
+ options = set([
+ OptionRecommendation(name='htmlz_css_type', recommended_value='class',
+ level=OptionRecommendation.LOW,
+ choices=['class', 'inline', 'tag'],
+ help=_('Specify the handling of CSS. Default is class.\n'
+ 'class: Use CSS classes and have elements reference them.\n'
+ 'inline: Write the CSS as an inline style attribute.\n'
+ 'tag: Turn as many CSS styles as possible into HTML tags.'
+ )),
+ OptionRecommendation(name='htmlz_class_style', recommended_value='external',
+ level=OptionRecommendation.LOW,
+ choices=['external', 'inline'],
+ help=_('How to handle the CSS when using css-type = \'class\'.\n'
+ 'Default is external.\n'
+ 'external: Use an external CSS file that is linked in the document.\n'
+ 'inline: Place the CSS in the head section of the document.'
+ )),
+ ])
+
+ def convert(self, oeb_book, output_path, input_plugin, opts, log):
+ # HTML
+ if opts.htmlz_css_type == 'inline':
+ from calibre.ebooks.htmlz.oeb2html import OEB2HTMLInlineCSSizer
+ OEB2HTMLizer = OEB2HTMLInlineCSSizer
+ elif opts.htmlz_css_type == 'tag':
+ from calibre.ebooks.htmlz.oeb2html import OEB2HTMLNoCSSizer
+ OEB2HTMLizer = OEB2HTMLNoCSSizer
+ else:
+ from calibre.ebooks.htmlz.oeb2html import OEB2HTMLClassCSSizer as OEB2HTMLizer
+
+ with TemporaryDirectory('_htmlz_output') as tdir:
+ htmlizer = OEB2HTMLizer(log)
+ html = htmlizer.oeb2html(oeb_book, opts)
+
+ with open(os.path.join(tdir, 'index.html'), 'wb') as tf:
+ tf.write(html)
+
+ # CSS
+ if opts.htmlz_css_type == 'class' and opts.htmlz_class_style == 'external':
+ with open(os.path.join(tdir, 'style.css'), 'wb') as tf:
+ tf.write(htmlizer.get_css(oeb_book))
+
+ # Images
+ images = htmlizer.images
+ if images:
+ if not os.path.exists(os.path.join(tdir, 'images')):
+ os.makedirs(os.path.join(tdir, 'images'))
+ for item in oeb_book.manifest:
+ if item.media_type in OEB_IMAGES and item.href in images:
+ fname = os.path.join(tdir, 'images', images[item.href])
+ with open(fname, 'wb') as img:
+ img.write(item.data)
+
+ # Metadata
+ with open(os.path.join(tdir, 'metadata.opf'), 'wb') as mdataf:
+ mdataf.write(etree.tostring(oeb_book.metadata.to_opf1()))
+
+ htmlz = ZipFile(output_path, 'w')
+ htmlz.add_dir(tdir)
diff --git a/src/calibre/ebooks/lrf/html/convert_from.py b/src/calibre/ebooks/lrf/html/convert_from.py
index 3be8f85e45..4ee1538e3f 100644
--- a/src/calibre/ebooks/lrf/html/convert_from.py
+++ b/src/calibre/ebooks/lrf/html/convert_from.py
@@ -332,7 +332,7 @@ class HTMLConverter(object):
soup = BeautifulSoup(raw,
convertEntities=BeautifulSoup.XHTML_ENTITIES,
markupMassage=nmassage)
- except ConversionError, err:
+ except ConversionError as err:
if 'Failed to coerce to unicode' in str(err):
raw = unicode(raw, 'utf8', 'replace')
soup = BeautifulSoup(raw,
@@ -935,7 +935,7 @@ class HTMLConverter(object):
try:
im = PILImage.open(path)
- except IOError, err:
+ except IOError as err:
self.log.warning('Unable to process image: %s\n%s'%( original_path, err))
return
encoding = detect_encoding(im)
@@ -953,7 +953,7 @@ class HTMLConverter(object):
pt.close()
self.scaled_images[path] = pt
return pt.name
- except (IOError, SystemError), err: # PIL chokes on interlaced PNG images as well a some GIF images
+ except (IOError, SystemError) as err: # PIL chokes on interlaced PNG images as well a some GIF images
self.log.warning(_('Unable to process image %s. Error: %s')%(path, err))
if width == None or height == None:
@@ -1013,7 +1013,7 @@ class HTMLConverter(object):
if not self.images.has_key(path):
try:
self.images[path] = ImageStream(path, encoding=encoding)
- except LrsError, err:
+ except LrsError as err:
self.log.warning(_('Could not process image: %s\n%s')%(
original_path, err))
return
@@ -1768,7 +1768,7 @@ class HTMLConverter(object):
tag_css = self.tag_css(tag)[0] # Table should not inherit CSS
try:
self.process_table(tag, tag_css)
- except Exception, err:
+ except Exception as err:
self.log.warning(_('An error occurred while processing a table: %s. Ignoring table markup.')%repr(err))
self.log.exception('')
self.log.debug(_('Bad table:\n%s')%unicode(tag)[:300])
@@ -1858,7 +1858,7 @@ def process_file(path, options, logger):
tf.close()
tim.save(tf.name)
tpath = tf.name
- except IOError, err: # PIL sometimes fails, for example on interlaced PNG files
+ except IOError as err: # PIL sometimes fails, for example on interlaced PNG files
logger.warn(_('Could not read cover image: %s'), err)
options.cover = None
else:
diff --git a/src/calibre/ebooks/lrf/input.py b/src/calibre/ebooks/lrf/input.py
index 70f3c3a15a..e354bee562 100644
--- a/src/calibre/ebooks/lrf/input.py
+++ b/src/calibre/ebooks/lrf/input.py
@@ -6,7 +6,7 @@ __license__ = 'GPL v3'
__copyright__ = '2009, Kovid Goyal '
__docformat__ = 'restructuredtext en'
-import os, textwrap
+import os, textwrap, sys
from copy import deepcopy
from lxml import etree
@@ -413,7 +413,12 @@ class LRFInput(InputFormatPlugin):
('calibre', 'image-block'): image_block,
}
transform = etree.XSLT(styledoc, extensions=extensions)
- result = transform(doc)
+ try:
+ result = transform(doc)
+ except RuntimeError:
+ sys.setrecursionlimit(5000)
+ result = transform(doc)
+
with open('content.opf', 'wb') as f:
f.write(result)
styles.write()
diff --git a/src/calibre/ebooks/markdown/markdown.py b/src/calibre/ebooks/markdown/markdown.py
index e734079116..677047878a 100644
--- a/src/calibre/ebooks/markdown/markdown.py
+++ b/src/calibre/ebooks/markdown/markdown.py
@@ -34,7 +34,7 @@ License: GPL 2 (http://www.gnu.org/copyleft/gpl.html) or BSD
import re, sys, codecs
from logging import getLogger, StreamHandler, Formatter, \
- DEBUG, INFO, WARN, ERROR, CRITICAL
+ DEBUG, INFO, WARN, CRITICAL
MESSAGE_THRESHOLD = CRITICAL
@@ -95,7 +95,7 @@ def removeBOM(text, encoding):
# and uses the actual name of the executable called.)
EXECUTABLE_NAME_FOR_USAGE = "python markdown.py"
-
+
# --------------- CONSTANTS YOU _SHOULD NOT_ HAVE TO CHANGE ----------
@@ -242,8 +242,6 @@ class Element:
if bidi:
- orig_bidi = self.bidi
-
if not self.bidi or self.isDocumentElement:
# Once the bidi is set don't change it (except for doc element)
self.bidi = bidi
@@ -319,7 +317,7 @@ class Element:
childBuffer += "/>"
-
+
buffer += "<" + self.nodeName
if self.nodeName in ['p', 'li', 'ul', 'ol',
@@ -330,10 +328,10 @@ class Element:
bidi = self.bidi
else:
bidi = self.doc.bidi
-
+
if bidi=="rtl":
self.setAttribute("dir", "rtl")
-
+
for attr in self.attributes:
value = self.attribute_values[attr]
value = self.doc.normalizeEntities(value,
@@ -358,7 +356,7 @@ class TextNode:
attrRegExp = re.compile(r'\{@([^\}]*)=([^\}]*)}') # {@id=123}
def __init__ (self, text):
- self.value = text
+ self.value = text
def attributeCallback(self, match):
@@ -372,7 +370,7 @@ class TextNode:
text = self.value
self.parent.setBidi(getBidiType(text))
-
+
if not text.startswith(HTML_PLACEHOLDER_PREFIX):
if self.parent.nodeName == "p":
text = text.replace("\n", "\n ")
@@ -413,11 +411,11 @@ There are two types of preprocessors: TextPreprocessor and Preprocessor.
class TextPreprocessor:
'''
TextPreprocessors are run before the text is broken into lines.
-
+
Each TextPreprocessor implements a "run" method that takes a pointer to a
text string of the document, modifies it as necessary and returns
- either the same pointer or a pointer to a new string.
-
+ either the same pointer or a pointer to a new string.
+
TextPreprocessors must extend markdown.TextPreprocessor.
'''
@@ -431,18 +429,18 @@ class Preprocessor:
Each preprocessor implements a "run" method that takes a pointer to a
list of lines of the document, modifies it as necessary and returns
- either the same pointer or a pointer to a new list.
-
+ either the same pointer or a pointer to a new list.
+
Preprocessors must extend markdown.Preprocessor.
'''
def run(self, lines):
pass
-
+
class HtmlBlockPreprocessor(TextPreprocessor):
"""Removes html blocks from the source text and stores it."""
-
+
def _get_left_tag(self, block):
return block[1:].replace(">", " ", 1).split()[0].lower()
@@ -451,7 +449,7 @@ class HtmlBlockPreprocessor(TextPreprocessor):
return block.rstrip()[-len(left_tag)-2:-1].lower()
def _equal_tags(self, left_tag, right_tag):
-
+
if left_tag == 'div' or left_tag[0] in ['?', '@', '%']: # handle PHP, etc.
return True
if ("/" + left_tag) == right_tag:
@@ -467,17 +465,17 @@ class HtmlBlockPreprocessor(TextPreprocessor):
def _is_oneliner(self, tag):
return (tag in ['hr', 'hr/'])
-
+
def run(self, text):
new_blocks = []
text = text.split("\n\n")
-
+
items = []
left_tag = ''
right_tag = ''
in_tag = False # flag
-
+
for block in text:
if block.startswith("\n"):
block = block[1:]
@@ -485,7 +483,7 @@ class HtmlBlockPreprocessor(TextPreprocessor):
if not in_tag:
if block.startswith("<"):
-
+
left_tag = self._get_left_tag(block)
right_tag = self._get_right_tag(left_tag, block)
@@ -497,13 +495,13 @@ class HtmlBlockPreprocessor(TextPreprocessor):
if self._is_oneliner(left_tag):
new_blocks.append(block.strip())
continue
-
+
if block[1] == "!":
# is a comment block
left_tag = "--"
right_tag = self._get_right_tag(left_tag, block)
# keep checking conditions below and maybe just append
-
+
if block.rstrip().endswith(">") \
and self._equal_tags(left_tag, right_tag):
new_blocks.append(
@@ -519,9 +517,9 @@ class HtmlBlockPreprocessor(TextPreprocessor):
else:
items.append(block.strip())
-
+
right_tag = self._get_right_tag(left_tag, block)
-
+
if self._equal_tags(left_tag, right_tag):
# if find closing tag
in_tag = False
@@ -532,7 +530,7 @@ class HtmlBlockPreprocessor(TextPreprocessor):
if items:
new_blocks.append(self.stash.store('\n\n'.join(items)))
new_blocks.append('\n')
-
+
return "\n\n".join(new_blocks)
HTML_BLOCK_PREPROCESSOR = HtmlBlockPreprocessor()
@@ -605,7 +603,7 @@ LINE_PREPROCESSOR = LinePreprocessor()
class ReferencePreprocessor(Preprocessor):
- '''
+ '''
Removes reference definitions from the text and stores them for later use.
'''
@@ -760,7 +758,7 @@ class BacktickPattern (Pattern):
return el
-class DoubleTagPattern (SimpleTagPattern):
+class DoubleTagPattern (SimpleTagPattern):
def handleMatch(self, m, doc):
tag1, tag2 = self.tag.split(",")
@@ -775,7 +773,6 @@ class HtmlPattern (Pattern):
def handleMatch (self, m, doc):
rawhtml = m.group(2)
- inline = True
place_holder = self.stash.store(rawhtml)
return doc.createTextNode(place_holder)
@@ -926,11 +923,11 @@ There are two types of post-processors: Postprocessor and TextPostprocessor
class Postprocessor:
'''
Postprocessors are run before the dom it converted back into text.
-
+
Each Postprocessor implements a "run" method that takes a pointer to a
- NanoDom document, modifies it as necessary and returns a NanoDom
+ NanoDom document, modifies it as necessary and returns a NanoDom
document.
-
+
Postprocessors must extend markdown.Postprocessor.
There are currently no standard post-processors, but the footnote
@@ -945,10 +942,10 @@ class Postprocessor:
class TextPostprocessor:
'''
TextPostprocessors are run after the dom it converted back into text.
-
+
Each TextPostprocessor implements a "run" method that takes a pointer to a
text string, modifies it as necessary and returns a text string.
-
+
TextPostprocessors must extend markdown.TextPostprocessor.
'''
@@ -971,7 +968,7 @@ class RawHtmlTextPostprocessor(TextPostprocessor):
html = ''
else:
html = HTML_REMOVED_TEXT
-
+
text = text.replace("%s\n
" % (HTML_PLACEHOLDER % i),
html + "\n")
text = text.replace(HTML_PLACEHOLDER % i, html)
@@ -1031,7 +1028,6 @@ class BlockGuru:
remainder of the original list"""
items = []
- item = -1
i = 0 # to keep track of where we are
@@ -1187,7 +1183,7 @@ class Markdown:
RAWHTMLTEXTPOSTPROCESSOR]
self.prePatterns = []
-
+
self.inlinePatterns = [DOUBLE_BACKTICK_PATTERN,
BACKTICK_PATTERN,
@@ -1241,7 +1237,7 @@ class Markdown:
configs_for_ext = configs[ext]
else:
configs_for_ext = []
- extension = module.makeExtension(configs_for_ext)
+ extension = module.makeExtension(configs_for_ext)
extension.extendMarkdown(self, globals())
@@ -1310,7 +1306,7 @@ class Markdown:
else:
buffer.append(line)
self._processSection(self.top_element, buffer)
-
+
#self._processSection(self.top_element, self.lines)
# Not sure why I put this in but let's leave it for now.
@@ -1426,7 +1422,7 @@ class Markdown:
for item in list:
el.appendChild(item)
-
+
def _processUList(self, parent_elem, lines, inList):
self._processList(parent_elem, lines, inList,
@@ -1458,7 +1454,7 @@ class Markdown:
i = 0 # a counter to keep track of where we are
- for line in lines:
+ for line in lines:
loose = 0
if not line.strip():
@@ -1477,7 +1473,7 @@ class Markdown:
# Check if the next non-blank line is still a part of the list
if ( RE.regExp['ul'].match(next) or
- RE.regExp['ol'].match(next) or
+ RE.regExp['ol'].match(next) or
RE.regExp['tabbed'].match(next) ):
# get rid of any white space in the line
items[item].append(line.strip())
@@ -1618,7 +1614,7 @@ class Markdown:
i = 0
while i < len(parts):
-
+
x = parts[i]
if isinstance(x, (str, unicode)):
@@ -1641,14 +1637,14 @@ class Markdown:
parts[i] = self.doc.createTextNode(x)
return parts
-
+
def _applyPattern(self, line, pattern, patternIndex):
""" Given a pattern name, this function checks if the line
fits the pattern, creates the necessary elements, and returns
back a list consisting of NanoDom elements and/or strings.
-
+
@param line: the text to be processed
@param pattern: the pattern to be checked
@@ -1676,19 +1672,19 @@ class Markdown:
if not node.nodeName in ["code", "pre"]:
for child in node.childNodes:
if isinstance(child, TextNode):
-
+
result = self._handleInline(child.value, patternIndex+1)
-
+
if result:
if result == [child]:
continue
-
+
result.reverse()
#to make insertion easier
position = node.childNodes.index(child)
-
+
node.removeChild(child)
for item in result:
@@ -1699,7 +1695,7 @@ class Markdown:
self.doc.createTextNode(item))
else:
node.insertChild(position, item)
-
+
@@ -1798,14 +1794,14 @@ def markdownFromFile(input = None,
def markdown(text,
extensions = [],
safe_mode = False):
-
+
message(DEBUG, "in markdown.markdown(), received text:\n%s" % text)
extension_names = []
extension_configs = {}
-
+
for ext in extensions:
- pos = ext.find("(")
+ pos = ext.find("(")
if pos == -1:
extension_names.append(ext)
else:
@@ -1820,7 +1816,7 @@ def markdown(text,
safe_mode = safe_mode)
return md.convert(text)
-
+
class Extension:
@@ -1845,26 +1841,11 @@ Python 2.3 or higher required for advanced command line options.
For lower versions of Python use:
%s INPUT_FILE > OUTPUT_FILE
-
+
""" % EXECUTABLE_NAME_FOR_USAGE
def parse_options():
-
- try:
- optparse = __import__("optparse")
- except:
- if len(sys.argv) == 2:
- return {'input': sys.argv[1],
- 'output': None,
- 'message_threshold': CRITICAL,
- 'safe': False,
- 'extensions': [],
- 'encoding': None }
-
- else:
- print OPTPARSE_WARNING
- return None
-
+ import optparse
parser = optparse.OptionParser(usage="%prog INPUTFILE [options]")
parser.add_option("-f", "--file", dest="filename",
@@ -1881,7 +1862,7 @@ def parse_options():
parser.add_option("-s", "--safe", dest="safe", default=False,
metavar="SAFE_MODE",
help="same mode ('replace', 'remove' or 'escape' user's HTML tag)")
-
+
parser.add_option("--noisy",
action="store_const", const=DEBUG, dest="verbose",
help="print debug messages")
@@ -1914,14 +1895,14 @@ def main():
if not options:
sys.exit(0)
-
+
markdownFromFile(**options)
if __name__ == '__main__':
sys.exit(main())
""" Run Markdown from the command line. """
-
+
diff --git a/src/calibre/ebooks/metadata/amazon.py b/src/calibre/ebooks/metadata/amazon.py
index 8e4dd1dd27..4100439feb 100644
--- a/src/calibre/ebooks/metadata/amazon.py
+++ b/src/calibre/ebooks/metadata/amazon.py
@@ -108,7 +108,7 @@ def _get_cover_url(br, asin):
q = 'http://amzn.com/'+asin
try:
raw = br.open_novisit(q).read()
- except Exception, e:
+ except Exception as e:
if callable(getattr(e, 'getcode', None)) and \
e.getcode() == 404:
return None
@@ -139,7 +139,7 @@ def get_metadata(br, asin, mi):
q = 'http://amzn.com/'+asin
try:
raw = br.open_novisit(q).read()
- except Exception, e:
+ except Exception as e:
if callable(getattr(e, 'getcode', None)) and \
e.getcode() == 404:
return False
diff --git a/src/calibre/ebooks/metadata/amazonfr.py b/src/calibre/ebooks/metadata/amazonfr.py
index 156fff3d75..248c8d9ed0 100644
--- a/src/calibre/ebooks/metadata/amazonfr.py
+++ b/src/calibre/ebooks/metadata/amazonfr.py
@@ -33,7 +33,7 @@ class AmazonFr(MetadataSource):
try:
self.results = search(self.title, self.book_author, self.publisher,
self.isbn, max_results=10, verbose=self.verbose, lang='fr')
- except Exception, e:
+ except Exception as e:
self.exception = e
self.tb = traceback.format_exc()
@@ -50,7 +50,7 @@ class AmazonEs(MetadataSource):
try:
self.results = search(self.title, self.book_author, self.publisher,
self.isbn, max_results=10, verbose=self.verbose, lang='es')
- except Exception, e:
+ except Exception as e:
self.exception = e
self.tb = traceback.format_exc()
@@ -67,7 +67,7 @@ class AmazonEn(MetadataSource):
try:
self.results = search(self.title, self.book_author, self.publisher,
self.isbn, max_results=10, verbose=self.verbose, lang='en')
- except Exception, e:
+ except Exception as e:
self.exception = e
self.tb = traceback.format_exc()
@@ -84,7 +84,7 @@ class AmazonDe(MetadataSource):
try:
self.results = search(self.title, self.book_author, self.publisher,
self.isbn, max_results=10, verbose=self.verbose, lang='de')
- except Exception, e:
+ except Exception as e:
self.exception = e
self.tb = traceback.format_exc()
@@ -103,7 +103,7 @@ class Amazon(MetadataSource):
try:
self.results = search(self.title, self.book_author, self.publisher,
self.isbn, max_results=10, verbose=self.verbose, lang='all')
- except Exception, e:
+ except Exception as e:
self.exception = e
self.tb = traceback.format_exc()
@@ -193,7 +193,7 @@ class Query(object):
try:
raw = browser.open_novisit(self.urldata, timeout=timeout).read()
- except Exception, e:
+ except Exception as e:
report(verbose)
if callable(getattr(e, 'getcode', None)) and \
e.getcode() == 404:
@@ -226,7 +226,7 @@ class Query(object):
try:
urldata = self.urldata + '&page=' + str(i)
raw = browser.open_novisit(urldata, timeout=timeout).read()
- except Exception, e:
+ except Exception as e:
continue
if '404 - ' in raw:
continue
@@ -413,7 +413,7 @@ class ResultList(list):
def get_individual_metadata(self, browser, linkdata, verbose):
try:
raw = browser.open_novisit(linkdata).read()
- except Exception, e:
+ except Exception as e:
report(verbose)
if callable(getattr(e, 'getcode', None)) and \
e.getcode() == 404:
@@ -445,7 +445,7 @@ class ResultList(list):
# self.clean_entry(entry, invalid_id=inv_ids)
title = self.get_title(entry)
authors = self.get_authors(entry)
- except Exception, e:
+ except Exception as e:
if verbose:
print 'Failed to get all details for an entry'
print e
diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index 2bf23e4b82..ff22cd3608 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -125,7 +125,10 @@ class Metadata(object):
_data = object.__getattribute__(self, '_data')
if field in TOP_LEVEL_IDENTIFIERS:
field, val = self._clean_identifier(field, val)
- _data['identifiers'].update({field: val})
+ identifiers = _data['identifiers']
+ identifiers.pop(field, None)
+ if val:
+ identifiers[field] = val
elif field == 'identifiers':
if not val:
val = copy.copy(NULL_VALUES.get('identifiers', None))
@@ -198,8 +201,10 @@ class Metadata(object):
return copy.deepcopy(ans)
def _clean_identifier(self, typ, val):
- typ = icu_lower(typ).strip().replace(':', '').replace(',', '')
- val = val.strip().replace(',', '|').replace(':', '|')
+ if typ:
+ typ = icu_lower(typ).strip().replace(':', '').replace(',', '')
+ if val:
+ val = val.strip().replace(',', '|').replace(':', '|')
return typ, val
def set_identifiers(self, identifiers):
@@ -222,8 +227,7 @@ class Metadata(object):
identifiers = object.__getattribute__(self,
'_data')['identifiers']
- if not val and typ in identifiers:
- identifiers.pop(typ)
+ identifiers.pop(typ, None)
if val:
identifiers[typ] = val
@@ -575,7 +579,10 @@ class Metadata(object):
orig_res = res
datatype = cmeta['datatype']
if datatype == 'text' and cmeta['is_multiple']:
- res = u', '.join(sorted(res, key=sort_key))
+ if cmeta['display'].get('is_names', False):
+ res = u' & '.join(res)
+ else:
+ res = u', '.join(sorted(res, key=sort_key))
elif datatype == 'series' and series_with_index:
if self.get_extra(key) is not None:
res = res + \
@@ -642,7 +649,7 @@ class Metadata(object):
fmt('Tags', u', '.join([unicode(t) for t in self.tags]))
if self.series:
fmt('Series', self.series + ' #%s'%self.format_series_index())
- if self.language:
+ if not self.is_null('language'):
fmt('Language', self.language)
if self.rating is not None:
fmt('Rating', self.rating)
diff --git a/src/calibre/ebooks/metadata/covers.py b/src/calibre/ebooks/metadata/covers.py
index 74b210a9a1..10acff4e61 100644
--- a/src/calibre/ebooks/metadata/covers.py
+++ b/src/calibre/ebooks/metadata/covers.py
@@ -91,7 +91,7 @@ class OpenLibraryCovers(CoverDownload): # {{{
br.open_novisit(HeadRequest(self.OPENLIBRARY%mi.isbn), timeout=timeout)
self.debug('cover for', mi.isbn, 'found')
ans.set()
- except Exception, e:
+ except Exception as e:
if callable(getattr(e, 'getcode', None)) and e.getcode() == 302:
self.debug('cover for', mi.isbn, 'found')
ans.set()
@@ -106,7 +106,7 @@ class OpenLibraryCovers(CoverDownload): # {{{
try:
ans = br.open(self.OPENLIBRARY%mi.isbn, timeout=timeout).read()
result_queue.put((True, ans, 'jpg', self.name))
- except Exception, e:
+ except Exception as e:
if callable(getattr(e, 'getcode', None)) and e.getcode() == 404:
result_queue.put((False, _('ISBN: %s not found')%mi.isbn, '', self.name))
else:
@@ -131,7 +131,7 @@ class AmazonCovers(CoverDownload): # {{{
get_cover_url(mi.isbn, br)
self.debug('cover for', mi.isbn, 'found')
ans.set()
- except Exception, e:
+ except Exception as e:
self.debug(e)
def get_covers(self, mi, result_queue, abort, timeout=5.):
@@ -145,7 +145,7 @@ class AmazonCovers(CoverDownload): # {{{
raise ValueError('No cover found for ISBN: %s'%mi.isbn)
cover_data = br.open_novisit(url).read()
result_queue.put((True, cover_data, 'jpg', self.name))
- except Exception, e:
+ except Exception as e:
result_queue.put((False, self.exception_to_string(e),
traceback.format_exc(), self.name))
@@ -215,7 +215,7 @@ class DoubanCovers(CoverDownload): # {{{
try:
url = self.DOUBAN_ISBN_URL + isbn + "?apikey=" + self.CALIBRE_DOUBAN_API_KEY
src = br.open(url, timeout=timeout).read()
- except Exception, err:
+ except Exception as err:
if isinstance(getattr(err, 'args', [None])[0], socket.timeout):
err = Exception(_('Douban.com API timed out. Try again later.'))
raise err
@@ -248,7 +248,7 @@ class DoubanCovers(CoverDownload): # {{{
if self.get_cover_url(mi.isbn, br, timeout=timeout) != None:
self.debug('cover for', mi.isbn, 'found')
ans.set()
- except Exception, e:
+ except Exception as e:
self.debug(e)
def get_covers(self, mi, result_queue, abort, timeout=5.):
@@ -259,7 +259,7 @@ class DoubanCovers(CoverDownload): # {{{
url = self.get_cover_url(mi.isbn, br, timeout=timeout)
cover_data = br.open_novisit(url).read()
result_queue.put((True, cover_data, 'jpg', self.name))
- except Exception, e:
+ except Exception as e:
result_queue.put((False, self.exception_to_string(e),
traceback.format_exc(), self.name))
# }}}
@@ -302,4 +302,16 @@ def test(isbns): # {{{
if __name__ == '__main__':
isbns = sys.argv[1:] + ['9781591025412', '9780307272119']
- test(isbns)
+ #test(isbns)
+
+ from calibre.ebooks.metadata import MetaInformation
+ oc = OpenLibraryCovers(None)
+ for isbn in isbns:
+ mi = MetaInformation('xx', ['yy'])
+ mi.isbn = isbn
+ rq = Queue()
+ oc.get_covers(mi, rq, Event())
+ result = rq.get_nowait()
+ if not result[0]:
+ print 'Failed for ISBN:', isbn
+ print result
diff --git a/src/calibre/ebooks/metadata/douban.py b/src/calibre/ebooks/metadata/douban.py
index c6a34b6162..98a51f69d1 100644
--- a/src/calibre/ebooks/metadata/douban.py
+++ b/src/calibre/ebooks/metadata/douban.py
@@ -49,7 +49,7 @@ class DoubanBooks(MetadataSource):
self.results = search(self.title, self.book_author, self.publisher,
self.isbn, max_results=10,
verbose=self.verbose)
- except Exception, e:
+ except Exception as e:
self.exception = e
self.tb = traceback.format_exc()
@@ -192,7 +192,7 @@ class ResultList(list):
raw = browser.open(id_url).read()
feed = etree.fromstring(raw)
x = entry(feed)[0]
- except Exception, e:
+ except Exception as e:
if verbose:
print 'Failed to get all details for an entry'
print e
@@ -212,7 +212,7 @@ def search(title=None, author=None, publisher=None, isbn=None,
api_key = CALIBRE_DOUBAN_API_KEY
while start > 0 and len(entries) <= max_results:
- new, start = Query(title=title, author=author, publisher=publisher,
+ new, start = Query(title=title, author=author, publisher=publisher,
isbn=isbn, max_results=max_results, start_index=start, api_key=api_key)(br, verbose)
if not new:
break
diff --git a/src/calibre/ebooks/metadata/epub.py b/src/calibre/ebooks/metadata/epub.py
index f19b89eb88..27fa94e217 100644
--- a/src/calibre/ebooks/metadata/epub.py
+++ b/src/calibre/ebooks/metadata/epub.py
@@ -5,7 +5,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
'''Read meta information from epub files'''
-import os, re, posixpath, shutil
+import os, re, posixpath
from cStringIO import StringIO
from contextlib import closing
@@ -192,6 +192,13 @@ def get_metadata(stream, extract_cover=True):
def get_quick_metadata(stream):
return get_metadata(stream, False)
+def _write_new_cover(new_cdata, cpath):
+ from calibre.utils.magick.draw import save_cover_data_to
+ new_cover = PersistentTemporaryFile(suffix=os.path.splitext(cpath)[1])
+ new_cover.close()
+ save_cover_data_to(new_cdata, new_cover.name)
+ return new_cover
+
def set_metadata(stream, mi, apply_null=False, update_timestamp=False):
stream.seek(0)
reader = OCFZipReader(stream, root=os.getcwdu())
@@ -208,6 +215,7 @@ def set_metadata(stream, mi, apply_null=False, update_timestamp=False):
new_cdata = open(mi.cover, 'rb').read()
except:
pass
+ new_cover = cpath = None
if new_cdata and raster_cover:
try:
cpath = posixpath.join(posixpath.dirname(reader.opf_path),
@@ -215,19 +223,7 @@ def set_metadata(stream, mi, apply_null=False, update_timestamp=False):
cover_replacable = not reader.encryption_meta.is_encrypted(cpath) and \
os.path.splitext(cpath)[1].lower() in ('.png', '.jpg', '.jpeg')
if cover_replacable:
- from calibre.utils.magick.draw import save_cover_data_to, \
- identify
- new_cover = PersistentTemporaryFile(suffix=os.path.splitext(cpath)[1])
- resize_to = None
- if False: # Resize new cover to same size as old cover
- shutil.copyfileobj(reader.open(cpath), new_cover)
- new_cover.close()
- width, height, fmt = identify(new_cover.name)
- resize_to = (width, height)
- else:
- new_cover.close()
- save_cover_data_to(new_cdata, new_cover.name,
- resize_to=resize_to)
+ new_cover = _write_new_cover(new_cdata, cpath)
replacements[cpath] = open(new_cover.name, 'rb')
except:
import traceback
@@ -249,4 +245,11 @@ def set_metadata(stream, mi, apply_null=False, update_timestamp=False):
newopf = StringIO(reader.opf.render())
safe_replace(stream, reader.container[OPF.MIMETYPE], newopf,
extra_replacements=replacements)
+ try:
+ if cpath is not None:
+ replacements[cpath].close()
+ os.remove(replacements[cpath].name)
+ except:
+ pass
+
diff --git a/src/calibre/ebooks/metadata/txtz.py b/src/calibre/ebooks/metadata/extz.py
similarity index 94%
rename from src/calibre/ebooks/metadata/txtz.py
rename to src/calibre/ebooks/metadata/extz.py
index ae6efb4838..0ecdbe9ea6 100644
--- a/src/calibre/ebooks/metadata/txtz.py
+++ b/src/calibre/ebooks/metadata/extz.py
@@ -4,7 +4,7 @@ __license__ = 'GPL v3'
__copyright__ = '2011, John Schember <john@nachtimwald.com>'
'''
-Read meta information from TXT files
+Read meta information from extZ (TXTZ, HTMLZ...) files.
'''
import os
diff --git a/src/calibre/ebooks/metadata/fetch.py b/src/calibre/ebooks/metadata/fetch.py
index 667b4f4d7c..e1fac50d16 100644
--- a/src/calibre/ebooks/metadata/fetch.py
+++ b/src/calibre/ebooks/metadata/fetch.py
@@ -93,7 +93,7 @@ class MetadataSource(Plugin): # {{{
traceback.print_exc()
mi.comments = None
- except Exception, e:
+ except Exception as e:
self.exception = e
self.tb = traceback.format_exc()
@@ -186,7 +186,7 @@ class GoogleBooks(MetadataSource): # {{{
self.results = search(self.title, self.book_author, self.publisher,
self.isbn, max_results=10,
verbose=self.verbose)
- except Exception, e:
+ except Exception as e:
self.exception = e
self.tb = traceback.format_exc()
@@ -217,7 +217,7 @@ class ISBNDB(MetadataSource): # {{{
try:
opts, args = option_parser().parse_args(args)
self.results = create_books(opts, args)
- except Exception, e:
+ except Exception as e:
self.exception = e
self.tb = traceback.format_exc()
@@ -244,7 +244,7 @@ class Amazon(MetadataSource): # {{{
try:
self.results = get_social_metadata(self.title, self.book_author,
self.publisher, self.isbn)
- except Exception, e:
+ except Exception as e:
self.exception = e
self.tb = traceback.format_exc()
@@ -264,7 +264,7 @@ class KentDistrictLibrary(MetadataSource): # {{{
from calibre.ebooks.metadata.kdl import get_series
try:
self.results = get_series(self.title, self.book_author)
- except Exception, e:
+ except Exception as e:
import traceback
traceback.print_exc()
self.exception = e
diff --git a/src/calibre/ebooks/metadata/fictionwise.py b/src/calibre/ebooks/metadata/fictionwise.py
index b780f2b39d..145e39768d 100644
--- a/src/calibre/ebooks/metadata/fictionwise.py
+++ b/src/calibre/ebooks/metadata/fictionwise.py
@@ -30,7 +30,7 @@ class Fictionwise(MetadataSource): # {{{
try:
self.results = search(self.title, self.book_author, self.publisher,
self.isbn, max_results=10, verbose=self.verbose)
- except Exception, e:
+ except Exception as e:
self.exception = e
self.tb = traceback.format_exc()
@@ -91,7 +91,7 @@ class Query(object):
try:
raw = browser.open_novisit(self.BASE_URL, self.urldata, timeout=timeout).read()
- except Exception, e:
+ except Exception as e:
report(verbose)
if callable(getattr(e, 'getcode', None)) and \
e.getcode() == 404:
@@ -276,7 +276,7 @@ class ResultList(list):
def get_individual_metadata(self, browser, linkdata, verbose):
try:
raw = browser.open_novisit(self.BASE_URL + linkdata).read()
- except Exception, e:
+ except Exception as e:
report(verbose)
if callable(getattr(e, 'getcode', None)) and \
e.getcode() == 404:
@@ -311,7 +311,7 @@ class ResultList(list):
#maybe strenghten the search
ratings = self.get_rating(entry.xpath("./p/table")[1], verbose)
authors = self.get_authors(entry)
- except Exception, e:
+ except Exception as e:
if verbose:
print _('Failed to get all details for an entry')
print e
@@ -328,7 +328,7 @@ class ResultList(list):
#maybe strenghten the search
ratings = self.get_rating(entry.xpath("./p/table")[1], verbose)
authors = self.get_authors(entry)
- except Exception, e:
+ except Exception as e:
if verbose:
print _('Failed to get all details for an entry')
print e
diff --git a/src/calibre/ebooks/metadata/google_books.py b/src/calibre/ebooks/metadata/google_books.py
index 2087b7c489..2e52bf020d 100644
--- a/src/calibre/ebooks/metadata/google_books.py
+++ b/src/calibre/ebooks/metadata/google_books.py
@@ -176,7 +176,7 @@ class ResultList(list):
raw = browser.open(id_url).read()
feed = etree.fromstring(raw)
x = entry(feed)[0]
- except Exception, e:
+ except Exception as e:
if verbose:
print 'Failed to get all details for an entry'
print e
@@ -193,6 +193,7 @@ class ResultList(list):
def search(title=None, author=None, publisher=None, isbn=None,
min_viewability='none', verbose=False, max_results=40):
br = browser()
+ br.set_handle_gzip(True)
start, entries = 1, []
while start > 0 and len(entries) <= max_results:
new, start = Query(title=title, author=author, publisher=publisher,
diff --git a/src/calibre/ebooks/metadata/imp.py b/src/calibre/ebooks/metadata/imp.py
index e2a2b61f31..28bc2bc00f 100644
--- a/src/calibre/ebooks/metadata/imp.py
+++ b/src/calibre/ebooks/metadata/imp.py
@@ -38,7 +38,7 @@ def get_metadata(stream):
mi.author = author
if category:
mi.category = category
- except Exception, err:
+ except Exception as err:
msg = u'Couldn\'t read metadata from imp: %s with error %s'%(mi.title, unicode(err))
print >>sys.stderr, msg.encode('utf8')
return mi
diff --git a/src/calibre/ebooks/metadata/isbndb.py b/src/calibre/ebooks/metadata/isbndb.py
index 1c5f706593..54cd403c62 100644
--- a/src/calibre/ebooks/metadata/isbndb.py
+++ b/src/calibre/ebooks/metadata/isbndb.py
@@ -25,7 +25,7 @@ def fetch_metadata(url, max=3, timeout=5.):
while len(books) < total_results and max > 0:
try:
raw = br.open(url, timeout=timeout).read()
- except Exception, err:
+ except Exception as err:
raise ISBNDBError('Could not fetch ISBNDB metadata. Error: '+str(err))
soup = BeautifulStoneSoup(raw,
convertEntities=BeautifulStoneSoup.XML_ENTITIES)
diff --git a/src/calibre/ebooks/metadata/kdl.py b/src/calibre/ebooks/metadata/kdl.py
index b0b961b603..aa2f0d7246 100644
--- a/src/calibre/ebooks/metadata/kdl.py
+++ b/src/calibre/ebooks/metadata/kdl.py
@@ -43,7 +43,7 @@ def get_series(title, authors, timeout=60):
br = browser()
try:
raw = br.open_novisit(url, timeout=timeout).read()
- except URLError, e:
+ except URLError as e:
if isinstance(e.reason, socket.timeout):
raise Exception('KDL Server busy, try again later')
raise
diff --git a/src/calibre/ebooks/metadata/library_thing.py b/src/calibre/ebooks/metadata/library_thing.py
index a0f28a3c21..ddd4b64f58 100644
--- a/src/calibre/ebooks/metadata/library_thing.py
+++ b/src/calibre/ebooks/metadata/library_thing.py
@@ -4,34 +4,23 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
Fetch cover from LibraryThing.com based on ISBN number.
'''
-import sys, re, random
+import sys, re
from lxml import html
import mechanize
-from calibre import browser, prints
+from calibre import browser, prints, random_user_agent
from calibre.utils.config import OptionParser
from calibre.ebooks.chardet import strip_encoding_declarations
OPENLIBRARY = 'http://covers.openlibrary.org/b/isbn/%s-L.jpg?default=false'
-def get_ua():
- choices = [
- 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11'
- 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)'
- 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)'
- 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1)'
- 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7A341 Safari/528.16'
- 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.19 (KHTML, like Gecko) Chrome/0.2.153.1 Safari/525.19'
- 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11'
- ]
- return choices[random.randint(0, len(choices)-1)]
_lt_br = None
def get_browser():
global _lt_br
if _lt_br is None:
- _lt_br = browser(user_agent=get_ua())
+ _lt_br = browser(user_agent=random_user_agent())
return _lt_br.clone_browser()
class HeadRequest(mechanize.Request):
@@ -45,7 +34,7 @@ def check_for_cover(isbn, timeout=5.):
try:
br.open_novisit(HeadRequest(OPENLIBRARY%isbn), timeout=timeout)
return True
- except Exception, e:
+ except Exception as e:
if callable(getattr(e, 'getcode', None)) and e.getcode() == 302:
return True
return False
diff --git a/src/calibre/ebooks/metadata/meta.py b/src/calibre/ebooks/metadata/meta.py
index cbd9db3f04..b0c43a8182 100644
--- a/src/calibre/ebooks/metadata/meta.py
+++ b/src/calibre/ebooks/metadata/meta.py
@@ -182,6 +182,19 @@ def metadata_from_filename(name, pat=None):
mi.isbn = si
except (IndexError, ValueError):
pass
+ try:
+ publisher = match.group('publisher')
+ mi.publisher = publisher
+ except (IndexError, ValueError):
+ pass
+ try:
+ pubdate = match.group('published')
+ if pubdate:
+ from calibre.utils.date import parse_date
+ mi.pubdate = parse_date(pubdate)
+ except:
+ pass
+
if mi.is_null('title'):
mi.title = name
return mi
diff --git a/src/calibre/ebooks/metadata/mobi.py b/src/calibre/ebooks/metadata/mobi.py
index 963391dcf8..ffdef77d11 100644
--- a/src/calibre/ebooks/metadata/mobi.py
+++ b/src/calibre/ebooks/metadata/mobi.py
@@ -271,11 +271,11 @@ class MetadataUpdater(object):
FILTER=''.join([(len(repr(chr(x)))==3) and chr(x) or '.' for x in range(256)])
N=0; result=''
while src:
- s,src = src[:length],src[length:]
- hexa = ' '.join(["%02X"%ord(x) for x in s])
- s = s.translate(FILTER)
- result += "%04X %-*s %s\n" % (N, length*3, hexa, s)
- N+=length
+ s,src = src[:length],src[length:]
+ hexa = ' '.join(["%02X"%ord(x) for x in s])
+ s = s.translate(FILTER)
+ result += "%04X %-*s %s\n" % (N, length*3, hexa, s)
+ N+=length
print result
def get_pdbrecords(self):
@@ -323,6 +323,7 @@ class MetadataUpdater(object):
"\tThis is a '%s' file of type '%s'" % (self.type[0:4], self.type[4:8]))
recs = []
+ added_501 = False
try:
from calibre.ebooks.conversion.config import load_defaults
prefs = load_defaults('mobi_output')
@@ -355,6 +356,7 @@ class MetadataUpdater(object):
update_exth_record((105, normalize(subjects).encode(self.codec, 'replace')))
if kindle_pdoc and kindle_pdoc in mi.tags:
+ added_501 = True
update_exth_record((501, str('PDOC')))
if mi.pubdate:
@@ -370,6 +372,12 @@ class MetadataUpdater(object):
update_exth_record((203, pack('>I', 0)))
if self.thumbnail_record is not None:
update_exth_record((202, pack('>I', self.thumbnail_rindex)))
+ # Add a 113 record if not present to allow Amazon syncing
+ if (113 not in self.original_exth_records and
+ self.original_exth_records.get(501, None) == 'EBOK' and
+ not added_501):
+ from uuid import uuid4
+ update_exth_record((113, str(uuid4())))
if 503 in self.original_exth_records:
update_exth_record((503, mi.title.encode(self.codec, 'replace')))
diff --git a/src/calibre/ebooks/metadata/nicebooks.py b/src/calibre/ebooks/metadata/nicebooks.py
index 8914e2d985..2afa6c018a 100644
--- a/src/calibre/ebooks/metadata/nicebooks.py
+++ b/src/calibre/ebooks/metadata/nicebooks.py
@@ -32,7 +32,7 @@ class NiceBooks(MetadataSource):
try:
self.results = search(self.title, self.book_author, self.publisher,
self.isbn, max_results=10, verbose=self.verbose)
- except Exception, e:
+ except Exception as e:
self.exception = e
self.tb = traceback.format_exc()
@@ -54,7 +54,7 @@ class NiceBooksCovers(CoverDownload):
if Covers(mi.isbn)(entry).check_cover():
self.debug('cover for', mi.isbn, 'found')
ans.set()
- except Exception, e:
+ except Exception as e:
self.debug(e)
def get_covers(self, mi, result_queue, abort, timeout=5.):
@@ -67,7 +67,7 @@ class NiceBooksCovers(CoverDownload):
if not ext:
ext = 'jpg'
result_queue.put((True, cover_data, ext, self.name))
- except Exception, e:
+ except Exception as e:
result_queue.put((False, self.exception_to_string(e),
traceback.format_exc(), self.name))
@@ -109,7 +109,7 @@ class Query(object):
try:
raw = browser.open_novisit(self.BASE_URL+self.urldata, timeout=timeout).read()
- except Exception, e:
+ except Exception as e:
report(verbose)
if callable(getattr(e, 'getcode', None)) and \
e.getcode() == 404:
@@ -144,7 +144,7 @@ class Query(object):
try:
urldata = self.urldata + '&p=' + str(i)
raw = browser.open_novisit(self.BASE_URL+urldata, timeout=timeout).read()
- except Exception, e:
+ except Exception as e:
continue
if '<title>404 - ' in raw:
continue
@@ -233,7 +233,7 @@ class ResultList(list):
def get_individual_metadata(self, browser, linkdata, verbose):
try:
raw = browser.open_novisit(self.BASE_URL + linkdata).read()
- except Exception, e:
+ except Exception as e:
report(verbose)
if callable(getattr(e, 'getcode', None)) and \
e.getcode() == 404:
@@ -266,7 +266,7 @@ class ResultList(list):
entry = entry.find("div[@id='book-info']")
title = self.get_title(entry)
authors = self.get_authors(entry)
- except Exception, e:
+ except Exception as e:
if verbose:
print 'Failed to get all details for an entry'
print e
@@ -280,7 +280,7 @@ class ResultList(list):
entry = entry.find("div[@id='book-info']")
title = self.get_title(entry)
authors = self.get_authors(entry)
- except Exception, e:
+ except Exception as e:
if verbose:
print 'Failed to get all details for an entry'
print e
@@ -315,7 +315,7 @@ class Covers(object):
cover, ext = browser.open_novisit(self.urlimg, timeout=timeout).read(), \
self.urlimg.rpartition('.')[-1]
return cover, ext if ext else 'jpg'
- except Exception, err:
+ except Exception as err:
if isinstance(getattr(err, 'args', [None])[0], socket.timeout):
raise NiceBooksError(_('Nicebooks timed out. Try again later.'))
if not len(self.urlimg):
diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py
index 6af4f79cbb..d360451e2e 100644
--- a/src/calibre/ebooks/metadata/opf2.py
+++ b/src/calibre/ebooks/metadata/opf2.py
@@ -21,6 +21,7 @@ from calibre.ebooks.metadata.book.base import Metadata
from calibre.utils.date import parse_date, isoformat
from calibre.utils.localization import get_lang
from calibre import prints
+from calibre.utils.cleantext import clean_ascii_chars
class Resource(object): # {{{
'''
@@ -1157,7 +1158,7 @@ class OPFCreator(Metadata):
def DC_ELEM(tag, text, dc_attrs={}, opf_attrs={}):
if text:
- elem = getattr(DC, tag)(text, **dc_attrs)
+ elem = getattr(DC, tag)(clean_ascii_chars(text), **dc_attrs)
else:
elem = getattr(DC, tag)(**dc_attrs)
for k, v in opf_attrs.items():
@@ -1260,7 +1261,6 @@ def metadata_to_opf(mi, as_string=True):
from lxml import etree
import textwrap
from calibre.ebooks.oeb.base import OPF, DC
- from calibre.utils.cleantext import clean_ascii_chars
if not mi.application_id:
mi.application_id = str(uuid.uuid4())
diff --git a/src/calibre/ebooks/metadata/rb.py b/src/calibre/ebooks/metadata/rb.py
index 1f13ce1d9d..c8ab657146 100644
--- a/src/calibre/ebooks/metadata/rb.py
+++ b/src/calibre/ebooks/metadata/rb.py
@@ -43,7 +43,7 @@ def get_metadata(stream):
elif key.strip() == 'AUTHOR':
mi.author = value
mi.authors = string_to_authors(value)
- except Exception, err:
+ except Exception as err:
msg = u'Couldn\'t read metadata from rb: %s with error %s'%(mi.title, unicode(err))
print >>sys.stderr, msg.encode('utf8')
raise
diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index b99893ccba..24df68e51d 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -10,6 +10,7 @@ __docformat__ = 'restructuredtext en'
import socket, time, re
from urllib import urlencode
from threading import Thread
+from Queue import Queue, Empty
from lxml.html import soupparser, tostring
@@ -22,17 +23,18 @@ from calibre.ebooks.metadata.book.base import Metadata
from calibre.library.comments import sanitize_comments_html
from calibre.utils.date import parse_date
-class Worker(Thread): # {{{
+class Worker(Thread): # Get details {{{
'''
Get book details from amazons book page in a separate thread
'''
- def __init__(self, url, result_queue, browser, log, timeout=20):
+ def __init__(self, url, result_queue, browser, log, relevance, plugin, timeout=20):
Thread.__init__(self)
self.daemon = True
self.url, self.result_queue = url, result_queue
self.log, self.timeout = log, timeout
+ self.relevance, self.plugin = relevance, plugin
self.browser = browser.clone_browser()
self.cover_url = self.amazon_id = self.isbn = None
@@ -40,12 +42,12 @@ class Worker(Thread): # {{{
try:
self.get_details()
except:
- self.log.error('get_details failed for url: %r'%self.url)
+ self.log.exception('get_details failed for url: %r'%self.url)
def get_details(self):
try:
raw = self.browser.open_novisit(self.url, timeout=self.timeout).read().strip()
- except Exception, e:
+ except Exception as e:
if callable(getattr(e, 'getcode', None)) and \
e.getcode() == 404:
self.log.error('URL malformed: %r'%self.url)
@@ -62,7 +64,7 @@ class Worker(Thread): # {{{
raw = xml_to_unicode(raw, strip_encoding_pats=True,
resolve_entities=True)[0]
- # open('/t/t.html', 'wb').write(raw)
+ #open('/t/t.html', 'wb').write(raw)
if '<title>404 - ' in raw:
self.log.error('URL malformed: %r'%self.url)
@@ -161,6 +163,17 @@ class Worker(Thread): # {{{
else:
self.log.warning('Failed to find product description for url: %r'%self.url)
+ mi.source_relevance = self.relevance
+
+ if self.amazon_id:
+ if self.isbn:
+ self.plugin.cache_isbn_to_identifier(self.isbn, self.amazon_id)
+ if self.cover_url:
+ self.plugin.cache_identifier_to_cover_url(self.amazon_id,
+ self.cover_url)
+
+ self.plugin.clean_downloaded_metadata(mi)
+
self.result_queue.put(mi)
def parse_asin(self, root):
@@ -205,6 +218,9 @@ class Worker(Thread): # {{{
' @class="emptyClear" or @href]'):
c.getparent().remove(c)
desc = tostring(desc, method='html', encoding=unicode).strip()
+ # Encoding bug in Amazon data U+fffd (replacement char)
+ # in some examples it is present in place of '
+ desc = desc.replace('\ufffd', "'")
# remove all attributes from tags
desc = re.sub(r'<([a-zA-Z0-9]+)\s[^>]+>', r'<\1>', desc)
# Collapse whitespace
@@ -263,19 +279,31 @@ class Worker(Thread): # {{{
class Amazon(Source):
- name = 'Amazon'
+ name = 'Amazon.com'
description = _('Downloads metadata from Amazon')
- capabilities = frozenset(['identify'])
+ capabilities = frozenset(['identify', 'cover'])
touched_fields = frozenset(['title', 'authors', 'identifier:amazon',
- 'identifier:isbn', 'rating', 'comments', 'publisher', 'pubdate'])
+ 'identifier:isbn', 'rating', 'comments', 'publisher', 'pubdate',
+ 'language'])
+ has_html_comments = True
+ supports_gzip_transfer_encoding = True
AMAZON_DOMAINS = {
'com': _('US'),
'fr' : _('France'),
'de' : _('Germany'),
+ 'uk' : _('UK'),
}
+ def get_book_url(self, identifiers): # {{{
+ asin = identifiers.get('amazon', None)
+ if asin is None:
+ asin = identifiers.get('asin', None)
+ if asin:
+ return 'http://amzn.com/%s'%asin
+ # }}}
+
def create_query(self, log, title=None, authors=None, identifiers={}): # {{{
domain = self.prefs.get('domain', 'com')
@@ -314,13 +342,29 @@ class Amazon(Source):
# Insufficient metadata to make an identify query
return None
- utf8q = dict([(x.encode('utf-8'), y.encode('utf-8')) for x, y in
+ latin1q = dict([(x.encode('latin1', 'ignore'), y.encode('latin1',
+ 'ignore')) for x, y in
q.iteritems()])
- url = 'http://www.amazon.%s/s/?'%domain + urlencode(utf8q)
+ url = 'http://www.amazon.%s/s/?'%domain + urlencode(latin1q)
return url
# }}}
+ def get_cached_cover_url(self, identifiers): # {{{
+ url = None
+ asin = identifiers.get('amazon', None)
+ if asin is None:
+ asin = identifiers.get('asin', None)
+ if asin is None:
+ isbn = identifiers.get('isbn', None)
+ if isbn is not None:
+ asin = self.cached_isbn_to_identifier(isbn)
+ if asin is not None:
+ url = self.cached_identifier_to_cover_url(asin)
+
+ return url
+ # }}}
+
def identify(self, log, result_queue, abort, title=None, authors=None, # {{{
identifiers={}, timeout=30):
'''
@@ -335,7 +379,7 @@ class Amazon(Source):
br = self.browser
try:
raw = br.open_novisit(query, timeout=timeout).read().strip()
- except Exception, e:
+ except Exception as e:
if callable(getattr(e, 'getcode', None)) and \
e.getcode() == 404:
log.error('Query malformed: %r'%query)
@@ -379,6 +423,18 @@ class Amazon(Source):
if 'bulk pack' not in title:
matches.append(a.get('href'))
break
+ if not matches:
+ # This can happen for some user agents that Amazon thinks are
+ # mobile/less capable
+ log('Trying alternate results page markup')
+ for td in root.xpath(
+ r'//div[@id="Results"]/descendant::td[starts-with(@id, "search:Td:")]'):
+ for a in td.xpath(r'descendant::td[@class="dataColumn"]/descendant::a[@href]/span[@class="srTitle"]/..'):
+ title = tostring(a, method='text', encoding=unicode).lower()
+ if 'bulk pack' not in title:
+ matches.append(a.get('href'))
+ break
+
# Keep only the top 5 matches as the matches are sorted by relevance by
# Amazon so lower matches are not likely to be very relevant
@@ -396,7 +452,8 @@ class Amazon(Source):
log.error('No matches found with query: %r'%query)
return
- workers = [Worker(url, result_queue, br, log) for url in matches]
+ workers = [Worker(url, result_queue, br, log, i, self) for i, url in
+ enumerate(matches)]
for w in workers:
w.start()
@@ -414,19 +471,47 @@ class Amazon(Source):
if not a_worker_is_alive:
break
- for w in workers:
- if w.amazon_id:
- if w.isbn:
- self.cache_isbn_to_identifier(w.isbn, w.amazon_id)
- if w.cover_url:
- self.cache_identifier_to_cover_url(w.amazon_id,
- w.cover_url)
-
return None
# }}}
+ def download_cover(self, log, result_queue, abort, # {{{
+ title=None, authors=None, identifiers={}, timeout=30):
+ cached_url = self.get_cached_cover_url(identifiers)
+ if cached_url is None:
+ log.info('No cached cover found, running identify')
+ rq = Queue()
+ self.identify(log, rq, abort, title=title, authors=authors,
+ identifiers=identifiers)
+ if abort.is_set():
+ return
+ results = []
+ while True:
+ try:
+ results.append(rq.get_nowait())
+ except Empty:
+ break
+ results.sort(key=self.identify_results_keygen(
+ title=title, authors=authors, identifiers=identifiers))
+ for mi in results:
+ cached_url = self.get_cached_cover_url(mi.identifiers)
+ if cached_url is not None:
+ break
+ if cached_url is None:
+ log.info('No cover found')
+ return
-if __name__ == '__main__':
+ if abort.is_set():
+ return
+ br = self.browser
+ log('Downloading cover from:', cached_url)
+ try:
+ cdata = br.open_novisit(cached_url, timeout=timeout).read()
+ result_queue.put((self, cdata))
+ except:
+ log.exception('Failed to download cover from:', cached_url)
+ # }}}
+
+if __name__ == '__main__': # tests {{{
# To run these test use: calibre-debug -e
# src/calibre/ebooks/metadata/sources/amazon.py
from calibre.ebooks.metadata.sources.test import (test_identify_plugin,
@@ -446,7 +531,7 @@ if __name__ == '__main__':
( # This isbn not on amazon
{'identifiers':{'isbn': '8324616489'}, 'title':'Learning Python',
'authors':['Lutz']},
- [title_test('Learning Python: Powerful Object-Oriented Programming',
+ [title_test('Learning Python, 3rd Edition',
exact=True), authors_test(['Mark Lutz'])
]
@@ -472,5 +557,5 @@ if __name__ == '__main__':
),
])
-
+# }}}
diff --git a/src/calibre/ebooks/metadata/sources/base.py b/src/calibre/ebooks/metadata/sources/base.py
index 55cc996cf7..5089d8951b 100644
--- a/src/calibre/ebooks/metadata/sources/base.py
+++ b/src/calibre/ebooks/metadata/sources/base.py
@@ -8,19 +8,146 @@ __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
import re, threading
+from future_builtins import map
from calibre import browser, random_user_agent
from calibre.customize import Plugin
from calibre.utils.logging import ThreadSafeLog, FileStream
from calibre.utils.config import JSONConfig
+from calibre.utils.titlecase import titlecase
+from calibre.utils.icu import capitalize, lower
+from calibre.ebooks.metadata import check_isbn
-msprefs = JSONConfig('metadata_sources.json')
+msprefs = JSONConfig('metadata_sources/global.json')
+msprefs.defaults['txt_comments'] = False
+msprefs.defaults['ignore_fields'] = []
+msprefs.defaults['max_tags'] = 20
+msprefs.defaults['wait_after_first_identify_result'] = 30 # seconds
+msprefs.defaults['wait_after_first_cover_result'] = 60 # seconds
+
+# Google covers are often poor quality (scans/errors) but they have high
+# resolution, so they trump covers from better sources. So make sure they
+# are only used if no other covers are found.
+msprefs.defaults['cover_priorities'] = {'Google':2}
def create_log(ostream=None):
log = ThreadSafeLog(level=ThreadSafeLog.DEBUG)
log.outputs = [FileStream(ostream)]
return log
+# Comparing Metadata objects for relevance {{{
+words = ("the", "a", "an", "of", "and")
+prefix_pat = re.compile(r'^(%s)\s+'%("|".join(words)))
+trailing_paren_pat = re.compile(r'\(.*\)$')
+whitespace_pat = re.compile(r'\s+')
+
+def cleanup_title(s):
+ if not s:
+ s = _('Unknown')
+ s = s.strip().lower()
+ s = prefix_pat.sub(' ', s)
+ s = trailing_paren_pat.sub('', s)
+ s = whitespace_pat.sub(' ', s)
+ return s.strip()
+
+class InternalMetadataCompareKeyGen(object):
+
+ '''
+ Generate a sort key for comparison of the relevance of Metadata objects,
+ given a search query.
+
+ The sort key ensures that an ascending order sort is a sort by order of
+ decreasing relevance.
+
+ The algorithm is:
+
+ * Prefer results that have the same ISBN as specified in the query
+ * Prefer results with a cached cover URL
+ * Prefer results with all available fields filled in
+ * Prefer results that are an exact title match to the query
+ * Prefer results with longer comments (greater than 10% longer)
+ * Use the relevance of the result as reported by the metadata source's search
+ engine
+ '''
+
+ def __init__(self, mi, source_plugin, title, authors, identifiers):
+ isbn = 1 if mi.isbn and mi.isbn == identifiers.get('isbn', None) else 2
+
+ all_fields = 1 if source_plugin.test_fields(mi) is None else 2
+
+ exact_title = 1 if title and \
+ cleanup_title(title) == cleanup_title(mi.title) else 2
+
+ has_cover = 2 if (not source_plugin.cached_cover_url_is_reliable or
+ source_plugin.get_cached_cover_url(mi.identifiers) is None) else 1
+
+ self.base = (isbn, has_cover, all_fields, exact_title)
+ self.comments_len = len(mi.comments.strip() if mi.comments else '')
+ self.extra = (getattr(mi, 'source_relevance', 0), )
+
+ def __cmp__(self, other):
+ result = cmp(self.base, other.base)
+ if result == 0:
+ # Now prefer results with the longer comments, within 10%
+ cx, cy = self.comments_len, other.comments_len
+ t = (cx + cy) / 20
+ delta = cy - cx
+ if abs(delta) > t:
+ result = delta
+ else:
+ result = cmp(self.extra, other.extra)
+ return result
+
+# }}}
+
+def get_cached_cover_urls(mi):
+ from calibre.customize.ui import metadata_plugins
+ plugins = list(metadata_plugins(['identify']))
+ for p in plugins:
+ url = p.get_cached_cover_url(mi.identifiers)
+ if url:
+ yield (p, url)
+
+def cap_author_token(token):
+ lt = lower(token)
+ if lt in ('von', 'de', 'el', 'van', 'le'):
+ return lt
+ if re.match(r'([a-z]\.){2,}$', lt) is not None:
+ # Normalize tokens of the form J.K. to J. K.
+ parts = token.split('.')
+ return '. '.join(map(capitalize, parts)).strip()
+ return capitalize(token)
+
+def fixauthors(authors):
+ if not authors:
+ return authors
+ ans = []
+ for x in authors:
+ ans.append(' '.join(map(cap_author_token, x.split())))
+ return ans
+
+def fixcase(x):
+ if x:
+ x = titlecase(x)
+ return x
+
+class Option(object):
+ __slots__ = ['type', 'default', 'label', 'desc', 'name', 'choices']
+
+ def __init__(self, name, type_, default, label, desc, choices=None):
+ '''
+ :param name: The name of this option. Must be a valid python identifier
+ :param type_: The type of this option, one of ('number', 'string',
+ 'bool', 'choices')
+ :param default: The default value for this option
+ :param label: A short (few words) description of this option
+ :param desc: A longer description of this option
+ :param choices: A list of possible values, used only if type='choices'
+ '''
+ self.name, self.type, self.default, self.label, self.desc = (name,
+ type_, default, label, desc)
+ self.choices = choices
+
class Source(Plugin):
type = _('Metadata source')
@@ -28,10 +155,33 @@ class Source(Plugin):
supported_platforms = ['windows', 'osx', 'linux']
+ #: Set of capabilities supported by this plugin.
+ #: Useful capabilities are: 'identify', 'cover'
capabilities = frozenset()
+ #: List of metadata fields that can potentially be download by this plugin
+ #: during the identify phase
touched_fields = frozenset()
+ #: Set this to True if your plugin return HTML formatted comments
+ has_html_comments = False
+
+ #: Setting this to True means that the browser object will add
+ #: Accept-Encoding: gzip to all requests. This can speedup downloads
+ #: but make sure that the source actually supports gzip transfer encoding
+ #: correctly first
+ supports_gzip_transfer_encoding = False
+
+ #: Cached cover URLs can sometimes be unreliable (i.e. the download could
+ #: fail or the returned image could be bogus. If that is often the case
+ #: with this source set to False
+ cached_cover_url_is_reliable = True
+
+ #: A list of :class:`Option` objects. They will be used to automatically
+ #: construct the configuration widget for this plugin
+ options = ()
+
+
def __init__(self, *args, **kwargs):
Plugin.__init__(self, *args, **kwargs)
self._isbn_to_identifier_cache = {}
@@ -39,9 +189,29 @@ class Source(Plugin):
self.cache_lock = threading.RLock()
self._config_obj = None
self._browser = None
+ self.prefs.defaults['ignore_fields'] = []
+ for opt in self.options:
+ self.prefs.defaults[opt.name] = opt.default
# Configuration {{{
+ def is_configured(self):
+ '''
+ Return False if your plugin needs to be configured before it can be
+ used. For example, it might need a username/password/API key.
+ '''
+ return True
+
+ def is_customizable(self):
+ return True
+
+ def config_widget(self):
+ from calibre.gui2.metadata.config import ConfigWidget
+ return ConfigWidget(self)
+
+ def save_settings(self, config_widget):
+ config_widget.commit()
+
@property
def prefs(self):
if self._config_obj is None:
@@ -55,11 +225,19 @@ class Source(Plugin):
def browser(self):
if self._browser is None:
self._browser = browser(user_agent=random_user_agent())
- return self._browser
+ if self.supports_gzip_transfer_encoding:
+ self._browser.set_handle_gzip(True)
+ return self._browser.clone_browser()
# }}}
- # Utility functions {{{
+ # Caching {{{
+
+ def get_related_isbns(self, id_):
+ with self.cache_lock:
+ for isbn, q in self._isbn_to_identifier_cache.iteritems():
+ if q == id_:
+ yield isbn
def cache_isbn_to_identifier(self, isbn, identifier):
with self.cache_lock:
@@ -77,6 +255,10 @@ class Source(Plugin):
with self.cache_lock:
return self._identifier_to_cover_url_cache.get(id_, None)
+ # }}}
+
+ # Utility functions {{{
+
def get_author_tokens(self, authors, only_first_author=True):
'''
Take a list of authors and return a list of tokens useful for an
@@ -128,12 +310,72 @@ class Source(Plugin):
gr.append(job)
return [g for g in groups if g]
+ def test_fields(self, mi):
+ '''
+ Return the first field from self.touched_fields that is null on the
+ mi object
+ '''
+ for key in self.touched_fields:
+ if key.startswith('identifier:'):
+ key = key.partition(':')[-1]
+ if not mi.has_identifier(key):
+ return 'identifier: ' + key
+ elif mi.is_null(key):
+ return key
+
+ def clean_downloaded_metadata(self, mi):
+ '''
+ Call this method in your plugin's identify method to normalize metadata
+ before putting the Metadata object into result_queue. You can of
+ course, use a custom algorithm suited to your metadata source.
+ '''
+ if mi.title:
+ mi.title = fixcase(mi.title)
+ mi.authors = fixauthors(mi.authors)
+ mi.tags = list(map(fixcase, mi.tags))
+ mi.isbn = check_isbn(mi.isbn)
+
# }}}
# Metadata API {{{
+ def get_book_url(self, identifiers):
+ '''
+ Return the URL for the book identified by identifiers at this source.
+ If no URL is found, return None.
+ '''
+ return None
+
+ def get_cached_cover_url(self, identifiers):
+ '''
+ Return cached cover URL for the book identified by
+ the identifiers dict or None if no such URL exists.
+
+ Note that this method must only return validated URLs, i.e. not URLS
+ that could result in a generic cover image or a not found error.
+ '''
+ return None
+
+ def identify_results_keygen(self, title=None, authors=None,
+ identifiers={}):
+ '''
+ Return a function that is used to generate a key that can sort Metadata
+ objects by their relevance given a search query (title, authors,
+ identifiers).
+
+ These keys are used to sort the results of a call to :meth:`identify`.
+
+ For details on the default algorithm see
+ :class:`InternalMetadataCompareKeyGen`. Re-implement this function in
+ your plugin if the default algorithm is not suitable.
+ '''
+ def keygen(mi):
+ return InternalMetadataCompareKeyGen(mi, self, title, authors,
+ identifiers)
+ return keygen
+
def identify(self, log, result_queue, abort, title=None, authors=None,
- identifiers={}, timeout=5):
+ identifiers={}, timeout=30):
'''
Identify a book by its title/author/isbn/etc.
@@ -147,6 +389,15 @@ class Source(Plugin):
the same ISBN/special identifier does not need to get the cover URL
again. Use the caching API for this.
+ Every Metadata object put into result_queue by this method must have a
+ `source_relevance` attribute that is an integer indicating the order in
+ which the results were returned by the metadata source for this query.
+ This integer will be used by :meth:`compare_identify_results`. If the
+ order is unimportant, set it to zero for every result.
+
+ Make sure that any cover/isbn mapping information is cached before the
+ Metadata object is put into result_queue.
+
:param log: A log object, use it to output debugging information/errors
:param result_queue: A result Queue, results should be put into it.
Each result is a Metadata object
@@ -164,5 +415,18 @@ class Source(Plugin):
'''
return None
+ def download_cover(self, log, result_queue, abort,
+ title=None, authors=None, identifiers={}, timeout=30):
+ '''
+ Download a cover and put it into result_queue. The parameters all have
+ the same meaning as for :meth:`identify`. Put (self, cover_data) into
+ result_queue.
+
+ This method should use cached cover URLs for efficiency whenever
+ possible. When cached data is not present, most plugins simply call
+ identify and use its results.
+ '''
+ pass
+
# }}}
diff --git a/src/calibre/ebooks/metadata/sources/cli.py b/src/calibre/ebooks/metadata/sources/cli.py
new file mode 100644
index 0000000000..cb422f939d
--- /dev/null
+++ b/src/calibre/ebooks/metadata/sources/cli.py
@@ -0,0 +1,105 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+ print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+import sys, textwrap
+from io import BytesIO
+from threading import Event
+
+from calibre import prints
+from calibre.utils.config import OptionParser
+from calibre.utils.magick.draw import save_cover_data_to
+from calibre.ebooks.metadata import string_to_authors
+from calibre.ebooks.metadata.opf2 import metadata_to_opf
+from calibre.ebooks.metadata.sources.base import create_log
+from calibre.ebooks.metadata.sources.identify import identify
+from calibre.ebooks.metadata.sources.covers import download_cover
+from calibre.utils.config import test_eight_code
+
+def option_parser():
+ if not test_eight_code:
+ from calibre.ebooks.metadata.fetch import option_parser
+ return option_parser()
+
+ parser = OptionParser(textwrap.dedent(
+ '''\
+ %prog [options]
+
+ Fetch book metadata from online sources. You must specify at least one
+ of title, authors or ISBN.
+ '''
+ ))
+ parser.add_option('-t', '--title', help='Book title')
+ parser.add_option('-a', '--authors', help='Book author(s)')
+ parser.add_option('-i', '--isbn', help='Book ISBN')
+ parser.add_option('-v', '--verbose', default=False, action='store_true',
+ help='Print the log to the console (stderr)')
+ parser.add_option('-o', '--opf', help='Output the metadata in OPF format')
+ parser.add_option('-c', '--cover',
+ help='Specify a filename. The cover, if available, will be saved to it')
+ parser.add_option('-d', '--timeout', default='30',
+ help='Timeout in seconds. Default is 30')
+
+ return parser
+
+def main(args=sys.argv):
+ if not test_eight_code:
+ from calibre.ebooks.metadata.fetch import main
+ return main(args)
+ parser = option_parser()
+ opts, args = parser.parse_args(args)
+
+ buf = BytesIO()
+ log = create_log(buf)
+ abort = Event()
+
+ authors = []
+ if opts.authors:
+ authors = string_to_authors(opts.authors)
+
+ identifiers = {}
+ if opts.isbn:
+ identifiers['isbn'] = opts.isbn
+
+ results = identify(log, abort, title=opts.title, authors=authors,
+ identifiers=identifiers, timeout=int(opts.timeout))
+
+ if not results:
+ print (log, file=sys.stderr)
+ prints('No results found', file=sys.stderr)
+ raise SystemExit(1)
+ result = results[0]
+
+ cf = None
+ if opts.cover and results:
+ cover = download_cover(log, title=opts.title, authors=authors,
+ identifiers=result.identifiers, timeout=int(opts.timeout))
+ if cover is None:
+ prints('No cover found', file=sys.stderr)
+ else:
+ save_cover_data_to(cover[-1], opts.cover)
+ result.cover = cf = opts.cover
+
+
+ log = buf.getvalue()
+
+
+ result = (metadata_to_opf(result) if opts.opf else
+ unicode(result).encode('utf-8'))
+
+ if opts.verbose:
+ print (log, file=sys.stderr)
+
+ print (result)
+ if not opts.opf and opts.cover:
+ prints('Cover :', cf)
+
+ return 0
+
+if __name__ == '__main__':
+ sys.exit(main())
diff --git a/src/calibre/ebooks/metadata/sources/covers.py b/src/calibre/ebooks/metadata/sources/covers.py
new file mode 100644
index 0000000000..cf6ec90c54
--- /dev/null
+++ b/src/calibre/ebooks/metadata/sources/covers.py
@@ -0,0 +1,178 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+ print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+import time
+from Queue import Queue, Empty
+from threading import Thread, Event
+from io import BytesIO
+
+from calibre.customize.ui import metadata_plugins
+from calibre.ebooks.metadata.sources.base import msprefs, create_log
+from calibre.utils.magick.draw import Image, save_cover_data_to
+
+class Worker(Thread):
+
+ def __init__(self, plugin, abort, title, authors, identifiers, timeout, rq):
+ Thread.__init__(self)
+ self.daemon = True
+
+ self.plugin = plugin
+ self.abort = abort
+ self.buf = BytesIO()
+ self.log = create_log(self.buf)
+ self.title, self.authors, self.identifiers = (title, authors,
+ identifiers)
+ self.timeout, self.rq = timeout, rq
+ self.time_spent = None
+
+ def run(self):
+ start_time = time.time()
+ if not self.abort.is_set():
+ try:
+ self.plugin.download_cover(self.log, self.rq, self.abort,
+ title=self.title, authors=self.authors,
+ identifiers=self.identifiers, timeout=self.timeout)
+ except:
+ self.log.exception('Failed to download cover from',
+ self.plugin.name)
+ self.time_spent = time.time() - start_time
+
+def is_worker_alive(workers):
+ for w in workers:
+ if w.is_alive():
+ return True
+ return False
+
+def process_result(log, result):
+ plugin, data = result
+ try:
+ im = Image()
+ im.load(data)
+ im.trim(10)
+ width, height = im.size
+ fmt = im.format
+
+ if width < 50 or height < 50:
+ raise ValueError('Image too small')
+ data = save_cover_data_to(im, '/cover.jpg', return_data=True)
+ except:
+ log.exception('Invalid cover from', plugin.name)
+ return None
+ return (plugin, width, height, fmt, data)
+
+def run_download(log, results, abort,
+ title=None, authors=None, identifiers={}, timeout=30):
+ '''
+ Run the cover download, putting results into the queue :param:`results`.
+
+ Each result is a tuple of the form:
+
+ (plugin, width, height, fmt, bytes)
+
+ '''
+ plugins = [p for p in metadata_plugins(['cover']) if p.is_configured()]
+
+ rq = Queue()
+ workers = [Worker(p, abort, title, authors, identifiers, timeout, rq) for p
+ in plugins]
+ for w in workers:
+ w.start()
+
+ first_result_at = None
+ wait_time = msprefs['wait_after_first_cover_result']
+ found_results = {}
+
+ while True:
+ time.sleep(0.1)
+ try:
+ x = rq.get_nowait()
+ result = process_result(log, x)
+ if result is not None:
+ results.put(result)
+ found_results[result[0]] = result
+ if first_result_at is not None:
+ first_result_at = time.time()
+ except Empty:
+ pass
+
+ if not is_worker_alive(workers):
+ break
+
+ if first_result_at is not None and time.time() - first_result_at > wait_time:
+ log('Not waiting for any more results')
+ abort.set()
+
+ if abort.is_set():
+ break
+
+ while True:
+ try:
+ x = rq.get_nowait()
+ result = process_result(log, x)
+ if result is not None:
+ results.put(result)
+ found_results[result[0]] = result
+ except Empty:
+ break
+
+ for w in workers:
+ wlog = w.buf.getvalue().strip()
+ log('\n'+'*'*30, w.plugin.name, 'Covers', '*'*30)
+ log('Request extra headers:', w.plugin.browser.addheaders)
+ if w.plugin in found_results:
+ result = found_results[w.plugin]
+ log('Downloaded cover:', '%dx%d'%(result[1], result[2]))
+ else:
+ log('Failed to download valid cover')
+ if w.time_spent is None:
+ log('Download aborted')
+ else:
+ log('Took', w.time_spent, 'seconds')
+ if wlog:
+ log(wlog)
+ log('\n'+'*'*80)
+
+
+def download_cover(log,
+ title=None, authors=None, identifiers={}, timeout=30):
+ '''
+ Synchronous cover download. Returns the "best" cover as per user
+ prefs/cover resolution.
+
+ Return cover is a tuple: (plugin, width, height, fmt, data)
+
+ Returns None if no cover is found.
+ '''
+ rq = Queue()
+ abort = Event()
+
+ run_download(log, rq, abort, title=title, authors=authors,
+ identifiers=identifiers, timeout=timeout)
+
+ results = []
+
+ while True:
+ try:
+ results.append(rq.get_nowait())
+ except Empty:
+ break
+
+ cp = msprefs['cover_priorities']
+
+ def keygen(result):
+ plugin, width, height, fmt, data = result
+ return (cp.get(plugin.name, 1), 1/(width*height))
+
+ results.sort(key=keygen)
+
+ return results[0] if results else None
+
+
+
+
diff --git a/src/calibre/ebooks/metadata/sources/google.py b/src/calibre/ebooks/metadata/sources/google.py
index c44ad81b6c..4133d4d527 100644
--- a/src/calibre/ebooks/metadata/sources/google.py
+++ b/src/calibre/ebooks/metadata/sources/google.py
@@ -7,9 +7,10 @@ __license__ = 'GPL v3'
__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
-import time
+import time, hashlib
from urllib import urlencode
from functools import partial
+from Queue import Queue, Empty
from lxml import etree
@@ -24,7 +25,8 @@ from calibre import as_unicode
NAMESPACES = {
'openSearch':'http://a9.com/-/spec/opensearchrss/1.0/',
'atom' : 'http://www.w3.org/2005/Atom',
- 'dc': 'http://purl.org/dc/terms'
+ 'dc' : 'http://purl.org/dc/terms',
+ 'gd' : 'http://schemas.google.com/g/2005'
}
XPath = partial(etree.XPath, namespaces=NAMESPACES)
@@ -41,6 +43,7 @@ publisher = XPath('descendant::dc:publisher')
subject = XPath('descendant::dc:subject')
description = XPath('descendant::dc:description')
language = XPath('descendant::dc:language')
+rating = XPath('descendant::gd:rating[@average]')
def get_details(browser, url, timeout): # {{{
try:
@@ -113,8 +116,10 @@ def to_metadata(browser, log, entry_, timeout): # {{{
btags = [x.text for x in subject(extra) if x.text]
tags = []
for t in btags:
- tags.extend([y.strip() for y in t.split('/')])
- tags = list(sorted(list(set(tags))))
+ atags = [y.strip() for y in t.split('/')]
+ for tag in atags:
+ if tag not in tags:
+ tags.append(tag)
except:
log.exception('Failed to parse tags:')
tags = []
@@ -128,21 +133,48 @@ def to_metadata(browser, log, entry_, timeout): # {{{
default = utcnow().replace(day=15)
mi.pubdate = parse_date(pubdate, assume_utc=True, default=default)
except:
- log.exception('Failed to parse pubdate')
+ log.error('Failed to parse pubdate %r'%pubdate)
+ # Ratings
+ for x in rating(extra):
+ try:
+ mi.rating = float(x.get('average'))
+ if mi.rating > 5:
+ mi.rating /= 2
+ except:
+ log.exception('Failed to parse rating')
+
+ # Cover
+ mi.has_google_cover = None
+ for x in extra.xpath(
+ '//*[@href and @rel="http://schemas.google.com/books/2008/thumbnail"]'):
+ mi.has_google_cover = x.get('href')
+ break
return mi
# }}}
class GoogleBooks(Source):
- name = 'Google Books'
+ name = 'Google'
description = _('Downloads metadata from Google Books')
- capabilities = frozenset(['identify'])
+ capabilities = frozenset(['identify', 'cover'])
touched_fields = frozenset(['title', 'authors', 'tags', 'pubdate',
- 'comments', 'publisher', 'identifier:isbn',
+ 'comments', 'publisher', 'identifier:isbn', 'rating',
'identifier:google']) # language currently disabled
+ supports_gzip_transfer_encoding = True
+ cached_cover_url_is_reliable = False
+
+ GOOGLE_COVER = 'http://books.google.com/books?id=%s&printsec=frontcover&img=1'
+
+ DUMMY_IMAGE_MD5 = frozenset(['0de4383ebad0adad5eeb8975cd796657'])
+
+ def get_book_url(self, identifiers): # {{{
+ goog = identifiers.get('google', None)
+ if goog is not None:
+ return 'http://books.google.com/books?id=%s'%goog
+ # }}}
def create_query(self, log, title=None, authors=None, identifiers={}): # {{{
BASE_URL = 'http://books.google.com/books/feeds/volumes?'
@@ -174,45 +206,95 @@ class GoogleBooks(Source):
})
# }}}
- def cover_url_from_identifiers(self, identifiers):
+ def download_cover(self, log, result_queue, abort, # {{{
+ title=None, authors=None, identifiers={}, timeout=30):
+ cached_url = self.get_cached_cover_url(identifiers)
+ if cached_url is None:
+ log.info('No cached cover found, running identify')
+ rq = Queue()
+ self.identify(log, rq, abort, title=title, authors=authors,
+ identifiers=identifiers)
+ if abort.is_set():
+ return
+ results = []
+ while True:
+ try:
+ results.append(rq.get_nowait())
+ except Empty:
+ break
+ results.sort(key=self.identify_results_keygen(
+ title=title, authors=authors, identifiers=identifiers))
+ for mi in results:
+ cached_url = self.get_cached_cover_url(mi.identifiers)
+ if cached_url is not None:
+ break
+ if cached_url is None:
+ log.info('No cover found')
+ return
+
+ if abort.is_set():
+ return
+ br = self.browser
+ log('Downloading cover from:', cached_url)
+ try:
+ cdata = br.open_novisit(cached_url, timeout=timeout).read()
+ if cdata:
+ if hashlib.md5(cdata).hexdigest() in self.DUMMY_IMAGE_MD5:
+ log.warning('Google returned a dummy image, ignoring')
+ else:
+ result_queue.put((self, cdata))
+ except:
+ log.exception('Failed to download cover from:', cached_url)
+
+ # }}}
+
+ def get_cached_cover_url(self, identifiers): # {{{
+ url = None
goog = identifiers.get('google', None)
if goog is None:
isbn = identifiers.get('isbn', None)
- goog = self.cached_isbn_to_identifier(isbn)
+ if isbn is not None:
+ goog = self.cached_isbn_to_identifier(isbn)
if goog is not None:
- return ('http://books.google.com/books?id=%s&printsec=frontcover&img=1' %
- goog)
+ url = self.cached_identifier_to_cover_url(goog)
- def is_cover_image_valid(self, raw):
- # When no cover is present, returns a PNG saying image not available
- # Try for example google identifier llNqPwAACAAJ
- # I have yet to see an actual cover in PNG format
- return raw and len(raw) > 17000 and raw[1:4] != 'PNG'
+ return url
+ # }}}
- def get_all_details(self, br, log, entries, abort, result_queue, timeout):
- for i in entries:
+ def get_all_details(self, br, log, entries, abort, # {{{
+ result_queue, timeout):
+ for relevance, i in enumerate(entries):
try:
ans = to_metadata(br, log, i, timeout)
if isinstance(ans, Metadata):
- result_queue.put(ans)
+ ans.source_relevance = relevance
+ goog = ans.identifiers['google']
for isbn in getattr(ans, 'all_isbns', []):
- self.cache_isbn_to_identifier(isbn,
- ans.identifiers['google'])
+ self.cache_isbn_to_identifier(isbn, goog)
+ if ans.has_google_cover:
+ self.cache_identifier_to_cover_url(goog,
+ self.GOOGLE_COVER%goog)
+ self.clean_downloaded_metadata(ans)
+ result_queue.put(ans)
except:
log.exception(
'Failed to get metadata for identify entry:',
etree.tostring(i))
if abort.is_set():
break
+ # }}}
def identify(self, log, result_queue, abort, title=None, authors=None, # {{{
identifiers={}, timeout=30):
query = self.create_query(log, title=title, authors=authors,
identifiers=identifiers)
+ if not query:
+ log.error('Insufficient metadata to construct query')
+ return
br = self.browser
try:
raw = br.open_novisit(query, timeout=timeout).read()
- except Exception, e:
+ except Exception as e:
log.exception('Failed to make identify query: %r'%query)
return as_unicode(e)
@@ -221,7 +303,7 @@ class GoogleBooks(Source):
feed = etree.fromstring(xml_to_unicode(clean_ascii_chars(raw),
strip_encoding_pats=True)[0], parser=parser)
entries = entry(feed)
- except Exception, e:
+ except Exception as e:
log.exception('Failed to parse identify results')
return as_unicode(e)
@@ -237,7 +319,7 @@ class GoogleBooks(Source):
return None
# }}}
-if __name__ == '__main__':
+if __name__ == '__main__': # tests {{{
# To run these test use: calibre-debug -e src/calibre/ebooks/metadata/sources/google.py
from calibre.ebooks.metadata.sources.test import (test_identify_plugin,
title_test, authors_test)
@@ -252,8 +334,10 @@ if __name__ == '__main__':
authors_test(['Francis Scott Fitzgerald'])]
),
- #(
- # {'title': 'Great Expectations', 'authors':['Charles Dickens']},
- # [title_test('Great Expectations', exact=True)]
- #),
+ (
+ {'title': 'Flatland', 'authors':['Abbott']},
+ [title_test('Flatland', exact=False)]
+ ),
])
+# }}}
+
diff --git a/src/calibre/ebooks/metadata/sources/identify.py b/src/calibre/ebooks/metadata/sources/identify.py
new file mode 100644
index 0000000000..fad810c26e
--- /dev/null
+++ b/src/calibre/ebooks/metadata/sources/identify.py
@@ -0,0 +1,431 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+ print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+import time
+from datetime import datetime
+from Queue import Queue, Empty
+from threading import Thread
+from io import BytesIO
+from operator import attrgetter
+
+from calibre.customize.ui import metadata_plugins, all_metadata_plugins
+from calibre.ebooks.metadata.sources.base import create_log, msprefs
+from calibre.ebooks.metadata.xisbn import xisbn
+from calibre.ebooks.metadata.book.base import Metadata
+from calibre.utils.date import utc_tz
+from calibre.utils.html2text import html2text
+from calibre.utils.icu import lower
+
+# Download worker {{{
+class Worker(Thread):
+
+ def __init__(self, plugin, kwargs, abort):
+ Thread.__init__(self)
+ self.daemon = True
+
+ self.plugin, self.kwargs, self.rq = plugin, kwargs, Queue()
+ self.abort = abort
+ self.buf = BytesIO()
+ self.log = create_log(self.buf)
+
+ def run(self):
+ start = time.time()
+ try:
+ self.plugin.identify(self.log, self.rq, self.abort, **self.kwargs)
+ except:
+ self.log.exception('Plugin', self.plugin.name, 'failed')
+ self.plugin.dl_time_spent = time.time() - start
+
+def is_worker_alive(workers):
+ for w in workers:
+ if w.is_alive():
+ return True
+ return False
+
+# }}}
+
+# Merge results from different sources {{{
+
+class ISBNMerge(object):
+
+ def __init__(self):
+ self.pools = {}
+ self.isbnless_results = []
+
+ def isbn_in_pool(self, isbn):
+ if isbn:
+ for isbns, pool in self.pools.iteritems():
+ if isbn in isbns:
+ return pool
+ return None
+
+ def pool_has_result_from_same_source(self, pool, result):
+ results = pool[1]
+ for r in results:
+ if r.identify_plugin is result.identify_plugin:
+ return True
+ return False
+
+ def add_result(self, result):
+ isbn = result.isbn
+ if isbn:
+ pool = self.isbn_in_pool(isbn)
+ if pool is None:
+ isbns, min_year = xisbn.get_isbn_pool(isbn)
+ if not isbns:
+ isbns = frozenset([isbn])
+ self.pools[isbns] = pool = (min_year, [])
+
+ if not self.pool_has_result_from_same_source(pool, result):
+ pool[1].append(result)
+ else:
+ self.isbnless_results.append(result)
+
+ def finalize(self):
+ has_isbn_result = False
+ for results in self.pools.itervalues():
+ if results:
+ has_isbn_result = True
+ break
+ self.has_isbn_result = has_isbn_result
+
+ if has_isbn_result:
+ self.merge_isbn_results()
+ else:
+ results = sorted(self.isbnless_results,
+ key=attrgetter('relevance_in_source'))
+ # Pick only the most relevant result from each source
+ self.results = []
+ seen = set()
+ for result in results:
+ if result.identify_plugin not in seen:
+ seen.add(result.identify_plugin)
+ self.results.append(result)
+ result.average_source_relevance = \
+ result.relevance_in_source
+
+ self.merge_metadata_results()
+
+ return self.results
+
+ def merge_metadata_results(self):
+ ' Merge results with identical title and authors '
+ groups = {}
+ for result in self.results:
+ title = lower(result.title if result.title else '')
+ key = (title, tuple([lower(x) for x in result.authors]))
+ if key not in groups:
+ groups[key] = []
+ groups[key].append(result)
+
+ if len(groups) != len(self.results):
+ self.results = []
+ for rgroup in groups.itervalues():
+ rel = [r.average_source_relevance for r in rgroup]
+ if len(rgroup) > 1:
+ result = self.merge(rgroup, None, do_asr=False)
+ result.average_source_relevance = sum(rel)/len(rel)
+ else:
+ result = rgroup[0]
+ self.results.append(result)
+
+ self.results.sort(key=attrgetter('average_source_relevance'))
+
+ def merge_isbn_results(self):
+ self.results = []
+ for min_year, results in self.pools.itervalues():
+ if results:
+ self.results.append(self.merge(results, min_year))
+
+ self.results.sort(key=attrgetter('average_source_relevance'))
+
+ def length_merge(self, attr, results, null_value=None, shortest=True):
+ values = [getattr(x, attr) for x in results if not x.is_null(attr)]
+ values = [x for x in values if len(x) > 0]
+ if not values:
+ return null_value
+ values.sort(key=len, reverse=not shortest)
+ return values[0]
+
+ def random_merge(self, attr, results, null_value=None):
+ values = [getattr(x, attr) for x in results if not x.is_null(attr)]
+ return values[0] if values else null_value
+
+ def merge(self, results, min_year, do_asr=True):
+ ans = Metadata(_('Unknown'))
+
+ # We assume the shortest title has the least cruft in it
+ ans.title = self.length_merge('title', results, null_value=ans.title)
+
+ # No harm in having extra authors, maybe something useful like an
+ # editor or translator
+ ans.authors = self.length_merge('authors', results,
+ null_value=ans.authors, shortest=False)
+
+ # We assume the shortest publisher has the least cruft in it
+ ans.publisher = self.length_merge('publisher', results,
+ null_value=ans.publisher)
+
+ # We assume the smallest set of tags has the least cruft in it
+ ans.tags = self.length_merge('tags', results,
+ null_value=ans.tags)
+
+ # We assume the longest series has the most info in it
+ ans.series = self.length_merge('series', results,
+ null_value=ans.series, shortest=False)
+ for r in results:
+ if r.series and r.series == ans.series:
+ ans.series_index = r.series_index
+ break
+
+ # Average the rating over all sources
+ ratings = []
+ for r in results:
+ rating = r.rating
+ if rating and rating > 0 and rating <= 5:
+ ratings.append(rating)
+ if ratings:
+ ans.rating = sum(ratings)/len(ratings)
+
+ # Smallest language is likely to be valid
+ ans.language = self.length_merge('language', results,
+ null_value=ans.language)
+
+ # Choose longest comments
+ ans.comments = self.length_merge('comments', results,
+ null_value=ans.comments, shortest=False)
+
+ # Published date
+ if min_year:
+ min_date = datetime(min_year, 1, 2, tzinfo=utc_tz)
+ ans.pubdate = min_date
+ else:
+ min_date = datetime(3001, 1, 1, tzinfo=utc_tz)
+ for r in results:
+ if r.pubdate is not None and r.pubdate < min_date:
+ min_date = r.pubdate
+ if min_date.year < 3000:
+ ans.pubdate = min_date
+
+ # Identifiers
+ for r in results:
+ ans.identifiers.update(r.identifiers)
+
+ # Cover URL
+ ans.has_cached_cover_url = bool([r for r in results if
+ getattr(r, 'has_cached_cover_url', False)])
+
+ # Merge any other fields with no special handling (random merge)
+ touched_fields = set()
+ for r in results:
+ if hasattr(r, 'identify_plugin'):
+ touched_fields |= r.identify_plugin.touched_fields
+
+ for f in touched_fields:
+ if f.startswith('identifier:') or not ans.is_null(f):
+ continue
+ setattr(ans, f, self.random_merge(f, results,
+ null_value=getattr(ans, f)))
+
+ if do_asr:
+ avg = [x.relevance_in_source for x in results]
+ avg = sum(avg)/len(avg)
+ ans.average_source_relevance = avg
+
+ return ans
+
+
+def merge_identify_results(result_map, log):
+ isbn_merge = ISBNMerge()
+ for plugin, results in result_map.iteritems():
+ for result in results:
+ isbn_merge.add_result(result)
+
+ return isbn_merge.finalize()
+
+# }}}
+
+def identify(log, abort, # {{{
+ title=None, authors=None, identifiers={}, timeout=30):
+ start_time = time.time()
+ plugins = [p for p in metadata_plugins(['identify']) if p.is_configured()]
+
+ kwargs = {
+ 'title': title,
+ 'authors': authors,
+ 'identifiers': identifiers,
+ 'timeout': timeout,
+ }
+
+ log('Running identify query with parameters:')
+ log(kwargs)
+ log('Using plugins:', ', '.join([p.name for p in plugins]))
+ log('The log from individual plugins is below')
+
+ workers = [Worker(p, kwargs, abort) for p in plugins]
+ for w in workers:
+ w.start()
+
+ first_result_at = None
+ results = {}
+ for p in plugins:
+ results[p] = []
+ logs = dict([(w.plugin, w.buf) for w in workers])
+
+ def get_results():
+ found = False
+ for w in workers:
+ try:
+ result = w.rq.get_nowait()
+ except Empty:
+ pass
+ else:
+ results[w.plugin].append(result)
+ found = True
+ return found
+
+ wait_time = msprefs['wait_after_first_identify_result']
+ while True:
+ time.sleep(0.2)
+
+ if get_results() and first_result_at is None:
+ first_result_at = time.time()
+
+ if not is_worker_alive(workers):
+ break
+
+ if (first_result_at is not None and time.time() - first_result_at >
+ wait_time):
+ log('Not waiting any longer for more results')
+ abort.set()
+ break
+
+ while not abort.is_set() and get_results():
+ pass
+
+ sort_kwargs = dict(kwargs)
+ for k in list(sort_kwargs.iterkeys()):
+ if k not in ('title', 'authors', 'identifiers'):
+ sort_kwargs.pop(k)
+
+ longest, lp = -1, ''
+ for plugin, presults in results.iteritems():
+ presults.sort(key=plugin.identify_results_keygen(**sort_kwargs))
+ plog = logs[plugin].getvalue().strip()
+ log('\n'+'*'*30, plugin.name, '*'*30)
+ log('Request extra headers:', plugin.browser.addheaders)
+ log('Found %d results'%len(presults))
+ time_spent = getattr(plugin, 'dl_time_spent', None)
+ if time_spent is None:
+ log('Downloading was aborted')
+ longest, lp = -1, plugin.name
+ else:
+ log('Downloading from', plugin.name, 'took', time_spent)
+ if time_spent > longest:
+ longest, lp = time_spent, plugin.name
+ for r in presults:
+ log('\n\n---')
+ log(unicode(r))
+ if plog:
+ log(plog)
+ log('\n'+'*'*80)
+
+ for i, result in enumerate(presults):
+ result.relevance_in_source = i
+ result.has_cached_cover_url = (plugin.cached_cover_url_is_reliable
+ and plugin.get_cached_cover_url(result.identifiers) is not
+ None)
+ result.identify_plugin = plugin
+
+ log('The identify phase took %.2f seconds'%(time.time() - start_time))
+ log('The longest time (%f) was taken by:'%longest, lp)
+ log('Merging results from different sources and finding earliest',
+ 'publication dates')
+ start_time = time.time()
+ results = merge_identify_results(results, log)
+ log('We have %d merged results, merging took: %.2f seconds' %
+ (len(results), time.time() - start_time))
+
+ if msprefs['txt_comments']:
+ for r in results:
+ if r.plugin.has_html_comments and r.comments:
+ r.comments = html2text(r.comments)
+
+ max_tags = msprefs['max_tags']
+ for r in results:
+ r.tags = r.tags[:max_tags]
+
+ return results
+# }}}
+
+def urls_from_identifiers(identifiers): # {{{
+ ans = []
+ for plugin in all_metadata_plugins():
+ try:
+ url = plugin.get_book_url(identifiers)
+ if url is not None:
+ ans.append((plugin.name, url))
+ except:
+ pass
+ isbn = identifiers.get('isbn', None)
+ if isbn:
+ ans.append(('ISBN',
+ 'http://www.worldcat.org/search?q=bn%%3A%s&qt=advanced'%isbn))
+ return ans
+# }}}
+
+if __name__ == '__main__': # tests {{{
+ # To run these test use: calibre-debug -e
+ # src/calibre/ebooks/metadata/sources/identify.py
+ from calibre.ebooks.metadata.sources.test import (test_identify,
+ title_test, authors_test)
+ tests = [
+
+ ( # An e-book ISBN not on Amazon, one of the authors is
+ # unknown to Amazon
+ {'identifiers':{'isbn': '9780307459671'},
+ 'title':'Invisible Gorilla', 'authors':['Christopher Chabris']},
+ [title_test('The Invisible Gorilla: And Other Ways Our Intuitions Deceive Us',
+ exact=True), authors_test(['Christopher Chabris', 'Daniel Simons'])]
+
+ ),
+
+ ( # Test absence of identifiers
+ {'title':'Learning Python',
+ 'authors':['Lutz']},
+ [title_test('Learning Python',
+ exact=True), authors_test(['Mark Lutz'])
+ ]
+
+ ),
+
+ ( # Sophisticated comment formatting
+ {'identifiers':{'isbn': '9781416580829'}},
+ [title_test('Angels & Demons',
+ exact=True), authors_test(['Dan Brown'])]
+ ),
+
+ ( # No ISBN
+ {'title':'Justine', 'authors':['Durrel']},
+ [title_test('Justine', exact=True),
+ authors_test(['Lawrence Durrel'])]
+ ),
+
+ ( # A newer book
+ {'identifiers':{'isbn': '9780316044981'}},
+ [title_test('The Heroes', exact=True),
+ authors_test(['Joe Abercrombie'])]
+
+ ),
+
+ ]
+ #test_identify(tests[1:2])
+ test_identify(tests)
+# }}}
+
diff --git a/src/calibre/ebooks/metadata/sources/isbndb.py b/src/calibre/ebooks/metadata/sources/isbndb.py
new file mode 100644
index 0000000000..ab9342c6cb
--- /dev/null
+++ b/src/calibre/ebooks/metadata/sources/isbndb.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+ print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+from calibre.ebooks.metadata.sources.base import Source
+
+class ISBNDB(Source):
+
+ name = 'ISBNDB'
+ description = _('Downloads metadata from isbndb.com')
+
+ capabilities = frozenset(['identify'])
+ touched_fields = frozenset(['title', 'authors',
+ 'identifier:isbn', 'comments', 'publisher'])
+ supports_gzip_transfer_encoding = True
+
+ def __init__(self, *args, **kwargs):
+ Source.__init__(self, *args, **kwargs)
+
+ prefs = self.prefs
+ prefs.defaults['key_migrated'] = False
+ prefs.defaults['isbndb_key'] = None
+
+ if not prefs['key_migrated']:
+ prefs['key_migrated'] = True
+ try:
+ from calibre.customize.ui import config
+ key = config['plugin_customization']['IsbnDB']
+ prefs['isbndb_key'] = key
+ except:
+ pass
+
+ self.isbndb_key = prefs['isbndb_key']
+
+ def is_configured(self):
+ return self.isbndb_key is not None
+
+
diff --git a/src/calibre/ebooks/metadata/sources/openlibrary.py b/src/calibre/ebooks/metadata/sources/openlibrary.py
new file mode 100644
index 0000000000..4645d2a18a
--- /dev/null
+++ b/src/calibre/ebooks/metadata/sources/openlibrary.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+ print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+from calibre.ebooks.metadata.sources.base import Source
+
+class OpenLibrary(Source):
+
+ name = 'Open Library'
+ description = _('Downloads covers from The Open Library')
+
+ capabilities = frozenset(['cover'])
+
+ OPENLIBRARY = 'http://covers.openlibrary.org/b/isbn/%s-L.jpg?default=false'
+
+ def download_cover(self, log, result_queue, abort,
+ title=None, authors=None, identifiers={}, timeout=30):
+ if 'isbn' not in identifiers:
+ return
+ isbn = identifiers['isbn']
+ br = self.browser
+ try:
+ ans = br.open_novisit(self.OPENLIBRARY%isbn, timeout=timeout).read()
+ result_queue.put((self, ans))
+ except Exception as e:
+ if callable(getattr(e, 'getcode', None)) and e.getcode() == 404:
+ log.error('No cover for ISBN: %r found'%isbn)
+ else:
+ log.exception('Failed to download cover for ISBN:', isbn)
+
diff --git a/src/calibre/ebooks/metadata/sources/test.py b/src/calibre/ebooks/metadata/sources/test.py
index 2af9a47078..2e72f86c47 100644
--- a/src/calibre/ebooks/metadata/sources/test.py
+++ b/src/calibre/ebooks/metadata/sources/test.py
@@ -11,11 +11,11 @@ import os, tempfile, time
from Queue import Queue, Empty
from threading import Event
-
from calibre.customize.ui import metadata_plugins
-from calibre import prints
+from calibre import prints, sanitize_file_name2
from calibre.ebooks.metadata import check_isbn
-from calibre.ebooks.metadata.sources.base import create_log
+from calibre.ebooks.metadata.sources.base import (create_log,
+ get_cached_cover_urls)
def isbn_test(isbn):
isbn_ = check_isbn(isbn)
@@ -46,17 +46,80 @@ def authors_test(authors):
return test
-def _test_fields(touched_fields, mi):
- for key in touched_fields:
- if key.startswith('identifier:'):
- key = key.partition(':')[-1]
- if not mi.has_identifier(key):
- return 'identifier: ' + key
- elif mi.is_null(key):
- return key
+def init_test(tdir_name):
+ tdir = tempfile.gettempdir()
+ lf = os.path.join(tdir, tdir_name.replace(' ', '')+'_identify_test.txt')
+ log = create_log(open(lf, 'wb'))
+ abort = Event()
+ return tdir, lf, log, abort
+def test_identify(tests): # {{{
+ '''
+ :param tests: List of 2-tuples. Each two tuple is of the form (args,
+ test_funcs). args is a dict of keyword arguments to pass to
+ the identify method. test_funcs are callables that accept a
+ Metadata object and return True iff the object passes the
+ test.
+ '''
+ from calibre.ebooks.metadata.sources.identify import identify
-def test_identify_plugin(name, tests):
+ tdir, lf, log, abort = init_test('Full Identify')
+ prints('Log saved to', lf)
+
+ times = []
+
+ for kwargs, test_funcs in tests:
+ log('#'*80)
+ log('### Running test with:', kwargs)
+ log('#'*80)
+ prints('Running test with:', kwargs)
+ args = (log, abort)
+ start_time = time.time()
+ results = identify(*args, **kwargs)
+ total_time = time.time() - start_time
+ times.append(total_time)
+ if not results:
+ prints('identify failed to find any results')
+ break
+
+ prints('Found', len(results), 'matches:', end=' ')
+ prints('Smaller relevance means better match')
+
+ for i, mi in enumerate(results):
+ prints('*'*30, 'Relevance:', i, '*'*30)
+ prints(mi)
+ prints('\nCached cover URLs :',
+ [x[0].name for x in get_cached_cover_urls(mi)])
+ prints('*'*75, '\n\n')
+
+ possibles = []
+ for mi in results:
+ test_failed = False
+ for tfunc in test_funcs:
+ if not tfunc(mi):
+ test_failed = True
+ break
+ if not test_failed:
+ possibles.append(mi)
+
+ if not possibles:
+ prints('ERROR: No results that passed all tests were found')
+ prints('Log saved to', lf)
+ raise SystemExit(1)
+
+ if results[0] is not possibles[0]:
+ prints('Most relevant result failed the tests')
+ raise SystemExit(1)
+
+ log('\n\n')
+
+ prints('Average time per query', sum(times)/len(times))
+
+ prints('Full log is at:', lf)
+
+# }}}
+
+def test_identify_plugin(name, tests): # {{{
'''
:param name: Plugin name
:param tests: List of 2-tuples. Each two tuple is of the form (args,
@@ -71,11 +134,9 @@ def test_identify_plugin(name, tests):
plugin = x
break
prints('Testing the identify function of', plugin.name)
+ prints('Using extra headers:', plugin.browser.addheaders)
- tdir = tempfile.gettempdir()
- lf = os.path.join(tdir, plugin.name.replace(' ', '')+'_identify_test.txt')
- log = create_log(open(lf, 'wb'))
- abort = Event()
+ tdir, lf, log, abort = init_test(plugin.name)
prints('Log saved to', lf)
times = []
@@ -99,11 +160,19 @@ def test_identify_plugin(name, tests):
except Empty:
break
- prints('Found', len(results), 'matches:')
+ prints('Found', len(results), 'matches:', end=' ')
+ prints('Smaller relevance means better match')
- for mi in results:
+ results.sort(key=plugin.identify_results_keygen(
+ title=kwargs.get('title', None), authors=kwargs.get('authors',
+ None), identifiers=kwargs.get('identifiers', {})))
+
+ for i, mi in enumerate(results):
+ prints('*'*30, 'Relevance:', i, '*'*30)
prints(mi)
- prints('\n\n')
+ prints('\nCached cover URL :',
+ plugin.get_cached_cover_url(mi.identifiers))
+ prints('*'*75, '\n\n')
possibles = []
for mi in results:
@@ -120,16 +189,46 @@ def test_identify_plugin(name, tests):
prints('Log saved to', lf)
raise SystemExit(1)
- good = [x for x in possibles if _test_fields(plugin.touched_fields, x) is
+ good = [x for x in possibles if plugin.test_fields(x) is
None]
if not good:
- prints('Failed to find', _test_fields(plugin.touched_fields,
- possibles[0]))
+ prints('Failed to find', plugin.test_fields(possibles[0]))
raise SystemExit(1)
+ if results[0] is not possibles[0]:
+ prints('Most relevant result failed the tests')
+ raise SystemExit(1)
+
+ if 'cover' in plugin.capabilities:
+ rq = Queue()
+ mi = results[0]
+ plugin.download_cover(log, rq, abort, title=mi.title,
+ authors=mi.authors, identifiers=mi.identifiers)
+ results = []
+ while True:
+ try:
+ results.append(rq.get_nowait())
+ except Empty:
+ break
+ if not results:
+ prints('Cover download failed')
+ raise SystemExit(1)
+ cdata = results[0]
+ cover = os.path.join(tdir, plugin.name.replace(' ',
+ '')+'-%s-cover.jpg'%sanitize_file_name2(mi.title.replace(' ',
+ '_')))
+ with open(cover, 'wb') as f:
+ f.write(cdata)
+
+ prints('Cover downloaded to:', cover)
+
+ if len(cdata) < 10240:
+ prints('Downloaded cover too small')
+ raise SystemExit(1)
prints('Average time per query', sum(times)/len(times))
if os.stat(lf).st_size > 10:
prints('There were some errors/warnings, see log', lf)
+# }}}
diff --git a/src/calibre/ebooks/metadata/toc.py b/src/calibre/ebooks/metadata/toc.py
index 10d45186de..17f99150be 100644
--- a/src/calibre/ebooks/metadata/toc.py
+++ b/src/calibre/ebooks/metadata/toc.py
@@ -147,7 +147,7 @@ class TOC(list):
if path and os.access(path, os.R_OK):
try:
self.read_ncx_toc(path)
- except Exception, err:
+ except Exception as err:
print 'WARNING: Invalid NCX file:', err
return
cwd = os.path.abspath(self.base_path)
diff --git a/src/calibre/ebooks/metadata/xisbn.py b/src/calibre/ebooks/metadata/xisbn.py
index aaeb1c6b98..56156c034e 100644
--- a/src/calibre/ebooks/metadata/xisbn.py
+++ b/src/calibre/ebooks/metadata/xisbn.py
@@ -71,14 +71,32 @@ class xISBN(object):
ans.add(i)
return ans
+ def get_isbn_pool(self, isbn):
+ data = self.get_data(isbn)
+ raw = tuple(x.get('isbn') for x in data if 'isbn' in x)
+ isbns = []
+ for x in raw:
+ isbns += x
+ isbns = frozenset(isbns)
+ min_year = 100000
+ for x in data:
+ try:
+ year = int(x['year'])
+ if year < min_year:
+ min_year = year
+ except:
+ continue
+ if min_year == 100000:
+ min_year = None
+ return isbns, min_year
xisbn = xISBN()
if __name__ == '__main__':
- import sys
+ import sys, pprint
isbn = sys.argv[-1]
- print xisbn.get_data(isbn)
+ print pprint.pprint(xisbn.get_data(isbn))
print
print xisbn.get_associated_isbns(isbn)
diff --git a/src/calibre/ebooks/mobi/mobiml.py b/src/calibre/ebooks/mobi/mobiml.py
index 189739986d..40ad5e9e78 100644
--- a/src/calibre/ebooks/mobi/mobiml.py
+++ b/src/calibre/ebooks/mobi/mobiml.py
@@ -102,6 +102,7 @@ class MobiMLizer(object):
def __call__(self, oeb, context):
oeb.logger.info('Converting XHTML to Mobipocket markup...')
self.oeb = oeb
+ self.log = self.oeb.logger
self.opts = context
self.profile = profile = context.dest
self.fnums = fnums = dict((v, k) for k, v in profile.fnums.items())
@@ -118,6 +119,10 @@ class MobiMLizer(object):
del oeb.guide['cover']
item = oeb.manifest.hrefs[href]
if item.spine_position is not None:
+ self.log.warn('Found an HTML cover,', item.href, 'removing it.',
+ 'If you find some content missing from the output MOBI, it '
+ 'is because you misidentified the HTML cover in the input '
+ 'document')
oeb.spine.remove(item)
if item.media_type in OEB_DOCS:
self.oeb.manifest.remove(item)
@@ -206,7 +211,11 @@ class MobiMLizer(object):
vspace = bstate.vpadding + bstate.vmargin
bstate.vpadding = bstate.vmargin = 0
if tag not in TABLE_TAGS:
- wrapper.attrib['height'] = self.mobimlize_measure(vspace)
+ if tag in ('ul', 'ol') and vspace > 0:
+ wrapper.addprevious(etree.Element(XHTML('div'),
+ height=self.mobimlize_measure(vspace)))
+ else:
+ wrapper.attrib['height'] = self.mobimlize_measure(vspace)
para.attrib['width'] = self.mobimlize_measure(indent)
elif tag == 'table' and vspace > 0:
vspace = int(round(vspace / self.profile.fbase))
diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py
index f1b1b1ef63..8877ecdd0b 100644
--- a/src/calibre/ebooks/mobi/reader.py
+++ b/src/calibre/ebooks/mobi/reader.py
@@ -769,7 +769,8 @@ class MobiReader(object):
def extract_text(self):
self.log.debug('Extracting text...')
- text_sections = [self.text_section(i) for i in range(1, self.book_header.records + 1)]
+ text_sections = [self.text_section(i) for i in range(1,
+ min(self.book_header.records + 1, len(self.sections)))]
processed_records = list(range(0, self.book_header.records + 1))
self.mobi_html = ''
diff --git a/src/calibre/ebooks/mobi/writer.py b/src/calibre/ebooks/mobi/writer.py
index 2be699e525..5f4c47cdf3 100644
--- a/src/calibre/ebooks/mobi/writer.py
+++ b/src/calibre/ebooks/mobi/writer.py
@@ -282,8 +282,8 @@ class Serializer(object):
buffer.write('="')
self.serialize_text(val, quot=True)
buffer.write('"')
+ buffer.write('>')
if elem.text or len(elem) > 0:
- buffer.write('>')
if elem.text:
self.anchor_offset = None
self.serialize_text(elem.text)
@@ -292,9 +292,7 @@ class Serializer(object):
if child.tail:
self.anchor_offset = None
self.serialize_text(child.tail)
- buffer.write('</%s>' % tag)
- else:
- buffer.write('/>')
+ buffer.write('</%s>' % tag)
def serialize_text(self, text, quot=False):
text = text.replace('&', '&')
@@ -1098,7 +1096,7 @@ class MobiWriter(object):
nodeCountValue = 0x80 if nodeCountValue == 0 else nodeCountValue
tbSequence += chr(nodeCountValue)
else :
- tbSequence += decint(0x00, DECINT_FORWARD) # arg1 = 0x80
+ tbSequence += decint(0x00, DECINT_FORWARD) # arg1 = 0x80
tbSequence += decint(len(tbSequence) + 1, DECINT_FORWARD) # len
@@ -1188,7 +1186,7 @@ class MobiWriter(object):
toc = self._oeb.toc
nodes = list(toc.iter())[1:]
toc_conforms = True
- for (i, child) in enumerate(nodes) :
+ for child in nodes:
if child.klass == "periodical" and child.depth() != 3 or \
child.klass == "section" and child.depth() != 2 or \
child.klass == "article" and child.depth() != 1 :
@@ -1644,14 +1642,14 @@ class MobiWriter(object):
self._oeb.log('Generating INDX ...')
self._primary_index_record = None
- # Build the NCXEntries and INDX
+ # Build the NCXEntries and INDX
indxt, indxt_count, indices, last_name = self._generate_indxt()
if last_name is None:
self._oeb.log.warn('Input document has no TOC. No index generated.')
return
- # Assemble the INDX0[0] and INDX1[0] output streams
+ # Assemble the INDX0[0] and INDX1[0] output streams
indx1 = StringIO()
indx1.write('INDX'+pack('>I', 0xc0)) # header length
@@ -2310,10 +2308,8 @@ class MobiWriter(object):
parentIndex = sectionParent.parentIndex
self._write_section_node(indxt, indices, sectionParent.myCtocMapIndex, index, offset, length, c, firstArticle, lastArticle, parentIndex)
- last_name = "%04X"%c
-
# articles
- for (i, article) in enumerate(list(sectionParent.articles)) :
+ for article in list(sectionParent.articles):
index = article.myCtocMapIndex
offset = article.startAddress
length = article.articleLength
@@ -2413,7 +2409,6 @@ class MobiWriter(object):
# <navPoint> Article(s) child.depth() = 1
# <navpoint> Section 2
- documentType = "unknown"
sectionIndices = []
sectionParents = []
currentSection = 0 # Starting section number
@@ -2421,7 +2416,6 @@ class MobiWriter(object):
indxt, indices, c = StringIO(), StringIO(), 0
indices.write('IDXT')
- c = 0
last_name = None
# 'book', 'periodical' or None
@@ -2449,8 +2443,8 @@ class MobiWriter(object):
if self.opts.verbose > 3 :
self._oeb.logger.info("unknown document type %12.12s \tdepth:%d" % (child.title, child.depth()) )
- # Original code starts here
- # test first node for depth/class
+ # Original code starts here
+ # test first node for depth/class
entries = list(toc.iter())[1:]
for (i, child) in enumerate(entries):
if not child.title or not child.title.strip():
diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py
index 3bd936b803..e5f2cace7f 100644
--- a/src/calibre/ebooks/oeb/base.py
+++ b/src/calibre/ebooks/oeb/base.py
@@ -884,13 +884,13 @@ class Manifest(object):
def first_pass(data):
try:
data = etree.fromstring(data, parser=parser)
- except etree.XMLSyntaxError, err:
+ except etree.XMLSyntaxError as err:
self.oeb.log.exception('Initial parse failed:')
repl = lambda m: ENTITYDEFS.get(m.group(1), m.group(0))
data = ENTITY_RE.sub(repl, data)
try:
data = etree.fromstring(data, parser=parser)
- except etree.XMLSyntaxError, err:
+ except etree.XMLSyntaxError as err:
self.oeb.logger.warn('Parsing file %r as HTML' % self.href)
if err.args and err.args[0].startswith('Excessive depth'):
from lxml.html import soupparser
diff --git a/src/calibre/ebooks/oeb/reader.py b/src/calibre/ebooks/oeb/reader.py
index 4a09e0b1d4..ebc2f30d00 100644
--- a/src/calibre/ebooks/oeb/reader.py
+++ b/src/calibre/ebooks/oeb/reader.py
@@ -103,8 +103,8 @@ class OEBReader(object):
data = self.oeb.container.read(None)
data = self.oeb.decode(data)
data = XMLDECL_RE.sub('', data)
- data = data.replace('http://openebook.org/namespaces/oeb-package/1.0',
- OPF1_NS)
+ data = re.sub(r'http://openebook.org/namespaces/oeb-package/1.0(/*)',
+ OPF1_NS, data)
try:
opf = etree.fromstring(data)
except etree.XMLSyntaxError:
diff --git a/src/calibre/ebooks/oeb/stylizer.py b/src/calibre/ebooks/oeb/stylizer.py
index 0cd17387fe..634f7f5fce 100644
--- a/src/calibre/ebooks/oeb/stylizer.py
+++ b/src/calibre/ebooks/oeb/stylizer.py
@@ -17,6 +17,8 @@ from cssutils.css import CSSStyleRule, CSSPageRule, CSSStyleDeclaration, \
from cssutils import profile as cssprofiles
from lxml import etree
from lxml.cssselect import css_to_xpath, ExpressionError, SelectorSyntaxError
+
+from calibre import force_unicode
from calibre.ebooks.oeb.base import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES
from calibre.ebooks.oeb.base import XPNSMAP, xpath, urlnormalize
from calibre.ebooks.oeb.profile import PROFILES
@@ -95,6 +97,10 @@ class CSSSelector(etree.XPath):
def __init__(self, css, namespaces=XPNSMAP):
css = self.MIN_SPACE_RE.sub(r'\1', css)
+ if isinstance(css, unicode):
+ # Workaround for bug in lxml on windows/OS X that causes a massive
+ # memory leak with non ASCII selectors
+ css = css.encode('ascii', 'ignore').decode('ascii')
try:
path = css_to_xpath(css)
except UnicodeEncodeError: # Bug in css_to_xpath
@@ -140,13 +146,22 @@ class Stylizer(object):
log=logging.getLogger('calibre.css'))
self.font_face_rules = []
for elem in head:
- if elem.tag == XHTML('style') and elem.text \
- and elem.get('type', CSS_MIME) in OEB_STYLES:
- text = XHTML_CSS_NAMESPACE + elem.text
- text = oeb.css_preprocessor(text)
- stylesheet = parser.parseString(text, href=cssname)
- stylesheet.namespaces['h'] = XHTML_NS
- stylesheets.append(stylesheet)
+ if (elem.tag == XHTML('style') and
+ elem.get('type', CSS_MIME) in OEB_STYLES):
+ text = elem.text if elem.text else u''
+ for x in elem:
+ t = getattr(x, 'text', None)
+ if t:
+ text += u'\n\n' + force_unicode(t, u'utf-8')
+ t = getattr(x, 'tail', None)
+ if t:
+ text += u'\n\n' + force_unicode(t, u'utf-8')
+ if text:
+ text = XHTML_CSS_NAMESPACE + elem.text
+ text = oeb.css_preprocessor(text)
+ stylesheet = parser.parseString(text, href=cssname)
+ stylesheet.namespaces['h'] = XHTML_NS
+ stylesheets.append(stylesheet)
elif elem.tag == XHTML('link') and elem.get('href') \
and elem.get('rel', 'stylesheet').lower() == 'stylesheet' \
and elem.get('type', CSS_MIME).lower() in OEB_STYLES:
diff --git a/src/calibre/ebooks/oeb/transforms/margins.py b/src/calibre/ebooks/oeb/transforms/margins.py
deleted file mode 100644
index fbdf2e63fd..0000000000
--- a/src/calibre/ebooks/oeb/transforms/margins.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
-
-__license__ = 'GPL v3'
-__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
-__docformat__ = 'restructuredtext en'
-
-
-class RemoveFakeMargins(object):
- '''
- Try to detect and remove fake margins inserted by asinine ebook creation
- software on each paragraph/wrapper div. Can be used only after CSS
- flattening.
- '''
-
- def __call__(self, oeb, opts, log):
- self.oeb, self.opts, self.log = oeb, opts, log
-
- from calibre.ebooks.oeb.base import XPath, OEB_STYLES
-
- stylesheet = None
- for item in self.oeb.manifest:
- if item.media_type.lower() in OEB_STYLES:
- stylesheet = item.data
- break
-
- if stylesheet is None:
- return
-
-
- top_level_elements = {}
- second_level_elements = {}
-
- for x in self.oeb.spine:
- root = x.data
- body = XPath('//h:body')(root)
- if body:
- body = body[0]
-
- if not hasattr(body, 'xpath'):
- continue
-
- # Check for margins on top level elements
- for lb in XPath('./h:div|./h:p|./*/h:div|./*/h:p')(body):
- cls = lb.get('class', '')
- level = top_level_elements if lb.getparent() is body else \
- second_level_elements
- if cls not in level:
- level[cls] = []
- top_level_elements[cls] = []
- level[cls].append(lb)
-
-
- def get_margins(self, stylesheet, cls):
- pass
-
diff --git a/src/calibre/ebooks/oeb/transforms/page_margin.py b/src/calibre/ebooks/oeb/transforms/page_margin.py
new file mode 100644
index 0000000000..bc1925e343
--- /dev/null
+++ b/src/calibre/ebooks/oeb/transforms/page_margin.py
@@ -0,0 +1,174 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+ print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+from collections import Counter
+
+from calibre.ebooks.oeb.base import OEB_STYLES, barename, XPath
+
+class RemoveAdobeMargins(object):
+ '''
+ Remove margins specified in Adobe's page templates.
+ '''
+
+ def __call__(self, oeb, log, opts):
+ self.oeb, self.opts, self.log = oeb, opts, log
+
+ for item in self.oeb.manifest:
+ if item.media_type in ('application/vnd.adobe-page-template+xml',
+ 'application/vnd.adobe.page-template+xml'):
+ self.log('Removing page margins specified in the'
+ ' Adobe page template')
+ for elem in item.data.xpath(
+ '//*[@margin-bottom or @margin-top '
+ 'or @margin-left or @margin-right]'):
+ for margin in ('left', 'right', 'top', 'bottom'):
+ attr = 'margin-'+margin
+ elem.attrib.pop(attr, None)
+
+
+class RemoveFakeMargins(object):
+
+ '''
+ Remove left and right margins from paragraph/divs if the same margin is specified
+ on almost all the elements at that level.
+
+ Must be called only after CSS flattening
+ '''
+
+ def __call__(self, oeb, log, opts):
+ if not opts.remove_fake_margins:
+ return
+ self.oeb, self.log, self.opts = oeb, log, opts
+ stylesheet = None
+ self.levels = {}
+ self.stats = {}
+ self.selector_map = {}
+
+ for item in self.oeb.manifest:
+ if item.media_type.lower() in OEB_STYLES:
+ stylesheet = item
+ break
+ if stylesheet is None:
+ return
+
+ self.log('Removing fake margins...')
+
+ stylesheet = stylesheet.data
+
+ from cssutils.css import CSSRule
+ for rule in stylesheet.cssRules.rulesOfType(CSSRule.STYLE_RULE):
+ self.selector_map[rule.selectorList.selectorText] = rule.style
+
+ self.find_levels()
+
+ for level in self.levels:
+ self.process_level(level)
+
+ def get_margins(self, elem):
+ cls = elem.get('class', None)
+ if cls:
+ style = self.selector_map.get('.'+cls, None)
+ if style:
+ return style.marginLeft, style.marginRight, style
+ return '', '', None
+
+
+ def process_level(self, level):
+ elems = self.levels[level]
+ self.stats[level+'_left'] = Counter()
+ self.stats[level+'_right'] = Counter()
+
+ for elem in elems:
+ lm, rm = self.get_margins(elem)[:2]
+ self.stats[level+'_left'][lm] += 1
+ self.stats[level+'_right'][rm] += 1
+
+ self.log.debug(level, ' left margin stats:', self.stats[level+'_left'])
+ self.log.debug(level, ' right margin stats:', self.stats[level+'_right'])
+
+ remove_left = self.analyze_stats(self.stats[level+'_left'])
+ remove_right = self.analyze_stats(self.stats[level+'_right'])
+
+
+ if remove_left:
+ mcl = self.stats[level+'_left'].most_common(1)[0][0]
+ self.log('Removing level %s left margin of:'%level, mcl)
+
+ if remove_right:
+ mcr = self.stats[level+'_right'].most_common(1)[0][0]
+ self.log('Removing level %s right margin of:'%level, mcr)
+
+ if remove_left or remove_right:
+ for elem in elems:
+ lm, rm, style = self.get_margins(elem)
+ if remove_left and lm == mcl:
+ style.removeProperty('margin-left')
+ if remove_right and rm == mcr:
+ style.removeProperty('margin-right')
+
+ def find_levels(self):
+
+ def level_of(elem, body):
+ ans = 1
+ while elem.getparent() is not body:
+ ans += 1
+ elem = elem.getparent()
+ return ans
+
+ paras = XPath('descendant::h:p|descendant::h:div')
+
+ for item in self.oeb.spine:
+ body = XPath('//h:body')(item.data)
+ if not body:
+ continue
+ body = body[0]
+
+ for p in paras(body):
+ level = level_of(p, body)
+ level = '%s_%d'%(barename(p.tag), level)
+ if level not in self.levels:
+ self.levels[level] = []
+ self.levels[level].append(p)
+
+ remove = set()
+ for k, v in self.levels.iteritems():
+ num = len(v)
+ self.log.debug('Found %d items of level:'%num, k)
+ level = int(k.split('_')[-1])
+ tag = k.split('_')[0]
+ if tag == 'p' and num < 25:
+ remove.add(k)
+ if tag == 'div':
+ if level > 2 and num < 25:
+ remove.add(k)
+ elif level < 3:
+ # Check each level < 3 element and only keep those
+ # that have many child paras
+ for elem in list(v):
+ children = len(paras(elem))
+ if children < 5:
+ v.remove(elem)
+
+ for k in remove:
+ self.levels.pop(k)
+ self.log.debug('Ignoring level', k)
+
+ def analyze_stats(self, stats):
+ if not stats:
+ return False
+ mc = stats.most_common(1)
+ if len(mc) > 1:
+ return False
+ mc = mc[0]
+ most_common, most_common_count = mc
+ if not most_common or most_common == '0':
+ return False
+ total = sum(stats.values())
+ # True if greater than 95% of elements have the same margin
+ return most_common_count/total > 0.95
diff --git a/src/calibre/ebooks/oeb/transforms/structure.py b/src/calibre/ebooks/oeb/transforms/structure.py
index 0d8bdcdf2e..613429c3ec 100644
--- a/src/calibre/ebooks/oeb/transforms/structure.py
+++ b/src/calibre/ebooks/oeb/transforms/structure.py
@@ -10,10 +10,10 @@ import re
from lxml import etree
from urlparse import urlparse
+from collections import OrderedDict
from calibre.ebooks.oeb.base import XPNSMAP, TOC, XHTML, xml2text
from calibre.ebooks import ConversionError
-from calibre.utils.ordered_dict import OrderedDict
def XPath(x):
try:
diff --git a/src/calibre/ebooks/pdf/fonts.cpp b/src/calibre/ebooks/pdf/fonts.cpp
index 99ab7517c1..c3a709869e 100644
--- a/src/calibre/ebooks/pdf/fonts.cpp
+++ b/src/calibre/ebooks/pdf/fonts.cpp
@@ -72,6 +72,7 @@ XMLFont::XMLFont(string* font_name, double size, GfxRGB rgb) :
size(size-1), line_size(-1.0), italic(false), bold(false), font_name(font_name),
font_family(NULL), color(rgb) {
+
if (!this->font_name) this->font_name = new string(DEFAULT_FONT_FAMILY);
this->font_family = family_name(this->font_name);
if (strcasestr(font_name->c_str(), "bold")) this->bold = true;
@@ -134,7 +135,12 @@ Fonts::size_type Fonts::add_font(XMLFont *f) {
}
Fonts::size_type Fonts::add_font(string* font_name, double size, GfxRGB rgb) {
- XMLFont *f = new XMLFont(font_name, size, rgb);
+ XMLFont *f = NULL;
+ if (font_name == NULL)
+ font_name = new string("Unknown");
+ // font_name must not be deleted
+ f = new XMLFont(font_name, size, rgb);
+
return this->add_font(f);
}
diff --git a/src/calibre/ebooks/pdf/input.py b/src/calibre/ebooks/pdf/input.py
index 14b3552b04..8de3f44d36 100644
--- a/src/calibre/ebooks/pdf/input.py
+++ b/src/calibre/ebooks/pdf/input.py
@@ -34,7 +34,7 @@ class PDFInput(InputFormatPlugin):
from calibre.ebooks.pdf.reflow import PDFDocument
if pdfreflow_err:
raise RuntimeError('Failed to load pdfreflow: ' + pdfreflow_err)
- pdfreflow.reflow(stream.read())
+ pdfreflow.reflow(stream.read(), 1, -1)
xml = open('index.xml', 'rb').read()
PDFDocument(xml, self.opts, self.log)
return os.path.join(os.getcwd(), 'metadata.opf')
diff --git a/src/calibre/ebooks/pdf/main.cpp b/src/calibre/ebooks/pdf/main.cpp
index 4e6ec60388..869204dc1d 100644
--- a/src/calibre/ebooks/pdf/main.cpp
+++ b/src/calibre/ebooks/pdf/main.cpp
@@ -24,13 +24,14 @@ extern "C" {
pdfreflow_reflow(PyObject *self, PyObject *args) {
char *pdfdata;
Py_ssize_t size;
+ int first_page, last_page, num = 0;
- if (!PyArg_ParseTuple(args, "s#", &pdfdata, &size))
+ if (!PyArg_ParseTuple(args, "s#ii", &pdfdata, &size, &first_page, &last_page))
return NULL;
try {
Reflow reflow(pdfdata, static_cast<std::ifstream::pos_type>(size));
- reflow.render();
+ num = reflow.render(first_page, last_page);
} catch (std::exception &e) {
PyErr_SetString(PyExc_RuntimeError, e.what()); return NULL;
} catch (...) {
@@ -38,7 +39,7 @@ extern "C" {
"Unknown exception raised while rendering PDF"); return NULL;
}
- Py_RETURN_NONE;
+ return Py_BuildValue("i", num);
}
static PyObject *
@@ -166,8 +167,8 @@ extern "C" {
static
PyMethodDef pdfreflow_methods[] = {
{"reflow", pdfreflow_reflow, METH_VARARGS,
- "reflow(pdf_data)\n\n"
- "Reflow the specified PDF."
+ "reflow(pdf_data, first_page, last_page)\n\n"
+ "Reflow the specified PDF. Returns the number of pages in the PDF. If last_page is -1 renders to end of document."
},
{"get_metadata", pdfreflow_get_metadata, METH_VARARGS,
"get_metadata(pdf_data, cover)\n\n"
diff --git a/src/calibre/ebooks/pdf/manipulate/decrypt.py b/src/calibre/ebooks/pdf/manipulate/decrypt.py
index ede12f15ee..fd8510efc7 100644
--- a/src/calibre/ebooks/pdf/manipulate/decrypt.py
+++ b/src/calibre/ebooks/pdf/manipulate/decrypt.py
@@ -103,7 +103,7 @@ def main(args=sys.argv, name=''):
try:
decrypt(args[0], opts.output, args[1])
- except DecryptionError, e:
+ except DecryptionError as e:
print e.value
return 1
diff --git a/src/calibre/ebooks/pdf/pdftohtml.py b/src/calibre/ebooks/pdf/pdftohtml.py
index 564ba14a32..4aa0953738 100644
--- a/src/calibre/ebooks/pdf/pdftohtml.py
+++ b/src/calibre/ebooks/pdf/pdftohtml.py
@@ -13,7 +13,7 @@ from functools import partial
from calibre.ebooks import ConversionError, DRMError
from calibre.ptempfile import PersistentTemporaryFile
-from calibre import isosx, iswindows, islinux, isfreebsd
+from calibre.constants import isosx, iswindows, islinux, isfreebsd
from calibre import CurrentDir
PDFTOHTML = 'pdftohtml'
@@ -43,6 +43,8 @@ def pdftohtml(output_dir, pdf_path, no_images):
# This is neccessary as pdftohtml doesn't always (linux) respect absolute paths
pdf_path = os.path.abspath(pdf_path)
cmd = [PDFTOHTML, '-enc', 'UTF-8', '-noframes', '-p', '-nomerge', '-nodrm', '-q', pdf_path, os.path.basename(index)]
+ if isfreebsd:
+ cmd.remove('-nodrm')
if no_images:
cmd.append('-i')
@@ -50,7 +52,7 @@ def pdftohtml(output_dir, pdf_path, no_images):
try:
p = popen(cmd, stderr=logf._fd, stdout=logf._fd,
stdin=subprocess.PIPE)
- except OSError, err:
+ except OSError as err:
if err.errno == 2:
raise ConversionError(_('Could not find pdftohtml, check it is in your PATH'))
else:
@@ -60,7 +62,7 @@ def pdftohtml(output_dir, pdf_path, no_images):
try:
ret = p.wait()
break
- except OSError, e:
+ except OSError as e:
if e.errno == errno.EINTR:
continue
else:
diff --git a/src/calibre/ebooks/pdf/reflow.cpp b/src/calibre/ebooks/pdf/reflow.cpp
index e444c126ab..65b5de6ae0 100644
--- a/src/calibre/ebooks/pdf/reflow.cpp
+++ b/src/calibre/ebooks/pdf/reflow.cpp
@@ -712,16 +712,18 @@ Reflow::Reflow(char *pdfdata, size_t sz) :
}
-void
-Reflow::render() {
+int
+Reflow::render(int first_page, int last_page) {
if (!this->doc->okToCopy())
cout << "Warning, this document has the copy protection flag set, ignoring." << endl;
globalParams->setTextEncoding(encoding);
- int first_page = 1;
- int last_page = doc->getNumPages();
+ int doc_pages = doc->getNumPages();
+ if (last_page < 1 || last_page > doc_pages) last_page = doc_pages;
+ if (first_page < 1) first_page = 1;
+ if (first_page > last_page) first_page = last_page;
XMLOutputDev *xml_out = new XMLOutputDev(this->doc);
doc->displayPages(xml_out, first_page, last_page,
@@ -733,9 +735,12 @@ Reflow::render() {
false //Printing
);
- this->dump_outline();
+ if (last_page - first_page == doc_pages - 1)
+ this->dump_outline();
delete xml_out;
+
+ return doc_pages;
}
void Reflow::dump_outline() {
diff --git a/src/calibre/ebooks/pdf/reflow.h b/src/calibre/ebooks/pdf/reflow.h
index ad4b79929d..768799f004 100644
--- a/src/calibre/ebooks/pdf/reflow.h
+++ b/src/calibre/ebooks/pdf/reflow.h
@@ -66,7 +66,7 @@ class Reflow {
~Reflow();
/* Convert the PDF to XML. All files are output to the current directory */
- void render();
+ int render(int first_page, int last_page);
/* Get the PDF Info Dictionary */
map<string, string> get_info();
diff --git a/src/calibre/ebooks/rtf/input.py b/src/calibre/ebooks/rtf/input.py
index 52f6feb071..23c16f473d 100644
--- a/src/calibre/ebooks/rtf/input.py
+++ b/src/calibre/ebooks/rtf/input.py
@@ -22,6 +22,7 @@ border_style_map = {
'dot-dot-dash': 'dotted',
'outset': 'outset',
'tripple': 'double',
+ 'triple': 'double',
'thick-thin-small': 'solid',
'thin-thick-small': 'solid',
'thin-thick-thin-small': 'solid',
@@ -267,7 +268,7 @@ class RTFInput(InputFormatPlugin):
self.log('Converting RTF to XML...')
try:
xml = self.generate_xml(stream.name)
- except RtfInvalidCodeException, e:
+ except RtfInvalidCodeException as e:
raise ValueError(_('This RTF file has a feature calibre does not '
'support. Convert it to HTML first and then try it.\n%s')%e)
diff --git a/src/calibre/ebooks/rtf2xml/colors.py b/src/calibre/ebooks/rtf2xml/colors.py
index e85b59571c..70c069eb80 100755
--- a/src/calibre/ebooks/rtf2xml/colors.py
+++ b/src/calibre/ebooks/rtf2xml/colors.py
@@ -245,8 +245,11 @@ class Colors:
self.__token_info = line[:16]
action = self.__state_dict.get(self.__state)
if action is None:
- sys.stderr.write('no matching state in module fonts.py\n')
- sys.stderr.write(self.__state + '\n')
+ try:
+ sys.stderr.write('no matching state in module fonts.py\n')
+ sys.stderr.write(self.__state + '\n')
+ except:
+ pass
action(line)
copy_obj = copy.Copy(bug_handler = self.__bug_handler)
if self.__copy:
diff --git a/src/calibre/ebooks/rtf2xml/make_lists.py b/src/calibre/ebooks/rtf2xml/make_lists.py
index fc544ac499..b785bf85d2 100755
--- a/src/calibre/ebooks/rtf2xml/make_lists.py
+++ b/src/calibre/ebooks/rtf2xml/make_lists.py
@@ -291,9 +291,12 @@ class MakeLists:
if self.__list_of_lists: # older RTF won't generate a list_of_lists
index_of_list = self.__get_index_of_list(id)
if index_of_list != None:# found a matching id
- list_dict = self.__list_of_lists[index_of_list][0]
+ curlist = self.__list_of_lists[index_of_list]
+ list_dict = curlist[0]
level = int(self.__level) + 1
- level_dict = self.__list_of_lists[index_of_list][level][0]
+ if level >= len(curlist):
+ level = len(curlist) - 1
+ level_dict = curlist[level][0]
list_type = level_dict.get('numbering-type')
if list_type == 'bullet':
list_type = 'unordered'
diff --git a/src/calibre/ebooks/snb/snbfile.py b/src/calibre/ebooks/snb/snbfile.py
index 9a7d65e417..1a0986baf4 100644
--- a/src/calibre/ebooks/snb/snbfile.py
+++ b/src/calibre/ebooks/snb/snbfile.py
@@ -85,7 +85,7 @@ class SNBFile:
uncompressedData += bzdc.decompress(data)
else:
uncompressedData += data
- except Exception, e:
+ except Exception as e:
print e
if len(uncompressedData) != self.plainStreamSizeUncompressed:
raise Exception()
diff --git a/src/calibre/ebooks/textile/functions.py b/src/calibre/ebooks/textile/functions.py
index 891211de30..39f793face 100755
--- a/src/calibre/ebooks/textile/functions.py
+++ b/src/calibre/ebooks/textile/functions.py
@@ -1,4 +1,6 @@
#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
"""
PyTextile
@@ -62,6 +64,8 @@ import re
import uuid
from urlparse import urlparse
+from calibre.utils.smartypants import smartyPants
+
def _normalize_newlines(string):
out = re.sub(r'\r\n', '\n', string)
out = re.sub(r'\n{3,}', '\n\n', out)
@@ -121,97 +125,114 @@ class Textile(object):
btag = ('bq', 'bc', 'notextile', 'pre', 'h[1-6]', 'fn\d+', 'p')
btag_lite = ('bq', 'bc', 'p')
- glyph_defaults = (
- ('mac_cent', '¢'),
- ('mac_pound', '£'),
- ('mac_yen', '¥'),
- ('mac_quarter', '¼'),
- ('mac_half', '½'),
- ('mac_three-quarter', '¾'),
- ('mac_cA-grave', 'À'),
- ('mac_cA-acute', 'Á'),
- ('mac_cA-circumflex', 'Â'),
- ('mac_cA-tilde', 'Ã'),
- ('mac_cA-diaeresis', 'Ä'),
- ('mac_cA-ring', 'Å'),
- ('mac_cAE', 'Æ'),
- ('mac_cC-cedilla', 'Ç'),
- ('mac_cE-grave', 'È'),
- ('mac_cE-acute', 'É'),
- ('mac_cE-circumflex', 'Ê'),
- ('mac_cE-diaeresis', 'Ë'),
- ('mac_cI-grave', 'Ì'),
- ('mac_cI-acute', 'Í'),
- ('mac_cI-circumflex', 'Î'),
- ('mac_cI-diaeresis', 'Ï'),
- ('mac_cEth', 'Ð'),
- ('mac_cN-tilde', 'Ñ'),
- ('mac_cO-grave', 'Ò'),
- ('mac_cO-acute', 'Ó'),
- ('mac_cO-circumflex', 'Ô'),
- ('mac_cO-tilde', 'Õ'),
- ('mac_cO-diaeresis', 'Ö'),
- ('mac_cO-stroke', 'Ø'),
- ('mac_cU-grave', 'Ù'),
- ('mac_cU-acute', 'Ú'),
- ('mac_cU-circumflex', 'Û'),
- ('mac_cU-diaeresis', 'Ü'),
- ('mac_cY-acute', 'Ý'),
- ('mac_sa-grave', 'à'),
- ('mac_sa-acute', 'á'),
- ('mac_sa-circumflex', 'â'),
- ('mac_sa-tilde', 'ã'),
- ('mac_sa-diaeresis', 'ä'),
- ('mac_sa-ring', 'å'),
- ('mac_sae', 'æ'),
- ('mac_sc-cedilla', 'ç'),
- ('mac_se-grave', 'è'),
- ('mac_se-acute', 'é'),
- ('mac_se-circumflex', 'ê'),
- ('mac_se-diaeresis', 'ë'),
- ('mac_si-grave', 'ì'),
- ('mac_si-acute', 'í'),
- ('mac_si-circumflex', 'î'),
- ('mac_si-diaeresis', 'ï'),
- ('mac_sn-tilde', 'ñ'),
- ('mac_so-grave', 'ò'),
- ('mac_so-acute', 'ó'),
- ('mac_so-circumflex', 'ô'),
- ('mac_so-tilde', 'õ'),
- ('mac_so-diaeresis', 'ö'),
- ('mac_so-stroke', 'ø'),
- ('mac_su-grave', 'ù'),
- ('mac_su-acute', 'ú'),
- ('mac_su-circumflex', 'û'),
- ('mac_su-diaeresis', 'ü'),
- ('mac_sy-acute', 'ý'),
- ('mac_sy-diaeresis', 'ÿ'),
- ('mac_cOE', 'Œ'),
- ('mac_soe', 'œ'),
- ('mac_bullet', '•'),
- ('mac_franc', '₣'),
- ('mac_lira', '₤'),
- ('mac_rupee', '₨'),
- ('mac_euro', '€'),
- ('mac_spade', '♠'),
- ('mac_club', '♣'),
- ('mac_heart', '♥'),
- ('mac_diamond', '♦'),
- ('txt_dimension', '×'),
- ('txt_quote_single_open', '‘'),
- ('txt_quote_single_close', '’'),
- ('txt_quote_double_open', '“'),
- ('txt_quote_double_close', '”'),
- ('txt_apostrophe', '’'),
- ('txt_prime', '′'),
- ('txt_prime_double', '″'),
- ('txt_ellipsis', '…'),
- ('txt_emdash', '—'),
- ('txt_endash', '–'),
- ('txt_trademark', '™'),
- ('txt_registered', '®'),
- ('txt_copyright', '©'),
- )
+ macro_defaults = [
+ (re.compile(r'{(c\||\|c)}'), r'¢'), # cent
+ (re.compile(r'{(L-|-L)}'), r'£'), # pound
+ (re.compile(r'{(Y=|=Y)}'), r'¥'), # yen
+ (re.compile(r'{\(c\)}'), r'©'), # copyright
+ (re.compile(r'{\(r\)}'), r'®'), # registered
+ (re.compile(r'{(\+_|_\+)}'), r'±'), # plus-minus
+ (re.compile(r'{1/4}'), r'¼'), # quarter
+ (re.compile(r'{1/2}'), r'½'), # half
+ (re.compile(r'{3/4}'), r'¾'), # three-quarter
+ (re.compile(r'{(A`|`A)}'), r'À'), # A-acute
+ (re.compile(r'{(A\'|\'A)}'), r'Á'), # A-grave
+ (re.compile(r'{(A\^|\^A)}'), r'Â'), # A-circumflex
+ (re.compile(r'{(A~|~A)}'), r'Ã'), # A-tilde
+ (re.compile(r'{(A\"|\"A)}'), r'Ä'), # A-diaeresis
+ (re.compile(r'{(Ao|oA)}'), r'Å'), # A-ring
+ (re.compile(r'{(AE)}'), r'Æ'), # AE
+ (re.compile(r'{(C,|,C)}'), r'Ç'), # C-cedilla
+ (re.compile(r'{(E`|`E)}'), r'È'), # E-acute
+ (re.compile(r'{(E\'|\'E)}'), r'É'), # E-grave
+ (re.compile(r'{(E\^|\^E)}'), r'Ê'), # E-circumflex
+ (re.compile(r'{(E\"|\"E)}'), r'Ë'), # E-diaeresis
+ (re.compile(r'{(I`|`I)}'), r'Ì'), # I-acute
+ (re.compile(r'{(I\'|\'I)}'), r'Í'), # I-grave
+ (re.compile(r'{(I\^|\^I)}'), r'Î'), # I-circumflex
+ (re.compile(r'{(I\"|\"I)}'), r'Ï'), # I-diaeresis
+ (re.compile(r'{(D-|-D)}'), r'Ð'), # ETH
+ (re.compile(r'{(N~|~N)}'), r'Ñ'), # N-tilde
+ (re.compile(r'{(O`|`O)}'), r'Ò'), # O-acute
+ (re.compile(r'{(O\'|\'O)}'), r'Ó'), # O-grave
+ (re.compile(r'{(O\^|\^O)}'), r'Ô'), # O-circumflex
+ (re.compile(r'{(O~|~O)}'), r'Õ'), # O-tilde
+ (re.compile(r'{(O\"|\"O)}'), r'Ö'), # O-diaeresis
+ (re.compile(r'{x}'), r'×'), # dimension
+ (re.compile(r'{(O\/|\/O)}'), r'Ø'), # O-slash
+ (re.compile(r'{(U`|`U)}'), r'Ù'), # U-acute
+ (re.compile(r'{(U\'|\'U)}'), r'Ú'), # U-grave
+ (re.compile(r'{(U\^|\^U)}'), r'Û'), # U-circumflex
+ (re.compile(r'{(U\"|\"U)}'), r'Ü'), # U-diaeresis
+ (re.compile(r'{(Y\'|\'Y)}'), r'Ý'), # Y-grave
+ (re.compile(r'{sz}'), r'ß'), # sharp-s
+ (re.compile(r'{(a`|`a)}'), r'à'), # a-grave
+ (re.compile(r'{(a\'|\'a)}'), r'á'), # a-acute
+ (re.compile(r'{(a\^|\^a)}'), r'â'), # a-circumflex
+ (re.compile(r'{(a~|~a)}'), r'ã'), # a-tilde
+ (re.compile(r'{(a\"|\"a)}'), r'ä'), # a-diaeresis
+ (re.compile(r'{(ao|oa)}'), r'å'), # a-ring
+ (re.compile(r'{ae}'), r'æ'), # ae
+ (re.compile(r'{(c,|,c)}'), r'ç'), # c-cedilla
+ (re.compile(r'{(e`|`e)}'), r'è'), # e-grave
+ (re.compile(r'{(e\'|\'e)}'), r'é'), # e-acute
+ (re.compile(r'{(e\^|\^e)}'), r'ê'), # e-circumflex
+ (re.compile(r'{(e\"|\"e)}'), r'ë'), # e-diaeresis
+ (re.compile(r'{(i`|`i)}'), r'ì'), # i-grave
+ (re.compile(r'{(i\'|\'i)}'), r'í'), # i-acute
+ (re.compile(r'{(i\^|\^i)}'), r'î'), # i-circumflex
+ (re.compile(r'{(i\"|\"i)}'), r'ï'), # i-diaeresis
+ (re.compile(r'{(d-|-d)}'), r'ð'), # eth
+ (re.compile(r'{(n~|~n)}'), r'ñ'), # n-tilde
+ (re.compile(r'{(o`|`o)}'), r'ò'), # o-grave
+ (re.compile(r'{(o\'|\'o)}'), r'ó'), # o-acute
+ (re.compile(r'{(o\^|\^o)}'), r'ô'), # o-circumflex
+ (re.compile(r'{(o~|~o)}'), r'õ'), # o-tilde
+ (re.compile(r'{(o\"|\"o)}'), r'ö'), # o-diaeresis
+ (re.compile(r'{(o\/|\/o)}'), r'ø'), # o-stroke
+ (re.compile(r'{(u`|`u)}'), r'ù'), # u-grave
+ (re.compile(r'{(u\'|\'u)}'), r'ú'), # u-acute
+ (re.compile(r'{(u\^|\^u)}'), r'û'), # u-circumflex
+ (re.compile(r'{(u\"|\"u)}'), r'ü'), # u-diaeresis
+ (re.compile(r'{(y\'|\'y)}'), r'ý'), # y-acute
+ (re.compile(r'{(y\"|\"y)}'), r'ÿ'), # y-diaeresis
+ (re.compile(r'{OE}'), r'Œ'), # OE
+ (re.compile(r'{oe}'), r'œ'), # oe
+ (re.compile(r'{(S\^|\^S)}'), r'Š'), # Scaron
+ (re.compile(r'{(s\^|\^s)}'), r'š'), # scaron
+ (re.compile(r'{\*}'), r'•'), # bullet
+ (re.compile(r'{Fr}'), r'₣'), # Franc
+ (re.compile(r'{(L=|=L)}'), r'₤'), # Lira
+ (re.compile(r'{Rs}'), r'₨'), # Rupee
+ (re.compile(r'{(C=|=C)}'), r'€'), # euro
+ (re.compile(r'{tm}'), r'™'), # trademark
+ (re.compile(r'{spades?}'), r'♠'), # spade
+ (re.compile(r'{clubs?}'), r'♣'), # club
+ (re.compile(r'{hearts?}'), r'♥'), # heart
+ (re.compile(r'{diam(onds?|s)}'), r'♦'), # diamond
+ (re.compile(r'{"}'), r'"'), # double-quote
+ (re.compile(r"{'}"), r'''), # single-quote
+ (re.compile(r"{(’|'/|/')}"), r'’'), # closing-single-quote - apostrophe
+ (re.compile(r"{(‘|\\'|'\\)}"), r'‘'), # opening-single-quote
+ (re.compile(r'{(”|"/|/")}'), r'”'), # closing-double-quote
+ (re.compile(r'{(“|\\"|"\\)}'), r'“'), # opening-double-quote
+ ]
+ glyph_defaults = [
+ (re.compile(r'(\d+\'?\"?)( ?)x( ?)(?=\d+)'), r'\1\2×\3'), # dimension sign
+ (re.compile(r'(\d+)\'', re.I), r'\1′'), # prime
+ (re.compile(r'(\d+)\"', re.I), r'\1″'), # prime-double
+ (re.compile(r'\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])'), r'<acronym title="\2">\1</acronym>'), # 3+ uppercase acronym
+ (re.compile(r'\b([A-Z][A-Z\'\-]+[A-Z])(?=[\s.,\)>])'), r'<span class="caps">\1</span>'), # 3+ uppercase
+ (re.compile(r'\b(\s{0,1})?\.{3}'), r'\1…'), # ellipsis
+ (re.compile(r'^[\*_-]{3,}$', re.M), r'<hr />'), # <hr> scene-break
+ (re.compile(r'\b--\b'), r'—'), # em dash
+ (re.compile(r'(\s)--(\s)'), r'\1—\2'), # em dash
+ (re.compile(r'\s-(?:\s|$)'), r' – '), # en dash
+ (re.compile(r'\b( ?)[([]TM[])]', re.I), r'\1™'), # trademark
+ (re.compile(r'\b( ?)[([]R[])]', re.I), r'\1®'), # registered
+ (re.compile(r'\b( ?)[([]C[])]', re.I), r'\1©'), # copyright
+ ]
+
def __init__(self, restricted=False, lite=False, noimage=False):
"""docstring for __init__"""
@@ -243,10 +264,9 @@ class Textile(object):
self.rel = ' rel="%s"' % rel
text = self.getRefs(text)
-
text = self.block(text, int(head_offset))
-
text = self.retrieve(text)
+ text = smartyPants(text, 'q')
return text
@@ -673,211 +693,15 @@ class Textile(object):
# fix: hackish
text = re.sub(r'"\Z', '\" ', text)
- glyph_search = (
- re.compile(r'(\d+\'?\"?)( ?)x( ?)(?=\d+)'), # dimension sign
- re.compile(r"(\w)\'(\w)"), # apostrophe's
- re.compile(r'(\s)\'(\d+\w?)\b(?!\')'), # back in '88
- re.compile(r'(\S)\'(?=\s|'+self.pnct+'|<|$)'), # single closing
- re.compile(r'\'/'), # single opening
- re.compile(r'(\")\"'), # double closing - following another
- re.compile(r'(\S)\"(?=\s|'+self.pnct+'|<|$)'), # double closing
- re.compile(r'"'), # double opening
- re.compile(r'\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])'), # 3+ uppercase acronym
- re.compile(r'\b([A-Z][A-Z\'\-]+[A-Z])(?=[\s.,\)>])'), # 3+ uppercase
- re.compile(r'\b(\s{0,1})?\.{3}'), # ellipsis
- re.compile(r'(\s?)--(\s?)'), # em dash
- re.compile(r'\s-(?:\s|$)'), # en dash
- re.compile(r'\b( ?)[([]TM[])]', re.I), # trademark
- re.compile(r'\b( ?)[([]R[])]', re.I), # registered
- re.compile(r'\b( ?)[([]C[])]', re.I) # copyright
- )
-
- glyph_replace = [x % dict(self.glyph_defaults) for x in (
- r'\1\2%(txt_dimension)s\3', # dimension sign
- r'\1%(txt_apostrophe)s\2', # apostrophe's
- r'\1%(txt_apostrophe)s\2', # back in '88
- r'\1%(txt_quote_single_close)s', # single closing
- r'%(txt_quote_single_open)s', # single opening
- r'\1%(txt_quote_double_close)s', # double closing - following another
- r'\1%(txt_quote_double_close)s', # double closing
- r'%(txt_quote_double_open)s', # double opening
- r'<acronym title="\2">\1</acronym>', # 3+ uppercase acronym
- r'<span class="caps">\1</span>', # 3+ uppercase
- r'\1%(txt_ellipsis)s', # ellipsis
- r'\1%(txt_emdash)s\2', # em dash
- r' %(txt_endash)s ', # en dash
- r'\1%(txt_trademark)s', # trademark
- r'\1%(txt_registered)s', # registered
- r'\1%(txt_copyright)s' # copyright
- )]
-
- if re.search(r'{.+?}', text):
- glyph_search += (
- re.compile(r'{(c\||\|c)}'), # cent
- re.compile(r'{(L-|-L)}'), # pound
- re.compile(r'{(Y=|=Y)}'), # yen
- re.compile(r'{\(c\)}'), # copyright
- re.compile(r'{\(r\)}'), # registered
- re.compile(r'{1/4}'), # quarter
- re.compile(r'{1/2}'), # half
- re.compile(r'{3/4}'), # three-quarter
- re.compile(r'{(A`|`A)}'), # 192;
- re.compile(r'{(A\'|\'A)}'), # 193;
- re.compile(r'{(A\^|\^A)}'), # 194;
- re.compile(r'{(A~|~A)}'), # 195;
- re.compile(r'{(A\"|\"A)}'), # 196;
- re.compile(r'{(Ao|oA)}'), # 197;
- re.compile(r'{(AE)}'), # 198;
- re.compile(r'{(C,|,C)}'), # 199;
- re.compile(r'{(E`|`E)}'), # 200;
- re.compile(r'{(E\'|\'E)}'), # 201;
- re.compile(r'{(E\^|\^E)}'), # 202;
- re.compile(r'{(E\"|\"E)}'), # 203;
- re.compile(r'{(I`|`I)}'), # 204;
- re.compile(r'{(I\'|\'I)}'), # 205;
- re.compile(r'{(I\^|\^I)}'), # 206;
- re.compile(r'{(I\"|\"I)}'), # 207;
- re.compile(r'{(D-|-D)}'), # 208;
- re.compile(r'{(N~|~N)}'), # 209;
- re.compile(r'{(O`|`O)}'), # 210;
- re.compile(r'{(O\'|\'O)}'), # 211;
- re.compile(r'{(O\^|\^O)}'), # 212;
- re.compile(r'{(O~|~O)}'), # 213;
- re.compile(r'{(O\"|\"O)}'), # 214;
- re.compile(r'{(O\/|\/O)}'), # 215;
- re.compile(r'{(U`|`U)}'), # 216;
- re.compile(r'{(U\'|\'U)}'), # 217;
- re.compile(r'{(U\^|\^U)}'), # 218;
- re.compile(r'{(U\"|\"U)}'), # 219;
- re.compile(r'{(Y\'|\'Y)}'), # 220;
- re.compile(r'{(a`|`a)}'), # a-grace
- re.compile(r'{(a\'|\'a)}'), # a-acute
- re.compile(r'{(a\^|\^a)}'), # a-circumflex
- re.compile(r'{(a~|~a)}'), # a-tilde
- re.compile(r'{(a\"|\"a)}'), # a-diaeresis
- re.compile(r'{(ao|oa)}'), # a-ring
- re.compile(r'{ae}'), # ae
- re.compile(r'{(c,|,c)}'), # c-cedilla
- re.compile(r'{(e`|`e)}'), # e-grace
- re.compile(r'{(e\'|\'e)}'), # e-acute
- re.compile(r'{(e\^|\^e)}'), # e-circumflex
- re.compile(r'{(e\"|\"e)}'), # e-diaeresis
- re.compile(r'{(i`|`i)}'), # i-grace
- re.compile(r'{(i\'|\'i)}'), # i-acute
- re.compile(r'{(i\^|\^i)}'), # i-circumflex
- re.compile(r'{(i\"|\"i)}'), # i-diaeresis
- re.compile(r'{(n~|~n)}'), # n-tilde
- re.compile(r'{(o`|`o)}'), # o-grace
- re.compile(r'{(o\'|\'o)}'), # o-acute
- re.compile(r'{(o\^|\^o)}'), # o-circumflex
- re.compile(r'{(o~|~o)}'), # o-tilde
- re.compile(r'{(o\"|\"o)}'), # o-diaeresis
- re.compile(r'{(o\/|\/o)}'), # o-stroke
- re.compile(r'{(u`|`u)}'), # u-grace
- re.compile(r'{(u\'|\'u)}'), # u-acute
- re.compile(r'{(u\^|\^u)}'), # u-circumflex
- re.compile(r'{(u\"|\"u)}'), # u-diaeresis
- re.compile(r'{(y\'|\'y)}'), # y-acute
- re.compile(r'{(y\"|\"y)}'), # y-diaeresis
- re.compile(r'{OE}'), # y-diaeresis
- re.compile(r'{oe}'), # y-diaeresis
- re.compile(r'{\*}'), # bullet
- re.compile(r'{Fr}'), # Franc
- re.compile(r'{(L=|=L)}'), # Lira
- re.compile(r'{Rs}'), # Rupee
- re.compile(r'{(C=|=C)}'), # euro
- re.compile(r'{tm}'), # euro
- re.compile(r'{spade}'), # spade
- re.compile(r'{club}'), # club
- re.compile(r'{heart}'), # heart
- re.compile(r'{diamond}') # diamond
- )
-
- glyph_replace += [x % dict(self.glyph_defaults) for x in (
- r'%(mac_cent)s', # cent
- r'%(mac_pound)s', # pound
- r'%(mac_yen)s', # yen
- r'%(txt_copyright)s', # copyright
- r'%(txt_registered)s', # registered
- r'%(mac_quarter)s', # quarter
- r'%(mac_half)s', # half
- r'%(mac_three-quarter)s', # three-quarter
- r'%(mac_cA-grave)s', # 192;
- r'%(mac_cA-acute)s', # 193;
- r'%(mac_cA-circumflex)s', # 194;
- r'%(mac_cA-tilde)s', # 195;
- r'%(mac_cA-diaeresis)s', # 196;
- r'%(mac_cA-ring)s', # 197;
- r'%(mac_cAE)s', # 198;
- r'%(mac_cC-cedilla)s', # 199;
- r'%(mac_cE-grave)s', # 200;
- r'%(mac_cE-acute)s', # 201;
- r'%(mac_cE-circumflex)s', # 202;
- r'%(mac_cE-diaeresis)s', # 203;
- r'%(mac_cI-grave)s', # 204;
- r'%(mac_cI-acute)s', # 205;
- r'%(mac_cI-circumflex)s', # 206;
- r'%(mac_cI-diaeresis)s', # 207;
- r'%(mac_cEth)s', # 208;
- r'%(mac_cN-tilde)s', # 209;
- r'%(mac_cO-grave)s', # 210;
- r'%(mac_cO-acute)s', # 211;
- r'%(mac_cO-circumflex)s', # 212;
- r'%(mac_cO-tilde)s', # 213;
- r'%(mac_cO-diaeresis)s', # 214;
- r'%(mac_cO-stroke)s', # 216;
- r'%(mac_cU-grave)s', # 217;
- r'%(mac_cU-acute)s', # 218;
- r'%(mac_cU-circumflex)s', # 219;
- r'%(mac_cU-diaeresis)s', # 220;
- r'%(mac_cY-acute)s', # 221;
- r'%(mac_sa-grave)s', # 224;
- r'%(mac_sa-acute)s', # 225;
- r'%(mac_sa-circumflex)s', # 226;
- r'%(mac_sa-tilde)s', # 227;
- r'%(mac_sa-diaeresis)s', # 228;
- r'%(mac_sa-ring)s', # 229;
- r'%(mac_sae)s', # 230;
- r'%(mac_sc-cedilla)s', # 231;
- r'%(mac_se-grave)s', # 232;
- r'%(mac_se-acute)s', # 233;
- r'%(mac_se-circumflex)s', # 234;
- r'%(mac_se-diaeresis)s', # 235;
- r'%(mac_si-grave)s', # 236;
- r'%(mac_si-acute)s', # 237;
- r'%(mac_si-circumflex)s', # 238;
- r'%(mac_si-diaeresis)s', # 239;
- r'%(mac_sn-tilde)s', # 241;
- r'%(mac_so-grave)s', # 242;
- r'%(mac_so-acute)s', # 243;
- r'%(mac_so-circumflex)s', # 244;
- r'%(mac_so-tilde)s', # 245;
- r'%(mac_so-diaeresis)s', # 246;
- r'%(mac_so-stroke)s', # 248;
- r'%(mac_su-grave)s', # 249;
- r'%(mac_su-acute)s', # 250;
- r'%(mac_su-circumflex)s', # 251;
- r'%(mac_su-diaeresis)s', # 252;
- r'%(mac_sy-acute)s', # 253;
- r'%(mac_sy-diaeresis)s', # 255;
- r'%(mac_cOE)s', # 338;
- r'%(mac_soe)s', # 339;
- r'%(mac_bullet)s', # bullet
- r'%(mac_franc)s', # franc
- r'%(mac_lira)s', # lira
- r'%(mac_rupee)s', # rupee
- r'%(mac_euro)s', # euro
- r'%(txt_trademark)s', # trademark
- r'%(mac_spade)s', # spade
- r'%(mac_club)s', # club
- r'%(mac_heart)s', # heart
- r'%(mac_diamond)s' # diamond
- )]
-
result = []
for line in re.compile(r'(<.*?>)', re.U).split(text):
if not re.search(r'<.*>', line):
- for s, r in zip(glyph_search, glyph_replace):
+ rules = []
+ if re.search(r'{.+?}', line):
+ rules = self.macro_defaults + self.glyph_defaults
+ else:
+ rules = self.glyph_defaults
+ for s, r in rules:
line = s.sub(r, line)
result.append(line)
return ''.join(result)
@@ -927,7 +751,7 @@ class Textile(object):
return url
def shelve(self, text):
- id = str(uuid.uuid4())
+ id = str(uuid.uuid4()) + 'c'
self.shelf[id] = text
return id
@@ -1049,7 +873,7 @@ class Textile(object):
for qtag in qtags:
pattern = re.compile(r"""
- (?:^|(?<=[\s>%(pnct)s])|\[|([\]}]))
+ (?:^|(?<=[\s>%(pnct)s\(])|\[|([\]}]))
(%(qtag)s)(?!%(qtag)s)
(%(c)s)
(?::(\S+))?
diff --git a/src/calibre/ebooks/txt/markdownml.py b/src/calibre/ebooks/txt/markdownml.py
index c179378049..fe76757eab 100644
--- a/src/calibre/ebooks/txt/markdownml.py
+++ b/src/calibre/ebooks/txt/markdownml.py
@@ -37,7 +37,7 @@ class MarkdownMLizer(object):
if not self.opts.keep_links:
html = re.sub(r'<\s*/*\s*a[^>]*>', '', html)
if not self.opts.keep_image_references:
- html = re.sub(r'<\s*img[^>]*>', '', html)\
+ html = re.sub(r'<\s*img[^>]*>', '', html)
text = html2text(html)
diff --git a/src/calibre/ebooks/txt/output.py b/src/calibre/ebooks/txt/output.py
index d021cbbba6..4e54a97b45 100644
--- a/src/calibre/ebooks/txt/output.py
+++ b/src/calibre/ebooks/txt/output.py
@@ -11,7 +11,7 @@ from lxml import etree
from calibre.customize.conversion import OutputFormatPlugin, \
OptionRecommendation
-from calibre.ebooks.oeb.base import OEB_IMAGES
+from calibre.ebooks.oeb.base import OEB_IMAGES
from calibre.ebooks.txt.txtml import TXTMLizer
from calibre.ebooks.txt.newlines import TxtNewlines, specified_newlines
from calibre.ptempfile import TemporaryDirectory, TemporaryFile
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 9649a79cc1..22aaabf592 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -13,7 +13,7 @@ from PyQt4.Qt import QVariant, QFileInfo, QObject, SIGNAL, QBuffer, Qt, \
ORG_NAME = 'KovidsBrain'
APP_UID = 'libprs500'
-from calibre.constants import islinux, iswindows, isfreebsd, isfrozen
+from calibre.constants import islinux, iswindows, isfreebsd, isfrozen, isosx
from calibre.utils.config import Config, ConfigProxy, dynamic, JSONConfig
from calibre.utils.localization import set_qt_translator
from calibre.ebooks.metadata.meta import get_metadata, metadata_from_formats
@@ -23,19 +23,45 @@ from calibre.utils.date import UNDEFINED_DATE
# Setup gprefs {{{
gprefs = JSONConfig('gui')
-gprefs.defaults['action-layout-toolbar'] = (
+if isosx:
+ gprefs.defaults['action-layout-menubar'] = (
+ 'Add Books', 'Edit Metadata', 'Convert Books',
+ 'Choose Library', 'Save To Disk', 'Preferences',
+ 'Help',
+ )
+ gprefs.defaults['action-layout-menubar-device'] = (
+ 'Add Books', 'Edit Metadata', 'Convert Books',
+ 'Location Manager', 'Send To Device',
+ 'Save To Disk', 'Preferences', 'Help',
+ )
+ gprefs.defaults['action-layout-toolbar'] = (
+ 'Add Books', 'Edit Metadata', None, 'Convert Books', 'View', None,
+ 'Choose Library', 'Donate', None, 'Fetch News', 'Save To Disk',
+ 'Connect Share', None, 'Remove Books',
+ )
+ gprefs.defaults['action-layout-toolbar-device'] = (
+ 'Add Books', 'Edit Metadata', None, 'Convert Books', 'View',
+ 'Send To Device', None, None, 'Location Manager', None, None,
+ 'Fetch News', 'Save To Disk', 'Connect Share', None,
+ 'Remove Books',
+ )
+else:
+ gprefs.defaults['action-layout-menubar'] = ()
+ gprefs.defaults['action-layout-menubar-device'] = ()
+ gprefs.defaults['action-layout-toolbar'] = (
'Add Books', 'Edit Metadata', None, 'Convert Books', 'View', None,
'Choose Library', 'Donate', None, 'Fetch News', 'Save To Disk',
'Connect Share', None, 'Remove Books', None, 'Help', 'Preferences',
)
-
-gprefs.defaults['action-layout-toolbar-device'] = (
+ gprefs.defaults['action-layout-toolbar-device'] = (
'Add Books', 'Edit Metadata', None, 'Convert Books', 'View',
'Send To Device', None, None, 'Location Manager', None, None,
'Fetch News', 'Save To Disk', 'Connect Share', None,
'Remove Books', None, 'Help', 'Preferences',
)
+gprefs.defaults['action-layout-toolbar-child'] = ()
+
gprefs.defaults['action-layout-context-menu'] = (
'Edit Metadata', 'Send To Device', 'Save To Disk',
'Connect Share', 'Copy To Library', None,
@@ -52,10 +78,10 @@ gprefs.defaults['show_splash_screen'] = True
gprefs.defaults['toolbar_icon_size'] = 'medium'
gprefs.defaults['automerge'] = 'ignore'
gprefs.defaults['toolbar_text'] = 'auto'
-gprefs.defaults['show_child_bar'] = False
gprefs.defaults['font'] = None
gprefs.defaults['tags_browser_partition_method'] = 'first letter'
gprefs.defaults['tags_browser_collapse_at'] = 100
+gprefs.defaults['edit_metadata_single_layout'] = 'default'
# }}}
@@ -79,6 +105,8 @@ def _config():
help=_('Use Roman numerals for series number'))
c.add_opt('sort_tags_by', default='name',
help=_('Sort tags list by name, popularity, or rating'))
+ c.add_opt('match_tags_type', default='any',
+ help=_('Match tags by any or all.'))
c.add_opt('cover_flow_queue_length', default=6,
help=_('Number of covers to show in the cover browsing mode'))
c.add_opt('LRF_conversion_defaults', default=[],
diff --git a/src/calibre/gui2/actions/__init__.py b/src/calibre/gui2/actions/__init__.py
index 8563956b28..a5ef402f22 100644
--- a/src/calibre/gui2/actions/__init__.py
+++ b/src/calibre/gui2/actions/__init__.py
@@ -75,7 +75,7 @@ class InterfaceAction(QObject):
dont_remove_from = frozenset([])
all_locations = frozenset(['toolbar', 'toolbar-device', 'context-menu',
- 'context-menu-device'])
+ 'context-menu-device', 'toolbar-child', 'menubar', 'menubar-device'])
#: Type of action
#: 'current' means acts on the current view
@@ -145,11 +145,10 @@ class InterfaceAction(QObject):
ans[candidate] = zf.read(candidate)
return ans
-
def genesis(self):
'''
Setup this plugin. Only called once during initialization. self.gui is
- available. The action secified by :attr:`action_spec` is available as
+ available. The action specified by :attr:`action_spec` is available as
``self.qaction``.
'''
pass
diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py
index cf67cd6cfa..f8dd0693ea 100644
--- a/src/calibre/gui2/actions/add.py
+++ b/src/calibre/gui2/actions/add.py
@@ -22,6 +22,8 @@ from calibre.constants import preferred_encoding, filesystem_encoding
from calibre.gui2.actions import InterfaceAction
from calibre.gui2 import config, question_dialog
from calibre.ebooks.metadata import MetaInformation
+from calibre.utils.config import test_eight_code
+from calibre.ebooks.metadata.sources.base import msprefs
def get_filters():
return [
@@ -178,13 +180,26 @@ class AddAction(InterfaceAction):
except IndexError:
self.gui.library_view.model().books_added(self.isbn_add_dialog.value)
self.isbn_add_dialog.accept()
- orig = config['overwrite_author_title_metadata']
- config['overwrite_author_title_metadata'] = True
- try:
- self.gui.iactions['Edit Metadata'].do_download_metadata(
- self.add_by_isbn_ids)
- finally:
- config['overwrite_author_title_metadata'] = orig
+ if test_eight_code:
+ orig = msprefs['ignore_fields']
+ new = list(orig)
+ for x in ('title', 'authors'):
+ if x in new:
+ new.remove(x)
+ msprefs['ignore_fields'] = new
+ try:
+ self.gui.iactions['Edit Metadata'].download_metadata(
+ ids=self.add_by_isbn_ids)
+ finally:
+ msprefs['ignore_fields'] = orig
+ else:
+ orig = config['overwrite_author_title_metadata']
+ config['overwrite_author_title_metadata'] = True
+ try:
+ self.gui.iactions['Edit Metadata'].do_download_metadata(
+ self.add_by_isbn_ids)
+ finally:
+ config['overwrite_author_title_metadata'] = orig
return
diff --git a/src/calibre/gui2/actions/add_to_library.py b/src/calibre/gui2/actions/add_to_library.py
index 05aea8f1dd..2665ffe0a4 100644
--- a/src/calibre/gui2/actions/add_to_library.py
+++ b/src/calibre/gui2/actions/add_to_library.py
@@ -12,7 +12,7 @@ class AddToLibraryAction(InterfaceAction):
name = 'Add To Library'
action_spec = (_('Add books to library'), 'add_book.png',
_('Add books to your calibre library from the connected device'), None)
- dont_add_to = frozenset(['toolbar', 'context-menu'])
+ dont_add_to = frozenset(['menubar', 'toolbar', 'context-menu', 'toolbar-child'])
action_type = 'current'
def genesis(self):
diff --git a/src/calibre/gui2/actions/annotate.py b/src/calibre/gui2/actions/annotate.py
index a702ba045e..48397936fb 100644
--- a/src/calibre/gui2/actions/annotate.py
+++ b/src/calibre/gui2/actions/annotate.py
@@ -18,6 +18,7 @@ class FetchAnnotationsAction(InterfaceAction):
name = 'Fetch Annotations'
action_spec = (_('Fetch annotations (experimental)'), None, None, None)
+ dont_add_to = frozenset(['menubar', 'toolbar', 'context-menu', 'toolbar-child'])
action_type = 'current'
def genesis(self):
diff --git a/src/calibre/gui2/actions/catalog.py b/src/calibre/gui2/actions/catalog.py
index fadb140be6..fad6e59294 100644
--- a/src/calibre/gui2/actions/catalog.py
+++ b/src/calibre/gui2/actions/catalog.py
@@ -18,7 +18,7 @@ class GenerateCatalogAction(InterfaceAction):
name = 'Generate Catalog'
action_spec = (_('Create a catalog of the books in your calibre library'), None, None, None)
- dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+ dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
def generate_catalog(self):
rows = self.gui.library_view.selectionModel().selectedRows()
@@ -31,10 +31,10 @@ class GenerateCatalogAction(InterfaceAction):
_('No books selected for catalog generation'),
show=True)
- db = self.gui.library_view.model().db
- dbspec = {}
- for id in ids:
- dbspec[id] = {'ondevice': db.ondevice(id, index_is_id=True)}
+ db = self.gui.library_view.model().db
+ dbspec = {}
+ for id in ids:
+ dbspec[id] = {'ondevice': db.ondevice(id, index_is_id=True)}
# Calling gui2.tools:generate_catalog()
ret = generate_catalog(self.gui, dbspec, ids, self.gui.device_manager,
diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index 6f4ca624cb..4b262ad9dd 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en'
import os, shutil
from functools import partial
-from PyQt4.Qt import QMenu, Qt, QInputDialog
+from PyQt4.Qt import QMenu, Qt, QInputDialog, QToolButton
from calibre import isbytestring
from calibre.constants import filesystem_encoding
@@ -80,7 +80,7 @@ class ChooseLibraryAction(InterfaceAction):
name = 'Choose Library'
action_spec = (_('%d books'), 'lt.png',
_('Choose calibre library to work with'), None)
- dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+ dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
def genesis(self):
self.count_changed(0)
@@ -88,6 +88,9 @@ class ChooseLibraryAction(InterfaceAction):
type=Qt.QueuedConnection)
self.stats = LibraryUsageStats()
+ self.popup_type = (QToolButton.InstantPopup if len(self.stats.stats) > 1 else
+ QToolButton.MenuButtonPopup)
+
self.create_action(spec=(_('Switch/create library...'), 'lt.png', None,
None), attr='action_choose')
self.action_choose.triggered.connect(self.choose_library,
@@ -123,6 +126,7 @@ class ChooseLibraryAction(InterfaceAction):
type=Qt.QueuedConnection)
self.choose_menu.addAction(ac)
+
self.rename_separator = self.choose_menu.addSeparator()
self.maintenance_menu = QMenu(_('Library Maintenance'))
@@ -172,6 +176,7 @@ class ChooseLibraryAction(InterfaceAction):
return
db = self.gui.library_view.model().db
locations = list(self.stats.locations(db))
+
for ac in self.switch_actions:
ac.setVisible(False)
self.quick_menu.clear()
@@ -205,7 +210,6 @@ class ChooseLibraryAction(InterfaceAction):
rename_actions, delete_actions, qs_actions,
self.action_choose)
-
def location_selected(self, loc):
enabled = loc == 'library'
self.qaction.setEnabled(enabled)
diff --git a/src/calibre/gui2/actions/convert.py b/src/calibre/gui2/actions/convert.py
index caf65932d8..ed0a064e88 100644
--- a/src/calibre/gui2/actions/convert.py
+++ b/src/calibre/gui2/actions/convert.py
@@ -20,7 +20,7 @@ class ConvertAction(InterfaceAction):
name = 'Convert Books'
action_spec = (_('Convert books'), 'convert.png', None, _('C'))
- dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+ dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
action_type = 'current'
def genesis(self):
@@ -51,7 +51,7 @@ class ConvertAction(InterfaceAction):
self.queue_convert_jobs(jobs, changed, bad, rows, previous,
self.book_auto_converted, extra_job_args=[on_card])
- def auto_convert_mail(self, to, fmts, delete_from_library, book_ids, format):
+ def auto_convert_mail(self, to, fmts, delete_from_library, book_ids, format, subject):
previous = self.gui.library_view.currentIndex()
rows = [x.row() for x in \
self.gui.library_view.selectionModel().selectedRows()]
@@ -59,7 +59,7 @@ class ConvertAction(InterfaceAction):
if jobs == []: return
self.queue_convert_jobs(jobs, changed, bad, rows, previous,
self.book_auto_converted_mail,
- extra_job_args=[delete_from_library, to, fmts])
+ extra_job_args=[delete_from_library, to, fmts, subject])
def auto_convert_news(self, book_ids, format):
previous = self.gui.library_view.currentIndex()
@@ -145,9 +145,10 @@ class ConvertAction(InterfaceAction):
self.gui.sync_to_device(on_card, False, specific_format=fmt, send_ids=[book_id], do_auto_convert=False)
def book_auto_converted_mail(self, job):
- temp_files, fmt, book_id, delete_from_library, to, fmts = self.conversion_jobs[job]
+ temp_files, fmt, book_id, delete_from_library, to, fmts, subject = self.conversion_jobs[job]
self.book_converted(job)
- self.gui.send_by_mail(to, fmts, delete_from_library, specific_format=fmt, send_ids=[book_id], do_auto_convert=False)
+ self.gui.send_by_mail(to, fmts, delete_from_library, subject=subject,
+ specific_format=fmt, send_ids=[book_id], do_auto_convert=False)
def book_auto_converted_news(self, job):
temp_files, fmt, book_id = self.conversion_jobs[job]
diff --git a/src/calibre/gui2/actions/copy_to_library.py b/src/calibre/gui2/actions/copy_to_library.py
index 0668baeac6..2e4d0380be 100644
--- a/src/calibre/gui2/actions/copy_to_library.py
+++ b/src/calibre/gui2/actions/copy_to_library.py
@@ -32,7 +32,7 @@ class Worker(Thread):
def run(self):
try:
self.doit()
- except Exception, err:
+ except Exception as err:
import traceback
try:
err = unicode(err)
diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py
index 0b0492228e..debcbb6c1a 100644
--- a/src/calibre/gui2/actions/device.py
+++ b/src/calibre/gui2/actions/device.py
@@ -24,7 +24,7 @@ class ShareConnMenu(QMenu): # {{{
config_email = pyqtSignal()
toggle_server = pyqtSignal()
- dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+ dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
def __init__(self, parent=None):
QMenu.__init__(self, parent)
@@ -82,7 +82,8 @@ class ShareConnMenu(QMenu): # {{{
keys = sorted(opts.accounts.keys())
for account in keys:
formats, auto, default = opts.accounts[account]
- dest = 'mail:'+account+';'+formats
+ subject = opts.subjects.get(account, '')
+ dest = 'mail:'+account+';'+formats+';'+subject
action1 = DeviceAction(dest, False, False, I('mail.png'),
account)
action2 = DeviceAction(dest, True, False, I('mail.png'),
@@ -120,8 +121,7 @@ class SendToDeviceAction(InterfaceAction):
name = 'Send To Device'
action_spec = (_('Send to device'), 'sync.png', None, _('D'))
- dont_remove_from = frozenset(['toolbar-device'])
- dont_add_to = frozenset(['toolbar', 'context-menu'])
+ dont_add_to = frozenset(['menubar', 'toolbar', 'context-menu', 'toolbar-child'])
def genesis(self):
self.qaction.triggered.connect(self.do_sync)
@@ -165,10 +165,14 @@ class ConnectShareAction(InterfaceAction):
def content_server_state_changed(self, running):
self.share_conn_menu.server_state_changed(running)
+ if running:
+ self.qaction.setIcon(QIcon(I('connect_share_on.png')))
+ else:
+ self.qaction.setIcon(QIcon(I('connect_share.png')))
def toggle_content_server(self):
if self.gui.content_server is None:
- self.gui.start_content_server()
+ self.gui.start_content_server()
else:
self.gui.content_server.threaded_exit()
self.stopping_msg = info_dialog(self.gui, _('Stopping'),
diff --git a/src/calibre/gui2/actions/edit_collections.py b/src/calibre/gui2/actions/edit_collections.py
index 7f5dd76538..1a0b1038ce 100644
--- a/src/calibre/gui2/actions/edit_collections.py
+++ b/src/calibre/gui2/actions/edit_collections.py
@@ -12,7 +12,7 @@ class EditCollectionsAction(InterfaceAction):
name = 'Edit Collections'
action_spec = (_('Manage collections'), None,
_('Manage the collections on this device'), None)
- dont_add_to = frozenset(['toolbar', 'context-menu'])
+ dont_add_to = frozenset(['menubar', 'toolbar', 'context-menu', 'toolbar-child'])
action_type = 'current'
def genesis(self):
diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py
index 6c2cfb8126..fc663d268a 100644
--- a/src/calibre/gui2/actions/edit_metadata.py
+++ b/src/calibre/gui2/actions/edit_metadata.py
@@ -17,6 +17,7 @@ from calibre.gui2.dialogs.confirm_delete import confirm
from calibre.gui2.dialogs.tag_list_editor import TagListEditor
from calibre.gui2.actions import InterfaceAction
from calibre.utils.icu import sort_key
+from calibre.utils.config import test_eight_code
class EditMetadataAction(InterfaceAction):
@@ -34,16 +35,23 @@ class EditMetadataAction(InterfaceAction):
md.addAction(_('Edit metadata in bulk'),
partial(self.edit_metadata, False, bulk=True))
md.addSeparator()
- md.addAction(_('Download metadata and covers'),
- partial(self.download_metadata, False, covers=True),
+ if test_eight_code:
+ dall = self.download_metadata
+ dident = partial(self.download_metadata, covers=False)
+ dcovers = partial(self.download_metadata, identify=False)
+ else:
+ dall = partial(self.download_metadata_old, False, covers=True)
+ dident = partial(self.download_metadata_old, False, covers=False)
+ dcovers = partial(self.download_metadata_old, False, covers=True,
+ set_metadata=False, set_social_metadata=False)
+
+ md.addAction(_('Download metadata and covers'), dall,
Qt.ControlModifier+Qt.Key_D)
- md.addAction(_('Download only metadata'),
- partial(self.download_metadata, False, covers=False))
- md.addAction(_('Download only covers'),
- partial(self.download_metadata, False, covers=True,
- set_metadata=False, set_social_metadata=False))
- md.addAction(_('Download only social metadata'),
- partial(self.download_metadata, False, covers=False,
+ md.addAction(_('Download only metadata'), dident)
+ md.addAction(_('Download only covers'), dcovers)
+ if not test_eight_code:
+ md.addAction(_('Download only social metadata'),
+ partial(self.download_metadata_old, False, covers=False,
set_metadata=False, set_social_metadata=True))
self.metadata_menu = md
@@ -72,7 +80,16 @@ class EditMetadataAction(InterfaceAction):
self.qaction.setEnabled(enabled)
self.action_merge.setEnabled(enabled)
- def download_metadata(self, checked, covers=True, set_metadata=True,
+ def download_metadata(self, identify=True, covers=True, ids=None):
+ if ids is None:
+ rows = self.gui.library_view.selectionModel().selectedRows()
+ if not rows or len(rows) == 0:
+ return error_dialog(self.gui, _('Cannot download metadata'),
+ _('No books selected'), show=True)
+ db = self.gui.library_view.model().db
+ ids = [db.id(row.row()) for row in rows]
+
+ def download_metadata_old(self, checked, covers=True, set_metadata=True,
set_social_metadata=None):
rows = self.gui.library_view.selectionModel().selectedRows()
if not rows or len(rows) == 0:
@@ -133,8 +150,6 @@ class EditMetadataAction(InterfaceAction):
row_list = [r.row() for r in rows]
current_row = 0
- changed = set([])
- db = self.gui.library_view.model().db
if len(row_list) == 1:
cr = row_list[0]
@@ -142,6 +157,27 @@ class EditMetadataAction(InterfaceAction):
list(range(self.gui.library_view.model().rowCount(QModelIndex())))
current_row = row_list.index(cr)
+ func = (self.do_edit_metadata if test_eight_code else
+ self.do_edit_metadata_old)
+ changed, rows_to_refresh = func(row_list, current_row)
+
+ m = self.gui.library_view.model()
+
+ if rows_to_refresh:
+ m.refresh_rows(rows_to_refresh)
+
+ if changed:
+ m.refresh_ids(list(changed))
+ current = self.gui.library_view.currentIndex()
+ if self.gui.cover_flow:
+ self.gui.cover_flow.dataChanged()
+ m.current_changed(current, previous)
+ self.gui.tags_view.recount()
+
+ def do_edit_metadata_old(self, row_list, current_row):
+ changed = set([])
+ db = self.gui.library_view.model().db
+
while True:
prev = next_ = None
if current_row > 0:
@@ -164,16 +200,32 @@ class EditMetadataAction(InterfaceAction):
if d.row_delta == 0:
break
current_row += d.row_delta
+ self.gui.library_view.set_current_row(current_row)
+ self.gui.library_view.scroll_to_row(current_row)
+ return changed, set()
+ def do_edit_metadata(self, row_list, current_row):
+ from calibre.gui2.metadata.single import edit_metadata
+ db = self.gui.library_view.model().db
+ changed, rows_to_refresh = edit_metadata(db, row_list, current_row,
+ parent=self.gui, view_slot=self.view_format_callback,
+ set_current_callback=self.set_current_callback)
+ return changed, rows_to_refresh
+
+ def set_current_callback(self, id_):
+ db = self.gui.library_view.model().db
+ current_row = db.row(id_)
+ self.gui.library_view.set_current_row(current_row)
+ self.gui.library_view.scroll_to_row(current_row)
+
+ def view_format_callback(self, id_, fmt):
+ view = self.gui.iactions['View']
+ if id_ is None:
+ view._view_file(fmt)
+ else:
+ db = self.gui.library_view.model().db
+ view.view_format(db.row(id_), fmt)
- if changed:
- self.gui.library_view.model().refresh_ids(list(changed))
- current = self.gui.library_view.currentIndex()
- m = self.gui.library_view.model()
- if self.gui.cover_flow:
- self.gui.cover_flow.dataChanged()
- m.current_changed(current, previous)
- self.gui.tags_view.recount()
def edit_bulk_metadata(self, checked):
'''
diff --git a/src/calibre/gui2/actions/fetch_news.py b/src/calibre/gui2/actions/fetch_news.py
index f7756efbab..f94dfbc88c 100644
--- a/src/calibre/gui2/actions/fetch_news.py
+++ b/src/calibre/gui2/actions/fetch_news.py
@@ -5,6 +5,8 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
+import gc
+
from PyQt4.Qt import Qt
from calibre.gui2 import Dispatcher
@@ -53,11 +55,11 @@ class FetchNewsAction(InterfaceAction):
def scheduled_recipe_fetched(self, job):
temp_files, fmt, arg = self.conversion_jobs.pop(job)
- pt = temp_files[0]
+ fname = temp_files[0].name
if job.failed:
self.scheduler.recipe_download_failed(arg)
return self.gui.job_exception(job)
- id = self.gui.library_view.model().add_news(pt.name, arg)
+ id = self.gui.library_view.model().add_news(fname, arg)
# Arg may contain a "keep_issues" variable. If it is non-zero,
# delete all but newest x issues.
@@ -81,5 +83,6 @@ class FetchNewsAction(InterfaceAction):
self.gui.status_bar.show_message(arg['title'] + _(' fetched.'), 3000)
self.gui.email_news(id)
self.gui.sync_news()
+ gc.collect()
diff --git a/src/calibre/gui2/actions/next_match.py b/src/calibre/gui2/actions/next_match.py
index 1c74719674..8e076655a9 100644
--- a/src/calibre/gui2/actions/next_match.py
+++ b/src/calibre/gui2/actions/next_match.py
@@ -11,7 +11,7 @@ class NextMatchAction(InterfaceAction):
name = 'Move to next highlighted book'
action_spec = (_('Move to next match'), 'arrow-down.png',
_('Move to next highlighted match'), [_('N'), _('F3')])
- dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+ dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
action_type = 'current'
def genesis(self):
diff --git a/src/calibre/gui2/actions/open.py b/src/calibre/gui2/actions/open.py
index 141ff01a66..a66f68eee5 100644
--- a/src/calibre/gui2/actions/open.py
+++ b/src/calibre/gui2/actions/open.py
@@ -13,7 +13,7 @@ class OpenFolderAction(InterfaceAction):
name = 'Open Folder'
action_spec = (_('Open containing folder'), 'document_open.png', None,
_('O'))
- dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+ dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
action_type = 'current'
def genesis(self):
diff --git a/src/calibre/gui2/actions/preferences.py b/src/calibre/gui2/actions/preferences.py
index ee52f06aac..24d20b23f9 100644
--- a/src/calibre/gui2/actions/preferences.py
+++ b/src/calibre/gui2/actions/preferences.py
@@ -16,7 +16,6 @@ class PreferencesAction(InterfaceAction):
name = 'Preferences'
action_spec = (_('Preferences'), 'config.png', None, _('Ctrl+P'))
- dont_remove_from = frozenset(['toolbar'])
def genesis(self):
pm = QMenu()
@@ -25,8 +24,11 @@ class PreferencesAction(InterfaceAction):
self.gui.run_wizard)
if not DEBUG:
pm.addSeparator()
- pm.addAction(QIcon(I('debug.png')), _('Restart in debug mode'),
+ ac = pm.addAction(QIcon(I('debug.png')), _('Restart in debug mode'),
self.debug_restart)
+ ac.setShortcut('Ctrl+Shift+R')
+ self.gui.addAction(ac)
+
self.qaction.setMenu(pm)
self.preferences_menu = pm
for x in (self.gui.preferences_action, self.qaction):
diff --git a/src/calibre/gui2/actions/show_book_details.py b/src/calibre/gui2/actions/show_book_details.py
index 67903a7d58..11064f2f39 100644
--- a/src/calibre/gui2/actions/show_book_details.py
+++ b/src/calibre/gui2/actions/show_book_details.py
@@ -15,7 +15,7 @@ class ShowBookDetailsAction(InterfaceAction):
name = 'Show Book Details'
action_spec = (_('Show book details'), 'dialog_information.png', None,
_('I'))
- dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+ dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
action_type = 'current'
def genesis(self):
diff --git a/src/calibre/gui2/actions/tweak_epub.py b/src/calibre/gui2/actions/tweak_epub.py
index 212aff8019..c9f2d7a8c6 100755
--- a/src/calibre/gui2/actions/tweak_epub.py
+++ b/src/calibre/gui2/actions/tweak_epub.py
@@ -15,7 +15,7 @@ class TweakEpubAction(InterfaceAction):
action_spec = (_('Tweak ePub'), 'trim.png',
_('Make small changes to ePub format books'),
_('T'))
- dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+ dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
action_type = 'current'
def genesis(self):
diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py
index f40cf0ff75..44b5bb446b 100644
--- a/src/calibre/gui2/add.py
+++ b/src/calibre/gui2/add.py
@@ -78,7 +78,7 @@ class RecursiveFind(QThread): # {{{
if isinstance(root, unicode):
root = root.encode(filesystem_encoding)
self.walk(root)
- except Exception, err:
+ except Exception as err:
import traceback
traceback.print_exc()
try:
diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py
index a28759486e..609c2b30f3 100644
--- a/src/calibre/gui2/book_details.py
+++ b/src/calibre/gui2/book_details.py
@@ -270,6 +270,8 @@ class BookInfo(QWebView):
<style type="text/css">
body, td {background-color: transparent; font-size: %dpx; color: %s }
a { text-decoration: none; color: blue }
+ div.description { margin-top: 0; padding-top: 0; text-indent: 0 }
+ table { margin-bottom: 0; padding-bottom: 0; }
</style>
</head>
<body>
@@ -278,9 +280,10 @@ class BookInfo(QWebView):
<html>
'''%(f, c)
if self.vertical:
+ extra = ''
if comments:
- rows += u'<tr><td colspan="2">%s</td></tr>'%comments
- self.setHtml(templ%(u'<table>%s</table>'%rows))
+ extra = u'<div class="description">%s</div>'%comments
+ self.setHtml(templ%(u'<table>%s</table>%s'%(rows, extra)))
else:
left_pane = u'<table>%s</table>'%rows
right_pane = u'<div>%s</div>'%comments
diff --git a/src/calibre/gui2/catalog/catalog_bibtex.py b/src/calibre/gui2/catalog/catalog_bibtex.py
index ebfcc6e546..0fe641403b 100644
--- a/src/calibre/gui2/catalog/catalog_bibtex.py
+++ b/src/calibre/gui2/catalog/catalog_bibtex.py
@@ -46,6 +46,13 @@ class PluginWidget(QWidget, Ui_Form):
for x in xrange(self.db_fields.count()):
item = self.db_fields.item(x)
item.setSelected(unicode(item.text()) in fields)
+ self.bibfile_enc.clear()
+ self.bibfile_enc.addItems(['utf-8', 'cp1252', 'ascii/LaTeX'])
+ self.bibfile_enctag.clear()
+ self.bibfile_enctag.addItems(['strict', 'replace', 'ignore',
+ 'backslashreplace'])
+ self.bib_entry.clear()
+ self.bib_entry.addItems(['mixed', 'misc', 'book'])
# Update dialog fields from stored options
for opt in self.OPTION_FIELDS:
opt_value = gprefs.get(self.name + '_' + opt[0], opt[1])
diff --git a/src/calibre/gui2/catalog/catalog_bibtex.ui b/src/calibre/gui2/catalog/catalog_bibtex.ui
index 8712d40148..5b41e96267 100644
--- a/src/calibre/gui2/catalog/catalog_bibtex.ui
+++ b/src/calibre/gui2/catalog/catalog_bibtex.ui
@@ -29,23 +29,7 @@
</widget>
</item>
<item row="1" column="0">
- <widget class="QComboBox" name="bibfile_enc">
- <item>
- <property name="text">
- <string notr="true">utf-8</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string notr="true">cp1252</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>ascii/LaTeX</string>
- </property>
- </item>
- </widget>
+ <widget class="QComboBox" name="bibfile_enc"/>
</item>
<item row="1" column="1" rowspan="11">
<widget class="QListWidget" name="db_fields">
@@ -71,28 +55,7 @@
</widget>
</item>
<item row="3" column="0">
- <widget class="QComboBox" name="bibfile_enctag">
- <item>
- <property name="text">
- <string>strict</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>replace</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>ignore</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>backslashreplace</string>
- </property>
- </item>
- </widget>
+ <widget class="QComboBox" name="bibfile_enctag"/>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer">
@@ -115,23 +78,7 @@
</widget>
</item>
<item row="6" column="0">
- <widget class="QComboBox" name="bib_entry">
- <item>
- <property name="text">
- <string>mixed</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>misc</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>book</string>
- </property>
- </item>
- </widget>
+ <widget class="QComboBox" name="bib_entry"/>
</item>
<item row="7" column="0">
<widget class="QCheckBox" name="impcit">
diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py
index d5149569be..8af72e51c0 100644
--- a/src/calibre/gui2/catalog/catalog_epub_mobi.py
+++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py
@@ -193,7 +193,10 @@ class PluginWidget(QWidget,Ui_Form):
opts_dict['header_note_source_field'] = self.header_note_source_field_name
# Append the output profile
- opts_dict['output_profile'] = [load_defaults('page_setup')['output_profile']]
+ try:
+ opts_dict['output_profile'] = [load_defaults('page_setup')['output_profile']]
+ except:
+ opts_dict['output_profile'] = ['default']
if False:
print "opts_dict"
for opt in sorted(opts_dict.keys()):
diff --git a/src/calibre/gui2/convert/__init__.py b/src/calibre/gui2/convert/__init__.py
index 925fecd693..bdcf9ede05 100644
--- a/src/calibre/gui2/convert/__init__.py
+++ b/src/calibre/gui2/convert/__init__.py
@@ -6,7 +6,7 @@ __license__ = 'GPL v3'
__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
-import textwrap, codecs
+import textwrap, codecs, importlib
from functools import partial
from PyQt4.Qt import QWidget, QSpinBox, QDoubleSpinBox, QLineEdit, QTextEdit, \
@@ -22,8 +22,8 @@ from calibre.customize.ui import plugin_for_input_format
def config_widget_for_input_plugin(plugin):
name = plugin.name.lower().replace(' ', '_')
try:
- return __import__('calibre.gui2.convert.'+name,
- fromlist=[1]).PluginWidget
+ return importlib.import_module(
+ 'calibre.gui2.convert.'+name).PluginWidget
except ImportError:
pass
diff --git a/src/calibre/gui2/convert/bulk.py b/src/calibre/gui2/convert/bulk.py
index 349f39ac76..576b3ca3e7 100644
--- a/src/calibre/gui2/convert/bulk.py
+++ b/src/calibre/gui2/convert/bulk.py
@@ -4,7 +4,7 @@ __license__ = 'GPL 3'
__copyright__ = '2009, John Schember <john@nachtimwald.com>'
__docformat__ = 'restructuredtext en'
-import shutil
+import shutil, importlib
from PyQt4.Qt import QString, SIGNAL
@@ -82,8 +82,8 @@ class BulkConfig(Config):
output_widget = None
name = self.plumber.output_plugin.name.lower().replace(' ', '_')
try:
- output_widget = __import__('calibre.gui2.convert.'+name,
- fromlist=[1])
+ output_widget = importlib.import_module(
+ 'calibre.gui2.convert.'+name)
pw = output_widget.PluginWidget
pw.ICON = I('back.png')
pw.HELP = _('Options specific to the output format.')
diff --git a/src/calibre/gui2/convert/fb2_output.py b/src/calibre/gui2/convert/fb2_output.py
index 66296ee666..19d0995fc1 100644
--- a/src/calibre/gui2/convert/fb2_output.py
+++ b/src/calibre/gui2/convert/fb2_output.py
@@ -17,8 +17,10 @@ class PluginWidget(Widget, Ui_Form):
ICON = I('mimetypes/fb2.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
- Widget.__init__(self, parent, ['sectionize'])
+ Widget.__init__(self, parent, ['sectionize', 'fb2_genre'])
self.db, self.book_id = db, book_id
for x in ('toc', 'files', 'nothing'):
self.opt_sectionize.addItem(x)
+ for x in get_option('fb2_genre').option.choices:
+ self.opt_fb2_genre.addItem(x)
self.initialize_options(get_option, get_help, db, book_id)
diff --git a/src/calibre/gui2/convert/fb2_output.ui b/src/calibre/gui2/convert/fb2_output.ui
index 891aa29857..c8d4230a99 100644
--- a/src/calibre/gui2/convert/fb2_output.ui
+++ b/src/calibre/gui2/convert/fb2_output.ui
@@ -14,7 +14,7 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="1" column="0">
+ <item row="2" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -29,21 +29,31 @@
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
- <property name="text">
- <string>Sectionize:</string>
- </property>
- <property name="buddy">
- <cstring>opt_sectionize</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="opt_sectionize">
- <property name="minimumContentsLength">
- <number>20</number>
+ <property name="text">
+ <string>Sectionize:</string>
+ </property>
+ <property name="buddy">
+ <cstring>opt_sectionize</cstring>
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="opt_sectionize">
+ <property name="minimumContentsLength">
+ <number>20</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Genre</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="opt_fb2_genre"/>
+ </item>
</layout>
</widget>
<resources/>
diff --git a/src/calibre/gui2/convert/htmlz_output.py b/src/calibre/gui2/convert/htmlz_output.py
new file mode 100644
index 0000000000..6e9f5bd68c
--- /dev/null
+++ b/src/calibre/gui2/convert/htmlz_output.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+
+__license__ = 'GPL 3'
+__copyright__ = '2009, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+from calibre.gui2.convert.htmlz_output_ui import Ui_Form
+from calibre.gui2.convert import Widget
+
+format_model = None
+
+class PluginWidget(Widget, Ui_Form):
+
+ TITLE = _('HTMLZ Output')
+ HELP = _('Options specific to')+' HTMLZ '+_('output')
+ COMMIT_NAME = 'htmlz_output'
+ ICON = I('mimetypes/html.png')
+
+ def __init__(self, parent, get_option, get_help, db=None, book_id=None):
+ Widget.__init__(self, parent, ['htmlz_css_type', 'htmlz_class_style'])
+ self.db, self.book_id = db, book_id
+ for x in get_option('htmlz_css_type').option.choices:
+ self.opt_htmlz_css_type.addItem(x)
+ for x in get_option('htmlz_class_style').option.choices:
+ self.opt_htmlz_class_style.addItem(x)
+ self.initialize_options(get_option, get_help, db, book_id)
diff --git a/src/calibre/gui2/convert/htmlz_output.ui b/src/calibre/gui2/convert/htmlz_output.ui
new file mode 100644
index 0000000000..7593300653
--- /dev/null
+++ b/src/calibre/gui2/convert/htmlz_output.ui
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>438</width>
+ <height>300</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="2" column="0">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>246</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>How to handle CSS</string>
+ </property>
+ <property name="buddy">
+ <cstring>opt_htmlz_css_type</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="opt_htmlz_css_type">
+ <property name="minimumContentsLength">
+ <number>20</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>How to handle class based CSS</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="opt_htmlz_class_style"/>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/calibre/gui2/convert/metadata.py b/src/calibre/gui2/convert/metadata.py
index 95dd7623c9..80311502e8 100644
--- a/src/calibre/gui2/convert/metadata.py
+++ b/src/calibre/gui2/convert/metadata.py
@@ -192,7 +192,7 @@ class MetadataWidget(Widget, Ui_Form):
try:
cf = open(_file, "rb")
cover = cf.read()
- except IOError, e:
+ except IOError as e:
d = error_dialog(self.parent(), _('Error reading file'),
_("<p>There was an error reading from file: <br /><b>") + _file + "</b></p><br />"+str(e))
d.exec_()
diff --git a/src/calibre/gui2/convert/search_and_replace.py b/src/calibre/gui2/convert/search_and_replace.py
index c2241ff8eb..407e7922e7 100644
--- a/src/calibre/gui2/convert/search_and_replace.py
+++ b/src/calibre/gui2/convert/search_and_replace.py
@@ -69,7 +69,7 @@ class SearchAndReplaceWidget(Widget, Ui_Form):
try:
pat = unicode(x.regex)
re.compile(pat)
- except Exception, err:
+ except Exception as err:
error_dialog(self, _('Invalid regular expression'),
_('Invalid regular expression: %s')%err, show=True)
return False
diff --git a/src/calibre/gui2/convert/single.py b/src/calibre/gui2/convert/single.py
index 59fcbb65ad..3575fb5ffb 100644
--- a/src/calibre/gui2/convert/single.py
+++ b/src/calibre/gui2/convert/single.py
@@ -6,7 +6,7 @@ __license__ = 'GPL v3'
__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
-import sys, cPickle, shutil
+import sys, cPickle, shutil, importlib
from PyQt4.Qt import QString, SIGNAL, QAbstractListModel, Qt, QVariant, QFont
@@ -182,8 +182,8 @@ class Config(ResizableDialog, Ui_Dialog):
output_widget = None
name = self.plumber.output_plugin.name.lower().replace(' ', '_')
try:
- output_widget = __import__('calibre.gui2.convert.'+name,
- fromlist=[1])
+ output_widget = importlib.import_module(
+ 'calibre.gui2.convert.'+name)
pw = output_widget.PluginWidget
pw.ICON = I('back.png')
pw.HELP = _('Options specific to the output format.')
@@ -193,8 +193,8 @@ class Config(ResizableDialog, Ui_Dialog):
input_widget = None
name = self.plumber.input_plugin.name.lower().replace(' ', '_')
try:
- input_widget = __import__('calibre.gui2.convert.'+name,
- fromlist=[1])
+ input_widget = importlib.import_module(
+ 'calibre.gui2.convert.'+name)
pw = input_widget.PluginWidget
pw.ICON = I('forward.png')
pw.HELP = _('Options specific to the input format.')
diff --git a/src/calibre/gui2/convert/structure_detection.py b/src/calibre/gui2/convert/structure_detection.py
index d8e2f4f122..b58c473bd4 100644
--- a/src/calibre/gui2/convert/structure_detection.py
+++ b/src/calibre/gui2/convert/structure_detection.py
@@ -21,7 +21,7 @@ class StructureDetectionWidget(Widget, Ui_Form):
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent,
['chapter', 'chapter_mark',
- 'remove_first_image',
+ 'remove_first_image', 'remove_fake_margins',
'insert_metadata', 'page_breaks_before']
)
self.db, self.book_id = db, book_id
diff --git a/src/calibre/gui2/convert/structure_detection.ui b/src/calibre/gui2/convert/structure_detection.ui
index f80e6f8182..4ba90c1c2c 100644
--- a/src/calibre/gui2/convert/structure_detection.ui
+++ b/src/calibre/gui2/convert/structure_detection.ui
@@ -48,10 +48,10 @@
</property>
</widget>
</item>
- <item row="6" column="0" colspan="3">
+ <item row="7" column="0" colspan="3">
<widget class="XPathEdit" name="opt_page_breaks_before" native="true"/>
</item>
- <item row="7" column="0" colspan="3">
+ <item row="8" column="0" colspan="3">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -77,7 +77,7 @@
</property>
</spacer>
</item>
- <item row="4" column="0" colspan="3">
+ <item row="5" column="0" colspan="3">
<widget class="QLabel" name="label_2">
<property name="text">
<string>The header and footer removal options have been replaced by the Search & Replace options. Click the Search & Replace category in the bar to the left to use these options. Leave the replace field blank and enter your header/footer removal regexps into the search field.</string>
@@ -87,6 +87,13 @@
</property>
</widget>
</item>
+ <item row="2" column="2">
+ <widget class="QCheckBox" name="opt_remove_fake_margins">
+ <property name="text">
+ <string>Remove &fake margins</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<customwidgets>
diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py
index beaca77a38..81016d3c6a 100644
--- a/src/calibre/gui2/custom_column_widgets.py
+++ b/src/calibre/gui2/custom_column_widgets.py
@@ -62,7 +62,7 @@ class Bool(Base):
w = self.widgets[1]
items = [_('Yes'), _('No'), _('Undefined')]
icons = [I('ok.png'), I('list_remove.png'), I('blank.png')]
- if tweaks['bool_custom_columns_are_tristate'] == 'no':
+ if not self.db.prefs.get('bools_are_tristate'):
items = items[:-1]
icons = icons[:-1]
for icon, text in zip(icons, items):
@@ -70,7 +70,7 @@ class Bool(Base):
def setter(self, val):
val = {None: 2, False: 1, True: 0}[val]
- if tweaks['bool_custom_columns_are_tristate'] == 'no' and val == 2:
+ if not self.db.prefs.get('bools_are_tristate') and val == 2:
val = 1
self.widgets[1].setCurrentIndex(val)
@@ -226,10 +226,18 @@ class Comments(Base):
class Text(Base):
def setup_ui(self, parent):
+ if self.col_metadata['display'].get('is_names', False):
+ self.sep = u' & '
+ else:
+ self.sep = u', '
values = self.all_values = list(self.db.all_custom(num=self.col_id))
values.sort(key=sort_key)
if self.col_metadata['is_multiple']:
w = MultiCompleteLineEdit(parent)
+ w.set_separator(self.sep.strip())
+ if self.sep == u' & ':
+ w.set_space_before_sep(True)
+ w.set_add_separator(tweaks['authors_completer_append_separator'])
w.update_items_cache(values)
w.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
else:
@@ -261,12 +269,12 @@ class Text(Base):
if self.col_metadata['is_multiple']:
if not val:
val = []
- self.widgets[1].setText(u', '.join(val))
+ self.widgets[1].setText(self.sep.join(val))
def getter(self):
if self.col_metadata['is_multiple']:
val = unicode(self.widgets[1].text()).strip()
- ans = [x.strip() for x in val.split(',') if x.strip()]
+ ans = [x.strip() for x in val.split(self.sep.strip()) if x.strip()]
if not ans:
ans = None
return ans
@@ -541,7 +549,7 @@ class BulkBool(BulkBase, Bool):
value = None
for book_id in book_ids:
val = self.db.get_custom(book_id, num=self.col_id, index_is_id=True)
- if tweaks['bool_custom_columns_are_tristate'] == 'no' and val is None:
+ if not self.db.prefs.get('bools_are_tristate') and val is None:
val = False
if value is not None and value != val:
return None
@@ -551,7 +559,7 @@ class BulkBool(BulkBase, Bool):
def setup_ui(self, parent):
self.make_widgets(parent, QComboBox)
items = [_('Yes'), _('No')]
- if tweaks['bool_custom_columns_are_tristate'] == 'no':
+ if not self.db.prefs.get('bools_are_tristate'):
items.append('')
else:
items.append(_('Undefined'))
@@ -563,7 +571,7 @@ class BulkBool(BulkBase, Bool):
def getter(self):
val = self.main_widget.currentIndex()
- if tweaks['bool_custom_columns_are_tristate'] == 'no':
+ if not self.db.prefs.get('bools_are_tristate'):
return {2: False, 1: False, 0: True}[val]
else:
return {2: None, 1: False, 0: True}[val]
@@ -578,13 +586,13 @@ class BulkBool(BulkBase, Bool):
return
val = self.gui_val
val = self.normalize_ui_val(val)
- if tweaks['bool_custom_columns_are_tristate'] == 'no' and val is None:
+ if not self.db.prefs.get('bools_are_tristate') and val is None:
val = False
self.db.set_custom_bulk(book_ids, val, num=self.col_id, notify=notify)
def a_c_checkbox_changed(self):
if not self.ignore_change_signals:
- if tweaks['bool_custom_columns_are_tristate'] == 'no' and \
+ if not self.db.prefs.get('bools_are_tristate') and \
self.main_widget.currentIndex() == 2:
self.a_c_checkbox.setChecked(False)
else:
@@ -847,13 +855,20 @@ class BulkText(BulkBase):
self.main_widget.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
self.adding_widget = self.main_widget
- w = RemoveTags(parent, values)
- self.widgets.append(QLabel('&'+self.col_metadata['name']+': ' +
- _('tags to remove'), parent))
- self.widgets.append(w)
- self.removing_widget = w
- w.tags_box.textChanged.connect(self.a_c_checkbox_changed)
- w.checkbox.stateChanged.connect(self.a_c_checkbox_changed)
+ if not self.col_metadata['display'].get('is_names', False):
+ w = RemoveTags(parent, values)
+ self.widgets.append(QLabel('&'+self.col_metadata['name']+': ' +
+ _('tags to remove'), parent))
+ self.widgets.append(w)
+ self.removing_widget = w
+ self.main_widget.set_separator(',')
+ w.tags_box.textChanged.connect(self.a_c_checkbox_changed)
+ w.checkbox.stateChanged.connect(self.a_c_checkbox_changed)
+ else:
+ self.main_widget.set_separator('&')
+ self.main_widget.set_space_before_sep(True)
+ self.main_widget.set_add_separator(
+ tweaks['authors_completer_append_separator'])
else:
self.make_widgets(parent, MultiCompleteComboBox)
self.main_widget.set_separator(None)
@@ -882,21 +897,26 @@ class BulkText(BulkBase):
if not self.a_c_checkbox.isChecked():
return
if self.col_metadata['is_multiple']:
- remove_all, adding, rtext = self.gui_val
- remove = set()
- if remove_all:
- remove = set(self.db.all_custom(num=self.col_id))
+ if self.col_metadata['display'].get('is_names', False):
+ val = self.gui_val
+ add = [v.strip() for v in val.split('&') if v.strip()]
+ self.db.set_custom_bulk(book_ids, add, num=self.col_id)
else:
- txt = rtext
+ remove_all, adding, rtext = self.gui_val
+ remove = set()
+ if remove_all:
+ remove = set(self.db.all_custom(num=self.col_id))
+ else:
+ txt = rtext
+ if txt:
+ remove = set([v.strip() for v in txt.split(',')])
+ txt = adding
if txt:
- remove = set([v.strip() for v in txt.split(',')])
- txt = adding
- if txt:
- add = set([v.strip() for v in txt.split(',')])
- else:
- add = set()
- self.db.set_custom_bulk_multiple(book_ids, add=add, remove=remove,
- num=self.col_id)
+ add = set([v.strip() for v in txt.split(',')])
+ else:
+ add = set()
+ self.db.set_custom_bulk_multiple(book_ids, add=add,
+ remove=remove, num=self.col_id)
else:
val = self.gui_val
val = self.normalize_ui_val(val)
@@ -905,10 +925,11 @@ class BulkText(BulkBase):
def getter(self):
if self.col_metadata['is_multiple']:
- return self.removing_widget.checkbox.isChecked(), \
- unicode(self.adding_widget.text()), \
- unicode(self.removing_widget.tags_box.text())
-
+ if not self.col_metadata['display'].get('is_names', False):
+ return self.removing_widget.checkbox.isChecked(), \
+ unicode(self.adding_widget.text()), \
+ unicode(self.removing_widget.tags_box.text())
+ return unicode(self.adding_widget.text())
val = unicode(self.main_widget.currentText()).strip()
if not val:
val = None
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 215e67c46f..4d4f66eab1 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -64,7 +64,7 @@ class DeviceJob(BaseJob): # {{{
self.result = self.func(*self.args, **self.kwargs)
if self._aborted:
return
- except (Exception, SystemExit), err:
+ except (Exception, SystemExit) as err:
if self._aborted:
return
self.failed = True
@@ -162,9 +162,9 @@ class DeviceManager(Thread): # {{{
dev.reset(detected_device=detected_device,
report_progress=self.report_progress)
dev.open(self.current_library_uuid)
- except OpenFeedback, e:
+ except OpenFeedback as e:
if dev not in self.ejected_devices:
- self.open_feedback_msg(dev.get_gui_name(), e.feedback_msg)
+ self.open_feedback_msg(dev.get_gui_name(), e)
self.ejected_devices.add(dev)
continue
except:
@@ -618,8 +618,11 @@ class DeviceMixin(object): # {{{
if tweaks['auto_connect_to_folder']:
self.connect_to_folder_named(tweaks['auto_connect_to_folder'])
- def show_open_feedback(self, devname, msg):
- self.__of_dev_mem__ = d = info_dialog(self, devname, msg)
+ def show_open_feedback(self, devname, e):
+ try:
+ self.__of_dev_mem__ = d = e.custom_dialog(self)
+ except NotImplementedError:
+ self.__of_dev_mem__ = d = info_dialog(self, devname, e.feedback_msg)
d.show()
def auto_convert_question(self, msg, autos):
@@ -884,9 +887,14 @@ class DeviceMixin(object): # {{{
on_card = dest
self.sync_to_device(on_card, delete, fmt)
elif dest == 'mail':
- to, fmts = sub_dest.split(';')
+ sub_dest_parts = sub_dest.split(';')
+ while len(sub_dest_parts) < 3:
+ sub_dest_parts.append('')
+ to = sub_dest_parts[0]
+ fmts = sub_dest_parts[1]
+ subject = ';'.join(sub_dest_parts[2:])
fmts = [x.strip().lower() for x in fmts.split(',')]
- self.send_by_mail(to, fmts, delete)
+ self.send_by_mail(to, fmts, delete, subject=subject)
def cover_to_thumbnail(self, data):
if self.device_manager.device and \
diff --git a/src/calibre/gui2/device_drivers/configwidget.py b/src/calibre/gui2/device_drivers/configwidget.py
index 97c492b550..fc7e16e639 100644
--- a/src/calibre/gui2/device_drivers/configwidget.py
+++ b/src/calibre/gui2/device_drivers/configwidget.py
@@ -133,7 +133,7 @@ class ConfigWidget(QWidget, Ui_ConfigWidget):
try:
validation_formatter.validate(tmpl)
return True
- except Exception, err:
+ except Exception as err:
error_dialog(self, _('Invalid template'),
'<p>'+_('The template %s is invalid:')%tmpl + \
'<br>'+unicode(err), show=True)
diff --git a/src/calibre/gui2/dialogs/book_info.ui b/src/calibre/gui2/dialogs/book_info.ui
index 412126a610..9e9e71eda0 100644
--- a/src/calibre/gui2/dialogs/book_info.ui
+++ b/src/calibre/gui2/dialogs/book_info.ui
@@ -7,15 +7,25 @@
<x>0</x>
<y>0</y>
<width>917</width>
- <height>480</height>
+ <height>492</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
+ <property name="windowIcon">
+ <iconset resource="../../../../resources/images.qrc">
+ <normaloff>:/images/metadata.png</normaloff>:/images/metadata.png</iconset>
+ </property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="title">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
<property name="text">
<string>TextLabel</string>
</property>
@@ -24,86 +34,104 @@
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="1" column="0" rowspan="3">
<widget class="CoverView" name="cover"/>
</item>
<item row="1" column="1">
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QLabel" name="text">
- <property name="text">
- <string>TextLabel</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Comments</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QWebView" name="comments">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>350</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="url">
- <url>
- <string>about:blank</string>
- </url>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="fit_cover">
- <property name="text">
- <string>Fit &cover within view</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>435</width>
+ <height>670</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QPushButton" name="previous_button">
+ <widget class="QLabel" name="text">
<property name="text">
- <string>&Previous</string>
+ <string>TextLabel</string>
</property>
- <property name="icon">
- <iconset resource="../../../../resources/images.qrc">
- <normaloff>:/images/previous.png</normaloff>:/images/previous.png</iconset>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="next_button">
- <property name="text">
- <string>&Next</string>
- </property>
- <property name="icon">
- <iconset resource="../../../../resources/images.qrc">
- <normaloff>:/images/next.png</normaloff>:/images/next.png</iconset>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Comments</string>
</property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QWebView" name="comments">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>350</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="url">
+ <url>
+ <string>about:blank</string>
+ </url>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
</layout>
+ </widget>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="fit_cover">
+ <property name="text">
+ <string>Fit &cover within view</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="previous_button">
+ <property name="text">
+ <string>&Previous</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../../resources/images.qrc">
+ <normaloff>:/images/previous.png</normaloff>:/images/previous.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="next_button">
+ <property name="text">
+ <string>&Next</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../../resources/images.qrc">
+ <normaloff>:/images/next.png</normaloff>:/images/next.png</iconset>
+ </property>
+ </widget>
</item>
</layout>
</item>
diff --git a/src/calibre/gui2/dialogs/catalog.py b/src/calibre/gui2/dialogs/catalog.py
index ebca7235eb..a8f7ed160f 100644
--- a/src/calibre/gui2/dialogs/catalog.py
+++ b/src/calibre/gui2/dialogs/catalog.py
@@ -6,7 +6,7 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
-import os, sys
+import os, sys, importlib
from calibre.customize.ui import config
from calibre.gui2.dialogs.catalog_ui import Ui_Dialog
@@ -43,8 +43,7 @@ class Catalog(ResizableDialog, Ui_Dialog):
name = plugin.name.lower().replace(' ', '_')
if type(plugin) in builtin_plugins:
try:
- catalog_widget = __import__('calibre.gui2.catalog.'+name,
- fromlist=[1])
+ catalog_widget = importlib.import_module('calibre.gui2.catalog.'+name)
pw = catalog_widget.PluginWidget()
pw.initialize(name, db)
pw.ICON = I('forward.png')
@@ -75,7 +74,7 @@ class Catalog(ResizableDialog, Ui_Dialog):
# Import the dynamic PluginWidget() from .py file provided in plugin.zip
try:
sys.path.insert(0, plugin.resources_path)
- catalog_widget = __import__(name, fromlist=[1])
+ catalog_widget = importlib.import_module(name)
pw = catalog_widget.PluginWidget()
pw.initialize(name)
pw.ICON = I('forward.png')
diff --git a/src/calibre/gui2/dialogs/check_library.py b/src/calibre/gui2/dialogs/check_library.py
index 560090d2b3..95f99d4034 100644
--- a/src/calibre/gui2/dialogs/check_library.py
+++ b/src/calibre/gui2/dialogs/check_library.py
@@ -68,7 +68,7 @@ class DBCheck(QDialog): # {{{
self.start_load()
return
QTimer.singleShot(0, self.do_one_dump)
- except Exception, e:
+ except Exception as e:
import traceback
self.error = (as_unicode(e), traceback.format_exc())
self.reject()
@@ -90,7 +90,7 @@ class DBCheck(QDialog): # {{{
self.conn.commit()
QTimer.singleShot(0, self.do_one_load)
- except Exception, e:
+ except Exception as e:
import traceback
self.error = (as_unicode(e), traceback.format_exc())
self.reject()
@@ -111,7 +111,7 @@ class DBCheck(QDialog): # {{{
self.pb.setValue(self.pb.value() + 1)
self.count -= 1
QTimer.singleShot(0, self.do_one_load)
- except Exception, e:
+ except Exception as e:
import traceback
self.error = (as_unicode(e), traceback.format_exc())
self.reject()
diff --git a/src/calibre/gui2/dialogs/confirm_delete.py b/src/calibre/gui2/dialogs/confirm_delete.py
index 9cdd46712f..16d7bdde2f 100644
--- a/src/calibre/gui2/dialogs/confirm_delete.py
+++ b/src/calibre/gui2/dialogs/confirm_delete.py
@@ -3,12 +3,11 @@ __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
__docformat__ = 'restructuredtext en'
-from calibre.gui2 import dynamic
-from calibre.gui2.dialogs.confirm_delete_ui import Ui_Dialog
from PyQt4.Qt import QDialog, Qt, QPixmap, QIcon
-def _config_name(name):
- return name + '_again'
+from calibre import confirm_config_name
+from calibre.gui2 import dynamic
+from calibre.gui2.dialogs.confirm_delete_ui import Ui_Dialog
class Dialog(QDialog, Ui_Dialog):
@@ -22,11 +21,11 @@ class Dialog(QDialog, Ui_Dialog):
self.buttonBox.setFocus(Qt.OtherFocusReason)
def toggle(self, *args):
- dynamic[_config_name(self.name)] = self.again.isChecked()
+ dynamic[confirm_config_name(self.name)] = self.again.isChecked()
def confirm(msg, name, parent=None, pixmap='dialog_warning.png'):
- if not dynamic.get(_config_name(name), True):
+ if not dynamic.get(confirm_config_name(name), True):
return True
d = Dialog(msg, name, parent)
d.label.setPixmap(QPixmap(I(pixmap)))
diff --git a/src/calibre/gui2/dialogs/job_view.ui b/src/calibre/gui2/dialogs/job_view.ui
index 8b54c23573..1e854c0f29 100644
--- a/src/calibre/gui2/dialogs/job_view.ui
+++ b/src/calibre/gui2/dialogs/job_view.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>Dialog</class>
- <widget class="QDialog" name="Dialog" >
- <property name="geometry" >
+ <widget class="QDialog" name="Dialog">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,38 +10,41 @@
<height>462</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Details of job</string>
</property>
- <property name="windowIcon" >
- <iconset resource="../../../../resources/images.qrc" >
+ <property name="windowIcon">
+ <iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/view.png</normaloff>:/images/view.png</iconset>
</property>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" >
- <widget class="QPlainTextEdit" name="log" >
- <property name="undoRedoEnabled" >
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QPlainTextEdit" name="log">
+ <property name="undoRedoEnabled">
<bool>false</bool>
</property>
- <property name="lineWrapMode" >
+ <property name="lineWrapMode">
<enum>QPlainTextEdit::NoWrap</enum>
</property>
- <property name="readOnly" >
+ <property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="standardButtons" >
+ <item row="2" column="0">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
+ <item row="1" column="0">
+ <widget class="QTextBrowser" name="tb"/>
+ </item>
</layout>
</widget>
<resources>
- <include location="../../../../resources/images.qrc" />
+ <include location="../../../../resources/images.qrc"/>
</resources>
<connections>
<connection>
@@ -49,11 +53,11 @@
<receiver>Dialog</receiver>
<slot>accept()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>617</x>
<y>442</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>206</x>
<y>-5</y>
</hint>
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 9b25545252..0683f2cb91 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -120,7 +120,7 @@ class MyBlockingBusy(QDialog): # {{{
self.msg.setText(self.msg_text.format(self.phases[self.current_phase],
percent))
self.do_one(id)
- except Exception, err:
+ except Exception as err:
import traceback
try:
err = unicode(err)
@@ -653,7 +653,10 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
if self.destination_field_fm['is_multiple']:
if self.comma_separated.isChecked():
- if dest == 'authors':
+ if dest == 'authors' or \
+ (self.destination_field_fm['is_custom'] and
+ self.destination_field_fm['datatype'] == 'text' and
+ self.destination_field_fm['display'].get('is_names', False)):
splitter = ' & '
else:
splitter = ','
diff --git a/src/calibre/gui2/dialogs/metadata_single.py b/src/calibre/gui2/dialogs/metadata_single.py
index 9efe7f7160..f6b7b94453 100644
--- a/src/calibre/gui2/dialogs/metadata_single.py
+++ b/src/calibre/gui2/dialogs/metadata_single.py
@@ -76,7 +76,7 @@ class CoverFetcher(Thread): # {{{
self.cover_data, self.errors = download_cover(mi,
timeout=self.timeout)
- except Exception, e:
+ except Exception as e:
self.exception = e
self.traceback = traceback.format_exc()
print self.traceback
@@ -183,7 +183,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
try:
cf = open(_file, "rb")
cover = cf.read()
- except IOError, e:
+ except IOError as e:
d = error_dialog(self, _('Error reading file'),
_("<p>There was an error reading from file: <br /><b>") + _file + "</b></p><br />"+str(e))
d.exec_()
diff --git a/src/calibre/gui2/dialogs/scheduler.py b/src/calibre/gui2/dialogs/scheduler.py
index 347eeb7019..9b1fe67f29 100644
--- a/src/calibre/gui2/dialogs/scheduler.py
+++ b/src/calibre/gui2/dialogs/scheduler.py
@@ -9,6 +9,7 @@ Scheduler for automated recipe downloads
from datetime import timedelta
import calendar, textwrap
+from collections import OrderedDict
from PyQt4.Qt import QDialog, Qt, QTime, QObject, QMenu, QHBoxLayout, \
QAction, QIcon, QMutex, QTimer, pyqtSignal, QWidget, QGridLayout, \
@@ -20,7 +21,6 @@ from calibre.web.feeds.recipes.model import RecipeModel
from calibre.ptempfile import PersistentTemporaryFile
from calibre.utils.date import utcnow
from calibre.utils.network import internet_connected
-from calibre.utils.ordered_dict import OrderedDict
from calibre import force_unicode
def convert_day_time_schedule(val):
diff --git a/src/calibre/gui2/dialogs/tag_editor.py b/src/calibre/gui2/dialogs/tag_editor.py
index 6bd8eb7dbe..bf3bb9fd4e 100644
--- a/src/calibre/gui2/dialogs/tag_editor.py
+++ b/src/calibre/gui2/dialogs/tag_editor.py
@@ -122,6 +122,8 @@ class TagEditor(QDialog, Ui_TagEditor):
tags = unicode(self.add_tag_input.text()).split(',')
for tag in tags:
tag = tag.strip()
+ if not tag:
+ continue
for item in self.available_tags.findItems(tag, Qt.MatchFixedString):
self.available_tags.takeItem(self.available_tags.row(item))
if tag not in self.tags:
diff --git a/src/calibre/gui2/dialogs/user_profiles.py b/src/calibre/gui2/dialogs/user_profiles.py
index 5453a90766..d66d02d211 100644
--- a/src/calibre/gui2/dialogs/user_profiles.py
+++ b/src/calibre/gui2/dialogs/user_profiles.py
@@ -237,7 +237,7 @@ class %(classname)s(%(base_class)s):
try:
compile_recipe(src)
- except Exception, err:
+ except Exception as err:
error_dialog(self, _('Invalid input'),
_('<p>Could not create recipe. Error:<br>%s')%str(err)).exec_()
return
@@ -246,7 +246,7 @@ class %(classname)s(%(base_class)s):
src = unicode(self.source_code.toPlainText())
try:
title = compile_recipe(src).title
- except Exception, err:
+ except Exception as err:
error_dialog(self, _('Invalid input'),
_('<p>Could not create recipe. Error:<br>%s')%str(err)).exec_()
return
@@ -333,7 +333,7 @@ class %(classname)s(%(base_class)s):
try:
profile = open(file, 'rb').read().decode('utf-8')
title = compile_recipe(profile).title
- except Exception, err:
+ except Exception as err:
error_dialog(self, _('Invalid input'),
_('<p>Could not create recipe. Error:<br>%s')%str(err)).exec_()
return
diff --git a/src/calibre/gui2/dnd.py b/src/calibre/gui2/dnd.py
index 928de72578..b602e4112a 100644
--- a/src/calibre/gui2/dnd.py
+++ b/src/calibre/gui2/dnd.py
@@ -35,7 +35,7 @@ class Worker(Thread): # {{{
try:
br = browser()
br.retrieve(self.url, self.fpath, self.callback)
- except Exception, e:
+ except Exception as e:
self.err = as_unicode(e)
import traceback
self.tb = traceback.format_exc()
@@ -143,21 +143,27 @@ def dnd_has_extension(md, extensions):
urls = [unicode(u.toString()) for u in
md.urls()]
purls = [urlparse(u) for u in urls]
+ paths = [u2p(x) for x in purls]
if DEBUG:
prints('URLS:', urls)
- prints('Paths:', [u2p(x) for x in purls])
+ prints('Paths:', paths)
- exts = frozenset([posixpath.splitext(u.path)[1][1:].lower() for u in
- purls])
+ exts = frozenset([posixpath.splitext(u)[1][1:].lower() for u in
+ paths])
return bool(exts.intersection(frozenset(extensions)))
return False
+def _u2p(raw):
+ path = raw
+ if iswindows and path.startswith('/'):
+ path = path[1:]
+ return path.replace('/', os.sep)
+
def u2p(url):
path = url.path
- if iswindows:
- if path.startswith('/'):
- path = path[1:]
- ans = path.replace('/', os.sep)
+ ans = _u2p(path)
+ if not os.path.exists(ans):
+ ans = _u2p(url.path + '#' + url.fragment)
if os.path.exists(ans):
return ans
# Try unquoting the URL
@@ -189,8 +195,9 @@ def dnd_get_image(md, image_exts=IMAGE_EXTENSIONS):
md.urls()]
purls = [urlparse(u) for u in urls]
# First look for a local file
- images = [u2p(x) for x in purls if x.scheme in ('', 'file') and
- posixpath.splitext(urllib.unquote(x.path))[1][1:].lower() in
+ images = [u2p(x) for x in purls if x.scheme in ('', 'file')]
+ images = [x for x in images if
+ posixpath.splitext(urllib.unquote(x))[1][1:].lower() in
image_exts]
images = [x for x in images if os.path.exists(x)]
p = QPixmap()
@@ -235,8 +242,9 @@ def dnd_get_files(md, exts):
md.urls()]
purls = [urlparse(u) for u in urls]
# First look for a local file
- local_files = [u2p(x) for x in purls if x.scheme in ('', 'file') and
- posixpath.splitext(urllib.unquote(x.path))[1][1:].lower() in
+ local_files = [u2p(x) for x in purls if x.scheme in ('', 'file')]
+ local_files = [ p for p in local_files if
+ posixpath.splitext(urllib.unquote(p))[1][1:].lower() in
exts]
local_files = [x for x in local_files if os.path.exists(x)]
if local_files:
diff --git a/src/calibre/gui2/email.py b/src/calibre/gui2/email.py
index c84b3180f7..c8adeb7d31 100644
--- a/src/calibre/gui2/email.py
+++ b/src/calibre/gui2/email.py
@@ -6,9 +6,7 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
-import os, socket, time, cStringIO
-from threading import Thread
-from Queue import Queue
+import os, socket, time
from binascii import unhexlify
from functools import partial
from itertools import repeat
@@ -16,66 +14,20 @@ from itertools import repeat
from calibre.utils.smtp import compose_mail, sendmail, extract_email_address, \
config as email_config
from calibre.utils.filenames import ascii_filename
-from calibre.utils.ipc.job import BaseJob
-from calibre.ptempfile import PersistentTemporaryFile
from calibre.customize.ui import available_input_formats, available_output_formats
from calibre.ebooks.metadata import authors_to_string
from calibre.constants import preferred_encoding
from calibre.gui2 import config, Dispatcher, warning_dialog
+from calibre.library.save_to_disk import get_components
from calibre.utils.config import tweaks
+from calibre.gui2.threaded_jobs import ThreadedJob
-class EmailJob(BaseJob): # {{{
-
- def __init__(self, callback, description, attachment, aname, to, subject, text, job_manager):
- BaseJob.__init__(self, description)
- self.exception = None
- self.job_manager = job_manager
- self.email_args = (attachment, aname, to, subject, text)
- self.email_sent_callback = callback
- self.log_path = None
- self._log_file = cStringIO.StringIO()
- self._log_file.write(self.description.encode('utf-8') + '\n')
-
- @property
- def log_file(self):
- if self.log_path is not None:
- return open(self.log_path, 'rb')
- return cStringIO.StringIO(self._log_file.getvalue())
-
- def start_work(self):
- self.start_time = time.time()
- self.job_manager.changed_queue.put(self)
-
- def job_done(self):
- self.duration = time.time() - self.start_time
- self.percent = 1
- # Dump log onto disk
- lf = PersistentTemporaryFile('email_log')
- lf.write(self._log_file.getvalue())
- lf.close()
- self.log_path = lf.name
- self._log_file.close()
- self._log_file = None
-
- self.job_manager.changed_queue.put(self)
-
- def log_write(self, what):
- self._log_file.write(what)
-
-# }}}
-
-class Emailer(Thread): # {{{
+class Sendmail(object):
MAX_RETRIES = 1
- def __init__(self, job_manager):
- Thread.__init__(self)
- self.daemon = True
- self.jobs = Queue()
- self.job_manager = job_manager
- self._run = True
+ def __init__(self):
self.calculate_rate_limit()
-
self.last_send_time = time.time() - self.rate_limit
def calculate_rate_limit(self):
@@ -86,70 +38,28 @@ class Emailer(Thread): # {{{
'gmail.com' in rh or 'live.com' in rh):
self.rate_limit = tweaks['public_smtp_relay_delay']
- def stop(self):
- self._run = False
- self.jobs.put(None)
+ def __call__(self, attachment, aname, to, subject, text, log=None,
+ abort=None, notifications=None):
- def run(self):
- while self._run:
+ try_count = 0
+ while try_count <= self.MAX_RETRIES:
+ if try_count > 0:
+ log('\nRetrying in %d seconds...\n' %
+ self.rate_limit)
try:
- job = self.jobs.get()
+ self.sendmail(attachment, aname, to, subject, text, log)
+ try_count = self.MAX_RETRIES
+ log('Email successfully sent')
except:
- break
- if job is None or not self._run:
- break
- try_count = 0
- failed, exc = False, None
- job.start_work()
- if job.kill_on_start:
- job.log_write('Aborted\n')
- job.failed = failed
- job.killed = True
- job.job_done()
- continue
+ if abort.is_set():
+ return
+ if try_count == self.MAX_RETRIES:
+ raise
+ log.exception('\nSending failed...\n')
- while try_count <= self.MAX_RETRIES:
- failed = False
- if try_count > 0:
- job.log_write('\nRetrying in %d seconds...\n' %
- self.rate_limit)
- try:
- self.sendmail(job)
- break
- except Exception, e:
- if not self._run:
- return
- import traceback
- failed = True
- exc = e
- job.log_write('\nSending failed...\n')
- job.log_write(traceback.format_exc())
+ try_count += 1
- try_count += 1
-
- if not self._run:
- break
-
- job.failed = failed
- job.exception = exc
- job.job_done()
- try:
- job.email_sent_callback(job)
- except:
- import traceback
- traceback.print_exc()
-
- def send_mails(self, jobnames, callback, attachments, to_s, subjects,
- texts, attachment_names):
- for name, attachment, to, subject, text, aname in zip(jobnames,
- attachments, to_s, subjects, texts, attachment_names):
- description = _('Email %s to %s') % (name, to)
- job = EmailJob(callback, description, attachment, aname, to,
- subject, text, self.job_manager)
- self.job_manager.add_job(job)
- self.jobs.put(job)
-
- def sendmail(self, job):
+ def sendmail(self, attachment, aname, to, subject, text, log):
while time.time() - self.last_send_time <= self.rate_limit:
time.sleep(1)
try:
@@ -157,7 +67,6 @@ class Emailer(Thread): # {{{
from_ = opts.from_
if not from_:
from_ = 'calibre <calibre@'+socket.getfqdn()+'>'
- attachment, aname, to, subject, text = job.email_args
msg = compose_mail(from_, to, text, subject, open(attachment, 'rb'),
aname)
efrom, eto = map(extract_email_address, (from_, to))
@@ -168,49 +77,57 @@ class Emailer(Thread): # {{{
username=opts.relay_username,
password=unhexlify(opts.relay_password), port=opts.relay_port,
encryption=opts.encryption,
- debug_output=partial(print, file=job._log_file))
+ debug_output=log.debug)
finally:
self.last_send_time = time.time()
- def email_news(self, mi, remove, get_fmts, done):
- opts = email_config().parse()
- accounts = [(account, [x.strip().lower() for x in x[0].split(',')])
- for account, x in opts.accounts.items() if x[1]]
- sent_mails = []
- for i, x in enumerate(accounts):
- account, fmts = x
- files = get_fmts(fmts)
- files = [f for f in files if f is not None]
- if not files:
- continue
- attachment = files[0]
- to_s = [account]
- subjects = [_('News:')+' '+mi.title]
- texts = [
- _('Attached is the %s periodical downloaded by calibre.')
- % (mi.title,)
- ]
- attachment_names = [ascii_filename(mi.title)+os.path.splitext(attachment)[1]]
- attachments = [attachment]
- jobnames = [mi.title]
- do_remove = []
- if i == len(accounts) - 1:
- do_remove = remove
- self.send_mails(jobnames,
- Dispatcher(partial(done, remove=do_remove)),
- attachments, to_s, subjects, texts, attachment_names)
- sent_mails.append(to_s[0])
- return sent_mails
+gui_sendmail = Sendmail()
-# }}}
+def send_mails(jobnames, callback, attachments, to_s, subjects,
+ texts, attachment_names, job_manager):
+ for name, attachment, to, subject, text, aname in zip(jobnames,
+ attachments, to_s, subjects, texts, attachment_names):
+ description = _('Email %s to %s') % (name, to)
+ job = ThreadedJob('email', description, gui_sendmail, (attachment, aname, to,
+ subject, text), {}, callback, killable=False)
+ job_manager.run_threaded_job(job)
+
+
+def email_news(mi, remove, get_fmts, done, job_manager):
+ opts = email_config().parse()
+ accounts = [(account, [x.strip().lower() for x in x[0].split(',')])
+ for account, x in opts.accounts.items() if x[1]]
+ sent_mails = []
+ for i, x in enumerate(accounts):
+ account, fmts = x
+ files = get_fmts(fmts)
+ files = [f for f in files if f is not None]
+ if not files:
+ continue
+ attachment = files[0]
+ to_s = [account]
+ subjects = [_('News:')+' '+mi.title]
+ texts = [
+ _('Attached is the %s periodical downloaded by calibre.')
+ % (mi.title,)
+ ]
+ attachment_names = [ascii_filename(mi.title)+os.path.splitext(attachment)[1]]
+ attachments = [attachment]
+ jobnames = [mi.title]
+ do_remove = []
+ if i == len(accounts) - 1:
+ do_remove = remove
+ send_mails(jobnames,
+ Dispatcher(partial(done, remove=do_remove)),
+ attachments, to_s, subjects, texts, attachment_names,
+ job_manager)
+ sent_mails.append(to_s[0])
+ return sent_mails
class EmailMixin(object): # {{{
- def __init__(self):
- self.emailer = Emailer(self.job_manager)
-
- def send_by_mail(self, to, fmts, delete_from_library, send_ids=None,
+ def send_by_mail(self, to, fmts, delete_from_library, subject='', send_ids=None,
do_auto_convert=True, specific_format=None):
ids = [self.library_view.model().id(r) for r in self.library_view.selectionModel().selectedRows()] if send_ids is None else send_ids
if not ids or len(ids) == 0:
@@ -239,7 +156,13 @@ class EmailMixin(object): # {{{
remove_ids.append(id)
jobnames.append(t)
attachments.append(f)
- subjects.append(_('E-book:')+ ' '+t)
+ if not subject:
+ subjects.append(_('E-book:')+ ' '+t)
+ else:
+ components = get_components(subject, mi, id)
+ if not components:
+ components = [mi.title]
+ subjects.append(os.path.join(*components))
a = authors_to_string(mi.authors if mi.authors else \
[_('Unknown')])
texts.append(_('Attached, you will find the e-book') + \
@@ -254,11 +177,10 @@ class EmailMixin(object): # {{{
to_s = list(repeat(to, len(attachments)))
if attachments:
- if not self.emailer.is_alive():
- self.emailer.start()
- self.emailer.send_mails(jobnames,
+ send_mails(jobnames,
Dispatcher(partial(self.email_sent, remove=remove)),
- attachments, to_s, subjects, texts, attachment_names)
+ attachments, to_s, subjects, texts, attachment_names,
+ self.job_manager)
self.status_bar.show_message(_('Sending email to')+' '+to, 3000)
auto = []
@@ -292,7 +214,7 @@ class EmailMixin(object): # {{{
if self.auto_convert_question(
_('Auto convert the following books before sending via '
'email?'), autos):
- self.iactions['Convert Books'].auto_convert_mail(to, fmts, delete_from_library, auto, format)
+ self.iactions['Convert Books'].auto_convert_mail(to, fmts, delete_from_library, auto, format, subject)
if bad:
bad = '\n'.join('%s'%(i,) for i in bad)
@@ -326,10 +248,8 @@ class EmailMixin(object): # {{{
files, auto = self.library_view.model().\
get_preferred_formats_from_ids([id_], fmts)
return files
- if not self.emailer.is_alive():
- self.emailer.start()
- sent_mails = self.emailer.email_news(mi, remove,
- get_fmts, self.email_sent)
+ sent_mails = email_news(mi, remove,
+ get_fmts, self.email_sent, self.job_manager)
if sent_mails:
self.status_bar.show_message(_('Sent news to')+' '+\
', '.join(sent_mails), 3000)
diff --git a/src/calibre/gui2/filename_pattern.ui b/src/calibre/gui2/filename_pattern.ui
index 68b3108e06..c8a9b4f6f6 100644
--- a/src/calibre/gui2/filename_pattern.ui
+++ b/src/calibre/gui2/filename_pattern.ui
@@ -206,6 +206,46 @@
</property>
</widget>
</item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Publisher:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QLineEdit" name="publisher">
+ <property name="toolTip">
+ <string>Regular expression (?P<publisher>)</string>
+ </property>
+ <property name="text">
+ <string>No match</string>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="label_9">
+ <property name="text">
+ <string>Published:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QLineEdit" name="pubdate">
+ <property name="toolTip">
+ <string>Regular expression (?P<published>)</string>
+ </property>
+ <property name="text">
+ <string>No match</string>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</widget>
diff --git a/src/calibre/gui2/jobs.py b/src/calibre/gui2/jobs.py
index dbde030e81..34eef4406a 100644
--- a/src/calibre/gui2/jobs.py
+++ b/src/calibre/gui2/jobs.py
@@ -8,14 +8,13 @@ Job management.
'''
import re
-
from Queue import Empty, Queue
-from PyQt4.Qt import QAbstractTableModel, QVariant, QModelIndex, Qt, \
- QTimer, pyqtSignal, QIcon, QDialog, QAbstractItemDelegate, QApplication, \
- QSize, QStyleOptionProgressBarV2, QString, QStyle, QToolTip, QFrame, \
- QHBoxLayout, QVBoxLayout, QSizePolicy, QLabel, QCoreApplication, QAction, \
- QByteArray
+from PyQt4.Qt import (QAbstractTableModel, QVariant, QModelIndex, Qt,
+ QTimer, pyqtSignal, QIcon, QDialog, QAbstractItemDelegate, QApplication,
+ QSize, QStyleOptionProgressBarV2, QString, QStyle, QToolTip, QFrame,
+ QHBoxLayout, QVBoxLayout, QSizePolicy, QLabel, QCoreApplication, QAction,
+ QByteArray)
from calibre.utils.ipc.server import Server
from calibre.utils.ipc.job import ParallelJob
@@ -25,8 +24,9 @@ from calibre.gui2.dialogs.jobs_ui import Ui_JobsDialog
from calibre import __appname__
from calibre.gui2.dialogs.job_view_ui import Ui_Dialog
from calibre.gui2.progress_indicator import ProgressIndicator
+from calibre.gui2.threaded_jobs import ThreadedJobServer, ThreadedJob
-class JobManager(QAbstractTableModel):
+class JobManager(QAbstractTableModel): # {{{
job_added = pyqtSignal(int)
job_done = pyqtSignal(int)
@@ -42,6 +42,7 @@ class JobManager(QAbstractTableModel):
self.add_job = Dispatcher(self._add_job)
self.server = Server(limit=int(config['worker_limit']/2.0),
enforce_cpu_limit=config['enforce_cpu_limit'])
+ self.threaded_server = ThreadedJobServer()
self.changed_queue = Queue()
self.timer = QTimer(self)
@@ -146,12 +147,21 @@ class JobManager(QAbstractTableModel):
jobs.add(self.server.changed_jobs_queue.get_nowait())
except Empty:
break
+
+ # Update device jobs
while True:
try:
jobs.add(self.changed_queue.get_nowait())
except Empty:
break
+ # Update threaded jobs
+ while True:
+ try:
+ jobs.add(self.threaded_server.changed_jobs.get_nowait())
+ except Empty:
+ break
+
if jobs:
needs_reset = False
for job in jobs:
@@ -207,11 +217,22 @@ class JobManager(QAbstractTableModel):
self.server.add_job(job)
return job
+ def run_threaded_job(self, job):
+ self.add_job(job)
+ self.threaded_server.add_job(job)
+
def launch_gui_app(self, name, args=[], kwargs={}, description=''):
job = ParallelJob(name, description, lambda x: x,
args=args, kwargs=kwargs)
self.server.run_job(job, gui=True, redirect_output=False)
+ def _kill_job(self, job):
+ if isinstance(job, ParallelJob):
+ self.server.kill_job(job)
+ elif isinstance(job, ThreadedJob):
+ self.threaded_server.kill_job(job)
+ else:
+ job.kill_on_start = True
def kill_job(self, row, view):
job = self.jobs[row]
@@ -221,29 +242,29 @@ class JobManager(QAbstractTableModel):
if job.duration is not None:
return error_dialog(view, _('Cannot kill job'),
_('Job has already run')).exec_()
- if isinstance(job, ParallelJob):
- self.server.kill_job(job)
- else:
- job.kill_on_start = True
+ if not getattr(job, 'killable', True):
+ return error_dialog(view, _('Cannot kill job'),
+ _('This job cannot be stopped'), show=True)
+ self._kill_job(job)
def kill_all_jobs(self):
for job in self.jobs:
- if isinstance(job, DeviceJob) or job.duration is not None:
+ if (isinstance(job, DeviceJob) or job.duration is not None or
+ not getattr(job, 'killable', True)):
continue
- if isinstance(job, ParallelJob):
- self.server.kill_job(job)
- else:
- job.kill_on_start = True
+ self._kill_job(job)
def terminate_all_jobs(self):
self.server.killall()
for job in self.jobs:
- if isinstance(job, DeviceJob) or job.duration is not None:
+ if (isinstance(job, DeviceJob) or job.duration is not None or
+ not getattr(job, 'killable', True)):
continue
if not isinstance(job, ParallelJob):
- job.kill_on_start = True
-
+ self._kill_job(job)
+# }}}
+# Jobs UI {{{
class ProgressBarDelegate(QAbstractItemDelegate):
def sizeHint(self, option, index):
@@ -269,6 +290,11 @@ class DetailView(QDialog, Ui_Dialog):
self.setupUi(self)
self.setWindowTitle(job.description)
self.job = job
+ self.html_view = hasattr(job, 'html_details')
+ if self.html_view:
+ self.log.setVisible(False)
+ else:
+ self.tb.setVisible(False)
self.next_pos = 0
self.update()
self.timer = QTimer(self)
@@ -277,12 +303,19 @@ class DetailView(QDialog, Ui_Dialog):
def update(self):
- f = self.job.log_file
- f.seek(self.next_pos)
- more = f.read()
- self.next_pos = f.tell()
- if more:
- self.log.appendPlainText(more.decode('utf-8', 'replace'))
+ if self.html_view:
+ html = self.job.html_details
+ if len(html) > self.next_pos:
+ self.next_pos = len(html)
+ self.tb.setHtml(
+ '<pre style="font-family:monospace">%s</pre>'%html)
+ else:
+ f = self.job.log_file
+ f.seek(self.next_pos)
+ more = f.read()
+ self.next_pos = f.tell()
+ if more:
+ self.log.appendPlainText(more.decode('utf-8', 'replace'))
class JobsButton(QFrame):
@@ -441,3 +474,5 @@ class JobsDialog(QDialog, Ui_JobsDialog):
def hide(self, *args):
self.save_state()
return QDialog.hide(self, *args)
+# }}}
+
diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index e8a4e79384..e98817a02f 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -7,12 +7,12 @@ __docformat__ = 'restructuredtext en'
from functools import partial
-from PyQt4.Qt import QIcon, Qt, QWidget, QToolBar, QSize, \
- pyqtSignal, QToolButton, QMenu, \
- QObject, QVBoxLayout, QSizePolicy, QLabel, QHBoxLayout, QActionGroup
+from PyQt4.Qt import (QIcon, Qt, QWidget, QToolBar, QSize,
+ pyqtSignal, QToolButton, QMenu, QMenuBar, QAction,
+ QObject, QVBoxLayout, QSizePolicy, QLabel, QHBoxLayout, QActionGroup)
-from calibre.constants import __appname__
+from calibre.constants import __appname__, isosx
from calibre.gui2.search_box import SearchBox2, SavedSearchBox
from calibre.gui2.throbber import ThrobbingButton
from calibre.gui2 import gprefs
@@ -238,18 +238,117 @@ class Spacer(QWidget): # {{{
self.l.addStretch(10)
# }}}
-class ToolBar(QToolBar): # {{{
+class MenuAction(QAction): # {{{
- def __init__(self, donate, location_manager, child_bar, parent):
- QToolBar.__init__(self, parent)
+ def __init__(self, clone, parent):
+ QAction.__init__(self, clone.text(), parent)
+ self.clone = clone
+ clone.changed.connect(self.clone_changed)
+
+ def clone_changed(self):
+ self.setText(self.clone.text())
+# }}}
+
+class MenuBar(QMenuBar): # {{{
+
+ def __init__(self, location_manager, parent):
+ QMenuBar.__init__(self, parent)
self.gui = parent
- self.child_bar = child_bar
+ self.setNativeMenuBar(True)
+
+ self.location_manager = location_manager
+ self.location_manager.locations_changed.connect(self.build_bar)
+ self.added_actions = []
+
+ self.donate_action = QAction(_('Donate'), self)
+ self.donate_menu = QMenu()
+ self.donate_menu.addAction(self.gui.donate_action)
+ self.donate_action.setMenu(self.donate_menu)
+ self.build_bar()
+
+ def build_bar(self, changed_action=None):
+ showing_device = self.location_manager.has_device
+ actions = '-device' if showing_device else ''
+ actions = gprefs['action-layout-menubar'+actions]
+
+ show_main = len(actions) > 0
+ self.setVisible(show_main)
+
+ for ac in self.added_actions:
+ m = ac.menu()
+ if m is not None:
+ m.setVisible(False)
+
+ self.clear()
+ self.added_actions = []
+ self.action_map = {}
+
+ for what in actions:
+ if what is None:
+ continue
+ elif what == 'Location Manager':
+ for ac in self.location_manager.available_actions:
+ ac = self.build_menu(ac)
+ self.addAction(ac)
+ self.added_actions.append(ac)
+ elif what == 'Donate':
+ self.addAction(self.donate_action)
+ elif what in self.gui.iactions:
+ action = self.gui.iactions[what]
+ ac = self.build_menu(action.qaction)
+ self.addAction(ac)
+ self.added_actions.append(ac)
+
+ def build_menu(self, action):
+ m = action.menu()
+ ac = MenuAction(action, self)
+ if m is None:
+ m = QMenu()
+ m.addAction(action)
+ ac.setMenu(m)
+ return ac
+
+# }}}
+
+class BaseToolBar(QToolBar): # {{{
+
+ def __init__(self, parent):
+ QToolBar.__init__(self, parent)
self.setContextMenuPolicy(Qt.PreventContextMenu)
self.setMovable(False)
self.setFloatable(False)
self.setOrientation(Qt.Horizontal)
self.setAllowedAreas(Qt.TopToolBarArea|Qt.BottomToolBarArea)
self.setStyleSheet('QToolButton:checked { font-weight: bold }')
+ self.preferred_width = self.sizeHint().width()
+
+ def resizeEvent(self, ev):
+ QToolBar.resizeEvent(self, ev)
+ style = self.get_text_style()
+ self.setToolButtonStyle(style)
+
+ def get_text_style(self):
+ style = Qt.ToolButtonTextUnderIcon
+ s = gprefs['toolbar_icon_size']
+ if s != 'off':
+ p = gprefs['toolbar_text']
+ if p == 'never':
+ style = Qt.ToolButtonIconOnly
+ elif p == 'auto' and self.preferred_width > self.width()+35:
+ style = Qt.ToolButtonIconOnly
+ return style
+
+ def contextMenuEvent(self, *args):
+ pass
+
+# }}}
+
+class ToolBar(BaseToolBar): # {{{
+
+ def __init__(self, donate, location_manager, child_bar, parent):
+ BaseToolBar.__init__(self, parent)
+ self.gui = parent
+ self.child_bar = child_bar
self.donate_button = donate
self.apply_settings()
@@ -259,30 +358,31 @@ class ToolBar(QToolBar): # {{{
donate.setCursor(Qt.PointingHandCursor)
self.added_actions = []
self.build_bar()
- self.preferred_width = self.sizeHint().width()
self.setAcceptDrops(True)
def apply_settings(self):
sz = gprefs['toolbar_icon_size']
- sz = {'small':24, 'medium':48, 'large':64}[sz]
+ sz = {'off':0, 'small':24, 'medium':48, 'large':64}[sz]
self.setIconSize(QSize(sz, sz))
self.child_bar.setIconSize(QSize(sz, sz))
style = Qt.ToolButtonTextUnderIcon
- if gprefs['toolbar_text'] == 'never':
+ if sz > 0 and gprefs['toolbar_text'] == 'never':
style = Qt.ToolButtonIconOnly
self.setToolButtonStyle(style)
self.child_bar.setToolButtonStyle(style)
self.donate_button.set_normal_icon_size(sz, sz)
- def contextMenuEvent(self, *args):
- pass
-
def build_bar(self):
- self.child_bar.setVisible(gprefs['show_child_bar'])
self.showing_donate = False
showing_device = self.location_manager.has_device
- actions = '-device' if showing_device else ''
- actions = gprefs['action-layout-toolbar'+actions]
+ mactions = '-device' if showing_device else ''
+ mactions = gprefs['action-layout-toolbar'+mactions]
+ cactions = gprefs['action-layout-toolbar-child']
+
+ show_main = len(mactions) > 0
+ self.setVisible(show_main)
+ show_child = len(cactions) > 0
+ self.child_bar.setVisible(show_child)
for ac in self.added_actions:
m = ac.menu()
@@ -292,63 +392,41 @@ class ToolBar(QToolBar): # {{{
self.clear()
self.child_bar.clear()
self.added_actions = []
- self.spacers = [Spacer(self.child_bar), Spacer(self.child_bar),
- Spacer(self), Spacer(self)]
- self.child_bar.addWidget(self.spacers[0])
- if gprefs['show_child_bar']:
- self.addWidget(self.spacers[2])
- for what in actions:
- if what is None and not gprefs['show_child_bar']:
- self.addSeparator()
- elif what == 'Location Manager':
- for ac in self.location_manager.available_actions:
- self.addAction(ac)
- self.added_actions.append(ac)
- self.setup_tool_button(ac, QToolButton.MenuButtonPopup)
- elif what == 'Donate':
- self.d_widget = QWidget()
- self.d_widget.setLayout(QVBoxLayout())
- self.d_widget.layout().addWidget(self.donate_button)
- self.addWidget(self.d_widget)
- self.showing_donate = True
- elif what in self.gui.iactions:
- action = self.gui.iactions[what]
- bar = self
- if action.action_type == 'current' and gprefs['show_child_bar']:
- bar = self.child_bar
- bar.addAction(action.qaction)
- self.added_actions.append(action.qaction)
- self.setup_tool_button(action.qaction, action.popup_type)
+ for bar, actions in ((self, mactions), (self.child_bar, cactions)):
+ for what in actions:
+ if what is None:
+ bar.addSeparator()
+ elif what == 'Location Manager':
+ for ac in self.location_manager.available_actions:
+ bar.addAction(ac)
+ bar.added_actions.append(ac)
+ bar.setup_tool_button(bar, ac, QToolButton.MenuButtonPopup)
+ elif what == 'Donate':
+ self.d_widget = QWidget()
+ self.d_widget.setLayout(QVBoxLayout())
+ self.d_widget.layout().addWidget(self.donate_button)
+ if isosx:
+ self.d_widget.setStyleSheet('QWidget, QToolButton {background-color: none; border: none; }')
+ bar.addWidget(self.d_widget)
+ self.showing_donate = True
+ elif what in self.gui.iactions:
+ action = self.gui.iactions[what]
+ bar.addAction(action.qaction)
+ self.added_actions.append(action.qaction)
+ self.setup_tool_button(bar, action.qaction, action.popup_type)
+ self.preferred_width = self.sizeHint().width()
+ self.child_bar.preferred_width = self.child_bar.sizeHint().width()
- self.child_bar.addWidget(self.spacers[1])
- if gprefs['show_child_bar']:
- self.addWidget(self.spacers[3])
- else:
- for s in self.spacers[2:]:
- s.setVisible(False)
-
- def setup_tool_button(self, ac, menu_mode=None):
- ch = self.widgetForAction(ac)
+ def setup_tool_button(self, bar, ac, menu_mode=None):
+ ch = bar.widgetForAction(ac)
if ch is None:
ch = self.child_bar.widgetForAction(ac)
ch.setCursor(Qt.PointingHandCursor)
ch.setAutoRaise(True)
if ac.menu() is not None and menu_mode is not None:
ch.setPopupMode(menu_mode)
-
- def resizeEvent(self, ev):
- QToolBar.resizeEvent(self, ev)
- style = Qt.ToolButtonTextUnderIcon
- p = gprefs['toolbar_text']
- if p == 'never':
- style = Qt.ToolButtonIconOnly
-
- if p == 'auto' and self.preferred_width > self.width()+35 and \
- not gprefs['show_child_bar']:
- style = Qt.ToolButtonIconOnly
-
- self.setToolButtonStyle(style)
+ return ch
def database_changed(self, db):
pass
@@ -427,11 +505,14 @@ class MainWindowMixin(object): # {{{
self.iactions['Fetch News'].init_scheduler(db)
self.search_bar = SearchBar(self)
- self.child_bar = QToolBar(self)
+ self.child_bar = BaseToolBar(self)
self.tool_bar = ToolBar(self.donate_button,
self.location_manager, self.child_bar, self)
self.addToolBar(Qt.TopToolBarArea, self.tool_bar)
self.addToolBar(Qt.BottomToolBarArea, self.child_bar)
+ self.menu_bar = MenuBar(self.location_manager, self)
+ self.setMenuBar(self.menu_bar)
+ self.setUnifiedTitleAndToolBarOnMac(True)
l = self.centralwidget.layout()
l.addWidget(self.search_bar)
diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py
index 3a090f8102..ac8568af07 100644
--- a/src/calibre/gui2/library/delegates.py
+++ b/src/calibre/gui2/library/delegates.py
@@ -353,7 +353,7 @@ class CcBoolDelegate(QStyledItemDelegate): # {{{
editor = DelegateCB(parent)
items = [_('Y'), _('N'), ' ']
icons = [I('ok.png'), I('list_remove.png'), I('blank.png')]
- if tweaks['bool_custom_columns_are_tristate'] == 'no':
+ if not index.model().db.prefs.get('bools_are_tristate'):
items = items[:-1]
icons = icons[:-1]
for icon, text in zip(icons, items):
@@ -367,7 +367,7 @@ class CcBoolDelegate(QStyledItemDelegate): # {{{
def setEditorData(self, editor, index):
m = index.model()
val = m.db.data[index.row()][m.custom_columns[m.column_map[index.column()]]['rec_index']]
- if tweaks['bool_custom_columns_are_tristate'] == 'no':
+ if not m.db.prefs.get('bools_are_tristate'):
val = 1 if not val else 0
else:
val = 2 if val is None else 1 if not val else 0
@@ -398,7 +398,7 @@ class CcTemplateDelegate(QStyledItemDelegate): # {{{
val = unicode(editor.textbox.toPlainText())
try:
validation_formatter.validate(val)
- except Exception, err:
+ except Exception as err:
error_dialog(self.parent(), _('Invalid template'),
'<p>'+_('The template %s is invalid:')%val + \
'<br>'+str(err), show=True)
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index c5b13901ae..f7074a6fee 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -7,7 +7,6 @@ __docformat__ = 'restructuredtext en'
import shutil, functools, re, os, traceback
from contextlib import closing
-from operator import attrgetter
from PyQt4.Qt import QAbstractTableModel, Qt, pyqtSignal, QIcon, QImage, \
QModelIndex, QVariant, QDate, QColor
@@ -18,7 +17,7 @@ from calibre.ebooks.metadata import fmt_sidx, authors_to_string, string_to_autho
from calibre.ptempfile import PersistentTemporaryFile
from calibre.utils.config import tweaks, prefs
from calibre.utils.date import dt_factory, qt_to_dt, isoformat
-from calibre.utils.icu import sort_key, strcmp as icu_strcmp
+from calibre.utils.icu import sort_key
from calibre.ebooks.metadata.meta import set_metadata as _set_metadata
from calibre.utils.search_query_parser import SearchQueryParser
from calibre.library.caches import _match, CONTAINS_MATCH, EQUALS_MATCH, \
@@ -428,7 +427,7 @@ class BooksModel(QAbstractTableModel): # {{{
au = self.db.authors(row)
if not au:
au = _('Unknown')
- au = ', '.join([a.strip() for a in au.split(',')])
+ au = authors_to_string([a.strip().replace('|', ',') for a in au.split(',')])
data[_('Author(s)')] = au
return data
@@ -605,7 +604,10 @@ class BooksModel(QAbstractTableModel): # {{{
def size(r, idx=-1):
size = self.db.data[r][idx]
if size:
- return QVariant('%.1f'%(float(size)/(1024*1024)))
+ ans = '%.1f'%(float(size)/(1024*1024))
+ if size > 0 and ans == '0.0':
+ ans = '<0.1'
+ return QVariant(ans)
return None
def rating_type(r, idx=-1):
@@ -640,18 +642,18 @@ class BooksModel(QAbstractTableModel): # {{{
return self.bool_yes_icon
return self.bool_blank_icon
- def text_type(r, mult=False, idx=-1):
+ def text_type(r, mult=None, idx=-1):
text = self.db.data[r][idx]
- if text and mult:
- return QVariant(', '.join(sorted(text.split('|'),key=sort_key)))
+ if text and mult is not None:
+ if mult:
+ return QVariant(u' & '.join(text.split('|')))
+ return QVariant(u', '.join(sorted(text.split('|'),key=sort_key)))
return QVariant(text)
- def decorated_text_type(r, mult=False, idx=-1):
+ def decorated_text_type(r, idx=-1):
text = self.db.data[r][idx]
if force_to_bool(text) is not None:
return None
- if text and mult:
- return QVariant(', '.join(sorted(text.split('|'),key=sort_key)))
return QVariant(text)
def number_type(r, idx=-1):
@@ -659,7 +661,7 @@ class BooksModel(QAbstractTableModel): # {{{
self.dc = {
'title' : functools.partial(text_type,
- idx=self.db.field_metadata['title']['rec_index'], mult=False),
+ idx=self.db.field_metadata['title']['rec_index'], mult=None),
'authors' : functools.partial(authors,
idx=self.db.field_metadata['authors']['rec_index']),
'size' : functools.partial(size,
@@ -671,14 +673,14 @@ class BooksModel(QAbstractTableModel): # {{{
'rating' : functools.partial(rating_type,
idx=self.db.field_metadata['rating']['rec_index']),
'publisher': functools.partial(text_type,
- idx=self.db.field_metadata['publisher']['rec_index'], mult=False),
+ idx=self.db.field_metadata['publisher']['rec_index'], mult=None),
'tags' : functools.partial(tags,
idx=self.db.field_metadata['tags']['rec_index']),
'series' : functools.partial(series_type,
idx=self.db.field_metadata['series']['rec_index'],
siix=self.db.field_metadata['series_index']['rec_index']),
'ondevice' : functools.partial(text_type,
- idx=self.db.field_metadata['ondevice']['rec_index'], mult=False),
+ idx=self.db.field_metadata['ondevice']['rec_index'], mult=None),
}
self.dc_decorator = {
@@ -692,15 +694,16 @@ class BooksModel(QAbstractTableModel): # {{{
datatype = self.custom_columns[col]['datatype']
if datatype in ('text', 'comments', 'composite', 'enumeration'):
mult=self.custom_columns[col]['is_multiple']
+ if mult is not None:
+ mult = self.custom_columns[col]['display'].get('is_names', False)
self.dc[col] = functools.partial(text_type, idx=idx, mult=mult)
if datatype in ['text', 'composite', 'enumeration'] and not mult:
if self.custom_columns[col]['display'].get('use_decorations', False):
- self.dc[col] = functools.partial(decorated_text_type,
- idx=idx, mult=mult)
+ self.dc[col] = functools.partial(decorated_text_type, idx=idx)
self.dc_decorator[col] = functools.partial(
bool_type_decorator, idx=idx,
bool_cols_are_tristate=
- tweaks['bool_custom_columns_are_tristate'] != 'no')
+ self.db.prefs.get('bools_are_tristate'))
elif datatype in ('int', 'float'):
self.dc[col] = functools.partial(number_type, idx=idx)
elif datatype == 'datetime':
@@ -710,7 +713,7 @@ class BooksModel(QAbstractTableModel): # {{{
self.dc_decorator[col] = functools.partial(
bool_type_decorator, idx=idx,
bool_cols_are_tristate=
- tweaks['bool_custom_columns_are_tristate'] != 'no')
+ self.db.prefs.get('bools_are_tristate'))
elif datatype == 'rating':
self.dc[col] = functools.partial(rating_type, idx=idx)
elif datatype == 'series':
@@ -983,6 +986,21 @@ class OnDeviceSearch(SearchQueryParser): # {{{
# }}}
+class DeviceDBSortKeyGen(object): # {{{
+
+ def __init__(self, attr, keyfunc, db):
+ self.attr = attr
+ self.db = db
+ self.keyfunc = keyfunc
+
+ def __call__(self, x):
+ try:
+ ans = self.keyfunc(getattr(self.db[x], self.attr))
+ except:
+ ans = None
+ return ans
+# }}}
+
class DeviceBooksModel(BooksModel): # {{{
booklist_dirtied = pyqtSignal()
@@ -1088,59 +1106,40 @@ class DeviceBooksModel(BooksModel): # {{{
def sort(self, col, order, reset=True):
descending = order != Qt.AscendingOrder
- def strcmp(attr):
- ag = attrgetter(attr)
- def _strcmp(x, y):
- x = ag(self.db[x])
- y = ag(self.db[y])
- if x == None:
- x = ''
- if y == None:
- y = ''
- return icu_strcmp(x.strip(), y.strip())
- return _strcmp
- def datecmp(x, y):
- x = self.db[x].datetime
- y = self.db[y].datetime
- return cmp(dt_factory(x, assume_utc=True), dt_factory(y,
- assume_utc=True))
- def sizecmp(x, y):
- x, y = int(self.db[x].size), int(self.db[y].size)
- return cmp(x, y)
- def tagscmp(x, y):
- x = ','.join(sorted(getattr(self.db[x], 'device_collections', []),key=sort_key))
- y = ','.join(sorted(getattr(self.db[y], 'device_collections', []),key=sort_key))
- return cmp(x, y)
- def libcmp(x, y):
- x, y = self.db[x].in_library, self.db[y].in_library
- return cmp(x, y)
- def authorcmp(x, y):
- ax = getattr(self.db[x], 'author_sort', None)
- ay = getattr(self.db[y], 'author_sort', None)
- if ax and ay:
- x = ax
- y = ay
- else:
- x, y = authors_to_string(self.db[x].authors), \
- authors_to_string(self.db[y].authors)
- return cmp(x, y)
cname = self.column_map[col]
- fcmp = {
- 'title': strcmp('title_sorter'),
- 'authors' : authorcmp,
- 'size' : sizecmp,
- 'timestamp': datecmp,
- 'collections': tagscmp,
- 'inlibrary': libcmp,
+ def author_key(x):
+ try:
+ ax = self.db[x].author_sort
+ if not ax:
+ raise Exception('')
+ except:
+ try:
+ ax = authors_to_string(self.db[x].authors)
+ except:
+ ax = ''
+ return ax
+
+ keygen = {
+ 'title': ('title_sorter', lambda x: sort_key(x) if x else ''),
+ 'authors' : author_key,
+ 'size' : ('size', int),
+ 'timestamp': ('datetime', functools.partial(dt_factory, assume_utc=True)),
+ 'collections': ('device_collections', lambda x:sorted(x,
+ key=sort_key)),
+ 'inlibrary': ('in_library', lambda x: x),
}[cname]
- self.map.sort(cmp=fcmp, reverse=descending)
+ keygen = keygen if callable(keygen) else DeviceDBSortKeyGen(
+ keygen[0], keygen[1], self.db)
+ self.map.sort(key=keygen, reverse=descending)
if len(self.map) == len(self.db):
self.sorted_map = list(self.map)
else:
self.sorted_map = list(range(len(self.db)))
- self.sorted_map.sort(cmp=fcmp, reverse=descending)
+ self.sorted_map.sort(key=keygen, reverse=descending)
self.sorted_on = (self.column_map[col], order)
self.sort_history.insert(0, self.sorted_on)
+ if hasattr(keygen, 'db'):
+ keygen.db = None
if reset:
self.reset()
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index c62936a46f..0cce33da9e 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -78,6 +78,7 @@ class BooksView(QTableView): # {{{
self.pubdate_delegate = PubDateDelegate(self)
self.tags_delegate = CompleteDelegate(self, ',', 'all_tags')
self.authors_delegate = CompleteDelegate(self, '&', 'all_author_names', True)
+ self.cc_names_delegate = CompleteDelegate(self, '&', 'all_custom', True)
self.series_delegate = TextDelegate(self)
self.publisher_delegate = TextDelegate(self)
self.text_delegate = TextDelegate(self)
@@ -410,6 +411,7 @@ class BooksView(QTableView): # {{{
self.save_state()
self._model.set_database(db)
self.tags_delegate.set_database(db)
+ self.cc_names_delegate.set_database(db)
self.authors_delegate.set_database(db)
self.series_delegate.set_auto_complete_function(db.all_series)
self.publisher_delegate.set_auto_complete_function(db.all_publishers)
@@ -431,12 +433,17 @@ class BooksView(QTableView): # {{{
self.setItemDelegateForColumn(cm.index(colhead), delegate)
elif cc['datatype'] == 'comments':
self.setItemDelegateForColumn(cm.index(colhead), self.cc_comments_delegate)
- elif cc['datatype'] in ('text', 'series'):
+ elif cc['datatype'] == 'text':
if cc['is_multiple']:
- self.setItemDelegateForColumn(cm.index(colhead), self.tags_delegate)
+ if cc['display'].get('is_names', False):
+ self.setItemDelegateForColumn(cm.index(colhead),
+ self.cc_names_delegate)
+ else:
+ self.setItemDelegateForColumn(cm.index(colhead),
+ self.tags_delegate)
else:
self.setItemDelegateForColumn(cm.index(colhead), self.cc_text_delegate)
- elif cc['datatype'] in ('int', 'float'):
+ elif cc['datatype'] in ('series', 'int', 'float'):
self.setItemDelegateForColumn(cm.index(colhead), self.cc_text_delegate)
elif cc['datatype'] == 'bool':
self.setItemDelegateForColumn(cm.index(colhead), self.cc_bool_delegate)
diff --git a/src/calibre/gui2/lrf_renderer/main.py b/src/calibre/gui2/lrf_renderer/main.py
index 2acfd3c9a7..e68e04adcf 100644
--- a/src/calibre/gui2/lrf_renderer/main.py
+++ b/src/calibre/gui2/lrf_renderer/main.py
@@ -35,7 +35,7 @@ class RenderWorker(QThread):
self.stream = None
if self.aborted:
self.lrf = None
- except Exception, err:
+ except Exception as err:
self.lrf, self.stream = None, None
self.exception = err
self.formatted_traceback = traceback.format_exc()
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 976b679726..c67ec8c2b4 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -399,7 +399,7 @@ def main(args=sys.argv):
if __name__ == '__main__':
try:
sys.exit(main())
- except Exception, err:
+ except Exception as err:
if not iswindows: raise
tb = traceback.format_exc()
from PyQt4.QtGui import QErrorMessage
diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py
index d5a8de7b67..b2ee79c9c0 100644
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+ print_function)
__license__ = 'GPL v3'
__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
@@ -7,10 +9,10 @@ __docformat__ = 'restructuredtext en'
import textwrap, re, os
-from PyQt4.Qt import Qt, QDateEdit, QDate, \
- QIcon, QToolButton, QWidget, QLabel, QGridLayout, \
- QDoubleSpinBox, QListWidgetItem, QSize, QPixmap, \
- QPushButton, QSpinBox, QLineEdit
+from PyQt4.Qt import (Qt, QDateEdit, QDate, pyqtSignal,
+ QIcon, QToolButton, QWidget, QLabel, QGridLayout,
+ QDoubleSpinBox, QListWidgetItem, QSize, QPixmap,
+ QPushButton, QSpinBox, QLineEdit, QSizePolicy)
from calibre.gui2.widgets import EnLineEdit, FormatList, ImageView
from calibre.gui2.complete import MultiCompleteLineEdit, MultiCompleteComboBox
@@ -22,7 +24,7 @@ from calibre.ebooks.metadata.meta import get_metadata
from calibre.gui2 import file_icon_provider, UNDEFINED_QDATE, UNDEFINED_DATE, \
choose_files, error_dialog, choose_images, question_dialog
from calibre.utils.date import local_tz, qt_to_dt
-from calibre import strftime
+from calibre import strftime, fit_image
from calibre.ebooks import BOOK_EXTENSIONS
from calibre.customize.ui import run_plugins_on_import
from calibre.utils.date import utcfromtimestamp
@@ -170,6 +172,7 @@ class AuthorsEdit(MultiCompleteComboBox):
self.books_to_refresh = set([])
all_authors = db.all_authors()
all_authors.sort(key=lambda x : sort_key(x[1]))
+ self.clear()
for i in all_authors:
id, name = i
name = [name.strip().replace('|', ',') for n in name.split(',')]
@@ -313,7 +316,7 @@ class SeriesEdit(MultiCompleteComboBox):
if not val:
val = ''
self.setEditText(val.strip())
- self.setCursorPosition(0)
+ self.lineEdit().setCursorPosition(0)
return property(fget=fget, fset=fset)
@@ -324,6 +327,7 @@ class SeriesEdit(MultiCompleteComboBox):
self.update_items_cache([x[1] for x in all_series])
series_id = db.series_id(id_, index_is_id=True)
idx, c = None, 0
+ self.clear()
for i in all_series:
id, name = i
if id == series_id:
@@ -426,7 +430,7 @@ class Format(QListWidgetItem): # {{{
if timestamp is not None:
ts = timestamp.astimezone(local_tz)
t = strftime('%a, %d %b %Y [%H:%M:%S]', ts.timetuple())
- text = _('Last modified: %s')%t
+ text = _('Last modified: %s\n\nDouble click to view')%t
self.setToolTip(text)
self.setStatusTip(text)
@@ -480,6 +484,7 @@ class FormatsManager(QWidget): # {{{
def initialize(self, db, id_):
self.changed = False
+ self.formats.clear()
exts = db.formats(id_, index_is_id=True)
self.original_val = set([])
if exts:
@@ -574,8 +579,7 @@ class FormatsManager(QWidget): # {{{
self.changed = True
def show_format(self, item, *args):
- fmt = item.ext
- self.dialog.view_format.emit(fmt)
+ self.dialog.do_view_format(item.path, item.ext)
def get_selected_format_metadata(self, db, id_):
old = prefs['read_file_metadata']
@@ -611,6 +615,8 @@ class FormatsManager(QWidget): # {{{
class Cover(ImageView): # {{{
+ download_cover = pyqtSignal()
+
def __init__(self, parent):
ImageView.__init__(self, parent)
self.dialog = parent
@@ -638,6 +644,23 @@ class Cover(ImageView): # {{{
self.trim_cover_button, self.download_cover_button,
self.generate_cover_button]
+ self.frame_size = (300, 400)
+ self.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,
+ QSizePolicy.Preferred))
+
+ def frame_resized(self, ev):
+ sz = ev.size()
+ self.frame_size = (sz.width()//3, sz.height())
+
+ def sizeHint(self):
+ sz = ImageView.sizeHint(self)
+ w, h = sz.width(), sz.height()
+ resized, nw, nh = fit_image(w, h, self.frame_size[0],
+ self.frame_size[1])
+ if resized:
+ sz = QSize(nw, nh)
+ return sz
+
def select_cover(self, *args):
files = choose_images(self, 'change cover dialog',
_('Choose cover for ') +
@@ -656,7 +679,7 @@ class Cover(ImageView): # {{{
try:
cf = open(_file, "rb")
cover = cf.read()
- except IOError, e:
+ except IOError as e:
d = error_dialog(self, _('Error reading file'),
_("<p>There was an error reading from file: <br /><b>")
+ _file + "</b></p><br />"+str(e))
@@ -684,9 +707,6 @@ class Cover(ImageView): # {{{
cdata = im.export('png')
self.current_val = cdata
- def download_cover(self, *args):
- pass # TODO: Implement this
-
def generate_cover(self, *args):
from calibre.ebooks import calibre_cover
from calibre.ebooks.metadata import fmt_sidx
@@ -843,6 +863,7 @@ class TagsEdit(MultiCompleteLineEdit): # {{{
if not val:
val = []
self.setText(', '.join([x.strip() for x in val]))
+ self.setCursorPosition(0)
return property(fget=fget, fset=fset)
def initialize(self, db, id_):
@@ -882,8 +903,11 @@ class TagsEdit(MultiCompleteLineEdit): # {{{
# }}}
-class ISBNEdit(QLineEdit): # {{{
- LABEL = _('IS&BN:')
+class IdentifiersEdit(QLineEdit): # {{{
+ LABEL = _('I&ds:')
+ BASE_TT = _('Edit the identifiers for this book. '
+ 'For example: \n\n%s')%(
+ 'isbn:1565927249, doi:10.1000/182, amazon:1565927249')
def __init__(self, parent):
QLineEdit.__init__(self, parent)
@@ -893,32 +917,45 @@ class ISBNEdit(QLineEdit): # {{{
@dynamic_property
def current_val(self):
def fget(self):
- return self.pat.sub('', unicode(self.text()).strip())
+ raw = unicode(self.text()).strip()
+ parts = [x.strip() for x in raw.split(',')]
+ ans = {}
+ for x in parts:
+ c = x.split(':')
+ if len(c) == 2:
+ ans[c[0]] = c[1]
+ return ans
def fset(self, val):
if not val:
- val = ''
- self.setText(val.strip())
+ val = {}
+ txt = ', '.join(['%s:%s'%(k, v) for k, v in val.iteritems()])
+ self.setText(txt.strip())
+ self.setCursorPosition(0)
return property(fget=fget, fset=fset)
def initialize(self, db, id_):
- self.current_val = db.isbn(id_, index_is_id=True)
+ self.current_val = db.get_identifiers(id_, index_is_id=True)
self.original_val = self.current_val
def commit(self, db, id_):
- db.set_isbn(id_, self.current_val, notify=False, commit=False)
+ if self.original_val != self.current_val:
+ db.set_identifiers(id_, self.current_val, notify=False, commit=False)
return True
def validate(self, *args):
- isbn = self.current_val
- tt = _('This ISBN number is valid')
+ identifiers = self.current_val
+ isbn = identifiers.get('isbn', '')
+ tt = self.BASE_TT
+ extra = ''
if not isbn:
col = 'rgba(0,255,0,0%)'
elif check_isbn(isbn) is not None:
col = 'rgba(0,255,0,20%)'
+ extra = '\n\n'+_('This ISBN number is valid')
else:
col = 'rgba(255,0,0,20%)'
- tt = _('This ISBN number is invalid')
- self.setToolTip(tt)
+ extra = '\n\n' + _('This ISBN number is invalid')
+ self.setToolTip(tt+extra)
self.setStyleSheet('QLineEdit { background-color: %s }'%col)
# }}}
@@ -943,7 +980,7 @@ class PublisherEdit(MultiCompleteComboBox): # {{{
if not val:
val = ''
self.setEditText(val.strip())
- self.setCursorPosition(0)
+ self.lineEdit().setCursorPosition(0)
return property(fget=fget, fset=fset)
@@ -953,13 +990,13 @@ class PublisherEdit(MultiCompleteComboBox): # {{{
all_publishers.sort(key=lambda x : sort_key(x[1]))
self.update_items_cache([x[1] for x in all_publishers])
publisher_id = db.publisher_id(id_, index_is_id=True)
- idx, c = None, 0
- for i in all_publishers:
- id, name = i
- if id == publisher_id:
- idx = c
+ idx = None
+ self.clear()
+ for i, x in enumerate(all_publishers):
+ id_, name = x
+ if id_ == publisher_id:
+ idx = i
self.addItem(name)
- c += 1
self.setEditText('')
if idx is not None:
diff --git a/src/calibre/gui2/metadata/bulk_download.py b/src/calibre/gui2/metadata/bulk_download.py
index 461f56b60c..7a7f49dabf 100644
--- a/src/calibre/gui2/metadata/bulk_download.py
+++ b/src/calibre/gui2/metadata/bulk_download.py
@@ -88,7 +88,7 @@ class DownloadMetadata(Thread):
def run(self):
try:
self._run()
- except Exception, e:
+ except Exception as e:
self.exception = e
self.tb = traceback.format_exc()
diff --git a/src/calibre/gui2/metadata/bulk_download2.py b/src/calibre/gui2/metadata/bulk_download2.py
new file mode 100644
index 0000000000..cc6da1e995
--- /dev/null
+++ b/src/calibre/gui2/metadata/bulk_download2.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+ print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
+
diff --git a/src/calibre/gui2/metadata/config.py b/src/calibre/gui2/metadata/config.py
new file mode 100644
index 0000000000..68c935061d
--- /dev/null
+++ b/src/calibre/gui2/metadata/config.py
@@ -0,0 +1,122 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+ print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+import textwrap
+
+from PyQt4.Qt import (QWidget, QGridLayout, QGroupBox, QListView, Qt, QSpinBox,
+ QDoubleSpinBox, QCheckBox, QLineEdit, QComboBox, QLabel)
+
+from calibre.gui2.preferences.metadata_sources import FieldsModel as FM
+
+class FieldsModel(FM): # {{{
+
+ def __init__(self, plugin):
+ FM.__init__(self)
+ self.plugin = plugin
+ self.exclude = frozenset(['title', 'authors']) | self.exclude
+ self.prefs = self.plugin.prefs
+
+ def initialize(self):
+ fields = self.plugin.touched_fields
+ self.fields = []
+ for x in fields:
+ if not x.startswith('identifier:') and x not in self.exclude:
+ self.fields.append(x)
+ self.fields.sort(key=lambda x:self.descs.get(x, x))
+ self.reset()
+
+ def state(self, field, defaults=False):
+ src = self.prefs.defaults if defaults else self.prefs
+ return (Qt.Unchecked if field in src['ignore_fields']
+ else Qt.Checked)
+
+ def restore_defaults(self):
+ self.overrides = dict([(f, self.state(f, True)) for f in self.fields])
+ self.reset()
+
+ def commit(self):
+ val = [k for k, v in self.overrides.iteritems() if v == Qt.Unchecked]
+ self.prefs['ignore_fields'] = val
+
+# }}}
+
+class ConfigWidget(QWidget):
+
+ def __init__(self, plugin):
+ QWidget.__init__(self)
+ self.plugin = plugin
+
+ self.l = l = QGridLayout()
+ self.setLayout(l)
+
+ self.gb = QGroupBox(_('Downloaded metadata fields'), self)
+ l.addWidget(self.gb, 0, 0, 1, 2)
+ self.gb.l = QGridLayout()
+ self.gb.setLayout(self.gb.l)
+ self.fields_view = v = QListView(self)
+ self.gb.l.addWidget(v, 0, 0)
+ v.setFlow(v.LeftToRight)
+ v.setWrapping(True)
+ v.setResizeMode(v.Adjust)
+ self.fields_model = FieldsModel(self.plugin)
+ self.fields_model.initialize()
+ v.setModel(self.fields_model)
+
+ self.memory = []
+ self.widgets = []
+ for opt in plugin.options:
+ self.create_widgets(opt)
+
+ def create_widgets(self, opt):
+ val = self.plugin.prefs[opt.name]
+ if opt.type == 'number':
+ c = QSpinBox if isinstance(opt.default, int) else QDoubleSpinBox
+ widget = c(self)
+ widget.setValue(val)
+ elif opt.type == 'string':
+ widget = QLineEdit(self)
+ widget.setText(val)
+ elif opt.type == 'bool':
+ widget = QCheckBox(opt.label, self)
+ widget.setChecked(bool(val))
+ elif opt.type == 'choices':
+ widget = QComboBox(self)
+ for x in opt.choices:
+ widget.addItem(x)
+ idx = opt.choices.index(val)
+ widget.setCurrentIndex(idx)
+ widget.opt = opt
+ widget.setToolTip(textwrap.fill(opt.desc))
+ self.widgets.append(widget)
+ r = self.l.rowCount()
+ if opt.type == 'bool':
+ self.l.addWidget(widget, r, 0, 1, self.l.columnCount())
+ else:
+ l = QLabel(opt.label)
+ l.setToolTip(widget.toolTip())
+ self.memory.append(l)
+ l.setBuddy(widget)
+ self.l.addWidget(l, r, 0, 1, 1)
+ self.l.addWidget(widget, r, 1, 1, 1)
+
+
+ def commit(self):
+ self.fields_model.commit()
+ for w in self.widgets:
+ if isinstance(w, (QSpinBox, QDoubleSpinBox)):
+ val = w.value()
+ elif isinstance(w, QLineEdit):
+ val = unicode(w.text())
+ elif isinstance(w, QCheckBox):
+ val = w.isChecked()
+ elif isinstance(w, QComboBox):
+ val = unicode(w.currentText())
+ self.plugin.prefs[w.opt.name] = val
+
+
diff --git a/src/calibre/gui2/metadata/single.py b/src/calibre/gui2/metadata/single.py
index 3b6dd0e253..2e5b43ceba 100644
--- a/src/calibre/gui2/metadata/single.py
+++ b/src/calibre/gui2/metadata/single.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+ print_function)
__license__ = 'GPL v3'
__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
@@ -8,31 +10,33 @@ __docformat__ = 'restructuredtext en'
import os
from functools import partial
-from PyQt4.Qt import Qt, QVBoxLayout, QHBoxLayout, QWidget, QPushButton, \
- QGridLayout, pyqtSignal, QDialogButtonBox, QScrollArea, QFont, \
- QTabWidget, QIcon, QToolButton, QSplitter, QGroupBox, QSpacerItem, \
- QSizePolicy, QPalette, QFrame, QSize, QKeySequence
+from PyQt4.Qt import (Qt, QVBoxLayout, QHBoxLayout, QWidget, QPushButton,
+ QGridLayout, pyqtSignal, QDialogButtonBox, QScrollArea, QFont,
+ QTabWidget, QIcon, QToolButton, QSplitter, QGroupBox, QSpacerItem,
+ QSizePolicy, QPalette, QFrame, QSize, QKeySequence)
from calibre.ebooks.metadata import authors_to_string, string_to_authors
-from calibre.gui2 import ResizableDialog, error_dialog, gprefs
-from calibre.gui2.metadata.basic_widgets import TitleEdit, AuthorsEdit, \
- AuthorSortEdit, TitleSortEdit, SeriesEdit, SeriesIndexEdit, ISBNEdit, \
- RatingEdit, PublisherEdit, TagsEdit, FormatsManager, Cover, CommentsEdit, \
- BuddyLabel, DateEdit, PubdateEdit
+from calibre.gui2 import ResizableDialog, error_dialog, gprefs, pixmap_to_data
+from calibre.gui2.metadata.basic_widgets import (TitleEdit, AuthorsEdit,
+ AuthorSortEdit, TitleSortEdit, SeriesEdit, SeriesIndexEdit, IdentifiersEdit,
+ RatingEdit, PublisherEdit, TagsEdit, FormatsManager, Cover, CommentsEdit,
+ BuddyLabel, DateEdit, PubdateEdit)
+from calibre.gui2.metadata.single_download import FullFetch
from calibre.gui2.custom_column_widgets import populate_metadata_page
from calibre.utils.config import tweaks
+from calibre.ebooks.metadata.book.base import Metadata
class MetadataSingleDialogBase(ResizableDialog):
- view_format = pyqtSignal(object)
+ view_format = pyqtSignal(object, object)
cc_two_column = tweaks['metadata_single_use_2_cols_for_custom_fields']
one_line_comments_toolbar = False
def __init__(self, db, parent=None):
self.db = db
- self.changed = set([])
- self.books_to_refresh = set([])
- self.rows_to_refresh = set([])
+ self.changed = set()
+ self.books_to_refresh = set()
+ self.rows_to_refresh = set()
ResizableDialog.__init__(self, parent)
def setupUi(self, *args): # {{{
@@ -130,6 +134,7 @@ class MetadataSingleDialogBase(ResizableDialog):
self.formats_manager.cover_from_format_button.clicked.connect(
self.cover_from_format)
self.cover = Cover(self)
+ self.cover.download_cover.connect(self.download_cover)
self.basic_metadata_widgets.append(self.cover)
self.comments = CommentsEdit(self, self.one_line_comments_toolbar)
@@ -145,8 +150,8 @@ class MetadataSingleDialogBase(ResizableDialog):
self.tags_editor_button.clicked.connect(self.tags_editor)
self.basic_metadata_widgets.append(self.tags)
- self.isbn = ISBNEdit(self)
- self.basic_metadata_widgets.append(self.isbn)
+ self.identifiers = IdentifiersEdit(self)
+ self.basic_metadata_widgets.append(self.identifiers)
self.publisher = PublisherEdit(self)
self.basic_metadata_widgets.append(self.publisher)
@@ -156,12 +161,17 @@ class MetadataSingleDialogBase(ResizableDialog):
self.basic_metadata_widgets.extend([self.timestamp, self.pubdate])
self.fetch_metadata_button = QPushButton(
- _('&Fetch metadata from server'), self)
+ _('&Download metadata'), self)
self.fetch_metadata_button.clicked.connect(self.fetch_metadata)
font = self.fmb_font = QFont()
font.setBold(True)
self.fetch_metadata_button.setFont(font)
+ self.config_metadata_button = QToolButton(self)
+ self.config_metadata_button.setIcon(QIcon(I('config.png')))
+ self.config_metadata_button.clicked.connect(self.configure_metadata)
+ self.config_metadata_button.setToolTip(
+ _('Change how calibre downloads metadata'))
# }}}
@@ -192,6 +202,13 @@ class MetadataSingleDialogBase(ResizableDialog):
pass # Do something
# }}}
+ def do_view_format(self, path, fmt):
+ if path:
+ self.view_format.emit(None, path)
+ else:
+ self.view_format.emit(self.book_id, fmt)
+
+
def do_layout(self):
raise NotImplementedError()
@@ -202,6 +219,8 @@ class MetadataSingleDialogBase(ResizableDialog):
widget.initialize(self.db, id_)
for widget in getattr(self, 'custom_metadata_widgets', []):
widget.initialize(id_)
+ if callable(self.set_current_callback):
+ self.set_current_callback(id_)
# Commented out as it doesn't play nice with Next, Prev buttons
#self.fetch_metadata_button.setFocus(Qt.OtherFocusReason)
@@ -280,8 +299,8 @@ class MetadataSingleDialogBase(ResizableDialog):
self.publisher.current_val = mi.publisher
if not mi.is_null('tags'):
self.tags.current_val = mi.tags
- if not mi.is_null('isbn'):
- self.isbn.current_val = mi.isbn
+ if not mi.is_null('identifiers'):
+ self.identifiers.current_val = mi.identifiers
if not mi.is_null('pubdate'):
self.pubdate.current_val = mi.pubdate
if not mi.is_null('series') and mi.series.strip():
@@ -292,7 +311,36 @@ class MetadataSingleDialogBase(ResizableDialog):
self.comments.current_val = mi.comments
def fetch_metadata(self, *args):
- pass # TODO: fetch metadata
+ d = FullFetch(self.cover.pixmap(), self)
+ ret = d.start(title=self.title.current_val, authors=self.authors.current_val,
+ identifiers=self.identifiers.current_val)
+ if ret == d.Accepted:
+ from calibre.ebooks.metadata.sources.base import msprefs
+ mi = d.book
+ dummy = Metadata(_('Unknown'))
+ for f in msprefs['ignore_fields']:
+ setattr(mi, f, getattr(dummy, f))
+ if mi is not None:
+ self.update_from_mi(mi)
+ if d.cover_pixmap is not None:
+ self.cover.current_val = pixmap_to_data(d.cover_pixmap)
+
+ def configure_metadata(self):
+ from calibre.gui2.preferences import show_config_widget
+ gui = self.parent()
+ show_config_widget('Sharing', 'Metadata download', parent=self,
+ gui=gui, never_shutdown=True)
+
+ def download_cover(self, *args):
+ from calibre.gui2.metadata.single_download import CoverFetch
+ d = CoverFetch(self.cover.pixmap(), self)
+ ret = d.start(self.title.current_val, self.authors.current_val,
+ self.identifiers.current_val)
+ if ret == d.Accepted:
+ if d.cover_pixmap is not None:
+ self.cover.current_val = pixmap_to_data(d.cover_pixmap)
+
+
# }}}
def apply_changes(self):
@@ -303,7 +351,7 @@ class MetadataSingleDialogBase(ResizableDialog):
return False
self.books_to_refresh |= getattr(widget, 'books_to_refresh',
set([]))
- except IOError, err:
+ except IOError as err:
if err.errno == 13: # Permission denied
import traceback
fname = err.filename if err.filename else 'file'
@@ -337,11 +385,13 @@ class MetadataSingleDialogBase(ResizableDialog):
gprefs['metasingle_window_geometry3'] = bytearray(self.saveGeometry())
# Dialog use methods {{{
- def start(self, row_list, current_row, view_slot=None):
+ def start(self, row_list, current_row, view_slot=None,
+ set_current_callback=None):
self.row_list = row_list
self.current_row = current_row
if view_slot is not None:
self.view_format.connect(view_slot)
+ self.set_current_callback = set_current_callback
self.do_one(apply_changes=False)
ret = self.exec_()
self.break_cycles()
@@ -373,6 +423,7 @@ class MetadataSingleDialogBase(ResizableDialog):
def break_cycles(self):
# Break any reference cycles that could prevent python
# from garbage collecting this dialog
+ self.set_current_callback = self.db = None
def disconnect(signal):
try:
signal.disconnect()
@@ -385,6 +436,14 @@ class MetadataSingleDialogBase(ResizableDialog):
disconnect(x.clicked)
# }}}
+class Splitter(QSplitter):
+
+ frame_resized = pyqtSignal(object)
+
+ def resizeEvent(self, ev):
+ self.frame_resized.emit(ev)
+ return QSplitter.resizeEvent(self, ev)
+
class MetadataSingleDialog(MetadataSingleDialogBase): # {{{
def do_layout(self):
@@ -408,7 +467,8 @@ class MetadataSingleDialog(MetadataSingleDialogBase): # {{{
sto = QWidget.setTabOrder
sto(self.button_box, self.fetch_metadata_button)
- sto(self.fetch_metadata_button, self.title)
+ sto(self.fetch_metadata_button, self.config_metadata_button)
+ sto(self.config_metadata_button, self.title)
def create_row(row, one, two, three, col=1, icon='forward.png'):
ql = BuddyLabel(one)
@@ -437,8 +497,9 @@ class MetadataSingleDialog(MetadataSingleDialogBase): # {{{
tl.addWidget(self.formats_manager, 0, 6, 3, 1)
- self.splitter = QSplitter(Qt.Horizontal, self)
+ self.splitter = Splitter(Qt.Horizontal, self)
self.splitter.addWidget(self.cover)
+ self.splitter.frame_resized.connect(self.cover.frame_resized)
l.addWidget(self.splitter)
self.tabs[0].gb = gb = QGroupBox(_('Change cover'), self)
gb.l = l = QGridLayout()
@@ -475,9 +536,9 @@ class MetadataSingleDialog(MetadataSingleDialogBase): # {{{
create_row2(1, self.rating)
sto(self.rating, self.tags)
create_row2(2, self.tags, self.tags_editor_button)
- sto(self.tags_editor_button, self.isbn)
- create_row2(3, self.isbn)
- sto(self.isbn, self.timestamp)
+ sto(self.tags_editor_button, self.identifiers)
+ create_row2(3, self.identifiers)
+ sto(self.identifiers, self.timestamp)
create_row2(4, self.timestamp, self.timestamp.clear_button)
sto(self.timestamp.clear_button, self.pubdate)
create_row2(5, self.pubdate, self.pubdate.clear_button)
@@ -486,7 +547,8 @@ class MetadataSingleDialog(MetadataSingleDialogBase): # {{{
self.tabs[0].spc_two = QSpacerItem(10, 10, QSizePolicy.Expanding,
QSizePolicy.Expanding)
l.addItem(self.tabs[0].spc_two, 8, 0, 1, 3)
- l.addWidget(self.fetch_metadata_button, 9, 0, 1, 3)
+ l.addWidget(self.fetch_metadata_button, 9, 0, 1, 2)
+ l.addWidget(self.config_metadata_button, 9, 2, 1, 1)
self.tabs[0].gb2 = gb = QGroupBox(_('Co&mments'), self)
gb.l = l = QVBoxLayout()
@@ -498,18 +560,35 @@ class MetadataSingleDialog(MetadataSingleDialogBase): # {{{
# }}}
-class MetadataSingleDialogAlt(MetadataSingleDialogBase): # {{{
+class DragTrackingWidget(QWidget): # {{{
+
+ def __init__(self, parent, on_drag_enter):
+ QWidget.__init__(self, parent)
+ self.on_drag_enter = on_drag_enter
+
+ def dragEnterEvent(self, ev):
+ self.on_drag_enter.emit()
+
+# }}}
+
+class MetadataSingleDialogAlt1(MetadataSingleDialogBase): # {{{
cc_two_column = False
one_line_comments_toolbar = True
+ on_drag_enter = pyqtSignal()
+
+ def handle_drag_enter(self):
+ self.central_widget.setCurrentIndex(1)
+
def do_layout(self):
self.central_widget.clear()
self.tabs = []
self.labels = []
sto = QWidget.setTabOrder
- self.tabs.append(QWidget(self))
+ self.on_drag_enter.connect(self.handle_drag_enter)
+ self.tabs.append(DragTrackingWidget(self, self.on_drag_enter))
self.central_widget.addTab(self.tabs[0], _("&Metadata"))
self.tabs[0].l = QGridLayout()
self.tabs[0].setLayout(self.tabs[0].l)
@@ -519,6 +598,10 @@ class MetadataSingleDialogAlt(MetadataSingleDialogBase): # {{{
self.tabs[1].l = QGridLayout()
self.tabs[1].setLayout(self.tabs[1].l)
+ # accept drop events so we can automatically switch to the second tab to
+ # drop covers and formats
+ self.tabs[0].setAcceptDrops(True)
+
# Tab 0
tab0 = self.tabs[0]
@@ -527,6 +610,12 @@ class MetadataSingleDialogAlt(MetadataSingleDialogBase): # {{{
self.tabs[0].l.addWidget(gb, 0, 0, 1, 1)
gb.setLayout(tl)
+ self.button_box.addButton(self.fetch_metadata_button,
+ QDialogButtonBox.ActionRole)
+ self.config_metadata_button.setToolButtonStyle(Qt.ToolButtonTextOnly)
+ self.config_metadata_button.setText(_('Configure metadata downloading'))
+ self.button_box.addButton(self.config_metadata_button,
+ QDialogButtonBox.ActionRole)
sto(self.button_box, self.title)
def create_row(row, widget, tab_to, button=None, icon=None, span=1):
@@ -562,9 +651,9 @@ class MetadataSingleDialogAlt(MetadataSingleDialogBase): # {{{
create_row(8, self.pubdate, self.publisher,
button=self.pubdate.clear_button, icon='trash.png')
create_row(9, self.publisher, self.timestamp)
- create_row(10, self.timestamp, self.isbn,
+ create_row(10, self.timestamp, self.identifiers,
button=self.timestamp.clear_button, icon='trash.png')
- create_row(11, self.isbn, self.comments)
+ create_row(11, self.identifiers, self.comments)
tl.addItem(QSpacerItem(1, 1, QSizePolicy.Fixed, QSizePolicy.Expanding),
12, 1, 1 ,1)
@@ -580,7 +669,7 @@ class MetadataSingleDialogAlt(MetadataSingleDialogBase): # {{{
sr.setWidget(w)
gbl.addWidget(sr)
self.tabs[0].l.addWidget(gb, 0, 1, 1, 1)
- sto(self.isbn, gb)
+ sto(self.identifiers, gb)
w = QGroupBox(_('&Comments'), tab0)
sp = QSizePolicy()
@@ -616,7 +705,6 @@ class MetadataSingleDialogAlt(MetadataSingleDialogBase): # {{{
wgl.addWidget(gb)
wgl.addItem(QSpacerItem(10, 10, QSizePolicy.Expanding,
QSizePolicy.Expanding))
- wgl.addWidget(self.fetch_metadata_button)
wgl.addItem(QSpacerItem(10, 10, QSizePolicy.Expanding,
QSizePolicy.Expanding))
wgl.addWidget(self.formats_manager)
@@ -631,10 +719,16 @@ class MetadataSingleDialogAlt(MetadataSingleDialogBase): # {{{
# }}}
+editors = {'default': MetadataSingleDialog, 'alt1': MetadataSingleDialogAlt1}
-def edit_metadata(db, row_list, current_row, parent=None, view_slot=None):
- d = MetadataSingleDialog(db, parent)
- d.start(row_list, current_row, view_slot=view_slot)
+def edit_metadata(db, row_list, current_row, parent=None, view_slot=None,
+ set_current_callback=None):
+ cls = gprefs.get('edit_metadata_single_layout', '')
+ if cls not in editors:
+ cls = 'default'
+ d = editors[cls](db, parent)
+ d.start(row_list, current_row, view_slot=view_slot,
+ set_current_callback=set_current_callback)
return d.changed, d.rows_to_refresh
if __name__ == '__main__':
diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py
new file mode 100644
index 0000000000..8f01c6df1e
--- /dev/null
+++ b/src/calibre/gui2/metadata/single_download.py
@@ -0,0 +1,952 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+ print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+DEBUG_DIALOG = False
+
+# Imports {{{
+from threading import Thread, Event
+from operator import attrgetter
+from Queue import Queue, Empty
+
+from PyQt4.Qt import (QStyledItemDelegate, QTextDocument, QRectF, QIcon, Qt,
+ QStyle, QApplication, QDialog, QVBoxLayout, QLabel, QDialogButtonBox,
+ QStackedWidget, QWidget, QTableView, QGridLayout, QFontInfo, QPalette,
+ QTimer, pyqtSignal, QAbstractTableModel, QVariant, QSize, QListView,
+ QPixmap, QAbstractListModel, QColor, QRect, QTextBrowser)
+from PyQt4.QtWebKit import QWebView
+
+from calibre.customize.ui import metadata_plugins
+from calibre.ebooks.metadata import authors_to_string
+from calibre.utils.logging import GUILog as Log
+from calibre.ebooks.metadata.sources.identify import (identify,
+ urls_from_identifiers)
+from calibre.ebooks.metadata.book.base import Metadata
+from calibre.gui2 import error_dialog, NONE
+from calibre.utils.date import utcnow, fromordinal, format_date
+from calibre.library.comments import comments_to_html
+from calibre import force_unicode
+# }}}
+
+class RichTextDelegate(QStyledItemDelegate): # {{{
+
+ def __init__(self, parent=None):
+ QStyledItemDelegate.__init__(self, parent)
+
+ def to_doc(self, index):
+ doc = QTextDocument()
+ doc.setHtml(index.data().toString())
+ return doc
+
+ def sizeHint(self, option, index):
+ doc = self.to_doc(index)
+ ans = doc.size().toSize()
+ if ans.width() > 150:
+ ans.setWidth(160)
+ ans.setHeight(ans.height()+10)
+ return ans
+
+ def paint(self, painter, option, index):
+ painter.save()
+ painter.setClipRect(QRectF(option.rect))
+ if hasattr(QStyle, 'CE_ItemViewItem'):
+ QApplication.style().drawControl(QStyle.CE_ItemViewItem, option, painter)
+ elif option.state & QStyle.State_Selected:
+ painter.fillRect(option.rect, option.palette.highlight())
+ painter.translate(option.rect.topLeft())
+ self.to_doc(index).drawContents(painter)
+ painter.restore()
+# }}}
+
+class CoverDelegate(QStyledItemDelegate): # {{{
+
+ needs_redraw = pyqtSignal()
+
+ def __init__(self, parent):
+ QStyledItemDelegate.__init__(self, parent)
+
+ self.angle = 0
+ self.timer = QTimer(self)
+ self.timer.timeout.connect(self.frame_changed)
+ self.color = parent.palette().color(QPalette.WindowText)
+ self.spinner_width = 64
+
+ def frame_changed(self, *args):
+ self.angle = (self.angle+30)%360
+ self.needs_redraw.emit()
+
+ def start_animation(self):
+ self.angle = 0
+ self.timer.start(200)
+
+ def stop_animation(self):
+ self.timer.stop()
+
+ def draw_spinner(self, painter, rect):
+ width = rect.width()
+
+ outer_radius = (width-1)*0.5
+ inner_radius = (width-1)*0.5*0.38
+
+ capsule_height = outer_radius - inner_radius
+ capsule_width = int(capsule_height * (0.23 if width > 32 else 0.35))
+ capsule_radius = capsule_width//2
+
+ painter.save()
+ painter.setRenderHint(painter.Antialiasing)
+
+ for i in xrange(12):
+ color = QColor(self.color)
+ color.setAlphaF(1.0 - (i/12.0))
+ painter.setPen(Qt.NoPen)
+ painter.setBrush(color)
+ painter.save()
+ painter.translate(rect.center())
+ painter.rotate(self.angle - i*30.0)
+ painter.drawRoundedRect(-capsule_width*0.5,
+ -(inner_radius+capsule_height), capsule_width,
+ capsule_height, capsule_radius, capsule_radius)
+ painter.restore()
+ painter.restore()
+
+ def paint(self, painter, option, index):
+ QStyledItemDelegate.paint(self, painter, option, index)
+ if self.timer.isActive() and index.data(Qt.UserRole).toBool():
+ rect = QRect(0, 0, self.spinner_width, self.spinner_width)
+ rect.moveCenter(option.rect.center())
+ self.draw_spinner(painter, rect)
+# }}}
+
+class ResultsModel(QAbstractTableModel): # {{{
+
+ COLUMNS = (
+ '#', _('Title'), _('Published'), _('Has cover'), _('Has summary')
+ )
+ HTML_COLS = (1, 2)
+ ICON_COLS = (3, 4)
+
+ def __init__(self, results, parent=None):
+ QAbstractTableModel.__init__(self, parent)
+ self.results = results
+ self.yes_icon = QVariant(QIcon(I('ok.png')))
+
+ def rowCount(self, parent=None):
+ return len(self.results)
+
+ def columnCount(self, parent=None):
+ return len(self.COLUMNS)
+
+ def headerData(self, section, orientation, role):
+ if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+ try:
+ return QVariant(self.COLUMNS[section])
+ except:
+ return NONE
+ return NONE
+
+ def data_as_text(self, book, col):
+ if col == 0:
+ return unicode(book.gui_rank+1)
+ if col == 1:
+ t = book.title if book.title else _('Unknown')
+ a = authors_to_string(book.authors) if book.authors else ''
+ return '<b>%s</b><br><i>%s</i>' % (t, a)
+ if col == 2:
+ d = format_date(book.pubdate, 'yyyy') if book.pubdate else _('Unknown')
+ p = book.publisher if book.publisher else ''
+ return '<b>%s</b><br><i>%s</i>' % (d, p)
+
+
+ def data(self, index, role):
+ row, col = index.row(), index.column()
+ try:
+ book = self.results[row]
+ except:
+ return NONE
+ if role == Qt.DisplayRole and col not in self.ICON_COLS:
+ res = self.data_as_text(book, col)
+ if res:
+ return QVariant(res)
+ return NONE
+ elif role == Qt.DecorationRole and col in self.ICON_COLS:
+ if col == 3 and getattr(book, 'has_cached_cover_url', False):
+ return self.yes_icon
+ if col == 4 and book.comments:
+ return self.yes_icon
+ elif role == Qt.UserRole:
+ return book
+ elif role == Qt.ToolTipRole and col == 3:
+ return QVariant(
+ _('The has cover indication is not fully\n'
+ 'reliable. Sometimes results marked as not\n'
+ 'having a cover will find a cover in the download\n'
+ 'cover stage, and vice versa.'))
+
+ return NONE
+
+ def sort(self, col, order=Qt.AscendingOrder):
+ key = lambda x: x
+ if col == 0:
+ key = attrgetter('gui_rank')
+ elif col == 1:
+ key = attrgetter('title')
+ elif col == 2:
+ key = attrgetter('pubdate')
+ elif col == 3:
+ key = attrgetter('has_cached_cover_url')
+ elif key == 4:
+ key = lambda x: bool(x.comments)
+
+ self.results.sort(key=key, reverse=order==Qt.AscendingOrder)
+ self.reset()
+
+# }}}
+
+class ResultsView(QTableView): # {{{
+
+ show_details_signal = pyqtSignal(object)
+ book_selected = pyqtSignal(object)
+
+ def __init__(self, parent=None):
+ QTableView.__init__(self, parent)
+ self.rt_delegate = RichTextDelegate(self)
+ self.setSelectionMode(self.SingleSelection)
+ self.setAlternatingRowColors(True)
+ self.setSelectionBehavior(self.SelectRows)
+ self.setIconSize(QSize(24, 24))
+ self.clicked.connect(self.show_details)
+ self.doubleClicked.connect(self.select_index)
+ self.setSortingEnabled(True)
+
+ def show_results(self, results):
+ self._model = ResultsModel(results, self)
+ self.setModel(self._model)
+ for i in self._model.HTML_COLS:
+ self.setItemDelegateForColumn(i, self.rt_delegate)
+ self.resizeRowsToContents()
+ self.resizeColumnsToContents()
+ self.setFocus(Qt.OtherFocusReason)
+
+ def currentChanged(self, current, previous):
+ ret = QTableView.currentChanged(self, current, previous)
+ self.show_details(current)
+ return ret
+
+ def show_details(self, index):
+ book = self.model().data(index, Qt.UserRole)
+ parts = [
+ '<center>',
+ '<h2>%s</h2>'%book.title,
+ '<div><i>%s</i></div>'%authors_to_string(book.authors),
+ ]
+ if not book.is_null('rating'):
+ parts.append('<div>%s</div>'%('\u2605'*int(book.rating)))
+ parts.append('</center>')
+ if book.identifiers:
+ urls = urls_from_identifiers(book.identifiers)
+ ids = ['<a href="%s">%s</a>'%(url, name) for name, url in urls]
+ if ids:
+ parts.append('<div><b>%s:</b> %s</div><br>'%(_('See at'), ', '.join(ids)))
+ if book.tags:
+ parts.append('<div>%s</div><div>\u00a0</div>'%', '.join(book.tags))
+ if book.comments:
+ parts.append(comments_to_html(book.comments))
+
+ self.show_details_signal.emit(''.join(parts))
+
+ def select_index(self, index):
+ if not index.isValid():
+ index = self.model().index(0, 0)
+ book = self.model().data(index, Qt.UserRole)
+ self.book_selected.emit(book)
+
+ def get_result(self):
+ self.select_index(self.currentIndex())
+
+# }}}
+
+class Comments(QWebView): # {{{
+
+ def __init__(self, parent=None):
+ QWebView.__init__(self, parent)
+ self.setAcceptDrops(False)
+ self.setMaximumWidth(300)
+ self.setMinimumWidth(300)
+
+ palette = self.palette()
+ palette.setBrush(QPalette.Base, Qt.transparent)
+ self.page().setPalette(palette)
+ self.setAttribute(Qt.WA_OpaquePaintEvent, False)
+
+ self.page().setLinkDelegationPolicy(self.page().DelegateAllLinks)
+ self.linkClicked.connect(self.link_clicked)
+
+ def link_clicked(self, url):
+ from calibre.gui2 import open_url
+ if unicode(url.toString()).startswith('http://'):
+ open_url(url)
+
+ def turnoff_scrollbar(self, *args):
+ self.page().mainFrame().setScrollBarPolicy(Qt.Horizontal, Qt.ScrollBarAlwaysOff)
+
+ def show_data(self, html):
+ def color_to_string(col):
+ ans = '#000000'
+ if col.isValid():
+ col = col.toRgb()
+ if col.isValid():
+ ans = unicode(col.name())
+ return ans
+
+ f = QFontInfo(QApplication.font(self.parent())).pixelSize()
+ c = color_to_string(QApplication.palette().color(QPalette.Normal,
+ QPalette.WindowText))
+ templ = '''\
+ <html>
+ <head>
+ <style type="text/css">
+ body, td {background-color: transparent; font-size: %dpx; color: %s }
+ a { text-decoration: none; color: blue }
+ div.description { margin-top: 0; padding-top: 0; text-indent: 0 }
+ table { margin-bottom: 0; padding-bottom: 0; }
+ </style>
+ </head>
+ <body>
+ <div class="description">
+ %%s
+ </div>
+ </body>
+ <html>
+ '''%(f, c)
+ self.setHtml(templ%html)
+# }}}
+
+class IdentifyWorker(Thread): # {{{
+
+ def __init__(self, log, abort, title, authors, identifiers):
+ Thread.__init__(self)
+ self.daemon = True
+
+ self.log, self.abort = log, abort
+ self.title, self.authors, self.identifiers = (title, authors,
+ identifiers)
+
+ self.results = []
+ self.error = None
+
+ def sample_results(self):
+ m1 = Metadata('The Great Gatsby', ['Francis Scott Fitzgerald'])
+ m2 = Metadata('The Great Gatsby', ['F. Scott Fitzgerald'])
+ m1.has_cached_cover_url = True
+ m2.has_cached_cover_url = False
+ m1.comments = 'Some comments '*10
+ m1.tags = ['tag%d'%i for i in range(20)]
+ m1.rating = 4.4
+ m1.language = 'en'
+ m2.language = 'fr'
+ m1.pubdate = utcnow()
+ m2.pubdate = fromordinal(1000000)
+ m1.publisher = 'Publisher 1'
+ m2.publisher = 'Publisher 2'
+
+ return [m1, m2]
+
+ def run(self):
+ try:
+ if DEBUG_DIALOG:
+ self.results = self.sample_results()
+ else:
+ self.results = identify(self.log, self.abort, title=self.title,
+ authors=self.authors, identifiers=self.identifiers)
+ for i, result in enumerate(self.results):
+ result.gui_rank = i
+ except:
+ import traceback
+ self.error = force_unicode(traceback.format_exc())
+# }}}
+
+class IdentifyWidget(QWidget): # {{{
+
+ rejected = pyqtSignal()
+ results_found = pyqtSignal()
+ book_selected = pyqtSignal(object)
+
+ def __init__(self, log, parent=None):
+ QWidget.__init__(self, parent)
+ self.log = log
+ self.abort = Event()
+
+ self.l = l = QGridLayout()
+ self.setLayout(l)
+
+ names = ['<b>'+p.name+'</b>' for p in metadata_plugins(['identify']) if
+ p.is_configured()]
+ self.top = QLabel('<p>'+_('calibre is downloading metadata from: ') +
+ ', '.join(names))
+ self.top.setWordWrap(True)
+ l.addWidget(self.top, 0, 0)
+
+ self.results_view = ResultsView(self)
+ self.results_view.book_selected.connect(self.book_selected.emit)
+ self.get_result = self.results_view.get_result
+ l.addWidget(self.results_view, 1, 0)
+
+ self.comments_view = Comments(self)
+ l.addWidget(self.comments_view, 1, 1)
+
+ self.results_view.show_details_signal.connect(self.comments_view.show_data)
+
+ self.query = QLabel('download starting...')
+ f = self.query.font()
+ f.setPointSize(f.pointSize()-2)
+ self.query.setFont(f)
+ self.query.setWordWrap(True)
+ l.addWidget(self.query, 2, 0, 1, 2)
+
+ self.comments_view.show_data('<h2>'+_('Please wait')+
+ '<br><span id="dots">.</span></h2>'+
+ '''
+ <script type="text/javascript">
+ window.onload=function(){
+ var dotspan = document.getElementById('dots');
+ window.setInterval(function(){
+ if(dotspan.textContent == '............'){
+ dotspan.textContent = '.';
+ }
+ else{
+ dotspan.textContent += '.';
+ }
+ }, 400);
+ }
+ </script>
+ ''')
+
+ def start(self, title=None, authors=None, identifiers={}):
+ self.log.clear()
+ self.log('Starting download')
+ parts = []
+ if title:
+ parts.append('title:'+title)
+ if authors:
+ parts.append('authors:'+authors_to_string(authors))
+ if identifiers:
+ x = ', '.join('%s:%s'%(k, v) for k, v in identifiers.iteritems())
+ parts.append(x)
+ self.query.setText(_('Query: ')+'; '.join(parts))
+ self.log(unicode(self.query.text()))
+
+ self.worker = IdentifyWorker(self.log, self.abort, title,
+ authors, identifiers)
+
+ self.worker.start()
+
+ QTimer.singleShot(50, self.update)
+
+ def update(self):
+ if self.worker.is_alive():
+ QTimer.singleShot(50, self.update)
+ else:
+ self.process_results()
+
+ def process_results(self):
+ if self.worker.error is not None:
+ error_dialog(self, _('Download failed'),
+ _('Failed to download metadata. Click '
+ 'Show Details to see details'),
+ show=True, det_msg=self.worker.error)
+ self.rejected.emit()
+ return
+
+ if not self.worker.results:
+ log = ''.join(self.log.plain_text)
+ error_dialog(self, _('No matches found'), '<p>' +
+ _('Failed to find any books that '
+ 'match your search. Try making the search <b>less '
+ 'specific</b>. For example, use only the author\'s '
+ 'last name and a single distinctive word from '
+ 'the title.<p>To see the full log, click Show Details.'),
+ show=True, det_msg=log)
+ self.rejected.emit()
+ return
+
+ self.results_view.show_results(self.worker.results)
+
+ self.comments_view.show_data('''
+ <div style="margin-bottom:2ex">Found <b>%d</b> results</div>
+ <div>To see <b>details</b>, click on any result</div>''' %
+ len(self.worker.results))
+
+ self.results_found.emit()
+
+
+ def cancel(self):
+ self.abort.set()
+# }}}
+
+class CoverWorker(Thread): # {{{
+
+ def __init__(self, log, abort, title, authors, identifiers):
+ Thread.__init__(self)
+ self.daemon = True
+
+ self.log, self.abort = log, abort
+ self.title, self.authors, self.identifiers = (title, authors,
+ identifiers)
+
+ self.rq = Queue()
+ self.error = None
+
+ def fake_run(self):
+ images = ['donate.png', 'config.png', 'column.png', 'eject.png', ]
+ import time
+ time.sleep(2)
+ for pl, im in zip(metadata_plugins(['cover']), images):
+ self.rq.put((pl, 1, 1, 'png', I(im, data=True)))
+
+ def run(self):
+ try:
+ if DEBUG_DIALOG:
+ self.fake_run()
+ else:
+ from calibre.ebooks.metadata.sources.covers import run_download
+ run_download(self.log, self.rq, self.abort, title=self.title,
+ authors=self.authors, identifiers=self.identifiers)
+ except:
+ import traceback
+ self.error = force_unicode(traceback.format_exc())
+# }}}
+
+class CoversModel(QAbstractListModel): # {{{
+
+ def __init__(self, current_cover, parent=None):
+ QAbstractListModel.__init__(self, parent)
+
+ if current_cover is None:
+ current_cover = QPixmap(I('default_cover.png'))
+
+ self.blank = QPixmap(I('blank.png')).scaled(150, 200)
+
+ self.covers = [self.get_item(_('Current cover'), current_cover)]
+ self.plugin_map = {}
+ for i, plugin in enumerate(metadata_plugins(['cover'])):
+ self.covers.append((plugin.name+'\n'+_('Searching...'),
+ QVariant(self.blank), None, True))
+ self.plugin_map[plugin] = i+1
+
+ def get_item(self, src, pmap, waiting=False):
+ sz = '%dx%d'%(pmap.width(), pmap.height())
+ text = QVariant(src + '\n' + sz)
+ scaled = pmap.scaled(150, 200, Qt.IgnoreAspectRatio,
+ Qt.SmoothTransformation)
+ return (text, QVariant(scaled), pmap, waiting)
+
+ def rowCount(self, parent=None):
+ return len(self.covers)
+
+ def data(self, index, role):
+ try:
+ text, pmap, cover, waiting = self.covers[index.row()]
+ except:
+ return NONE
+ if role == Qt.DecorationRole:
+ return pmap
+ if role == Qt.DisplayRole:
+ return text
+ if role == Qt.UserRole:
+ return waiting
+ return NONE
+
+ def plugin_for_index(self, index):
+ row = index.row() if hasattr(index, 'row') else index
+ for k, v in self.plugin_map.iteritems():
+ if v == row:
+ return k
+
+ def cover_keygen(self, x):
+ pmap = x[2]
+ if pmap is None:
+ return 1
+ return pmap.width()*pmap.height()
+
+
+ def clear_failed(self):
+ good = []
+ pmap = {}
+ dcovers = sorted(self.covers[1:], key=self.cover_keygen, reverse=True)
+ for i, x in enumerate(self.covers[0:1] + dcovers):
+ if not x[-1]:
+ good.append(x)
+ if i > 0:
+ plugin = self.plugin_for_index(i)
+ pmap[plugin] = len(good) - 1
+ self.covers = good
+ self.plugin_map = pmap
+ self.reset()
+
+ def index_for_plugin(self, plugin):
+ idx = self.plugin_map.get(plugin, 0)
+ return self.index(idx)
+
+ def update_result(self, plugin, width, height, data):
+ try:
+ idx = self.plugin_map[plugin]
+ except:
+ return
+ pmap = QPixmap()
+ pmap.loadFromData(data)
+ if pmap.isNull():
+ return
+ self.covers[idx] = self.get_item(plugin.name, pmap, waiting=False)
+ self.dataChanged.emit(self.index(idx), self.index(idx))
+
+ def cover_pixmap(self, index):
+ row = index.row()
+ if row > 0 and row < len(self.covers):
+ pmap = self.covers[row][2]
+ if pmap is not None and not pmap.isNull():
+ return pmap
+
+# }}}
+
+class CoversView(QListView): # {{{
+
+ chosen = pyqtSignal()
+
+ def __init__(self, current_cover, parent=None):
+ QListView.__init__(self, parent)
+ self.m = CoversModel(current_cover, self)
+ self.setModel(self.m)
+
+ self.setFlow(self.LeftToRight)
+ self.setWrapping(True)
+ self.setResizeMode(self.Adjust)
+ self.setGridSize(QSize(190, 260))
+ self.setIconSize(QSize(150, 200))
+ self.setSelectionMode(self.SingleSelection)
+ self.setViewMode(self.IconMode)
+
+ self.delegate = CoverDelegate(self)
+ self.setItemDelegate(self.delegate)
+ self.delegate.needs_redraw.connect(self.viewport().update,
+ type=Qt.QueuedConnection)
+
+ self.doubleClicked.connect(self.chosen, type=Qt.QueuedConnection)
+
+ def select(self, num):
+ current = self.model().index(num)
+ sm = self.selectionModel()
+ sm.select(current, sm.SelectCurrent)
+
+ def start(self):
+ self.select(0)
+ self.delegate.start_animation()
+
+ def clear_failed(self):
+ plugin = self.m.plugin_for_index(self.currentIndex())
+ self.m.clear_failed()
+ self.select(self.m.index_for_plugin(plugin).row())
+
+# }}}
+
+class CoversWidget(QWidget): # {{{
+
+ chosen = pyqtSignal()
+ finished = pyqtSignal()
+
+ def __init__(self, log, current_cover, parent=None):
+ QWidget.__init__(self, parent)
+ self.log = log
+ self.abort = Event()
+
+ self.l = l = QGridLayout()
+ self.setLayout(l)
+
+ self.msg = QLabel()
+ self.msg.setWordWrap(True)
+ l.addWidget(self.msg, 0, 0)
+
+ self.covers_view = CoversView(current_cover, self)
+ self.covers_view.chosen.connect(self.chosen)
+ l.addWidget(self.covers_view, 1, 0)
+ self.continue_processing = True
+
+ def start(self, book, current_cover, title, authors):
+ self.book, self.current_cover = book, current_cover
+ self.title, self.authors = title, authors
+ self.log('Starting cover download for:', book.title)
+ self.log('Query:', title, authors, self.book.identifiers)
+ self.msg.setText('<p>'+_('Downloading covers for <b>%s</b>, please wait...')%book.title)
+ self.covers_view.start()
+
+ self.worker = CoverWorker(self.log, self.abort, self.title,
+ self.authors, book.identifiers)
+ self.worker.start()
+ QTimer.singleShot(50, self.check)
+ self.covers_view.setFocus(Qt.OtherFocusReason)
+
+ def check(self):
+ if self.worker.is_alive() and not self.abort.is_set():
+ QTimer.singleShot(50, self.check)
+ try:
+ self.process_result(self.worker.rq.get_nowait())
+ except Empty:
+ pass
+ else:
+ self.process_results()
+
+ def process_results(self):
+ while self.continue_processing:
+ try:
+ self.process_result(self.worker.rq.get_nowait())
+ except Empty:
+ break
+
+ self.covers_view.clear_failed()
+
+ if self.worker.error is not None:
+ error_dialog(self, _('Download failed'),
+ _('Failed to download any covers, click'
+ ' "Show details" for details.'),
+ det_msg=self.worker.error, show=True)
+
+ num = self.covers_view.model().rowCount()
+ if num < 2:
+ txt = _('Could not find any covers for <b>%s</b>')%self.book.title
+ else:
+ txt = _('Found <b>%d</b> covers of %s. Pick the one you like'
+ ' best.')%(num-1, self.title)
+ self.msg.setText(txt)
+
+ self.finished.emit()
+
+ def process_result(self, result):
+ if not self.continue_processing:
+ return
+ plugin, width, height, fmt, data = result
+ self.covers_view.model().update_result(plugin, width, height, data)
+
+ def cleanup(self):
+ self.covers_view.delegate.stop_animation()
+ self.continue_processing = False
+
+ def cancel(self):
+ self.continue_processing = False
+ self.abort.set()
+
+ def cover_pixmap(self):
+ idx = None
+ for i in self.covers_view.selectionModel().selectedIndexes():
+ if i.isValid():
+ idx = i
+ break
+ if idx is None:
+ idx = self.covers_view.currentIndex()
+ return self.covers_view.model().cover_pixmap(idx)
+
+# }}}
+
+class LogViewer(QDialog): # {{{
+
+ def __init__(self, log, parent=None):
+ QDialog.__init__(self, parent)
+ self.log = log
+ self.l = l = QVBoxLayout()
+ self.setLayout(l)
+
+ self.tb = QTextBrowser(self)
+ l.addWidget(self.tb)
+
+ self.bb = QDialogButtonBox(QDialogButtonBox.Close)
+ l.addWidget(self.bb)
+ self.copy_button = self.bb.addButton(_('Copy to clipboard'),
+ self.bb.ActionRole)
+ self.copy_button.clicked.connect(self.copy_to_clipboard)
+ self.copy_button.setIcon(QIcon(I('edit-copy.png')))
+ self.bb.rejected.connect(self.reject)
+ self.bb.accepted.connect(self.accept)
+
+ self.setWindowTitle(_('Download log'))
+ self.setWindowIcon(QIcon(I('debug.png')))
+ self.resize(QSize(800, 400))
+
+ self.keep_updating = True
+ self.last_html = None
+ self.finished.connect(self.stop)
+ QTimer.singleShot(100, self.update_log)
+
+ self.show()
+
+ def copy_to_clipboard(self):
+ QApplication.clipboard().setText(''.join(self.log.plain_text))
+
+ def stop(self, *args):
+ self.keep_updating = False
+
+ def update_log(self):
+ if not self.keep_updating:
+ return
+ html = self.log.html
+ if html != self.last_html:
+ self.last_html = html
+ self.tb.setHtml('<pre style="font-family:monospace">%s</pre>'%html)
+ QTimer.singleShot(1000, self.update_log)
+
+# }}}
+
+class FullFetch(QDialog): # {{{
+
+ def __init__(self, current_cover=None, parent=None):
+ QDialog.__init__(self, parent)
+ self.current_cover = current_cover
+ self.log = Log()
+ self.book = self.cover_pixmap = None
+
+ self.setWindowTitle(_('Downloading metadata...'))
+ self.setWindowIcon(QIcon(I('metadata.png')))
+
+ self.stack = QStackedWidget()
+ self.l = l = QVBoxLayout()
+ self.setLayout(l)
+ l.addWidget(self.stack)
+
+ self.bb = QDialogButtonBox(QDialogButtonBox.Cancel|QDialogButtonBox.Ok)
+ l.addWidget(self.bb)
+ self.bb.rejected.connect(self.reject)
+ self.next_button = self.bb.addButton(_('Next'), self.bb.AcceptRole)
+ self.next_button.setDefault(True)
+ self.next_button.setEnabled(False)
+ self.next_button.setIcon(QIcon(I('ok.png')))
+ self.next_button.clicked.connect(self.next_clicked)
+ self.ok_button = self.bb.button(self.bb.Ok)
+ self.ok_button.clicked.connect(self.ok_clicked)
+ self.log_button = self.bb.addButton(_('View log'), self.bb.ActionRole)
+ self.log_button.clicked.connect(self.view_log)
+ self.log_button.setIcon(QIcon(I('debug.png')))
+ self.ok_button.setVisible(False)
+
+ self.identify_widget = IdentifyWidget(self.log, self)
+ self.identify_widget.rejected.connect(self.reject)
+ self.identify_widget.results_found.connect(self.identify_results_found)
+ self.identify_widget.book_selected.connect(self.book_selected)
+ self.stack.addWidget(self.identify_widget)
+
+ self.covers_widget = CoversWidget(self.log, self.current_cover, parent=self)
+ self.covers_widget.chosen.connect(self.ok_clicked)
+ self.stack.addWidget(self.covers_widget)
+
+ self.resize(850, 550)
+
+ self.finished.connect(self.cleanup)
+
+ def view_log(self):
+ self._lv = LogViewer(self.log, self)
+
+ def book_selected(self, book):
+ self.next_button.setVisible(False)
+ self.ok_button.setVisible(True)
+ self.book = book
+ self.stack.setCurrentIndex(1)
+ self.log('\n\n')
+ self.covers_widget.start(book, self.current_cover,
+ self.title, self.authors)
+
+ def accept(self):
+ # Prevent the usual dialog accept mechanisms from working
+ pass
+
+ def reject(self):
+ self.identify_widget.cancel()
+ self.covers_widget.cancel()
+ return QDialog.reject(self)
+
+ def cleanup(self):
+ self.covers_widget.cleanup()
+
+ def identify_results_found(self):
+ self.next_button.setEnabled(True)
+
+ def next_clicked(self, *args):
+ self.identify_widget.get_result()
+
+ def ok_clicked(self, *args):
+ self.cover_pixmap = self.covers_widget.cover_pixmap()
+ if DEBUG_DIALOG:
+ if self.cover_pixmap is not None:
+ self.w = QLabel()
+ self.w.setPixmap(self.cover_pixmap)
+ self.stack.addWidget(self.w)
+ self.stack.setCurrentIndex(2)
+ else:
+ QDialog.accept(self)
+
+ def start(self, title=None, authors=None, identifiers={}):
+ self.title, self.authors = title, authors
+ self.identify_widget.start(title=title, authors=authors,
+ identifiers=identifiers)
+ return self.exec_()
+# }}}
+
+class CoverFetch(QDialog): # {{{
+
+ def __init__(self, current_cover=None, parent=None):
+ QDialog.__init__(self, parent)
+ self.current_cover = current_cover
+ self.log = Log()
+ self.cover_pixmap = None
+
+ self.setWindowTitle(_('Downloading cover...'))
+ self.setWindowIcon(QIcon(I('book.png')))
+
+ self.l = l = QVBoxLayout()
+ self.setLayout(l)
+
+ self.covers_widget = CoversWidget(self.log, self.current_cover, parent=self)
+ self.covers_widget.chosen.connect(self.accept)
+ l.addWidget(self.covers_widget)
+
+ self.resize(850, 550)
+
+ self.finished.connect(self.cleanup)
+
+ self.bb = QDialogButtonBox(QDialogButtonBox.Cancel|QDialogButtonBox.Ok)
+ l.addWidget(self.bb)
+ self.log_button = self.bb.addButton(_('View log'), self.bb.ActionRole)
+ self.log_button.clicked.connect(self.view_log)
+ self.log_button.setIcon(QIcon(I('debug.png')))
+ self.bb.rejected.connect(self.reject)
+ self.bb.accepted.connect(self.accept)
+
+ def cleanup(self):
+ self.covers_widget.cleanup()
+
+ def reject(self):
+ self.covers_widget.cancel()
+ return QDialog.reject(self)
+
+ def accept(self, *args):
+ self.cover_pixmap = self.covers_widget.cover_pixmap()
+ QDialog.accept(self)
+
+ def start(self, title, authors, identifiers):
+ book = Metadata(title, authors)
+ book.identifiers = identifiers
+ self.covers_widget.start(book, self.current_cover,
+ title, authors)
+ return self.exec_()
+
+ def view_log(self):
+ self._lv = LogViewer(self.log, self)
+
+# }}}
+
+if __name__ == '__main__':
+ #DEBUG_DIALOG = True
+ app = QApplication([])
+ d = FullFetch()
+ d.start(title='great gatsby', authors=['fitzgerald'])
+
diff --git a/src/calibre/gui2/notify.py b/src/calibre/gui2/notify.py
index 501f7007eb..947d98f1a4 100644
--- a/src/calibre/gui2/notify.py
+++ b/src/calibre/gui2/notify.py
@@ -34,7 +34,7 @@ class DBUSNotifier(Notifier):
import dbus
self.dbus = dbus
self._notify = dbus.Interface(dbus.SessionBus().get_object(server, path), interface)
- except Exception, err:
+ except Exception as err:
self.ok = False
self.err = str(err)
diff --git a/src/calibre/gui2/preferences/__init__.py b/src/calibre/gui2/preferences/__init__.py
index 54eb2f713c..1669e24059 100644
--- a/src/calibre/gui2/preferences/__init__.py
+++ b/src/calibre/gui2/preferences/__init__.py
@@ -7,8 +7,9 @@ __docformat__ = 'restructuredtext en'
import textwrap
-from PyQt4.Qt import QWidget, pyqtSignal, QCheckBox, QAbstractSpinBox, \
- QLineEdit, QComboBox, QVariant, Qt
+from PyQt4.Qt import (QWidget, pyqtSignal, QCheckBox, QAbstractSpinBox,
+ QLineEdit, QComboBox, QVariant, Qt, QIcon, QDialog, QVBoxLayout,
+ QDialogButtonBox)
from calibre.customize.ui import preferences_plugins
from calibre.utils.config import ConfigProxy
@@ -21,7 +22,7 @@ class ConfigWidgetInterface(object):
'''
This class defines the interface that all widgets displayed in the
Preferences dialog must implement. See :class:`ConfigWidgetBase` for
- a base class that implements this interface and defines various conveninece
+ a base class that implements this interface and defines various convenience
methods as well.
'''
@@ -284,7 +285,14 @@ def get_plugin(category, name):
'No Preferences Plugin with category: %s and name: %s found' %
(category, name))
-# Testing {{{
+class ConfigDialog(QDialog):
+ def set_widget(self, w): self.w = w
+ def accept(self):
+ try:
+ self.restart_required = self.w.commit()
+ except AbortCommit:
+ return
+ QDialog.accept(self)
def init_gui():
from calibre.gui2.ui import Main
@@ -298,21 +306,24 @@ def init_gui():
gui.initialize(db.library_path, db, None, actions, show_gui=False)
return gui
-def test_widget(category, name, gui=None):
- from PyQt4.Qt import QDialog, QVBoxLayout, QDialogButtonBox
- class Dialog(QDialog):
- def set_widget(self, w): self.w = w
- def accept(self):
- try:
- self.restart_required = self.w.commit()
- except AbortCommit:
- return
- QDialog.accept(self)
+def show_config_widget(category, name, gui=None, show_restart_msg=False,
+ parent=None, never_shutdown=False):
+ '''
+ Show the preferences plugin identified by category and name
+ :param gui: gui instance, if None a hidden gui is created
+ :param show_restart_msg: If True and the preferences plugin indicates a
+ restart is required, show a message box telling the user to restart
+ :param parent: The parent of the displayed dialog
+
+ :return: True iff a restart is required for the changes made by the user to
+ take effect
+ '''
pl = get_plugin(category, name)
- d = Dialog()
+ d = ConfigDialog(parent)
d.resize(750, 550)
- d.setWindowTitle(category + " - " + name)
+ d.setWindowTitle(_('Configure ') + name)
+ d.setWindowIcon(QIcon(I('config.png')))
bb = QDialogButtonBox(d)
bb.setStandardButtons(bb.Apply|bb.Cancel|bb.RestoreDefaults)
bb.accepted.connect(d.accept)
@@ -335,11 +346,18 @@ def test_widget(category, name, gui=None):
w.genesis(gui)
w.initialize()
d.exec_()
- if getattr(d, 'restart_required', False):
+ rr = getattr(d, 'restart_required', False)
+ if show_restart_msg and rr:
from calibre.gui2 import warning_dialog
warning_dialog(gui, 'Restart required', 'Restart required', show=True)
- if mygui:
+ if mygui and not never_shutdown:
gui.shutdown()
+ return rr
+
+# Testing {{{
+
+def test_widget(category, name, gui=None):
+ show_config_widget(category, name, gui=gui, show_restart_msg=True)
def test_all():
from PyQt4.Qt import QApplication
diff --git a/src/calibre/gui2/preferences/behavior.py b/src/calibre/gui2/preferences/behavior.py
index 45a63ce529..b376d067bc 100644
--- a/src/calibre/gui2/preferences/behavior.py
+++ b/src/calibre/gui2/preferences/behavior.py
@@ -11,7 +11,7 @@ from PyQt4.Qt import Qt, QVariant, QListWidgetItem
from calibre.gui2.preferences import ConfigWidgetBase, test_widget, Setting
from calibre.gui2.preferences.behavior_ui import Ui_Form
-from calibre.gui2 import config, info_dialog, dynamic
+from calibre.gui2 import config, info_dialog, dynamic, gprefs
from calibre.utils.config import prefs
from calibre.customize.ui import available_output_formats, all_input_formats
from calibre.utils.search_query_parser import saved_searches
@@ -19,6 +19,7 @@ from calibre.ebooks import BOOK_EXTENSIONS
from calibre.ebooks.oeb.iterator import is_supported
from calibre.constants import iswindows
from calibre.utils.icu import sort_key
+from calibre.utils.config import test_eight_code
class OutputFormatSetting(Setting):
@@ -31,15 +32,20 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
db = gui.library_view.model().db
r = self.register
-
- r('worker_process_priority', prefs, choices=
- [(_('Low'), 'low'), (_('Normal'), 'normal'), (_('High'), 'high')])
+ choices = [(_('Low'), 'low'), (_('Normal'), 'normal'), (_('High'),
+ 'high')] if iswindows else \
+ [(_('Normal'), 'normal'), (_('Low'), 'low'), (_('Very low'),
+ 'high')]
+ r('worker_process_priority', prefs, choices=choices)
r('network_timeout', prefs)
r('overwrite_author_title_metadata', config)
r('get_social_metadata', config)
+ if test_eight_code:
+ self.opt_overwrite_author_title_metadata.setVisible(False)
+ self.opt_get_social_metadata.setVisible(False)
r('new_version_notification', config)
r('upload_news_to_device', config)
r('delete_news_from_library_on_upload', config)
@@ -60,9 +66,14 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
signal = getattr(self.opt_internally_viewed_formats, 'item'+signal)
signal.connect(self.internally_viewed_formats_changed)
- self.settings['worker_process_priority'].gui_obj.setVisible(iswindows)
- self.priority_label.setVisible(iswindows)
-
+ r('bools_are_tristate', db.prefs, restart_required=True)
+ if test_eight_code:
+ r = self.register
+ choices = [(_('Default'), 'default'), (_('Compact Metadata'), 'alt1')]
+ r('edit_metadata_single_layout', gprefs, choices=choices)
+ else:
+ self.opt_edit_metadata_single_layout.setVisible(False)
+ self.edit_metadata_single_label.setVisible(False)
def initialize(self):
ConfigWidgetBase.initialize(self)
diff --git a/src/calibre/gui2/preferences/behavior.ui b/src/calibre/gui2/preferences/behavior.ui
index 0f35d28cd5..544de1457a 100644
--- a/src/calibre/gui2/preferences/behavior.ui
+++ b/src/calibre/gui2/preferences/behavior.ui
@@ -14,44 +14,92 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0" colspan="2">
+ <item row="0" column="1">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>10</width>
+ <height>00</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0">
<widget class="QCheckBox" name="opt_overwrite_author_title_metadata">
<property name="text">
<string>&Overwrite author and title by default when fetching metadata</string>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2">
+ <item row="0" column="2">
<widget class="QCheckBox" name="opt_get_social_metadata">
<property name="text">
<string>Download &social metadata (tags/ratings/etc.) by default</string>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2">
+ <item row="2" column="0">
<widget class="QCheckBox" name="opt_new_version_notification">
<property name="text">
<string>Show notification when &new version is available</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2">
+ <item row="2" column="2">
+ <widget class="QCheckBox" name="opt_bools_are_tristate">
+ <property name="text">
+ <string>Yes/No columns have three values (Requires restart)</string>
+ </property>
+ <property name="toolTip">
+ <string>If checked, Yes/No custom columns values can be Yes, No, or Unknown.
+If not checked, the values can be Yes or No.</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
<widget class="QCheckBox" name="opt_upload_news_to_device">
<property name="text">
<string>Automatically send downloaded &news to ebook reader</string>
</property>
</widget>
</item>
- <item row="4" column="0" colspan="2">
+ <item row="4" column="2">
<widget class="QCheckBox" name="opt_delete_news_from_library_on_upload">
<property name="text">
<string>&Delete news from library when it is automatically sent to reader</string>
</property>
</widget>
</item>
- <item row="5" column="0" colspan="2">
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="1" column="0">
+ <item row="6" column="0">
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QLabel" name="label_23">
+ <property name="text">
+ <string>Preferred &output format:</string>
+ </property>
+ <property name="buddy">
+ <cstring>opt_output_format</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="opt_output_format">
+ <property name="sizeAdjustPolicy">
+ <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
+ </property>
+ <property name="minimumContentsLength">
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="6" column="2">
+ <layout class="QHBoxLayout">
+ <item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Default network &timeout:</string>
@@ -61,7 +109,7 @@
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item>
<widget class="QSpinBox" name="opt_network_timeout">
<property name="toolTip">
<string>Set the default timeout for network fetches (i.e. anytime we go out to the internet to get information)</string>
@@ -80,7 +128,21 @@
</property>
</widget>
</item>
- <item row="2" column="1">
+ </layout>
+ </item>
+ <item row="8" column="0">
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QLabel" name="priority_label">
+ <property name="text">
+ <string>Job &priority:</string>
+ </property>
+ <property name="buddy">
+ <cstring>opt_worker_process_priority</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QComboBox" name="opt_worker_process_priority">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
@@ -105,37 +167,11 @@
</item>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="priority_label">
- <property name="text">
- <string>Job &priority:</string>
- </property>
- <property name="buddy">
- <cstring>opt_worker_process_priority</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_23">
- <property name="text">
- <string>Preferred &output format:</string>
- </property>
- <property name="buddy">
- <cstring>opt_output_format</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="opt_output_format">
- <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
- </property>
- <property name="minimumContentsLength">
- <number>10</number>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
+ </layout>
+ </item>
+ <item row="8" column="2">
+ <layout class="QHBoxLayout">
+ <item>
<widget class="QLabel" name="label_170">
<property name="text">
<string>Restriction to apply when the current library is opened:</string>
@@ -145,7 +181,7 @@
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item>
<widget class="QComboBox" name="opt_gui_restriction">
<property name="maximumSize">
<size>
@@ -166,14 +202,28 @@
</item>
</layout>
</item>
- <item row="6" column="0" colspan="2">
- <widget class="QPushButton" name="reset_confirmation_button">
- <property name="text">
- <string>Reset all disabled &confirmation dialogs</string>
- </property>
- </widget>
+ <item row="9" column="0">
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QLabel" name="edit_metadata_single_label">
+ <property name="text">
+ <string>Edit metadata (single) layout:</string>
+ </property>
+ <property name="buddy">
+ <cstring>opt_edit_metadata_single_layout</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="opt_edit_metadata_single_layout">
+ <property name="toolTip">
+ <string>Choose a different layout for the Edit Metadata dialog. The compact metadata layout favors editing custom metadata over changing covers and formats.</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="7" column="0">
+ <item row="20" column="0">
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>Preferred &input format order:</string>
@@ -235,7 +285,7 @@
</layout>
</widget>
</item>
- <item row="7" column="1">
+ <item row="20" column="2">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Use internal &viewer for:</string>
@@ -254,6 +304,13 @@
</layout>
</widget>
</item>
+ <item row="30" column="0" colspan="3">
+ <widget class="QPushButton" name="reset_confirmation_button">
+ <property name="text">
+ <string>Reset all disabled &confirmation dialogs</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<resources>
diff --git a/src/calibre/gui2/preferences/conversion.py b/src/calibre/gui2/preferences/conversion.py
index 8de9ee1661..b5240227d3 100644
--- a/src/calibre/gui2/preferences/conversion.py
+++ b/src/calibre/gui2/preferences/conversion.py
@@ -5,6 +5,8 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
+import importlib
+
from PyQt4.Qt import QIcon, Qt, QStringListModel, QVariant
from calibre.gui2.preferences import ConfigWidgetBase, test_widget, AbortCommit
@@ -104,8 +106,8 @@ class OutputOptions(Base):
for plugin in output_format_plugins():
name = plugin.name.lower().replace(' ', '_')
try:
- output_widget = __import__('calibre.gui2.convert.'+name,
- fromlist=[1])
+ output_widget = importlib.import_module(
+ 'calibre.gui2.convert.'+name)
pw = output_widget.PluginWidget
self.conversion_widgets.append(pw)
except ImportError:
diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py
index cee34f150e..f476845f8b 100644
--- a/src/calibre/gui2/preferences/create_custom_column.py
+++ b/src/calibre/gui2/preferences/create_custom_column.py
@@ -63,7 +63,7 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
for col, name in [('isbn', _('ISBN')), ('formats', _('Formats')),
('last_modified', _('Modified Date')), ('yesno', _('Yes/No')),
('tags', _('Tags')), ('series', _('Series')), ('rating',
- _('Rating'))]:
+ _('Rating')), ('people', _("People's names"))]:
text += ' <a href="col:%s">%s</a>,'%(col, name)
text = text[:-1]
self.shortcuts.setText(text)
@@ -125,6 +125,8 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
self.datatype_changed()
if ct in ['text', 'composite', 'enumeration']:
self.use_decorations.setChecked(c['display'].get('use_decorations', False))
+ elif ct == '*text':
+ self.is_names.setChecked(c['display'].get('is_names', False))
self.exec_()
def shortcut_activated(self, url):
@@ -134,6 +136,7 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
'tags' : 1,
'series': 3,
'rating': 8,
+ 'people': 1,
}.get(which, 10))
self.column_name_box.setText(which)
self.column_heading_box.setText({
@@ -143,7 +146,9 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
'tags': _('My Tags'),
'series': _('My Series'),
'rating': _('My Rating'),
- 'last_modified':_('Modified Date')}[which])
+ 'last_modified':_('Modified Date'),
+ 'people': _('People')}[which])
+ self.is_names.setChecked(which == 'people')
if self.composite_box.isVisible():
self.composite_box.setText(
{
@@ -153,7 +158,6 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
}[which])
self.composite_sort_by.setCurrentIndex(2 if which == 'last_modified' else 0)
-
def datatype_changed(self, *args):
try:
col_type = self.column_types[self.column_type_box.currentIndex()]['datatype']
@@ -167,6 +171,7 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
for x in ('box', 'default_label', 'label'):
getattr(self, 'enum_'+x).setVisible(col_type == 'enumeration')
self.use_decorations.setVisible(col_type in ['text', 'composite', 'enumeration'])
+ self.is_names.setVisible(col_type == '*text')
def accept(self):
col = unicode(self.column_name_box.text()).strip()
@@ -241,6 +246,8 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
return self.simple_error('', _('The value "{0}" is in the '
'list more than once').format(l[i]))
display_dict = {'enum_values': l}
+ elif col_type == 'text' and is_multiple:
+ display_dict = {'is_names': self.is_names.isChecked()}
if col_type in ['text', 'composite', 'enumeration']:
display_dict['use_decorations'] = self.use_decorations.checkState()
diff --git a/src/calibre/gui2/preferences/create_custom_column.ui b/src/calibre/gui2/preferences/create_custom_column.ui
index 3290d3c846..619b0c6212 100644
--- a/src/calibre/gui2/preferences/create_custom_column.ui
+++ b/src/calibre/gui2/preferences/create_custom_column.ui
@@ -9,7 +9,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>603</width>
+ <width>831</width>
<height>344</height>
</rect>
</property>
@@ -110,27 +110,37 @@
</item>
<item>
<widget class="QCheckBox" name="use_decorations">
- <property name="text">
- <string>Show checkmarks</string>
- </property>
<property name="toolTip">
<string>Show check marks in the GUI. Values of 'yes', 'checked', and 'true'
will show a green check. Values of 'no', 'unchecked', and 'false' will show a red X.
Everything else will show nothing.</string>
</property>
+ <property name="text">
+ <string>Show checkmarks</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="is_names">
+ <property name="toolTip">
+ <string>Check this box if this column contains names, like the authors column.</string>
+ </property>
+ <property name="text">
+ <string>Contains names</string>
+ </property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_27">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
@@ -241,25 +251,25 @@ Everything else will show nothing.</string>
</item>
<item>
<widget class="QCheckBox" name="composite_make_category">
- <property name="text">
- <string>Show in tags browser</string>
- </property>
<property name="toolTip">
<string>If checked, this column will appear in the tags browser as a category</string>
</property>
+ <property name="text">
+ <string>Show in tags browser</string>
+ </property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_24">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
diff --git a/src/calibre/gui2/preferences/emailp.py b/src/calibre/gui2/preferences/emailp.py
index 19007dfcf1..1644dc6b73 100644
--- a/src/calibre/gui2/preferences/emailp.py
+++ b/src/calibre/gui2/preferences/emailp.py
@@ -5,6 +5,8 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
+import textwrap
+
from PyQt4.Qt import QAbstractTableModel, QVariant, QFont, Qt
@@ -17,25 +19,30 @@ from calibre.utils.smtp import config as smtp_prefs
class EmailAccounts(QAbstractTableModel): # {{{
- def __init__(self, accounts):
+ def __init__(self, accounts, subjects):
QAbstractTableModel.__init__(self)
self.accounts = accounts
+ self.subjects = subjects
self.account_order = sorted(self.accounts.keys())
- self.headers = map(QVariant, [_('Email'), _('Formats'), _('Auto send')])
+ self.headers = map(QVariant, [_('Email'), _('Formats'), _('Subject'), _('Auto send')])
self.default_font = QFont()
self.default_font.setBold(True)
self.default_font = QVariant(self.default_font)
- self.tooltips =[NONE] + map(QVariant,
+ self.tooltips =[NONE] + list(map(QVariant, map(textwrap.fill,
[_('Formats to email. The first matching format will be sent.'),
+ _('Subject of the email to use when sending. When left blank '
+ 'the title will be used for the subject. Also, the same '
+ 'templates used for "Save to disk" such as {title} and '
+ '{author_sort} can be used here.'),
'<p>'+_('If checked, downloaded news will be automatically '
'mailed <br>to this email address '
- '(provided it is in one of the listed formats).')])
+ '(provided it is in one of the listed formats).')])))
def rowCount(self, *args):
return len(self.account_order)
def columnCount(self, *args):
- return 3
+ return len(self.headers)
def headerData(self, section, orientation, role):
if role == Qt.DisplayRole and orientation == Qt.Horizontal:
@@ -56,14 +63,16 @@ class EmailAccounts(QAbstractTableModel): # {{{
return QVariant(account)
if col == 1:
return QVariant(self.accounts[account][0])
+ if col == 2:
+ return QVariant(self.subjects.get(account, ''))
if role == Qt.FontRole and self.accounts[account][2]:
return self.default_font
- if role == Qt.CheckStateRole and col == 2:
+ if role == Qt.CheckStateRole and col == 3:
return QVariant(Qt.Checked if self.accounts[account][1] else Qt.Unchecked)
return NONE
def flags(self, index):
- if index.column() == 2:
+ if index.column() == 3:
return QAbstractTableModel.flags(self, index)|Qt.ItemIsUserCheckable
else:
return QAbstractTableModel.flags(self, index)|Qt.ItemIsEditable
@@ -73,11 +82,13 @@ class EmailAccounts(QAbstractTableModel): # {{{
return False
row, col = index.row(), index.column()
account = self.account_order[row]
- if col == 2:
+ if col == 3:
self.accounts[account][1] ^= True
+ elif col == 2:
+ self.subjects[account] = unicode(value.toString())
elif col == 1:
self.accounts[account][0] = unicode(value.toString()).upper()
- else:
+ elif col == 0:
na = unicode(value.toString())
from email.utils import parseaddr
addr = parseaddr(na)[-1]
@@ -89,7 +100,7 @@ class EmailAccounts(QAbstractTableModel): # {{{
self.accounts[na][0] = 'AZW, MOBI, TPZ, PRC, AZW1'
self.dataChanged.emit(
- self.index(index.row(), 0), self.index(index.row(), 2))
+ self.index(index.row(), 0), self.index(index.row(), 3))
return True
def make_default(self, index):
@@ -143,7 +154,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.send_email_widget.initialize(self.preferred_to_address)
self.send_email_widget.changed_signal.connect(self.changed_signal.emit)
opts = self.send_email_widget.smtp_opts
- self._email_accounts = EmailAccounts(opts.accounts)
+ self._email_accounts = EmailAccounts(opts.accounts, opts.subjects)
self._email_accounts.dataChanged.connect(lambda x,y:
self.changed_signal.emit())
self.email_view.setModel(self._email_accounts)
@@ -170,6 +181,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
if not self.send_email_widget.set_email_settings(to_set):
raise AbortCommit('abort')
self.proxy['accounts'] = self._email_accounts.accounts
+ self.proxy['subjects'] = self._email_accounts.subjects
return ConfigWidgetBase.commit(self)
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 206f2b97fb..71b9e38667 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -48,10 +48,9 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
r('disable_tray_notification', config)
r('use_roman_numerals_for_series_number', config)
r('separate_cover_flow', config, restart_required=True)
- r('show_child_bar', gprefs)
- choices = [(_('Small'), 'small'), (_('Medium'), 'medium'),
- (_('Large'), 'large')]
+ choices = [(_('Off'), 'off'), (_('Small'), 'small'),
+ (_('Medium'), 'medium'), (_('Large'), 'large')]
r('toolbar_icon_size', gprefs, choices=choices)
choices = [(_('Automatic'), 'auto'), (_('Always'), 'always'),
@@ -64,8 +63,9 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
r('tags_browser_collapse_at', gprefs)
choices = set([k for k in db.field_metadata.all_field_keys()
- if db.field_metadata[k]['is_category'] and
- db.field_metadata[k]['datatype'] in ['text', 'series', 'enumeration']])
+ if db.field_metadata[k]['is_category'] and
+ (db.field_metadata[k]['datatype'] in ['text', 'series', 'enumeration']) and
+ not db.field_metadata[k]['display'].get('is_names', False)])
choices -= set(['authors', 'publisher', 'formats', 'news', 'identifiers'])
choices |= set(['search'])
self.opt_categories_using_hierarchy.update_items_cache(choices)
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index bc965b89fa..996caeb653 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>670</width>
- <height>422</height>
+ <width>717</width>
+ <height>444</height>
</rect>
</property>
<property name="windowTitle">
@@ -244,13 +244,6 @@ then the tags will be displayed each on their own line.</string>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2">
- <widget class="QCheckBox" name="opt_show_child_bar">
- <property name="text">
- <string>&Split the toolbar into two toolbars</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
diff --git a/src/calibre/gui2/preferences/main.py b/src/calibre/gui2/preferences/main.py
index f25cc85dce..9f26bea7ce 100644
--- a/src/calibre/gui2/preferences/main.py
+++ b/src/calibre/gui2/preferences/main.py
@@ -7,6 +7,7 @@ __docformat__ = 'restructuredtext en'
import textwrap
from functools import partial
+from collections import OrderedDict
from PyQt4.Qt import QMainWindow, Qt, QIcon, QStatusBar, QFont, QWidget, \
QScrollArea, QStackedWidget, QVBoxLayout, QLabel, QFrame, QKeySequence, \
@@ -18,7 +19,6 @@ from calibre.gui2 import gprefs, min_available_height, available_width, \
warning_dialog
from calibre.gui2.preferences import init_gui, AbortCommit, get_plugin
from calibre.customize.ui import preferences_plugins
-from calibre.utils.ordered_dict import OrderedDict
ICON_SIZE = 32
@@ -71,11 +71,11 @@ class Category(QWidget): # {{{
plugin_activated = pyqtSignal(object)
- def __init__(self, name, plugins, parent=None):
+ def __init__(self, name, plugins, gui_name, parent=None):
QWidget.__init__(self, parent)
self._layout = QVBoxLayout()
self.setLayout(self._layout)
- self.label = QLabel(name)
+ self.label = QLabel(gui_name)
self.sep = QFrame(self)
self.bf = QFont()
self.bf.setBold(True)
@@ -118,12 +118,17 @@ class Browser(QScrollArea): # {{{
QScrollArea.__init__(self, parent)
self.setWidgetResizable(True)
- category_map = {}
+ category_map, category_names = {}, {}
for plugin in preferences_plugins():
if plugin.category not in category_map:
category_map[plugin.category] = plugin.category_order
if category_map[plugin.category] < plugin.category_order:
category_map[plugin.category] = plugin.category_order
+ if plugin.category not in category_names:
+ category_names[plugin.category] = (plugin.gui_category if
+ plugin.gui_category else plugin.category)
+
+ self.category_names = category_names
categories = list(category_map.keys())
categories.sort(cmp=lambda x, y: cmp(category_map[x], category_map[y]))
@@ -145,7 +150,7 @@ class Browser(QScrollArea): # {{{
self.setWidget(self.container)
for name, plugins in self.category_map.items():
- w = Category(name, plugins, self)
+ w = Category(name, plugins, self.category_names[name], parent=self)
self.widgets.append(w)
self._layout.addWidget(w)
w.plugin_activated.connect(self.show_plugin.emit)
@@ -355,6 +360,7 @@ class Preferences(QMainWindow):
self.gui.create_device_menu()
self.gui.set_device_menu_items_state(bool(self.gui.device_connected))
self.gui.tool_bar.build_bar()
+ self.gui.menu_bar.build_bar()
self.gui.build_context_menus()
self.gui.tool_bar.apply_settings()
diff --git a/src/calibre/gui2/preferences/metadata_sources.py b/src/calibre/gui2/preferences/metadata_sources.py
new file mode 100644
index 0000000000..4500a03b30
--- /dev/null
+++ b/src/calibre/gui2/preferences/metadata_sources.py
@@ -0,0 +1,308 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+ print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+from operator import attrgetter
+
+from PyQt4.Qt import (QAbstractTableModel, Qt, QAbstractListModel, QWidget,
+ pyqtSignal, QVBoxLayout, QDialogButtonBox, QFrame, QLabel)
+
+from calibre.gui2.preferences import ConfigWidgetBase, test_widget
+from calibre.gui2.preferences.metadata_sources_ui import Ui_Form
+from calibre.ebooks.metadata.sources.base import msprefs
+from calibre.customize.ui import (all_metadata_plugins, is_disabled,
+ enable_plugin, disable_plugin, default_disabled_plugins)
+from calibre.gui2 import NONE, error_dialog
+
+class SourcesModel(QAbstractTableModel): # {{{
+
+ def __init__(self, parent=None):
+ QAbstractTableModel.__init__(self, parent)
+
+ self.plugins = []
+ self.enabled_overrides = {}
+ self.cover_overrides = {}
+
+ def initialize(self):
+ self.plugins = list(all_metadata_plugins())
+ self.plugins.sort(key=attrgetter('name'))
+ self.enabled_overrides = {}
+ self.cover_overrides = {}
+ self.reset()
+
+ def rowCount(self, parent=None):
+ return len(self.plugins)
+
+ def columnCount(self, parent=None):
+ return 2
+
+ def headerData(self, section, orientation, role):
+ if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+ if section == 0:
+ return _('Source')
+ if section == 1:
+ return _('Cover priority')
+ return NONE
+
+ def data(self, index, role):
+ try:
+ plugin = self.plugins[index.row()]
+ except:
+ return NONE
+ col = index.column()
+
+ if role == Qt.DisplayRole:
+ if col == 0:
+ return plugin.name
+ elif col == 1:
+ orig = msprefs['cover_priorities'].get(plugin.name, 1)
+ return self.cover_overrides.get(plugin, orig)
+ elif role == Qt.CheckStateRole and col == 0:
+ orig = Qt.Unchecked if is_disabled(plugin) else Qt.Checked
+ return self.enabled_overrides.get(plugin, orig)
+ elif role == Qt.UserRole:
+ return plugin
+ return NONE
+
+ def setData(self, index, val, role):
+ try:
+ plugin = self.plugins[index.row()]
+ except:
+ return False
+ col = index.column()
+ ret = False
+ if col == 0 and role == Qt.CheckStateRole:
+ val, ok = val.toInt()
+ if ok:
+ self.enabled_overrides[plugin] = val
+ ret = True
+ if col == 1 and role == Qt.EditRole:
+ val, ok = val.toInt()
+ if ok:
+ self.cover_overrides[plugin] = val
+ ret = True
+ if ret:
+ self.dataChanged.emit(index, index)
+ return ret
+
+
+ def flags(self, index):
+ col = index.column()
+ ans = QAbstractTableModel.flags(self, index)
+ if col == 0:
+ return ans | Qt.ItemIsUserCheckable
+ return Qt.ItemIsEditable | ans
+
+ def commit(self):
+ for plugin, val in self.enabled_overrides.iteritems():
+ if val == Qt.Checked:
+ enable_plugin(plugin)
+ elif val == Qt.Unchecked:
+ disable_plugin(plugin)
+
+ if self.cover_overrides:
+ cp = msprefs['cover_priorities']
+ for plugin, val in self.cover_overrides.iteritems():
+ if val == 1:
+ cp.pop(plugin.name, None)
+ else:
+ cp[plugin.name] = val
+ msprefs['cover_priorities'] = cp
+
+ self.enabled_overrides = {}
+ self.cover_overrides = {}
+
+ def restore_defaults(self):
+ self.enabled_overrides = dict([(p, (Qt.Unchecked if p.name in
+ default_disabled_plugins else Qt.Checked)) for p in self.plugins])
+ self.cover_overrides = dict([(p,
+ msprefs.defaults['cover_priorities'].get(p.name, 1))
+ for p in self.plugins])
+ self.reset()
+
+# }}}
+
+class FieldsModel(QAbstractListModel): # {{{
+
+
+ def __init__(self, parent=None):
+ QAbstractTableModel.__init__(self, parent)
+
+ self.fields = []
+ self.descs = {
+ 'authors': _('Authors'),
+ 'comments': _('Comments'),
+ 'pubdate': _('Published date'),
+ 'publisher': _('Publisher'),
+ 'rating' : _('Rating'),
+ 'tags' : _('Tags'),
+ 'title': _('Title'),
+ 'series': _('Series'),
+ 'language': _('Language'),
+ }
+ self.overrides = {}
+ self.exclude = frozenset(['series_index'])
+
+ def rowCount(self, parent=None):
+ return len(self.fields)
+
+ def initialize(self):
+ fields = set()
+ for p in all_metadata_plugins():
+ fields |= p.touched_fields
+ self.fields = []
+ for x in fields:
+ if not x.startswith('identifier:') and x not in self.exclude:
+ self.fields.append(x)
+ self.fields.sort(key=lambda x:self.descs.get(x, x))
+ self.reset()
+
+ def state(self, field, defaults=False):
+ src = msprefs.defaults if defaults else msprefs
+ return (Qt.Unchecked if field in src['ignore_fields']
+ else Qt.Checked)
+
+ def data(self, index, role):
+ try:
+ field = self.fields[index.row()]
+ except:
+ return None
+ if role == Qt.DisplayRole:
+ return self.descs.get(field, field)
+ if role == Qt.CheckStateRole:
+ return self.overrides.get(field, self.state(field))
+ return NONE
+
+ def flags(self, index):
+ ans = QAbstractTableModel.flags(self, index)
+ return ans | Qt.ItemIsUserCheckable
+
+ def restore_defaults(self):
+ self.overrides = dict([(f, self.state(f, True)) for f in self.fields])
+ self.reset()
+
+ def setData(self, index, val, role):
+ try:
+ field = self.fields[index.row()]
+ except:
+ return False
+ ret = False
+ if role == Qt.CheckStateRole:
+ val, ok = val.toInt()
+ if ok:
+ self.overrides[field] = val
+ ret = True
+ if ret:
+ self.dataChanged.emit(index, index)
+ return ret
+
+ def commit(self):
+ val = [k for k, v in self.overrides.iteritems() if v == Qt.Unchecked]
+ msprefs['ignore_fields'] = val
+
+
+# }}}
+
+class PluginConfig(QWidget): # {{{
+
+ finished = pyqtSignal()
+
+ def __init__(self, plugin, parent):
+ QWidget.__init__(self, parent)
+
+ self.plugin = plugin
+
+ self.l = l = QVBoxLayout()
+ self.setLayout(l)
+ self.c = c = QLabel(_('<b>Configure %s</b><br>%s') % (plugin.name,
+ plugin.description))
+ c.setAlignment(Qt.AlignHCenter)
+ l.addWidget(c)
+
+ self.config_widget = plugin.config_widget()
+ self.l.addWidget(self.config_widget)
+
+ self.bb = QDialogButtonBox(
+ QDialogButtonBox.Save|QDialogButtonBox.Cancel,
+ parent=self)
+ self.bb.accepted.connect(self.finished)
+ self.bb.rejected.connect(self.finished)
+ self.bb.accepted.connect(self.commit)
+ l.addWidget(self.bb)
+
+ self.f = QFrame(self)
+ self.f.setFrameShape(QFrame.HLine)
+ l.addWidget(self.f)
+
+ def commit(self):
+ self.plugin.save_settings(self.config_widget)
+# }}}
+
+class ConfigWidget(ConfigWidgetBase, Ui_Form):
+
+ def genesis(self, gui):
+ r = self.register
+ r('txt_comments', msprefs)
+ r('max_tags', msprefs)
+ r('wait_after_first_identify_result', msprefs)
+ r('wait_after_first_cover_result', msprefs)
+
+ self.configure_plugin_button.clicked.connect(self.configure_plugin)
+ self.sources_model = SourcesModel(self)
+ self.sources_view.setModel(self.sources_model)
+ self.sources_model.dataChanged.connect(self.changed_signal)
+
+ self.fields_model = FieldsModel(self)
+ self.fields_view.setModel(self.fields_model)
+ self.fields_model.dataChanged.connect(self.changed_signal)
+
+ def configure_plugin(self):
+ for index in self.sources_view.selectionModel().selectedRows():
+ plugin = self.sources_model.data(index, Qt.UserRole)
+ if plugin is not NONE:
+ return self.do_config(plugin)
+ error_dialog(self, _('No source selected'),
+ _('No source selected, cannot configure.'), show=True)
+
+ def do_config(self, plugin):
+ self.pc = PluginConfig(plugin, self)
+ self.stack.insertWidget(1, self.pc)
+ self.stack.setCurrentIndex(1)
+ self.pc.finished.connect(self.pc_finished)
+
+ def pc_finished(self):
+ try:
+ self.pc.finished.diconnect()
+ except:
+ pass
+ self.stack.setCurrentIndex(0)
+ self.stack.removeWidget(self.pc)
+ self.pc = None
+
+ def initialize(self):
+ ConfigWidgetBase.initialize(self)
+ self.sources_model.initialize()
+ self.sources_view.resizeColumnsToContents()
+ self.fields_model.initialize()
+
+ def restore_defaults(self):
+ ConfigWidgetBase.restore_defaults(self)
+ self.sources_model.restore_defaults()
+ self.fields_model.restore_defaults()
+ self.changed_signal.emit()
+
+ def commit(self):
+ self.sources_model.commit()
+ self.fields_model.commit()
+ return ConfigWidgetBase.commit(self)
+
+if __name__ == '__main__':
+ from PyQt4.Qt import QApplication
+ app = QApplication([])
+ test_widget('Sharing', 'Metadata download')
+
diff --git a/src/calibre/gui2/preferences/metadata_sources.ui b/src/calibre/gui2/preferences/metadata_sources.ui
new file mode 100644
index 0000000000..546120f628
--- /dev/null
+++ b/src/calibre/gui2/preferences/metadata_sources.ui
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>781</width>
+ <height>300</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QStackedWidget" name="stack">
+ <widget class="QWidget" name="page">
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" rowspan="5">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Metadata sources</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Disable any metadata sources you do not want by unchecking them. You can also set the cover priority. Covers from sources that have a higher (smaller) priority will be preferred when bulk downloading metadata.
+</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QTableView" name="sources_view">
+ <property name="selectionMode">
+ <enum>QAbstractItemView::SingleSelection</enum>
+ </property>
+ <property name="selectionBehavior">
+ <enum>QAbstractItemView::SelectRows</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="configure_plugin_button">
+ <property name="text">
+ <string>Configure selected source</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../../resources/images.qrc">
+ <normaloff>:/images/plugins.png</normaloff>:/images/plugins.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="1" colspan="2">
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Downloaded metadata fields</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QListView" name="fields_view">
+ <property name="toolTip">
+ <string>If you uncheck any fields, metadata for those fields will not be downloaded</string>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::NoSelection</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="2">
+ <widget class="QCheckBox" name="opt_txt_comments">
+ <property name="text">
+ <string>Convert all downloaded comments to plain &text</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Max. number of &tags to download:</string>
+ </property>
+ <property name="buddy">
+ <cstring>opt_max_tags</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="QSpinBox" name="opt_max_tags"/>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Max. &time to wait after first match is found:</string>
+ </property>
+ <property name="buddy">
+ <cstring>opt_wait_after_first_identify_result</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2">
+ <widget class="QSpinBox" name="opt_wait_after_first_identify_result">
+ <property name="suffix">
+ <string> secs</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Max. time to wait after first &cover is found:</string>
+ </property>
+ <property name="buddy">
+ <cstring>opt_wait_after_first_cover_result</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="2">
+ <widget class="QSpinBox" name="opt_wait_after_first_cover_result">
+ <property name="suffix">
+ <string> secs</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="page_2"/>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="../../../../resources/images.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/src/calibre/gui2/preferences/plugboard.py b/src/calibre/gui2/preferences/plugboard.py
index e1dc6b03bd..8f2b084d76 100644
--- a/src/calibre/gui2/preferences/plugboard.py
+++ b/src/calibre/gui2/preferences/plugboard.py
@@ -251,7 +251,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
if d != 0:
try:
validation_formatter.validate(s)
- except Exception, err:
+ except Exception as err:
error_dialog(self, _('Invalid template'),
'<p>'+_('The template %s is invalid:')%s + \
'<br>'+str(err), show=True)
diff --git a/src/calibre/gui2/preferences/plugins.py b/src/calibre/gui2/preferences/plugins.py
index cc7821d1fe..79cd2b1ce4 100644
--- a/src/calibre/gui2/preferences/plugins.py
+++ b/src/calibre/gui2/preferences/plugins.py
@@ -6,6 +6,7 @@ __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
import textwrap, os
+from collections import OrderedDict
from PyQt4.Qt import Qt, QModelIndex, QAbstractItemModel, QVariant, QIcon, \
QBrush
@@ -19,7 +20,6 @@ from calibre.gui2 import NONE, error_dialog, info_dialog, choose_files, \
question_dialog, gprefs
from calibre.utils.search_query_parser import SearchQueryParser
from calibre.utils.icu import lower
-from calibre.utils.ordered_dict import OrderedDict
class PluginModel(QAbstractItemModel, SearchQueryParser): # {{{
diff --git a/src/calibre/gui2/preferences/save_template.py b/src/calibre/gui2/preferences/save_template.py
index 4c00a14c0f..96ca8c8945 100644
--- a/src/calibre/gui2/preferences/save_template.py
+++ b/src/calibre/gui2/preferences/save_template.py
@@ -57,7 +57,7 @@ class SaveTemplate(QWidget, Ui_Form):
return question_dialog(self, _('Constant template'),
_('The template contains no {fields}, so all '
'books will have the same name. Is this OK?'))
- except Exception, err:
+ except Exception as err:
error_dialog(self, _('Invalid template'),
'<p>'+_('The template %s is invalid:')%tmpl + \
'<br>'+str(err), show=True)
diff --git a/src/calibre/gui2/preferences/server.py b/src/calibre/gui2/preferences/server.py
index 82519f17cd..f4a00c0932 100644
--- a/src/calibre/gui2/preferences/server.py
+++ b/src/calibre/gui2/preferences/server.py
@@ -18,6 +18,7 @@ from calibre.utils.config import ConfigProxy
from calibre.gui2 import error_dialog, config, open_url, warning_dialog, \
Dispatcher, info_dialog
from calibre import as_unicode
+from calibre.utils.icu import sort_key
class ConfigWidget(ConfigWidgetBase, Ui_Form):
@@ -42,8 +43,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
else self.opt_password.Password))
self.opt_password.setEchoMode(self.opt_password.Password)
- restrictions = sorted(saved_searches().names(),
- cmp=lambda x,y: cmp(x.lower(), y.lower()))
+ restrictions = sorted(saved_searches().names(), key=sort_key)
+ # verify that the current restriction still exists. If not, clear it.
+ csr = db.prefs.get('cs_restriction', None)
+ if csr and csr not in restrictions:
+ db.prefs.set('cs_restriction', '')
choices = [('', '')] + [(x, x) for x in restrictions]
r('cs_restriction', db.prefs, choices=choices)
@@ -57,17 +61,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
r('autolaunch_server', config)
- def set_server_options(self):
- c = self.proxy
- c.set('port', self.opt_port.value())
- c.set('username', unicode(self.opt_username.text()).strip())
- p = unicode(self.opt_password.text()).strip()
- if not p:
- p = None
- c.set('password', p)
-
def start_server(self):
- self.set_server_options()
+ ConfigWidgetBase.commit(self)
self.gui.start_content_server(check_started=False)
while not self.gui.content_server.is_running and self.gui.content_server.exception is None:
time.sleep(1)
diff --git a/src/calibre/gui2/preferences/toolbar.py b/src/calibre/gui2/preferences/toolbar.py
index a0d48f3910..7f5e0c4441 100644
--- a/src/calibre/gui2/preferences/toolbar.py
+++ b/src/calibre/gui2/preferences/toolbar.py
@@ -34,9 +34,12 @@ class BaseModel(QAbstractListModel):
if name == 'Location Manager':
return FakeAction(name, None,
_('Switch between library and device views'),
- dont_remove_from=set(['toolbar-device']))
+ dont_add_to=frozenset(['menubar', 'toolbar',
+ 'toolbar-child', 'context-menu',
+ 'context-menu-device']))
if name is None:
- return FakeAction('--- '+_('Separator')+' ---', None)
+ return FakeAction('--- '+_('Separator')+' ---', None,
+ dont_add_to=frozenset(['menubar', 'menubar-device']))
try:
return gui.iactions[name]
except:
@@ -77,6 +80,12 @@ class BaseModel(QAbstractListModel):
ans.append(n)
return ans
+ def has_action(self, name):
+ for a in self._data:
+ if a.name == name:
+ return True
+ return False
+
class AllModel(BaseModel):
@@ -89,7 +98,7 @@ class AllModel(BaseModel):
self._data = self.get_all_actions(current)
def get_all_actions(self, current):
- all = list(self.gui.iactions.keys()) + ['Donate']
+ all = list(self.gui.iactions.keys()) + ['Donate', 'Location Manager']
all = [x for x in all if x not in current] + [None]
all = [self.name_to_action(x, self.gui) for x in all]
all = [x for x in all if self.key not in x.dont_add_to]
@@ -209,10 +218,13 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
LOCATIONS = [
('toolbar', _('The main toolbar')),
('toolbar-device', _('The main toolbar when a device is connected')),
+ ('toolbar-child', _('The optional second toolbar')),
+ ('menubar', _('The menubar')),
+ ('menubar-device', _('The menubar when a device is connected')),
('context-menu', _('The context menu for the books in the '
'calibre library')),
('context-menu-device', _('The context menu for the books on '
- 'the device'))
+ 'the device')),
]
def genesis(self, gui):
@@ -283,6 +295,18 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.changed_signal.emit()
def commit(self):
+ # Ensure preferences are showing in either the toolbar or
+ # the menubar.
+ pref_in_toolbar = self.models['toolbar'][1].has_action('Preferences')
+ pref_in_menubar = self.models['menubar'][1].has_action('Preferences')
+ lm_in_toolbar = self.models['toolbar-device'][1].has_action('Location Manager')
+ lm_in_menubar = self.models['menubar-device'][1].has_action('Location Manager')
+ if not pref_in_toolbar and not pref_in_menubar:
+ self.models['menubar'][1].add(['Preferences'])
+ if not lm_in_toolbar and not lm_in_menubar:
+ self.models['menubar-device'][1].add(['Location Manager'])
+
+ # Save data.
for am, cm in self.models.values():
cm.commit()
return False
diff --git a/src/calibre/gui2/preferences/tweaks.py b/src/calibre/gui2/preferences/tweaks.py
index 9d0097ac35..a1756bf1ba 100644
--- a/src/calibre/gui2/preferences/tweaks.py
+++ b/src/calibre/gui2/preferences/tweaks.py
@@ -14,9 +14,9 @@ from calibre.utils.config import read_raw_tweaks, write_tweaks
from calibre.gui2.widgets import PythonHighlighter
from calibre import isbytestring
-from PyQt4.Qt import QAbstractListModel, Qt, QStyledItemDelegate, QStyle, \
- QStyleOptionViewItem, QFont, QDialogButtonBox, QDialog, \
- QVBoxLayout, QPlainTextEdit, QLabel
+from PyQt4.Qt import (QAbstractListModel, Qt, QStyledItemDelegate, QStyle,
+ QStyleOptionViewItem, QFont, QDialogButtonBox, QDialog,
+ QVBoxLayout, QPlainTextEdit, QLabel)
class Delegate(QStyledItemDelegate): # {{{
def __init__(self, view):
@@ -35,8 +35,9 @@ class Delegate(QStyledItemDelegate): # {{{
class Tweak(object): # {{{
def __init__(self, name, doc, var_names, defaults, custom):
- self.name = name
- self.doc = doc.strip()
+ translate = __builtins__['_']
+ self.name = translate(name)
+ self.doc = translate(doc.strip())
self.var_names = var_names
self.default_values = {}
for x in var_names:
diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index fa3b597636..ea7cab95d0 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -109,7 +109,7 @@ class SearchBox2(QComboBox): # {{{
def normalize_state(self):
self.setToolTip(self.tool_tip_text)
self.line_edit.setStyleSheet(
- 'QLineEdit{color:black;background-color:%s;}' % self.normal_background)
+ 'QLineEdit{color:none;background-color:%s;}' % self.normal_background)
def text(self):
return self.currentText()
@@ -436,14 +436,15 @@ class SavedSearchBoxMixin(object): # {{{
b = getattr(self, x+'_search_button')
b.setStatusTip(b.toolTip())
- def saved_searches_changed(self, set_restriction=None):
+ def saved_searches_changed(self, set_restriction=None, recount=True):
p = sorted(saved_searches().names(), key=sort_key)
if set_restriction is None:
set_restriction = unicode(self.search_restriction.currentText())
# rebuild the restrictions combobox using current saved searches
self.search_restriction.clear()
self.search_restriction.addItem('')
- self.tags_view.recount()
+ if recount:
+ self.tags_view.recount()
for s in p:
self.search_restriction.addItem(s)
if set_restriction: # redo the search restriction if there was one
diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index 73c191101c..74e448da6e 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -25,8 +25,9 @@ class SearchRestrictionMixin(object):
r = self.search_restriction.findText(name)
if r < 0:
r = 0
- self.search_restriction.setCurrentIndex(r)
- self.apply_search_restriction(r)
+ if r != self.search_restriction.currentIndex():
+ self.search_restriction.setCurrentIndex(r)
+ self.apply_search_restriction(r)
def apply_search_restriction(self, i):
r = unicode(self.search_restriction.currentText())
diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py
index dd8c81d819..83695b86c1 100644
--- a/src/calibre/gui2/tag_view.py
+++ b/src/calibre/gui2/tag_view.py
@@ -16,7 +16,7 @@ from PyQt4.Qt import Qt, QTreeView, QApplication, pyqtSignal, QFont, QSize, \
QIcon, QPoint, QVBoxLayout, QHBoxLayout, QComboBox, QTimer,\
QAbstractItemModel, QVariant, QModelIndex, QMenu, QFrame,\
QPushButton, QWidget, QItemDelegate, QString, QLabel, \
- QShortcut, QKeySequence, SIGNAL, QMimeData
+ QShortcut, QKeySequence, SIGNAL, QMimeData, QToolButton
from calibre.ebooks.metadata import title_sort
from calibre.gui2 import config, NONE, gprefs
@@ -158,11 +158,17 @@ class TagsView(QTreeView): # {{{
self.setContextMenuPolicy(Qt.CustomContextMenu)
pop = config['sort_tags_by']
self.sort_by.setCurrentIndex(self.db.CATEGORY_SORTS.index(pop))
+ try:
+ match_pop = self.db.MATCH_TYPE.index(config['match_tags_type'])
+ except ValueError:
+ match_pop = 0
+ self.tag_match.setCurrentIndex(match_pop)
if not self.made_connections:
self.clicked.connect(self.toggle)
self.customContextMenuRequested.connect(self.show_context_menu)
self.refresh_required.connect(self.recount, type=Qt.QueuedConnection)
self.sort_by.currentIndexChanged.connect(self.sort_changed)
+ self.tag_match.currentIndexChanged.connect(self.match_changed)
self.made_connections = True
self.refresh_signal_processed = True
db.add_listener(self.database_changed)
@@ -180,6 +186,12 @@ class TagsView(QTreeView): # {{{
config.set('sort_tags_by', self.db.CATEGORY_SORTS[pop])
self.recount()
+ def match_changed(self, pop):
+ try:
+ config.set('match_tags_type', self.db.MATCH_TYPE[pop])
+ except:
+ pass
+
def set_search_restriction(self, s):
if s:
self.search_restriction = s
@@ -658,8 +670,7 @@ class TagTreeItem(object): # {{{
def tag_data(self, role):
tag = self.tag
- if tag.category == 'authors' and \
- tweaks['categories_use_field_for_author_name'] == 'author_sort':
+ if tag.use_sort_as_name:
name = tag.sort
tt_author = True
else:
@@ -707,8 +718,8 @@ class TagTreeItem(object): # {{{
break
elif self.tag.state == TAG_SEARCH_STATES['mark_plusplus'] or\
self.tag.state == TAG_SEARCH_STATES['mark_minusminus']:
- if self.tag.is_searchable and self.tag.is_hierarchical \
- and len(self.children):
+ if self.tag.is_searchable and len(self.children) and \
+ self.tag.is_hierarchical == '5state':
break
else:
break
@@ -803,7 +814,8 @@ class TagsModel(QAbstractItemModel): # {{{
self.category_nodes.append(node)
node.can_be_edited = (not is_gst) and (i == (len(path_parts)-1))
node.is_gst = is_gst
- node.tag.is_hierarchical = not is_gst
+ if not is_gst:
+ node.tag.is_hierarchical = '5state'
if not is_gst:
tree_root[p] = {}
tree_root = tree_root[p]
@@ -973,6 +985,7 @@ class TagsModel(QAbstractItemModel): # {{{
def do_drop_from_library(self, md, action, row, column, parent):
idx = parent
if idx.isValid():
+ self.tags_view.setCurrentIndex(idx)
node = self.data(idx, Qt.UserRole)
if node.type == TagTreeItem.TAG:
fm = self.db.metadata_for_field(node.tag.category)
@@ -1050,12 +1063,12 @@ class TagsModel(QAbstractItemModel): # {{{
if (key == 'authors' and len(ids) >= 5):
if not confirm('<p>'+_('Changing the authors for several books can '
'take a while. Are you sure?')
- +'</p>', 'tag_browser_drop_authors', self.parent()):
+ +'</p>', 'tag_browser_drop_authors', self.tags_view):
return
elif len(ids) > 15:
if not confirm('<p>'+_('Changing the metadata for that many books '
'can take a while. Are you sure?')
- +'</p>', 'tag_browser_many_changes', self.parent()):
+ +'</p>', 'tag_browser_many_changes', self.tags_view):
return
fm = self.db.metadata_for_field(key)
@@ -1274,6 +1287,7 @@ class TagsModel(QAbstractItemModel): # {{{
if len(components) == 0 or '.'.join(components) != tag.original_name:
components = [tag.original_name]
if (not tag.is_hierarchical) and (in_uc or
+ (fm['is_custom'] and fm['display'].get('is_names', False)) or
key in ['authors', 'publisher', 'news', 'formats', 'rating'] or
key not in self.db.prefs.get('categories_using_hierarchy', []) or
len(components) == 1):
@@ -1294,7 +1308,8 @@ class TagsModel(QAbstractItemModel): # {{{
if t.type != TagTreeItem.CATEGORY])
if (comp,tag.category) in child_map:
node_parent = child_map[(comp,tag.category)]
- node_parent.tag.is_hierarchical = key != 'search'
+ node_parent.tag.is_hierarchical = \
+ '5state' if tag.category != 'search' else '3state'
else:
if i < len(components)-1:
t = copy.copy(tag)
@@ -1309,7 +1324,8 @@ class TagsModel(QAbstractItemModel): # {{{
t = tag
if not in_uc:
t.original_name = t.name
- t.is_hierarchical = key != 'search'
+ t.is_hierarchical = \
+ '5state' if t.category != 'search' else '3state'
t.name = comp
self.beginInsertRows(category_index, 999999, 1)
node_parent = TagTreeItem(parent=node_parent, data=t,
@@ -1502,7 +1518,7 @@ class TagsModel(QAbstractItemModel): # {{{
if node.tag.category in \
('tags', 'series', 'authors', 'rating', 'publisher') or \
(fm['is_custom'] and \
- fm['datatype'] in ['text', 'rating', 'series']):
+ fm['datatype'] in ['text', 'rating', 'series', 'enumeration']):
ans |= Qt.ItemIsDropEnabled
else:
ans |= Qt.ItemIsDropEnabled
@@ -2058,17 +2074,18 @@ class TagBrowserWidget(QWidget): # {{{
sc = QShortcut(QKeySequence(_('ALT+f')), parent)
sc.connect(sc, SIGNAL('activated()'), self.set_focus_to_find_box)
- self.search_button = QPushButton()
+ self.search_button = QToolButton()
self.search_button.setText(_('F&ind'))
self.search_button.setToolTip(_('Find the first/next matching item'))
- self.search_button.setFixedWidth(40)
search_layout.addWidget(self.search_button)
- self.expand_button = QPushButton()
+ self.expand_button = QToolButton()
self.expand_button.setText('-')
- self.expand_button.setFixedWidth(20)
self.expand_button.setToolTip(_('Collapse all categories'))
search_layout.addWidget(self.expand_button)
+ search_layout.setStretch(0, 10)
+ search_layout.setStretch(1, 1)
+ search_layout.setStretch(2, 1)
self.current_find_position = None
self.search_button.clicked.connect(self.find)
@@ -2110,6 +2127,7 @@ class TagBrowserWidget(QWidget): # {{{
parent.sort_by.setCurrentIndex(0)
self._layout.addWidget(parent.sort_by)
+ # Must be in the same order as db2.MATCH_TYPE
parent.tag_match = QComboBox(parent)
for x in (_('Match any'), _('Match all')):
parent.tag_match.addItem(x)
diff --git a/src/calibre/gui2/threaded_jobs.py b/src/calibre/gui2/threaded_jobs.py
new file mode 100644
index 0000000000..f29baf4134
--- /dev/null
+++ b/src/calibre/gui2/threaded_jobs.py
@@ -0,0 +1,238 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+ print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+import os, time, tempfile, json
+from threading import Thread, RLock, Event
+from Queue import Queue
+
+from calibre.utils.ipc.job import BaseJob
+from calibre.utils.logging import GUILog
+from calibre.ptempfile import base_dir
+
+class ThreadedJob(BaseJob):
+
+ def __init__(self,
+ type_, description,
+
+ func, args, kwargs,
+
+ callback,
+
+ max_concurrent_count=1,
+ killable=True,
+ log=None):
+ '''
+ A job that is run in its own thread in the calibre main process
+
+ :param type_: The type of this job (a string). The type is used in
+ conjunction with max_concurrent_count to prevent too many jobs of the
+ same type from running
+
+ :param description: A user viewable job description
+
+ :func: The function that actually does the work. This function *must*
+ accept at least three keyword arguments: abort, log and notifications. abort is
+ An Event object. func should periodically check abort.is_set(0 and if
+ it is True, it should stop processing as soon as possible. notifications
+ is a Queue. func should put progress notifications into it in the form
+ of a tuple (frac, msg). frac is a number between 0 and 1 indicating
+ progress and msg is a string describing the progress. log is a Log
+ object which func should use for all debugging output. func should
+ raise an Exception to indicate failure. This exception is stored in
+ job.exception and can thus be used to pass arbitrary information to
+ callback.
+
+ :param args,kwargs: These are passed to func when it is called
+
+ :param callback: A callable that is called on completion of this job.
+ Note that it is not called if the user kills the job. Check job.failed
+ to see if the job succeeded or not. And use job.log to get the job log.
+
+ :param killable: If False the GUI wont let the user kill this job
+
+ :param log: Must be a subclass of GUILog or None. If None a default
+ GUILog is created.
+ '''
+ BaseJob.__init__(self, description)
+
+ self.type = type_
+ self.max_concurrent_count = max_concurrent_count
+ self.killable = killable
+ self.callback = callback
+ self.abort = Event()
+ self.exception = None
+
+ kwargs['notifications'] = self.notifications
+ kwargs['abort'] = self.abort
+ self.log = GUILog() if log is None else log
+ kwargs['log'] = self.log
+
+ self.func, self.args, self.kwargs = func, args, kwargs
+ self.consolidated_log = None
+
+ def start_work(self):
+ self.start_time = time.time()
+ self.log('Starting job:', self.description)
+ try:
+ self.result = self.func(*self.args, **self.kwargs)
+ except Exception as e:
+ self.exception = e
+ self.failed = True
+ self.log.exception('Job: "%s" failed with error:'%self.description)
+ self.log.debug('Called with args:', self.args, self.kwargs)
+
+ self.duration = time.time() - self.start_time
+ try:
+ self.callback(self)
+ except:
+ pass
+ self._cleanup()
+
+ def _cleanup(self):
+
+ try:
+ self.consolidate_log()
+ except:
+ self.log.exception('Log consolidation failed')
+
+ # No need to keep references to these around anymore
+ self.func = self.args = self.kwargs = self.notifications = None
+
+ def kill(self):
+ if self.start_time is None:
+ self.start_time = time.time()
+ self.duration = 0.0001
+ else:
+ self.duration = time.time() - self.start_time()
+ self.abort.set()
+
+ self.log('Aborted job:', self.description)
+ self.killed = True
+ self.failed = True
+ self._cleanup()
+
+ def consolidate_log(self):
+ logs = [self.log.html, self.log.plain_text]
+ bdir = base_dir()
+ log_dir = os.path.join(bdir, 'threaded_job_logs')
+ if not os.path.exists(log_dir):
+ os.makedirs(log_dir)
+ fd, path = tempfile.mkstemp(suffix='.json', prefix='log-', dir=log_dir)
+ with os.fdopen(fd, 'wb') as f:
+ f.write(json.dumps(logs, ensure_ascii=False,
+ indent=2).encode('utf-8'))
+ self.consolidated_log = path
+ self.log = None
+
+ def read_consolidated_log(self):
+ with open(self.consolidated_log, 'rb') as f:
+ return json.loads(f.read().decode('utf-8'))
+
+ @property
+ def details(self):
+ if self.consolidated_log is None:
+ return self.log.plain_text
+ return self.read_consolidated_log()[1]
+
+ @property
+ def html_details(self):
+ if self.consolidated_log is None:
+ return self.log.html
+ return self.read_consolidated_log()[0]
+
+class ThreadedJobWorker(Thread):
+
+ def __init__(self, job):
+ Thread.__init__(self)
+ self.daemon = True
+ self.job = job
+
+ def run(self):
+ try:
+ self.job.start_work()
+ except:
+ import traceback
+ from calibre import prints
+ prints('Job had unhandled exception:', self.job.description)
+ traceback.print_exc()
+
+class ThreadedJobServer(Thread):
+
+ def __init__(self):
+ Thread.__init__(self)
+ self.daemon = True
+ self.lock = RLock()
+
+ self.queued_jobs = []
+ self.running_jobs = set()
+ self.changed_jobs = Queue()
+ self.keep_going = True
+
+ def close(self):
+ self.keep_going = False
+
+ def add_job(self, job):
+ with self.lock:
+ self.queued_jobs.append(job)
+
+ if not self.is_alive():
+ self.start()
+
+ def run(self):
+ while self.keep_going:
+ self.run_once()
+ time.sleep(0.1)
+
+ def run_once(self):
+ with self.lock:
+ remove = set()
+ for worker in self.running_jobs:
+ if worker.is_alive():
+ # Get progress notifications
+ if worker.job.consume_notifications():
+ self.changed_jobs.put(worker.job)
+ else:
+ remove.add(worker)
+ self.changed_jobs.put(worker.job)
+
+ for worker in remove:
+ self.running_jobs.remove(worker)
+
+ jobs = self.get_startable_jobs()
+ for job in jobs:
+ w = ThreadedJobWorker(job)
+ w.start()
+ self.running_jobs.add(w)
+ self.changed_jobs.put(job)
+ self.queued_jobs.remove(job)
+
+ def kill_job(self, job):
+ with self.lock:
+ if job in self.queued_jobs:
+ self.queued_jobs.remove(job)
+ elif job in self.running_jobs:
+ self.running_jobs.remove(job)
+ job.kill()
+ self.changed_jobs.put(job)
+
+ def running_jobs_of_type(self, type_):
+ return len([w for w in self.running_jobs if w.job.type == type_])
+
+ def get_startable_jobs(self):
+ queued_types = []
+ ans = []
+ for job in self.queued_jobs:
+ num = self.running_jobs_of_type(job.type)
+ num += queued_types.count(job.type)
+ if num < job.max_concurrent_count:
+ queued_types.append(job.type)
+ ans.append(job)
+ return ans
+
+
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 5658453163..ef4fb8c23e 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -12,18 +12,19 @@ __docformat__ = 'restructuredtext en'
import collections, os, sys, textwrap, time, gc
from Queue import Queue, Empty
from threading import Thread
-from PyQt4.Qt import Qt, SIGNAL, QTimer, QHelpEvent, QAction, \
- QMenu, QIcon, pyqtSignal, \
- QDialog, QSystemTrayIcon, QApplication, QKeySequence
+from collections import OrderedDict
+
+from PyQt4.Qt import (Qt, SIGNAL, QTimer, QHelpEvent, QAction,
+ QMenu, QIcon, pyqtSignal, QUrl,
+ QDialog, QSystemTrayIcon, QApplication, QKeySequence)
from calibre import prints
from calibre.constants import __appname__, isosx
-from calibre.ptempfile import PersistentTemporaryFile
from calibre.utils.config import prefs, dynamic
from calibre.utils.ipc.server import Server
from calibre.library.database2 import LibraryDatabase2
from calibre.customize.ui import interface_actions, store_plugins
-from calibre.gui2 import error_dialog, GetMetadata, open_local_file, \
+from calibre.gui2 import error_dialog, GetMetadata, open_url, \
gprefs, max_available_height, config, info_dialog, Dispatcher, \
question_dialog
from calibre.gui2.cover_flow import CoverFlowMixin
@@ -39,7 +40,6 @@ from calibre.gui2.init import LibraryViewMixin, LayoutMixin
from calibre.gui2.search_box import SearchBoxMixin, SavedSearchBoxMixin
from calibre.gui2.search_restriction_mixin import SearchRestrictionMixin
from calibre.gui2.tag_view import TagBrowserMixin
-from calibre.utils.ordered_dict import OrderedDict
class Listener(Thread): # {{{
@@ -186,6 +186,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
for ac in self.iactions.values():
ac.do_genesis()
+ self.donate_action = QAction(QIcon(I('donate.png')), _('&Donate to support calibre'), self)
for st in self.istores.values():
st.do_genesis()
MainWindowMixin.__init__(self, db)
@@ -222,8 +223,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
self.system_tray_menu = QMenu(self)
self.restore_action = self.system_tray_menu.addAction(
QIcon(I('page.png')), _('&Restore'))
- self.donate_action = self.system_tray_menu.addAction(
- QIcon(I('donate.png')), _('&Donate to support calibre'))
+ self.system_tray_menu.addAction(self.donate_action)
self.donate_button.setDefaultAction(self.donate_action)
self.donate_button.setStatusTip(self.donate_button.toolTip())
self.eject_action = self.system_tray_menu.addAction(
@@ -418,6 +418,9 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
error_dialog(self, _('Failed to start content server'),
unicode(self.content_server.exception)).exec_()
+ @property
+ def current_db(self):
+ return self.library_view.model().db
def another_instance_wants_to_talk(self):
try:
@@ -479,15 +482,16 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
self.search.clear()
self.saved_search.clear()
self.book_details.reset_info()
- self.library_view.model().count_changed()
prefs['library_path'] = self.library_path
+ #self.library_view.model().count_changed()
db = self.library_view.model().db
- for action in self.iactions.values():
- action.library_changed(db)
+ self.iactions['Choose Library'].count_changed(db.count())
self.set_window_title()
self.apply_named_search_restriction('') # reset restriction to null
- self.saved_searches_changed() # reload the search restrictions combo box
+ self.saved_searches_changed(recount=False) # reload the search restrictions combo box
self.apply_named_search_restriction(db.prefs['gui_restriction'])
+ for action in self.iactions.values():
+ action.library_changed(db)
if olddb is not None:
try:
if call_close:
@@ -603,37 +607,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
QApplication.instance().quit()
def donate(self, *args):
- BUTTON = '''
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input type="hidden" name="cmd" value="_s-xclick" />
- <input type="hidden" name="hosted_button_id" value="3029467" />
- <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="Donate to support calibre development" />
- <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
- </form>
- '''
- MSG = _('is the result of the efforts of many volunteers from all '
- 'over the world. If you find it useful, please consider '
- 'donating to support its development. Your donation helps '
- 'keep calibre development going.')
- HTML = u'''
- <html>
- <head>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
- <title>Donate to support calibre
-
-
- 
Calibre %s
- %s
-
-