Commit 393869e5 authored by Ozzieisaacs's avatar Ozzieisaacs

Test revert global Session

parent 34d32259
...@@ -48,7 +48,6 @@ try: ...@@ -48,7 +48,6 @@ try:
except ImportError: except ImportError:
use_unidecode = False use_unidecode = False
Session = None
cc_exceptions = ['datetime', 'comments', 'composite', 'series'] cc_exceptions = ['datetime', 'comments', 'composite', 'series']
cc_classes = {} cc_classes = {}
...@@ -410,7 +409,6 @@ class CalibreDB(): ...@@ -410,7 +409,6 @@ class CalibreDB():
def setup_db(self, config, app_db_path): def setup_db(self, config, app_db_path):
self.config = config self.config = config
self.dispose() self.dispose()
global Session
if not config.config_calibre_dir: if not config.config_calibre_dir:
config.invalidate() config.invalidate()
...@@ -680,7 +678,6 @@ class CalibreDB(): ...@@ -680,7 +678,6 @@ class CalibreDB():
conn.create_function("title_sort", 1, _title_sort) conn.create_function("title_sort", 1, _title_sort)
def dispose(self): def dispose(self):
# global session
old_session = self.session old_session = self.session
self.session = None self.session = None
......
...@@ -53,7 +53,7 @@ class TaskConvert(CalibreTask): ...@@ -53,7 +53,7 @@ class TaskConvert(CalibreTask):
def _convert_ebook_format(self): def _convert_ebook_format(self):
error_message = None error_message = None
local_session = db.Session() # local_session = db.Session()
file_path = self.file_path file_path = self.file_path
book_id = self.bookid book_id = self.bookid
format_old_ext = u'.' + self.settings['old_book_format'].lower() format_old_ext = u'.' + self.settings['old_book_format'].lower()
...@@ -94,10 +94,10 @@ class TaskConvert(CalibreTask): ...@@ -94,10 +94,10 @@ class TaskConvert(CalibreTask):
book_format=self.settings['new_book_format'].upper(), book_format=self.settings['new_book_format'].upper(),
book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext)) book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext))
try: try:
local_session.merge(new_format) calibre_db.session.merge(new_format)
local_session.commit() calibre_db.session.commit()
except SQLAlchemyError as e: except SQLAlchemyError as e:
local_session.rollback() calibre_db.session.rollback()
log.error("Database error: %s", e) log.error("Database error: %s", e)
return return
self.results['path'] = cur_book.path self.results['path'] = cur_book.path
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment