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

Further fixes

Browse Source
This commit is contained in:
Phill Ridout 2015-02-19 21:24:12 +00:00
parent 75c9391d8e
commit fb20f9243f
3 changed files with 149 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/common/historycombobox.py
View File

@ -28,9 +28,9 @@ from PyQt4 import QtCore, QtGui
class HistoryComboBox(QtGui.QComboBox): class HistoryComboBox(QtGui.QComboBox):
""" """
The :class:`~openlp.core.common.historycombobox.HistoryComboBox` widget emulates the QLineEdit ``returnPressed`` signal The :class:`~openlp.core.common.historycombobox.HistoryComboBox` widget emulates the QLineEdit ``returnPressed``
for when the :kbd:`Enter` or :kbd:`Return` keys are pressed, and saves anything that is typed into the edit box into signal for when the :kbd:`Enter` or :kbd:`Return` keys are pressed, and saves anything that is typed into the edit
its list. box into its list.
""" """
returnPressed = QtCore.pyqtSignal() returnPressed = QtCore.pyqtSignal()

259
openlp/plugins/bibles/lib/upgrade.py
View File

@ -30,6 +30,7 @@ log = logging.getLogger(__name__)
__version__ = 1 __version__ = 1
# TODO: When removing an upgrade path the ftw-data needs updating to the minimum supported version
def upgrade_1(session, metadata): def upgrade_1(session, metadata):
""" """
Version 1 upgrade. Version 1 upgrade.
@ -38,132 +39,162 @@ def upgrade_1(session, metadata):
""" """
metadata_table = metadata.tables['metadata'] metadata_table = metadata.tables['metadata']
# Copy "Version" to "name" ("version" used by upgrade system) # Copy "Version" to "name" ("version" used by upgrade system)
session.execute(insert(metadata_table).values( try:
key='name', session.execute(insert(metadata_table).values(
value=select( key='name',
[metadata_table.c.value], value=select(
metadata_table.c.key == 'Version' [metadata_table.c.value],
).as_scalar() metadata_table.c.key == 'Version'
)) ).as_scalar()
session.execute(delete(metadata_table).where(metadata_table.c.key == 'Version')) ))
session.execute(delete(metadata_table).where(metadata_table.c.key == 'Version'))
except:
log.exception('Exception when upgrading Version')
# Copy "Copyright" to "copyright" # Copy "Copyright" to "copyright"
session.execute(insert(metadata_table).values( try:
key='copyright', session.execute(insert(metadata_table).values(
value=select( key='copyright',
[metadata_table.c.value], value=select(
metadata_table.c.key == 'Copyright' [metadata_table.c.value],
).as_scalar() metadata_table.c.key == 'Copyright'
)) ).as_scalar()
session.execute(delete(metadata_table).where(metadata_table.c.key == 'Copyright')) ))
session.execute(delete(metadata_table).where(metadata_table.c.key == 'Copyright'))
except:
log.exception('Exception when upgrading Copyright')
# Copy "Permissions" to "permissions" # Copy "Permissions" to "permissions"
session.execute(insert(metadata_table).values( try:
key='permissions', session.execute(insert(metadata_table).values(
value=select( key='permissions',
[metadata_table.c.value], value=select(
metadata_table.c.key == 'Permissions' [metadata_table.c.value],
).as_scalar() metadata_table.c.key == 'Permissions'
)) ).as_scalar()
session.execute(delete(metadata_table).where(metadata_table.c.key == 'Permissions')) ))
session.execute(delete(metadata_table).where(metadata_table.c.key == 'Permissions'))
except:
log.exception('Exception when upgrading Permissions')
# Copy "Bookname language" to "book_name_language" # Copy "Bookname language" to "book_name_language"
value_count = session.execute( try:
select( value_count = session.execute(
[func.count(metadata_table.c.value)], select(
metadata_table.c.key == 'Bookname language' [func.count(metadata_table.c.value)],
)
).scalar()
if value_count > 0:
session.execute(insert(metadata_table).values(
key='book_name_language',
value=select(
[metadata_table.c.value],
metadata_table.c.key == 'Bookname language' metadata_table.c.key == 'Bookname language'
).as_scalar() )
)) ).scalar()
session.execute(delete(metadata_table).where(metadata_table.c.key == 'Bookname language')) if value_count > 0:
session.execute(insert(metadata_table).values(
key='book_name_language',
value=select(
[metadata_table.c.value],
metadata_table.c.key == 'Bookname language'
).as_scalar()
))
session.execute(delete(metadata_table).where(metadata_table.c.key == 'Bookname language'))
except:
log.exception('Exception when upgrading Bookname language')
# Copy "download source" to "download_source" # Copy "download source" to "download_source"
value_count = session.execute( try:
select( value_count = session.execute(
[func.count(metadata_table.c.value)], select(
metadata_table.c.key == 'download source' [func.count(metadata_table.c.value)],
)
).scalar()
log.debug('download source: %s', value_count)
if value_count > 0:
session.execute(insert(metadata_table).values(
key='download_source',
value=select(
[metadata_table.c.value],
metadata_table.c.key == 'download source' metadata_table.c.key == 'download source'
).as_scalar() )
)) ).scalar()
session.execute(delete(metadata_table).where(metadata_table.c.key == 'download source')) log.debug('download source: %s', value_count)
if value_count > 0:
session.execute(insert(metadata_table).values(
key='download_source',
value=select(
[metadata_table.c.value],
metadata_table.c.key == 'download source'
).as_scalar()
))
session.execute(delete(metadata_table).where(metadata_table.c.key == 'download source'))
except:
log.exception('Exception when upgrading download source')
# Copy "download name" to "download_name" # Copy "download name" to "download_name"
value_count = session.execute( try:
select( value_count = session.execute(
[func.count(metadata_table.c.value)], select(
metadata_table.c.key == 'download name' [func.count(metadata_table.c.value)],
)
).scalar()
log.debug('download name: %s', value_count)
if value_count > 0:
session.execute(insert(metadata_table).values(
key='download_name',
value=select(
[metadata_table.c.value],
metadata_table.c.key == 'download name' metadata_table.c.key == 'download name'
).as_scalar() )
)) ).scalar()
session.execute(delete(metadata_table).where(metadata_table.c.key == 'download name')) log.debug('download name: %s', value_count)
if value_count > 0:
session.execute(insert(metadata_table).values(
key='download_name',
value=select(
[metadata_table.c.value],
metadata_table.c.key == 'download name'
).as_scalar()
))
session.execute(delete(metadata_table).where(metadata_table.c.key == 'download name'))
except:
log.exception('Exception when upgrading download name')
# Copy "proxy server" to "proxy_server" # Copy "proxy server" to "proxy_server"
value_count = session.execute( try:
select( value_count = session.execute(
[func.count(metadata_table.c.value)], select(
metadata_table.c.key == 'proxy server' [func.count(metadata_table.c.value)],
)
).scalar()
log.debug('proxy server: %s', value_count)
if value_count > 0:
session.execute(insert(metadata_table).values(
key='proxy_server',
value=select(
[metadata_table.c.value],
metadata_table.c.key == 'proxy server' metadata_table.c.key == 'proxy server'
).as_scalar() )
)) ).scalar()
session.execute(delete(metadata_table).where(metadata_table.c.key == 'proxy server')) log.debug('proxy server: %s', value_count)
if value_count > 0:
session.execute(insert(metadata_table).values(
key='proxy_server',
value=select(
[metadata_table.c.value],
metadata_table.c.key == 'proxy server'
).as_scalar()
))
session.execute(delete(metadata_table).where(metadata_table.c.key == 'proxy server'))
except:
log.exception('Exception when upgrading proxy server')
# Copy "proxy username" to "proxy_username" # Copy "proxy username" to "proxy_username"
value_count = session.execute( try:
select( value_count = session.execute(
[func.count(metadata_table.c.value)], select(
metadata_table.c.key == 'proxy username' [func.count(metadata_table.c.value)],
)
).scalar()
log.debug('proxy username: %s', value_count)
if value_count > 0:
session.execute(insert(metadata_table).values(
key='proxy_username',
value=select(
[metadata_table.c.value],
metadata_table.c.key == 'proxy username' metadata_table.c.key == 'proxy username'
).as_scalar() )
)) ).scalar()
session.execute(delete(metadata_table).where(metadata_table.c.key == 'proxy username')) log.debug('proxy username: %s', value_count)
if value_count > 0:
session.execute(insert(metadata_table).values(
key='proxy_username',
value=select(
[metadata_table.c.value],
metadata_table.c.key == 'proxy username'
).as_scalar()
))
session.execute(delete(metadata_table).where(metadata_table.c.key == 'proxy username'))
except:
log.exception('Exception when upgrading proxy username')
# Copy "proxy password" to "proxy_password" # Copy "proxy password" to "proxy_password"
value_count = session.execute( try:
select( value_count = session.execute(
[func.count(metadata_table.c.value)], select(
metadata_table.c.key == 'proxy password' [func.count(metadata_table.c.value)],
)
).scalar()
log.debug('proxy password: %s', value_count)
if value_count > 0:
session.execute(insert(metadata_table).values(
key='proxy_password',
value=select(
[metadata_table.c.value],
metadata_table.c.key == 'proxy password' metadata_table.c.key == 'proxy password'
).as_scalar() )
)) ).scalar()
session.execute(delete(metadata_table).where(metadata_table.c.key == 'proxy password')) log.debug('proxy password: %s', value_count)
session.execute(delete(metadata_table).where(metadata_table.c.key == 'dbversion')) if value_count > 0:
session.execute(insert(metadata_table).values(
key='proxy_password',
value=select(
[metadata_table.c.value],
metadata_table.c.key == 'proxy password'
).as_scalar()
))
session.execute(delete(metadata_table).where(metadata_table.c.key == 'proxy password'))
except:
log.exception('Exception when upgrading proxy password')
try:
session.execute(delete(metadata_table).where(metadata_table.c.key == 'dbversion'))
except:
log.exception('Exception when deleting dbversion')
session.commit() session.commit()

1
openlp/plugins/songs/lib/upgrade.py
View File

@ -35,6 +35,7 @@ log = logging.getLogger(__name__)
__version__ = 4 __version__ = 4
# TODO: When removing an upgrade path the ftw-data needs updating to the minimum supported version
def upgrade_1(session, metadata): def upgrade_1(session, metadata):
""" """
Version 1 upgrade. Version 1 upgrade.