From 684788f2fd761a75812746051a7bd2f63d8ce681 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Fri, 15 Apr 2016 09:45:41 -0400 Subject: [PATCH] DictionaryDB: use backup on load from file, if available --- gramps/plugins/database/dictionarydb.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gramps/plugins/database/dictionarydb.py b/gramps/plugins/database/dictionarydb.py index 7a17faf50..c3d9b3437 100644 --- a/gramps/plugins/database/dictionarydb.py +++ b/gramps/plugins/database/dictionarydb.py @@ -28,6 +28,8 @@ from gramps.gen.db.generic import * from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext +import glob + class DictionaryDb(DbGeneric): """ Database backend class for dictionary databases @@ -1066,8 +1068,11 @@ class DictionaryDb(DbGeneric): from gramps.plugins.importer.importxml import importData from gramps.cli.user import User if self._directory: - filename = os.path.join(self._directory, "data.gramps") - if os.path.isfile(filename): - importData(self, filename, User()) - self.reindex_reference_map(lambda progress: None) - self.rebuild_secondary(lambda progress: None) + backups = list(reversed(glob.glob(os.path.join( + self._directory, "backup-*.gramps")))) + if backups: + filename = backups[0] + if os.path.isfile(filename): + importData(self, filename, User()) + self.reindex_reference_map(lambda progress: None) + self.rebuild_secondary(lambda progress: None)