forked from openlp/openlp
Revert resource location
This commit is contained in:
parent
754da4c28e
commit
7c2c8f26e1
@ -322,8 +322,8 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
|
|||||||
Load the list of Crosswalk and BibleGateway bibles.
|
Load the list of Crosswalk and BibleGateway bibles.
|
||||||
"""
|
"""
|
||||||
#Load and store Crosswalk Bibles
|
#Load and store Crosswalk Bibles
|
||||||
filepath = os.path.join(AppLocation.get_section_data_path(
|
filepath = AppLocation.get_directory(AppLocation.PluginsDir)
|
||||||
self.bibleplugin.settingsSection), u'resources')
|
filepath = os.path.join(filepath, u'bibles', u'resources')
|
||||||
try:
|
try:
|
||||||
self.web_bible_list[WebDownload.Crosswalk] = {}
|
self.web_bible_list[WebDownload.Crosswalk] = {}
|
||||||
books_file = open(
|
books_file = open(
|
||||||
|
@ -56,8 +56,8 @@ class HTTPBooks(object):
|
|||||||
"""
|
"""
|
||||||
if HTTPBooks.cursor is None:
|
if HTTPBooks.cursor is None:
|
||||||
filepath = os.path.join(
|
filepath = os.path.join(
|
||||||
AppLocation.get_section_data_path(u'bibles'), u'resources',
|
AppLocation.get_directory(AppLocation.PluginsDir), u'bibles',
|
||||||
u'httpbooks.sqlite')
|
u'resources', u'httpbooks.sqlite')
|
||||||
conn = sqlite3.connect(filepath)
|
conn = sqlite3.connect(filepath)
|
||||||
HTTPBooks.cursor = conn.cursor()
|
HTTPBooks.cursor = conn.cursor()
|
||||||
return HTTPBooks.cursor
|
return HTTPBooks.cursor
|
||||||
|
@ -68,8 +68,9 @@ class OSISBible(BibleDB):
|
|||||||
self.trans_regex = re.compile(r'<transChange(.*?)>(.*?)</transChange>')
|
self.trans_regex = re.compile(r'<transChange(.*?)>(.*?)</transChange>')
|
||||||
self.spaces_regex = re.compile(r'([ ]{2,})')
|
self.spaces_regex = re.compile(r'([ ]{2,})')
|
||||||
self.books = {}
|
self.books = {}
|
||||||
filepath = os.path.join(AppLocation.get_section_data_path(
|
filepath = os.path.join(
|
||||||
self.bible_plugin.settingsSection), u'resources', u'osisbooks.csv')
|
AppLocation.get_directory(AppLocation.PluginsDir), u'bibles',
|
||||||
|
u'resources', u'osisbooks.csv')
|
||||||
fbibles = None
|
fbibles = None
|
||||||
try:
|
try:
|
||||||
fbibles = open(filepath, u'r')
|
fbibles = open(filepath, u'r')
|
||||||
|
Loading…
Reference in New Issue
Block a user