Merge from trunk

src/calibre/ebooks/chm/reader.py

@@ -8,7 +8,7 @@ import os, re
 from mimetypes import guess_type as guess_mimetype
 
 from calibre.ebooks.BeautifulSoup import BeautifulSoup, NavigableString
-
+from calibre.constants import iswindows
 from calibre.utils.chm.chm import CHMFile
 from calibre.utils.chm.chmlib import (
   CHM_RESOLVE_SUCCESS, CHM_ENUMERATE_NORMAL,
@@ -135,10 +135,16 @@ class CHMReader(CHMFile):
             if lpath.find(';') != -1:
                 # fix file names with ";<junk>" at the end, see _reformat()
                 lpath = lpath.split(';')[0]
-            with open(lpath, 'wb') as f:
+            try:
-                if guess_mimetype(path)[0] == ('text/html'):
+                with open(lpath, 'wb') as f:
-                    data = self._reformat(data)
+                    if guess_mimetype(path)[0] == ('text/html'):
-                f.write(data)
+                        data = self._reformat(data)
+                    f.write(data)
+            except:
+                if iswindows and len(lpath) > 250:
+                    self.log.warn('%r filename too long, skipping'%path)
+                    continue
+                raise
         self._extracted = True
         files = os.listdir(output_dir)
         if self.hhc_path not in files:

src/calibre/ebooks/metadata/__init__.py

@@ -260,7 +260,7 @@ class MetaInformation(object):
             setattr(self, x, getattr(mi, x, None))
 
     def print_all_attributes(self):
-        for x in ('author', 'author_sort', 'title_sort', 'comments', 'category', 'publisher',
+        for x in ('title','author', 'author_sort', 'title_sort', 'comments', 'category', 'publisher',
                   'series', 'series_index', 'tags', 'rating', 'isbn', 'language',
                   'application_id', 'manifest', 'toc', 'spine', 'guide', 'cover',
                   'book_producer', 'timestamp', 'lccn', 'lcc', 'ddc', 'pubdate',

src/calibre/ebooks/metadata/epub.py

@@ -182,7 +182,7 @@ def get_metadata(stream, extract_cover=True):
 def get_quick_metadata(stream):
     return get_metadata(stream, False)
 
-def set_metadata(stream, mi, apply_null=False):
+def set_metadata(stream, mi, apply_null=False, update_timestamp=False):
     stream.seek(0)
     reader = OCFZipReader(stream, root=os.getcwdu())
     mi = MetaInformation(mi)
@@ -196,6 +196,8 @@ def set_metadata(stream, mi, apply_null=False):
             reader.opf.tags = []
         if not getattr(mi, 'isbn', None):
             reader.opf.isbn = None
+    if update_timestamp and mi.timestamp is not None:
+        reader.opf.timestamp = mi.timestamp
 
     newopf = StringIO(reader.opf.render())
     safe_replace(stream, reader.container[OPF.MIMETYPE], newopf)

src/calibre/gui2/device.py

@@ -689,14 +689,28 @@ class DeviceMixin(object): # {{{
             self.device_error_dialog.show()
 
     # Device connected {{{
-    def device_detected(self, connected, is_folder_device):
+
-        '''
+    def set_device_menu_items_state(self, connected, is_folder_device):
-        Called when a device is connected to the computer.
-        '''
         if connected:
             self._sync_menu.connect_to_folder_action.setEnabled(False)
             if is_folder_device:
                 self._sync_menu.disconnect_from_folder_action.setEnabled(True)
+            self._sync_menu.enable_device_actions(True,
+                    self.device_manager.device.card_prefix(),
+                    self.device_manager.device)
+            self.eject_action.setEnabled(True)
+        else:
+            self._sync_menu.connect_to_folder_action.setEnabled(True)
+            self._sync_menu.disconnect_from_folder_action.setEnabled(False)
+            self._sync_menu.enable_device_actions(False)
+            self.eject_action.setEnabled(False)
+
+    def device_detected(self, connected, is_folder_device):
+        '''
+        Called when a device is connected to the computer.
+        '''
+        self.set_device_menu_items_state(connected, is_folder_device)
+        if connected:
             self.device_manager.get_device_information(\
                     Dispatcher(self.info_read))
             self.set_default_thumbnail(\
@@ -705,17 +719,10 @@ class DeviceMixin(object): # {{{
                 self.device_manager.device.__class__.get_gui_name()+\
                         _(' detected.'), 3000)
             self.device_connected = 'device' if not is_folder_device else 'folder'
-            self._sync_menu.enable_device_actions(True,
-                    self.device_manager.device.card_prefix(),
-                    self.device_manager.device)
             self.location_view.model().device_connected(self.device_manager.device)
-            self.eject_action.setEnabled(True)
             self.refresh_ondevice_info (device_connected = True, reset_only = True)
         else:
-            self._sync_menu.connect_to_folder_action.setEnabled(True)
-            self._sync_menu.disconnect_from_folder_action.setEnabled(False)
             self.device_connected = None
-            self._sync_menu.enable_device_actions(False)
             self.location_view.model().update_devices()
             self.vanity.setText(self.vanity_template%\
                     dict(version=self.latest_version, device=' '))
@@ -723,7 +730,6 @@ class DeviceMixin(object): # {{{
             if self.current_view() != self.library_view:
                 self.book_details.reset_info()
                 self.location_view.setCurrentIndex(self.location_view.model().index(0))
-            self.eject_action.setEnabled(False)
             self.refresh_ondevice_info (device_connected = False)
 
     def info_read(self, job):

src/calibre/gui2/metadata.py

@@ -84,12 +84,12 @@ class DownloadMetadata(Thread):
                 if mi.isbn:
                     args['isbn'] = mi.isbn
                 else:
-                    if not mi.title:
+                    if not mi.title or mi.title == _('Unknown'):
                         self.failures[id] = \
                                 (str(id), _('Book has neither title nor ISBN'))
                         continue
                     args['title'] = mi.title
-                    if mi.authors:
+                    if mi.authors and mi.authors[0] != _('Unknown'):
                         args['author'] = mi.authors[0]
                 if self.key:
                     args['isbndb_key'] = self.key

src/calibre/gui2/ui.py

@@ -410,6 +410,8 @@ class Main(MainWindow, Ui_MainWindow, DeviceMixin, ToolbarMixin, # {{{
             self.tags_view.set_new_model() # in case columns changed
             self.tags_view.recount()
             self.create_device_menu()
+            self.set_device_menu_items_state(bool(self.device_connected),
+                    self.device_connected == 'folder')
 
             if not patheq(self.library_path, d.database_location):
                 newloc = d.database_location

src/calibre/web/feeds/news.py

@@ -788,6 +788,7 @@ class BasicNewsRecipe(Recipe):
                     }
 
                     .summary_byline {
+                        text-align:left;
                         font-family:monospace;
                     }
 
@@ -1139,12 +1140,6 @@ class BasicNewsRecipe(Recipe):
         mi = MetaInformation(self.short_title() + strftime(self.timefmt), [__appname__])
         mi.publisher = __appname__
         mi.author_sort = __appname__
-        if self.output_profile.name == 'iPad':
-            date_as_author = '%s, %s %s, %s' % (strftime('%A'), strftime('%B'), strftime('%d').lstrip('0'), strftime('%Y'))
-            mi = MetaInformation(self.short_title(), [date_as_author])
-            mi.publisher = __appname__
-            sort_author =  re.sub('^\s*A\s+|^\s*The\s+|^\s*An\s+', '', self.title).rstrip()
-            mi.author_sort = '%s %s' % (sort_author, strftime('%Y-%m-%d'))
         mi.publication_type = 'periodical:'+self.publication_type
         mi.timestamp = nowf()
         mi.comments = self.description