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

Move unloading formatter functions to backend.close().

Browse Source
This commit is contained in:
Charles Haley 2016-09-13 12:06:07 +02:00
parent 88edeb42ad
commit 1fe6c8d9a5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/db/backend.py
View File

@ -31,7 +31,8 @@ from calibre.utils.filenames import (
WindowsAtomicFolderMove, atomic_rename, remove_dir_if_empty, WindowsAtomicFolderMove, atomic_rename, remove_dir_if_empty,
copytree_using_links, copyfile_using_links) copytree_using_links, copyfile_using_links)
from calibre.utils.img import save_cover_data_to from calibre.utils.img import save_cover_data_to
from calibre.utils.formatter_functions import load_user_template_functions from calibre.utils.formatter_functions import (load_user_template_functions,
unload_user_template_functions)
from calibre.db.tables import (OneToOneTable, ManyToOneTable, ManyToManyTable, from calibre.db.tables import (OneToOneTable, ManyToOneTable, ManyToManyTable,
SizeTable, FormatsTable, AuthorsTable, IdentifiersTable, PathTable, SizeTable, FormatsTable, AuthorsTable, IdentifiersTable, PathTable,
CompositeTable, UUIDTable, RatingTable) CompositeTable, UUIDTable, RatingTable)
@ -1032,6 +1033,10 @@ class DB(object):
self.execute('UPDATE custom_columns SET mark_for_delete=1 WHERE id=?', (data['num'],)) self.execute('UPDATE custom_columns SET mark_for_delete=1 WHERE id=?', (data['num'],))
def close(self, force=False): def close(self, force=False):
try:
unload_user_template_functions(self.library_id)
except:
pass
if getattr(self, '_conn', None) is not None: if getattr(self, '_conn', None) is not None:
self._conn.close(force) self._conn.close(force)
del self._conn del self._conn

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

@ -685,8 +685,6 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
try: try:
if call_close: if call_close:
olddb.close() olddb.close()
from calibre.utils.formatter_functions import unload_user_template_functions
unload_user_template_functions(olddb.library_id)
except: except:
import traceback import traceback
traceback.print_exc() traceback.print_exc()