forked from openlp/openlp
parent
4014179032
commit
582e2e267a
|
@ -52,6 +52,8 @@ def download_sha256():
|
||||||
web_config = get_web_page('https://get.openlp.org/webclient/download.cfg', headers={'User-Agent': user_agent})
|
web_config = get_web_page('https://get.openlp.org/webclient/download.cfg', headers={'User-Agent': user_agent})
|
||||||
except ConnectionError:
|
except ConnectionError:
|
||||||
return False
|
return False
|
||||||
|
if not web_config:
|
||||||
|
return None
|
||||||
file_bits = web_config.split()
|
file_bits = web_config.split()
|
||||||
return file_bits[0], file_bits[2]
|
return file_bits[0], file_bits[2]
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,10 @@ class HttpWorker(QtCore.QObject):
|
||||||
address = Settings().value('api/ip address')
|
address = Settings().value('api/ip address')
|
||||||
port = Settings().value('api/port')
|
port = Settings().value('api/port')
|
||||||
Registry().execute('get_website_version')
|
Registry().execute('get_website_version')
|
||||||
serve(application, host=address, port=port)
|
try:
|
||||||
|
serve(application, host=address, port=port)
|
||||||
|
except OSError:
|
||||||
|
log.exception('An error occurred when serving the application.')
|
||||||
|
|
||||||
def stop(self):
|
def stop(self):
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -403,8 +403,8 @@ def main(args=None):
|
||||||
.format(back_up_path=back_up_path))
|
.format(back_up_path=back_up_path))
|
||||||
QtWidgets.QMessageBox.information(
|
QtWidgets.QMessageBox.information(
|
||||||
None, translate('OpenLP', 'Settings Upgrade'),
|
None, translate('OpenLP', 'Settings Upgrade'),
|
||||||
translate('OpenLP', 'Your settings are about to upgraded. A backup will be created at {back_up_path}')
|
translate('OpenLP', 'Your settings are about to be upgraded. A backup will be created at '
|
||||||
.format(back_up_path=back_up_path))
|
'{back_up_path}').format(back_up_path=back_up_path))
|
||||||
settings.export(back_up_path)
|
settings.export(back_up_path)
|
||||||
settings.upgrade_settings()
|
settings.upgrade_settings()
|
||||||
# First time checks in settings
|
# First time checks in settings
|
||||||
|
|
|
@ -236,7 +236,7 @@ class Settings(QtCore.QSettings):
|
||||||
('bibles/last search type', '', []),
|
('bibles/last search type', '', []),
|
||||||
('custom/last search type', 'custom/last used search type', []),
|
('custom/last search type', 'custom/last used search type', []),
|
||||||
# The following changes are being made for the conversion to using Path objects made in 2.6 development
|
# The following changes are being made for the conversion to using Path objects made in 2.6 development
|
||||||
('advanced/data path', 'advanced/data path', [(str_to_path, None)]),
|
('advanced/data path', 'advanced/data path', [(lambda p: Path(p) if p is not None else None, None)]),
|
||||||
('crashreport/last directory', 'crashreport/last directory', [(str_to_path, None)]),
|
('crashreport/last directory', 'crashreport/last directory', [(str_to_path, None)]),
|
||||||
('servicemanager/last directory', 'servicemanager/last directory', [(str_to_path, None)]),
|
('servicemanager/last directory', 'servicemanager/last directory', [(str_to_path, None)]),
|
||||||
('servicemanager/last file', 'servicemanager/last file', [(str_to_path, None)]),
|
('servicemanager/last file', 'servicemanager/last file', [(str_to_path, None)]),
|
||||||
|
|
|
@ -389,7 +389,8 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
|
||||||
"""
|
"""
|
||||||
Return the current file name, excluding the path.
|
Return the current file name, excluding the path.
|
||||||
"""
|
"""
|
||||||
return self._service_path.name
|
if self._service_path:
|
||||||
|
return self._service_path.name
|
||||||
|
|
||||||
def reset_supported_suffixes(self):
|
def reset_supported_suffixes(self):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue