openlp-core team mailing list archive

[Phill <phill.ridout@xxxxxxxxx>]

Phill has proposed merging lp:~phill-ridout/openlp/bug1390236 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1390236 in OpenLP: "OpenLP locks up / crashes when preforming a text search on bible "
  https://bugs.launchpad.net/openlp/+bug/1390236

For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/bug1390236/+merge/245247

Fixes two bugs. First one limits the automatic selection of bible verses when more than 100 verses are returned after a search. This fixes the problems when "single click to preview" is selected.

The second bug is making selections with the keyboard with "single click to preview" is selected.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/bug1390236 into lp:openlp.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2014-12-07 08:21:37 +0000
+++ openlp/core/ui/slidecontroller.py	2014-12-19 22:14:20 +0000
@@ -863,7 +863,8 @@
         if service_item.is_media():
             self.on_media_start(service_item)
         self.slide_selected(True)
-        self.preview_widget.setFocus()
+        if service_item.from_service:
+            self.preview_widget.setFocus()
         if old_item:
             # Close the old item after the new one is opened
             # This avoids the service theme/desktop flashing on screen

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2014-05-03 14:19:29 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2014-12-19 22:14:20 +0000
@@ -713,7 +713,8 @@
         items = self.build_display_results(bible, second_bible, self.search_results)
         for bible_verse in items:
             self.list_view.addItem(bible_verse)
-        self.list_view.selectAll()
+        if len(items) < 100:
+            self.list_view.selectAll()
         self.search_results = {}
         self.second_search_results = {}
 

=== added file 'tests/functional/openlp_plugins/bibles/test_mediaitem.py'
--- tests/functional/openlp_plugins/bibles/test_mediaitem.py	1970-01-01 00:00:00 +0000
+++ tests/functional/openlp_plugins/bibles/test_mediaitem.py	2014-12-19 22:14:20 +0000
@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2014 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan      #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub,      #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer.   #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru,          #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,             #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock,              #
+# Frode Woldsund, Martin Zibricky, Patrick Zimmermann                         #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+This module contains tests for the lib submodule of the Presentations plugin.
+"""
+from unittest import TestCase
+from openlp.plugins.bibles.lib.mediaitem import BibleMediaItem
+from tests.functional import MagicMock, patch
+from tests.helpers.testmixin import TestMixin
+
+
+class TestMediaItem(TestCase, TestMixin):
+    """
+    Test the bible mediaitem methods.
+    """
+
+    def setUp(self):
+        """
+        Set up the components need for all tests.
+        """
+        with patch('openlp.plugins.bibles.lib.mediaitem.MediaManagerItem._setup'),\
+                patch('openlp.plugins.bibles.lib.mediaitem.BibleMediaItem.setup_item'):
+            self.media_item = BibleMediaItem(None, MagicMock())
+        self.setup_application()
+
+    def display_results_no_results_test(self):
+        """
+        Test the display_results method when called with a single bible, returning no results
+        """
+
+        # GIVEN: A mocked build_display_results which returns an empty list
+        with patch('openlp.plugins.bibles.lib.BibleMediaItem.build_display_results', **{'return_value': []}) \
+                as mocked_build_display_results:
+            mocked_list_view = MagicMock()
+            self.media_item.search_results = 'results'
+            self.media_item.list_view = mocked_list_view
+
+            # WHEN: Calling display_results with a single bible version
+            self.media_item.display_results('NIV')
+
+            # THEN: No items should be added to the list, and select all should have been called.
+            mocked_build_display_results.assert_called_once_with('NIV', '', 'results')
+            self.assertFalse(mocked_list_view.addItem.called)
+            mocked_list_view.selectAll.assert_called_once_with()
+            self.assertEqual(self.media_item.search_results, {})
+            self.assertEqual(self.media_item.second_search_results, {})
+
+    def display_results_two_bibles_no_results_test(self):
+        """
+        Test the display_results method when called with two bibles, returning no results
+        """
+
+        # GIVEN: A mocked build_display_results which returns an empty list
+        with patch('openlp.plugins.bibles.lib.BibleMediaItem.build_display_results', **{'return_value': []}) \
+                as mocked_build_display_results:
+            mocked_list_view = MagicMock()
+            self.media_item.search_results = 'results'
+            self.media_item.list_view = mocked_list_view
+
+            # WHEN: Calling display_results with two single bible versions
+            self.media_item.display_results('NIV', 'GNB')
+
+            # THEN: build_display_results should have been called with two bible versions.
+            #       No items should be added to the list, and select all should have been called.
+            mocked_build_display_results.assert_called_once_with('NIV', 'GNB', 'results')
+            self.assertFalse(mocked_list_view.addItem.called)
+            mocked_list_view.selectAll.assert_called_once_with()
+            self.assertEqual(self.media_item.search_results, {})
+            self.assertEqual(self.media_item.second_search_results, {})
+
+    def display_results_returns_lots_of_results_test_test(self):
+            """
+            Test the display_results method a large number of results (> 100) are returned
+            """
+
+            # GIVEN: A mocked build_displat_results which returns a large list of results
+            long_list = list(range(100))
+            with patch('openlp.plugins.bibles.lib.BibleMediaItem.build_display_results', **{'return_value': long_list})\
+                    as mocked_build_display_results:
+                mocked_list_view = MagicMock()
+                self.media_item.search_results = 'results'
+                self.media_item.list_view = mocked_list_view
+
+                # WHEN: Calling display_results
+                self.media_item.display_results('NIV', 'GNB')
+
+                # THEN: addItem should have been called 100 times, and the lsit items should not be selected.
+                mocked_build_display_results.assert_called_once_with('NIV', 'GNB', 'results')
+                self.assertEqual(mocked_list_view.addItem.call_count, 100)
+                self.assertFalse(mocked_list_view.selectAll.called)
+                self.assertEqual(self.media_item.search_results, {})
+                self.assertEqual(self.media_item.second_search_results, {})

=== modified file 'tests/functional/openlp_plugins/songs/test_mediaitem.py'
--- tests/functional/openlp_plugins/songs/test_mediaitem.py	2014-10-22 20:43:05 +0000
+++ tests/functional/openlp_plugins/songs/test_mediaitem.py	2014-12-19 22:14:20 +0000
@@ -1,3 +1,31 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2014 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan      #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub,      #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer.   #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru,          #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,             #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock,              #
+# Frode Woldsund, Martin Zibricky, Patrick Zimmermann                         #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
 """
 This module contains tests for the lib submodule of the Songs plugin.
 """