'
__docformat__ = 'restructuredtext en'
-from PyQt4.Qt import QDialog, QLabel, QVBoxLayout, QDialogButtonBox, \
- QProgressBar, QSize, QTimer, pyqtSignal, Qt
+from PyQt4.Qt import (QDialog, QLabel, QVBoxLayout, QDialogButtonBox,
+ QProgressBar, QSize, QTimer, pyqtSignal, Qt)
from calibre.library.restore import Restore
-from calibre.gui2 import error_dialog, question_dialog, warning_dialog, \
- info_dialog
+from calibre.gui2 import (error_dialog, question_dialog, warning_dialog,
+ info_dialog)
+from calibre import force_unicode
+from calibre.constants import filesystem_encoding
class DBRestore(QDialog):
@@ -73,6 +75,19 @@ class DBRestore(QDialog):
self.msg.setText(msg)
self.pb.setValue(step)
+def _show_success_msg(restorer, parent=None):
+ r = restorer
+ olddb = _('The old database was saved as: %s')%force_unicode(r.olddb,
+ filesystem_encoding)
+ if r.errors_occurred:
+ warning_dialog(parent, _('Success'),
+ _('Restoring the database succeeded with some warnings'
+ ' click Show details to see the details. %s')%olddb,
+ det_msg=r.report, show=True)
+ else:
+ info_dialog(parent, _('Success'),
+ _('Restoring database was successful. %s')%olddb, show=True,
+ show_copy_button=False)
def restore_database(db, parent=None):
if not question_dialog(parent, _('Are you sure?'), ''+
@@ -102,14 +117,21 @@ def restore_database(db, parent=None):
_('Restoring database failed, click Show details to see details'),
det_msg=r.tb, show=True)
else:
- if r.errors_occurred:
- warning_dialog(parent, _('Success'),
- _('Restoring the database succeeded with some warnings'
- ' click Show details to see the details.'),
- det_msg=r.report, show=True)
- else:
- info_dialog(parent, _('Success'),
- _('Restoring database was successful'), show=True,
- show_copy_button=False)
+ _show_success_msg(r, parent=parent)
return True
+def repair_library_at(library_path, parent=None):
+ d = DBRestore(parent, library_path)
+ d.exec_()
+ if d.rejected:
+ return False
+ r = d.restorer
+ if r.tb is not None:
+ error_dialog(parent, _('Failed'),
+ _('Restoring database failed, click Show details to see details'),
+ det_msg=r.tb, show=True)
+ return False
+ _show_success_msg(r, parent=parent)
+ return True
+
+
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 76b734a718..81324d31f8 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -4,16 +4,15 @@ __copyright__ = '2008, Kovid Goyal '
import sys, os, time, socket, traceback
from functools import partial
-from PyQt4.Qt import QCoreApplication, QIcon, QObject, QTimer, \
- QThread, pyqtSignal, Qt, QProgressDialog, QString, QPixmap, \
- QSplashScreen, QApplication
+from PyQt4.Qt import (QCoreApplication, QIcon, QObject, QTimer,
+ QPixmap, QSplashScreen, QApplication)
-from calibre import prints, plugins
-from calibre.constants import iswindows, __appname__, isosx, DEBUG, \
- filesystem_encoding
+from calibre import prints, plugins, force_unicode
+from calibre.constants import (iswindows, __appname__, isosx, DEBUG,
+ filesystem_encoding)
from calibre.utils.ipc import ADDRESS, RC
-from calibre.gui2 import ORG_NAME, APP_UID, initialize_file_icon_provider, \
- Application, choose_dir, error_dialog, question_dialog, gprefs
+from calibre.gui2 import (ORG_NAME, APP_UID, initialize_file_icon_provider,
+ Application, choose_dir, error_dialog, question_dialog, gprefs)
from calibre.gui2.main_window import option_parser as _option_parser
from calibre.utils.config import prefs, dynamic
from calibre.library.database2 import LibraryDatabase2
@@ -110,36 +109,9 @@ def get_library_path(parent=None):
default_dir=get_default_library_path())
return library_path
-class DBRepair(QThread):
-
- repair_done = pyqtSignal(object, object)
- progress = pyqtSignal(object, object)
-
- def __init__(self, library_path, parent, pd):
- QThread.__init__(self, parent)
- self.library_path = library_path
- self.pd = pd
- self.progress.connect(self._callback, type=Qt.QueuedConnection)
-
- def _callback(self, num, is_length):
- if is_length:
- self.pd.setRange(0, num-1)
- num = 0
- self.pd.setValue(num)
-
- def callback(self, num, is_length):
- self.progress.emit(num, is_length)
-
- def run(self):
- from calibre.debug import reinit_db
- try:
- reinit_db(os.path.join(self.library_path, 'metadata.db'),
- self.callback)
- db = LibraryDatabase2(self.library_path)
- tb = None
- except:
- db, tb = None, traceback.format_exc()
- self.repair_done.emit(db, tb)
+def repair_library(library_path):
+ from calibre.gui2.dialogs.restore_library import repair_library_at
+ return repair_library_at(library_path)
class GuiRunner(QObject):
'''Make sure an event loop is running before starting the main work of
@@ -184,9 +156,6 @@ class GuiRunner(QObject):
raise SystemExit(1)
def initialize_db_stage2(self, db, tb):
- repair_pd = getattr(self, 'repair_pd', None)
- if repair_pd is not None:
- repair_pd.cancel()
if db is None and tb is not None:
# DB Repair failed
@@ -219,23 +188,16 @@ class GuiRunner(QObject):
db = LibraryDatabase2(self.library_path)
except (sqlite.Error, DatabaseException):
repair = question_dialog(self.splash_screen, _('Corrupted database'),
- _('Your calibre database appears to be corrupted. Do '
- 'you want calibre to try and repair it automatically? '
- 'If you say No, a new empty calibre library will be created.'),
+ _('The library database at %s appears to be corrupted. Do '
+ 'you want calibre to try and rebuild it automatically? '
+ 'The rebuild may not be completely successful. '
+ 'If you say No, a new empty calibre library will be created.')
+ % force_unicode(self.library_path, filesystem_encoding),
det_msg=traceback.format_exc()
)
if repair:
- self.repair_pd = QProgressDialog(_('Repairing database. This '
- 'can take a very long time for a large collection'), QString(),
- 0, 0)
- self.repair_pd.setWindowModality(Qt.WindowModal)
- self.repair_pd.show()
-
- self.repair = DBRepair(self.library_path, self, self.repair_pd)
- self.repair.repair_done.connect(self.initialize_db_stage2,
- type=Qt.QueuedConnection)
- self.repair.start()
- return
+ if repair_library(self.library_path):
+ db = LibraryDatabase2(self.library_path)
except:
error_dialog(self.splash_screen, _('Bad database location'),
_('Bad database location %r. Will start with '
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 928e6c63ab..c12a15829a 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -18,8 +18,8 @@ from PyQt4.Qt import (Qt, SIGNAL, QTimer, QHelpEvent, QAction,
QMenu, QIcon, pyqtSignal, QUrl,
QDialog, QSystemTrayIcon, QApplication)
-from calibre import prints
-from calibre.constants import __appname__, isosx
+from calibre import prints, force_unicode
+from calibre.constants import __appname__, isosx, filesystem_encoding
from calibre.utils.config import prefs, dynamic
from calibre.utils.ipc.server import Server
from calibre.library.database2 import LibraryDatabase2
@@ -41,7 +41,7 @@ from calibre.gui2.search_box import SearchBoxMixin, SavedSearchBoxMixin
from calibre.gui2.search_restriction_mixin import SearchRestrictionMixin
from calibre.gui2.tag_browser.ui import TagBrowserMixin
from calibre.gui2.keyboard import Manager
-
+from calibre.library.sqlite import sqlite, DatabaseException
class Listener(Thread): # {{{
@@ -475,7 +475,8 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
def booklists(self):
return self.memory_view.model().db, self.card_a_view.model().db, self.card_b_view.model().db
- def library_moved(self, newloc, copy_structure=False, call_close=True):
+ def library_moved(self, newloc, copy_structure=False, call_close=True,
+ allow_rebuild=False):
if newloc is None: return
default_prefs = None
try:
@@ -484,7 +485,26 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
default_prefs = olddb.prefs
except:
olddb = None
- db = LibraryDatabase2(newloc, default_prefs=default_prefs)
+ try:
+ db = LibraryDatabase2(newloc, default_prefs=default_prefs)
+ except (DatabaseException, sqlite.Error):
+ if not allow_rebuild: raise
+ import traceback
+ repair = question_dialog(self, _('Corrupted database'),
+ _('The library database at %s appears to be corrupted. Do '
+ 'you want calibre to try and rebuild it automatically? '
+ 'The rebuild may not be completely successful.')
+ % force_unicode(newloc, filesystem_encoding),
+ det_msg=traceback.format_exc()
+ )
+ if repair:
+ from calibre.gui2.dialogs.restore_library import repair_library_at
+ if repair_library_at(newloc, parent=self):
+ db = LibraryDatabase2(newloc, default_prefs=default_prefs)
+ else:
+ return
+ else:
+ return
if self.content_server is not None:
self.content_server.set_database(db)
self.library_path = newloc