raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Remove previous change to skip old_database bibles

Browse Source
This commit is contained in:
Stevan Pettit 2011-06-09 22:55:43 -04:00
parent 729f38f158
commit f0dde73530
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
openlp/plugins/bibles/lib/manager.py
View File

@ -147,34 +147,33 @@ class BibleManager(object):
self.db_cache = {} self.db_cache = {}
self.old_bible_databases = [] self.old_bible_databases = []
for filename in files: for filename in files:
if not filename.startswith(u'old_database_'): bible = BibleDB(self.parent, path=self.path, file=filename)
bible = BibleDB(self.parent, path=self.path, file=filename) name = bible.get_name()
name = bible.get_name() # Remove corrupted files.
# Remove corrupted files. if name is None:
if name is None: delete_file(os.path.join(self.path, filename))
delete_file(os.path.join(self.path, filename)) continue
continue # Find old database versions
# Find old database versions if bible.is_old_database():
if bible.is_old_database(): self.old_bible_databases.append([filename, name])
self.old_bible_databases.append([filename, name]) bible.session.close()
bible.session.close() continue
continue log.debug(u'Bible Name: "%s"', name)
log.debug(u'Bible Name: "%s"', name) self.db_cache[name] = bible
self.db_cache[name] = bible # Look to see if lazy load bible exists and get create getter.
# Look to see if lazy load bible exists and get create getter. source = self.db_cache[name].get_object(BibleMeta,
source = self.db_cache[name].get_object(BibleMeta, u'download source')
u'download source') if source:
if source: download_name = self.db_cache[name].get_object(BibleMeta,
download_name = self.db_cache[name].get_object(BibleMeta, u'download name').value
u'download name').value meta_proxy = self.db_cache[name].get_object(BibleMeta,
meta_proxy = self.db_cache[name].get_object(BibleMeta, u'proxy url')
u'proxy url') web_bible = HTTPBible(self.parent, path=self.path,
web_bible = HTTPBible(self.parent, path=self.path, file=filename, download_source=source.value,
file=filename, download_source=source.value, download_name=download_name)
download_name=download_name) if meta_proxy:
if meta_proxy: web_bible.proxy_server = meta_proxy.value
web_bible.proxy_server = meta_proxy.value self.db_cache[name] = web_bible
self.db_cache[name] = web_bible
log.debug(u'Bibles reloaded') log.debug(u'Bibles reloaded')
def set_process_dialog(self, wizard): def set_process_dialog(self, wizard):