Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 18:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2010-10-03 20:35:28 +01:00
commit abccf7b527
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/ebooks/metadata/book/__init__.py
View File

@ -114,7 +114,8 @@ SC_COPYABLE_FIELDS = SOCIAL_METADATA_FIELDS.union(
PUBLICATION_METADATA_FIELDS).union( PUBLICATION_METADATA_FIELDS).union(
BOOK_STRUCTURE_FIELDS).union( BOOK_STRUCTURE_FIELDS).union(
DEVICE_METADATA_FIELDS).union( DEVICE_METADATA_FIELDS).union(
CALIBRE_METADATA_FIELDS) - \ CALIBRE_METADATA_FIELDS).union(
TOP_LEVEL_CLASSIFIERS) - \
SC_FIELDS_NOT_COPIED.union( SC_FIELDS_NOT_COPIED.union(
SC_FIELDS_COPY_NOT_NULL) SC_FIELDS_COPY_NOT_NULL)

3
src/calibre/ebooks/metadata/meta.py
View File

@ -108,7 +108,8 @@ def _get_metadata(stream, stream_type, use_libprs_metadata,
base = metadata_from_filename(name, pat=pattern) base = metadata_from_filename(name, pat=pattern)
if force_read_metadata or is_recipe(name) or prefs['read_file_metadata']: if force_read_metadata or is_recipe(name) or prefs['read_file_metadata']:
mi = get_file_type_metadata(stream, stream_type) mi = get_file_type_metadata(stream, stream_type)
if base.title == os.path.splitext(name)[0] and base.authors is None: if base.title == os.path.splitext(name)[0] and \
base.is_null('authors') and base.is_null('isbn'):
# Assume that there was no metadata in the file and the user set pattern # Assume that there was no metadata in the file and the user set pattern
# to match meta info from the file name did not match. # to match meta info from the file name did not match.
# The regex is meant to match the standard format filenames are written # The regex is meant to match the standard format filenames are written

3
src/calibre/gui2/actions/convert.py
View File

@ -181,5 +181,6 @@ class ConvertAction(InterfaceAction):
self.gui.tags_view.recount() self.gui.tags_view.recount()
if self.gui.current_view() is self.gui.library_view: if self.gui.current_view() is self.gui.library_view:
current = self.gui.library_view.currentIndex() current = self.gui.library_view.currentIndex()
self.gui.library_view.model().current_changed(current, QModelIndex()) if current.isValid():
self.gui.library_view.model().current_changed(current, QModelIndex())

15
src/calibre/gui2/library/models.py
View File

@ -361,13 +361,14 @@ class BooksModel(QAbstractTableModel): # {{{
self.cover_cache.set_cache(ids) self.cover_cache.set_cache(ids)
def current_changed(self, current, previous, emit_signal=True): def current_changed(self, current, previous, emit_signal=True):
idx = current.row() if current.isValid():
self.set_cache(idx) idx = current.row()
data = self.get_book_display_info(idx) self.set_cache(idx)
if emit_signal: data = self.get_book_display_info(idx)
self.new_bookdisplay_data.emit(data) if emit_signal:
else: self.new_bookdisplay_data.emit(data)
return data else:
return data
def get_book_info(self, index): def get_book_info(self, index):
if isinstance(index, int): if isinstance(index, int):