Merge lp:~phill-ridout/openlp/fixes-V into lp:openlp

[Phill]

Number of fixes, including:
* Fix to creation and saving of services
* SongBeamer encoding detection
* OSX plugin, media and presentation controller discovery and import fixes
* Make the ftw thread work in its own thread, rather than the main thread

lp:~phill-ridout/openlp/fixes-V (revision 2801)
https://ci.openlp.io/job/Branch-01-Pull/2351/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2252/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2117/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1443/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test_Coverage/1260/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04c-Code_Analysis2/390/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/219/ [WAITING]
[FAILURE]
Stopping after failure

Failed builds:
 - Branch-05-AppVeyor-Tests #219: https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/219/console

[Raoul Snyman (raoul-snyman)]

Hold up with the thread changes. I have a thread manager thingie which I'm hoping will solve some of the segfaults we're getting related to threads.

[Raoul Snyman (raoul-snyman)]

Also, a note on the SongBeamer import. Despite what their forums and other stuff says, SongBeamer actually uses the encoding set by Windows. This means that I had a case where the file encoding was actually an Arabic encoding (which chardet couldn't detect either). Sadly, this is not a simple fix (and probably never will be).

[lp:~phill-ridout/openlp/fixes-V]

2796. By Tim Bentley on 2017-12-17

Refactor asserts in api and common packages

lp:~trb143/openlp/asserts (revision 2809)
https://ci.openlp.io/job/Branch-01-Pull/2354/ [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2255/ [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2120/ [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1446/ [SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test_Coverage/1263/ [SUCCESS]
https...

[Phill (phill-ridout)]

--------------------------------------------------------------------------------
lp:~phill-ridout/openlp/fixes-V (revision 2798)
https://ci.openlp.io/job/Branch-01-Pull/2359/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2260/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2121/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1447/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test_Coverage/1264/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04c-Code_Analysis2/394/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/223/ [WAITING]
[FAILURE]
Stopping after failure

Failed builds:
 - Branch-05-AppVeyor-Tests #223: https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/223/console

[lp:~phill-ridout/openlp/fixes-V]

2797. By Tim Bentley on 2017-12-18

functional lib completed

lp:~trb143/openlp/asserts (revision 2815)
https://ci.openlp.io/job/Branch-01-Pull/2362/ [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2263/ [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2124/ [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1450/ [SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test_Coverage/1266/ [SUCCESS]
https://ci.openlp.io/jo...

[Raoul Snyman (raoul-snyman)]

Looks fine to me.

review: Approve

[Tim Bentley (trb143)]

review: Approve

[lp:~phill-ridout/openlp/fixes-V]

2798. By Phill on 2017-12-21

Number of fixes, including:
* Fix to creation and saving of services
* SongBeamer encoding detection
* OSX plugin, media and presentation controller discovery and import fixes
* Make the ftw thread work in its own thread, rather than the main thread

lp:~phill-ridout/openlp/fixes-V (revision 2801)
https://ci.openlp.io/job/Branch-01-Pull/2351/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2252/ [WAITING]
[RUNNING]
[SUCC...

=== modified file 'openlp/core/common/__init__.py'
--- openlp/core/common/__init__.py	2017-11-18 23:14:28 +0000
+++ openlp/core/common/__init__.py	2017-12-17 15:32:59 +0000
@@ -80,6 +80,7 @@
         extension_path = extension_path.relative_to(app_dir)
         if extension_path.name in excluded_files:
             continue
+        log.debug('Attempting to import %s', extension_path)
         module_name = path_to_module(extension_path)
         try:
             importlib.import_module(module_name)

=== modified file 'openlp/core/lib/pluginmanager.py'
--- openlp/core/lib/pluginmanager.py	2017-11-18 22:37:24 +0000
+++ openlp/core/lib/pluginmanager.py	2017-12-17 15:32:59 +0000
@@ -71,7 +71,7 @@
         """
         Scan a directory for objects inheriting from the ``Plugin`` class.
         """
-        glob_pattern = os.path.join('plugins', '*', '*plugin.py')
+        glob_pattern = os.path.join('plugins', '*', '[!.]*plugin.py')
         extension_loader(glob_pattern)
         plugin_classes = Plugin.__subclasses__()
         plugin_objects = []

=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py	2017-11-22 21:56:56 +0000
+++ openlp/core/ui/media/mediacontroller.py	2017-12-17 15:32:59 +0000
@@ -181,7 +181,8 @@
         """
         log.debug('_check_available_media_players')
         controller_dir = os.path.join('core', 'ui', 'media')
-        glob_pattern = os.path.join(controller_dir, '*player.py')
+        # Find all files that do not begin with '.' (lp:#1738047) and end with player.py
+        glob_pattern = os.path.join(controller_dir, '[!.]*player.py')
         extension_loader(glob_pattern, ['mediaplayer.py'])
         player_classes = MediaPlayer.__subclasses__()
         for player_class in player_classes:

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2017-12-02 21:47:11 +0000
+++ openlp/core/ui/servicemanager.py	2017-12-17 15:32:59 +0000
@@ -370,7 +370,7 @@
         :rtype: None
         """
         self._service_path = file_path
-        self.main_window.set_service_modified(self.is_modified(), file_path.name)
+        self.set_modified(self.is_modified())
         Settings().setValue('servicemanager/last file', file_path)
         if file_path and file_path.suffix == '.oszl':
             self._save_lite = True

=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py	2017-11-06 22:41:36 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py	2017-12-17 15:32:59 +0000
@@ -336,6 +336,7 @@
         self.sword_layout.addWidget(self.sword_tab_widget)
         self.sword_disabled_label = QtWidgets.QLabel(self.sword_widget)
         self.sword_disabled_label.setObjectName('SwordDisabledLabel')
+        self.sword_disabled_label.setWordWrap(True)
         self.sword_layout.addWidget(self.sword_disabled_label)
         self.select_stack.addWidget(self.sword_widget)
         self.wordproject_widget = QtWidgets.QWidget(self.select_page)

=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py	2017-11-19 21:57:38 +0000
+++ openlp/plugins/presentations/presentationplugin.py	2017-12-17 15:32:59 +0000
@@ -129,7 +129,8 @@
         """
         log.debug('check_pre_conditions')
         controller_dir = os.path.join('plugins', 'presentations', 'lib')
-        glob_pattern = os.path.join(controller_dir, '*controller.py')
+        # Find all files that do not begin with '.' (lp:#1738047) and end with controller.py
+        glob_pattern = os.path.join(controller_dir, '[!.]*controller.py')
         extension_loader(glob_pattern, ['presentationcontroller.py'])
         controller_classes = PresentationController.__subclasses__()
         for controller_class in controller_classes:

=== modified file 'tests/functional/openlp_plugins/presentations/test_impresscontroller.py'
--- tests/functional/openlp_plugins/presentations/test_impresscontroller.py	2017-10-07 07:05:07 +0000
+++ tests/functional/openlp_plugins/presentations/test_impresscontroller.py	2017-12-17 15:32:59 +0000
@@ -23,7 +23,7 @@
 Functional tests to test the Impress class and related methods.
 """
 from unittest import TestCase
-from unittest.mock import MagicMock
+from unittest.mock import MagicMock, patch
 import shutil
 from tempfile import mkdtemp
 
@@ -72,6 +72,60 @@
         self.assertEqual('Impress', controller.name,
                          'The name of the presentation controller should be correct')
 
+    @patch('openlp.plugins.presentations.lib.impresscontroller.log')
+    def test_check_available(self, mocked_log):
+        """
+        Test `ImpressController.check_available` on Windows
+        """
+        # GIVEN: An instance of :class:`ImpressController`
+        controller = ImpressController(plugin=self.mock_plugin)
+
+        # WHEN: `check_available` is called on Windows and `get_com_servicemanager` returns None
+        with patch('openlp.plugins.presentations.lib.impresscontroller.is_win', return_value=True), \
+                patch.object(controller, 'get_com_servicemanager', return_value=None) as mocked_get_com_servicemanager:
+            result = controller.check_available()
+
+            # THEN: `check_available` should return False
+            assert mocked_get_com_servicemanager.called is True
+            assert result is False
+
+    @patch('openlp.plugins.presentations.lib.impresscontroller.log')
+    def test_check_available1(self, mocked_log):
+        """
+        Test `ImpressController.check_available` on Windows
+        """
+        # GIVEN: An instance of :class:`ImpressController`
+        controller = ImpressController(plugin=self.mock_plugin)
+
+        # WHEN: `check_available` is called on Windows and `get_com_servicemanager` returns an object
+        mocked_com_object = MagicMock()
+        with patch('openlp.plugins.presentations.lib.impresscontroller.is_win', return_value=True), \
+                patch.object(controller, 'get_com_servicemanager', return_value=mocked_com_object) \
+                as mocked_get_com_servicemanager:
+            result = controller.check_available()
+
+            # THEN: `check_available` should return True
+            assert mocked_get_com_servicemanager.called is True
+            assert result is True
+
+    @patch('openlp.plugins.presentations.lib.impresscontroller.log')
+    @patch('openlp.plugins.presentations.lib.impresscontroller.is_win', return_value=False)
+    def test_check_available2(self, mocked_is_win, mocked_log):
+        """
+        Test `ImpressController.check_available` when not on Windows
+        """
+        # GIVEN: An instance of :class:`ImpressController`
+        controller = ImpressController(plugin=self.mock_plugin)
+
+        # WHEN: `check_available` is called on Windows and `uno_available` is True
+        with patch('openlp.plugins.presentations.lib.impresscontroller.uno_available', True), \
+                patch.object(controller, 'get_com_servicemanager') as mocked_get_com_servicemanager:
+            result = controller.check_available()
+
+            # THEN: `check_available` should return True
+            assert mocked_get_com_servicemanager.called is False
+            assert result is True
+
 
 class TestImpressDocument(TestCase):
     """