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

Fix template formatter functions not being reloaded asfter a check library operation

Browse Source 
Fix an error during shutdown caused by some library closed plugins

Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
Kovid Goyal 2017-03-11 23:56:31 +05:30
commit ac1fd2b9b3
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/actions/choose_library.py
View File

@ -493,16 +493,16 @@ class ChooseLibraryAction(InterfaceAction):
m.stop_metadata_backup() m.stop_metadata_backup()
db = m.db db = m.db
db.prefs.disable_setting = True db.prefs.disable_setting = True
library_path = db.library_path
d = DBCheck(self.gui, db) d = DBCheck(self.gui, db)
d.start() d.start()
try: try:
d.conn.close() m.close()
except: except:
pass pass
d.break_cycles() d.break_cycles()
self.gui.library_moved(db.library_path, call_close=not self.gui.library_moved(library_path, call_close=False)
d.closed_orig_conn)
if d.rejected: if d.rejected:
return return
if d.error is None: if d.error is None:

1
src/calibre/gui2/dialogs/check_library.py
View File

@ -37,7 +37,6 @@ class DBCheck(QDialog): # {{{
self.resize(self.sizeHint() + QSize(100, 50)) self.resize(self.sizeHint() + QSize(100, 50))
self.error = None self.error = None
self.db = db.new_api self.db = db.new_api
self.closed_orig_conn = False
self.rejected = False self.rejected = False
def start(self): def start(self):

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

@ -38,6 +38,7 @@ def human_readable(size, precision=1):
""" Convert a size in bytes into megabytes """ """ Convert a size in bytes into megabytes """
return ('%.'+str(precision)+'f') % ((size/(1024.*1024.)),) return ('%.'+str(precision)+'f') % ((size/(1024.*1024.)),)
TIME_FMT = '%d %b %Y' TIME_FMT = '%d %b %Y'
ALIGNMENT_MAP = {'left': Qt.AlignLeft, 'right': Qt.AlignRight, 'center': ALIGNMENT_MAP = {'left': Qt.AlignLeft, 'right': Qt.AlignRight, 'center':
@ -333,6 +334,7 @@ class BooksModel(QAbstractTableModel): # {{{
self.new_bookdisplay_data.emit(self.get_book_display_info(current_row)) self.new_bookdisplay_data.emit(self.get_book_display_info(current_row))
def close(self): def close(self):
if self.db is not None:
self.db.close() self.db.close()
self.db = None self.db = None
self.beginResetModel(), self.endResetModel() self.beginResetModel(), self.endResetModel()
@ -1710,6 +1712,3 @@ class DeviceBooksModel(BooksModel): # {{{
self.editable = [] self.editable = []
# }}} # }}}

3
src/calibre/gui2/ui.py
View File

@ -955,8 +955,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
if mb is not None: if mb is not None:
mb.stop() mb.stop()
if db is not None: self.library_view.model().close()
db.close()
try: try:
try: try: