From fb9d0302415f8b72f297878d0eb885a5ace502fc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 23 Jul 2009 19:15:35 -0600
Subject: [PATCH] Misc. minor fixes

---
 src/calibre/ebooks/lrf/html/convert_from.py |  6 ++++++
 src/calibre/ebooks/metadata/opf2.py         |  4 +++-
 src/calibre/ebooks/pdf/manipulate/crop.py   | 10 +++++-----
 src/calibre/gui2/wizard/__init__.py         |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/calibre/ebooks/lrf/html/convert_from.py b/src/calibre/ebooks/lrf/html/convert_from.py
index 515ec4182d..bab56e3a58 100644
--- a/src/calibre/ebooks/lrf/html/convert_from.py
+++ b/src/calibre/ebooks/lrf/html/convert_from.py
@@ -1891,6 +1891,12 @@ def process_file(path, options, logger):
     if options.header:
         header = Paragraph()
         fheader = options.headerformat
+        if not options.title:
+            options.title = _('Unknown')
+        if not options.author:
+            options.author = _('Unknown')
+        if not fheader:
+            fheader = "%t by %a"
         fheader = re.sub(r'(?<!%)%t', options.title, fheader)
         fheader = re.sub(r'(?<!%)%a', options.author, fheader)
         fheader = re.sub(r'%%a','%a',fheader)
diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py
index b98e345366..e9bd4b35f3 100644
--- a/src/calibre/ebooks/metadata/opf2.py
+++ b/src/calibre/ebooks/metadata/opf2.py
@@ -15,7 +15,7 @@ from lxml import etree
 from dateutil import parser
 
 from calibre.ebooks.chardet import xml_to_unicode
-from calibre.constants import __appname__, __version__
+from calibre.constants import __appname__, __version__, filesystem_encoding
 from calibre.ebooks.metadata.toc import TOC
 from calibre.ebooks.metadata import MetaInformation, string_to_authors
 
@@ -1048,6 +1048,8 @@ def metadata_to_opf(mi, as_string=True):
     metadata[-1].tail = '\n' +(' '*4)
 
     if mi.cover:
+        if not isinstance(mi.cover, unicode):
+            mi.cover = mi.cover.decode(filesystem_encoding)
         guide.text = '\n'+(' '*8)
         r = guide.makeelement(OPF('reference'),
                 attrib={'type':'cover', 'title':_('Cover'), 'href':mi.cover})
diff --git a/src/calibre/ebooks/pdf/manipulate/crop.py b/src/calibre/ebooks/pdf/manipulate/crop.py
index c35d4615a4..a447d43e29 100644
--- a/src/calibre/ebooks/pdf/manipulate/crop.py
+++ b/src/calibre/ebooks/pdf/manipulate/crop.py
@@ -23,7 +23,7 @@ from calibre.ebooks.pdf.verify import is_valid_pdf, is_encrypted
 
 from pyPdf import PdfFileWriter, PdfFileReader
 
-DEFAULT_CROP = '10'
+DEFAULT_CROP = 10
 
 USAGE = '\n%prog %%name ' + _('''\
 [options] file.pdf
@@ -36,16 +36,16 @@ OPTIONS = set([
         level=OptionRecommendation.HIGH, long_switch='output', short_switch='o',
         help=_('Path to output file. By default a file is created in the current directory.')),
     OptionRecommendation(name='bottom_left_x', recommended_value=DEFAULT_CROP,
-        level=OptionRecommendation.LOW, long_switch='leftx', short_switch='x',
+        level=OptionRecommendation.LOW, long_switch='left-x', short_switch='x',
         help=_('Number of pixels to crop from the left most x (default is %s)') % DEFAULT_CROP),
     OptionRecommendation(name='bottom_left_y', recommended_value=DEFAULT_CROP,
-        level=OptionRecommendation.LOW, long_switch='lefty', short_switch='y',
+        level=OptionRecommendation.LOW, long_switch='left-y', short_switch='y',
         help=_('Number of pixels to crop from the left most y (default is %s)') % DEFAULT_CROP),
     OptionRecommendation(name='top_right_x', recommended_value=DEFAULT_CROP,
-        level=OptionRecommendation.LOW, long_switch='rightx', short_switch='v',
+        level=OptionRecommendation.LOW, long_switch='right-x', short_switch='v',
         help=_('Number of pixels to crop from the right most x (default is %s)') % DEFAULT_CROP),
     OptionRecommendation(name='top_right_y', recommended_value=DEFAULT_CROP,
-        level=OptionRecommendation.LOW, long_switch='right y', short_switch='w',
+        level=OptionRecommendation.LOW, long_switch='right-y', short_switch='w',
         help=_('Number of pixels to crop from the right most y (default is %s)') % DEFAULT_CROP),
     OptionRecommendation(name='bounding', recommended_value=None,
         level=OptionRecommendation.LOW, long_switch='bounding', short_switch='b',
diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index d73c245288..f56f0fe7a7 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -511,7 +511,7 @@ class Wizard(QWizard):
         self.device_page = DevicePage()
         self.library_page = LibraryPage()
         self.finish_page = FinishPage()
-        bt = unicode(self.buttonText(self.FinishButton))
+        bt = unicode(self.buttonText(self.FinishButton)).replace('&', '')
         t = unicode(self.finish_page.finish_text.text())
         self.finish_page.finish_text.setText(t%bt)
         self.kindle_page = KindlePage()