forked from openlp/openlp
Fix issues with VLC
lp:~trb143/openlp/media2018a (revision 2838) https://ci.openlp.io/job/Branch-01-Pull/2481/ [SUCCESS] https://ci.openlp.io/job/Branch-02a-Linux-Tests/2382/ [SUCCESS] https://ci.openlp.io/job/Branch-02b-macOS-Tests/169/ [FAILURE] https://ci.openlp.io/job/Branch-03a-Build-Source/91/ [SUCCESS] https://ci.openlp.io/job/Branch-03b-Build-macOS/84/ [SUCCESS] https://ci.openlp.io/job/B... bzr-revno: 2815
This commit is contained in:
commit
d88a18e080
@ -459,26 +459,16 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties):
|
|||||||
log.debug('use %s controller' % self.current_media_players[controller.controller_type].display_name)
|
log.debug('use %s controller' % self.current_media_players[controller.controller_type].display_name)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def media_length(self, service_item):
|
@staticmethod
|
||||||
|
def media_length(service_item):
|
||||||
"""
|
"""
|
||||||
Loads and starts a media item to obtain the media length
|
Uses Media Info to obtain the media length
|
||||||
|
|
||||||
:param service_item: The ServiceItem containing the details to be played.
|
:param service_item: The ServiceItem containing the details to be played.
|
||||||
"""
|
"""
|
||||||
media_info = MediaInfo()
|
media_info = MediaInfo()
|
||||||
media_info.volume = 0
|
media_info.volume = 0
|
||||||
media_info.file_info = QtCore.QFileInfo(service_item.get_frame_path())
|
media_info.file_info = QtCore.QFileInfo(service_item.get_frame_path())
|
||||||
# display = controller.preview_display
|
|
||||||
suffix = '*.%s' % media_info.file_info.suffix().lower()
|
|
||||||
used_players = get_media_players()[0]
|
|
||||||
player = self.media_players[used_players[0]]
|
|
||||||
if suffix not in player.video_extensions_list and suffix not in player.audio_extensions_list:
|
|
||||||
# Media could not be loaded correctly
|
|
||||||
critical_error_message_box(
|
|
||||||
translate('MediaPlugin.MediaItem', 'Unsupported Media File'),
|
|
||||||
translate('MediaPlugin.MediaItem', 'File {file_path} not supported using player {player_name}'
|
|
||||||
).format(file_path=service_item.get_frame_path(), player_name=used_players[0]))
|
|
||||||
return False
|
|
||||||
media_data = MediaInfoWrapper.parse(service_item.get_frame_path())
|
media_data = MediaInfoWrapper.parse(service_item.get_frame_path())
|
||||||
# duration returns in milli seconds
|
# duration returns in milli seconds
|
||||||
service_item.set_media_length(media_data.tracks[0].duration)
|
service_item.set_media_length(media_data.tracks[0].duration)
|
||||||
@ -573,16 +563,6 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties):
|
|||||||
if not title:
|
if not title:
|
||||||
continue
|
continue
|
||||||
player = self.media_players[title]
|
player = self.media_players[title]
|
||||||
# The system player may not return what files it can play so add it now
|
|
||||||
# and check whether it can play the file later
|
|
||||||
if title == 'system':
|
|
||||||
if not controller.media_info.is_background or controller.media_info.is_background and \
|
|
||||||
player.can_background:
|
|
||||||
self.resize(display, player)
|
|
||||||
if player.load(display):
|
|
||||||
self.current_media_players[controller.controller_type] = player
|
|
||||||
controller.media_info.media_type = MediaType.Video
|
|
||||||
return True
|
|
||||||
if suffix in player.video_extensions_list:
|
if suffix in player.video_extensions_list:
|
||||||
if not controller.media_info.is_background or controller.media_info.is_background and \
|
if not controller.media_info.is_background or controller.media_info.is_background and \
|
||||||
player.can_background:
|
player.can_background:
|
||||||
|
@ -66,7 +66,15 @@ def get_vlc():
|
|||||||
"""
|
"""
|
||||||
if 'openlp.core.ui.media.vendor.vlc' in sys.modules:
|
if 'openlp.core.ui.media.vendor.vlc' in sys.modules:
|
||||||
# If VLC has already been imported, no need to do all the stuff below again
|
# If VLC has already been imported, no need to do all the stuff below again
|
||||||
return sys.modules['openlp.core.ui.media.vendor.vlc']
|
is_vlc_available = False
|
||||||
|
try:
|
||||||
|
is_vlc_available = bool(sys.modules['openlp.core.ui.media.vendor.vlc'].get_default_instance())
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
if is_vlc_available:
|
||||||
|
return sys.modules['openlp.core.ui.media.vendor.vlc']
|
||||||
|
else:
|
||||||
|
return None
|
||||||
is_vlc_available = False
|
is_vlc_available = False
|
||||||
try:
|
try:
|
||||||
if is_macosx():
|
if is_macosx():
|
||||||
@ -89,6 +97,7 @@ def get_vlc():
|
|||||||
except (ImportError, NameError, NotImplementedError):
|
except (ImportError, NameError, NotImplementedError):
|
||||||
pass
|
pass
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
|
# this will get raised the first time
|
||||||
if is_win():
|
if is_win():
|
||||||
if not isinstance(e, WindowsError) and e.winerror != 126:
|
if not isinstance(e, WindowsError) and e.winerror != 126:
|
||||||
raise
|
raise
|
||||||
|
@ -22,8 +22,24 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
from unittest.mock import MagicMock
|
from unittest.mock import MagicMock
|
||||||
|
|
||||||
|
from PyQt5 import QtCore
|
||||||
|
|
||||||
from openlp.core.common.registry import Registry
|
from openlp.core.common.registry import Registry
|
||||||
from openlp.core.api.endpoint.controller import controller_text, controller_direction
|
from openlp.core.api.endpoint.controller import controller_text, controller_direction
|
||||||
|
from openlp.core.display.renderer import Renderer
|
||||||
|
from openlp.core.display.screens import ScreenList
|
||||||
|
from openlp.core.lib import ServiceItem
|
||||||
|
|
||||||
|
from tests.utils import convert_file_service_item
|
||||||
|
from tests.utils.constants import RESOURCE_PATH
|
||||||
|
|
||||||
|
TEST_PATH = str(RESOURCE_PATH / 'service')
|
||||||
|
|
||||||
|
SCREEN = {
|
||||||
|
'primary': False,
|
||||||
|
'number': 1,
|
||||||
|
'size': QtCore.QRect(0, 0, 1024, 768)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class TestController(TestCase):
|
class TestController(TestCase):
|
||||||
@ -38,11 +54,18 @@ class TestController(TestCase):
|
|||||||
Registry.create()
|
Registry.create()
|
||||||
self.registry = Registry()
|
self.registry = Registry()
|
||||||
self.mocked_live_controller = MagicMock()
|
self.mocked_live_controller = MagicMock()
|
||||||
|
self.desktop = MagicMock()
|
||||||
|
self.desktop.primaryScreen.return_value = SCREEN['primary']
|
||||||
|
self.desktop.screenCount.return_value = SCREEN['number']
|
||||||
|
self.desktop.screenGeometry.return_value = SCREEN['size']
|
||||||
|
self.screens = ScreenList.create(self.desktop)
|
||||||
|
renderer = Renderer()
|
||||||
|
renderer.empty_height = 1000
|
||||||
Registry().register('live_controller', self.mocked_live_controller)
|
Registry().register('live_controller', self.mocked_live_controller)
|
||||||
|
|
||||||
def test_controller_text(self):
|
def test_controller_text_empty(self):
|
||||||
"""
|
"""
|
||||||
Remote API Tests : test the controller text method can be called
|
Remote API Tests : test the controller text method can be called with empty service item
|
||||||
"""
|
"""
|
||||||
# GIVEN: A mocked service with a dummy service item
|
# GIVEN: A mocked service with a dummy service item
|
||||||
self.mocked_live_controller.service_item = MagicMock()
|
self.mocked_live_controller.service_item = MagicMock()
|
||||||
@ -53,6 +76,22 @@ class TestController(TestCase):
|
|||||||
assert isinstance(results['item'], MagicMock)
|
assert isinstance(results['item'], MagicMock)
|
||||||
assert len(results['slides']) == 0
|
assert len(results['slides']) == 0
|
||||||
|
|
||||||
|
def test_controller_text(self):
|
||||||
|
"""
|
||||||
|
Remote API Tests : test the controller text method can be called with a real service item
|
||||||
|
"""
|
||||||
|
# GIVEN: A mocked service with a dummy service item
|
||||||
|
line = convert_file_service_item(TEST_PATH, 'serviceitem_custom_1.osj')
|
||||||
|
self.mocked_live_controller.service_item = ServiceItem(None)
|
||||||
|
self.mocked_live_controller.service_item.set_from_service(line)
|
||||||
|
self.mocked_live_controller.service_item.render(True)
|
||||||
|
# WHEN: I trigger the method
|
||||||
|
ret = controller_text("SomeText")
|
||||||
|
# THEN: I get a basic set of results
|
||||||
|
results = ret['results']
|
||||||
|
assert isinstance(ret, dict)
|
||||||
|
assert len(results['slides']) == 2
|
||||||
|
|
||||||
def test_controller_direction_next(self):
|
def test_controller_direction_next(self):
|
||||||
"""
|
"""
|
||||||
Text the live next method is triggered
|
Text the live next method is triggered
|
||||||
|
Loading…
Reference in New Issue
Block a user