IGN:...

src/calibre/ebooks/epub/input.py

@@ -51,8 +51,7 @@ class EPUBInput(InputFormatPlugin):
             traceback.print_exc()
         return False
 
-    def convert(self, stream, options, file_ext, parse_cache, log, 
+    def convert(self, stream, options, file_ext, log, accelerators):
-                accelerators):
         from calibre.utils.zipfile import ZipFile
         from calibre import walk
         from calibre.ebooks import DRMError
@@ -73,5 +72,4 @@ class EPUBInput(InputFormatPlugin):
             if not self.process_encryption(encfile, opf, log):
                 raise DRMError(os.path.basename(path))
 
-        return opf
+        return os.path.join(os.getcwd(), opf)
-        

src/calibre/ebooks/htmlsymbols.py

@@ -306,5 +306,7 @@ HTML_SYMBOLS = {
                 u'ý' : ['ý', 'ý'], # latin small letter y with acute
                 u'þ' : ['þ', 'þ'], # latin small letter thorn
                 u'ÿ' : ['ÿ', 'ÿ'], # latin small letter y with diaeresis
+                # More
+                u' ' : [' '],
                }
 

src/calibre/ebooks/metadata/pdf.py

@@ -51,23 +51,18 @@ def get_metadata(stream, extract_cover=True):
 
 def set_metadata(stream, mi):
     stream.seek(0)
-
     # Use a StringIO object for the pdf because we will want to over
     # write it later and if we are working on the stream directly it
     # could cause some issues.
     raw = StringIO.StringIO(stream.read())
     orig_pdf = PdfFileReader(raw)
-
     title = mi.title if mi.title else orig_pdf.documentInfo.title
     author = authors_to_string(mi.authors) if mi.authors else orig_pdf.documentInfo.author
-
     out_pdf = PdfFileWriter(title=title, author=author)
     for page in orig_pdf.pages:
         out_pdf.addPage(page)
-
     out_str = StringIO.StringIO()
     out_pdf.write(out_str)
-
     stream.seek(0)
     stream.truncate()
     out_str.seek(0)

src/calibre/ebooks/mobi/reader.py

@@ -158,22 +158,19 @@ class BookHeader(object):
 
 
 class MetadataHeader(BookHeader):
-    def __init__(self, stream):
+    def __init__(self, stream, log):
         self.stream = stream
-
         self.ident = self.identity()
         self.num_sections = self.section_count()
-
         if self.num_sections >= 2:
             header = self.header()
-            BookHeader.__init__(self, header, self.ident, None)
+            BookHeader.__init__(self, header, self.ident, None, log)
         else:
             self.exth = None
 
     def identity(self):
         self.stream.seek(60)
         ident = self.stream.read(8).upper()
-
         if ident not in ['BOOKMOBI', 'TEXTREAD']:
             raise MobiError('Unknown book type: %s' % ident)
         return ident
@@ -188,7 +185,6 @@ class MetadataHeader(BookHeader):
 
     def header(self):
         section_headers = []
-
         # First section with the metadata
         section_headers.append(self.section_offset(0))
         # Second section used to get the lengh of the first
@@ -196,20 +192,16 @@ class MetadataHeader(BookHeader):
 
         end_off = section_headers[1]
         off = section_headers[0]
-
         self.stream.seek(off)
         return self.stream.read(end_off - off)
 
     def section_data(self, number):
         start = self.section_offset(number)
-
         if number == self.num_sections -1:
             end = os.stat(self.stream.name).st_size
         else:
             end = self.section_offset(number + 1)
-
         self.stream.seek(start)
-
         return self.stream.read(end - start)
 
 
@@ -470,7 +462,7 @@ class MobiReader(object):
     def create_opf(self, htmlfile, guide=None, root=None):
         mi = getattr(self.book_header.exth, 'mi', self.embedded_mi)
         if mi is None:
-            mi = MetaInformation(self.title, [_('Unknown')])
+            mi = MetaInformation(self.book_header.title, [_('Unknown')])
         opf = OPFCreator(os.path.dirname(htmlfile), mi)
         if hasattr(self.book_header.exth, 'cover_offset'):
             opf.cover = 'images/%05d.jpg'%(self.book_header.exth.cover_offset+1)
@@ -649,20 +641,23 @@ class MobiReader(object):
             im.convert('RGB').save(open(path, 'wb'), format='JPEG')
 
 def get_metadata(stream):
+    from calibre.utils.logging import Log
+    log = Log()
+
     mi = MetaInformation(os.path.basename(stream.name), [_('Unknown')])
     try:
-        mh = MetadataHeader(stream)
+        mh = MetadataHeader(stream, log)
 
         if mh.exth is not None:
             if mh.exth.mi is not None:
                 mi = mh.exth.mi
         else:
             with TemporaryDirectory('_mobi_meta_reader') as tdir:
-                mr = MobiReader(stream)
+                mr = MobiReader(stream, log)
-                mr.extract_content(tdir, {})
+                parse_cache = {}
+                mr.extract_content(tdir, parse_cache)
                 if mr.embedded_mi is not None:
                     mi = mr.embedded_mi
-
         if hasattr(mh.exth, 'cover_offset'):
             cover_index = mh.first_image_index + mh.exth.cover_offset
             data  = mh.section_data(int(cover_index))
@@ -674,9 +669,5 @@ def get_metadata(stream):
         im.convert('RGBA').save(obuf, format='JPEG')
         mi.cover_data = ('jpg', obuf.getvalue())
     except:
-        import traceback
+        log.exception()
-        traceback.print_exc()
-
     return mi
-
-

src/calibre/ebooks/oeb/iterator.py

@@ -1,3 +1,4 @@
+from __future__ import with_statement
 __license__   = 'GPL v3'
 __copyright__ = '2008 Kovid Goyal <kovid at kovidgoyal.net>'
 

src/calibre/gui2/dialogs/config.py

@@ -18,7 +18,7 @@ from calibre.utils.config import prefs
 from calibre.gui2.widgets import FilenamePattern
 from calibre.gui2.library import BooksModel
 from calibre.ebooks import BOOK_EXTENSIONS
-from calibre.ebooks.epub.iterator import is_supported
+from calibre.ebooks.oeb.iterator import is_supported
 from calibre.library import server_config
 from calibre.customize.ui import initialized_plugins, is_disabled, enable_plugin, \
                                  disable_plugin, customize_plugin, \

src/calibre/gui2/dialogs/config.ui

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0" >
  <author>Kovid Goyal</author>
  <class>Dialog</class>
@@ -24,7 +23,7 @@
      <item>
       <widget class="QListView" name="category_view" >
        <property name="sizePolicy" >
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+        <sizepolicy vsizetype="Expanding" hsizetype="MinimumExpanding" >
          <horstretch>1</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -35,6 +34,9 @@
          <bold>true</bold>
         </font>
        </property>
+       <property name="editTriggers" >
+        <set>QAbstractItemView::NoEditTriggers</set>
+       </property>
        <property name="tabKeyNavigation" >
         <bool>true</bool>
        </property>
@@ -67,7 +69,7 @@
      <item>
       <widget class="QStackedWidget" name="stackedWidget" >
        <property name="sizePolicy" >
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
          <horstretch>100</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -563,7 +565,7 @@
            <item>
             <widget class="QLineEdit" name="email_from" >
              <property name="toolTip" >
-              <string>&lt;p&gt;This is what will be present in the From: field of emails sent by calibre.&lt;br&gt; Set it to your email address</string>
+              <string>&lt;p>This is what will be present in the From: field of emails sent by calibre.&lt;br> Set it to your email address</string>
              </property>
             </widget>
            </item>
@@ -640,7 +642,7 @@
          <item row="3" column="0" >
           <widget class="QGroupBox" name="groupBox_5" >
            <property name="toolTip" >
-            <string>&lt;p&gt;A mail server is useful if the service you are sending mail to only accepts email from well know mail services.</string>
+            <string>&lt;p>A mail server is useful if the service you are sending mail to only accepts email from well know mail services.</string>
            </property>
            <property name="title" >
             <string>Mail &amp;Server</string>
@@ -649,7 +651,7 @@
             <item row="0" column="0" colspan="4" >
              <widget class="QLabel" name="label_16" >
               <property name="text" >
-               <string>calibre can &lt;b&gt;optionally&lt;/b&gt; use a server to send mail</string>
+               <string>calibre can &lt;b>optionally&lt;/b> use a server to send mail</string>
               </property>
               <property name="wordWrap" >
                <bool>true</bool>