forked from openlp/openlp
- def handle_db_error now uses except FileNotFoundError to handle the missing data path
This commit is contained in:
parent
e46174d653
commit
ece524e2a1
|
@ -75,26 +75,23 @@ def get_db_path(plugin_name, db_file_name=None):
|
||||||
name=db_file_name)
|
name=db_file_name)
|
||||||
|
|
||||||
|
|
||||||
def handle_db_error(self, plugin_name, db_file_name):
|
def handle_db_error(plugin_name, db_file_name):
|
||||||
"""
|
"""
|
||||||
Log and report to the user that a database cannot be loaded
|
Log and report to the user that a database cannot be loaded
|
||||||
|
|
||||||
:param self: Allows the usage of other functions.
|
|
||||||
:param plugin_name: Name of plugin
|
:param plugin_name: Name of plugin
|
||||||
:param db_file_name: File name of database
|
:param db_file_name: File name of database
|
||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
# Check if the path (Eg. C:/ or D:/) exists in the system, if not: 'pass' so def load will handle the missing
|
try:
|
||||||
# drive in advancedtab.py. Otherwise check for "Normal" database errors.
|
|
||||||
self.current_data_path = AppLocation.get_data_path()
|
|
||||||
if not os.path.exists(self.current_data_path):
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
db_path = get_db_path(plugin_name, db_file_name)
|
db_path = get_db_path(plugin_name, db_file_name)
|
||||||
log.exception('Error loading database: {db}'.format(db=db_path))
|
log.exception('Error loading database: {db}'.format(db=db_path))
|
||||||
critical_error_message_box(translate('OpenLP.Manager', 'Database Error'),
|
critical_error_message_box(translate('OpenLP.Manager', 'Database Error'),
|
||||||
translate('OpenLP.Manager',
|
translate('OpenLP.Manager',
|
||||||
'OpenLP cannot load your database.\n\nDatabase: {db}').format(db=db_path))
|
'OpenLP cannot load your database.\n\nDatabase: {db}').format(db=db_path))
|
||||||
|
# If the path (Eg. C:/ or D:/) does not exists in the system, return and def load will handle the missing
|
||||||
|
except FileNotFoundError:
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
def init_url(plugin_name, db_file_name=None):
|
def init_url(plugin_name, db_file_name=None):
|
||||||
|
|
Loading…
Reference in New Issue