forked from openlp/openlp
small cleanups
This commit is contained in:
parent
a9c87798eb
commit
7cdf2bc320
@ -88,7 +88,6 @@ class CSVBible(BibleDB):
|
|||||||
"""
|
"""
|
||||||
log.info(self.__class__.__name__)
|
log.info(self.__class__.__name__)
|
||||||
BibleDB.__init__(self, parent, **kwargs)
|
BibleDB.__init__(self, parent, **kwargs)
|
||||||
self.parent = parent
|
|
||||||
#TODO: Delete unused code
|
#TODO: Delete unused code
|
||||||
'''
|
'''
|
||||||
try:
|
try:
|
||||||
@ -98,6 +97,8 @@ class CSVBible(BibleDB):
|
|||||||
'''
|
'''
|
||||||
self.booksfile = kwargs[u'booksfile']
|
self.booksfile = kwargs[u'booksfile']
|
||||||
self.versesfile = kwargs[u'versefile']
|
self.versesfile = kwargs[u'versefile']
|
||||||
|
|
||||||
|
#TODO: Delete unused code
|
||||||
'''
|
'''
|
||||||
def setup_testaments(self):
|
def setup_testaments(self):
|
||||||
"""
|
"""
|
||||||
|
@ -386,10 +386,10 @@ class BibleDB(QtCore.QObject, Manager):
|
|||||||
return db_book
|
return db_book
|
||||||
|
|
||||||
def get_book_ref_id_by_name(self, book, language_id=None):
|
def get_book_ref_id_by_name(self, book, language_id=None):
|
||||||
log.debug(u'BibleManager.get_book_ref_id_by_name:("%s", "%s")', book,
|
log.debug(u'BibleDB.get_book_ref_id_by_name:("%s", "%s")', book,
|
||||||
language_id)
|
language_id)
|
||||||
self.alternative_book_names_cache = AlternativeBookNamesDB(self.bible_plugin,
|
self.alternative_book_names_cache = AlternativeBookNamesDB(
|
||||||
path=self.path)
|
self.bible_plugin, path=self.path)
|
||||||
if BiblesResourcesDB.get_book(book):
|
if BiblesResourcesDB.get_book(book):
|
||||||
book_temp = BiblesResourcesDB.get_book(book)
|
book_temp = BiblesResourcesDB.get_book(book)
|
||||||
book_id = book_temp[u'id']
|
book_id = book_temp[u'id']
|
||||||
|
@ -359,7 +359,6 @@ class HTTPBible(BibleDB):
|
|||||||
Init confirms the bible exists and stores the database path.
|
Init confirms the bible exists and stores the database path.
|
||||||
"""
|
"""
|
||||||
BibleDB.__init__(self, parent, **kwargs)
|
BibleDB.__init__(self, parent, **kwargs)
|
||||||
self.parent = parent
|
|
||||||
self.download_source = kwargs[u'download_source']
|
self.download_source = kwargs[u'download_source']
|
||||||
self.download_name = kwargs[u'download_name']
|
self.download_name = kwargs[u'download_name']
|
||||||
# TODO: Clean up proxy stuff. We probably want one global proxy per
|
# TODO: Clean up proxy stuff. We probably want one global proxy per
|
||||||
|
@ -130,8 +130,6 @@ class BibleManager(object):
|
|||||||
self.suffix = u'.sqlite'
|
self.suffix = u'.sqlite'
|
||||||
self.import_wizard = None
|
self.import_wizard = None
|
||||||
self.reload_bibles()
|
self.reload_bibles()
|
||||||
#TODO: Delete unused code
|
|
||||||
#self.reload_alternative_book_names()
|
|
||||||
self.media = None
|
self.media = None
|
||||||
|
|
||||||
def reload_bibles(self):
|
def reload_bibles(self):
|
||||||
|
@ -43,7 +43,6 @@ class OpenLP1Bible(BibleDB):
|
|||||||
"""
|
"""
|
||||||
log.debug(self.__class__.__name__)
|
log.debug(self.__class__.__name__)
|
||||||
BibleDB.__init__(self, parent, **kwargs)
|
BibleDB.__init__(self, parent, **kwargs)
|
||||||
self.parent = parent
|
|
||||||
self.filename = kwargs[u'filename']
|
self.filename = kwargs[u'filename']
|
||||||
|
|
||||||
def do_import(self):
|
def do_import(self):
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# -*- coding: utf-8 -*-
|
song# -*- coding: utf-8 -*-
|
||||||
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
|
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
@ -43,7 +43,6 @@ class OpenSongBible(BibleDB):
|
|||||||
"""
|
"""
|
||||||
log.debug(self.__class__.__name__)
|
log.debug(self.__class__.__name__)
|
||||||
BibleDB.__init__(self, parent, **kwargs)
|
BibleDB.__init__(self, parent, **kwargs)
|
||||||
self.parent = parent
|
|
||||||
self.filename = kwargs['filename']
|
self.filename = kwargs['filename']
|
||||||
|
|
||||||
def do_import(self):
|
def do_import(self):
|
||||||
|
@ -46,7 +46,6 @@ class OSISBible(BibleDB):
|
|||||||
def __init__(self, parent, **kwargs):
|
def __init__(self, parent, **kwargs):
|
||||||
log.debug(self.__class__.__name__)
|
log.debug(self.__class__.__name__)
|
||||||
BibleDB.__init__(self, parent, **kwargs)
|
BibleDB.__init__(self, parent, **kwargs)
|
||||||
self.parent = parent
|
|
||||||
self.filename = kwargs[u'filename']
|
self.filename = kwargs[u'filename']
|
||||||
fbibles = None
|
fbibles = None
|
||||||
self.books = {}
|
self.books = {}
|
||||||
|
Loading…
Reference in New Issue
Block a user