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

Fix a bug when cleaning up thumbnails where all presentation controllers, whether enabled or not, would be cycled through.

Browse Source 
bzr-revno: 2884
This commit is contained in:
Raoul Snyman 2019-07-02 23:25:22 -07:00
commit 87eac6fbe0
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/plugins/presentations/lib/mediaitem.py
View File

@ -246,6 +246,9 @@ class PresentationMediaItem(MediaManagerItem):
:rtype: None :rtype: None
""" """
for cidx in self.controllers: for cidx in self.controllers:
if not self.controllers[cidx].enabled():
# skip presentation controllers that are not enabled
continue
file_ext = file_path.suffix[1:] file_ext = file_path.suffix[1:]
if file_ext in self.controllers[cidx].supports or file_ext in self.controllers[cidx].also_supports: if file_ext in self.controllers[cidx].supports or file_ext in self.controllers[cidx].also_supports:
doc = self.controllers[cidx].add_document(file_path) doc = self.controllers[cidx].add_document(file_path)

21
tests/functional/openlp_plugins/presentations/test_mediaitem.py
View File

@ -24,7 +24,7 @@ This module contains tests for the lib submodule of the Presentations plugin.
""" """
from pathlib import Path from pathlib import Path
from unittest import TestCase from unittest import TestCase
from unittest.mock import MagicMock, call, patch from unittest.mock import MagicMock, PropertyMock, call, patch
from openlp.core.common.registry import Registry from openlp.core.common.registry import Registry
from openlp.plugins.presentations.lib.mediaitem import PresentationMediaItem from openlp.plugins.presentations.lib.mediaitem import PresentationMediaItem
@ -94,17 +94,23 @@ class TestMediaItem(TestCase, TestMixin):
Test that the clean_up_thumbnails method works as expected when files exists. Test that the clean_up_thumbnails method works as expected when files exists.
""" """
# GIVEN: A mocked controller, and mocked os.path.getmtime # GIVEN: A mocked controller, and mocked os.path.getmtime
mocked_controller = MagicMock() mocked_disabled_controller = MagicMock()
mocked_disabled_controller.enabled.return_value = False
mocked_disabled_supports = PropertyMock()
type(mocked_disabled_controller).supports = mocked_disabled_supports
mocked_enabled_controller = MagicMock()
mocked_enabled_controller.enabled.return_value = True
mocked_doc = MagicMock(**{'get_thumbnail_path.return_value': Path()}) mocked_doc = MagicMock(**{'get_thumbnail_path.return_value': Path()})
mocked_controller.add_document.return_value = mocked_doc mocked_enabled_controller.add_document.return_value = mocked_doc
mocked_controller.supports = ['tmp'] mocked_enabled_controller.supports = ['tmp']
self.media_item.controllers = { self.media_item.controllers = {
'Mocked': mocked_controller 'Enabled': mocked_enabled_controller,
'Disabled': mocked_disabled_controller
} }
thmub_path = MagicMock(st_mtime=100) thumb_path = MagicMock(st_mtime=100)
file_path = MagicMock(st_mtime=400) file_path = MagicMock(st_mtime=400)
with patch.object(Path, 'stat', side_effect=[thmub_path, file_path]), \ with patch.object(Path, 'stat', side_effect=[thumb_path, file_path]), \
patch.object(Path, 'exists', return_value=True): patch.object(Path, 'exists', return_value=True):
presentation_file = Path('file.tmp') presentation_file = Path('file.tmp')
@ -114,6 +120,7 @@ class TestMediaItem(TestCase, TestMixin):
# THEN: doc.presentation_deleted should have been called since the thumbnails mtime will be greater than # THEN: doc.presentation_deleted should have been called since the thumbnails mtime will be greater than
# the presentation_file's mtime. # the presentation_file's mtime.
mocked_doc.assert_has_calls([call.get_thumbnail_path(1, True), call.presentation_deleted()], True) mocked_doc.assert_has_calls([call.get_thumbnail_path(1, True), call.presentation_deleted()], True)
assert mocked_disabled_supports.call_count == 0
def test_clean_up_thumbnails_missing_file(self): def test_clean_up_thumbnails_missing_file(self):
""" """