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

...

Browse Source
This commit is contained in:
Kovid Goyal 2010-09-26 11:16:05 -06:00
commit e4c7e79a66
12 changed files with 256 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/calibre/devices/usbms/books.py
View File

@ -111,6 +111,12 @@ class CollectionsBookList(BookList):
from calibre.devices.usbms.driver import debug_print from calibre.devices.usbms.driver import debug_print
debug_print('Starting get_collections:', prefs['manage_device_metadata']) debug_print('Starting get_collections:', prefs['manage_device_metadata'])
debug_print('Renaming rules:', tweaks['sony_collection_renaming_rules']) debug_print('Renaming rules:', tweaks['sony_collection_renaming_rules'])
# Complexity: we can use renaming rules only when using automatic
# management. Otherwise we don't always have the metadata to make the
# right decisions
use_renaming_rules = prefs['manage_device_metadata'] == 'on_connect'
collections = {} collections = {}
# This map of sets is used to avoid linear searches when testing for # This map of sets is used to avoid linear searches when testing for
# book equality # book equality
@ -139,7 +145,16 @@ class CollectionsBookList(BookList):
attrs = collection_attributes attrs = collection_attributes
for attr in attrs: for attr in attrs:
attr = attr.strip() attr = attr.strip()
ign, val, orig_val, fm = book.format_field_extended(attr) # If attr is device_collections, then we cannot use
# format_field, because we don't know the fields where the
# values came from.
if attr == 'device_collections':
doing_dc = True
val = book.device_collections # is a list
else:
doing_dc = False
ign, val, orig_val, fm = book.format_field_extended(attr)
if not val: continue if not val: continue
if isbytestring(val): if isbytestring(val):
val = val.decode(preferred_encoding, 'replace') val = val.decode(preferred_encoding, 'replace')
@ -151,9 +166,15 @@ class CollectionsBookList(BookList):
val = orig_val val = orig_val
else: else:
val = [val] val = [val]
for category in val: for category in val:
is_series = False is_series = False
if fm['is_custom']: # is a custom field if doing_dc:
# Attempt to determine if this value is a series by
# comparing it to the series name.
if category == book.series:
is_series = True
elif fm['is_custom']: # is a custom field
if fm['datatype'] == 'text' and len(category) > 1 and \ if fm['datatype'] == 'text' and len(category) > 1 and \
category[0] == '[' and category[-1] == ']': category[0] == '[' and category[-1] == ']':
continue continue
@ -167,7 +188,11 @@ class CollectionsBookList(BookList):
('series' in collection_attributes and ('series' in collection_attributes and
book.get('series', None) == category): book.get('series', None) == category):
is_series = True is_series = True
cat_name = self.compute_category_name(attr, category, fm) if use_renaming_rules:
cat_name = self.compute_category_name(attr, category, fm)
else:
cat_name = category
if cat_name not in collections: if cat_name not in collections:
collections[cat_name] = [] collections[cat_name] = []
collections_lpaths[cat_name] = set() collections_lpaths[cat_name] = set()

4
src/calibre/ebooks/metadata/book/base.py
View File

@ -455,6 +455,8 @@ class Metadata(object):
res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy')) res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy'))
elif datatype == 'bool': elif datatype == 'bool':
res = _('Yes') if res else _('No') res = _('Yes') if res else _('No')
elif datatype == 'float' and key.endswith('_index'):
res = self.format_series_index(res)
return (name, unicode(res), orig_res, cmeta) return (name, unicode(res), orig_res, cmeta)
if key in field_metadata and field_metadata[key]['kind'] == 'field': if key in field_metadata and field_metadata[key]['kind'] == 'field':
@ -468,6 +470,8 @@ class Metadata(object):
datatype = fmeta['datatype'] datatype = fmeta['datatype']
if key == 'authors': if key == 'authors':
res = authors_to_string(res) res = authors_to_string(res)
elif key == 'series_index':
res = self.format_series_index(res)
elif datatype == 'text' and fmeta['is_multiple']: elif datatype == 'text' and fmeta['is_multiple']:
res = u', '.join(res) res = u', '.join(res)
elif datatype == 'series' and series_with_index: elif datatype == 'series' and series_with_index:

43
src/calibre/gui2/custom_column_widgets.py
View File

@ -452,9 +452,25 @@ class BulkSeries(BulkBase):
self.name_widget = w self.name_widget = w
self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent), w] self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent), w]
self.widgets.append(QLabel(_('Automatically number books in this series'), parent)) self.widgets.append(QLabel('', parent))
self.idx_widget=QCheckBox(parent) w = QWidget(parent)
self.widgets.append(self.idx_widget) layout = QHBoxLayout(w)
layout.setContentsMargins(0, 0, 0, 0)
self.remove_series = QCheckBox(parent)
self.remove_series.setText(_('Remove series'))
layout.addWidget(self.remove_series)
self.idx_widget = QCheckBox(parent)
self.idx_widget.setText(_('Automatically number books'))
layout.addWidget(self.idx_widget)
self.force_number = QCheckBox(parent)
self.force_number.setText(_('Force numbers to start with '))
layout.addWidget(self.force_number)
self.series_start_number = QSpinBox(parent)
self.series_start_number.setMinimum(1)
self.series_start_number.setProperty("value", 1)
layout.addWidget(self.series_start_number)
layout.addItem(QSpacerItem(20, 10, QSizePolicy.Expanding, QSizePolicy.Minimum))
self.widgets.append(w)
def initialize(self, book_id): def initialize(self, book_id):
self.idx_widget.setChecked(False) self.idx_widget.setChecked(False)
@ -465,17 +481,26 @@ class BulkSeries(BulkBase):
def getter(self): def getter(self):
n = unicode(self.name_widget.currentText()).strip() n = unicode(self.name_widget.currentText()).strip()
i = self.idx_widget.checkState() i = self.idx_widget.checkState()
return n, i f = self.force_number.checkState()
s = self.series_start_number.value()
r = self.remove_series.checkState()
return n, i, f, s, r
def commit(self, book_ids, notify=False): def commit(self, book_ids, notify=False):
val, update_indices = self.gui_val val, update_indices, force_start, at_value, clear = self.gui_val
val = self.normalize_ui_val(val) val = '' if clear else self.normalize_ui_val(val)
if val != '': if clear or val != '':
extras = [] extras = []
next_index = self.db.get_next_cc_series_num_for(val, num=self.col_id) next_index = self.db.get_next_cc_series_num_for(val, num=self.col_id)
for book_id in book_ids: for book_id in book_ids:
if clear:
extras.append(None)
continue
if update_indices: if update_indices:
if tweaks['series_index_auto_increment'] == 'next': if force_start:
s_index = at_value
at_value += 1
elif tweaks['series_index_auto_increment'] == 'next':
s_index = next_index s_index = next_index
next_index += 1 next_index += 1
else: else:
@ -483,6 +508,8 @@ class BulkSeries(BulkBase):
else: else:
s_index = self.db.get_custom_extra(book_id, num=self.col_id, s_index = self.db.get_custom_extra(book_id, num=self.col_id,
index_is_id=True) index_is_id=True)
if s_index is None:
s_index = 1.0
extras.append(s_index) extras.append(s_index)
self.db.set_custom_bulk(book_ids, val, extras=extras, self.db.set_custom_bulk(book_ids, val, extras=extras,
num=self.col_id, notify=notify) num=self.col_id, notify=notify)

8
src/calibre/gui2/dialogs/metadata_bulk.py
View File

@ -32,7 +32,7 @@ class Worker(Thread):
remove, add, au, aus, do_aus, rating, pub, do_series, \ remove, add, au, aus, do_aus, rating, pub, do_series, \
do_autonumber, do_remove_format, remove_format, do_swap_ta, \ do_autonumber, do_remove_format, remove_format, do_swap_ta, \
do_remove_conv, do_auto_author, series, do_series_restart, \ do_remove_conv, do_auto_author, series, do_series_restart, \
series_start_value, do_title_case = self.args series_start_value, do_title_case, clear_series = self.args
# first loop: do author and title. These will commit at the end of each # first loop: do author and title. These will commit at the end of each
# operation, because each operation modifies the file system. We want to # operation, because each operation modifies the file system. We want to
@ -75,6 +75,9 @@ class Worker(Thread):
if pub: if pub:
self.db.set_publisher(id, pub, notify=False, commit=False) self.db.set_publisher(id, pub, notify=False, commit=False)
if clear_series:
self.db.set_series(id, '', notify=False, commit=False)
if do_series: if do_series:
if do_series_restart: if do_series_restart:
next = series_start_value next = series_start_value
@ -592,6 +595,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
rating = self.rating.value() rating = self.rating.value()
pub = unicode(self.publisher.text()) pub = unicode(self.publisher.text())
do_series = self.write_series do_series = self.write_series
clear_series = self.clear_series.isChecked()
series = unicode(self.series.currentText()).strip() series = unicode(self.series.currentText()).strip()
do_autonumber = self.autonumber_series.isChecked() do_autonumber = self.autonumber_series.isChecked()
do_series_restart = self.series_numbering_restarts.isChecked() do_series_restart = self.series_numbering_restarts.isChecked()
@ -606,7 +610,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
args = (remove, add, au, aus, do_aus, rating, pub, do_series, args = (remove, add, au, aus, do_aus, rating, pub, do_series,
do_autonumber, do_remove_format, remove_format, do_swap_ta, do_autonumber, do_remove_format, remove_format, do_swap_ta,
do_remove_conv, do_auto_author, series, do_series_restart, do_remove_conv, do_auto_author, series, do_series_restart,
series_start_value, do_title_case) series_start_value, do_title_case, clear_series)
bb = BlockingBusy(_('Applying changes to %d books. This may take a while.') bb = BlockingBusy(_('Applying changes to %d books. This may take a while.')
%len(self.ids), parent=self) %len(self.ids), parent=self)

137
src/calibre/gui2/dialogs/metadata_bulk.ui
View File

@ -225,61 +225,50 @@
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="7" column="1">
<widget class="EnComboBox" name="series"> <layout class="QHBoxLayout" name="HLayout_34">
<property name="toolTip"> <item>
<string>List of known series. You can add new series.</string> <widget class="EnComboBox" name="series">
</property> <property name="toolTip">
<property name="whatsThis"> <string>List of known series. You can add new series.</string>
<string>List of known series. You can add new series.</string> </property>
</property> <property name="whatsThis">
<property name="editable"> <string>List of known series. You can add new series.</string>
<bool>true</bool> </property>
</property> <property name="editable">
<property name="insertPolicy"> <bool>true</bool>
<enum>QComboBox::InsertAlphabetically</enum> </property>
</property> <property name="insertPolicy">
<property name="sizeAdjustPolicy"> <enum>QComboBox::InsertAlphabetically</enum>
<enum>QComboBox::AdjustToContents</enum> </property>
</property> <property name="sizeAdjustPolicy">
</widget> <enum>QComboBox::AdjustToContents</enum>
</item> </property>
<item row="9" column="0"> </widget>
<widget class="QLabel" name="label_5"> </item>
<property name="text"> <item>
<string>Remove &amp;format:</string> <widget class="QCheckBox" name="clear_series">
</property> <property name="toolTip">
<property name="buddy"> <string>If checked, the series will be cleared</string>
<cstring>remove_format</cstring> </property>
</property> <property name="text">
</widget> <string>Clear series</string>
</item> </property>
<item row="9" column="1"> </widget>
<widget class="QComboBox" name="remove_format"/> </item>
</item> <item>
<item row="0" column="1"> <spacer name="HSpacer_344">
<widget class="EnComboBox" name="authors"> <property name="orientation">
<property name="editable"> <enum>Qt::Horizontal</enum>
<bool>true</bool> </property>
</property> <property name="sizeHint" stdset="0">
</widget> <size>
</item> <width>20</width>
<item row="11" column="0" colspan="2"> <height>00</height>
<widget class="QCheckBox" name="swap_title_and_author"> </size>
<property name="text"> </property>
<string>&amp;Swap title and author</string> </spacer>
</property> </item>
</widget> </layout>
</item>
<item row="12" column="0" colspan="2">
<widget class="QCheckBox" name="change_title_to_title_case">
<property name="text">
<string>Change title to title case</string>
</property>
<property name="toolTip">
<string>Force the title to be in title case. If both this and swap authors are checked,
title and author are swapped before the title case is set</string>
</property>
</widget>
</item> </item>
<item row="8" column="1" colspan="2"> <item row="8" column="1" colspan="2">
<layout class="QHBoxLayout" name="HLayout_3"> <layout class="QHBoxLayout" name="HLayout_3">
@ -339,6 +328,44 @@ from the value in the box</string>
</item> </item>
</layout> </layout>
</item> </item>
<item row="9" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Remove &amp;format:</string>
</property>
<property name="buddy">
<cstring>remove_format</cstring>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QComboBox" name="remove_format"/>
</item>
<item row="0" column="1">
<widget class="EnComboBox" name="authors">
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="11" column="0" colspan="2">
<widget class="QCheckBox" name="swap_title_and_author">
<property name="text">
<string>&amp;Swap title and author</string>
</property>
</widget>
</item>
<item row="12" column="0" colspan="2">
<widget class="QCheckBox" name="change_title_to_title_case">
<property name="text">
<string>Change title to title case</string>
</property>
<property name="toolTip">
<string>Force the title to be in title case. If both this and swap authors are checked,
title and author are swapped before the title case is set</string>
</property>
</widget>
</item>
<item row="10" column="0" colspan="2"> <item row="10" column="0" colspan="2">
<widget class="QCheckBox" name="remove_conversion_settings"> <widget class="QCheckBox" name="remove_conversion_settings">
<property name="toolTip"> <property name="toolTip">

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

@ -89,6 +89,7 @@ class BooksModel(QAbstractTableModel): # {{{
self.alignment_map = {} self.alignment_map = {}
self.buffer_size = buffer self.buffer_size = buffer
self.cover_cache = None self.cover_cache = None
self.metadata_backup = None
self.bool_yes_icon = QIcon(I('ok.png')) self.bool_yes_icon = QIcon(I('ok.png'))
self.bool_no_icon = QIcon(I('list_remove.png')) self.bool_no_icon = QIcon(I('list_remove.png'))
self.bool_blank_icon = QIcon(I('blank.png')) self.bool_blank_icon = QIcon(I('blank.png'))
@ -154,8 +155,14 @@ class BooksModel(QAbstractTableModel): # {{{
self.database_changed.emit(db) self.database_changed.emit(db)
if self.cover_cache is not None: if self.cover_cache is not None:
self.cover_cache.stop() self.cover_cache.stop()
# Would like to to a join here, but the thread might be waiting to
# do something on the GUI thread. Deadlock.
self.cover_cache = CoverCache(db, FunctionDispatcher(self.db.cover)) self.cover_cache = CoverCache(db, FunctionDispatcher(self.db.cover))
self.cover_cache.start() self.cover_cache.start()
if self.metadata_backup is not None:
self.metadata_backup.stop()
# Would like to to a join here, but the thread might be waiting to
# do something on the GUI thread. Deadlock.
self.metadata_backup = MetadataBackup(db) self.metadata_backup = MetadataBackup(db)
self.metadata_backup.start() self.metadata_backup.start()
def refresh_cover(event, ids): def refresh_cover(event, ids):

2
src/calibre/gui2/preferences/create_custom_column.py
View File

@ -38,7 +38,7 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
'is_multiple':False}, 'is_multiple':False},
8:{'datatype':'bool', 8:{'datatype':'bool',
'text':_('Yes/No'), 'is_multiple':False}, 'text':_('Yes/No'), 'is_multiple':False},
8:{'datatype':'composite', 9:{'datatype':'composite',
'text':_('Column built from other columns'), 'is_multiple':False}, 'text':_('Column built from other columns'), 'is_multiple':False},
} }

5
src/calibre/gui2/preferences/misc.py
View File

@ -88,10 +88,15 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
r('enforce_cpu_limit', config, restart_required=True) r('enforce_cpu_limit', config, restart_required=True)
self.device_detection_button.clicked.connect(self.debug_device_detection) self.device_detection_button.clicked.connect(self.debug_device_detection)
self.compact_button.clicked.connect(self.compact) self.compact_button.clicked.connect(self.compact)
self.button_all_books_dirty.clicked.connect(self.mark_dirty)
self.button_open_config_dir.clicked.connect(self.open_config_dir) self.button_open_config_dir.clicked.connect(self.open_config_dir)
self.button_osx_symlinks.clicked.connect(self.create_symlinks) self.button_osx_symlinks.clicked.connect(self.create_symlinks)
self.button_osx_symlinks.setVisible(isosx) self.button_osx_symlinks.setVisible(isosx)
def mark_dirty(self):
db = self.gui.library_view.model().db
db.dirtied(list(db.data.iterallids()))
def debug_device_detection(self, *args): def debug_device_detection(self, *args):
from calibre.gui2.preferences.device_debug import DebugDevice from calibre.gui2.preferences.device_debug import DebugDevice
d = DebugDevice(self) d = DebugDevice(self)

11
src/calibre/gui2/preferences/misc.ui
View File

@ -124,7 +124,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="10" column="0" colspan="2">
<widget class="QPushButton" name="button_all_books_dirty">
<property name="text">
<string>Back up metadata of all books (while you are working)</string>
</property>
</widget>
</item>
<item row="20" column="0">
<spacer name="verticalSpacer_9"> <spacer name="verticalSpacer_9">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -132,7 +139,7 @@
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>18</height> <height>1000</height>
</size> </size>
</property> </property>
</spacer> </spacer>

42
src/calibre/library/caches.py
View File

@ -19,6 +19,7 @@ from calibre.utils.date import parse_date, now, UNDEFINED_DATE
from calibre.utils.search_query_parser import SearchQueryParser from calibre.utils.search_query_parser import SearchQueryParser
from calibre.utils.pyparsing import ParseException from calibre.utils.pyparsing import ParseException
from calibre.ebooks.metadata import title_sort from calibre.ebooks.metadata import title_sort
from calibre.ebooks.metadata.opf2 import metadata_to_opf
from calibre import fit_image, prints from calibre import fit_image, prints
class MetadataBackup(Thread): # {{{ class MetadataBackup(Thread): # {{{
@ -36,39 +37,53 @@ class MetadataBackup(Thread): # {{{
self.keep_running = True self.keep_running = True
from calibre.gui2 import FunctionDispatcher from calibre.gui2 import FunctionDispatcher
self.do_write = FunctionDispatcher(self.write) self.do_write = FunctionDispatcher(self.write)
self.get_metadata_for_dump = FunctionDispatcher(db.get_metadata_for_dump)
self.clear_dirtied = FunctionDispatcher(db.clear_dirtied)
def stop(self): def stop(self):
self.keep_running = False self.keep_running = False
def run(self): def run(self):
import traceback
while self.keep_running: while self.keep_running:
try: try:
id_ = self.db.dirtied_queue.get() time.sleep(0.5) # Limit to two per second
id_ = self.db.dirtied_queue.get(True, 1.45)
except Empty: except Empty:
continue continue
except: except:
# Happens during interpreter shutdown # Happens during interpreter shutdown
break break
dump = []
try: try:
self.db.dump_metadata([id_], dump_to=dump) path, mi = self.get_metadata_for_dump(id_)
except: except:
prints('Failed to get backup metadata for id:', id_, 'once') prints('Failed to get backup metadata for id:', id_, 'once')
import traceback
traceback.print_exc() traceback.print_exc()
time.sleep(2) time.sleep(2)
dump = []
try: try:
self.db.dump_metadata([id_], dump_to=dump) path, mi = self.get_metadata_for_dump(id_)
except: except:
prints('Failed to get backup metadata for id:', id_, 'again, giving up') prints('Failed to get backup metadata for id:', id_, 'again, giving up')
traceback.print_exc() traceback.print_exc()
continue continue
if mi is None:
self.clear_dirtied([id_])
continue
# Give the GUI thread a chance to do something. Python threads don't
# have priorities, so this thread would naturally keep the processor
# until some scheduling event happens. The sleep makes such an event
time.sleep(0.1)
try: try:
path, raw = dump[0] raw = metadata_to_opf(mi)
except: except:
break prints('Failed to convert to opf for id:', id_)
traceback.print_exc()
continue
time.sleep(0.1) # Give the GUI thread a chance to do something
try: try:
self.do_write(path, raw) self.do_write(path, raw)
except: except:
@ -79,8 +94,13 @@ class MetadataBackup(Thread): # {{{
except: except:
prints('Failed to write backup metadata for id:', id_, prints('Failed to write backup metadata for id:', id_,
'again, giving up') 'again, giving up')
continue
time.sleep(0.5) # Limit to two per second time.sleep(0.1) # Give the GUI thread a chance to do something
try:
self.clear_dirtied([id_])
except:
prints('Failed to clear dirtied for id:', id_)
def write(self, path, raw): def write(self, path, raw):
with open(path, 'wb') as f: with open(path, 'wb') as f:
@ -106,7 +126,6 @@ class CoverCache(Thread): # {{{
self.keep_running = False self.keep_running = False
def _image_for_id(self, id_): def _image_for_id(self, id_):
time.sleep(0.050) # Limit 20/second to not overwhelm the GUI
img = self.cover_func(id_, index_is_id=True, as_image=True) img = self.cover_func(id_, index_is_id=True, as_image=True)
if img is None: if img is None:
img = QImage() img = QImage()
@ -122,7 +141,8 @@ class CoverCache(Thread): # {{{
def run(self): def run(self):
while self.keep_running: while self.keep_running:
try: try:
id_ = self.load_queue.get() time.sleep(0.050) # Limit 20/second to not overwhelm the GUI
id_ = self.load_queue.get(True, 2)
except Empty: except Empty:
continue continue
except: except:

51
src/calibre/library/database2.py
View File

@ -566,8 +566,26 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
def metadata_for_field(self, key): def metadata_for_field(self, key):
return self.field_metadata[key] return self.field_metadata[key]
def clear_dirtied(self, book_ids):
'''
Clear the dirtied indicator for the books. This is used when fetching
metadata, creating an OPF, and writing a file are separated into steps.
The last step is clearing the indicator
'''
for book_id in book_ids:
if not self.data.has_id(book_id):
continue
self.conn.execute('DELETE FROM metadata_dirtied WHERE book=?',
(book_id,))
# if a later exception prevents the commit, then the dirtied
# table will still have the book. No big deal, because the OPF
# is there and correct. We will simply do it again on next
# start
self.dirtied_cache.discard(book_id)
self.conn.commit()
def dump_metadata(self, book_ids=None, remove_from_dirtied=True, def dump_metadata(self, book_ids=None, remove_from_dirtied=True,
commit=True, dump_to=None): commit=True):
''' '''
Write metadata for each record to an individual OPF file Write metadata for each record to an individual OPF file
@ -580,19 +598,12 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
for book_id in book_ids: for book_id in book_ids:
if not self.data.has_id(book_id): if not self.data.has_id(book_id):
continue continue
mi = self.get_metadata(book_id, index_is_id=True, get_cover=False) path, mi = self.get_metadata_for_dump(book_id)
# Always set cover to cover.jpg. Even if cover doesn't exist, if path is None:
# no harm done. This way no need to call dirtied when continue
# cover is set/removed
mi.cover = 'cover.jpg'
raw = metadata_to_opf(mi) raw = metadata_to_opf(mi)
path = os.path.join(self.abspath(book_id, index_is_id=True), with open(path, 'wb') as f:
'metadata.opf') f.write(raw)
if dump_to is None:
with open(path, 'wb') as f:
f.write(raw)
else:
dump_to.append((path, raw))
if remove_from_dirtied: if remove_from_dirtied:
self.conn.execute('DELETE FROM metadata_dirtied WHERE book=?', self.conn.execute('DELETE FROM metadata_dirtied WHERE book=?',
(book_id,)) (book_id,))
@ -638,6 +649,18 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
self.dirtied_cache = set() self.dirtied_cache = set()
self.dirtied(book_ids) self.dirtied(book_ids)
def get_metadata_for_dump(self, idx):
try:
path = os.path.join(self.abspath(idx, index_is_id=True), 'metadata.opf')
mi = self.get_metadata(idx, index_is_id=True)
# Always set cover to cover.jpg. Even if cover doesn't exist,
# no harm done. This way no need to call dirtied when
# cover is set/removed
mi.cover = 'cover.jpg'
except:
return (None, None)
return (path, mi)
def get_metadata(self, idx, index_is_id=False, get_cover=False): def get_metadata(self, idx, index_is_id=False, get_cover=False):
''' '''
Convenience method to return metadata as a :class:`Metadata` object. Convenience method to return metadata as a :class:`Metadata` object.
@ -647,6 +670,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
mi = self.data.get(idx, self.FIELD_MAP['all_metadata'], mi = self.data.get(idx, self.FIELD_MAP['all_metadata'],
row_is_id = index_is_id) row_is_id = index_is_id)
if mi is not None: if mi is not None:
if get_cover and mi.cover is None:
mi.cover = self.cover(idx, index_is_id=index_is_id, as_path=True)
return mi return mi
self.gm_missed += 1 self.gm_missed += 1

12
src/calibre/library/restore.py
View File

@ -48,12 +48,13 @@ class Restore(Thread):
self.books = [] self.books = []
self.conflicting_custom_cols = {} self.conflicting_custom_cols = {}
self.failed_restores = [] self.failed_restores = []
self.mismatched_dirs = []
self.successes = 0 self.successes = 0
self.tb = None self.tb = None
@property @property
def errors_occurred(self): def errors_occurred(self):
return self.failed_dirs or \ return self.failed_dirs or self.mismatched_dirs or \
self.conflicting_custom_cols or self.failed_restores self.conflicting_custom_cols or self.failed_restores
@property @property
@ -74,6 +75,13 @@ class Restore(Thread):
for x in self.conflicting_custom_cols: for x in self.conflicting_custom_cols:
ans += '\t#'+x+'\n' ans += '\t#'+x+'\n'
if self.mismatched_dirs:
ans += '\n\n'
ans += 'The following folders were ignored:\n'
for x in self.mismatched_dirs:
ans += '\t'+x+'\n'
return ans return ans
@ -140,7 +148,7 @@ class Restore(Thread):
'path': path, 'path': path,
}) })
else: else:
self.ignored_dirs.append(dirpath) self.mismatched_dirs.append(dirpath)
def create_cc_metadata(self): def create_cc_metadata(self):
self.books.sort(key=itemgetter('timestamp')) self.books.sort(key=itemgetter('timestamp'))