forked from openlp/openlp
Fix traceback in mediacontroller if a service item had a processor type of automatic
bzr-revno: 2573
This commit is contained in:
commit
4687d71c50
@ -514,17 +514,17 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
|
|||||||
:param display: Which display to use
|
:param display: Which display to use
|
||||||
:param service_item: The ServiceItem containing the details to be played.
|
:param service_item: The ServiceItem containing the details to be played.
|
||||||
"""
|
"""
|
||||||
used_players = get_media_players()
|
used_players = get_media_players()[0]
|
||||||
default_player = used_players[0]
|
# If no player, we can't play
|
||||||
|
if not used_players:
|
||||||
|
return False
|
||||||
|
default_player = [used_players[0]]
|
||||||
if service_item.processor and service_item.processor != UiStrings().Automatic:
|
if service_item.processor and service_item.processor != UiStrings().Automatic:
|
||||||
# check to see if the player is usable else use the default one.
|
# check to see if the player is usable else use the default one.
|
||||||
if not service_item.processor.lower() in used_players:
|
if not service_item.processor.lower() in used_players:
|
||||||
used_players = default_player
|
used_players = default_player
|
||||||
else:
|
else:
|
||||||
used_players = [service_item.processor.lower()]
|
used_players = [service_item.processor.lower()]
|
||||||
# If no player, we can't play
|
|
||||||
if not used_players:
|
|
||||||
return False
|
|
||||||
if controller.media_info.file_info.isFile():
|
if controller.media_info.file_info.isFile():
|
||||||
suffix = '*.%s' % controller.media_info.file_info.suffix().lower()
|
suffix = '*.%s' % controller.media_info.file_info.suffix().lower()
|
||||||
for title in used_players:
|
for title in used_players:
|
||||||
|
@ -120,6 +120,66 @@ class TestMediaController(TestCase, TestMixin):
|
|||||||
# THEN: it should return False
|
# THEN: it should return False
|
||||||
self.assertFalse(ret, '_check_file_type should return False when the processor for service_item is None.')
|
self.assertFalse(ret, '_check_file_type should return False when the processor for service_item is None.')
|
||||||
|
|
||||||
|
@patch('openlp.core.ui.media.mediacontroller.get_media_players')
|
||||||
|
@patch('openlp.core.ui.media.mediacontroller.UiStrings')
|
||||||
|
def check_file_type_automatic_processor_test(self, mocked_uistrings, mocked_get_media_players):
|
||||||
|
"""
|
||||||
|
Test that we can play media when players are available and we have a automatic processor from the service item
|
||||||
|
"""
|
||||||
|
# GIVEN: A mocked UiStrings, get_media_players, controller, display and service_item
|
||||||
|
mocked_get_media_players.return_value = (['vlc', 'webkit'], '')
|
||||||
|
mocked_ret_uistrings = MagicMock()
|
||||||
|
mocked_ret_uistrings.Automatic = 1
|
||||||
|
mocked_uistrings.return_value = mocked_ret_uistrings
|
||||||
|
media_controller = MediaController()
|
||||||
|
mocked_vlc = MagicMock()
|
||||||
|
mocked_vlc.video_extensions_list = ['*.mp4']
|
||||||
|
media_controller.media_players = {'vlc': mocked_vlc, 'webkit': MagicMock()}
|
||||||
|
mocked_controller = MagicMock()
|
||||||
|
mocked_suffix = MagicMock()
|
||||||
|
mocked_suffix.return_value = 'mp4'
|
||||||
|
mocked_controller.media_info.file_info.suffix = mocked_suffix
|
||||||
|
mocked_display = MagicMock()
|
||||||
|
mocked_service_item = MagicMock()
|
||||||
|
mocked_service_item.processor = 1
|
||||||
|
|
||||||
|
# WHEN: calling _check_file_type when the processor for the service item is None
|
||||||
|
ret = media_controller._check_file_type(mocked_controller, mocked_display, mocked_service_item)
|
||||||
|
|
||||||
|
# THEN: it should return True
|
||||||
|
self.assertTrue(ret, '_check_file_type should return True when mediaplayers are available and '
|
||||||
|
'the service item has an automatic processor.')
|
||||||
|
|
||||||
|
@patch('openlp.core.ui.media.mediacontroller.get_media_players')
|
||||||
|
@patch('openlp.core.ui.media.mediacontroller.UiStrings')
|
||||||
|
def check_file_type_processor_different_from_available_test(self, mocked_uistrings, mocked_get_media_players):
|
||||||
|
"""
|
||||||
|
Test that we can play media when players available are different from the processor from the service item
|
||||||
|
"""
|
||||||
|
# GIVEN: A mocked UiStrings, get_media_players, controller, display and service_item
|
||||||
|
mocked_get_media_players.return_value = (['phonon'], '')
|
||||||
|
mocked_ret_uistrings = MagicMock()
|
||||||
|
mocked_ret_uistrings.Automatic = 'automatic'
|
||||||
|
mocked_uistrings.return_value = mocked_ret_uistrings
|
||||||
|
media_controller = MediaController()
|
||||||
|
mocked_phonon = MagicMock()
|
||||||
|
mocked_phonon.video_extensions_list = ['*.mp4']
|
||||||
|
media_controller.media_players = {'phonon': mocked_phonon}
|
||||||
|
mocked_controller = MagicMock()
|
||||||
|
mocked_suffix = MagicMock()
|
||||||
|
mocked_suffix.return_value = 'mp4'
|
||||||
|
mocked_controller.media_info.file_info.suffix = mocked_suffix
|
||||||
|
mocked_display = MagicMock()
|
||||||
|
mocked_service_item = MagicMock()
|
||||||
|
mocked_service_item.processor = 'vlc'
|
||||||
|
|
||||||
|
# WHEN: calling _check_file_type when the processor for the service item is None
|
||||||
|
ret = media_controller._check_file_type(mocked_controller, mocked_display, mocked_service_item)
|
||||||
|
|
||||||
|
# THEN: it should return True
|
||||||
|
self.assertTrue(ret, '_check_file_type should return True when the players available are different'
|
||||||
|
'from the processor from the service item.')
|
||||||
|
|
||||||
def media_play_msg_test(self):
|
def media_play_msg_test(self):
|
||||||
"""
|
"""
|
||||||
Test that the media controller responds to the request to play a loaded video
|
Test that the media controller responds to the request to play a loaded video
|
||||||
|
Loading…
Reference in New Issue
Block a user