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

Fix performance in songbook search 

Speedup by ~500%

Fixes: https://launchpad.net/bugs/1552563
This commit is contained in:
Samuel Mehrbrodt 2016-04-29 18:30:17 +02:00
parent 1744032383
commit d636461cbb
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openlp/plugins/songs/lib/mediaitem.py
View File

@ -207,9 +207,11 @@ class SongMediaItem(MediaManagerItem):
search_keywords = search_keywords.rpartition(' ') search_keywords = search_keywords.rpartition(' ')
search_book = search_keywords[0] + '%' search_book = search_keywords[0] + '%'
search_entry = search_keywords[2] + '%' search_entry = search_keywords[2] + '%'
search_results = (self.plugin.manager.session.query(SongBookEntry) search_results = (self.plugin.manager.session.query(SongBookEntry.entry, Book.name, Song.title, Song.id)
.join(Song)
.join(Book) .join(Book)
.filter(Book.name.like(search_book), SongBookEntry.entry.like(search_entry)).all()) .filter(Book.name.like(search_book), SongBookEntry.entry.like(search_entry),
Song.temporary.is_(False)).all())
self.display_results_book(search_results) self.display_results_book(search_results)
elif search_type == SongSearch.Themes: elif search_type == SongSearch.Themes:
log.debug('Theme Search') log.debug('Theme Search')
@ -316,20 +318,17 @@ class SongMediaItem(MediaManagerItem):
:param search_results: A list of db SongBookEntry objects :param search_results: A list of db SongBookEntry objects
:return: None :return: None
""" """
def get_songbook_key(songbook_entry): def get_songbook_key(result):
"""Get the key to sort by""" """Get the key to sort by"""
return (get_natural_key(songbook_entry.songbook.name), get_natural_key(songbook_entry.entry)) return (get_natural_key(result[1]), get_natural_key(result[0]), get_natural_key(result[2]))
log.debug('display results Book') log.debug('display results Book')
self.list_view.clear() self.list_view.clear()
search_results.sort(key=get_songbook_key) search_results.sort(key=get_songbook_key)
for songbook_entry in search_results: for result in search_results:
# Do not display temporary songs song_detail = '%s #%s: %s' % (result[1], result[0], result[2])
if songbook_entry.song.temporary:
continue
song_detail = '%s #%s: %s' % (songbook_entry.songbook.name, songbook_entry.entry, songbook_entry.song.title)
song_name = QtWidgets.QListWidgetItem(song_detail) song_name = QtWidgets.QListWidgetItem(song_detail)
song_name.setData(QtCore.Qt.UserRole, songbook_entry.song.id) song_name.setData(QtCore.Qt.UserRole, result[3])
self.list_view.addItem(song_name) self.list_view.addItem(song_name)
def display_results_topic(self, search_results): def display_results_topic(self, search_results):