From cb3ef2f7c855cb40cec900a98cbfd8e59e9161d3 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Thu, 21 Apr 2016 22:09:42 +0200 Subject: [PATCH 01/50] Make it possible for presentations to wrap or go to next item, like native openlp-items. Fixes bug 1165855. Fixes: https://launchpad.net/bugs/1165855 --- openlp/core/common/registry.py | 2 +- openlp/core/ui/slidecontroller.py | 13 +++++++++++-- .../presentations/lib/impresscontroller.py | 3 +++ .../presentations/lib/messagelistener.py | 19 ++++++++++--------- .../presentations/lib/powerpointcontroller.py | 5 ++++- .../presentations/lib/pptviewcontroller.py | 5 ++++- .../lib/pptviewlib/pptviewlib.cpp | 6 ++++-- .../presentations/lib/pptviewlib/pptviewlib.h | 2 +- .../lib/presentationcontroller.py | 2 +- 9 files changed, 39 insertions(+), 18 deletions(-) diff --git a/openlp/core/common/registry.py b/openlp/core/common/registry.py index adf495a36..005f284ad 100644 --- a/openlp/core/common/registry.py +++ b/openlp/core/common/registry.py @@ -135,7 +135,7 @@ class Registry(object): for function in self.functions_list[event]: try: result = function(*args, **kwargs) - if result: + if result is not None: results.append(result) except TypeError: # Who has called me can help in debugging diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 96ce82868..6e198dd30 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -1170,8 +1170,17 @@ class SlideController(DisplayController, RegistryProperties): if not self.service_item: return if self.service_item.is_command(): - Registry().execute('%s_next' % self.service_item.name.lower(), [self.service_item, self.is_live]) - if self.is_live: + past_end = Registry().execute('%s_next' % self.service_item.name.lower(), [self.service_item, self.is_live]) + # Check if we have gone past the end of the last slide + if self.is_live and past_end and past_end[0]: + if wrap is None: + if self.slide_limits == SlideLimits.Wrap: + self.on_slide_selected_index([0]) + elif self.is_live and self.slide_limits == SlideLimits.Next: + self.service_next() + elif wrap: + self.on_slide_selected_index([0]) + else: self.update_preview() else: row = self.preview_widget.current_slide_number() + 1 diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index 29af3a375..5442ad6e3 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -416,11 +416,14 @@ class ImpressDocument(PresentationDocument): """ Triggers the next effect of slide on the running presentation. """ + past_end = False is_paused = self.control.isPaused() self.control.gotoNextEffect() time.sleep(0.1) if not is_paused and self.control.isPaused(): self.control.gotoPreviousEffect() + past_end = True + return past_end def previous_step(self): """ diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index cc5a6f05e..ee25c2efc 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -168,24 +168,25 @@ class Controller(object): """ log.debug('Live = %s, next' % self.is_live) if not self.doc: - return + return False if not self.is_live: - return + return False if self.hide_mode: if not self.doc.is_active(): - return + return False if self.doc.slidenumber < self.doc.get_slide_count(): self.doc.slidenumber += 1 self.poll() - return + return False if not self.activate(): - return + return False # The "End of slideshow" screen is after the last slide. Note, we can't just stop on the last slide, since it # may contain animations that need to be stepped through. if self.doc.slidenumber > self.doc.get_slide_count(): - return - self.doc.next_step() + return True + ret = self.doc.next_step() self.poll() + return ret def previous(self): """ @@ -418,9 +419,9 @@ class MessageListener(object): """ is_live = message[1] if is_live: - self.live_handler.next() + return self.live_handler.next() else: - self.preview_handler.next() + return self.preview_handler.next() def previous(self, message): """ diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index 6cc6a8450..3b20207a3 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -433,6 +433,7 @@ class PowerpointDocument(PresentationDocument): Triggers the next effect of slide on the running presentation. """ log.debug('next_step') + past_end = False try: self.presentation.SlideShowWindow.Activate() self.presentation.SlideShowWindow.View.Next() @@ -441,16 +442,18 @@ class PowerpointDocument(PresentationDocument): log.exception(e) trace_error_handler(log) self.show_error_msg() - return + return past_end if self.get_slide_number() > self.get_slide_count(): log.debug('past end, stepping back to previous') self.previous_step() + past_end = True # Stop powerpoint from flashing in the taskbar if self.presentation_hwnd: win32gui.FlashWindowEx(self.presentation_hwnd, win32con.FLASHW_STOP, 0, 0) # Make sure powerpoint doesn't steal focus, unless we're on a single screen setup if len(ScreenList().screen_list) > 1: Registry().get('main_window').activateWindow() + return past_end def previous_step(self): """ diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py index c5e1b351f..9fbb23cc7 100644 --- a/openlp/plugins/presentations/lib/pptviewcontroller.py +++ b/openlp/plugins/presentations/lib/pptviewcontroller.py @@ -302,7 +302,10 @@ class PptviewDocument(PresentationDocument): """ Triggers the next effect of slide on the running presentation. """ - self.controller.process.NextStep(self.ppt_id) + if self.controller.process.NextStep(self.ppt_id) == 0: + return False + else: + return True def previous_step(self): """ diff --git a/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp b/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp index 22b46f760..ee1dac08c 100644 --- a/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp +++ b/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp @@ -518,16 +518,18 @@ DllExport int GetCurrentSlide(int id) } // Take a step forwards through the show -DllExport void NextStep(int id) +DllExport int NextStep(int id) { DEBUG(L"NextStep:%d (%d)\n", id, pptView[id].currentSlide); - if (pptView[id].currentSlide > pptView[id].slideCount) return; + // Return 1 to signal that the slideshow has gone past the end + if (pptView[id].currentSlide > pptView[id].slideCount) return 1; if (pptView[id].currentSlide < pptView[id].slideCount) { pptView[id].guess = pptView[id].currentSlide + 1; } PostMessage(pptView[id].hWnd2, WM_MOUSEWHEEL, MAKEWPARAM(0, -WHEEL_DELTA), 0); + return 0; } // Take a step backwards through the show diff --git a/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h b/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h index e54c95537..66df0e0b1 100644 --- a/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h +++ b/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h @@ -30,7 +30,7 @@ DllExport BOOL CheckInstalled(); DllExport void ClosePPT(int id); DllExport int GetCurrentSlide(int id); DllExport int GetSlideCount(int id); -DllExport void NextStep(int id); +DllExport int NextStep(int id); DllExport void PrevStep(int id); DllExport void GotoSlide(int id, int slide_no); DllExport void RestartShow(int id); diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py index abc71f867..0b62ee485 100644 --- a/openlp/plugins/presentations/lib/presentationcontroller.py +++ b/openlp/plugins/presentations/lib/presentationcontroller.py @@ -232,7 +232,7 @@ class PresentationDocument(object): Triggers the next effect of slide on the running presentation. This might be the next animation on the current slide, or the next slide """ - pass + return False def previous_step(self): """ From 89a68f9e6bf3808578490c2233d42fec0e1f77b0 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Tue, 10 Oct 2017 21:29:03 +0200 Subject: [PATCH 02/50] Fixed a typo and added a SlideShowListener for event handling. --- .../presentations/lib/impresscontroller.py | 110 ++++++++++++++++++ .../presentations/lib/messagelistener.py | 2 +- 2 files changed, 111 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index d89c6c8f1..0e57f9577 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -51,8 +51,10 @@ if is_win(): else: try: import uno + import unohelper from com.sun.star.beans import PropertyValue from com.sun.star.task import ErrorCodeIOException + from com.sun.star.presentation import XSlideShowListener uno_available = True except ImportError: @@ -210,6 +212,8 @@ class ImpressDocument(PresentationDocument): self.document = None self.presentation = None self.control = None + self.slide_ended = False + self.slide_ended_reverse = False def load_presentation(self): """ @@ -381,6 +385,8 @@ class ImpressDocument(PresentationDocument): sleep_count += 1 self.control = self.presentation.getController() window.setVisible(False) + listener = SlideShowListener(self) + self.control.getSlideShow().addSlideShowListener(listener) else: self.control.activate() self.goto_slide(1) @@ -412,10 +418,19 @@ class ImpressDocument(PresentationDocument): """ Triggers the next effect of slide on the running presentation. """ + # if we are at the presentations end don't go further, just return True + if self.slide_ended and self.get_slide_count() == self.get_slide_number(): + print('detected presentation end!') + return True + self.slide_ended = False + self.slide_ended_reverse = False past_end = False is_paused = self.control.isPaused() + print('going to next effect') self.control.gotoNextEffect() time.sleep(0.1) + # If for some reason the presentation end was not detected above, this will catch it. + # The presentation is set to paused when going past the end. if not is_paused and self.control.isPaused(): self.control.gotoPreviousEffect() past_end = True @@ -425,6 +440,8 @@ class ImpressDocument(PresentationDocument): """ Triggers the previous slide on the running presentation. """ + self.slide_ended = False + self.slide_ended_reverse = False self.control.gotoPreviousEffect() def get_slide_text(self, slide_no): @@ -482,3 +499,96 @@ class ImpressDocument(PresentationDocument): note = ' ' notes.append(note) self.save_titles_and_notes(titles, notes) + + +class SlideShowListener(unohelper.Base, XSlideShowListener): + """ + Listener interface to receive global slide show events. + """ + + def __init__(self, document): + """ + + :param control: SlideShowController + """ + self.document = document + + def paused(self): + """ + Notify that the slide show is paused + """ + log.debug('LibreOffice SlideShowListener event: paused') + + def resumed(self): + """ + Notify that the slide show is resumed from a paused state + """ + log.debug('LibreOffice SlideShowListener event: resumed') + + def slideTransitionStarted(self): + """ + Notify that a new slide starts to become visible. + """ + log.debug('LibreOffice SlideShowListener event: slideTransitionStarted') + + def slideTransitionEnded(self): + """ + Notify that the slide transtion of the current slide ended. + """ + log.debug('LibreOffice SlideShowListener event: slideTransitionEnded') + + def slideAnimationsEnded(self): + """ + Notify that the last animation from the main sequence of the current slide has ended. + """ + log.debug('LibreOffice SlideShowListener event: slideAnimationsEnded') + #if not Registry().get('main_window').isActiveWindow(): + # log.debug('main window is not in focus - should update slidecontroller') + # Registry().execute('slidecontroller_live_change', self.document.control.getCurrentSlideIndex() + 1) + + def slideEnded(self, reverse): + """ + Notify that the current slide has ended, e.g. the user has clicked on the slide. Calling displaySlide() + twice will not issue this event. + """ + print('LibreOffice SlideShowListener event: slideEnded %d' % reverse) + if reverse: + self.document.slide_ended = False + self.document.slide_ended_reverse = True + else: + self.document.slide_ended = True + self.document.slide_ended_reverse = False + + def hyperLinkClicked(self, hyperLink): + """ + Notifies that a hyperlink has been clicked. + """ + log.debug('LibreOffice SlideShowListener event: hyperLinkClicked %s' % hyperLink) + + def disposing(self, source): + """ + gets called when the broadcaster is about to be disposed. + :param source: + """ + log.debug('LibreOffice SlideShowListener event: disposing') + + def beginEvent(self, node): + """ + This event is raised when the element local timeline begins to play. + :param node: + """ + log.debug('LibreOffice SlideShowListener event: beginEvent') + + def endEvent(self, node): + """ + This event is raised at the active end of the element. + :param node: + """ + log.debug('LibreOffice SlideShowListener event: endEvent') + + def repeat(self, node): + """ + This event is raised when the element local timeline repeats. + :param node: + """ + log.debug('LibreOffice SlideShowListener event: repeat') diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index fe00c65e0..ef4a0bdc0 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -191,7 +191,7 @@ class Controller(object): """ Based on the handler passed at startup triggers the previous slide event. """ - log.debug('Live = {live}, previous'.formta(live=self.is_live)) + log.debug('Live = {live}, previous'.format(live=self.is_live)) if not self.doc: return if not self.is_live: From 9cac014cefc69a495b94ee5f3813b3633a51f5cf Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Tue, 10 Oct 2017 22:12:56 +0200 Subject: [PATCH 03/50] Improving past-end. --- openlp/plugins/presentations/lib/impresscontroller.py | 4 +--- openlp/plugins/presentations/lib/messagelistener.py | 5 ----- openlp/plugins/presentations/lib/powerpointcontroller.py | 5 +++++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index cb1d7ec0e..64561fbec 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -421,13 +421,11 @@ class ImpressDocument(PresentationDocument): """ # if we are at the presentations end don't go further, just return True if self.slide_ended and self.get_slide_count() == self.get_slide_number(): - print('detected presentation end!') return True self.slide_ended = False self.slide_ended_reverse = False past_end = False is_paused = self.control.isPaused() - print('going to next effect') self.control.gotoNextEffect() time.sleep(0.1) # If for some reason the presentation end was not detected above, this will catch it. @@ -552,7 +550,7 @@ class SlideShowListener(unohelper.Base, XSlideShowListener): Notify that the current slide has ended, e.g. the user has clicked on the slide. Calling displaySlide() twice will not issue this event. """ - print('LibreOffice SlideShowListener event: slideEnded %d' % reverse) + log.debug('LibreOffice SlideShowListener event: slideEnded %d' % reverse) if reverse: self.document.slide_ended = False self.document.slide_ended_reverse = True diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index 53674f84b..bb09b5592 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -180,10 +180,6 @@ class Controller(object): return False if not self.activate(): return False - # The "End of slideshow" screen is after the last slide. Note, we can't just stop on the last slide, since it - # may contain animations that need to be stepped through. - if self.doc.slidenumber > self.doc.get_slide_count(): - return True ret = self.doc.next_step() self.poll() return ret @@ -424,7 +420,6 @@ class MessageListener(object): is_live = message[1] if is_live: ret = self.live_handler.next() - self.live_handler.next() if Settings().value('core/click live slide to unblank'): Registry().execute('slidecontroller_live_unblank') return ret diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index b01c90700..fb3d8b2cb 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -427,6 +427,10 @@ class PowerpointDocument(PresentationDocument): Triggers the next effect of slide on the running presentation. """ log.debug('next_step') + # if we are at the presentations end don't go further, just return True + if self.presentation.SlideShowWindow.View.GetClickCount() == self.presentation.SlideShowWindow.View.GetClickIndex()\ + and self.get_slide_number() == self.get_slide_count(): + return True past_end = False try: self.presentation.SlideShowWindow.Activate() @@ -436,6 +440,7 @@ class PowerpointDocument(PresentationDocument): trace_error_handler(log) self.show_error_msg() return past_end + # If for some reason the presentation end was not detected above, this will catch it. if self.get_slide_number() > self.get_slide_count(): log.debug('past end, stepping back to previous') self.previous_step() From b819e79a7052ae1f5d3d4244a587fa3aa4ad5d00 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Sun, 4 Feb 2018 21:47:24 +0100 Subject: [PATCH 04/50] Added extra error check --- openlp/plugins/presentations/lib/impresscontroller.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index ee54d6337..2c78b2b28 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -242,6 +242,9 @@ class ImpressDocument(PresentationDocument): except: log.warning('Failed to load presentation {url}'.format(url=url)) return False + if self.document is None: + log.warning('Presentation {url} could not be loaded'.format(url=url)) + return False self.presentation = self.document.getPresentation() self.presentation.Display = ScreenList().current['number'] + 1 self.control = None From aa982492e45ab72da279e43fb7589e319968fcae Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Fri, 15 Feb 2019 20:33:43 +0100 Subject: [PATCH 05/50] Implement going to the previous serviceitem. --- openlp/core/ui/slidecontroller.py | 17 +++++++++++++---- .../presentations/lib/impresscontroller.py | 19 ++++++++++++++++++- .../presentations/lib/messagelistener.py | 9 ++++++--- .../presentations/lib/powerpointcontroller.py | 4 ++++ .../lib/presentationcontroller.py | 6 ++++-- 5 files changed, 45 insertions(+), 10 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 79a34b33e..2f3ebb6d8 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -1174,7 +1174,8 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties): if not self.service_item: return if self.service_item.is_command(): - past_end = Registry().execute('%s_next' % self.service_item.name.lower(), [self.service_item, self.is_live]) + past_end = Registry().execute('{text}_next'.format(text=self.service_item.name.lower()), + [self.service_item, self.is_live]) # Check if we have gone past the end of the last slide if self.is_live and past_end and past_end[0]: if wrap is None: @@ -1211,9 +1212,17 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties): if not self.service_item: return if self.service_item.is_command(): - Registry().execute('{text}_previous'.format(text=self.service_item.name.lower()), - [self.service_item, self.is_live]) - if self.is_live: + before_start = Registry().execute('{text}_previous'.format(text=self.service_item.name.lower()), + [self.service_item, self.is_live]) + # Check id we have tried to go before that start slide + if self.is_live and before_start and before_start[0]: + print('detected before start!') + if self.slide_limits == SlideLimits.Wrap: + self.on_slide_selected_index([self.preview_widget.slide_count() - 1]) + elif self.is_live and self.slide_limits == SlideLimits.Next: + self.keypress_queue.append(ServiceItemAction.PreviousLastSlide) + self._process_queue() + elif self.is_live: self.update_preview() else: row = self.preview_widget.current_slide_number() - 1 diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index dac8122d8..b868023c4 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -46,6 +46,18 @@ from openlp.plugins.presentations.lib.presentationcontroller import Presentation if is_win(): from win32com.client import Dispatch import pywintypes + uno_available = False + try: + service_manager = Dispatch('com.sun.star.ServiceManager') + service_manager._FlagAsMethod('Bridge_GetStruct') + XSlideShowListenerObj = service_manager.Bridge_GetStruct('com.sun.star.presentation.XSlideShowListener') + + class SlideShowListenerImport(XSlideShowListenerObj.__class__): + pass + except (AttributeError, pywintypes.com_error): + class SlideShowListenerImport(object): + pass + # Declare an empty exception to match the exception imported from UNO class ErrorCodeIOException(Exception): @@ -58,6 +70,9 @@ else: from com.sun.star.task import ErrorCodeIOException from com.sun.star.presentation import XSlideShowListener + class SlideShowListenerImport(unohelper.Base, XSlideShowListener): + pass + uno_available = True except ImportError: uno_available = False @@ -504,8 +519,10 @@ class ImpressDocument(PresentationDocument): notes.append(note) self.save_titles_and_notes(titles, notes) + if is_win(): + property_object = self.controller.manager.Bridge_GetStruct('com.sun.star.beans.PropertyValue') -class SlideShowListener(unohelper.Base, XSlideShowListener): +class SlideShowListener(SlideShowListenerImport): """ Listener interface to receive global slide show events. """ diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index c816142af..358eeea76 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -203,8 +203,10 @@ class Controller(object): return if not self.activate(): return - self.doc.previous_step() + ret = self.doc.previous_step() self.poll() + print('previous returning: %d' % ret) + return ret def shutdown(self): """ @@ -435,11 +437,12 @@ class MessageListener(object): """ is_live = message[1] if is_live: - self.live_handler.previous() + ret = self.live_handler.previous() if Settings().value('core/click live slide to unblank'): Registry().execute('slidecontroller_live_unblank') + return ret else: - self.preview_handler.previous() + return self.preview_handler.previous() def shutdown(self, message): """ diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index a3a0360b8..034991b33 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -468,12 +468,16 @@ class PowerpointDocument(PresentationDocument): Triggers the previous slide on the running presentation. """ log.debug('previous_step') + # if we are at the presentations start we can't go further back, just return True + if self.presentation.SlideShowWindow.View.GetClickIndex() == 0 and self.get_slide_number() == 1: + return True try: self.presentation.SlideShowWindow.View.Previous() except (AttributeError, pywintypes.com_error): log.exception('Caught exception while in previous_step') trace_error_handler(log) self.show_error_msg() + return False def get_slide_text(self, slide_no): """ diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py index 196813631..a52c1c2e7 100644 --- a/openlp/plugins/presentations/lib/presentationcontroller.py +++ b/openlp/plugins/presentations/lib/presentationcontroller.py @@ -246,15 +246,17 @@ class PresentationDocument(object): def next_step(self): """ Triggers the next effect of slide on the running presentation. This might be the next animation on the current - slide, or the next slide + slide, or the next slide. + Returns True if we stepped beyond the slides of the presentation """ return False def previous_step(self): """ Triggers the previous slide on the running presentation + Returns True if we stepped beyond the slides of the presentation """ - pass + return False def convert_thumbnail(self, image_path, index): """ From 4e739a3ed9b5c409cbc2790b874319bc68ff1988 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Wed, 27 Mar 2019 21:29:19 +0100 Subject: [PATCH 06/50] Disable the presentation console --- openlp/plugins/presentations/lib/powerpointcontroller.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index 034991b33..6d610c2b9 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -318,6 +318,9 @@ class PowerpointDocument(PresentationDocument): size = ScreenList().current.display_geometry ppt_window = None try: + # Disable the presentation console + self.presentation.SlideShowSettings.ShowPresenterView = 0 + # Start the presentation ppt_window = self.presentation.SlideShowSettings.Run() except (AttributeError, pywintypes.com_error): log.exception('Caught exception while in start_presentation') From 52bdb8db02a3641fb4af5b537d9b4e0e2df89ad1 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Tue, 2 Apr 2019 22:22:05 +0200 Subject: [PATCH 07/50] Added support for disabling Impress Presentation Screen. Fixes bug 1798651 Fixes: https://launchpad.net/bugs/1798651 --- .../presentations/lib/impresscontroller.py | 80 ++++++++++++++----- 1 file changed, 58 insertions(+), 22 deletions(-) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index c1ea3d407..458643bcb 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -36,7 +36,7 @@ import time from PyQt5 import QtCore -from openlp.core.common import delete_file, get_uno_command, get_uno_instance, is_win +from openlp.core.common import delete_file, get_uno_command, get_uno_instance, is_win, trace_error_handler from openlp.core.common.registry import Registry from openlp.core.display.screens import ScreenList from openlp.plugins.presentations.lib.presentationcontroller import PresentationController, PresentationDocument, \ @@ -55,7 +55,7 @@ if is_win(): class SlideShowListenerImport(XSlideShowListenerObj.__class__): pass except (AttributeError, pywintypes.com_error): - class SlideShowListenerImport(object): + class SlideShowListenerImport(): pass # Declare an empty exception to match the exception imported from UNO @@ -97,6 +97,8 @@ class ImpressController(PresentationController): self.process = None self.desktop = None self.manager = None + self.conf_provider = None + self.presenter_screen_disabled_by_openlp = False def check_available(self): """ @@ -105,8 +107,7 @@ class ImpressController(PresentationController): log.debug('check_available') if is_win(): return self.get_com_servicemanager() is not None - else: - return uno_available + return uno_available def start_process(self): """ @@ -146,6 +147,7 @@ class ImpressController(PresentationController): self.manager = uno_instance.ServiceManager log.debug('get UNO Desktop Openoffice - createInstanceWithContext - Desktop') desktop = self.manager.createInstanceWithContext("com.sun.star.frame.Desktop", uno_instance) + self.toggle_presentation_screen(False) return desktop except Exception: log.warning('Failed to get UNO desktop') @@ -163,6 +165,7 @@ class ImpressController(PresentationController): desktop = self.manager.createInstance('com.sun.star.frame.Desktop') except (AttributeError, pywintypes.com_error): log.warning('Failure to find desktop - Impress may have closed') + self.toggle_presentation_screen(False) return desktop if desktop else None def get_com_servicemanager(self): @@ -181,6 +184,8 @@ class ImpressController(PresentationController): Called at system exit to clean up any running presentations. """ log.debug('Kill OpenOffice') + if self.presenter_screen_disabled_by_openlp: + self._toggle_presentation_screen(True) while self.docs: self.docs[0].close_presentation() desktop = None @@ -210,6 +215,51 @@ class ImpressController(PresentationController): except Exception: log.warning('Failed to terminate OpenOffice') + def toggle_presentation_screen(self, target_value): + """ + Enable or disable the Presentation Screen/Console + """ + # Create Instance of ConfigurationProvider + if not self.conf_provider: + if is_win(): + self.conf_provider = self.manager.createInstance("com.sun.star.configuration.ConfigurationProvider") + else: + self.conf_provider = self.manager.createInstanceWithContext("com.sun.star.configuration.ConfigurationProvider", uno.getComponentContext()) + # Setup lookup properties to get Impress settings + properties = [] + properties.append(self.create_property('nodepath', 'org.openoffice.Office.Impress')) + properties = tuple(properties) + try: + # Get an updateable configuration view + impress_conf_props = self.conf_provider.createInstanceWithArguments('com.sun.star.configuration.ConfigurationUpdateAccess', properties) + # Get the specific setting for presentation screen + presenter_screen_enabled = impress_conf_props.getHierarchicalPropertyValue('Misc/Start/EnablePresenterScreen') + # If the presentation screen is enabled we disable it + if presenter_screen_enabled != target_value: + impress_conf_props.setHierarchicalPropertyValue('Misc/Start/EnablePresenterScreen', target_value) + impress_conf_props.commitChanges() + # if target_value is False this is an attempt to disable the Presenter Screen + # so we make a note that it has been disabled, so it can be enabled again on close. + if target_value == False: + self.presenter_screen_disabled_by_openlp = True + except Exception as e: + log.exception(e) + trace_error_handler(log) + return + + def create_property(self, name, value): + """ + Create an OOo style property object which are passed into some Uno methods. + """ + log.debug('create property OpenOffice') + if is_win(): + property_object = self.manager.Bridge_GetStruct('com.sun.star.beans.PropertyValue') + else: + property_object = PropertyValue() + property_object.Name = name + property_object.Value = value + return property_object + class ImpressDocument(PresentationDocument): """ @@ -250,7 +300,7 @@ class ImpressDocument(PresentationDocument): return False self.desktop = desktop properties = [] - properties.append(self.create_property('Hidden', True)) + properties.append(self.controller.create_property('Hidden', True)) properties = tuple(properties) try: self.document = desktop.loadComponentFromURL(url, '_blank', 0, properties) @@ -277,7 +327,7 @@ class ImpressDocument(PresentationDocument): temp_folder_path = self.get_temp_folder() thumb_dir_url = temp_folder_path.as_uri() properties = [] - properties.append(self.create_property('FilterName', 'impress_png_Export')) + properties.append(self.controller.create_property('FilterName', 'impress_png_Export')) properties = tuple(properties) doc = self.document pages = doc.getDrawPages() @@ -299,19 +349,6 @@ class ImpressDocument(PresentationDocument): except Exception: log.exception('{path} - Unable to store openoffice preview'.format(path=path)) - def create_property(self, name, value): - """ - Create an OOo style property object which are passed into some Uno methods. - """ - log.debug('create property OpenOffice') - if is_win(): - property_object = self.controller.manager.Bridge_GetStruct('com.sun.star.beans.PropertyValue') - else: - property_object = PropertyValue() - property_object.Name = name - property_object.Value = value - return property_object - def close_presentation(self): """ Close presentation and clean up objects. Triggered by new object being added to SlideController or OpenLP being @@ -376,8 +413,7 @@ class ImpressDocument(PresentationDocument): log.debug('is blank OpenOffice') if self.control and self.control.isRunning(): return self.control.isPaused() - else: - return False + return False def stop_presentation(self): """ @@ -513,7 +549,7 @@ class ImpressDocument(PresentationDocument): titles.append(self.__get_text_from_page(slide_no, TextType.Title).replace('\r\n', ' ') .replace('\n', ' ').strip()) note = self.__get_text_from_page(slide_no, TextType.Notes) - if len(note) == 0: + if not note: note = ' ' notes.append(note) self.save_titles_and_notes(titles, notes) From f1f313ed5f8d06dfe7de1715d566b487726ecc8e Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 11 Apr 2019 14:55:57 -0700 Subject: [PATCH 08/50] Detect if OpenLP is running as a frozen app, and set the VLC environment variable --- openlp/core/app.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openlp/core/app.py b/openlp/core/app.py index 6aa3d9cb4..cdd023136 100644 --- a/openlp/core/app.py +++ b/openlp/core/app.py @@ -28,6 +28,7 @@ logging and a plugin framework are contained within the openlp.core module. """ import argparse import logging +import os import sys import time from datetime import datetime @@ -344,6 +345,9 @@ def main(args=None): # Bug #1018855: Set the WM_CLASS property in X11 if not is_win() and not is_macosx(): qt_args.append('OpenLP') + # Set the libvlc environment variable if we're frozen + if getattr(sys, 'frozen', False): + os.environ['PYTHON_VLC_LIB_PATH'] = str(AppLocation.get_directory(AppLocation.AppDir)) # Initialise the resources qInitResources() # Now create and actually run the application. From cec6f135061f6356c01bd8516803965aa62cb334 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 11 Apr 2019 20:24:47 -0700 Subject: [PATCH 09/50] Log VLC path for debugging --- openlp/core/app.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openlp/core/app.py b/openlp/core/app.py index cdd023136..43b03ec83 100644 --- a/openlp/core/app.py +++ b/openlp/core/app.py @@ -348,6 +348,7 @@ def main(args=None): # Set the libvlc environment variable if we're frozen if getattr(sys, 'frozen', False): os.environ['PYTHON_VLC_LIB_PATH'] = str(AppLocation.get_directory(AppLocation.AppDir)) + log.debug(os.environ['PYTHON_VLC_LIB_PATH']) # Initialise the resources qInitResources() # Now create and actually run the application. From a16853e2d71774d62458ddbbe9a7789bee294c8e Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 11 Apr 2019 20:51:44 -0700 Subject: [PATCH 10/50] Debugging when not frozen too --- openlp/core/app.py | 4 +++- run_openlp.py | 0 2 files changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 run_openlp.py diff --git a/openlp/core/app.py b/openlp/core/app.py index 43b03ec83..7323ede8b 100644 --- a/openlp/core/app.py +++ b/openlp/core/app.py @@ -348,7 +348,9 @@ def main(args=None): # Set the libvlc environment variable if we're frozen if getattr(sys, 'frozen', False): os.environ['PYTHON_VLC_LIB_PATH'] = str(AppLocation.get_directory(AppLocation.AppDir)) - log.debug(os.environ['PYTHON_VLC_LIB_PATH']) + log.debug('VLC Path: %s', os.environ['PYTHON_VLC_LIB_PATH']) + else: + log.debug('Not frozen') # Initialise the resources qInitResources() # Now create and actually run the application. diff --git a/run_openlp.py b/run_openlp.py old mode 100644 new mode 100755 From 8f4e7dc7dbd748ae63703b4a44003458e8e7e12b Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 11 Apr 2019 20:55:45 -0700 Subject: [PATCH 11/50] debugging --- openlp/core/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/core/app.py b/openlp/core/app.py index 7323ede8b..84838628c 100644 --- a/openlp/core/app.py +++ b/openlp/core/app.py @@ -348,9 +348,9 @@ def main(args=None): # Set the libvlc environment variable if we're frozen if getattr(sys, 'frozen', False): os.environ['PYTHON_VLC_LIB_PATH'] = str(AppLocation.get_directory(AppLocation.AppDir)) - log.debug('VLC Path: %s', os.environ['PYTHON_VLC_LIB_PATH']) + print('VLC Path: {}'.format(os.environ['PYTHON_VLC_LIB_PATH'])) else: - log.debug('Not frozen') + print('Not frozen: {}'.format(str(AppLocation.get_directory(AppLocation.AppDir)))) # Initialise the resources qInitResources() # Now create and actually run the application. From 453191f395e9a3b68e6c3c46530aa49d163d0e3a Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 11 Apr 2019 20:57:15 -0700 Subject: [PATCH 12/50] Move the VLC setup to after the logging is set up --- openlp/core/app.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/openlp/core/app.py b/openlp/core/app.py index 84838628c..05e8ed0da 100644 --- a/openlp/core/app.py +++ b/openlp/core/app.py @@ -345,12 +345,6 @@ def main(args=None): # Bug #1018855: Set the WM_CLASS property in X11 if not is_win() and not is_macosx(): qt_args.append('OpenLP') - # Set the libvlc environment variable if we're frozen - if getattr(sys, 'frozen', False): - os.environ['PYTHON_VLC_LIB_PATH'] = str(AppLocation.get_directory(AppLocation.AppDir)) - print('VLC Path: {}'.format(os.environ['PYTHON_VLC_LIB_PATH'])) - else: - print('Not frozen: {}'.format(str(AppLocation.get_directory(AppLocation.AppDir)))) # Initialise the resources qInitResources() # Now create and actually run the application. @@ -381,6 +375,13 @@ def main(args=None): else: application.setApplicationName('OpenLP') set_up_logging(AppLocation.get_directory(AppLocation.CacheDir)) + # Set the libvlc environment variable if we're frozen + if getattr(sys, 'frozen', False): + os.environ['PYTHON_VLC_LIB_PATH'] = str(AppLocation.get_directory(AppLocation.AppDir)) + log.debug('VLC Path: {}'.format(os.environ['PYTHON_VLC_LIB_PATH'])) + else: + log.debug('Not frozen: {}'.format(str(AppLocation.get_directory(AppLocation.AppDir)))) + # Initialise the Registry Registry.create() Registry().register('application', application) Registry().set_flag('no_web_server', args.no_web_server) From 5786a3f5ac4a394b99070dec9cabd57919df388b Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 11 Apr 2019 22:52:06 -0700 Subject: [PATCH 13/50] Use the full path to the dll/dylib --- openlp/core/app.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openlp/core/app.py b/openlp/core/app.py index 05e8ed0da..9dbb640fa 100644 --- a/openlp/core/app.py +++ b/openlp/core/app.py @@ -377,10 +377,12 @@ def main(args=None): set_up_logging(AppLocation.get_directory(AppLocation.CacheDir)) # Set the libvlc environment variable if we're frozen if getattr(sys, 'frozen', False): - os.environ['PYTHON_VLC_LIB_PATH'] = str(AppLocation.get_directory(AppLocation.AppDir)) + if is_macosx(): + vlc_lib = 'libvlc.dylib' + elif is_win(): + vlc_lib = 'libvlc.dll' + os.environ['PYTHON_VLC_LIB_PATH'] = str(AppLocation.get_directory(AppLocation.AppDir) / vlc_lib) log.debug('VLC Path: {}'.format(os.environ['PYTHON_VLC_LIB_PATH'])) - else: - log.debug('Not frozen: {}'.format(str(AppLocation.get_directory(AppLocation.AppDir)))) # Initialise the Registry Registry.create() Registry().register('application', application) From 46bb693d18e0024de5539317e9089c27775f1d67 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 2 May 2019 11:59:09 -0700 Subject: [PATCH 14/50] Fix command line args --- openlp/core/app.py | 21 ++++++------ openlp/core/ui/mainwindow.py | 17 +++++----- openlp/core/ui/servicemanager.py | 32 ++++++++++++------- scripts/appveyor.yml | 18 ++++++++--- .../openlp_core/ui/test_mainwindow.py | 1 - 5 files changed, 52 insertions(+), 37 deletions(-) diff --git a/openlp/core/app.py b/openlp/core/app.py index 9dbb640fa..2237028bd 100644 --- a/openlp/core/app.py +++ b/openlp/core/app.py @@ -287,12 +287,12 @@ class OpenLP(QtWidgets.QApplication): return QtWidgets.QApplication.event(self, event) -def parse_options(args=None): +def parse_options(): """ Parse the command line arguments - :param args: list of command line arguments - :return: a tuple of parsed options of type optparse.Value and a list of remaining argsZ + :return: An :object:`argparse.Namespace` insatnce containing the parsed args. + :rtype: argparse.Namespace """ # Set up command line options. parser = argparse.ArgumentParser(prog='openlp') @@ -304,9 +304,9 @@ def parse_options(args=None): help='Specify if this should be run as a portable app, ') parser.add_argument('-w', '--no-web-server', dest='no_web_server', action='store_true', help='Turn off the Web and Socket Server ') - parser.add_argument('rargs', nargs='?', default=[]) - # Parse command line options and deal with them. Use args supplied pragmatically if possible. - return parser.parse_args(args) if args else parser.parse_args() + parser.add_argument('rargs', nargs='*', default=[]) + # Parse command line options and deal with them. + return parser.parse_args() def set_up_logging(log_path): @@ -325,13 +325,11 @@ def set_up_logging(log_path): print('Logging to: {name}'.format(name=file_path)) -def main(args=None): +def main(): """ The main function which parses command line options and then runs - - :param args: Some args """ - args = parse_options(args) + args = parse_options() qt_args = ['--disable-web-security'] # qt_args = [] if args and args.loglevel.lower() in ['d', 'debug']: @@ -345,6 +343,9 @@ def main(args=None): # Bug #1018855: Set the WM_CLASS property in X11 if not is_win() and not is_macosx(): qt_args.append('OpenLP') + # Set the libvlc environment variable if we're frozen + if getattr(sys, 'frozen', False): + os.environ['PYTHON_VLC_LIB_PATH'] = str(AppLocation.get_directory(AppLocation.AppDir)) # Initialise the resources qInitResources() # Now create and actually run the application. diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 8f2660d42..ea8242585 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -22,7 +22,7 @@ """ This is the main window, where all the action happens. """ -import sys +import os from datetime import datetime from distutils import dir_util from distutils.errors import DistutilsFileError @@ -475,7 +475,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert super(MainWindow, self).__init__() Registry().register('main_window', self) self.clipboard = self.application.clipboard() - self.arguments = ''.join(self.application.args) # Set up settings sections for the main application (not for use by plugins). self.ui_settings_section = 'user interface' self.general_settings_section = 'core' @@ -632,8 +631,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert # if self.live_controller.display.isVisible(): # self.live_controller.display.setFocus() self.activateWindow() - if self.arguments: - self.open_cmd_line_files(self.arguments) + if self.application.args: + self.open_cmd_line_files(self.application.args) elif Settings().value(self.general_settings_section + '/auto open'): self.service_manager_contents.load_last_file() # This will store currently used layout preset so it remains enabled on next startup. @@ -1354,11 +1353,11 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert settings.remove('advanced/data path') self.application.set_normal_cursor() - def open_cmd_line_files(self, filename): + def open_cmd_line_files(self, args): """ Open files passed in through command line arguments """ - if not isinstance(filename, str): - filename = str(filename, sys.getfilesystemencoding()) - if filename.endswith(('.osz', '.oszl')): - self.service_manager_contents.load_file(Path(filename)) + for arg in args: + file_name = os.path.expanduser(arg) + if os.path.isfile(file_name): + self.service_manager_contents.load_file(Path(file_name)) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index fcd8f159d..a75b48916 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -430,11 +430,20 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi return False self.new_file() - def on_load_service_clicked(self, load_file=None): + def on_load_service_clicked(self, checked): + """ + Handle the `fileOpenItem` action + + :param bool checked: Not used. + :rtype: None + """ + self.load_service() + + def load_service(self, file_path=None): """ Loads the service file and saves the existing one it there is one unchanged. - :param load_file: The service file to the loaded. Will be None is from menu so selection will be required. + :param openlp.core.common.path.Path | None file_path: The service file to the loaded. """ if self.is_modified(): result = self.save_modified_service() @@ -442,7 +451,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi return False elif result == QtWidgets.QMessageBox.Save: self.decide_save_method() - if not load_file: + if not file_path: file_path, filter_used = FileDialog.getOpenFileName( self.main_window, translate('OpenLP.ServiceManager', 'Open File'), @@ -450,8 +459,6 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz *.oszl)')) if not file_path: return False - else: - file_path = str_to_path(load_file) Settings().setValue(self.main_window.service_manager_settings_section + '/last directory', file_path.parent) self.load_file(file_path) @@ -670,8 +677,9 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi def load_file(self, file_path): """ - Load an existing service file - :param file_path: + Load an existing service file. + + :param openlp.core.common.path.Path file_path: The service file to load. """ if not file_path.exists(): return False @@ -1520,12 +1528,12 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi event.setDropAction(QtCore.Qt.CopyAction) event.accept() for url in link.urls(): - file_name = url.toLocalFile() - if file_name.endswith('.osz'): - self.on_load_service_clicked(file_name) - elif file_name.endswith('.oszl'): + file_path = Path(url.toLocalFile()) + if file_path.suffix == '.osz': + self.load_service(file_path) + elif file_path.suffix == '.oszl': # todo correct - self.on_load_service_clicked(file_name) + self.load_service(file_path) elif link.hasText(): plugin = link.text() item = self.service_manager_list.itemAt(event.pos()) diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml index 0f315b0e7..b22cd68ea 100644 --- a/scripts/appveyor.yml +++ b/scripts/appveyor.yml @@ -27,7 +27,7 @@ build: off test_script: - cd openlp-branch # Run the tests - - "%PYTHON%\\python.exe -m pytest -v tests" + #- "%PYTHON%\\python.exe -m pytest -v tests" # Go back to the user root folder - cd.. @@ -36,11 +36,12 @@ after_test: # Install PyInstaller - "%PYTHON%\\python.exe -m pip install pyinstaller" # Download and install Inno Setup - used for packaging - - appveyor DownloadFile http://www.jrsoftware.org/download.php/is-unicode.exe - - is-unicode.exe /VERYSILENT /SUPPRESSMSGBOXES /SP- + # - appveyor DownloadFile http://www.jrsoftware.org/download.php/is-unicode.exe + # - is-unicode.exe /VERYSILENT /SUPPRESSMSGBOXES /SP- # Download and unpack portable-bundle - appveyor DownloadFile https://get.openlp.org/win-sdk/portable-setup.7z - 7z x portable-setup.7z + - choco install vlc # Disabled portable installers - can't figure out how to make them silent # - curl -L -O http://downloads.sourceforge.net/project/portableapps/PortableApps.com%20Installer/PortableApps.comInstaller_3.4.4.paf.exe # - PortableApps.comInstaller_3.4.4.paf.exe /S @@ -49,10 +50,12 @@ after_test: # - curl -L -O http://downloads.sourceforge.net/project/portableapps/NSIS%20Portable/NSISPortable_3.0_English.paf.exe # - NSISPortable_3.0_English.paf.exe /S # Get the packaging code - - appveyor DownloadFile http://bazaar.launchpad.net/~openlp-core/openlp/packaging/tarball -FileName packaging.tar.gz + #- appveyor DownloadFile http://bazaar.launchpad.net/~openlp-core/openlp/packaging/tarball -FileName packaging.tar.gz + - appveyor DownloadFile http://bazaar.launchpad.net/~raoul-snyman/openlp/wix-packaging/tarball -FileName packaging.tar.gz - 7z e packaging.tar.gz - 7z x packaging.tar - - mv ~openlp-core/openlp/packaging packaging + #- mv ~openlp-core/openlp/packaging packaging + - mv ~raoul-snyman/openlp/wix-packaging packaging # If this is trunk we should also build the manual - ps: >- If (BUILD_DOCS) { @@ -70,3 +73,8 @@ after_test: artifacts: - path: openlp-branch\dist\*.exe + name: Portable-installer + - path: openlp-branch\dist\*.msi + name: Installer + - path: packaging\windows\OpenLP.wxs + name: Generated-XML diff --git a/tests/functional/openlp_core/ui/test_mainwindow.py b/tests/functional/openlp_core/ui/test_mainwindow.py index ac481e832..3b7703298 100644 --- a/tests/functional/openlp_core/ui/test_mainwindow.py +++ b/tests/functional/openlp_core/ui/test_mainwindow.py @@ -108,7 +108,6 @@ class TestMainWindow(TestCase, TestMixin): """ # GIVEN a non service file as an argument to openlp service = 'run_openlp.py' - self.main_window.arguments = service # WHEN the argument is processed self.main_window.open_cmd_line_files(service) From d95b4343b55e82d0245fe29741f0f407efaafb7d Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 2 May 2019 20:23:23 -0700 Subject: [PATCH 15/50] Temporary workaround for VLC --- openlp/core/ui/media/vlcplayer.py | 56 ++++++++++++++++--------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index 8e1989fda..b88314eb9 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -161,33 +161,35 @@ class VlcPlayer(MediaPlayer): :return: """ vlc = get_vlc() - output_display.vlc_widget = QtWidgets.QFrame(output_display) - output_display.vlc_widget.setFrameStyle(QtWidgets.QFrame.NoFrame) - # creating a basic vlc instance - command_line_options = '--no-video-title-show' - if Settings().value('advanced/hide mouse') and live_display: - command_line_options += ' --mouse-hide-timeout=0' - output_display.vlc_instance = vlc.Instance(command_line_options) - # creating an empty vlc media player - output_display.vlc_media_player = output_display.vlc_instance.media_player_new() - output_display.vlc_widget.resize(output_display.size()) - output_display.vlc_widget.raise_() - output_display.vlc_widget.hide() - # The media player has to be 'connected' to the QFrame. - # (otherwise a video would be displayed in it's own window) - # This is platform specific! - # You have to give the id of the QFrame (or similar object) - # to vlc, different platforms have different functions for this. - win_id = int(output_display.vlc_widget.winId()) - if is_win(): - output_display.vlc_media_player.set_hwnd(win_id) - elif is_macosx(): - # We have to use 'set_nsobject' since Qt5 on OSX uses Cocoa - # framework and not the old Carbon. - output_display.vlc_media_player.set_nsobject(win_id) - else: - # for Linux/*BSD using the X Server - output_display.vlc_media_player.set_xwindow(win_id) + # Temporary workaround + if vlc: + output_display.vlc_widget = QtWidgets.QFrame(output_display) + output_display.vlc_widget.setFrameStyle(QtWidgets.QFrame.NoFrame) + # creating a basic vlc instance + command_line_options = '--no-video-title-show' + if Settings().value('advanced/hide mouse') and live_display: + command_line_options += ' --mouse-hide-timeout=0' + output_display.vlc_instance = vlc.Instance(command_line_options) + # creating an empty vlc media player + output_display.vlc_media_player = output_display.vlc_instance.media_player_new() + output_display.vlc_widget.resize(output_display.size()) + output_display.vlc_widget.raise_() + output_display.vlc_widget.hide() + # The media player has to be 'connected' to the QFrame. + # (otherwise a video would be displayed in it's own window) + # This is platform specific! + # You have to give the id of the QFrame (or similar object) + # to vlc, different platforms have different functions for this. + win_id = int(output_display.vlc_widget.winId()) + if is_win(): + output_display.vlc_media_player.set_hwnd(win_id) + elif is_macosx(): + # We have to use 'set_nsobject' since Qt5 on OSX uses Cocoa + # framework and not the old Carbon. + output_display.vlc_media_player.set_nsobject(win_id) + else: + # for Linux/*BSD using the X Server + output_display.vlc_media_player.set_xwindow(win_id) self.has_own_widget = True def check_available(self): From 54aea66a16f1e0c023be476f57b1c14cc3d60e27 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 5 May 2019 09:13:10 +0100 Subject: [PATCH 16/50] initial version --- openlp/core/ui/media/vendor/__init__.py | 25 - openlp/core/ui/media/vendor/vlc.py | 8775 ----------------------- openlp/core/ui/media/vlcplayer.py | 91 +- scripts/check_dependencies.py | 3 +- 4 files changed, 49 insertions(+), 8845 deletions(-) delete mode 100644 openlp/core/ui/media/vendor/__init__.py delete mode 100644 openlp/core/ui/media/vendor/vlc.py diff --git a/openlp/core/ui/media/vendor/__init__.py b/openlp/core/ui/media/vendor/__init__.py deleted file mode 100644 index 72950e073..000000000 --- a/openlp/core/ui/media/vendor/__init__.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 - -########################################################################## -# OpenLP - Open Source Lyrics Projection # -# ---------------------------------------------------------------------- # -# Copyright (c) 2008-2019 OpenLP Developers # -# ---------------------------------------------------------------------- # -# 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, either version 3 of the License, or # -# (at your option) any later version. # -# # -# 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, see . # -########################################################################## -""" -The :mod:`~openlp.core.ui.media.vendor` module contains any scripts or libraries -from 3rd party vendors which are required to make certain media modules work. -""" diff --git a/openlp/core/ui/media/vendor/vlc.py b/openlp/core/ui/media/vendor/vlc.py deleted file mode 100644 index efea5ea76..000000000 --- a/openlp/core/ui/media/vendor/vlc.py +++ /dev/null @@ -1,8775 +0,0 @@ -#! /usr/bin/python -# -*- coding: utf-8 -*- - -# Python ctypes bindings for VLC -# -# Copyright (C) 2009-2017 the VideoLAN team -# $Id: $ -# -# Authors: Olivier Aubert -# Jean Brouwers -# Geoff Salmon -# -# This library is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of the -# License, or (at your option) any later version. -# -# This library 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 -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA - -"""This module provides bindings for the LibVLC public API, see -U{http://wiki.videolan.org/LibVLC}. - -You can find the documentation and a README file with some examples -at U{http://www.olivieraubert.net/vlc/python-ctypes/}. - -Basically, the most important class is L{Instance}, which is used -to create a libvlc instance. From this instance, you then create -L{MediaPlayer} and L{MediaListPlayer} instances. - -Alternatively, you may create instances of the L{MediaPlayer} and -L{MediaListPlayer} class directly and an instance of L{Instance} -will be implicitly created. The latter can be obtained using the -C{get_instance} method of L{MediaPlayer} and L{MediaListPlayer}. -""" - -import ctypes -from ctypes.util import find_library -import os -import sys -import functools - -# Used by EventManager in override.py -from inspect import getargspec - -import logging - -logger = logging.getLogger(__name__) - -__version__ = "3.0.3104" -__libvlc_version__ = "3.0.3" -__generator_version__ = "1.4" -build_date = "Fri Jul 13 15:18:27 2018 3.0.3" - -# The libvlc doc states that filenames are expected to be in UTF8, do -# not rely on sys.getfilesystemencoding() which will be confused, -# esp. on windows. -DEFAULT_ENCODING = 'utf-8' - -if sys.version_info[0] > 2: - str = str - unicode = str - bytes = bytes - basestring = (str, bytes) - PYTHON3 = True - - - def str_to_bytes(s): - """Translate string or bytes to bytes. - """ - if isinstance(s, str): - return bytes(s, DEFAULT_ENCODING) - else: - return s - - - def bytes_to_str(b): - """Translate bytes to string. - """ - if isinstance(b, bytes): - return b.decode(DEFAULT_ENCODING) - else: - return b -else: - str = str - unicode = unicode - bytes = str - basestring = basestring - PYTHON3 = False - - - def str_to_bytes(s): - """Translate string or bytes to bytes. - """ - if isinstance(s, unicode): - return s.encode(DEFAULT_ENCODING) - else: - return s - - - def bytes_to_str(b): - """Translate bytes to unicode string. - """ - if isinstance(b, str): - return unicode(b, DEFAULT_ENCODING) - else: - return b - -# Internal guard to prevent internal classes to be directly -# instanciated. -_internal_guard = object() - - -def find_lib(): - dll = None - plugin_path = os.environ.get('PYTHON_VLC_MODULE_PATH', None) - if 'PYTHON_VLC_LIB_PATH' in os.environ: - try: - dll = ctypes.CDLL(os.environ['PYTHON_VLC_LIB_PATH']) - except OSError: - logger.error("Cannot load lib specified by PYTHON_VLC_LIB_PATH env. variable") - sys.exit(1) - if plugin_path and not os.path.isdir(plugin_path): - logger.error("Invalid PYTHON_VLC_MODULE_PATH specified. Please fix.") - sys.exit(1) - if dll is not None: - return dll, plugin_path - - if sys.platform.startswith('linux'): - p = find_library('vlc') - try: - dll = ctypes.CDLL(p) - except OSError: # may fail - dll = ctypes.CDLL('libvlc.so.5') - elif sys.platform.startswith('win'): - libname = 'libvlc.dll' - p = find_library(libname) - if p is None: - try: # some registry settings - # leaner than win32api, win32con - if PYTHON3: - import winreg as w - else: - import _winreg as w - for r in w.HKEY_LOCAL_MACHINE, w.HKEY_CURRENT_USER: - try: - r = w.OpenKey(r, 'Software\\VideoLAN\\VLC') - plugin_path, _ = w.QueryValueEx(r, 'InstallDir') - w.CloseKey(r) - break - except w.error: - pass - except ImportError: # no PyWin32 - pass - if plugin_path is None: - # try some standard locations. - programfiles = os.environ["ProgramFiles"] - homedir = os.environ["HOMEDRIVE"] - for p in ('{programfiles}\\VideoLan{libname}', '{homedir}:\\VideoLan{libname}', - '{programfiles}{libname}', '{homedir}:{libname}'): - p = p.format(homedir=homedir, - programfiles=programfiles, - libname='\\VLC\\' + libname) - if os.path.exists(p): - plugin_path = os.path.dirname(p) - break - if plugin_path is not None: # try loading - p = os.getcwd() - os.chdir(plugin_path) - # if chdir failed, this will raise an exception - dll = ctypes.CDLL(libname) - # restore cwd after dll has been loaded - os.chdir(p) - else: # may fail - dll = ctypes.CDLL(libname) - else: - plugin_path = os.path.dirname(p) - dll = ctypes.CDLL(p) - - elif sys.platform.startswith('darwin'): - # FIXME: should find a means to configure path - d = '/Applications/VLC.app/Contents/MacOS/' - c = d + 'lib/libvlccore.dylib' - p = d + 'lib/libvlc.dylib' - if os.path.exists(p) and os.path.exists(c): - # pre-load libvlccore VLC 2.2.8+ - ctypes.CDLL(c) - dll = ctypes.CDLL(p) - for p in ('modules', 'plugins'): - p = d + p - if os.path.isdir(p): - plugin_path = p - break - else: # hope, some [DY]LD_LIBRARY_PATH is set... - # pre-load libvlccore VLC 2.2.8+ - ctypes.CDLL('libvlccore.dylib') - dll = ctypes.CDLL('libvlc.dylib') - - else: - raise NotImplementedError('%s: %s not supported' % (sys.argv[0], sys.platform)) - - return (dll, plugin_path) - - -# plugin_path used on win32 and MacOS in override.py -dll, plugin_path = find_lib() - - -class VLCException(Exception): - """Exception raised by libvlc methods. - """ - pass - - -try: - _Ints = (int, long) -except NameError: # no long in Python 3+ - _Ints = int -_Seqs = (list, tuple) - - -# Used for handling *event_manager() methods. -class memoize_parameterless(object): - """Decorator. Caches a parameterless method's return value each time it is called. - - If called later with the same arguments, the cached value is returned - (not reevaluated). - Adapted from https://wiki.python.org/moin/PythonDecoratorLibrary - """ - - def __init__(self, func): - self.func = func - self._cache = {} - - def __call__(self, obj): - try: - return self._cache[obj] - except KeyError: - v = self._cache[obj] = self.func(obj) - return v - - def __repr__(self): - """Return the function's docstring. - """ - return self.func.__doc__ - - def __get__(self, obj, objtype): - """Support instance methods. - """ - return functools.partial(self.__call__, obj) - - -# Default instance. It is used to instanciate classes directly in the -# OO-wrapper. -_default_instance = None - - -def get_default_instance(): - """Return the default VLC.Instance. - """ - global _default_instance - if _default_instance is None: - _default_instance = Instance() - return _default_instance - - -_Cfunctions = {} # from LibVLC __version__ -_Globals = globals() # sys.modules[__name__].__dict__ - - -def _Cfunction(name, flags, errcheck, *types): - """(INTERNAL) New ctypes function binding. - """ - if hasattr(dll, name) and name in _Globals: - p = ctypes.CFUNCTYPE(*types) - f = p((name, dll), flags) - if errcheck is not None: - f.errcheck = errcheck - # replace the Python function - # in this module, but only when - # running as python -O or -OO - if __debug__: - _Cfunctions[name] = f - else: - _Globals[name] = f - return f - raise NameError('no function %r' % (name,)) - - -def _Cobject(cls, ctype): - """(INTERNAL) New instance from ctypes. - """ - o = object.__new__(cls) - o._as_parameter_ = ctype - return o - - -def _Constructor(cls, ptr=_internal_guard): - """(INTERNAL) New wrapper from ctypes. - """ - if ptr == _internal_guard: - raise VLCException( - "(INTERNAL) ctypes class. You should get references for this class through methods of the LibVLC API.") - if ptr is None or ptr == 0: - return None - return _Cobject(cls, ctypes.c_void_p(ptr)) - - -class _Cstruct(ctypes.Structure): - """(INTERNAL) Base class for ctypes structures. - """ - _fields_ = [] # list of 2-tuples ('name', ctyptes.) - - def __str__(self): - l = [' %s:\t%s' % (n, getattr(self, n)) for n, _ in self._fields_] - return '\n'.join([self.__class__.__name__] + l) - - def __repr__(self): - return '%s.%s' % (self.__class__.__module__, self) - - -class _Ctype(object): - """(INTERNAL) Base class for ctypes. - """ - - @staticmethod - def from_param(this): # not self - """(INTERNAL) ctypes parameter conversion method. - """ - if this is None: - return None - return this._as_parameter_ - - -class ListPOINTER(object): - """Just like a POINTER but accept a list of ctype as an argument. - """ - - def __init__(self, etype): - self.etype = etype - - def from_param(self, param): - if isinstance(param, _Seqs): - return (self.etype * len(param))(*param) - else: - return ctypes.POINTER(param) - - -# errcheck functions for some native functions. -def string_result(result, func, arguments): - """Errcheck function. Returns a string and frees the original pointer. - - It assumes the result is a char *. - """ - if result: - # make a python string copy - s = bytes_to_str(ctypes.string_at(result)) - # free original string ptr - libvlc_free(result) - return s - return None - - -def class_result(classname): - """Errcheck function. Returns a function that creates the specified class. - """ - - def wrap_errcheck(result, func, arguments): - if result is None: - return None - return classname(result) - - return wrap_errcheck - - -# Wrapper for the opaque struct libvlc_log_t -class Log(ctypes.Structure): - pass - - -Log_ptr = ctypes.POINTER(Log) - - -# FILE* ctypes wrapper, copied from -# http://svn.python.org/projects/ctypes/trunk/ctypeslib/ctypeslib/contrib/pythonhdr.py -class FILE(ctypes.Structure): - pass - - -FILE_ptr = ctypes.POINTER(FILE) - -if PYTHON3: - PyFile_FromFd = ctypes.pythonapi.PyFile_FromFd - PyFile_FromFd.restype = ctypes.py_object - PyFile_FromFd.argtypes = [ctypes.c_int, - ctypes.c_char_p, - ctypes.c_char_p, - ctypes.c_int, - ctypes.c_char_p, - ctypes.c_char_p, - ctypes.c_char_p, - ctypes.c_int] - - PyFile_AsFd = ctypes.pythonapi.PyObject_AsFileDescriptor - PyFile_AsFd.restype = ctypes.c_int - PyFile_AsFd.argtypes = [ctypes.py_object] -else: - PyFile_FromFile = ctypes.pythonapi.PyFile_FromFile - PyFile_FromFile.restype = ctypes.py_object - PyFile_FromFile.argtypes = [FILE_ptr, - ctypes.c_char_p, - ctypes.c_char_p, - ctypes.CFUNCTYPE(ctypes.c_int, FILE_ptr)] - - PyFile_AsFile = ctypes.pythonapi.PyFile_AsFile - PyFile_AsFile.restype = FILE_ptr - PyFile_AsFile.argtypes = [ctypes.py_object] - - -# Generated enum types # - -class _Enum(ctypes.c_uint): - '''(INTERNAL) Base class - ''' - _enum_names_ = {} - - def __str__(self): - n = self._enum_names_.get(self.value, '') or ('FIXME_(%r)' % (self.value,)) - return '.'.join((self.__class__.__name__, n)) - - def __hash__(self): - return self.value - - def __repr__(self): - return '.'.join((self.__class__.__module__, self.__str__())) - - def __eq__(self, other): - return ((isinstance(other, _Enum) and self.value == other.value) - or (isinstance(other, _Ints) and self.value == other)) - - def __ne__(self, other): - return not self.__eq__(other) - - -class LogLevel(_Enum): - '''Logging messages level. -\note future libvlc versions may define new levels. - ''' - _enum_names_ = { - 0: 'DEBUG', - 2: 'NOTICE', - 3: 'WARNING', - 4: 'ERROR', - } - - -LogLevel.DEBUG = LogLevel(0) -LogLevel.ERROR = LogLevel(4) -LogLevel.NOTICE = LogLevel(2) -LogLevel.WARNING = LogLevel(3) - - -class MediaDiscovererCategory(_Enum): - '''Category of a media discoverer -See libvlc_media_discoverer_list_get(). - ''' - _enum_names_ = { - 0: 'devices', - 1: 'lan', - 2: 'podcasts', - 3: 'localdirs', - } - - -MediaDiscovererCategory.devices = MediaDiscovererCategory(0) -MediaDiscovererCategory.lan = MediaDiscovererCategory(1) -MediaDiscovererCategory.localdirs = MediaDiscovererCategory(3) -MediaDiscovererCategory.podcasts = MediaDiscovererCategory(2) - - -class DialogQuestionType(_Enum): - '''@defgroup libvlc_dialog libvlc dialog -@ingroup libvlc -@{ -@file -libvlc dialog external api. - ''' - _enum_names_ = { - 0: 'NORMAL', - 1: 'WARNING', - 2: 'CRITICAL', - } - - -DialogQuestionType.CRITICAL = DialogQuestionType(2) -DialogQuestionType.NORMAL = DialogQuestionType(0) -DialogQuestionType.WARNING = DialogQuestionType(1) - - -class EventType(_Enum): - '''Event types. - ''' - _enum_names_ = { - 0: 'MediaMetaChanged', - 1: 'MediaSubItemAdded', - 2: 'MediaDurationChanged', - 3: 'MediaParsedChanged', - 4: 'MediaFreed', - 5: 'MediaStateChanged', - 6: 'MediaSubItemTreeAdded', - 0x100: 'MediaPlayerMediaChanged', - 257: 'MediaPlayerNothingSpecial', - 258: 'MediaPlayerOpening', - 259: 'MediaPlayerBuffering', - 260: 'MediaPlayerPlaying', - 261: 'MediaPlayerPaused', - 262: 'MediaPlayerStopped', - 263: 'MediaPlayerForward', - 264: 'MediaPlayerBackward', - 265: 'MediaPlayerEndReached', - 266: 'MediaPlayerEncounteredError', - 267: 'MediaPlayerTimeChanged', - 268: 'MediaPlayerPositionChanged', - 269: 'MediaPlayerSeekableChanged', - 270: 'MediaPlayerPausableChanged', - 271: 'MediaPlayerTitleChanged', - 272: 'MediaPlayerSnapshotTaken', - 273: 'MediaPlayerLengthChanged', - 274: 'MediaPlayerVout', - 275: 'MediaPlayerScrambledChanged', - 276: 'MediaPlayerESAdded', - 277: 'MediaPlayerESDeleted', - 278: 'MediaPlayerESSelected', - 279: 'MediaPlayerCorked', - 280: 'MediaPlayerUncorked', - 281: 'MediaPlayerMuted', - 282: 'MediaPlayerUnmuted', - 283: 'MediaPlayerAudioVolume', - 284: 'MediaPlayerAudioDevice', - 285: 'MediaPlayerChapterChanged', - 0x200: 'MediaListItemAdded', - 513: 'MediaListWillAddItem', - 514: 'MediaListItemDeleted', - 515: 'MediaListWillDeleteItem', - 516: 'MediaListEndReached', - 0x300: 'MediaListViewItemAdded', - 769: 'MediaListViewWillAddItem', - 770: 'MediaListViewItemDeleted', - 771: 'MediaListViewWillDeleteItem', - 0x400: 'MediaListPlayerPlayed', - 1025: 'MediaListPlayerNextItemSet', - 1026: 'MediaListPlayerStopped', - 0x500: 'MediaDiscovererStarted', - 1281: 'MediaDiscovererEnded', - 1282: 'RendererDiscovererItemAdded', - 1283: 'RendererDiscovererItemDeleted', - 0x600: 'VlmMediaAdded', - 1537: 'VlmMediaRemoved', - 1538: 'VlmMediaChanged', - 1539: 'VlmMediaInstanceStarted', - 1540: 'VlmMediaInstanceStopped', - 1541: 'VlmMediaInstanceStatusInit', - 1542: 'VlmMediaInstanceStatusOpening', - 1543: 'VlmMediaInstanceStatusPlaying', - 1544: 'VlmMediaInstanceStatusPause', - 1545: 'VlmMediaInstanceStatusEnd', - 1546: 'VlmMediaInstanceStatusError', - } - - -EventType.MediaDiscovererEnded = EventType(1281) -EventType.MediaDiscovererStarted = EventType(0x500) -EventType.MediaDurationChanged = EventType(2) -EventType.MediaFreed = EventType(4) -EventType.MediaListEndReached = EventType(516) -EventType.MediaListItemAdded = EventType(0x200) -EventType.MediaListItemDeleted = EventType(514) -EventType.MediaListPlayerNextItemSet = EventType(1025) -EventType.MediaListPlayerPlayed = EventType(0x400) -EventType.MediaListPlayerStopped = EventType(1026) -EventType.MediaListViewItemAdded = EventType(0x300) -EventType.MediaListViewItemDeleted = EventType(770) -EventType.MediaListViewWillAddItem = EventType(769) -EventType.MediaListViewWillDeleteItem = EventType(771) -EventType.MediaListWillAddItem = EventType(513) -EventType.MediaListWillDeleteItem = EventType(515) -EventType.MediaMetaChanged = EventType(0) -EventType.MediaParsedChanged = EventType(3) -EventType.MediaPlayerAudioDevice = EventType(284) -EventType.MediaPlayerAudioVolume = EventType(283) -EventType.MediaPlayerBackward = EventType(264) -EventType.MediaPlayerBuffering = EventType(259) -EventType.MediaPlayerChapterChanged = EventType(285) -EventType.MediaPlayerCorked = EventType(279) -EventType.MediaPlayerESAdded = EventType(276) -EventType.MediaPlayerESDeleted = EventType(277) -EventType.MediaPlayerESSelected = EventType(278) -EventType.MediaPlayerEncounteredError = EventType(266) -EventType.MediaPlayerEndReached = EventType(265) -EventType.MediaPlayerForward = EventType(263) -EventType.MediaPlayerLengthChanged = EventType(273) -EventType.MediaPlayerMediaChanged = EventType(0x100) -EventType.MediaPlayerMuted = EventType(281) -EventType.MediaPlayerNothingSpecial = EventType(257) -EventType.MediaPlayerOpening = EventType(258) -EventType.MediaPlayerPausableChanged = EventType(270) -EventType.MediaPlayerPaused = EventType(261) -EventType.MediaPlayerPlaying = EventType(260) -EventType.MediaPlayerPositionChanged = EventType(268) -EventType.MediaPlayerScrambledChanged = EventType(275) -EventType.MediaPlayerSeekableChanged = EventType(269) -EventType.MediaPlayerSnapshotTaken = EventType(272) -EventType.MediaPlayerStopped = EventType(262) -EventType.MediaPlayerTimeChanged = EventType(267) -EventType.MediaPlayerTitleChanged = EventType(271) -EventType.MediaPlayerUncorked = EventType(280) -EventType.MediaPlayerUnmuted = EventType(282) -EventType.MediaPlayerVout = EventType(274) -EventType.MediaStateChanged = EventType(5) -EventType.MediaSubItemAdded = EventType(1) -EventType.MediaSubItemTreeAdded = EventType(6) -EventType.RendererDiscovererItemAdded = EventType(1282) -EventType.RendererDiscovererItemDeleted = EventType(1283) -EventType.VlmMediaAdded = EventType(0x600) -EventType.VlmMediaChanged = EventType(1538) -EventType.VlmMediaInstanceStarted = EventType(1539) -EventType.VlmMediaInstanceStatusEnd = EventType(1545) -EventType.VlmMediaInstanceStatusError = EventType(1546) -EventType.VlmMediaInstanceStatusInit = EventType(1541) -EventType.VlmMediaInstanceStatusOpening = EventType(1542) -EventType.VlmMediaInstanceStatusPause = EventType(1544) -EventType.VlmMediaInstanceStatusPlaying = EventType(1543) -EventType.VlmMediaInstanceStopped = EventType(1540) -EventType.VlmMediaRemoved = EventType(1537) - - -class Meta(_Enum): - '''Meta data types. - ''' - _enum_names_ = { - 0: 'Title', - 1: 'Artist', - 2: 'Genre', - 3: 'Copyright', - 4: 'Album', - 5: 'TrackNumber', - 6: 'Description', - 7: 'Rating', - 8: 'Date', - 9: 'Setting', - 10: 'URL', - 11: 'Language', - 12: 'NowPlaying', - 13: 'Publisher', - 14: 'EncodedBy', - 15: 'ArtworkURL', - 16: 'TrackID', - 17: 'TrackTotal', - 18: 'Director', - 19: 'Season', - 20: 'Episode', - 21: 'ShowName', - 22: 'Actors', - 23: 'AlbumArtist', - 24: 'DiscNumber', - 25: 'DiscTotal', - } - - -Meta.Actors = Meta(22) -Meta.Album = Meta(4) -Meta.AlbumArtist = Meta(23) -Meta.Artist = Meta(1) -Meta.ArtworkURL = Meta(15) -Meta.Copyright = Meta(3) -Meta.Date = Meta(8) -Meta.Description = Meta(6) -Meta.Director = Meta(18) -Meta.DiscNumber = Meta(24) -Meta.DiscTotal = Meta(25) -Meta.EncodedBy = Meta(14) -Meta.Episode = Meta(20) -Meta.Genre = Meta(2) -Meta.Language = Meta(11) -Meta.NowPlaying = Meta(12) -Meta.Publisher = Meta(13) -Meta.Rating = Meta(7) -Meta.Season = Meta(19) -Meta.Setting = Meta(9) -Meta.ShowName = Meta(21) -Meta.Title = Meta(0) -Meta.TrackID = Meta(16) -Meta.TrackNumber = Meta(5) -Meta.TrackTotal = Meta(17) -Meta.URL = Meta(10) - - -class State(_Enum): - '''Note the order of libvlc_state_t enum must match exactly the order of -See mediacontrol_playerstatus, See input_state_e enums, -and videolan.libvlc.state (at bindings/cil/src/media.cs). -expected states by web plugins are: -idle/close=0, opening=1, playing=3, paused=4, -stopping=5, ended=6, error=7. - ''' - _enum_names_ = { - 0: 'NothingSpecial', - 1: 'Opening', - 2: 'Buffering', - 3: 'Playing', - 4: 'Paused', - 5: 'Stopped', - 6: 'Ended', - 7: 'Error', - } - - -State.Buffering = State(2) -State.Ended = State(6) -State.Error = State(7) -State.NothingSpecial = State(0) -State.Opening = State(1) -State.Paused = State(4) -State.Playing = State(3) -State.Stopped = State(5) - - -class TrackType(_Enum): - '''N/A - ''' - _enum_names_ = { - -1: 'unknown', - 0: 'audio', - 1: 'video', - 2: 'text', - } - - -TrackType.audio = TrackType(0) -TrackType.text = TrackType(2) -TrackType.unknown = TrackType(-1) -TrackType.video = TrackType(1) - - -class VideoOrient(_Enum): - '''N/A - ''' - _enum_names_ = { - 0: 'left', - 1: 'right', - 2: 'left', - 3: 'right', - 4: 'top', - 5: 'bottom', - 6: 'top', - 7: 'bottom', - } - - -VideoOrient.bottom = VideoOrient(5) -VideoOrient.bottom = VideoOrient(7) -VideoOrient.left = VideoOrient(0) -VideoOrient.left = VideoOrient(2) -VideoOrient.right = VideoOrient(1) -VideoOrient.right = VideoOrient(3) -VideoOrient.top = VideoOrient(4) -VideoOrient.top = VideoOrient(6) - - -class VideoProjection(_Enum): - '''N/A - ''' - _enum_names_ = { - 0: 'rectangular', - 1: 'equirectangular', - 0x100: 'standard', - } - - -VideoProjection.equirectangular = VideoProjection(1) -VideoProjection.rectangular = VideoProjection(0) -VideoProjection.standard = VideoProjection(0x100) - - -class MediaType(_Enum): - '''Media type -See libvlc_media_get_type. - ''' - _enum_names_ = { - 0: 'unknown', - 1: 'file', - 2: 'directory', - 3: 'disc', - 4: 'stream', - 5: 'playlist', - } - - -MediaType.directory = MediaType(2) -MediaType.disc = MediaType(3) -MediaType.file = MediaType(1) -MediaType.playlist = MediaType(5) -MediaType.stream = MediaType(4) -MediaType.unknown = MediaType(0) - - -class MediaParseFlag(_Enum): - '''Parse flags used by libvlc_media_parse_with_options() -See libvlc_media_parse_with_options. - ''' - _enum_names_ = { - 0x0: 'local', - 0x1: 'network', - 0x2: 'local', - 0x4: 'network', - 0x8: 'interact', - } - - -MediaParseFlag.interact = MediaParseFlag(0x8) -MediaParseFlag.local = MediaParseFlag(0x0) -MediaParseFlag.local = MediaParseFlag(0x2) -MediaParseFlag.network = MediaParseFlag(0x1) -MediaParseFlag.network = MediaParseFlag(0x4) - - -class MediaParsedStatus(_Enum): - '''Parse status used sent by libvlc_media_parse_with_options() or returned by -libvlc_media_get_parsed_status() -See libvlc_media_parse_with_options -See libvlc_media_get_parsed_status. - ''' - _enum_names_ = { - 1: 'skipped', - 2: 'failed', - 3: 'timeout', - 4: 'done', - } - - -MediaParsedStatus.done = MediaParsedStatus(4) -MediaParsedStatus.failed = MediaParsedStatus(2) -MediaParsedStatus.skipped = MediaParsedStatus(1) -MediaParsedStatus.timeout = MediaParsedStatus(3) - - -class MediaSlaveType(_Enum): - '''Type of a media slave: subtitle or audio. - ''' - _enum_names_ = { - 0: 'subtitle', - 1: 'audio', - } - - -MediaSlaveType.audio = MediaSlaveType(1) -MediaSlaveType.subtitle = MediaSlaveType(0) - - -class VideoMarqueeOption(_Enum): - '''Marq options definition. - ''' - _enum_names_ = { - 0: 'Enable', - 1: 'Text', - 2: 'Color', - 3: 'Opacity', - 4: 'Position', - 5: 'Refresh', - 6: 'Size', - 7: 'Timeout', - 8: 'marquee_X', - 9: 'marquee_Y', - } - - -VideoMarqueeOption.Color = VideoMarqueeOption(2) -VideoMarqueeOption.Enable = VideoMarqueeOption(0) -VideoMarqueeOption.Opacity = VideoMarqueeOption(3) -VideoMarqueeOption.Position = VideoMarqueeOption(4) -VideoMarqueeOption.Refresh = VideoMarqueeOption(5) -VideoMarqueeOption.Size = VideoMarqueeOption(6) -VideoMarqueeOption.Text = VideoMarqueeOption(1) -VideoMarqueeOption.Timeout = VideoMarqueeOption(7) -VideoMarqueeOption.marquee_X = VideoMarqueeOption(8) -VideoMarqueeOption.marquee_Y = VideoMarqueeOption(9) - - -class NavigateMode(_Enum): - '''Navigation mode. - ''' - _enum_names_ = { - 0: 'activate', - 1: 'up', - 2: 'down', - 3: 'left', - 4: 'right', - 5: 'popup', - } - - -NavigateMode.activate = NavigateMode(0) -NavigateMode.down = NavigateMode(2) -NavigateMode.left = NavigateMode(3) -NavigateMode.popup = NavigateMode(5) -NavigateMode.right = NavigateMode(4) -NavigateMode.up = NavigateMode(1) - - -class Position(_Enum): - '''Enumeration of values used to set position (e.g. of video title). - ''' - _enum_names_ = { - -1: 'disable', - 0: 'center', - 1: 'left', - 2: 'right', - 3: 'top', - 4: 'left', - 5: 'right', - 6: 'bottom', - 7: 'left', - 8: 'right', - } - - -Position.bottom = Position(6) -Position.center = Position(0) -Position.disable = Position(-1) -Position.left = Position(1) -Position.left = Position(4) -Position.left = Position(7) -Position.right = Position(2) -Position.right = Position(5) -Position.right = Position(8) -Position.top = Position(3) - - -class TeletextKey(_Enum): - '''Enumeration of teletext keys than can be passed via -libvlc_video_set_teletext(). - ''' - _enum_names_ = { - 7471104: 'red', - 6750208: 'green', - 7929856: 'yellow', - 6422528: 'blue', - 6881280: 'index', - } - - -TeletextKey.blue = TeletextKey(6422528) -TeletextKey.green = TeletextKey(6750208) -TeletextKey.index = TeletextKey(6881280) -TeletextKey.red = TeletextKey(7471104) -TeletextKey.yellow = TeletextKey(7929856) - - -class VideoLogoOption(_Enum): - '''Option values for libvlc_video_{get,set}_logo_{int,string}. - ''' - _enum_names_ = { - 0: 'enable', - 1: 'file', - 2: 'logo_x', - 3: 'logo_y', - 4: 'delay', - 5: 'repeat', - 6: 'opacity', - 7: 'position', - } - - -VideoLogoOption.delay = VideoLogoOption(4) -VideoLogoOption.enable = VideoLogoOption(0) -VideoLogoOption.file = VideoLogoOption(1) -VideoLogoOption.logo_x = VideoLogoOption(2) -VideoLogoOption.logo_y = VideoLogoOption(3) -VideoLogoOption.opacity = VideoLogoOption(6) -VideoLogoOption.position = VideoLogoOption(7) -VideoLogoOption.repeat = VideoLogoOption(5) - - -class VideoAdjustOption(_Enum): - '''Option values for libvlc_video_{get,set}_adjust_{int,float,bool}. - ''' - _enum_names_ = { - 0: 'Enable', - 1: 'Contrast', - 2: 'Brightness', - 3: 'Hue', - 4: 'Saturation', - 5: 'Gamma', - } - - -VideoAdjustOption.Brightness = VideoAdjustOption(2) -VideoAdjustOption.Contrast = VideoAdjustOption(1) -VideoAdjustOption.Enable = VideoAdjustOption(0) -VideoAdjustOption.Gamma = VideoAdjustOption(5) -VideoAdjustOption.Hue = VideoAdjustOption(3) -VideoAdjustOption.Saturation = VideoAdjustOption(4) - - -class AudioOutputDeviceTypes(_Enum): - '''Audio device types. - ''' - _enum_names_ = { - -1: 'Error', - 1: 'Mono', - 2: 'Stereo', - 4: '_2F2R', - 5: '_3F2R', - 6: '_5_1', - 7: '_6_1', - 8: '_7_1', - 10: 'SPDIF', - } - - -AudioOutputDeviceTypes.Error = AudioOutputDeviceTypes(-1) -AudioOutputDeviceTypes.Mono = AudioOutputDeviceTypes(1) -AudioOutputDeviceTypes.SPDIF = AudioOutputDeviceTypes(10) -AudioOutputDeviceTypes.Stereo = AudioOutputDeviceTypes(2) -AudioOutputDeviceTypes._2F2R = AudioOutputDeviceTypes(4) -AudioOutputDeviceTypes._3F2R = AudioOutputDeviceTypes(5) -AudioOutputDeviceTypes._5_1 = AudioOutputDeviceTypes(6) -AudioOutputDeviceTypes._6_1 = AudioOutputDeviceTypes(7) -AudioOutputDeviceTypes._7_1 = AudioOutputDeviceTypes(8) - - -class AudioOutputChannel(_Enum): - '''Audio channels. - ''' - _enum_names_ = { - -1: 'Error', - 1: 'Stereo', - 2: 'RStereo', - 3: 'Left', - 4: 'Right', - 5: 'Dolbys', - } - - -AudioOutputChannel.Dolbys = AudioOutputChannel(5) -AudioOutputChannel.Error = AudioOutputChannel(-1) -AudioOutputChannel.Left = AudioOutputChannel(3) -AudioOutputChannel.RStereo = AudioOutputChannel(2) -AudioOutputChannel.Right = AudioOutputChannel(4) -AudioOutputChannel.Stereo = AudioOutputChannel(1) - - -class MediaPlayerRole(_Enum): - '''Media player roles. -\version libvlc 3.0.0 and later. -see \ref libvlc_media_player_set_role(). - ''' - _enum_names_ = { - 0: '_None', - 1: 'Music', - 2: 'Video', - 3: 'Communication', - 4: 'Game', - 5: 'Notification', - 6: 'Animation', - 7: 'Production', - 8: 'Accessibility', - 9: 'Test', - } - - -MediaPlayerRole.Accessibility = MediaPlayerRole(8) -MediaPlayerRole.Animation = MediaPlayerRole(6) -MediaPlayerRole.Communication = MediaPlayerRole(3) -MediaPlayerRole.Game = MediaPlayerRole(4) -MediaPlayerRole.Music = MediaPlayerRole(1) -MediaPlayerRole.Notification = MediaPlayerRole(5) -MediaPlayerRole.Production = MediaPlayerRole(7) -MediaPlayerRole.Test = MediaPlayerRole(9) -MediaPlayerRole.Video = MediaPlayerRole(2) -MediaPlayerRole._None = MediaPlayerRole(0) - - -class PlaybackMode(_Enum): - '''Defines playback modes for playlist. - ''' - _enum_names_ = { - 0: 'default', - 1: 'loop', - 2: 'repeat', - } - - -PlaybackMode.default = PlaybackMode(0) -PlaybackMode.loop = PlaybackMode(1) -PlaybackMode.repeat = PlaybackMode(2) - - -class Callback(ctypes.c_void_p): - """Callback function notification. - @param p_event: the event triggering the callback. - """ - pass - - -class LogCb(ctypes.c_void_p): - """Callback prototype for LibVLC log message handler. - @param data: data pointer as given to L{libvlc_log_set}(). - @param level: message level (@ref L{LogLevel}). - @param ctx: message context (meta-information about the message). - @param fmt: printf() format string (as defined by ISO C11). - @param args: variable argument list for the format @note Log message handlers B{must} be thread-safe. @warning The message context pointer, the format string parameters and the variable arguments are only valid until the callback returns. - """ - pass - - -class MediaOpenCb(ctypes.c_void_p): - """Callback prototype to open a custom bitstream input media. - The same media item can be opened multiple times. Each time, this callback - is invoked. It should allocate and initialize any instance-specific - resources, then store them in *datap. The instance resources can be freed - in the @ref libvlc_media_close_cb callback. - @param opaque: private pointer as passed to L{libvlc_media_new_callbacks}(). - @return: datap storage space for a private data pointer, sizep byte length of the bitstream or UINT64_MAX if unknown. - """ - pass - - -class MediaReadCb(ctypes.c_void_p): - """Callback prototype to read data from a custom bitstream input media. - @param opaque: private pointer as set by the @ref libvlc_media_open_cb callback. - @param buf: start address of the buffer to read data into. - @param len: bytes length of the buffer. - @return: strictly positive number of bytes read, 0 on end-of-stream, or -1 on non-recoverable error @note If no data is immediately available, then the callback should sleep. @warning The application is responsible for avoiding deadlock situations. In particular, the callback should return an error if playback is stopped; if it does not return, then L{libvlc_media_player_stop}() will never return. - """ - pass - - -class MediaSeekCb(ctypes.c_void_p): - """Callback prototype to seek a custom bitstream input media. - @param opaque: private pointer as set by the @ref libvlc_media_open_cb callback. - @param offset: absolute byte offset to seek to. - @return: 0 on success, -1 on error. - """ - pass - - -class MediaCloseCb(ctypes.c_void_p): - """Callback prototype to close a custom bitstream input media. - @param opaque: private pointer as set by the @ref libvlc_media_open_cb callback. - """ - pass - - -class VideoLockCb(ctypes.c_void_p): - """Callback prototype to allocate and lock a picture buffer. - Whenever a new video frame needs to be decoded, the lock callback is - invoked. Depending on the video chroma, one or three pixel planes of - adequate dimensions must be returned via the second parameter. Those - planes must be aligned on 32-bytes boundaries. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN]. - @param planes: start address of the pixel planes (LibVLC allocates the array of void pointers, this callback must initialize the array) [OUT]. - @return: a private pointer for the display and unlock callbacks to identify the picture buffers. - """ - pass - - -class VideoUnlockCb(ctypes.c_void_p): - """Callback prototype to unlock a picture buffer. - When the video frame decoding is complete, the unlock callback is invoked. - This callback might not be needed at all. It is only an indication that the - application can now read the pixel values if it needs to. - @note: A picture buffer is unlocked after the picture is decoded, - but before the picture is displayed. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN]. - @param picture: private pointer returned from the @ref libvlc_video_lock_cb callback [IN]. - @param planes: pixel planes as defined by the @ref libvlc_video_lock_cb callback (this parameter is only for convenience) [IN]. - """ - pass - - -class VideoDisplayCb(ctypes.c_void_p): - """Callback prototype to display a picture. - When the video frame needs to be shown, as determined by the media playback - clock, the display callback is invoked. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN]. - @param picture: private pointer returned from the @ref libvlc_video_lock_cb callback [IN]. - """ - pass - - -class VideoFormatCb(ctypes.c_void_p): - """Callback prototype to configure picture buffers format. - This callback gets the format of the video as output by the video decoder - and the chain of video filters (if any). It can opt to change any parameter - as it needs. In that case, LibVLC will attempt to convert the video format - (rescaling and chroma conversion) but these operations can be CPU intensive. - @param opaque: pointer to the private pointer passed to L{libvlc_video_set_callbacks}() [IN/OUT]. - @param chroma: pointer to the 4 bytes video format identifier [IN/OUT]. - @param width: pointer to the pixel width [IN/OUT]. - @param height: pointer to the pixel height [IN/OUT]. - @param pitches: table of scanline pitches in bytes for each pixel plane (the table is allocated by LibVLC) [OUT]. - @return: lines table of scanlines count for each plane. - """ - pass - - -class VideoCleanupCb(ctypes.c_void_p): - """Callback prototype to configure picture buffers format. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() (and possibly modified by @ref libvlc_video_format_cb) [IN]. - """ - pass - - -class AudioPlayCb(ctypes.c_void_p): - """Callback prototype for audio playback. - The LibVLC media player decodes and post-processes the audio signal - asynchronously (in an internal thread). Whenever audio samples are ready - to be queued to the output, this callback is invoked. - The number of samples provided per invocation may depend on the file format, - the audio coding algorithm, the decoder plug-in, the post-processing - filters and timing. Application must not assume a certain number of samples. - The exact format of audio samples is determined by L{libvlc_audio_set_format}() - or L{libvlc_audio_set_format_callbacks}() as is the channels layout. - Note that the number of samples is per channel. For instance, if the audio - track sampling rate is 48000 Hz, then 1200 samples represent 25 milliseconds - of audio signal - regardless of the number of audio channels. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param samples: pointer to a table of audio samples to play back [IN]. - @param count: number of audio samples to play back. - @param pts: expected play time stamp (see libvlc_delay()). - """ - pass - - -class AudioPauseCb(ctypes.c_void_p): - """Callback prototype for audio pause. - LibVLC invokes this callback to pause audio playback. - @note: The pause callback is never called if the audio is already paused. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param pts: time stamp of the pause request (should be elapsed already). - """ - pass - - -class AudioResumeCb(ctypes.c_void_p): - """Callback prototype for audio resumption. - LibVLC invokes this callback to resume audio playback after it was - previously paused. - @note: The resume callback is never called if the audio is not paused. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param pts: time stamp of the resumption request (should be elapsed already). - """ - pass - - -class AudioFlushCb(ctypes.c_void_p): - """Callback prototype for audio buffer flush. - LibVLC invokes this callback if it needs to discard all pending buffers and - stop playback as soon as possible. This typically occurs when the media is - stopped. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - """ - pass - - -class AudioDrainCb(ctypes.c_void_p): - """Callback prototype for audio buffer drain. - LibVLC may invoke this callback when the decoded audio track is ending. - There will be no further decoded samples for the track, but playback should - nevertheless continue until all already pending buffers are rendered. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - """ - pass - - -class AudioSetVolumeCb(ctypes.c_void_p): - """Callback prototype for audio volume change. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param volume: software volume (1. = nominal, 0. = mute). - @param mute: muted flag. - """ - pass - - -class AudioSetupCb(ctypes.c_void_p): - """Callback prototype to setup the audio playback. - This is called when the media player needs to create a new audio output. - @param opaque: pointer to the data pointer passed to L{libvlc_audio_set_callbacks}() [IN/OUT]. - @param format: 4 bytes sample format [IN/OUT]. - @param rate: sample rate [IN/OUT]. - @param channels: channels count [IN/OUT]. - @return: 0 on success, anything else to skip audio playback. - """ - pass - - -class AudioCleanupCb(ctypes.c_void_p): - """Callback prototype for audio playback cleanup. - This is called when the media player no longer needs an audio output. - @param opaque: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - """ - pass - - -class CallbackDecorators(object): - "Class holding various method decorators for callback functions." - Callback = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p) - Callback.__doc__ = '''Callback function notification. - @param p_event: the event triggering the callback. - ''' - LogCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_int, Log_ptr, ctypes.c_char_p, ctypes.c_void_p) - LogCb.__doc__ = '''Callback prototype for LibVLC log message handler. - @param data: data pointer as given to L{libvlc_log_set}(). - @param level: message level (@ref L{LogLevel}). - @param ctx: message context (meta-information about the message). - @param fmt: printf() format string (as defined by ISO C11). - @param args: variable argument list for the format @note Log message handlers B{must} be thread-safe. @warning The message context pointer, the format string parameters and the variable arguments are only valid until the callback returns. - ''' - MediaOpenCb = ctypes.CFUNCTYPE(ctypes.POINTER(ctypes.c_int), ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p), - ctypes.POINTER(ctypes.c_uint64)) - MediaOpenCb.__doc__ = '''Callback prototype to open a custom bitstream input media. - The same media item can be opened multiple times. Each time, this callback - is invoked. It should allocate and initialize any instance-specific - resources, then store them in *datap. The instance resources can be freed - in the @ref libvlc_media_close_cb callback. - @param opaque: private pointer as passed to L{libvlc_media_new_callbacks}(). - @return: datap storage space for a private data pointer, sizep byte length of the bitstream or UINT64_MAX if unknown. - ''' - MediaReadCb = ctypes.CFUNCTYPE(ctypes.POINTER(ctypes.c_ssize_t), ctypes.c_void_p, ctypes.c_char_p, ctypes.c_size_t) - MediaReadCb.__doc__ = '''Callback prototype to read data from a custom bitstream input media. - @param opaque: private pointer as set by the @ref libvlc_media_open_cb callback. - @param buf: start address of the buffer to read data into. - @param len: bytes length of the buffer. - @return: strictly positive number of bytes read, 0 on end-of-stream, or -1 on non-recoverable error @note If no data is immediately available, then the callback should sleep. @warning The application is responsible for avoiding deadlock situations. In particular, the callback should return an error if playback is stopped; if it does not return, then L{libvlc_media_player_stop}() will never return. - ''' - MediaSeekCb = ctypes.CFUNCTYPE(ctypes.POINTER(ctypes.c_int), ctypes.c_void_p, ctypes.c_uint64) - MediaSeekCb.__doc__ = '''Callback prototype to seek a custom bitstream input media. - @param opaque: private pointer as set by the @ref libvlc_media_open_cb callback. - @param offset: absolute byte offset to seek to. - @return: 0 on success, -1 on error. - ''' - MediaCloseCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p) - MediaCloseCb.__doc__ = '''Callback prototype to close a custom bitstream input media. - @param opaque: private pointer as set by the @ref libvlc_media_open_cb callback. - ''' - VideoLockCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - VideoLockCb.__doc__ = '''Callback prototype to allocate and lock a picture buffer. - Whenever a new video frame needs to be decoded, the lock callback is - invoked. Depending on the video chroma, one or three pixel planes of - adequate dimensions must be returned via the second parameter. Those - planes must be aligned on 32-bytes boundaries. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN]. - @param planes: start address of the pixel planes (LibVLC allocates the array of void pointers, this callback must initialize the array) [OUT]. - @return: a private pointer for the display and unlock callbacks to identify the picture buffers. - ''' - VideoUnlockCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - VideoUnlockCb.__doc__ = '''Callback prototype to unlock a picture buffer. - When the video frame decoding is complete, the unlock callback is invoked. - This callback might not be needed at all. It is only an indication that the - application can now read the pixel values if it needs to. - @note: A picture buffer is unlocked after the picture is decoded, - but before the picture is displayed. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN]. - @param picture: private pointer returned from the @ref libvlc_video_lock_cb callback [IN]. - @param planes: pixel planes as defined by the @ref libvlc_video_lock_cb callback (this parameter is only for convenience) [IN]. - ''' - VideoDisplayCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p) - VideoDisplayCb.__doc__ = '''Callback prototype to display a picture. - When the video frame needs to be shown, as determined by the media playback - clock, the display callback is invoked. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN]. - @param picture: private pointer returned from the @ref libvlc_video_lock_cb callback [IN]. - ''' - VideoFormatCb = ctypes.CFUNCTYPE(ctypes.POINTER(ctypes.c_uint), ctypes.POINTER(ctypes.c_void_p), ctypes.c_char_p, - ctypes.POINTER(ctypes.c_uint), ctypes.POINTER(ctypes.c_uint), - ctypes.POINTER(ctypes.c_uint), ctypes.POINTER(ctypes.c_uint)) - VideoFormatCb.__doc__ = '''Callback prototype to configure picture buffers format. - This callback gets the format of the video as output by the video decoder - and the chain of video filters (if any). It can opt to change any parameter - as it needs. In that case, LibVLC will attempt to convert the video format - (rescaling and chroma conversion) but these operations can be CPU intensive. - @param opaque: pointer to the private pointer passed to L{libvlc_video_set_callbacks}() [IN/OUT]. - @param chroma: pointer to the 4 bytes video format identifier [IN/OUT]. - @param width: pointer to the pixel width [IN/OUT]. - @param height: pointer to the pixel height [IN/OUT]. - @param pitches: table of scanline pitches in bytes for each pixel plane (the table is allocated by LibVLC) [OUT]. - @return: lines table of scanlines count for each plane. - ''' - VideoCleanupCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p) - VideoCleanupCb.__doc__ = '''Callback prototype to configure picture buffers format. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() (and possibly modified by @ref libvlc_video_format_cb) [IN]. - ''' - AudioPlayCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p, ctypes.c_uint, ctypes.c_int64) - AudioPlayCb.__doc__ = '''Callback prototype for audio playback. - The LibVLC media player decodes and post-processes the audio signal - asynchronously (in an internal thread). Whenever audio samples are ready - to be queued to the output, this callback is invoked. - The number of samples provided per invocation may depend on the file format, - the audio coding algorithm, the decoder plug-in, the post-processing - filters and timing. Application must not assume a certain number of samples. - The exact format of audio samples is determined by L{libvlc_audio_set_format}() - or L{libvlc_audio_set_format_callbacks}() as is the channels layout. - Note that the number of samples is per channel. For instance, if the audio - track sampling rate is 48000 Hz, then 1200 samples represent 25 milliseconds - of audio signal - regardless of the number of audio channels. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param samples: pointer to a table of audio samples to play back [IN]. - @param count: number of audio samples to play back. - @param pts: expected play time stamp (see libvlc_delay()). - ''' - AudioPauseCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_int64) - AudioPauseCb.__doc__ = '''Callback prototype for audio pause. - LibVLC invokes this callback to pause audio playback. - @note: The pause callback is never called if the audio is already paused. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param pts: time stamp of the pause request (should be elapsed already). - ''' - AudioResumeCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_int64) - AudioResumeCb.__doc__ = '''Callback prototype for audio resumption. - LibVLC invokes this callback to resume audio playback after it was - previously paused. - @note: The resume callback is never called if the audio is not paused. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param pts: time stamp of the resumption request (should be elapsed already). - ''' - AudioFlushCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_int64) - AudioFlushCb.__doc__ = '''Callback prototype for audio buffer flush. - LibVLC invokes this callback if it needs to discard all pending buffers and - stop playback as soon as possible. This typically occurs when the media is - stopped. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - ''' - AudioDrainCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p) - AudioDrainCb.__doc__ = '''Callback prototype for audio buffer drain. - LibVLC may invoke this callback when the decoded audio track is ending. - There will be no further decoded samples for the track, but playback should - nevertheless continue until all already pending buffers are rendered. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - ''' - AudioSetVolumeCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_float, ctypes.c_bool) - AudioSetVolumeCb.__doc__ = '''Callback prototype for audio volume change. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param volume: software volume (1. = nominal, 0. = mute). - @param mute: muted flag. - ''' - AudioSetupCb = ctypes.CFUNCTYPE(ctypes.POINTER(ctypes.c_int), ctypes.POINTER(ctypes.c_void_p), ctypes.c_char_p, - ctypes.POINTER(ctypes.c_uint), ctypes.POINTER(ctypes.c_uint)) - AudioSetupCb.__doc__ = '''Callback prototype to setup the audio playback. - This is called when the media player needs to create a new audio output. - @param opaque: pointer to the data pointer passed to L{libvlc_audio_set_callbacks}() [IN/OUT]. - @param format: 4 bytes sample format [IN/OUT]. - @param rate: sample rate [IN/OUT]. - @param channels: channels count [IN/OUT]. - @return: 0 on success, anything else to skip audio playback. - ''' - AudioCleanupCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p) - AudioCleanupCb.__doc__ = '''Callback prototype for audio playback cleanup. - This is called when the media player no longer needs an audio output. - @param opaque: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - ''' - - -cb = CallbackDecorators - - -# End of generated enum types # - -# From libvlc_structures.h - -class AudioOutput(_Cstruct): - - def __str__(self): - return '%s(%s:%s)' % (self.__class__.__name__, self.name, self.description) - - -AudioOutput._fields_ = [ # recursive struct - ('name', ctypes.c_char_p), - ('description', ctypes.c_char_p), - ('next', ctypes.POINTER(AudioOutput)), -] - - -class LogMessage(_Cstruct): - _fields_ = [ - ('size', ctypes.c_uint), - ('severity', ctypes.c_int), - ('type', ctypes.c_char_p), - ('name', ctypes.c_char_p), - ('header', ctypes.c_char_p), - ('message', ctypes.c_char_p), - ] - - def __init__(self): - super(LogMessage, self).__init__() - self.size = ctypes.sizeof(self) - - def __str__(self): - return '%s(%d:%s): %s' % (self.__class__.__name__, self.severity, self.type, self.message) - - -class MediaEvent(_Cstruct): - _fields_ = [ - ('media_name', ctypes.c_char_p), - ('instance_name', ctypes.c_char_p), - ] - - -class MediaStats(_Cstruct): - _fields_ = [ - ('read_bytes', ctypes.c_int), - ('input_bitrate', ctypes.c_float), - ('demux_read_bytes', ctypes.c_int), - ('demux_bitrate', ctypes.c_float), - ('demux_corrupted', ctypes.c_int), - ('demux_discontinuity', ctypes.c_int), - ('decoded_video', ctypes.c_int), - ('decoded_audio', ctypes.c_int), - ('displayed_pictures', ctypes.c_int), - ('lost_pictures', ctypes.c_int), - ('played_abuffers', ctypes.c_int), - ('lost_abuffers', ctypes.c_int), - ('sent_packets', ctypes.c_int), - ('sent_bytes', ctypes.c_int), - ('send_bitrate', ctypes.c_float), - ] - - -class MediaTrackInfo(_Cstruct): - _fields_ = [ - ('codec', ctypes.c_uint32), - ('id', ctypes.c_int), - ('type', TrackType), - ('profile', ctypes.c_int), - ('level', ctypes.c_int), - ('channels_or_height', ctypes.c_uint), - ('rate_or_width', ctypes.c_uint), - ] - - -class AudioTrack(_Cstruct): - _fields_ = [ - ('channels', ctypes.c_uint), - ('rate', ctypes.c_uint), - ] - - -class VideoTrack(_Cstruct): - _fields_ = [ - ('height', ctypes.c_uint), - ('width', ctypes.c_uint), - ('sar_num', ctypes.c_uint), - ('sar_den', ctypes.c_uint), - ('frame_rate_num', ctypes.c_uint), - ('frame_rate_den', ctypes.c_uint), - ] - - -class SubtitleTrack(_Cstruct): - _fields_ = [ - ('encoding', ctypes.c_char_p), - ] - - -class MediaTrackTracks(ctypes.Union): - _fields_ = [ - ('audio', ctypes.POINTER(AudioTrack)), - ('video', ctypes.POINTER(VideoTrack)), - ('subtitle', ctypes.POINTER(SubtitleTrack)), - ] - - -class MediaTrack(_Cstruct): - _anonymous_ = ("u",) - _fields_ = [ - ('codec', ctypes.c_uint32), - ('original_fourcc', ctypes.c_uint32), - ('id', ctypes.c_int), - ('type', TrackType), - ('profile', ctypes.c_int), - ('level', ctypes.c_int), - - ('u', MediaTrackTracks), - ('bitrate', ctypes.c_uint), - ('language', ctypes.c_char_p), - ('description', ctypes.c_char_p), - ] - - -class PlaylistItem(_Cstruct): - _fields_ = [ - ('id', ctypes.c_int), - ('uri', ctypes.c_char_p), - ('name', ctypes.c_char_p), - ] - - def __str__(self): - return '%s #%d %s (uri %s)' % (self.__class__.__name__, self.id, self.name, self.uri) - - -class Position(object): - """Enum-like, immutable window position constants. - - See e.g. VideoMarqueeOption.Position. - """ - Center = 0 - Left = 1 - CenterLeft = 1 - Right = 2 - CenterRight = 2 - Top = 4 - TopCenter = 4 - TopLeft = 5 - TopRight = 6 - Bottom = 8 - BottomCenter = 8 - BottomLeft = 9 - BottomRight = 10 - - def __init__(self, *unused): - raise TypeError('constants only') - - def __setattr__(self, *unused): # PYCHOK expected - raise TypeError('immutable constants') - - -class Rectangle(_Cstruct): - _fields_ = [ - ('top', ctypes.c_int), - ('left', ctypes.c_int), - ('bottom', ctypes.c_int), - ('right', ctypes.c_int), - ] - - -class TrackDescription(_Cstruct): - - def __str__(self): - return '%s(%d:%s)' % (self.__class__.__name__, self.id, self.name) - - -TrackDescription._fields_ = [ # recursive struct - ('id', ctypes.c_int), - ('name', ctypes.c_char_p), - ('next', ctypes.POINTER(TrackDescription)), -] - - -def track_description_list(head): - """Convert a TrackDescription linked list to a Python list (and release the former). - """ - r = [] - if head: - item = head - while item: - item = item.contents - r.append((item.id, item.name)) - item = item.next - try: - libvlc_track_description_release(head) - except NameError: - libvlc_track_description_list_release(head) - - return r - - -class EventUnion(ctypes.Union): - _fields_ = [ - ('meta_type', ctypes.c_uint), - ('new_child', ctypes.c_uint), - ('new_duration', ctypes.c_longlong), - ('new_status', ctypes.c_int), - ('media', ctypes.c_void_p), - ('new_state', ctypes.c_uint), - # FIXME: Media instance - ('new_cache', ctypes.c_float), - ('new_position', ctypes.c_float), - ('new_time', ctypes.c_longlong), - ('new_title', ctypes.c_int), - ('new_seekable', ctypes.c_longlong), - ('new_pausable', ctypes.c_longlong), - ('new_scrambled', ctypes.c_longlong), - ('new_count', ctypes.c_longlong), - # FIXME: Skipped MediaList and MediaListView... - ('filename', ctypes.c_char_p), - ('new_length', ctypes.c_longlong), - ('media_event', MediaEvent), - ] - - -class Event(_Cstruct): - _fields_ = [ - ('type', EventType), - ('object', ctypes.c_void_p), - ('u', EventUnion), - ] - - -class ModuleDescription(_Cstruct): - - def __str__(self): - return '%s %s (%s)' % (self.__class__.__name__, self.shortname, self.name) - - -ModuleDescription._fields_ = [ # recursive struct - ('name', ctypes.c_char_p), - ('shortname', ctypes.c_char_p), - ('longname', ctypes.c_char_p), - ('help', ctypes.c_char_p), - ('next', ctypes.POINTER(ModuleDescription)), -] - - -def module_description_list(head): - """Convert a ModuleDescription linked list to a Python list (and release the former). - """ - r = [] - if head: - item = head - while item: - item = item.contents - r.append((item.name, item.shortname, item.longname, item.help)) - item = item.next - libvlc_module_description_list_release(head) - return r - - -class AudioOutputDevice(_Cstruct): - - def __str__(self): - return '%s(%d:%s)' % (self.__class__.__name__, self.id, self.name) - - -AudioOutputDevice._fields_ = [ # recursive struct - ('next', ctypes.POINTER(AudioOutputDevice)), - ('device', ctypes.c_char_p), - ('description', ctypes.c_char_p), -] - - -class TitleDescription(_Cstruct): - _fields_ = [ - ('duration', ctypes.c_longlong), - ('name', ctypes.c_char_p), - ('menu', ctypes.c_bool), - ] - - -class ChapterDescription(_Cstruct): - _fields_ = [ - ('time_offset', ctypes.c_longlong), - ('duration', ctypes.c_longlong), - ('name', ctypes.c_char_p), - ] - - -class VideoViewpoint(_Cstruct): - _fields_ = [ - ('yaw', ctypes.c_float), - ('pitch', ctypes.c_float), - ('roll', ctypes.c_float), - ('field_of_view', ctypes.c_float), - ] - - -class MediaDiscovererDescription(_Cstruct): - _fields_ = [ - ('name', ctypes.c_char_p), - ('longname', ctypes.c_char_p), - ('cat', MediaDiscovererCategory), - ] - - def __str__(self): - return '%s %s (%d) - %s' % (self.__class__.__name__, self.name, self.cat, self.longname) - - -# This struct depends on the MediaSlaveType enum that is defined only -# in > 2.2 -if 'MediaSlaveType' in locals(): - class MediaSlave(_Cstruct): - _fields_ = [ - ('psz_uri', ctypes.c_char_p), - ('i_type', MediaSlaveType), - ('i_priority', ctypes.c_uint) - ] - - -class RDDescription(_Cstruct): - _fields_ = [ - ('name', ctypes.c_char_p), - ('longname', ctypes.c_char_p) - ] - - -# End of header.py # -class EventManager(_Ctype): - '''Create an event manager with callback handler. - - This class interposes the registration and handling of - event notifications in order to (a) remove the need for - decorating each callback functions with the decorator - '@callbackmethod', (b) allow any number of positional - and/or keyword arguments to the callback (in addition - to the Event instance) and (c) to preserve the Python - objects such that the callback and argument objects - remain alive (i.e. are not garbage collected) until - B{after} the notification has been unregistered. - - @note: Only a single notification can be registered - for each event type in an EventManager instance. - - ''' - - _callback_handler = None - _callbacks = {} - - def __new__(cls, ptr=_internal_guard): - if ptr == _internal_guard: - raise VLCException( - "(INTERNAL) ctypes class.\nYou should get a reference to EventManager through the MediaPlayer.event_manager() method.") - return _Constructor(cls, ptr) - - def event_attach(self, eventtype, callback, *args, **kwds): - """Register an event notification. - - @param eventtype: the desired event type to be notified about. - @param callback: the function to call when the event occurs. - @param args: optional positional arguments for the callback. - @param kwds: optional keyword arguments for the callback. - @return: 0 on success, ENOMEM on error. - - @note: The callback function must have at least one argument, - an Event instance. Any other, optional positional and keyword - arguments are in B{addition} to the first one. - """ - if not isinstance(eventtype, EventType): - raise VLCException("%s required: %r" % ('EventType', eventtype)) - if not hasattr(callback, '__call__'): # callable() - raise VLCException("%s required: %r" % ('callable', callback)) - # check that the callback expects arguments - if not any(getargspec(callback)[:2]): # list(...) - raise VLCException("%s required: %r" % ('argument', callback)) - - if self._callback_handler is None: - _called_from_ctypes = ctypes.CFUNCTYPE(None, ctypes.POINTER(Event), ctypes.c_void_p) - - @_called_from_ctypes - def _callback_handler(event, k): - """(INTERNAL) handle callback call from ctypes. - - @note: We cannot simply make this an EventManager - method since ctypes does not prepend self as the - first parameter, hence this closure. - """ - try: # retrieve Python callback and arguments - call, args, kwds = self._callbacks[k] - # deref event.contents to simplify callback code - call(event.contents, *args, **kwds) - except KeyError: # detached? - pass - - self._callback_handler = _callback_handler - self._callbacks = {} - - k = eventtype.value - r = libvlc_event_attach(self, k, self._callback_handler, k) - if not r: - self._callbacks[k] = (callback, args, kwds) - return r - - def event_detach(self, eventtype): - """Unregister an event notification. - - @param eventtype: the event type notification to be removed. - """ - if not isinstance(eventtype, EventType): - raise VLCException("%s required: %r" % ('EventType', eventtype)) - - k = eventtype.value - if k in self._callbacks: - del self._callbacks[k] # remove, regardless of libvlc return value - libvlc_event_detach(self, k, self._callback_handler, k) - - -class Instance(_Ctype): - '''Create a new Instance instance. - - It may take as parameter either: - - a string - - a list of strings as first parameters - - the parameters given as the constructor parameters (must be strings) - - ''' - - def __new__(cls, *args): - if len(args) == 1: - # Only 1 arg. It is either a C pointer, or an arg string, - # or a tuple. - i = args[0] - if isinstance(i, _Ints): - return _Constructor(cls, i) - elif isinstance(i, basestring): - args = i.strip().split() - elif isinstance(i, _Seqs): - args = list(i) - else: - raise VLCException('Instance %r' % (args,)) - else: - args = list(args) - - if not args: # no parameters passed - args = ['vlc'] - elif args[0] != 'vlc': - args.insert(0, 'vlc') - - if plugin_path is not None: - # set plugin_path if detected, win32 and MacOS, - # if the user did not specify it itself. - os.environ.setdefault('VLC_PLUGIN_PATH', plugin_path) - - if PYTHON3: - args = [str_to_bytes(a) for a in args] - return libvlc_new(len(args), args) - - def media_player_new(self, uri=None): - """Create a new MediaPlayer instance. - - @param uri: an optional URI to play in the player. - """ - p = libvlc_media_player_new(self) - if uri: - p.set_media(self.media_new(uri)) - p._instance = self - return p - - def media_list_player_new(self): - """Create a new MediaListPlayer instance. - """ - p = libvlc_media_list_player_new(self) - p._instance = self - return p - - def media_new(self, mrl, *options): - """Create a new Media instance. - - If mrl contains a colon (:) preceded by more than 1 letter, it - will be treated as a URL. Else, it will be considered as a - local path. If you need more control, directly use - media_new_location/media_new_path methods. - - Options can be specified as supplementary string parameters, - but note that many options cannot be set at the media level, - and rather at the Instance level. For instance, the marquee - filter must be specified when creating the vlc.Instance or - vlc.MediaPlayer. - - Alternatively, options can be added to the media using the - Media.add_options method (with the same limitation). - - @param options: optional media option=value strings - """ - if ':' in mrl and mrl.index(':') > 1: - # Assume it is a URL - m = libvlc_media_new_location(self, str_to_bytes(mrl)) - else: - # Else it should be a local path. - m = libvlc_media_new_path(self, str_to_bytes(os.path.normpath(mrl))) - for o in options: - libvlc_media_add_option(m, str_to_bytes(o)) - m._instance = self - return m - - def media_list_new(self, mrls=None): - """Create a new MediaList instance. - @param mrls: optional list of MRL strings - """ - l = libvlc_media_list_new(self) - # We should take the lock, but since we did not leak the - # reference, nobody else can access it. - if mrls: - for m in mrls: - l.add_media(m) - l._instance = self - return l - - def audio_output_enumerate_devices(self): - """Enumerate the defined audio output devices. - - @return: list of dicts {name:, description:, devices:} - """ - r = [] - head = libvlc_audio_output_list_get(self) - if head: - i = head - while i: - i = i.contents - d = [{'id': libvlc_audio_output_device_id(self, i.name, d), - 'longname': libvlc_audio_output_device_longname(self, i.name, d)} - for d in range(libvlc_audio_output_device_count(self, i.name))] - r.append({'name': i.name, 'description': i.description, 'devices': d}) - i = i.next - libvlc_audio_output_list_release(head) - return r - - def audio_filter_list_get(self): - """Returns a list of available audio filters. - - """ - return module_description_list(libvlc_audio_filter_list_get(self)) - - def video_filter_list_get(self): - """Returns a list of available video filters. - - """ - return module_description_list(libvlc_video_filter_list_get(self)) - - def release(self): - '''Decrement the reference count of a libvlc instance, and destroy it - if it reaches zero. - ''' - return libvlc_release(self) - - def retain(self): - '''Increments the reference count of a libvlc instance. - The initial reference count is 1 after L{new}() returns. - ''' - return libvlc_retain(self) - - def add_intf(self, name): - '''Try to start a user interface for the libvlc instance. - @param name: interface name, or None for default. - @return: 0 on success, -1 on error. - ''' - return libvlc_add_intf(self, str_to_bytes(name)) - - def set_user_agent(self, name, http): - '''Sets the application name. LibVLC passes this as the user agent string - when a protocol requires it. - @param name: human-readable application name, e.g. "FooBar player 1.2.3". - @param http: HTTP User Agent, e.g. "FooBar/1.2.3 Python/2.6.0". - @version: LibVLC 1.1.1 or later. - ''' - return libvlc_set_user_agent(self, str_to_bytes(name), str_to_bytes(http)) - - def set_app_id(self, id, version, icon): - '''Sets some meta-information about the application. - See also L{set_user_agent}(). - @param id: Java-style application identifier, e.g. "com.acme.foobar". - @param version: application version numbers, e.g. "1.2.3". - @param icon: application icon name, e.g. "foobar". - @version: LibVLC 2.1.0 or later. - ''' - return libvlc_set_app_id(self, str_to_bytes(id), str_to_bytes(version), str_to_bytes(icon)) - - def log_unset(self): - '''Unsets the logging callback. - This function deregisters the logging callback for a LibVLC instance. - This is rarely needed as the callback is implicitly unset when the instance - is destroyed. - @note: This function will wait for any pending callbacks invocation to - complete (causing a deadlock if called from within the callback). - @version: LibVLC 2.1.0 or later. - ''' - return libvlc_log_unset(self) - - def log_set(self, cb, data): - '''Sets the logging callback for a LibVLC instance. - This function is thread-safe: it will wait for any pending callbacks - invocation to complete. - @param data: opaque data pointer for the callback function @note Some log messages (especially debug) are emitted by LibVLC while is being initialized. These messages cannot be captured with this interface. @warning A deadlock may occur if this function is called from the callback. - @param p_instance: libvlc instance. - @version: LibVLC 2.1.0 or later. - ''' - return libvlc_log_set(self, cb, data) - - def log_set_file(self, stream): - '''Sets up logging to a file. - @param stream: FILE pointer opened for writing (the FILE pointer must remain valid until L{log_unset}()). - @version: LibVLC 2.1.0 or later. - ''' - return libvlc_log_set_file(self, stream) - - def media_discoverer_new(self, psz_name): - '''Create a media discoverer object by name. - After this object is created, you should attach to media_list events in - order to be notified of new items discovered. - You need to call L{media_discoverer_start}() in order to start the - discovery. - See L{media_discoverer_media_list} - See L{media_discoverer_event_manager} - See L{media_discoverer_start}. - @param psz_name: service name; use L{media_discoverer_list_get}() to get a list of the discoverer names available in this libVLC instance. - @return: media discover object or None in case of error. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_discoverer_new(self, str_to_bytes(psz_name)) - - def media_discoverer_list_get(self, i_cat, ppp_services): - '''Get media discoverer services by category. - @param i_cat: category of services to fetch. - @param ppp_services: address to store an allocated array of media discoverer services (must be freed with L{media_discoverer_list_release}() by the caller) [OUT]. - @return: the number of media discoverer services (0 on error). - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_discoverer_list_get(self, i_cat, ppp_services) - - def media_library_new(self): - '''Create an new Media Library object. - @return: a new object or None on error. - ''' - return libvlc_media_library_new(self) - - def vlm_release(self): - '''Release the vlm instance related to the given L{Instance}. - ''' - return libvlc_vlm_release(self) - - def vlm_add_broadcast(self, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop): - '''Add a broadcast, with one input. - @param psz_name: the name of the new broadcast. - @param psz_input: the input MRL. - @param psz_output: the output MRL (the parameter to the "sout" variable). - @param i_options: number of additional options. - @param ppsz_options: additional options. - @param b_enabled: boolean for enabling the new broadcast. - @param b_loop: Should this broadcast be played in loop ? - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_add_broadcast(self, str_to_bytes(psz_name), str_to_bytes(psz_input), str_to_bytes(psz_output), - i_options, ppsz_options, b_enabled, b_loop) - - def vlm_add_vod(self, psz_name, psz_input, i_options, ppsz_options, b_enabled, psz_mux): - '''Add a vod, with one input. - @param psz_name: the name of the new vod media. - @param psz_input: the input MRL. - @param i_options: number of additional options. - @param ppsz_options: additional options. - @param b_enabled: boolean for enabling the new vod. - @param psz_mux: the muxer of the vod media. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_add_vod(self, str_to_bytes(psz_name), str_to_bytes(psz_input), i_options, ppsz_options, - b_enabled, str_to_bytes(psz_mux)) - - def vlm_del_media(self, psz_name): - '''Delete a media (VOD or broadcast). - @param psz_name: the media to delete. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_del_media(self, str_to_bytes(psz_name)) - - def vlm_set_enabled(self, psz_name, b_enabled): - '''Enable or disable a media (VOD or broadcast). - @param psz_name: the media to work on. - @param b_enabled: the new status. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_set_enabled(self, str_to_bytes(psz_name), b_enabled) - - def vlm_set_output(self, psz_name, psz_output): - '''Set the output for a media. - @param psz_name: the media to work on. - @param psz_output: the output MRL (the parameter to the "sout" variable). - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_set_output(self, str_to_bytes(psz_name), str_to_bytes(psz_output)) - - def vlm_set_input(self, psz_name, psz_input): - '''Set a media's input MRL. This will delete all existing inputs and - add the specified one. - @param psz_name: the media to work on. - @param psz_input: the input MRL. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_set_input(self, str_to_bytes(psz_name), str_to_bytes(psz_input)) - - def vlm_add_input(self, psz_name, psz_input): - '''Add a media's input MRL. This will add the specified one. - @param psz_name: the media to work on. - @param psz_input: the input MRL. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_add_input(self, str_to_bytes(psz_name), str_to_bytes(psz_input)) - - def vlm_set_loop(self, psz_name, b_loop): - '''Set a media's loop status. - @param psz_name: the media to work on. - @param b_loop: the new status. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_set_loop(self, str_to_bytes(psz_name), b_loop) - - def vlm_set_mux(self, psz_name, psz_mux): - '''Set a media's vod muxer. - @param psz_name: the media to work on. - @param psz_mux: the new muxer. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_set_mux(self, str_to_bytes(psz_name), str_to_bytes(psz_mux)) - - def vlm_change_media(self, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop): - '''Edit the parameters of a media. This will delete all existing inputs and - add the specified one. - @param psz_name: the name of the new broadcast. - @param psz_input: the input MRL. - @param psz_output: the output MRL (the parameter to the "sout" variable). - @param i_options: number of additional options. - @param ppsz_options: additional options. - @param b_enabled: boolean for enabling the new broadcast. - @param b_loop: Should this broadcast be played in loop ? - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_change_media(self, str_to_bytes(psz_name), str_to_bytes(psz_input), str_to_bytes(psz_output), - i_options, ppsz_options, b_enabled, b_loop) - - def vlm_play_media(self, psz_name): - '''Play the named broadcast. - @param psz_name: the name of the broadcast. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_play_media(self, str_to_bytes(psz_name)) - - def vlm_stop_media(self, psz_name): - '''Stop the named broadcast. - @param psz_name: the name of the broadcast. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_stop_media(self, str_to_bytes(psz_name)) - - def vlm_pause_media(self, psz_name): - '''Pause the named broadcast. - @param psz_name: the name of the broadcast. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_pause_media(self, str_to_bytes(psz_name)) - - def vlm_seek_media(self, psz_name, f_percentage): - '''Seek in the named broadcast. - @param psz_name: the name of the broadcast. - @param f_percentage: the percentage to seek to. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_seek_media(self, str_to_bytes(psz_name), f_percentage) - - def vlm_show_media(self, psz_name): - '''Return information about the named media as a JSON - string representation. - This function is mainly intended for debugging use, - if you want programmatic access to the state of - a vlm_media_instance_t, please use the corresponding - libvlc_vlm_get_media_instance_xxx -functions. - Currently there are no such functions available for - vlm_media_t though. - @param psz_name: the name of the media, if the name is an empty string, all media is described. - @return: string with information about named media, or None on error. - ''' - return libvlc_vlm_show_media(self, str_to_bytes(psz_name)) - - def vlm_get_media_instance_position(self, psz_name, i_instance): - '''Get vlm_media instance position by name or instance id. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: position as float or -1. on error. - ''' - return libvlc_vlm_get_media_instance_position(self, str_to_bytes(psz_name), i_instance) - - def vlm_get_media_instance_time(self, psz_name, i_instance): - '''Get vlm_media instance time by name or instance id. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: time as integer or -1 on error. - ''' - return libvlc_vlm_get_media_instance_time(self, str_to_bytes(psz_name), i_instance) - - def vlm_get_media_instance_length(self, psz_name, i_instance): - '''Get vlm_media instance length by name or instance id. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: length of media item or -1 on error. - ''' - return libvlc_vlm_get_media_instance_length(self, str_to_bytes(psz_name), i_instance) - - def vlm_get_media_instance_rate(self, psz_name, i_instance): - '''Get vlm_media instance playback rate by name or instance id. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: playback rate or -1 on error. - ''' - return libvlc_vlm_get_media_instance_rate(self, str_to_bytes(psz_name), i_instance) - - def vlm_get_media_instance_title(self, psz_name, i_instance): - '''Get vlm_media instance title number by name or instance id. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: title as number or -1 on error. - @bug: will always return 0. - ''' - return libvlc_vlm_get_media_instance_title(self, str_to_bytes(psz_name), i_instance) - - def vlm_get_media_instance_chapter(self, psz_name, i_instance): - '''Get vlm_media instance chapter number by name or instance id. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: chapter as number or -1 on error. - @bug: will always return 0. - ''' - return libvlc_vlm_get_media_instance_chapter(self, str_to_bytes(psz_name), i_instance) - - def vlm_get_media_instance_seekable(self, psz_name, i_instance): - '''Is libvlc instance seekable ? - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: 1 if seekable, 0 if not, -1 if media does not exist. - @bug: will always return 0. - ''' - return libvlc_vlm_get_media_instance_seekable(self, str_to_bytes(psz_name), i_instance) - - @memoize_parameterless - def vlm_get_event_manager(self): - '''Get libvlc_event_manager from a vlm media. - The p_event_manager is immutable, so you don't have to hold the lock. - @return: libvlc_event_manager. - ''' - return libvlc_vlm_get_event_manager(self) - - def media_new_location(self, psz_mrl): - '''Create a media with a certain given media resource location, - for instance a valid URL. - @note: To refer to a local file with this function, - the file://... URI syntax B{must} be used (see IETF RFC3986). - We recommend using L{media_new_path}() instead when dealing with - local files. - See L{media_release}. - @param psz_mrl: the media location. - @return: the newly created media or None on error. - ''' - return libvlc_media_new_location(self, str_to_bytes(psz_mrl)) - - def media_new_path(self, path): - '''Create a media for a certain file path. - See L{media_release}. - @param path: local filesystem path. - @return: the newly created media or None on error. - ''' - return libvlc_media_new_path(self, str_to_bytes(path)) - - def media_new_fd(self, fd): - '''Create a media for an already open file descriptor. - The file descriptor shall be open for reading (or reading and writing). - Regular file descriptors, pipe read descriptors and character device - descriptors (including TTYs) are supported on all platforms. - Block device descriptors are supported where available. - Directory descriptors are supported on systems that provide fdopendir(). - Sockets are supported on all platforms where they are file descriptors, - i.e. all except Windows. - @note: This library will B{not} automatically close the file descriptor - under any circumstance. Nevertheless, a file descriptor can usually only be - rendered once in a media player. To render it a second time, the file - descriptor should probably be rewound to the beginning with lseek(). - See L{media_release}. - @param fd: open file descriptor. - @return: the newly created media or None on error. - @version: LibVLC 1.1.5 and later. - ''' - return libvlc_media_new_fd(self, fd) - - def media_new_callbacks(self, open_cb, read_cb, seek_cb, close_cb, opaque): - '''Create a media with custom callbacks to read the data from. - @param open_cb: callback to open the custom bitstream input media. - @param read_cb: callback to read data (must not be None). - @param seek_cb: callback to seek, or None if seeking is not supported. - @param close_cb: callback to close the media, or None if unnecessary. - @param opaque: data pointer for the open callback. - @return: the newly created media or None on error @note If open_cb is None, the opaque pointer will be passed to read_cb, seek_cb and close_cb, and the stream size will be treated as unknown. @note The callbacks may be called asynchronously (from another thread). A single stream instance need not be reentrant. However the open_cb needs to be reentrant if the media is used by multiple player instances. @warning The callbacks may be used until all or any player instances that were supplied the media item are stopped. See L{media_release}. - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_new_callbacks(self, open_cb, read_cb, seek_cb, close_cb, opaque) - - def media_new_as_node(self, psz_name): - '''Create a media as an empty node with a given name. - See L{media_release}. - @param psz_name: the name of the node. - @return: the new empty media or None on error. - ''' - return libvlc_media_new_as_node(self, str_to_bytes(psz_name)) - - def renderer_discoverer_new(self, psz_name): - '''Create a renderer discoverer object by name - After this object is created, you should attach to events in order to be - notified of the discoverer events. - You need to call L{renderer_discoverer_start}() in order to start the - discovery. - See L{renderer_discoverer_event_manager}() - See L{renderer_discoverer_start}(). - @param psz_name: service name; use L{renderer_discoverer_list_get}() to get a list of the discoverer names available in this libVLC instance. - @return: media discover object or None in case of error. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_renderer_discoverer_new(self, str_to_bytes(psz_name)) - - def renderer_discoverer_list_get(self, ppp_services): - '''Get media discoverer services - See libvlc_renderer_list_release(). - @param ppp_services: address to store an allocated array of renderer discoverer services (must be freed with libvlc_renderer_list_release() by the caller) [OUT]. - @return: the number of media discoverer services (0 on error). - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_renderer_discoverer_list_get(self, ppp_services) - - def audio_output_device_count(self, psz_audio_output): - '''Backward compatibility stub. Do not use in new code. - \deprecated Use L{audio_output_device_list_get}() instead. - @return: always 0. - ''' - return libvlc_audio_output_device_count(self, str_to_bytes(psz_audio_output)) - - def audio_output_device_longname(self, psz_output, i_device): - '''Backward compatibility stub. Do not use in new code. - \deprecated Use L{audio_output_device_list_get}() instead. - @return: always None. - ''' - return libvlc_audio_output_device_longname(self, str_to_bytes(psz_output), i_device) - - def audio_output_device_id(self, psz_audio_output, i_device): - '''Backward compatibility stub. Do not use in new code. - \deprecated Use L{audio_output_device_list_get}() instead. - @return: always None. - ''' - return libvlc_audio_output_device_id(self, str_to_bytes(psz_audio_output), i_device) - - def media_discoverer_new_from_name(self, psz_name): - '''\deprecated Use L{media_discoverer_new}() and L{media_discoverer_start}(). - ''' - return libvlc_media_discoverer_new_from_name(self, str_to_bytes(psz_name)) - - def wait(self): - '''Waits until an interface causes the instance to exit. - You should start at least one interface first, using L{add_intf}(). - ''' - return libvlc_wait(self) - - def get_log_verbosity(self): - '''Always returns minus one. - This function is only provided for backward compatibility. - @return: always -1. - ''' - return libvlc_get_log_verbosity(self) - - def set_log_verbosity(self, level): - '''This function does nothing. - It is only provided for backward compatibility. - @param level: ignored. - ''' - return libvlc_set_log_verbosity(self, level) - - def log_open(self): - '''This function does nothing useful. - It is only provided for backward compatibility. - @return: an unique pointer or None on error. - ''' - return libvlc_log_open(self) - - def playlist_play(self, i_id, i_options, ppsz_options): - '''Start playing (if there is any item in the playlist). - Additionnal playlist item options can be specified for addition to the - item before it is played. - @param i_id: the item to play. If this is a negative number, the next item will be selected. Otherwise, the item with the given ID will be played. - @param i_options: the number of options to add to the item. - @param ppsz_options: the options to add to the item. - ''' - return libvlc_playlist_play(self, i_id, i_options, ppsz_options) - - def audio_output_list_get(self): - '''Gets the list of available audio output modules. - @return: list of available audio outputs. It must be freed with In case of error, None is returned. - ''' - return libvlc_audio_output_list_get(self) - - def audio_output_device_list_get(self, aout): - '''Gets a list of audio output devices for a given audio output module, - See L{audio_output_device_set}(). - @note: Not all audio outputs support this. In particular, an empty (None) - list of devices does B{not} imply that the specified audio output does - not work. - @note: The list might not be exhaustive. - @warning: Some audio output devices in the list might not actually work in - some circumstances. By default, it is recommended to not specify any - explicit audio device. - @param aout: audio output name (as returned by L{audio_output_list_get}()). - @return: A None-terminated linked list of potential audio output devices. It must be freed with L{audio_output_device_list_release}(). - @version: LibVLC 2.1.0 or later. - ''' - return libvlc_audio_output_device_list_get(self, str_to_bytes(aout)) - - -class LogIterator(_Ctype): - '''Create a new VLC log iterator. - - ''' - - def __new__(cls, ptr=_internal_guard): - '''(INTERNAL) ctypes wrapper constructor. - ''' - return _Constructor(cls, ptr) - - def __iter__(self): - return self - - def next(self): - if self.has_next(): - b = LogMessage() - i = libvlc_log_iterator_next(self, b) - return i.contents - raise StopIteration - - def __next__(self): - return self.next() - - def free(self): - '''Frees memory allocated by L{log_get_iterator}(). - ''' - return libvlc_log_iterator_free(self) - - def has_next(self): - '''Always returns zero. - This function is only provided for backward compatibility. - @return: always zero. - ''' - return libvlc_log_iterator_has_next(self) - - -class Media(_Ctype): - '''Create a new Media instance. - - Usage: Media(MRL, *options) - - See vlc.Instance.media_new documentation for details. - - ''' - - def __new__(cls, *args): - if args: - i = args[0] - if isinstance(i, _Ints): - return _Constructor(cls, i) - if isinstance(i, Instance): - return i.media_new(*args[1:]) - - o = get_default_instance().media_new(*args) - return o - - def get_instance(self): - return getattr(self, '_instance', None) - - def add_options(self, *options): - """Add a list of options to the media. - - Options must be written without the double-dash. Warning: most - audio and video options, such as text renderer, have no - effects on an individual media. These options must be set at - the vlc.Instance or vlc.MediaPlayer instanciation. - - @param options: optional media option=value strings - """ - for o in options: - self.add_option(o) - - def tracks_get(self): - """Get media descriptor's elementary streams description - Note, you need to call L{parse}() or play the media at least once - before calling this function. - Not doing this will result in an empty array. - The result must be freed with L{tracks_release}. - @version: LibVLC 2.1.0 and later. - """ - mediaTrack_pp = ctypes.POINTER(MediaTrack)() - n = libvlc_media_tracks_get(self, ctypes.byref(mediaTrack_pp)) - info = ctypes.cast(mediaTrack_pp, ctypes.POINTER(ctypes.POINTER(MediaTrack) * n)) - try: - contents = info.contents - except ValueError: - # Media not parsed, no info. - return None - tracks = (contents[i].contents for i in range(len(contents))) - # libvlc_media_tracks_release(mediaTrack_pp, n) - return tracks - - def add_option(self, psz_options): - '''Add an option to the media. - This option will be used to determine how the media_player will - read the media. This allows to use VLC's advanced - reading/streaming options on a per-media basis. - @note: The options are listed in 'vlc --long-help' from the command line, - e.g. "-sout-all". Keep in mind that available options and their semantics - vary across LibVLC versions and builds. - @warning: Not all options affects L{Media} objects: - Specifically, due to architectural issues most audio and video options, - such as text renderer options, have no effects on an individual media. - These options must be set through L{new}() instead. - @param psz_options: the options (as a string). - ''' - return libvlc_media_add_option(self, str_to_bytes(psz_options)) - - def add_option_flag(self, psz_options, i_flags): - '''Add an option to the media with configurable flags. - This option will be used to determine how the media_player will - read the media. This allows to use VLC's advanced - reading/streaming options on a per-media basis. - The options are detailed in vlc --long-help, for instance - "--sout-all". Note that all options are not usable on medias: - specifically, due to architectural issues, video-related options - such as text renderer options cannot be set on a single media. They - must be set on the whole libvlc instance instead. - @param psz_options: the options (as a string). - @param i_flags: the flags for this option. - ''' - return libvlc_media_add_option_flag(self, str_to_bytes(psz_options), i_flags) - - def retain(self): - '''Retain a reference to a media descriptor object (L{Media}). Use - L{release}() to decrement the reference count of a - media descriptor object. - ''' - return libvlc_media_retain(self) - - def release(self): - '''Decrement the reference count of a media descriptor object. If the - reference count is 0, then L{release}() will release the - media descriptor object. It will send out an libvlc_MediaFreed event - to all listeners. If the media descriptor object has been released it - should not be used again. - ''' - return libvlc_media_release(self) - - def get_mrl(self): - '''Get the media resource locator (mrl) from a media descriptor object. - @return: string with mrl of media descriptor object. - ''' - return libvlc_media_get_mrl(self) - - def duplicate(self): - '''Duplicate a media descriptor object. - ''' - return libvlc_media_duplicate(self) - - def get_meta(self, e_meta): - '''Read the meta of the media. - If the media has not yet been parsed this will return None. - See L{parse} - See L{parse_with_options} - See libvlc_MediaMetaChanged. - @param e_meta: the meta to read. - @return: the media's meta. - ''' - return libvlc_media_get_meta(self, e_meta) - - def set_meta(self, e_meta, psz_value): - '''Set the meta of the media (this function will not save the meta, call - L{save_meta} in order to save the meta). - @param e_meta: the meta to write. - @param psz_value: the media's meta. - ''' - return libvlc_media_set_meta(self, e_meta, str_to_bytes(psz_value)) - - def save_meta(self): - '''Save the meta previously set. - @return: true if the write operation was successful. - ''' - return libvlc_media_save_meta(self) - - def get_state(self): - '''Get current state of media descriptor object. Possible media states are - libvlc_NothingSpecial=0, libvlc_Opening, libvlc_Playing, libvlc_Paused, - libvlc_Stopped, libvlc_Ended, libvlc_Error. - See L{State}. - @return: state of media descriptor object. - ''' - return libvlc_media_get_state(self) - - def get_stats(self, p_stats): - '''Get the current statistics about the media. - @param p_stats:: structure that contain the statistics about the media (this structure must be allocated by the caller). - @return: true if the statistics are available, false otherwise \libvlc_return_bool. - ''' - return libvlc_media_get_stats(self, p_stats) - - def subitems(self): - '''Get subitems of media descriptor object. This will increment - the reference count of supplied media descriptor object. Use - L{list_release}() to decrement the reference counting. - @return: list of media descriptor subitems or None. - ''' - return libvlc_media_subitems(self) - - @memoize_parameterless - def event_manager(self): - '''Get event manager from media descriptor object. - NOTE: this function doesn't increment reference counting. - @return: event manager object. - ''' - return libvlc_media_event_manager(self) - - def get_duration(self): - '''Get duration (in ms) of media descriptor object item. - @return: duration of media item or -1 on error. - ''' - return libvlc_media_get_duration(self) - - def parse_with_options(self, parse_flag, timeout): - '''Parse the media asynchronously with options. - This fetches (local or network) art, meta data and/or tracks information. - This method is the extended version of L{parse_with_options}(). - To track when this is over you can listen to libvlc_MediaParsedChanged - event. However if this functions returns an error, you will not receive any - events. - It uses a flag to specify parse options (see L{MediaParseFlag}). All - these flags can be combined. By default, media is parsed if it's a local - file. - @note: Parsing can be aborted with L{parse_stop}(). - See libvlc_MediaParsedChanged - See L{get_meta} - See L{tracks_get} - See L{get_parsed_status} - See L{MediaParseFlag}. - @param parse_flag: parse options: - @param timeout: maximum time allowed to preparse the media. If -1, the default "preparse-timeout" option will be used as a timeout. If 0, it will wait indefinitely. If > 0, the timeout will be used (in milliseconds). - @return: -1 in case of error, 0 otherwise. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_parse_with_options(self, parse_flag, timeout) - - def parse_stop(self): - '''Stop the parsing of the media - When the media parsing is stopped, the libvlc_MediaParsedChanged event will - be sent with the libvlc_media_parsed_status_timeout status. - See L{parse_with_options}. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_parse_stop(self) - - def get_parsed_status(self): - '''Get Parsed status for media descriptor object. - See libvlc_MediaParsedChanged - See L{MediaParsedStatus}. - @return: a value of the L{MediaParsedStatus} enum. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_get_parsed_status(self) - - def set_user_data(self, p_new_user_data): - '''Sets media descriptor's user_data. user_data is specialized data - accessed by the host application, VLC.framework uses it as a pointer to - an native object that references a L{Media} pointer. - @param p_new_user_data: pointer to user data. - ''' - return libvlc_media_set_user_data(self, p_new_user_data) - - def get_user_data(self): - '''Get media descriptor's user_data. user_data is specialized data - accessed by the host application, VLC.framework uses it as a pointer to - an native object that references a L{Media} pointer. - ''' - return libvlc_media_get_user_data(self) - - def get_type(self): - '''Get the media type of the media descriptor object. - @return: media type. - @version: LibVLC 3.0.0 and later. See L{MediaType}. - ''' - return libvlc_media_get_type(self) - - def slaves_add(self, i_type, i_priority, psz_uri): - '''Add a slave to the current media. - A slave is an external input source that may contains an additional subtitle - track (like a .srt) or an additional audio track (like a .ac3). - @note: This function must be called before the media is parsed (via - L{parse_with_options}()) or before the media is played (via - L{player_play}()). - @param i_type: subtitle or audio. - @param i_priority: from 0 (low priority) to 4 (high priority). - @param psz_uri: Uri of the slave (should contain a valid scheme). - @return: 0 on success, -1 on error. - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_slaves_add(self, i_type, i_priority, str_to_bytes(psz_uri)) - - def slaves_clear(self): - '''Clear all slaves previously added by L{slaves_add}() or - internally. - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_slaves_clear(self) - - def slaves_get(self, ppp_slaves): - '''Get a media descriptor's slave list - The list will contain slaves parsed by VLC or previously added by - L{slaves_add}(). The typical use case of this function is to save - a list of slave in a database for a later use. - @param ppp_slaves: address to store an allocated array of slaves (must be freed with L{slaves_release}()) [OUT]. - @return: the number of slaves (zero on error). - @version: LibVLC 3.0.0 and later. See L{slaves_add}. - ''' - return libvlc_media_slaves_get(self, ppp_slaves) - - def parse(self): - '''Parse a media. - This fetches (local) art, meta data and tracks information. - The method is synchronous. - \deprecated This function could block indefinitely. - Use L{parse_with_options}() instead - See L{parse_with_options} - See L{get_meta} - See L{get_tracks_info}. - ''' - return libvlc_media_parse(self) - - def parse_async(self): - '''Parse a media. - This fetches (local) art, meta data and tracks information. - The method is the asynchronous of L{parse}(). - To track when this is over you can listen to libvlc_MediaParsedChanged - event. However if the media was already parsed you will not receive this - event. - \deprecated You can't be sure to receive the libvlc_MediaParsedChanged - event (you can wait indefinitely for this event). - Use L{parse_with_options}() instead - See L{parse} - See libvlc_MediaParsedChanged - See L{get_meta} - See L{get_tracks_info}. - ''' - return libvlc_media_parse_async(self) - - def is_parsed(self): - '''Return true is the media descriptor object is parsed - \deprecated This can return true in case of failure. - Use L{get_parsed_status}() instead - See libvlc_MediaParsedChanged. - @return: true if media object has been parsed otherwise it returns false \libvlc_return_bool. - ''' - return libvlc_media_is_parsed(self) - - def get_tracks_info(self): - '''Get media descriptor's elementary streams description - Note, you need to call L{parse}() or play the media at least once - before calling this function. - Not doing this will result in an empty array. - \deprecated Use L{tracks_get}() instead. - @param tracks: address to store an allocated array of Elementary Streams descriptions (must be freed by the caller) [OUT]. - @return: the number of Elementary Streams. - ''' - return libvlc_media_get_tracks_info(self) - - def player_new_from_media(self): - '''Create a Media Player object from a Media. - @return: a new media player object, or None on error. - ''' - return libvlc_media_player_new_from_media(self) - - -class MediaDiscoverer(_Ctype): - '''N/A - ''' - - def __new__(cls, ptr=_internal_guard): - '''(INTERNAL) ctypes wrapper constructor. - ''' - return _Constructor(cls, ptr) - - def start(self): - '''Start media discovery. - To stop it, call L{stop}() or - L{list_release}() directly. - See L{stop}. - @return: -1 in case of error, 0 otherwise. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_discoverer_start(self) - - def stop(self): - '''Stop media discovery. - See L{start}. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_discoverer_stop(self) - - def release(self): - '''Release media discover object. If the reference count reaches 0, then - the object will be released. - ''' - return libvlc_media_discoverer_release(self) - - def media_list(self): - '''Get media service discover media list. - @return: list of media items. - ''' - return libvlc_media_discoverer_media_list(self) - - def is_running(self): - '''Query if media service discover object is running. - @return: true if running, false if not \libvlc_return_bool. - ''' - return libvlc_media_discoverer_is_running(self) - - def localized_name(self): - '''Get media service discover object its localized name. - \deprecated Useless, use L{list_get}() to get the - longname of the service discovery. - @return: localized name or None if the media_discoverer is not started. - ''' - return libvlc_media_discoverer_localized_name(self) - - @memoize_parameterless - def event_manager(self): - '''Get event manager from media service discover object. - \deprecated Useless, media_discoverer events are only triggered when calling - L{start}() and L{stop}(). - @return: event manager object. - ''' - return libvlc_media_discoverer_event_manager(self) - - -class MediaLibrary(_Ctype): - '''N/A - ''' - - def __new__(cls, ptr=_internal_guard): - '''(INTERNAL) ctypes wrapper constructor. - ''' - return _Constructor(cls, ptr) - - def release(self): - '''Release media library object. This functions decrements the - reference count of the media library object. If it reaches 0, - then the object will be released. - ''' - return libvlc_media_library_release(self) - - def retain(self): - '''Retain a reference to a media library object. This function will - increment the reference counting for this object. Use - L{release}() to decrement the reference count. - ''' - return libvlc_media_library_retain(self) - - def load(self): - '''Load media library. - @return: 0 on success, -1 on error. - ''' - return libvlc_media_library_load(self) - - def media_list(self): - '''Get media library subitems. - @return: media list subitems. - ''' - return libvlc_media_library_media_list(self) - - -class MediaList(_Ctype): - '''Create a new MediaList instance. - - Usage: MediaList(list_of_MRLs) - - See vlc.Instance.media_list_new documentation for details. - - ''' - - def __new__(cls, *args): - if args: - i = args[0] - if isinstance(i, _Ints): - return _Constructor(cls, i) - if isinstance(i, Instance): - return i.media_list_new(*args[1:]) - - o = get_default_instance().media_list_new(*args) - return o - - def get_instance(self): - return getattr(self, '_instance', None) - - def add_media(self, mrl): - """Add media instance to media list. - - The L{lock} should be held upon entering this function. - @param mrl: a media instance or a MRL. - @return: 0 on success, -1 if the media list is read-only. - """ - if isinstance(mrl, basestring): - mrl = (self.get_instance() or get_default_instance()).media_new(mrl) - return libvlc_media_list_add_media(self, mrl) - - def release(self): - '''Release media list created with L{new}(). - ''' - return libvlc_media_list_release(self) - - def retain(self): - '''Retain reference to a media list. - ''' - return libvlc_media_list_retain(self) - - def set_media(self, p_md): - '''Associate media instance with this media list instance. - If another media instance was present it will be released. - The L{lock} should NOT be held upon entering this function. - @param p_md: media instance to add. - ''' - return libvlc_media_list_set_media(self, p_md) - - def media(self): - '''Get media instance from this media list instance. This action will increase - the refcount on the media instance. - The L{lock} should NOT be held upon entering this function. - @return: media instance. - ''' - return libvlc_media_list_media(self) - - def insert_media(self, p_md, i_pos): - '''Insert media instance in media list on a position - The L{lock} should be held upon entering this function. - @param p_md: a media instance. - @param i_pos: position in array where to insert. - @return: 0 on success, -1 if the media list is read-only. - ''' - return libvlc_media_list_insert_media(self, p_md, i_pos) - - def remove_index(self, i_pos): - '''Remove media instance from media list on a position - The L{lock} should be held upon entering this function. - @param i_pos: position in array where to insert. - @return: 0 on success, -1 if the list is read-only or the item was not found. - ''' - return libvlc_media_list_remove_index(self, i_pos) - - def count(self): - '''Get count on media list items - The L{lock} should be held upon entering this function. - @return: number of items in media list. - ''' - return libvlc_media_list_count(self) - - def __len__(self): - return libvlc_media_list_count(self) - - def item_at_index(self, i_pos): - '''List media instance in media list at a position - The L{lock} should be held upon entering this function. - @param i_pos: position in array where to insert. - @return: media instance at position i_pos, or None if not found. In case of success, L{media_retain}() is called to increase the refcount on the media. - ''' - return libvlc_media_list_item_at_index(self, i_pos) - - def __getitem__(self, i): - return libvlc_media_list_item_at_index(self, i) - - def __iter__(self): - for i in range(len(self)): - yield self[i] - - def index_of_item(self, p_md): - '''Find index position of List media instance in media list. - Warning: the function will return the first matched position. - The L{lock} should be held upon entering this function. - @param p_md: media instance. - @return: position of media instance or -1 if media not found. - ''' - return libvlc_media_list_index_of_item(self, p_md) - - def is_readonly(self): - '''This indicates if this media list is read-only from a user point of view. - @return: 1 on readonly, 0 on readwrite \libvlc_return_bool. - ''' - return libvlc_media_list_is_readonly(self) - - def lock(self): - '''Get lock on media list items. - ''' - return libvlc_media_list_lock(self) - - def unlock(self): - '''Release lock on media list items - The L{lock} should be held upon entering this function. - ''' - return libvlc_media_list_unlock(self) - - @memoize_parameterless - def event_manager(self): - '''Get libvlc_event_manager from this media list instance. - The p_event_manager is immutable, so you don't have to hold the lock. - @return: libvlc_event_manager. - ''' - return libvlc_media_list_event_manager(self) - - -class MediaListPlayer(_Ctype): - '''Create a new MediaListPlayer instance. - - It may take as parameter either: - - a vlc.Instance - - nothing - - ''' - - def __new__(cls, arg=None): - if arg is None: - i = get_default_instance() - elif isinstance(arg, Instance): - i = arg - elif isinstance(arg, _Ints): - return _Constructor(cls, arg) - else: - raise TypeError('MediaListPlayer %r' % (arg,)) - - return i.media_list_player_new() - - def get_instance(self): - """Return the associated Instance. - """ - return self._instance # PYCHOK expected - - def release(self): - '''Release a media_list_player after use - Decrement the reference count of a media player object. If the - reference count is 0, then L{release}() will - release the media player object. If the media player object - has been released, then it should not be used again. - ''' - return libvlc_media_list_player_release(self) - - def retain(self): - '''Retain a reference to a media player list object. Use - L{release}() to decrement reference count. - ''' - return libvlc_media_list_player_retain(self) - - @memoize_parameterless - def event_manager(self): - '''Return the event manager of this media_list_player. - @return: the event manager. - ''' - return libvlc_media_list_player_event_manager(self) - - def set_media_player(self, p_mi): - '''Replace media player in media_list_player with this instance. - @param p_mi: media player instance. - ''' - return libvlc_media_list_player_set_media_player(self, p_mi) - - def get_media_player(self): - '''Get media player of the media_list_player instance. - @return: media player instance @note the caller is responsible for releasing the returned instance. - ''' - return libvlc_media_list_player_get_media_player(self) - - def set_media_list(self, p_mlist): - '''Set the media list associated with the player. - @param p_mlist: list of media. - ''' - return libvlc_media_list_player_set_media_list(self, p_mlist) - - def play(self): - '''Play media list. - ''' - return libvlc_media_list_player_play(self) - - def pause(self): - '''Toggle pause (or resume) media list. - ''' - return libvlc_media_list_player_pause(self) - - def set_pause(self, do_pause): - '''Pause or resume media list. - @param do_pause: play/resume if zero, pause if non-zero. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_list_player_set_pause(self, do_pause) - - def is_playing(self): - '''Is media list playing? - @return: true for playing and false for not playing \libvlc_return_bool. - ''' - return libvlc_media_list_player_is_playing(self) - - def get_state(self): - '''Get current libvlc_state of media list player. - @return: L{State} for media list player. - ''' - return libvlc_media_list_player_get_state(self) - - def play_item_at_index(self, i_index): - '''Play media list item at position index. - @param i_index: index in media list to play. - @return: 0 upon success -1 if the item wasn't found. - ''' - return libvlc_media_list_player_play_item_at_index(self, i_index) - - def __getitem__(self, i): - return libvlc_media_list_player_play_item_at_index(self, i) - - def __iter__(self): - for i in range(len(self)): - yield self[i] - - def play_item(self, p_md): - '''Play the given media item. - @param p_md: the media instance. - @return: 0 upon success, -1 if the media is not part of the media list. - ''' - return libvlc_media_list_player_play_item(self, p_md) - - def stop(self): - '''Stop playing media list. - ''' - return libvlc_media_list_player_stop(self) - - def next(self): - '''Play next item from media list. - @return: 0 upon success -1 if there is no next item. - ''' - return libvlc_media_list_player_next(self) - - def previous(self): - '''Play previous item from media list. - @return: 0 upon success -1 if there is no previous item. - ''' - return libvlc_media_list_player_previous(self) - - def set_playback_mode(self, e_mode): - '''Sets the playback mode for the playlist. - @param e_mode: playback mode specification. - ''' - return libvlc_media_list_player_set_playback_mode(self, e_mode) - - -class MediaPlayer(_Ctype): - '''Create a new MediaPlayer instance. - - It may take as parameter either: - - a string (media URI), options... In this case, a vlc.Instance will be created. - - a vlc.Instance, a string (media URI), options... - - ''' - - def __new__(cls, *args): - if len(args) == 1 and isinstance(args[0], _Ints): - return _Constructor(cls, args[0]) - - if args and isinstance(args[0], Instance): - instance = args[0] - args = args[1:] - else: - instance = get_default_instance() - - o = instance.media_player_new() - if args: - o.set_media(instance.media_new(*args)) - return o - - def get_instance(self): - """Return the associated Instance. - """ - return self._instance # PYCHOK expected - - def set_mrl(self, mrl, *options): - """Set the MRL to play. - - Warning: most audio and video options, such as text renderer, - have no effects on an individual media. These options must be - set at the vlc.Instance or vlc.MediaPlayer instanciation. - - @param mrl: The MRL - @param options: optional media option=value strings - @return: the Media object - """ - m = self.get_instance().media_new(mrl, *options) - self.set_media(m) - return m - - def video_get_spu_description(self): - """Get the description of available video subtitles. - """ - return track_description_list(libvlc_video_get_spu_description(self)) - - def video_get_title_description(self): - """Get the description of available titles. - """ - return track_description_list(libvlc_video_get_title_description(self)) - - def video_get_chapter_description(self, title): - """Get the description of available chapters for specific title. - - @param title: selected title (int) - """ - return track_description_list(libvlc_video_get_chapter_description(self, title)) - - def video_get_track_description(self): - """Get the description of available video tracks. - """ - return track_description_list(libvlc_video_get_track_description(self)) - - def audio_get_track_description(self): - """Get the description of available audio tracks. - """ - return track_description_list(libvlc_audio_get_track_description(self)) - - def get_full_title_descriptions(self): - '''Get the full description of available titles. - @return: the titles list - @version: LibVLC 3.0.0 and later. - ''' - titleDescription_pp = ctypes.POINTER(TitleDescription)() - n = libvlc_media_player_get_full_title_descriptions(self, ctypes.byref(titleDescription_pp)) - info = ctypes.cast(titleDescription_pp, ctypes.POINTER(ctypes.POINTER(TitleDescription) * n)) - try: - contents = info.contents - except ValueError: - # Media not parsed, no info. - return None - descr = (contents[i].contents for i in range(len(contents))) - return descr - - def get_full_chapter_descriptions(self, i_chapters_of_title): - '''Get the full description of available chapters. - @param i_chapters_of_title: index of the title to query for chapters (uses current title if set to -1). - @return: the chapters list - @version: LibVLC 3.0.0 and later. - ''' - chapterDescription_pp = ctypes.POINTER(ChapterDescription)() - n = libvlc_media_player_get_full_chapter_descriptions(self, ctypes.byref(chapterDescription_pp)) - info = ctypes.cast(chapterDescription_pp, ctypes.POINTER(ctypes.POINTER(ChapterDescription) * n)) - try: - contents = info.contents - except ValueError: - # Media not parsed, no info. - return None - descr = (contents[i].contents for i in range(len(contents))) - return descr - - def video_get_size(self, num=0): - """Get the video size in pixels as 2-tuple (width, height). - - @param num: video number (default 0). - """ - r = libvlc_video_get_size(self, num) - if isinstance(r, tuple) and len(r) == 2: - return r - else: - raise VLCException('invalid video number (%s)' % (num,)) - - def set_hwnd(self, drawable): - """Set a Win32/Win64 API window handle (HWND). - - Specify where the media player should render its video - output. If LibVLC was built without Win32/Win64 API output - support, then this has no effects. - - @param drawable: windows handle of the drawable. - """ - if not isinstance(drawable, ctypes.c_void_p): - drawable = ctypes.c_void_p(int(drawable)) - libvlc_media_player_set_hwnd(self, drawable) - - def video_get_width(self, num=0): - """Get the width of a video in pixels. - - @param num: video number (default 0). - """ - return self.video_get_size(num)[0] - - def video_get_height(self, num=0): - """Get the height of a video in pixels. - - @param num: video number (default 0). - """ - return self.video_get_size(num)[1] - - def video_get_cursor(self, num=0): - """Get the mouse pointer coordinates over a video as 2-tuple (x, y). - - Coordinates are expressed in terms of the decoded video resolution, - B{not} in terms of pixels on the screen/viewport. To get the - latter, you must query your windowing system directly. - - Either coordinate may be negative or larger than the corresponding - size of the video, if the cursor is outside the rendering area. - - @warning: The coordinates may be out-of-date if the pointer is not - located on the video rendering area. LibVLC does not track the - mouse pointer if the latter is outside the video widget. - - @note: LibVLC does not support multiple mouse pointers (but does - support multiple input devices sharing the same pointer). - - @param num: video number (default 0). - """ - r = libvlc_video_get_cursor(self, num) - if isinstance(r, tuple) and len(r) == 2: - return r - raise VLCException('invalid video number (%s)' % (num,)) - - def get_fps(self): - '''Get movie fps rate - This function is provided for backward compatibility. It cannot deal with - multiple video tracks. In LibVLC versions prior to 3.0, it would also fail - if the file format did not convey the frame rate explicitly. - \deprecated Consider using L{media_tracks_get}() instead. - @return: frames per second (fps) for this playing movie, or 0 if unspecified. - ''' - return libvlc_media_player_get_fps(self) - - def set_agl(self, drawable): - '''\deprecated Use L{set_nsobject}() instead. - ''' - return libvlc_media_player_set_agl(self, drawable) - - def get_agl(self): - '''\deprecated Use L{get_nsobject}() instead. - ''' - return libvlc_media_player_get_agl(self) - - def video_set_subtitle_file(self, psz_subtitle): - '''Set new video subtitle file. - \deprecated Use L{add_slave}() instead. - @param psz_subtitle: new video subtitle file. - @return: the success status (boolean). - ''' - return libvlc_video_set_subtitle_file(self, str_to_bytes(psz_subtitle)) - - def toggle_teletext(self): - '''Toggle teletext transparent status on video output. - \deprecated use L{video_set_teletext}() instead. - ''' - return libvlc_toggle_teletext(self) - - def release(self): - '''Release a media_player after use - Decrement the reference count of a media player object. If the - reference count is 0, then L{release}() will - release the media player object. If the media player object - has been released, then it should not be used again. - ''' - return libvlc_media_player_release(self) - - def retain(self): - '''Retain a reference to a media player object. Use - L{release}() to decrement reference count. - ''' - return libvlc_media_player_retain(self) - - def set_media(self, p_md): - '''Set the media that will be used by the media_player. If any, - previous md will be released. - @param p_md: the Media. Afterwards the p_md can be safely destroyed. - ''' - return libvlc_media_player_set_media(self, p_md) - - def get_media(self): - '''Get the media used by the media_player. - @return: the media associated with p_mi, or None if no media is associated. - ''' - return libvlc_media_player_get_media(self) - - @memoize_parameterless - def event_manager(self): - '''Get the Event Manager from which the media player send event. - @return: the event manager associated with p_mi. - ''' - return libvlc_media_player_event_manager(self) - - def is_playing(self): - '''is_playing. - @return: 1 if the media player is playing, 0 otherwise \libvlc_return_bool. - ''' - return libvlc_media_player_is_playing(self) - - def play(self): - '''Play. - @return: 0 if playback started (and was already started), or -1 on error. - ''' - return libvlc_media_player_play(self) - - def set_pause(self, do_pause): - '''Pause or resume (no effect if there is no media). - @param do_pause: play/resume if zero, pause if non-zero. - @version: LibVLC 1.1.1 or later. - ''' - return libvlc_media_player_set_pause(self, do_pause) - - def pause(self): - '''Toggle pause (no effect if there is no media). - ''' - return libvlc_media_player_pause(self) - - def stop(self): - '''Stop (no effect if there is no media). - ''' - return libvlc_media_player_stop(self) - - def set_renderer(self, p_item): - '''Set a renderer to the media player - @note: must be called before the first call of L{play}() to - take effect. - See L{renderer_discoverer_new}. - @param p_item: an item discovered by L{renderer_discoverer_start}(). - @return: 0 on success, -1 on error. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_player_set_renderer(self, p_item) - - def video_set_callbacks(self, lock, unlock, display, opaque): - '''Set callbacks and private data to render decoded video to a custom area - in memory. - Use L{video_set_format}() or L{video_set_format_callbacks}() - to configure the decoded format. - @warning: Rendering video into custom memory buffers is considerably less - efficient than rendering in a custom window as normal. - For optimal perfomances, VLC media player renders into a custom window, and - does not use this function and associated callbacks. It is B{highly - recommended} that other LibVLC-based application do likewise. - To embed video in a window, use libvlc_media_player_set_xid() or equivalent - depending on the operating system. - If window embedding does not fit the application use case, then a custom - LibVLC video output display plugin is required to maintain optimal video - rendering performances. - The following limitations affect performance: - - Hardware video decoding acceleration will either be disabled completely, - or require (relatively slow) copy from video/DSP memory to main memory. - - Sub-pictures (subtitles, on-screen display, etc.) must be blent into the - main picture by the CPU instead of the GPU. - - Depending on the video format, pixel format conversion, picture scaling, - cropping and/or picture re-orientation, must be performed by the CPU - instead of the GPU. - - Memory copying is required between LibVLC reference picture buffers and - application buffers (between lock and unlock callbacks). - @param lock: callback to lock video memory (must not be None). - @param unlock: callback to unlock video memory (or None if not needed). - @param display: callback to display video (or None if not needed). - @param opaque: private pointer for the three callbacks (as first parameter). - @version: LibVLC 1.1.1 or later. - ''' - return libvlc_video_set_callbacks(self, lock, unlock, display, opaque) - - def video_set_format(self, chroma, width, height, pitch): - '''Set decoded video chroma and dimensions. - This only works in combination with L{video_set_callbacks}(), - and is mutually exclusive with L{video_set_format_callbacks}(). - @param chroma: a four-characters string identifying the chroma (e.g. "RV32" or "YUYV"). - @param width: pixel width. - @param height: pixel height. - @param pitch: line pitch (in bytes). - @version: LibVLC 1.1.1 or later. - @bug: All pixel planes are expected to have the same pitch. To use the YCbCr color space with chrominance subsampling, consider using L{video_set_format_callbacks}() instead. - ''' - return libvlc_video_set_format(self, str_to_bytes(chroma), width, height, pitch) - - def video_set_format_callbacks(self, setup, cleanup): - '''Set decoded video chroma and dimensions. This only works in combination with - L{video_set_callbacks}(). - @param setup: callback to select the video format (cannot be None). - @param cleanup: callback to release any allocated resources (or None). - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_video_set_format_callbacks(self, setup, cleanup) - - def set_nsobject(self, drawable): - '''Set the NSView handler where the media player should render its video output. - Use the vout called "macosx". - The drawable is an NSObject that follow the VLCOpenGLVideoViewEmbedding - protocol: - @code.m - \@protocol VLCOpenGLVideoViewEmbedding - - (void)addVoutSubview:(NSView *)view; - - (void)removeVoutSubview:(NSView *)view; - \@end - @endcode - Or it can be an NSView object. - If you want to use it along with Qt see the QMacCocoaViewContainer. Then - the following code should work: - @code.mm - - NSView *video = [[NSView alloc] init]; - QMacCocoaViewContainer *container = new QMacCocoaViewContainer(video, parent); - L{set_nsobject}(mp, video); - [video release]; - - @endcode - You can find a live example in VLCVideoView in VLCKit.framework. - @param drawable: the drawable that is either an NSView or an object following the VLCOpenGLVideoViewEmbedding protocol. - ''' - return libvlc_media_player_set_nsobject(self, drawable) - - def get_nsobject(self): - '''Get the NSView handler previously set with L{set_nsobject}(). - @return: the NSView handler or 0 if none where set. - ''' - return libvlc_media_player_get_nsobject(self) - - def set_xwindow(self, drawable): - '''Set an X Window System drawable where the media player should render its - video output. The call takes effect when the playback starts. If it is - already started, it might need to be stopped before changes apply. - If LibVLC was built without X11 output support, then this function has no - effects. - By default, LibVLC will capture input events on the video rendering area. - Use L{video_set_mouse_input}() and L{video_set_key_input}() to - disable that and deliver events to the parent window / to the application - instead. By design, the X11 protocol delivers input events to only one - recipient. - @warning - The application must call the XInitThreads() function from Xlib before - L{new}(), and before any call to XOpenDisplay() directly or via any - other library. Failure to call XInitThreads() will seriously impede LibVLC - performance. Calling XOpenDisplay() before XInitThreads() will eventually - crash the process. That is a limitation of Xlib. - @param drawable: X11 window ID @note The specified identifier must correspond to an existing Input/Output class X11 window. Pixmaps are B{not} currently supported. The default X11 server is assumed, i.e. that specified in the DISPLAY environment variable. @warning LibVLC can deal with invalid X11 handle errors, however some display drivers (EGL, GLX, VA and/or VDPAU) can unfortunately not. Thus the window handle must remain valid until playback is stopped, otherwise the process may abort or crash. - @bug No more than one window handle per media player instance can be specified. If the media has multiple simultaneously active video tracks, extra tracks will be rendered into external windows beyond the control of the application. - ''' - return libvlc_media_player_set_xwindow(self, drawable) - - def get_xwindow(self): - '''Get the X Window System window identifier previously set with - L{set_xwindow}(). Note that this will return the identifier - even if VLC is not currently using it (for instance if it is playing an - audio-only input). - @return: an X window ID, or 0 if none where set. - ''' - return libvlc_media_player_get_xwindow(self) - - def get_hwnd(self): - '''Get the Windows API window handle (HWND) previously set with - L{set_hwnd}(). The handle will be returned even if LibVLC - is not currently outputting any video to it. - @return: a window handle or None if there are none. - ''' - return libvlc_media_player_get_hwnd(self) - - def set_android_context(self, p_awindow_handler): - '''Set the android context. - @param p_awindow_handler: org.videolan.libvlc.AWindow jobject owned by the org.videolan.libvlc.MediaPlayer class from the libvlc-android project. - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_player_set_android_context(self, p_awindow_handler) - - def set_evas_object(self, p_evas_object): - '''Set the EFL Evas Object. - @param p_evas_object: a valid EFL Evas Object (Evas_Object). - @return: -1 if an error was detected, 0 otherwise. - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_player_set_evas_object(self, p_evas_object) - - def audio_set_callbacks(self, play, pause, resume, flush, drain, opaque): - '''Sets callbacks and private data for decoded audio. - Use L{audio_set_format}() or L{audio_set_format_callbacks}() - to configure the decoded audio format. - @note: The audio callbacks override any other audio output mechanism. - If the callbacks are set, LibVLC will B{not} output audio in any way. - @param play: callback to play audio samples (must not be None). - @param pause: callback to pause playback (or None to ignore). - @param resume: callback to resume playback (or None to ignore). - @param flush: callback to flush audio buffers (or None to ignore). - @param drain: callback to drain audio buffers (or None to ignore). - @param opaque: private pointer for the audio callbacks (as first parameter). - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_audio_set_callbacks(self, play, pause, resume, flush, drain, opaque) - - def audio_set_volume_callback(self, set_volume): - '''Set callbacks and private data for decoded audio. This only works in - combination with L{audio_set_callbacks}(). - Use L{audio_set_format}() or L{audio_set_format_callbacks}() - to configure the decoded audio format. - @param set_volume: callback to apply audio volume, or None to apply volume in software. - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_audio_set_volume_callback(self, set_volume) - - def audio_set_format_callbacks(self, setup, cleanup): - '''Sets decoded audio format via callbacks. - This only works in combination with L{audio_set_callbacks}(). - @param setup: callback to select the audio format (cannot be None). - @param cleanup: callback to release any allocated resources (or None). - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_audio_set_format_callbacks(self, setup, cleanup) - - def audio_set_format(self, format, rate, channels): - '''Sets a fixed decoded audio format. - This only works in combination with L{audio_set_callbacks}(), - and is mutually exclusive with L{audio_set_format_callbacks}(). - @param format: a four-characters string identifying the sample format (e.g. "S16N" or "FL32"). - @param rate: sample rate (expressed in Hz). - @param channels: channels count. - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_audio_set_format(self, str_to_bytes(format), rate, channels) - - def get_length(self): - '''Get the current movie length (in ms). - @return: the movie length (in ms), or -1 if there is no media. - ''' - return libvlc_media_player_get_length(self) - - def get_time(self): - '''Get the current movie time (in ms). - @return: the movie time (in ms), or -1 if there is no media. - ''' - return libvlc_media_player_get_time(self) - - def set_time(self, i_time): - '''Set the movie time (in ms). This has no effect if no media is being played. - Not all formats and protocols support this. - @param i_time: the movie time (in ms). - ''' - return libvlc_media_player_set_time(self, i_time) - - def get_position(self): - '''Get movie position as percentage between 0.0 and 1.0. - @return: movie position, or -1. in case of error. - ''' - return libvlc_media_player_get_position(self) - - def set_position(self, f_pos): - '''Set movie position as percentage between 0.0 and 1.0. - This has no effect if playback is not enabled. - This might not work depending on the underlying input format and protocol. - @param f_pos: the position. - ''' - return libvlc_media_player_set_position(self, f_pos) - - def set_chapter(self, i_chapter): - '''Set movie chapter (if applicable). - @param i_chapter: chapter number to play. - ''' - return libvlc_media_player_set_chapter(self, i_chapter) - - def get_chapter(self): - '''Get movie chapter. - @return: chapter number currently playing, or -1 if there is no media. - ''' - return libvlc_media_player_get_chapter(self) - - def get_chapter_count(self): - '''Get movie chapter count. - @return: number of chapters in movie, or -1. - ''' - return libvlc_media_player_get_chapter_count(self) - - def will_play(self): - '''Is the player able to play. - @return: boolean \libvlc_return_bool. - ''' - return libvlc_media_player_will_play(self) - - def get_chapter_count_for_title(self, i_title): - '''Get title chapter count. - @param i_title: title. - @return: number of chapters in title, or -1. - ''' - return libvlc_media_player_get_chapter_count_for_title(self, i_title) - - def set_title(self, i_title): - '''Set movie title. - @param i_title: title number to play. - ''' - return libvlc_media_player_set_title(self, i_title) - - def get_title(self): - '''Get movie title. - @return: title number currently playing, or -1. - ''' - return libvlc_media_player_get_title(self) - - def get_title_count(self): - '''Get movie title count. - @return: title number count, or -1. - ''' - return libvlc_media_player_get_title_count(self) - - def previous_chapter(self): - '''Set previous chapter (if applicable). - ''' - return libvlc_media_player_previous_chapter(self) - - def next_chapter(self): - '''Set next chapter (if applicable). - ''' - return libvlc_media_player_next_chapter(self) - - def get_rate(self): - '''Get the requested movie play rate. - @warning: Depending on the underlying media, the requested rate may be - different from the real playback rate. - @return: movie play rate. - ''' - return libvlc_media_player_get_rate(self) - - def set_rate(self, rate): - '''Set movie play rate. - @param rate: movie play rate to set. - @return: -1 if an error was detected, 0 otherwise (but even then, it might not actually work depending on the underlying media protocol). - ''' - return libvlc_media_player_set_rate(self, rate) - - def get_state(self): - '''Get current movie state. - @return: the current state of the media player (playing, paused, ...) See L{State}. - ''' - return libvlc_media_player_get_state(self) - - def has_vout(self): - '''How many video outputs does this media player have? - @return: the number of video outputs. - ''' - return libvlc_media_player_has_vout(self) - - def is_seekable(self): - '''Is this media player seekable? - @return: true if the media player can seek \libvlc_return_bool. - ''' - return libvlc_media_player_is_seekable(self) - - def can_pause(self): - '''Can this media player be paused? - @return: true if the media player can pause \libvlc_return_bool. - ''' - return libvlc_media_player_can_pause(self) - - def program_scrambled(self): - '''Check if the current program is scrambled. - @return: true if the current program is scrambled \libvlc_return_bool. - @version: LibVLC 2.2.0 or later. - ''' - return libvlc_media_player_program_scrambled(self) - - def next_frame(self): - '''Display the next frame (if supported). - ''' - return libvlc_media_player_next_frame(self) - - def navigate(self, navigate): - '''Navigate through DVD Menu. - @param navigate: the Navigation mode. - @version: libVLC 2.0.0 or later. - ''' - return libvlc_media_player_navigate(self, navigate) - - def set_video_title_display(self, position, timeout): - '''Set if, and how, the video title will be shown when media is played. - @param position: position at which to display the title, or libvlc_position_disable to prevent the title from being displayed. - @param timeout: title display timeout in milliseconds (ignored if libvlc_position_disable). - @version: libVLC 2.1.0 or later. - ''' - return libvlc_media_player_set_video_title_display(self, position, timeout) - - def add_slave(self, i_type, psz_uri, b_select): - '''Add a slave to the current media player. - @note: If the player is playing, the slave will be added directly. This call - will also update the slave list of the attached L{Media}. - @param i_type: subtitle or audio. - @param psz_uri: Uri of the slave (should contain a valid scheme). - @param b_select: True if this slave should be selected when it's loaded. - @return: 0 on success, -1 on error. - @version: LibVLC 3.0.0 and later. See L{media_slaves_add}. - ''' - return libvlc_media_player_add_slave(self, i_type, str_to_bytes(psz_uri), b_select) - - def toggle_fullscreen(self): - '''Toggle fullscreen status on non-embedded video outputs. - @warning: The same limitations applies to this function - as to L{set_fullscreen}(). - ''' - return libvlc_toggle_fullscreen(self) - - def set_fullscreen(self, b_fullscreen): - '''Enable or disable fullscreen. - @warning: With most window managers, only a top-level windows can be in - full-screen mode. Hence, this function will not operate properly if - L{set_xwindow}() was used to embed the video in a - non-top-level window. In that case, the embedding window must be reparented - to the root window B{before} fullscreen mode is enabled. You will want - to reparent it back to its normal parent when disabling fullscreen. - @param b_fullscreen: boolean for fullscreen status. - ''' - return libvlc_set_fullscreen(self, b_fullscreen) - - def get_fullscreen(self): - '''Get current fullscreen status. - @return: the fullscreen status (boolean) \libvlc_return_bool. - ''' - return libvlc_get_fullscreen(self) - - def video_set_key_input(self, on): - '''Enable or disable key press events handling, according to the LibVLC hotkeys - configuration. By default and for historical reasons, keyboard events are - handled by the LibVLC video widget. - @note: On X11, there can be only one subscriber for key press and mouse - click events per window. If your application has subscribed to those events - for the X window ID of the video widget, then LibVLC will not be able to - handle key presses and mouse clicks in any case. - @warning: This function is only implemented for X11 and Win32 at the moment. - @param on: true to handle key press events, false to ignore them. - ''' - return libvlc_video_set_key_input(self, on) - - def video_set_mouse_input(self, on): - '''Enable or disable mouse click events handling. By default, those events are - handled. This is needed for DVD menus to work, as well as a few video - filters such as "puzzle". - See L{video_set_key_input}(). - @warning: This function is only implemented for X11 and Win32 at the moment. - @param on: true to handle mouse click events, false to ignore them. - ''' - return libvlc_video_set_mouse_input(self, on) - - def video_get_scale(self): - '''Get the current video scaling factor. - See also L{video_set_scale}(). - @return: the currently configured zoom factor, or 0. if the video is set to fit to the output window/drawable automatically. - ''' - return libvlc_video_get_scale(self) - - def video_set_scale(self, f_factor): - '''Set the video scaling factor. That is the ratio of the number of pixels on - screen to the number of pixels in the original decoded video in each - dimension. Zero is a special value; it will adjust the video to the output - window/drawable (in windowed mode) or the entire screen. - Note that not all video outputs support scaling. - @param f_factor: the scaling factor, or zero. - ''' - return libvlc_video_set_scale(self, f_factor) - - def video_get_aspect_ratio(self): - '''Get current video aspect ratio. - @return: the video aspect ratio or None if unspecified (the result must be released with free() or L{free}()). - ''' - return libvlc_video_get_aspect_ratio(self) - - def video_set_aspect_ratio(self, psz_aspect): - '''Set new video aspect ratio. - @param psz_aspect: new video aspect-ratio or None to reset to default @note Invalid aspect ratios are ignored. - ''' - return libvlc_video_set_aspect_ratio(self, str_to_bytes(psz_aspect)) - - def video_update_viewpoint(self, p_viewpoint, b_absolute): - '''Update the video viewpoint information. - @note: It is safe to call this function before the media player is started. - @param p_viewpoint: video viewpoint allocated via L{video_new_viewpoint}(). - @param b_absolute: if true replace the old viewpoint with the new one. If false, increase/decrease it. - @return: -1 in case of error, 0 otherwise @note the values are set asynchronously, it will be used by the next frame displayed. - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_video_update_viewpoint(self, p_viewpoint, b_absolute) - - def video_get_spu(self): - '''Get current video subtitle. - @return: the video subtitle selected, or -1 if none. - ''' - return libvlc_video_get_spu(self) - - def video_get_spu_count(self): - '''Get the number of available video subtitles. - @return: the number of available video subtitles. - ''' - return libvlc_video_get_spu_count(self) - - def video_set_spu(self, i_spu): - '''Set new video subtitle. - @param i_spu: video subtitle track to select (i_id from track description). - @return: 0 on success, -1 if out of range. - ''' - return libvlc_video_set_spu(self, i_spu) - - def video_get_spu_delay(self): - '''Get the current subtitle delay. Positive values means subtitles are being - displayed later, negative values earlier. - @return: time (in microseconds) the display of subtitles is being delayed. - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_video_get_spu_delay(self) - - def video_set_spu_delay(self, i_delay): - '''Set the subtitle delay. This affects the timing of when the subtitle will - be displayed. Positive values result in subtitles being displayed later, - while negative values will result in subtitles being displayed earlier. - The subtitle delay will be reset to zero each time the media changes. - @param i_delay: time (in microseconds) the display of subtitles should be delayed. - @return: 0 on success, -1 on error. - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_video_set_spu_delay(self, i_delay) - - def video_get_crop_geometry(self): - '''Get current crop filter geometry. - @return: the crop filter geometry or None if unset. - ''' - return libvlc_video_get_crop_geometry(self) - - def video_set_crop_geometry(self, psz_geometry): - '''Set new crop filter geometry. - @param psz_geometry: new crop filter geometry (None to unset). - ''' - return libvlc_video_set_crop_geometry(self, str_to_bytes(psz_geometry)) - - def video_get_teletext(self): - '''Get current teletext page requested or 0 if it's disabled. - Teletext is disabled by default, call L{video_set_teletext}() to enable - it. - @return: the current teletext page requested. - ''' - return libvlc_video_get_teletext(self) - - def video_set_teletext(self, i_page): - '''Set new teletext page to retrieve. - This function can also be used to send a teletext key. - @param i_page: teletex page number requested. This value can be 0 to disable teletext, a number in the range ]0;1000[ to show the requested page, or a \ref L{TeletextKey}. 100 is the default teletext page. - ''' - return libvlc_video_set_teletext(self, i_page) - - def video_get_track_count(self): - '''Get number of available video tracks. - @return: the number of available video tracks (int). - ''' - return libvlc_video_get_track_count(self) - - def video_get_track(self): - '''Get current video track. - @return: the video track ID (int) or -1 if no active input. - ''' - return libvlc_video_get_track(self) - - def video_set_track(self, i_track): - '''Set video track. - @param i_track: the track ID (i_id field from track description). - @return: 0 on success, -1 if out of range. - ''' - return libvlc_video_set_track(self, i_track) - - def video_take_snapshot(self, num, psz_filepath, i_width, i_height): - '''Take a snapshot of the current video window. - If i_width AND i_height is 0, original size is used. - If i_width XOR i_height is 0, original aspect-ratio is preserved. - @param num: number of video output (typically 0 for the first/only one). - @param psz_filepath: the path of a file or a folder to save the screenshot into. - @param i_width: the snapshot's width. - @param i_height: the snapshot's height. - @return: 0 on success, -1 if the video was not found. - ''' - return libvlc_video_take_snapshot(self, num, str_to_bytes(psz_filepath), i_width, i_height) - - def video_set_deinterlace(self, psz_mode): - '''Enable or disable deinterlace filter. - @param psz_mode: type of deinterlace filter, None to disable. - ''' - return libvlc_video_set_deinterlace(self, str_to_bytes(psz_mode)) - - def video_get_marquee_int(self, option): - '''Get an integer marquee option value. - @param option: marq option to get See libvlc_video_marquee_int_option_t. - ''' - return libvlc_video_get_marquee_int(self, option) - - def video_get_marquee_string(self, option): - '''Get a string marquee option value. - @param option: marq option to get See libvlc_video_marquee_string_option_t. - ''' - return libvlc_video_get_marquee_string(self, option) - - def video_set_marquee_int(self, option, i_val): - '''Enable, disable or set an integer marquee option - Setting libvlc_marquee_Enable has the side effect of enabling (arg !0) - or disabling (arg 0) the marq filter. - @param option: marq option to set See libvlc_video_marquee_int_option_t. - @param i_val: marq option value. - ''' - return libvlc_video_set_marquee_int(self, option, i_val) - - def video_set_marquee_string(self, option, psz_text): - '''Set a marquee string option. - @param option: marq option to set See libvlc_video_marquee_string_option_t. - @param psz_text: marq option value. - ''' - return libvlc_video_set_marquee_string(self, option, str_to_bytes(psz_text)) - - def video_get_logo_int(self, option): - '''Get integer logo option. - @param option: logo option to get, values of L{VideoLogoOption}. - ''' - return libvlc_video_get_logo_int(self, option) - - def video_set_logo_int(self, option, value): - '''Set logo option as integer. Options that take a different type value - are ignored. - Passing libvlc_logo_enable as option value has the side effect of - starting (arg !0) or stopping (arg 0) the logo filter. - @param option: logo option to set, values of L{VideoLogoOption}. - @param value: logo option value. - ''' - return libvlc_video_set_logo_int(self, option, value) - - def video_set_logo_string(self, option, psz_value): - '''Set logo option as string. Options that take a different type value - are ignored. - @param option: logo option to set, values of L{VideoLogoOption}. - @param psz_value: logo option value. - ''' - return libvlc_video_set_logo_string(self, option, str_to_bytes(psz_value)) - - def video_get_adjust_int(self, option): - '''Get integer adjust option. - @param option: adjust option to get, values of L{VideoAdjustOption}. - @version: LibVLC 1.1.1 and later. - ''' - return libvlc_video_get_adjust_int(self, option) - - def video_set_adjust_int(self, option, value): - '''Set adjust option as integer. Options that take a different type value - are ignored. - Passing libvlc_adjust_enable as option value has the side effect of - starting (arg !0) or stopping (arg 0) the adjust filter. - @param option: adust option to set, values of L{VideoAdjustOption}. - @param value: adjust option value. - @version: LibVLC 1.1.1 and later. - ''' - return libvlc_video_set_adjust_int(self, option, value) - - def video_get_adjust_float(self, option): - '''Get float adjust option. - @param option: adjust option to get, values of L{VideoAdjustOption}. - @version: LibVLC 1.1.1 and later. - ''' - return libvlc_video_get_adjust_float(self, option) - - def video_set_adjust_float(self, option, value): - '''Set adjust option as float. Options that take a different type value - are ignored. - @param option: adust option to set, values of L{VideoAdjustOption}. - @param value: adjust option value. - @version: LibVLC 1.1.1 and later. - ''' - return libvlc_video_set_adjust_float(self, option, value) - - def audio_output_set(self, psz_name): - '''Selects an audio output module. - @note: Any change will take be effect only after playback is stopped and - restarted. Audio output cannot be changed while playing. - @param psz_name: name of audio output, use psz_name of See L{AudioOutput}. - @return: 0 if function succeeded, -1 on error. - ''' - return libvlc_audio_output_set(self, str_to_bytes(psz_name)) - - def audio_output_device_enum(self): - '''Gets a list of potential audio output devices, - See L{audio_output_device_set}(). - @note: Not all audio outputs support enumerating devices. - The audio output may be functional even if the list is empty (None). - @note: The list may not be exhaustive. - @warning: Some audio output devices in the list might not actually work in - some circumstances. By default, it is recommended to not specify any - explicit audio device. - @return: A None-terminated linked list of potential audio output devices. It must be freed with L{audio_output_device_list_release}(). - @version: LibVLC 2.2.0 or later. - ''' - return libvlc_audio_output_device_enum(self) - - def audio_output_device_set(self, module, device_id): - '''Configures an explicit audio output device. - If the module paramater is None, audio output will be moved to the device - specified by the device identifier string immediately. This is the - recommended usage. - A list of adequate potential device strings can be obtained with - L{audio_output_device_enum}(). - However passing None is supported in LibVLC version 2.2.0 and later only; - in earlier versions, this function would have no effects when the module - parameter was None. - If the module parameter is not None, the device parameter of the - corresponding audio output, if it exists, will be set to the specified - string. Note that some audio output modules do not have such a parameter - (notably MMDevice and PulseAudio). - A list of adequate potential device strings can be obtained with - L{audio_output_device_list_get}(). - @note: This function does not select the specified audio output plugin. - L{audio_output_set}() is used for that purpose. - @warning: The syntax for the device parameter depends on the audio output. - Some audio output modules require further parameters (e.g. a channels map - in the case of ALSA). - @param module: If None, current audio output module. if non-None, name of audio output module. - @param device_id: device identifier string. - @return: Nothing. Errors are ignored (this is a design bug). - ''' - return libvlc_audio_output_device_set(self, str_to_bytes(module), str_to_bytes(device_id)) - - def audio_output_device_get(self): - '''Get the current audio output device identifier. - This complements L{audio_output_device_set}(). - @warning: The initial value for the current audio output device identifier - may not be set or may be some unknown value. A LibVLC application should - compare this value against the known device identifiers (e.g. those that - were previously retrieved by a call to L{audio_output_device_enum} or - L{audio_output_device_list_get}) to find the current audio output device. - It is possible that the selected audio output device changes (an external - change) without a call to L{audio_output_device_set}. That may make this - method unsuitable to use if a LibVLC application is attempting to track - dynamic audio device changes as they happen. - @return: the current audio output device identifier None if no device is selected or in case of error (the result must be released with free() or L{free}()). - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_audio_output_device_get(self) - - def audio_toggle_mute(self): - '''Toggle mute status. - ''' - return libvlc_audio_toggle_mute(self) - - def audio_get_mute(self): - '''Get current mute status. - @return: the mute status (boolean) if defined, -1 if undefined/unapplicable. - ''' - return libvlc_audio_get_mute(self) - - def audio_set_mute(self, status): - '''Set mute status. - @param status: If status is true then mute, otherwise unmute @warning This function does not always work. If there are no active audio playback stream, the mute status might not be available. If digital pass-through (S/PDIF, HDMI...) is in use, muting may be unapplicable. Also some audio output plugins do not support muting at all. @note To force silent playback, disable all audio tracks. This is more efficient and reliable than mute. - ''' - return libvlc_audio_set_mute(self, status) - - def audio_get_volume(self): - '''Get current software audio volume. - @return: the software volume in percents (0 = mute, 100 = nominal / 0dB). - ''' - return libvlc_audio_get_volume(self) - - def audio_set_volume(self, i_volume): - '''Set current software audio volume. - @param i_volume: the volume in percents (0 = mute, 100 = 0dB). - @return: 0 if the volume was set, -1 if it was out of range. - ''' - return libvlc_audio_set_volume(self, i_volume) - - def audio_get_track_count(self): - '''Get number of available audio tracks. - @return: the number of available audio tracks (int), or -1 if unavailable. - ''' - return libvlc_audio_get_track_count(self) - - def audio_get_track(self): - '''Get current audio track. - @return: the audio track ID or -1 if no active input. - ''' - return libvlc_audio_get_track(self) - - def audio_set_track(self, i_track): - '''Set current audio track. - @param i_track: the track ID (i_id field from track description). - @return: 0 on success, -1 on error. - ''' - return libvlc_audio_set_track(self, i_track) - - def audio_get_channel(self): - '''Get current audio channel. - @return: the audio channel See L{AudioOutputChannel}. - ''' - return libvlc_audio_get_channel(self) - - def audio_set_channel(self, channel): - '''Set current audio channel. - @param channel: the audio channel, See L{AudioOutputChannel}. - @return: 0 on success, -1 on error. - ''' - return libvlc_audio_set_channel(self, channel) - - def audio_get_delay(self): - '''Get current audio delay. - @return: the audio delay (microseconds). - @version: LibVLC 1.1.1 or later. - ''' - return libvlc_audio_get_delay(self) - - def audio_set_delay(self, i_delay): - '''Set current audio delay. The audio delay will be reset to zero each time the media changes. - @param i_delay: the audio delay (microseconds). - @return: 0 on success, -1 on error. - @version: LibVLC 1.1.1 or later. - ''' - return libvlc_audio_set_delay(self, i_delay) - - def set_equalizer(self, p_equalizer): - '''Apply new equalizer settings to a media player. - The equalizer is first created by invoking L{audio_equalizer_new}() or - L{audio_equalizer_new_from_preset}(). - It is possible to apply new equalizer settings to a media player whether the media - player is currently playing media or not. - Invoking this method will immediately apply the new equalizer settings to the audio - output of the currently playing media if there is any. - If there is no currently playing media, the new equalizer settings will be applied - later if and when new media is played. - Equalizer settings will automatically be applied to subsequently played media. - To disable the equalizer for a media player invoke this method passing None for the - p_equalizer parameter. - The media player does not keep a reference to the supplied equalizer so it is safe - for an application to release the equalizer reference any time after this method - returns. - @param p_equalizer: opaque equalizer handle, or None to disable the equalizer for this media player. - @return: zero on success, -1 on error. - @version: LibVLC 2.2.0 or later. - ''' - return libvlc_media_player_set_equalizer(self, p_equalizer) - - def get_role(self): - '''Gets the media role. - @return: the media player role (\ref libvlc_media_player_role_t). - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_player_get_role(self) - - def set_role(self, role): - '''Sets the media role. - @param role: the media player role (\ref libvlc_media_player_role_t). - @return: 0 on success, -1 on error. - ''' - return libvlc_media_player_set_role(self, role) - - -# LibVLC __version__ functions # - -def libvlc_clearerr(): - '''Clears the LibVLC error status for the current thread. This is optional. - By default, the error status is automatically overridden when a new error - occurs, and destroyed when the thread exits. - ''' - f = _Cfunctions.get('libvlc_clearerr', None) or \ - _Cfunction('libvlc_clearerr', (), None, - None) - return f() - - -def libvlc_vprinterr(fmt, ap): - '''Sets the LibVLC error status and message for the current thread. - Any previous error is overridden. - @param fmt: the format string. - @param ap: the arguments. - @return: a nul terminated string in any case. - ''' - f = _Cfunctions.get('libvlc_vprinterr', None) or \ - _Cfunction('libvlc_vprinterr', ((1,), (1,),), None, - ctypes.c_char_p, ctypes.c_char_p, ctypes.c_void_p) - return f(fmt, ap) - - -def libvlc_new(argc, argv): - '''Create and initialize a libvlc instance. - This functions accept a list of "command line" arguments similar to the - main(). These arguments affect the LibVLC instance default configuration. - @note - LibVLC may create threads. Therefore, any thread-unsafe process - initialization must be performed before calling L{libvlc_new}(). In particular - and where applicable: - - setlocale() and textdomain(), - - setenv(), unsetenv() and putenv(), - - with the X11 display system, XInitThreads() - (see also L{libvlc_media_player_set_xwindow}()) and - - on Microsoft Windows, SetErrorMode(). - - sigprocmask() shall never be invoked; pthread_sigmask() can be used. - On POSIX systems, the SIGCHLD signal B{must not} be ignored, i.e. the - signal handler must set to SIG_DFL or a function pointer, not SIG_IGN. - Also while LibVLC is active, the wait() function shall not be called, and - any call to waitpid() shall use a strictly positive value for the first - parameter (i.e. the PID). Failure to follow those rules may lead to a - deadlock or a busy loop. - Also on POSIX systems, it is recommended that the SIGPIPE signal be blocked, - even if it is not, in principles, necessary, e.g.: - @code - @endcode - On Microsoft Windows Vista/2008, the process error mode - SEM_FAILCRITICALERRORS flag B{must} be set before using LibVLC. - On later versions, that is optional and unnecessary. - Also on Microsoft Windows (Vista and any later version), setting the default - DLL directories to SYSTEM32 exclusively is strongly recommended for - security reasons: - @code - @endcode. - @param argc: the number of arguments (should be 0). - @param argv: list of arguments (should be None). - @return: the libvlc instance or None in case of error. - @version Arguments are meant to be passed from the command line to LibVLC, just like VLC media player does. The list of valid arguments depends on the LibVLC version, the operating system and platform, and set of available LibVLC plugins. Invalid or unsupported arguments will cause the function to fail (i.e. return None). Also, some arguments may alter the behaviour or otherwise interfere with other LibVLC functions. @warning There is absolutely no warranty or promise of forward, backward and cross-platform compatibility with regards to L{libvlc_new}() arguments. We recommend that you do not use them, other than when debugging. - ''' - f = _Cfunctions.get('libvlc_new', None) or \ - _Cfunction('libvlc_new', ((1,), (1,),), class_result(Instance), - ctypes.c_void_p, ctypes.c_int, ListPOINTER(ctypes.c_char_p)) - return f(argc, argv) - - -def libvlc_release(p_instance): - '''Decrement the reference count of a libvlc instance, and destroy it - if it reaches zero. - @param p_instance: the instance to destroy. - ''' - f = _Cfunctions.get('libvlc_release', None) or \ - _Cfunction('libvlc_release', ((1,),), None, - None, Instance) - return f(p_instance) - - -def libvlc_retain(p_instance): - '''Increments the reference count of a libvlc instance. - The initial reference count is 1 after L{libvlc_new}() returns. - @param p_instance: the instance to reference. - ''' - f = _Cfunctions.get('libvlc_retain', None) or \ - _Cfunction('libvlc_retain', ((1,),), None, - None, Instance) - return f(p_instance) - - -def libvlc_add_intf(p_instance, name): - '''Try to start a user interface for the libvlc instance. - @param p_instance: the instance. - @param name: interface name, or None for default. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_add_intf', None) or \ - _Cfunction('libvlc_add_intf', ((1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p) - return f(p_instance, name) - - -def libvlc_set_user_agent(p_instance, name, http): - '''Sets the application name. LibVLC passes this as the user agent string - when a protocol requires it. - @param p_instance: LibVLC instance. - @param name: human-readable application name, e.g. "FooBar player 1.2.3". - @param http: HTTP User Agent, e.g. "FooBar/1.2.3 Python/2.6.0". - @version: LibVLC 1.1.1 or later. - ''' - f = _Cfunctions.get('libvlc_set_user_agent', None) or \ - _Cfunction('libvlc_set_user_agent', ((1,), (1,), (1,),), None, - None, Instance, ctypes.c_char_p, ctypes.c_char_p) - return f(p_instance, name, http) - - -def libvlc_set_app_id(p_instance, id, version, icon): - '''Sets some meta-information about the application. - See also L{libvlc_set_user_agent}(). - @param p_instance: LibVLC instance. - @param id: Java-style application identifier, e.g. "com.acme.foobar". - @param version: application version numbers, e.g. "1.2.3". - @param icon: application icon name, e.g. "foobar". - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_set_app_id', None) or \ - _Cfunction('libvlc_set_app_id', ((1,), (1,), (1,), (1,),), None, - None, Instance, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p) - return f(p_instance, id, version, icon) - - -def libvlc_get_version(): - '''Retrieve libvlc version. - Example: "1.1.0-git The Luggage". - @return: a string containing the libvlc version. - ''' - f = _Cfunctions.get('libvlc_get_version', None) or \ - _Cfunction('libvlc_get_version', (), None, - ctypes.c_char_p) - return f() - - -def libvlc_get_compiler(): - '''Retrieve libvlc compiler version. - Example: "gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu6)". - @return: a string containing the libvlc compiler version. - ''' - f = _Cfunctions.get('libvlc_get_compiler', None) or \ - _Cfunction('libvlc_get_compiler', (), None, - ctypes.c_char_p) - return f() - - -def libvlc_get_changeset(): - '''Retrieve libvlc changeset. - Example: "aa9bce0bc4". - @return: a string containing the libvlc changeset. - ''' - f = _Cfunctions.get('libvlc_get_changeset', None) or \ - _Cfunction('libvlc_get_changeset', (), None, - ctypes.c_char_p) - return f() - - -def libvlc_free(ptr): - '''Frees an heap allocation returned by a LibVLC function. - If you know you're using the same underlying C run-time as the LibVLC - implementation, then you can call ANSI C free() directly instead. - @param ptr: the pointer. - ''' - f = _Cfunctions.get('libvlc_free', None) or \ - _Cfunction('libvlc_free', ((1,),), None, - None, ctypes.c_void_p) - return f(ptr) - - -def libvlc_event_attach(p_event_manager, i_event_type, f_callback, user_data): - '''Register for an event notification. - @param p_event_manager: the event manager to which you want to attach to. Generally it is obtained by vlc_my_object_event_manager() where my_object is the object you want to listen to. - @param i_event_type: the desired event to which we want to listen. - @param f_callback: the function to call when i_event_type occurs. - @param user_data: user provided data to carry with the event. - @return: 0 on success, ENOMEM on error. - ''' - f = _Cfunctions.get('libvlc_event_attach', None) or \ - _Cfunction('libvlc_event_attach', ((1,), (1,), (1,), (1,),), None, - ctypes.c_int, EventManager, ctypes.c_uint, Callback, ctypes.c_void_p) - return f(p_event_manager, i_event_type, f_callback, user_data) - - -def libvlc_event_detach(p_event_manager, i_event_type, f_callback, p_user_data): - '''Unregister an event notification. - @param p_event_manager: the event manager. - @param i_event_type: the desired event to which we want to unregister. - @param f_callback: the function to call when i_event_type occurs. - @param p_user_data: user provided data to carry with the event. - ''' - f = _Cfunctions.get('libvlc_event_detach', None) or \ - _Cfunction('libvlc_event_detach', ((1,), (1,), (1,), (1,),), None, - None, EventManager, ctypes.c_uint, Callback, ctypes.c_void_p) - return f(p_event_manager, i_event_type, f_callback, p_user_data) - - -def libvlc_event_type_name(event_type): - '''Get an event's type name. - @param event_type: the desired event. - ''' - f = _Cfunctions.get('libvlc_event_type_name', None) or \ - _Cfunction('libvlc_event_type_name', ((1,),), None, - ctypes.c_char_p, ctypes.c_uint) - return f(event_type) - - -def libvlc_log_get_context(ctx): - '''Gets log message debug infos. - This function retrieves self-debug information about a log message: - - the name of the VLC module emitting the message, - - the name of the source code module (i.e. file) and - - the line number within the source code module. - The returned module name and file name will be None if unknown. - The returned line number will similarly be zero if unknown. - @param ctx: message context (as passed to the @ref libvlc_log_cb callback). - @return: module module name storage (or None), file source code file name storage (or None), line source code file line number storage (or None). - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_log_get_context', None) or \ - _Cfunction('libvlc_log_get_context', ((1,), (2,), (2,), (2,),), None, - None, Log_ptr, ListPOINTER(ctypes.c_char_p), ListPOINTER(ctypes.c_char_p), - ctypes.POINTER(ctypes.c_uint)) - return f(ctx) - - -def libvlc_log_get_object(ctx, id): - '''Gets log message info. - This function retrieves meta-information about a log message: - - the type name of the VLC object emitting the message, - - the object header if any, and - - a temporaly-unique object identifier. - This information is mainly meant for B{manual} troubleshooting. - The returned type name may be "generic" if unknown, but it cannot be None. - The returned header will be None if unset; in current versions, the header - is used to distinguish for VLM inputs. - The returned object ID will be zero if the message is not associated with - any VLC object. - @param ctx: message context (as passed to the @ref libvlc_log_cb callback). - @return: name object name storage (or None), header object header (or None), line source code file line number storage (or None). - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_log_get_object', None) or \ - _Cfunction('libvlc_log_get_object', ((1,), (2,), (2,), (1,),), None, - None, Log_ptr, ListPOINTER(ctypes.c_char_p), ListPOINTER(ctypes.c_char_p), - ctypes.POINTER(ctypes.c_uint)) - return f(ctx, id) - - -def libvlc_log_unset(p_instance): - '''Unsets the logging callback. - This function deregisters the logging callback for a LibVLC instance. - This is rarely needed as the callback is implicitly unset when the instance - is destroyed. - @note: This function will wait for any pending callbacks invocation to - complete (causing a deadlock if called from within the callback). - @param p_instance: libvlc instance. - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_log_unset', None) or \ - _Cfunction('libvlc_log_unset', ((1,),), None, - None, Instance) - return f(p_instance) - - -def libvlc_log_set(p_instance, cb, data): - '''Sets the logging callback for a LibVLC instance. - This function is thread-safe: it will wait for any pending callbacks - invocation to complete. - @param cb: callback function pointer. - @param data: opaque data pointer for the callback function @note Some log messages (especially debug) are emitted by LibVLC while is being initialized. These messages cannot be captured with this interface. @warning A deadlock may occur if this function is called from the callback. - @param p_instance: libvlc instance. - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_log_set', None) or \ - _Cfunction('libvlc_log_set', ((1,), (1,), (1,),), None, - None, Instance, LogCb, ctypes.c_void_p) - return f(p_instance, cb, data) - - -def libvlc_log_set_file(p_instance, stream): - '''Sets up logging to a file. - @param p_instance: libvlc instance. - @param stream: FILE pointer opened for writing (the FILE pointer must remain valid until L{libvlc_log_unset}()). - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_log_set_file', None) or \ - _Cfunction('libvlc_log_set_file', ((1,), (1,),), None, - None, Instance, FILE_ptr) - return f(p_instance, stream) - - -def libvlc_module_description_list_release(p_list): - '''Release a list of module descriptions. - @param p_list: the list to be released. - ''' - f = _Cfunctions.get('libvlc_module_description_list_release', None) or \ - _Cfunction('libvlc_module_description_list_release', ((1,),), None, - None, ctypes.POINTER(ModuleDescription)) - return f(p_list) - - -def libvlc_audio_filter_list_get(p_instance): - '''Returns a list of audio filters that are available. - @param p_instance: libvlc instance. - @return: a list of module descriptions. It should be freed with L{libvlc_module_description_list_release}(). In case of an error, None is returned. See L{ModuleDescription} See L{libvlc_module_description_list_release}. - ''' - f = _Cfunctions.get('libvlc_audio_filter_list_get', None) or \ - _Cfunction('libvlc_audio_filter_list_get', ((1,),), None, - ctypes.POINTER(ModuleDescription), Instance) - return f(p_instance) - - -def libvlc_video_filter_list_get(p_instance): - '''Returns a list of video filters that are available. - @param p_instance: libvlc instance. - @return: a list of module descriptions. It should be freed with L{libvlc_module_description_list_release}(). In case of an error, None is returned. See L{ModuleDescription} See L{libvlc_module_description_list_release}. - ''' - f = _Cfunctions.get('libvlc_video_filter_list_get', None) or \ - _Cfunction('libvlc_video_filter_list_get', ((1,),), None, - ctypes.POINTER(ModuleDescription), Instance) - return f(p_instance) - - -def libvlc_clock(): - '''Return the current time as defined by LibVLC. The unit is the microsecond. - Time increases monotonically (regardless of time zone changes and RTC - adjustements). - The origin is arbitrary but consistent across the whole system - (e.g. the system uptim, the time since the system was booted). - @note: On systems that support it, the POSIX monotonic clock is used. - ''' - f = _Cfunctions.get('libvlc_clock', None) or \ - _Cfunction('libvlc_clock', (), None, - ctypes.c_int64) - return f() - - -def libvlc_media_discoverer_new(p_inst, psz_name): - '''Create a media discoverer object by name. - After this object is created, you should attach to media_list events in - order to be notified of new items discovered. - You need to call L{libvlc_media_discoverer_start}() in order to start the - discovery. - See L{libvlc_media_discoverer_media_list} - See L{libvlc_media_discoverer_event_manager} - See L{libvlc_media_discoverer_start}. - @param p_inst: libvlc instance. - @param psz_name: service name; use L{libvlc_media_discoverer_list_get}() to get a list of the discoverer names available in this libVLC instance. - @return: media discover object or None in case of error. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_new', None) or \ - _Cfunction('libvlc_media_discoverer_new', ((1,), (1,),), class_result(MediaDiscoverer), - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_inst, psz_name) - - -def libvlc_media_discoverer_start(p_mdis): - '''Start media discovery. - To stop it, call L{libvlc_media_discoverer_stop}() or - L{libvlc_media_discoverer_list_release}() directly. - See L{libvlc_media_discoverer_stop}. - @param p_mdis: media discover object. - @return: -1 in case of error, 0 otherwise. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_start', None) or \ - _Cfunction('libvlc_media_discoverer_start', ((1,),), None, - ctypes.c_int, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_media_discoverer_stop(p_mdis): - '''Stop media discovery. - See L{libvlc_media_discoverer_start}. - @param p_mdis: media discover object. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_stop', None) or \ - _Cfunction('libvlc_media_discoverer_stop', ((1,),), None, - None, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_media_discoverer_release(p_mdis): - '''Release media discover object. If the reference count reaches 0, then - the object will be released. - @param p_mdis: media service discover object. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_release', None) or \ - _Cfunction('libvlc_media_discoverer_release', ((1,),), None, - None, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_media_discoverer_media_list(p_mdis): - '''Get media service discover media list. - @param p_mdis: media service discover object. - @return: list of media items. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_media_list', None) or \ - _Cfunction('libvlc_media_discoverer_media_list', ((1,),), class_result(MediaList), - ctypes.c_void_p, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_media_discoverer_is_running(p_mdis): - '''Query if media service discover object is running. - @param p_mdis: media service discover object. - @return: true if running, false if not \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_is_running', None) or \ - _Cfunction('libvlc_media_discoverer_is_running', ((1,),), None, - ctypes.c_int, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_media_discoverer_list_get(p_inst, i_cat, ppp_services): - '''Get media discoverer services by category. - @param p_inst: libvlc instance. - @param i_cat: category of services to fetch. - @param ppp_services: address to store an allocated array of media discoverer services (must be freed with L{libvlc_media_discoverer_list_release}() by the caller) [OUT]. - @return: the number of media discoverer services (0 on error). - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_list_get', None) or \ - _Cfunction('libvlc_media_discoverer_list_get', ((1,), (1,), (1,),), None, - ctypes.c_size_t, Instance, MediaDiscovererCategory, - ctypes.POINTER(ctypes.POINTER(MediaDiscovererDescription))) - return f(p_inst, i_cat, ppp_services) - - -def libvlc_media_discoverer_list_release(pp_services, i_count): - '''Release an array of media discoverer services. - @param pp_services: array to release. - @param i_count: number of elements in the array. - @version: LibVLC 3.0.0 and later. See L{libvlc_media_discoverer_list_get}(). - ''' - f = _Cfunctions.get('libvlc_media_discoverer_list_release', None) or \ - _Cfunction('libvlc_media_discoverer_list_release', ((1,), (1,),), None, - None, ctypes.POINTER(MediaDiscovererDescription), ctypes.c_size_t) - return f(pp_services, i_count) - - -def libvlc_dialog_set_context(p_id, p_context): - '''Associate an opaque pointer with the dialog id. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_dialog_set_context', None) or \ - _Cfunction('libvlc_dialog_set_context', ((1,), (1,),), None, - None, ctypes.c_void_p, ctypes.c_void_p) - return f(p_id, p_context) - - -def libvlc_dialog_get_context(p_id): - '''Return the opaque pointer associated with the dialog id. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_dialog_get_context', None) or \ - _Cfunction('libvlc_dialog_get_context', ((1,),), None, - ctypes.c_void_p, ctypes.c_void_p) - return f(p_id) - - -def libvlc_dialog_post_login(p_id, psz_username, psz_password, b_store): - '''Post a login answer - After this call, p_id won't be valid anymore - See libvlc_dialog_cbs.pf_display_login. - @param p_id: id of the dialog. - @param psz_username: valid and non empty string. - @param psz_password: valid string (can be empty). - @param b_store: if true, store the credentials. - @return: 0 on success, or -1 on error. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_dialog_post_login', None) or \ - _Cfunction('libvlc_dialog_post_login', ((1,), (1,), (1,), (1,),), None, - ctypes.c_int, ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_bool) - return f(p_id, psz_username, psz_password, b_store) - - -def libvlc_dialog_post_action(p_id, i_action): - '''Post a question answer - After this call, p_id won't be valid anymore - See libvlc_dialog_cbs.pf_display_question. - @param p_id: id of the dialog. - @param i_action: 1 for action1, 2 for action2. - @return: 0 on success, or -1 on error. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_dialog_post_action', None) or \ - _Cfunction('libvlc_dialog_post_action', ((1,), (1,),), None, - ctypes.c_int, ctypes.c_void_p, ctypes.c_int) - return f(p_id, i_action) - - -def libvlc_dialog_dismiss(p_id): - '''Dismiss a dialog - After this call, p_id won't be valid anymore - See libvlc_dialog_cbs.pf_cancel. - @param p_id: id of the dialog. - @return: 0 on success, or -1 on error. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_dialog_dismiss', None) or \ - _Cfunction('libvlc_dialog_dismiss', ((1,),), None, - ctypes.c_int, ctypes.c_void_p) - return f(p_id) - - -def libvlc_media_library_new(p_instance): - '''Create an new Media Library object. - @param p_instance: the libvlc instance. - @return: a new object or None on error. - ''' - f = _Cfunctions.get('libvlc_media_library_new', None) or \ - _Cfunction('libvlc_media_library_new', ((1,),), class_result(MediaLibrary), - ctypes.c_void_p, Instance) - return f(p_instance) - - -def libvlc_media_library_release(p_mlib): - '''Release media library object. This functions decrements the - reference count of the media library object. If it reaches 0, - then the object will be released. - @param p_mlib: media library object. - ''' - f = _Cfunctions.get('libvlc_media_library_release', None) or \ - _Cfunction('libvlc_media_library_release', ((1,),), None, - None, MediaLibrary) - return f(p_mlib) - - -def libvlc_media_library_retain(p_mlib): - '''Retain a reference to a media library object. This function will - increment the reference counting for this object. Use - L{libvlc_media_library_release}() to decrement the reference count. - @param p_mlib: media library object. - ''' - f = _Cfunctions.get('libvlc_media_library_retain', None) or \ - _Cfunction('libvlc_media_library_retain', ((1,),), None, - None, MediaLibrary) - return f(p_mlib) - - -def libvlc_media_library_load(p_mlib): - '''Load media library. - @param p_mlib: media library object. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_media_library_load', None) or \ - _Cfunction('libvlc_media_library_load', ((1,),), None, - ctypes.c_int, MediaLibrary) - return f(p_mlib) - - -def libvlc_media_library_media_list(p_mlib): - '''Get media library subitems. - @param p_mlib: media library object. - @return: media list subitems. - ''' - f = _Cfunctions.get('libvlc_media_library_media_list', None) or \ - _Cfunction('libvlc_media_library_media_list', ((1,),), class_result(MediaList), - ctypes.c_void_p, MediaLibrary) - return f(p_mlib) - - -def libvlc_vlm_release(p_instance): - '''Release the vlm instance related to the given L{Instance}. - @param p_instance: the instance. - ''' - f = _Cfunctions.get('libvlc_vlm_release', None) or \ - _Cfunction('libvlc_vlm_release', ((1,),), None, - None, Instance) - return f(p_instance) - - -def libvlc_vlm_add_broadcast(p_instance, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop): - '''Add a broadcast, with one input. - @param p_instance: the instance. - @param psz_name: the name of the new broadcast. - @param psz_input: the input MRL. - @param psz_output: the output MRL (the parameter to the "sout" variable). - @param i_options: number of additional options. - @param ppsz_options: additional options. - @param b_enabled: boolean for enabling the new broadcast. - @param b_loop: Should this broadcast be played in loop ? - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_add_broadcast', None) or \ - _Cfunction('libvlc_vlm_add_broadcast', ((1,), (1,), (1,), (1,), (1,), (1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_int, - ListPOINTER(ctypes.c_char_p), ctypes.c_int, ctypes.c_int) - return f(p_instance, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop) - - -def libvlc_vlm_add_vod(p_instance, psz_name, psz_input, i_options, ppsz_options, b_enabled, psz_mux): - '''Add a vod, with one input. - @param p_instance: the instance. - @param psz_name: the name of the new vod media. - @param psz_input: the input MRL. - @param i_options: number of additional options. - @param ppsz_options: additional options. - @param b_enabled: boolean for enabling the new vod. - @param psz_mux: the muxer of the vod media. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_add_vod', None) or \ - _Cfunction('libvlc_vlm_add_vod', ((1,), (1,), (1,), (1,), (1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_int, ListPOINTER(ctypes.c_char_p), - ctypes.c_int, ctypes.c_char_p) - return f(p_instance, psz_name, psz_input, i_options, ppsz_options, b_enabled, psz_mux) - - -def libvlc_vlm_del_media(p_instance, psz_name): - '''Delete a media (VOD or broadcast). - @param p_instance: the instance. - @param psz_name: the media to delete. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_del_media', None) or \ - _Cfunction('libvlc_vlm_del_media', ((1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p) - return f(p_instance, psz_name) - - -def libvlc_vlm_set_enabled(p_instance, psz_name, b_enabled): - '''Enable or disable a media (VOD or broadcast). - @param p_instance: the instance. - @param psz_name: the media to work on. - @param b_enabled: the new status. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_set_enabled', None) or \ - _Cfunction('libvlc_vlm_set_enabled', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, b_enabled) - - -def libvlc_vlm_set_output(p_instance, psz_name, psz_output): - '''Set the output for a media. - @param p_instance: the instance. - @param psz_name: the media to work on. - @param psz_output: the output MRL (the parameter to the "sout" variable). - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_set_output', None) or \ - _Cfunction('libvlc_vlm_set_output', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p) - return f(p_instance, psz_name, psz_output) - - -def libvlc_vlm_set_input(p_instance, psz_name, psz_input): - '''Set a media's input MRL. This will delete all existing inputs and - add the specified one. - @param p_instance: the instance. - @param psz_name: the media to work on. - @param psz_input: the input MRL. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_set_input', None) or \ - _Cfunction('libvlc_vlm_set_input', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p) - return f(p_instance, psz_name, psz_input) - - -def libvlc_vlm_add_input(p_instance, psz_name, psz_input): - '''Add a media's input MRL. This will add the specified one. - @param p_instance: the instance. - @param psz_name: the media to work on. - @param psz_input: the input MRL. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_add_input', None) or \ - _Cfunction('libvlc_vlm_add_input', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p) - return f(p_instance, psz_name, psz_input) - - -def libvlc_vlm_set_loop(p_instance, psz_name, b_loop): - '''Set a media's loop status. - @param p_instance: the instance. - @param psz_name: the media to work on. - @param b_loop: the new status. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_set_loop', None) or \ - _Cfunction('libvlc_vlm_set_loop', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, b_loop) - - -def libvlc_vlm_set_mux(p_instance, psz_name, psz_mux): - '''Set a media's vod muxer. - @param p_instance: the instance. - @param psz_name: the media to work on. - @param psz_mux: the new muxer. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_set_mux', None) or \ - _Cfunction('libvlc_vlm_set_mux', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p) - return f(p_instance, psz_name, psz_mux) - - -def libvlc_vlm_change_media(p_instance, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop): - '''Edit the parameters of a media. This will delete all existing inputs and - add the specified one. - @param p_instance: the instance. - @param psz_name: the name of the new broadcast. - @param psz_input: the input MRL. - @param psz_output: the output MRL (the parameter to the "sout" variable). - @param i_options: number of additional options. - @param ppsz_options: additional options. - @param b_enabled: boolean for enabling the new broadcast. - @param b_loop: Should this broadcast be played in loop ? - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_change_media', None) or \ - _Cfunction('libvlc_vlm_change_media', ((1,), (1,), (1,), (1,), (1,), (1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_int, - ListPOINTER(ctypes.c_char_p), ctypes.c_int, ctypes.c_int) - return f(p_instance, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop) - - -def libvlc_vlm_play_media(p_instance, psz_name): - '''Play the named broadcast. - @param p_instance: the instance. - @param psz_name: the name of the broadcast. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_play_media', None) or \ - _Cfunction('libvlc_vlm_play_media', ((1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p) - return f(p_instance, psz_name) - - -def libvlc_vlm_stop_media(p_instance, psz_name): - '''Stop the named broadcast. - @param p_instance: the instance. - @param psz_name: the name of the broadcast. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_stop_media', None) or \ - _Cfunction('libvlc_vlm_stop_media', ((1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p) - return f(p_instance, psz_name) - - -def libvlc_vlm_pause_media(p_instance, psz_name): - '''Pause the named broadcast. - @param p_instance: the instance. - @param psz_name: the name of the broadcast. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_pause_media', None) or \ - _Cfunction('libvlc_vlm_pause_media', ((1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p) - return f(p_instance, psz_name) - - -def libvlc_vlm_seek_media(p_instance, psz_name, f_percentage): - '''Seek in the named broadcast. - @param p_instance: the instance. - @param psz_name: the name of the broadcast. - @param f_percentage: the percentage to seek to. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_seek_media', None) or \ - _Cfunction('libvlc_vlm_seek_media', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_float) - return f(p_instance, psz_name, f_percentage) - - -def libvlc_vlm_show_media(p_instance, psz_name): - '''Return information about the named media as a JSON - string representation. - This function is mainly intended for debugging use, - if you want programmatic access to the state of - a vlm_media_instance_t, please use the corresponding - libvlc_vlm_get_media_instance_xxx -functions. - Currently there are no such functions available for - vlm_media_t though. - @param p_instance: the instance. - @param psz_name: the name of the media, if the name is an empty string, all media is described. - @return: string with information about named media, or None on error. - ''' - f = _Cfunctions.get('libvlc_vlm_show_media', None) or \ - _Cfunction('libvlc_vlm_show_media', ((1,), (1,),), string_result, - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_instance, psz_name) - - -def libvlc_vlm_get_media_instance_position(p_instance, psz_name, i_instance): - '''Get vlm_media instance position by name or instance id. - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: position as float or -1. on error. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_position', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_position', ((1,), (1,), (1,),), None, - ctypes.c_float, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_media_instance_time(p_instance, psz_name, i_instance): - '''Get vlm_media instance time by name or instance id. - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: time as integer or -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_time', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_time', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_media_instance_length(p_instance, psz_name, i_instance): - '''Get vlm_media instance length by name or instance id. - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: length of media item or -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_length', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_length', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_media_instance_rate(p_instance, psz_name, i_instance): - '''Get vlm_media instance playback rate by name or instance id. - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: playback rate or -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_rate', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_rate', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_media_instance_title(p_instance, psz_name, i_instance): - '''Get vlm_media instance title number by name or instance id. - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: title as number or -1 on error. - @bug: will always return 0. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_title', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_title', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_media_instance_chapter(p_instance, psz_name, i_instance): - '''Get vlm_media instance chapter number by name or instance id. - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: chapter as number or -1 on error. - @bug: will always return 0. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_chapter', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_chapter', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_media_instance_seekable(p_instance, psz_name, i_instance): - '''Is libvlc instance seekable ? - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: 1 if seekable, 0 if not, -1 if media does not exist. - @bug: will always return 0. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_seekable', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_seekable', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_event_manager(p_instance): - '''Get libvlc_event_manager from a vlm media. - The p_event_manager is immutable, so you don't have to hold the lock. - @param p_instance: a libvlc instance. - @return: libvlc_event_manager. - ''' - f = _Cfunctions.get('libvlc_vlm_get_event_manager', None) or \ - _Cfunction('libvlc_vlm_get_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, Instance) - return f(p_instance) - - -def libvlc_media_new_location(p_instance, psz_mrl): - '''Create a media with a certain given media resource location, - for instance a valid URL. - @note: To refer to a local file with this function, - the file://... URI syntax B{must} be used (see IETF RFC3986). - We recommend using L{libvlc_media_new_path}() instead when dealing with - local files. - See L{libvlc_media_release}. - @param p_instance: the instance. - @param psz_mrl: the media location. - @return: the newly created media or None on error. - ''' - f = _Cfunctions.get('libvlc_media_new_location', None) or \ - _Cfunction('libvlc_media_new_location', ((1,), (1,),), class_result(Media), - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_instance, psz_mrl) - - -def libvlc_media_new_path(p_instance, path): - '''Create a media for a certain file path. - See L{libvlc_media_release}. - @param p_instance: the instance. - @param path: local filesystem path. - @return: the newly created media or None on error. - ''' - f = _Cfunctions.get('libvlc_media_new_path', None) or \ - _Cfunction('libvlc_media_new_path', ((1,), (1,),), class_result(Media), - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_instance, path) - - -def libvlc_media_new_fd(p_instance, fd): - '''Create a media for an already open file descriptor. - The file descriptor shall be open for reading (or reading and writing). - Regular file descriptors, pipe read descriptors and character device - descriptors (including TTYs) are supported on all platforms. - Block device descriptors are supported where available. - Directory descriptors are supported on systems that provide fdopendir(). - Sockets are supported on all platforms where they are file descriptors, - i.e. all except Windows. - @note: This library will B{not} automatically close the file descriptor - under any circumstance. Nevertheless, a file descriptor can usually only be - rendered once in a media player. To render it a second time, the file - descriptor should probably be rewound to the beginning with lseek(). - See L{libvlc_media_release}. - @param p_instance: the instance. - @param fd: open file descriptor. - @return: the newly created media or None on error. - @version: LibVLC 1.1.5 and later. - ''' - f = _Cfunctions.get('libvlc_media_new_fd', None) or \ - _Cfunction('libvlc_media_new_fd', ((1,), (1,),), class_result(Media), - ctypes.c_void_p, Instance, ctypes.c_int) - return f(p_instance, fd) - - -def libvlc_media_new_callbacks(instance, open_cb, read_cb, seek_cb, close_cb, opaque): - '''Create a media with custom callbacks to read the data from. - @param instance: LibVLC instance. - @param open_cb: callback to open the custom bitstream input media. - @param read_cb: callback to read data (must not be None). - @param seek_cb: callback to seek, or None if seeking is not supported. - @param close_cb: callback to close the media, or None if unnecessary. - @param opaque: data pointer for the open callback. - @return: the newly created media or None on error @note If open_cb is None, the opaque pointer will be passed to read_cb, seek_cb and close_cb, and the stream size will be treated as unknown. @note The callbacks may be called asynchronously (from another thread). A single stream instance need not be reentrant. However the open_cb needs to be reentrant if the media is used by multiple player instances. @warning The callbacks may be used until all or any player instances that were supplied the media item are stopped. See L{libvlc_media_release}. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_new_callbacks', None) or \ - _Cfunction('libvlc_media_new_callbacks', ((1,), (1,), (1,), (1,), (1,), (1,),), class_result(Media), - ctypes.c_void_p, Instance, MediaOpenCb, MediaReadCb, MediaSeekCb, MediaCloseCb, ctypes.c_void_p) - return f(instance, open_cb, read_cb, seek_cb, close_cb, opaque) - - -def libvlc_media_new_as_node(p_instance, psz_name): - '''Create a media as an empty node with a given name. - See L{libvlc_media_release}. - @param p_instance: the instance. - @param psz_name: the name of the node. - @return: the new empty media or None on error. - ''' - f = _Cfunctions.get('libvlc_media_new_as_node', None) or \ - _Cfunction('libvlc_media_new_as_node', ((1,), (1,),), class_result(Media), - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_instance, psz_name) - - -def libvlc_media_add_option(p_md, psz_options): - '''Add an option to the media. - This option will be used to determine how the media_player will - read the media. This allows to use VLC's advanced - reading/streaming options on a per-media basis. - @note: The options are listed in 'vlc --long-help' from the command line, - e.g. "-sout-all". Keep in mind that available options and their semantics - vary across LibVLC versions and builds. - @warning: Not all options affects L{Media} objects: - Specifically, due to architectural issues most audio and video options, - such as text renderer options, have no effects on an individual media. - These options must be set through L{libvlc_new}() instead. - @param p_md: the media descriptor. - @param psz_options: the options (as a string). - ''' - f = _Cfunctions.get('libvlc_media_add_option', None) or \ - _Cfunction('libvlc_media_add_option', ((1,), (1,),), None, - None, Media, ctypes.c_char_p) - return f(p_md, psz_options) - - -def libvlc_media_add_option_flag(p_md, psz_options, i_flags): - '''Add an option to the media with configurable flags. - This option will be used to determine how the media_player will - read the media. This allows to use VLC's advanced - reading/streaming options on a per-media basis. - The options are detailed in vlc --long-help, for instance - "--sout-all". Note that all options are not usable on medias: - specifically, due to architectural issues, video-related options - such as text renderer options cannot be set on a single media. They - must be set on the whole libvlc instance instead. - @param p_md: the media descriptor. - @param psz_options: the options (as a string). - @param i_flags: the flags for this option. - ''' - f = _Cfunctions.get('libvlc_media_add_option_flag', None) or \ - _Cfunction('libvlc_media_add_option_flag', ((1,), (1,), (1,),), None, - None, Media, ctypes.c_char_p, ctypes.c_uint) - return f(p_md, psz_options, i_flags) - - -def libvlc_media_retain(p_md): - '''Retain a reference to a media descriptor object (L{Media}). Use - L{libvlc_media_release}() to decrement the reference count of a - media descriptor object. - @param p_md: the media descriptor. - ''' - f = _Cfunctions.get('libvlc_media_retain', None) or \ - _Cfunction('libvlc_media_retain', ((1,),), None, - None, Media) - return f(p_md) - - -def libvlc_media_release(p_md): - '''Decrement the reference count of a media descriptor object. If the - reference count is 0, then L{libvlc_media_release}() will release the - media descriptor object. It will send out an libvlc_MediaFreed event - to all listeners. If the media descriptor object has been released it - should not be used again. - @param p_md: the media descriptor. - ''' - f = _Cfunctions.get('libvlc_media_release', None) or \ - _Cfunction('libvlc_media_release', ((1,),), None, - None, Media) - return f(p_md) - - -def libvlc_media_get_mrl(p_md): - '''Get the media resource locator (mrl) from a media descriptor object. - @param p_md: a media descriptor object. - @return: string with mrl of media descriptor object. - ''' - f = _Cfunctions.get('libvlc_media_get_mrl', None) or \ - _Cfunction('libvlc_media_get_mrl', ((1,),), string_result, - ctypes.c_void_p, Media) - return f(p_md) - - -def libvlc_media_duplicate(p_md): - '''Duplicate a media descriptor object. - @param p_md: a media descriptor object. - ''' - f = _Cfunctions.get('libvlc_media_duplicate', None) or \ - _Cfunction('libvlc_media_duplicate', ((1,),), class_result(Media), - ctypes.c_void_p, Media) - return f(p_md) - - -def libvlc_media_get_meta(p_md, e_meta): - '''Read the meta of the media. - If the media has not yet been parsed this will return None. - See L{libvlc_media_parse} - See L{libvlc_media_parse_with_options} - See libvlc_MediaMetaChanged. - @param p_md: the media descriptor. - @param e_meta: the meta to read. - @return: the media's meta. - ''' - f = _Cfunctions.get('libvlc_media_get_meta', None) or \ - _Cfunction('libvlc_media_get_meta', ((1,), (1,),), string_result, - ctypes.c_void_p, Media, Meta) - return f(p_md, e_meta) - - -def libvlc_media_set_meta(p_md, e_meta, psz_value): - '''Set the meta of the media (this function will not save the meta, call - L{libvlc_media_save_meta} in order to save the meta). - @param p_md: the media descriptor. - @param e_meta: the meta to write. - @param psz_value: the media's meta. - ''' - f = _Cfunctions.get('libvlc_media_set_meta', None) or \ - _Cfunction('libvlc_media_set_meta', ((1,), (1,), (1,),), None, - None, Media, Meta, ctypes.c_char_p) - return f(p_md, e_meta, psz_value) - - -def libvlc_media_save_meta(p_md): - '''Save the meta previously set. - @param p_md: the media desriptor. - @return: true if the write operation was successful. - ''' - f = _Cfunctions.get('libvlc_media_save_meta', None) or \ - _Cfunction('libvlc_media_save_meta', ((1,),), None, - ctypes.c_int, Media) - return f(p_md) - - -def libvlc_media_get_state(p_md): - '''Get current state of media descriptor object. Possible media states are - libvlc_NothingSpecial=0, libvlc_Opening, libvlc_Playing, libvlc_Paused, - libvlc_Stopped, libvlc_Ended, libvlc_Error. - See L{State}. - @param p_md: a media descriptor object. - @return: state of media descriptor object. - ''' - f = _Cfunctions.get('libvlc_media_get_state', None) or \ - _Cfunction('libvlc_media_get_state', ((1,),), None, - State, Media) - return f(p_md) - - -def libvlc_media_get_stats(p_md, p_stats): - '''Get the current statistics about the media. - @param p_md:: media descriptor object. - @param p_stats:: structure that contain the statistics about the media (this structure must be allocated by the caller). - @return: true if the statistics are available, false otherwise \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_get_stats', None) or \ - _Cfunction('libvlc_media_get_stats', ((1,), (1,),), None, - ctypes.c_int, Media, ctypes.POINTER(MediaStats)) - return f(p_md, p_stats) - - -def libvlc_media_subitems(p_md): - '''Get subitems of media descriptor object. This will increment - the reference count of supplied media descriptor object. Use - L{libvlc_media_list_release}() to decrement the reference counting. - @param p_md: media descriptor object. - @return: list of media descriptor subitems or None. - ''' - f = _Cfunctions.get('libvlc_media_subitems', None) or \ - _Cfunction('libvlc_media_subitems', ((1,),), class_result(MediaList), - ctypes.c_void_p, Media) - return f(p_md) - - -def libvlc_media_event_manager(p_md): - '''Get event manager from media descriptor object. - NOTE: this function doesn't increment reference counting. - @param p_md: a media descriptor object. - @return: event manager object. - ''' - f = _Cfunctions.get('libvlc_media_event_manager', None) or \ - _Cfunction('libvlc_media_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, Media) - return f(p_md) - - -def libvlc_media_get_duration(p_md): - '''Get duration (in ms) of media descriptor object item. - @param p_md: media descriptor object. - @return: duration of media item or -1 on error. - ''' - f = _Cfunctions.get('libvlc_media_get_duration', None) or \ - _Cfunction('libvlc_media_get_duration', ((1,),), None, - ctypes.c_longlong, Media) - return f(p_md) - - -def libvlc_media_parse_with_options(p_md, parse_flag, timeout): - '''Parse the media asynchronously with options. - This fetches (local or network) art, meta data and/or tracks information. - This method is the extended version of L{libvlc_media_parse_with_options}(). - To track when this is over you can listen to libvlc_MediaParsedChanged - event. However if this functions returns an error, you will not receive any - events. - It uses a flag to specify parse options (see L{MediaParseFlag}). All - these flags can be combined. By default, media is parsed if it's a local - file. - @note: Parsing can be aborted with L{libvlc_media_parse_stop}(). - See libvlc_MediaParsedChanged - See L{libvlc_media_get_meta} - See L{libvlc_media_tracks_get} - See L{libvlc_media_get_parsed_status} - See L{MediaParseFlag}. - @param p_md: media descriptor object. - @param parse_flag: parse options: - @param timeout: maximum time allowed to preparse the media. If -1, the default "preparse-timeout" option will be used as a timeout. If 0, it will wait indefinitely. If > 0, the timeout will be used (in milliseconds). - @return: -1 in case of error, 0 otherwise. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_parse_with_options', None) or \ - _Cfunction('libvlc_media_parse_with_options', ((1,), (1,), (1,),), None, - ctypes.c_int, Media, MediaParseFlag, ctypes.c_int) - return f(p_md, parse_flag, timeout) - - -def libvlc_media_parse_stop(p_md): - '''Stop the parsing of the media - When the media parsing is stopped, the libvlc_MediaParsedChanged event will - be sent with the libvlc_media_parsed_status_timeout status. - See L{libvlc_media_parse_with_options}. - @param p_md: media descriptor object. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_parse_stop', None) or \ - _Cfunction('libvlc_media_parse_stop', ((1,),), None, - None, Media) - return f(p_md) - - -def libvlc_media_get_parsed_status(p_md): - '''Get Parsed status for media descriptor object. - See libvlc_MediaParsedChanged - See L{MediaParsedStatus}. - @param p_md: media descriptor object. - @return: a value of the L{MediaParsedStatus} enum. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_get_parsed_status', None) or \ - _Cfunction('libvlc_media_get_parsed_status', ((1,),), None, - MediaParsedStatus, Media) - return f(p_md) - - -def libvlc_media_set_user_data(p_md, p_new_user_data): - '''Sets media descriptor's user_data. user_data is specialized data - accessed by the host application, VLC.framework uses it as a pointer to - an native object that references a L{Media} pointer. - @param p_md: media descriptor object. - @param p_new_user_data: pointer to user data. - ''' - f = _Cfunctions.get('libvlc_media_set_user_data', None) or \ - _Cfunction('libvlc_media_set_user_data', ((1,), (1,),), None, - None, Media, ctypes.c_void_p) - return f(p_md, p_new_user_data) - - -def libvlc_media_get_user_data(p_md): - '''Get media descriptor's user_data. user_data is specialized data - accessed by the host application, VLC.framework uses it as a pointer to - an native object that references a L{Media} pointer. - @param p_md: media descriptor object. - ''' - f = _Cfunctions.get('libvlc_media_get_user_data', None) or \ - _Cfunction('libvlc_media_get_user_data', ((1,),), None, - ctypes.c_void_p, Media) - return f(p_md) - - -def libvlc_media_tracks_get(p_md, tracks): - '''Get media descriptor's elementary streams description - Note, you need to call L{libvlc_media_parse}() or play the media at least once - before calling this function. - Not doing this will result in an empty array. - @param p_md: media descriptor object. - @param tracks: address to store an allocated array of Elementary Streams descriptions (must be freed with L{libvlc_media_tracks_release}. - @return: the number of Elementary Streams (zero on error). - @version: LibVLC 2.1.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_tracks_get', None) or \ - _Cfunction('libvlc_media_tracks_get', ((1,), (1,),), None, - ctypes.c_uint, Media, ctypes.POINTER(ctypes.POINTER(MediaTrack))) - return f(p_md, tracks) - - -def libvlc_media_get_codec_description(i_type, i_codec): - '''Get codec description from media elementary stream. - @param i_type: i_type from L{MediaTrack}. - @param i_codec: i_codec or i_original_fourcc from L{MediaTrack}. - @return: codec description. - @version: LibVLC 3.0.0 and later. See L{MediaTrack}. - ''' - f = _Cfunctions.get('libvlc_media_get_codec_description', None) or \ - _Cfunction('libvlc_media_get_codec_description', ((1,), (1,),), None, - ctypes.c_char_p, TrackType, ctypes.c_uint32) - return f(i_type, i_codec) - - -def libvlc_media_tracks_release(p_tracks, i_count): - '''Release media descriptor's elementary streams description array. - @param p_tracks: tracks info array to release. - @param i_count: number of elements in the array. - @version: LibVLC 2.1.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_tracks_release', None) or \ - _Cfunction('libvlc_media_tracks_release', ((1,), (1,),), None, - None, ctypes.POINTER(MediaTrack), ctypes.c_uint) - return f(p_tracks, i_count) - - -def libvlc_media_get_type(p_md): - '''Get the media type of the media descriptor object. - @param p_md: media descriptor object. - @return: media type. - @version: LibVLC 3.0.0 and later. See L{MediaType}. - ''' - f = _Cfunctions.get('libvlc_media_get_type', None) or \ - _Cfunction('libvlc_media_get_type', ((1,),), None, - MediaType, Media) - return f(p_md) - - -def libvlc_media_slaves_add(p_md, i_type, i_priority, psz_uri): - '''Add a slave to the current media. - A slave is an external input source that may contains an additional subtitle - track (like a .srt) or an additional audio track (like a .ac3). - @note: This function must be called before the media is parsed (via - L{libvlc_media_parse_with_options}()) or before the media is played (via - L{libvlc_media_player_play}()). - @param p_md: media descriptor object. - @param i_type: subtitle or audio. - @param i_priority: from 0 (low priority) to 4 (high priority). - @param psz_uri: Uri of the slave (should contain a valid scheme). - @return: 0 on success, -1 on error. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_slaves_add', None) or \ - _Cfunction('libvlc_media_slaves_add', ((1,), (1,), (1,), (1,),), None, - ctypes.c_int, Media, MediaSlaveType, ctypes.c_int, ctypes.c_char_p) - return f(p_md, i_type, i_priority, psz_uri) - - -def libvlc_media_slaves_clear(p_md): - '''Clear all slaves previously added by L{libvlc_media_slaves_add}() or - internally. - @param p_md: media descriptor object. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_slaves_clear', None) or \ - _Cfunction('libvlc_media_slaves_clear', ((1,),), None, - None, Media) - return f(p_md) - - -def libvlc_media_slaves_get(p_md, ppp_slaves): - '''Get a media descriptor's slave list - The list will contain slaves parsed by VLC or previously added by - L{libvlc_media_slaves_add}(). The typical use case of this function is to save - a list of slave in a database for a later use. - @param p_md: media descriptor object. - @param ppp_slaves: address to store an allocated array of slaves (must be freed with L{libvlc_media_slaves_release}()) [OUT]. - @return: the number of slaves (zero on error). - @version: LibVLC 3.0.0 and later. See L{libvlc_media_slaves_add}. - ''' - f = _Cfunctions.get('libvlc_media_slaves_get', None) or \ - _Cfunction('libvlc_media_slaves_get', ((1,), (1,),), None, - ctypes.c_int, Media, ctypes.POINTER(ctypes.POINTER(MediaSlave))) - return f(p_md, ppp_slaves) - - -def libvlc_media_slaves_release(pp_slaves, i_count): - '''Release a media descriptor's slave list. - @param pp_slaves: slave array to release. - @param i_count: number of elements in the array. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_slaves_release', None) or \ - _Cfunction('libvlc_media_slaves_release', ((1,), (1,),), None, - None, ctypes.POINTER(MediaSlave), ctypes.c_int) - return f(pp_slaves, i_count) - - -def libvlc_renderer_item_hold(p_item): - '''Hold a renderer item, i.e. creates a new reference - This functions need to called from the libvlc_RendererDiscovererItemAdded - callback if the libvlc user wants to use this item after. (for display or - for passing it to the mediaplayer for example). - @return: the current item. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_item_hold', None) or \ - _Cfunction('libvlc_renderer_item_hold', ((1,),), None, - ctypes.c_void_p, ctypes.c_void_p) - return f(p_item) - - -def libvlc_renderer_item_release(p_item): - '''Releases a renderer item, i.e. decrements its reference counter. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_item_release', None) or \ - _Cfunction('libvlc_renderer_item_release', ((1,),), None, - None, ctypes.c_void_p) - return f(p_item) - - -def libvlc_renderer_item_name(p_item): - '''Get the human readable name of a renderer item. - @return: the name of the item (can't be None, must *not* be freed). - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_item_name', None) or \ - _Cfunction('libvlc_renderer_item_name', ((1,),), None, - ctypes.c_char_p, ctypes.c_void_p) - return f(p_item) - - -def libvlc_renderer_item_type(p_item): - '''Get the type (not translated) of a renderer item. For now, the type can only - be "chromecast" ("upnp", "airplay" may come later). - @return: the type of the item (can't be None, must *not* be freed). - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_item_type', None) or \ - _Cfunction('libvlc_renderer_item_type', ((1,),), None, - ctypes.c_char_p, ctypes.c_void_p) - return f(p_item) - - -def libvlc_renderer_item_icon_uri(p_item): - '''Get the icon uri of a renderer item. - @return: the uri of the item's icon (can be None, must *not* be freed). - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_item_icon_uri', None) or \ - _Cfunction('libvlc_renderer_item_icon_uri', ((1,),), None, - ctypes.c_char_p, ctypes.c_void_p) - return f(p_item) - - -def libvlc_renderer_item_flags(p_item): - '''Get the flags of a renderer item - See LIBVLC_RENDERER_CAN_AUDIO - See LIBVLC_RENDERER_CAN_VIDEO. - @return: bitwise flag: capabilities of the renderer, see. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_item_flags', None) or \ - _Cfunction('libvlc_renderer_item_flags', ((1,),), None, - ctypes.c_int, ctypes.c_void_p) - return f(p_item) - - -def libvlc_renderer_discoverer_new(p_inst, psz_name): - '''Create a renderer discoverer object by name - After this object is created, you should attach to events in order to be - notified of the discoverer events. - You need to call L{libvlc_renderer_discoverer_start}() in order to start the - discovery. - See L{libvlc_renderer_discoverer_event_manager}() - See L{libvlc_renderer_discoverer_start}(). - @param p_inst: libvlc instance. - @param psz_name: service name; use L{libvlc_renderer_discoverer_list_get}() to get a list of the discoverer names available in this libVLC instance. - @return: media discover object or None in case of error. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_new', None) or \ - _Cfunction('libvlc_renderer_discoverer_new', ((1,), (1,),), None, - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_inst, psz_name) - - -def libvlc_renderer_discoverer_release(p_rd): - '''Release a renderer discoverer object. - @param p_rd: renderer discoverer object. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_release', None) or \ - _Cfunction('libvlc_renderer_discoverer_release', ((1,),), None, - None, ctypes.c_void_p) - return f(p_rd) - - -def libvlc_renderer_discoverer_start(p_rd): - '''Start renderer discovery - To stop it, call L{libvlc_renderer_discoverer_stop}() or - L{libvlc_renderer_discoverer_release}() directly. - See L{libvlc_renderer_discoverer_stop}(). - @param p_rd: renderer discoverer object. - @return: -1 in case of error, 0 otherwise. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_start', None) or \ - _Cfunction('libvlc_renderer_discoverer_start', ((1,),), None, - ctypes.c_int, ctypes.c_void_p) - return f(p_rd) - - -def libvlc_renderer_discoverer_stop(p_rd): - '''Stop renderer discovery. - See L{libvlc_renderer_discoverer_start}(). - @param p_rd: renderer discoverer object. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_stop', None) or \ - _Cfunction('libvlc_renderer_discoverer_stop', ((1,),), None, - None, ctypes.c_void_p) - return f(p_rd) - - -def libvlc_renderer_discoverer_event_manager(p_rd): - '''Get the event manager of the renderer discoverer - The possible events to attach are @ref libvlc_RendererDiscovererItemAdded - and @ref libvlc_RendererDiscovererItemDeleted. - The @ref libvlc_renderer_item_t struct passed to event callbacks is owned by - VLC, users should take care of holding/releasing this struct for their - internal usage. - See libvlc_event_t.u.renderer_discoverer_item_added.item - See libvlc_event_t.u.renderer_discoverer_item_removed.item. - @return: a valid event manager (can't fail). - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_event_manager', None) or \ - _Cfunction('libvlc_renderer_discoverer_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, ctypes.c_void_p) - return f(p_rd) - - -def libvlc_renderer_discoverer_list_get(p_inst, ppp_services): - '''Get media discoverer services - See libvlc_renderer_list_release(). - @param p_inst: libvlc instance. - @param ppp_services: address to store an allocated array of renderer discoverer services (must be freed with libvlc_renderer_list_release() by the caller) [OUT]. - @return: the number of media discoverer services (0 on error). - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_list_get', None) or \ - _Cfunction('libvlc_renderer_discoverer_list_get', ((1,), (1,),), None, - ctypes.c_size_t, Instance, ctypes.POINTER(ctypes.POINTER(RDDescription))) - return f(p_inst, ppp_services) - - -def libvlc_renderer_discoverer_list_release(pp_services, i_count): - '''Release an array of media discoverer services - See L{libvlc_renderer_discoverer_list_get}(). - @param pp_services: array to release. - @param i_count: number of elements in the array. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_list_release', None) or \ - _Cfunction('libvlc_renderer_discoverer_list_release', ((1,), (1,),), None, - None, ctypes.POINTER(RDDescription), ctypes.c_size_t) - return f(pp_services, i_count) - - -def libvlc_media_list_new(p_instance): - '''Create an empty media list. - @param p_instance: libvlc instance. - @return: empty media list, or None on error. - ''' - f = _Cfunctions.get('libvlc_media_list_new', None) or \ - _Cfunction('libvlc_media_list_new', ((1,),), class_result(MediaList), - ctypes.c_void_p, Instance) - return f(p_instance) - - -def libvlc_media_list_release(p_ml): - '''Release media list created with L{libvlc_media_list_new}(). - @param p_ml: a media list created with L{libvlc_media_list_new}(). - ''' - f = _Cfunctions.get('libvlc_media_list_release', None) or \ - _Cfunction('libvlc_media_list_release', ((1,),), None, - None, MediaList) - return f(p_ml) - - -def libvlc_media_list_retain(p_ml): - '''Retain reference to a media list. - @param p_ml: a media list created with L{libvlc_media_list_new}(). - ''' - f = _Cfunctions.get('libvlc_media_list_retain', None) or \ - _Cfunction('libvlc_media_list_retain', ((1,),), None, - None, MediaList) - return f(p_ml) - - -def libvlc_media_list_set_media(p_ml, p_md): - '''Associate media instance with this media list instance. - If another media instance was present it will be released. - The L{libvlc_media_list_lock} should NOT be held upon entering this function. - @param p_ml: a media list instance. - @param p_md: media instance to add. - ''' - f = _Cfunctions.get('libvlc_media_list_set_media', None) or \ - _Cfunction('libvlc_media_list_set_media', ((1,), (1,),), None, - None, MediaList, Media) - return f(p_ml, p_md) - - -def libvlc_media_list_media(p_ml): - '''Get media instance from this media list instance. This action will increase - the refcount on the media instance. - The L{libvlc_media_list_lock} should NOT be held upon entering this function. - @param p_ml: a media list instance. - @return: media instance. - ''' - f = _Cfunctions.get('libvlc_media_list_media', None) or \ - _Cfunction('libvlc_media_list_media', ((1,),), class_result(Media), - ctypes.c_void_p, MediaList) - return f(p_ml) - - -def libvlc_media_list_add_media(p_ml, p_md): - '''Add media instance to media list - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - @param p_md: a media instance. - @return: 0 on success, -1 if the media list is read-only. - ''' - f = _Cfunctions.get('libvlc_media_list_add_media', None) or \ - _Cfunction('libvlc_media_list_add_media', ((1,), (1,),), None, - ctypes.c_int, MediaList, Media) - return f(p_ml, p_md) - - -def libvlc_media_list_insert_media(p_ml, p_md, i_pos): - '''Insert media instance in media list on a position - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - @param p_md: a media instance. - @param i_pos: position in array where to insert. - @return: 0 on success, -1 if the media list is read-only. - ''' - f = _Cfunctions.get('libvlc_media_list_insert_media', None) or \ - _Cfunction('libvlc_media_list_insert_media', ((1,), (1,), (1,),), None, - ctypes.c_int, MediaList, Media, ctypes.c_int) - return f(p_ml, p_md, i_pos) - - -def libvlc_media_list_remove_index(p_ml, i_pos): - '''Remove media instance from media list on a position - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - @param i_pos: position in array where to insert. - @return: 0 on success, -1 if the list is read-only or the item was not found. - ''' - f = _Cfunctions.get('libvlc_media_list_remove_index', None) or \ - _Cfunction('libvlc_media_list_remove_index', ((1,), (1,),), None, - ctypes.c_int, MediaList, ctypes.c_int) - return f(p_ml, i_pos) - - -def libvlc_media_list_count(p_ml): - '''Get count on media list items - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - @return: number of items in media list. - ''' - f = _Cfunctions.get('libvlc_media_list_count', None) or \ - _Cfunction('libvlc_media_list_count', ((1,),), None, - ctypes.c_int, MediaList) - return f(p_ml) - - -def libvlc_media_list_item_at_index(p_ml, i_pos): - '''List media instance in media list at a position - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - @param i_pos: position in array where to insert. - @return: media instance at position i_pos, or None if not found. In case of success, L{libvlc_media_retain}() is called to increase the refcount on the media. - ''' - f = _Cfunctions.get('libvlc_media_list_item_at_index', None) or \ - _Cfunction('libvlc_media_list_item_at_index', ((1,), (1,),), class_result(Media), - ctypes.c_void_p, MediaList, ctypes.c_int) - return f(p_ml, i_pos) - - -def libvlc_media_list_index_of_item(p_ml, p_md): - '''Find index position of List media instance in media list. - Warning: the function will return the first matched position. - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - @param p_md: media instance. - @return: position of media instance or -1 if media not found. - ''' - f = _Cfunctions.get('libvlc_media_list_index_of_item', None) or \ - _Cfunction('libvlc_media_list_index_of_item', ((1,), (1,),), None, - ctypes.c_int, MediaList, Media) - return f(p_ml, p_md) - - -def libvlc_media_list_is_readonly(p_ml): - '''This indicates if this media list is read-only from a user point of view. - @param p_ml: media list instance. - @return: 1 on readonly, 0 on readwrite \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_list_is_readonly', None) or \ - _Cfunction('libvlc_media_list_is_readonly', ((1,),), None, - ctypes.c_int, MediaList) - return f(p_ml) - - -def libvlc_media_list_lock(p_ml): - '''Get lock on media list items. - @param p_ml: a media list instance. - ''' - f = _Cfunctions.get('libvlc_media_list_lock', None) or \ - _Cfunction('libvlc_media_list_lock', ((1,),), None, - None, MediaList) - return f(p_ml) - - -def libvlc_media_list_unlock(p_ml): - '''Release lock on media list items - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - ''' - f = _Cfunctions.get('libvlc_media_list_unlock', None) or \ - _Cfunction('libvlc_media_list_unlock', ((1,),), None, - None, MediaList) - return f(p_ml) - - -def libvlc_media_list_event_manager(p_ml): - '''Get libvlc_event_manager from this media list instance. - The p_event_manager is immutable, so you don't have to hold the lock. - @param p_ml: a media list instance. - @return: libvlc_event_manager. - ''' - f = _Cfunctions.get('libvlc_media_list_event_manager', None) or \ - _Cfunction('libvlc_media_list_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, MediaList) - return f(p_ml) - - -def libvlc_media_player_get_fps(p_mi): - '''Get movie fps rate - This function is provided for backward compatibility. It cannot deal with - multiple video tracks. In LibVLC versions prior to 3.0, it would also fail - if the file format did not convey the frame rate explicitly. - \deprecated Consider using L{libvlc_media_tracks_get}() instead. - @param p_mi: the Media Player. - @return: frames per second (fps) for this playing movie, or 0 if unspecified. - ''' - f = _Cfunctions.get('libvlc_media_player_get_fps', None) or \ - _Cfunction('libvlc_media_player_get_fps', ((1,),), None, - ctypes.c_float, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_agl(p_mi, drawable): - '''\deprecated Use L{libvlc_media_player_set_nsobject}() instead. - ''' - f = _Cfunctions.get('libvlc_media_player_set_agl', None) or \ - _Cfunction('libvlc_media_player_set_agl', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint32) - return f(p_mi, drawable) - - -def libvlc_media_player_get_agl(p_mi): - '''\deprecated Use L{libvlc_media_player_get_nsobject}() instead. - ''' - f = _Cfunctions.get('libvlc_media_player_get_agl', None) or \ - _Cfunction('libvlc_media_player_get_agl', ((1,),), None, - ctypes.c_uint32, MediaPlayer) - return f(p_mi) - - -def libvlc_track_description_release(p_track_description): - '''\deprecated Use L{libvlc_track_description_list_release}() instead. - ''' - f = _Cfunctions.get('libvlc_track_description_release', None) or \ - _Cfunction('libvlc_track_description_release', ((1,),), None, - None, ctypes.POINTER(TrackDescription)) - return f(p_track_description) - - -def libvlc_video_get_height(p_mi): - '''Get current video height. - \deprecated Use L{libvlc_video_get_size}() instead. - @param p_mi: the media player. - @return: the video pixel height or 0 if not applicable. - ''' - f = _Cfunctions.get('libvlc_video_get_height', None) or \ - _Cfunction('libvlc_video_get_height', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_width(p_mi): - '''Get current video width. - \deprecated Use L{libvlc_video_get_size}() instead. - @param p_mi: the media player. - @return: the video pixel width or 0 if not applicable. - ''' - f = _Cfunctions.get('libvlc_video_get_width', None) or \ - _Cfunction('libvlc_video_get_width', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_title_description(p_mi): - '''Get the description of available titles. - @param p_mi: the media player. - @return: list containing description of available titles. It must be freed with L{libvlc_track_description_list_release}(). - ''' - f = _Cfunctions.get('libvlc_video_get_title_description', None) or \ - _Cfunction('libvlc_video_get_title_description', ((1,),), None, - ctypes.POINTER(TrackDescription), MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_chapter_description(p_mi, i_title): - '''Get the description of available chapters for specific title. - @param p_mi: the media player. - @param i_title: selected title. - @return: list containing description of available chapter for title i_title. It must be freed with L{libvlc_track_description_list_release}(). - ''' - f = _Cfunctions.get('libvlc_video_get_chapter_description', None) or \ - _Cfunction('libvlc_video_get_chapter_description', ((1,), (1,),), None, - ctypes.POINTER(TrackDescription), MediaPlayer, ctypes.c_int) - return f(p_mi, i_title) - - -def libvlc_video_set_subtitle_file(p_mi, psz_subtitle): - '''Set new video subtitle file. - \deprecated Use L{libvlc_media_player_add_slave}() instead. - @param p_mi: the media player. - @param psz_subtitle: new video subtitle file. - @return: the success status (boolean). - ''' - f = _Cfunctions.get('libvlc_video_set_subtitle_file', None) or \ - _Cfunction('libvlc_video_set_subtitle_file', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_char_p) - return f(p_mi, psz_subtitle) - - -def libvlc_toggle_teletext(p_mi): - '''Toggle teletext transparent status on video output. - \deprecated use L{libvlc_video_set_teletext}() instead. - @param p_mi: the media player. - ''' - f = _Cfunctions.get('libvlc_toggle_teletext', None) or \ - _Cfunction('libvlc_toggle_teletext', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_output_device_count(p_instance, psz_audio_output): - '''Backward compatibility stub. Do not use in new code. - \deprecated Use L{libvlc_audio_output_device_list_get}() instead. - @return: always 0. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_count', None) or \ - _Cfunction('libvlc_audio_output_device_count', ((1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p) - return f(p_instance, psz_audio_output) - - -def libvlc_audio_output_device_longname(p_instance, psz_output, i_device): - '''Backward compatibility stub. Do not use in new code. - \deprecated Use L{libvlc_audio_output_device_list_get}() instead. - @return: always None. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_longname', None) or \ - _Cfunction('libvlc_audio_output_device_longname', ((1,), (1,), (1,),), string_result, - ctypes.c_void_p, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_output, i_device) - - -def libvlc_audio_output_device_id(p_instance, psz_audio_output, i_device): - '''Backward compatibility stub. Do not use in new code. - \deprecated Use L{libvlc_audio_output_device_list_get}() instead. - @return: always None. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_id', None) or \ - _Cfunction('libvlc_audio_output_device_id', ((1,), (1,), (1,),), string_result, - ctypes.c_void_p, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_audio_output, i_device) - - -def libvlc_media_parse(p_md): - '''Parse a media. - This fetches (local) art, meta data and tracks information. - The method is synchronous. - \deprecated This function could block indefinitely. - Use L{libvlc_media_parse_with_options}() instead - See L{libvlc_media_parse_with_options} - See L{libvlc_media_get_meta} - See L{libvlc_media_get_tracks_info}. - @param p_md: media descriptor object. - ''' - f = _Cfunctions.get('libvlc_media_parse', None) or \ - _Cfunction('libvlc_media_parse', ((1,),), None, - None, Media) - return f(p_md) - - -def libvlc_media_parse_async(p_md): - '''Parse a media. - This fetches (local) art, meta data and tracks information. - The method is the asynchronous of L{libvlc_media_parse}(). - To track when this is over you can listen to libvlc_MediaParsedChanged - event. However if the media was already parsed you will not receive this - event. - \deprecated You can't be sure to receive the libvlc_MediaParsedChanged - event (you can wait indefinitely for this event). - Use L{libvlc_media_parse_with_options}() instead - See L{libvlc_media_parse} - See libvlc_MediaParsedChanged - See L{libvlc_media_get_meta} - See L{libvlc_media_get_tracks_info}. - @param p_md: media descriptor object. - ''' - f = _Cfunctions.get('libvlc_media_parse_async', None) or \ - _Cfunction('libvlc_media_parse_async', ((1,),), None, - None, Media) - return f(p_md) - - -def libvlc_media_is_parsed(p_md): - '''Return true is the media descriptor object is parsed - \deprecated This can return true in case of failure. - Use L{libvlc_media_get_parsed_status}() instead - See libvlc_MediaParsedChanged. - @param p_md: media descriptor object. - @return: true if media object has been parsed otherwise it returns false \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_is_parsed', None) or \ - _Cfunction('libvlc_media_is_parsed', ((1,),), None, - ctypes.c_int, Media) - return f(p_md) - - -def libvlc_media_get_tracks_info(p_md): - '''Get media descriptor's elementary streams description - Note, you need to call L{libvlc_media_parse}() or play the media at least once - before calling this function. - Not doing this will result in an empty array. - \deprecated Use L{libvlc_media_tracks_get}() instead. - @param p_md: media descriptor object. - @param tracks: address to store an allocated array of Elementary Streams descriptions (must be freed by the caller) [OUT]. - @return: the number of Elementary Streams. - ''' - f = _Cfunctions.get('libvlc_media_get_tracks_info', None) or \ - _Cfunction('libvlc_media_get_tracks_info', ((1,), (2,),), None, - ctypes.c_int, Media, ctypes.POINTER(ctypes.c_void_p)) - return f(p_md) - - -def libvlc_media_discoverer_new_from_name(p_inst, psz_name): - '''\deprecated Use L{libvlc_media_discoverer_new}() and L{libvlc_media_discoverer_start}(). - ''' - f = _Cfunctions.get('libvlc_media_discoverer_new_from_name', None) or \ - _Cfunction('libvlc_media_discoverer_new_from_name', ((1,), (1,),), class_result(MediaDiscoverer), - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_inst, psz_name) - - -def libvlc_media_discoverer_localized_name(p_mdis): - '''Get media service discover object its localized name. - \deprecated Useless, use L{libvlc_media_discoverer_list_get}() to get the - longname of the service discovery. - @param p_mdis: media discover object. - @return: localized name or None if the media_discoverer is not started. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_localized_name', None) or \ - _Cfunction('libvlc_media_discoverer_localized_name', ((1,),), string_result, - ctypes.c_void_p, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_media_discoverer_event_manager(p_mdis): - '''Get event manager from media service discover object. - \deprecated Useless, media_discoverer events are only triggered when calling - L{libvlc_media_discoverer_start}() and L{libvlc_media_discoverer_stop}(). - @param p_mdis: media service discover object. - @return: event manager object. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_event_manager', None) or \ - _Cfunction('libvlc_media_discoverer_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_wait(p_instance): - '''Waits until an interface causes the instance to exit. - You should start at least one interface first, using L{libvlc_add_intf}(). - @param p_instance: the instance @warning This function wastes one thread doing basically nothing. libvlc_set_exit_handler() should be used instead. - ''' - f = _Cfunctions.get('libvlc_wait', None) or \ - _Cfunction('libvlc_wait', ((1,),), None, - None, Instance) - return f(p_instance) - - -def libvlc_get_log_verbosity(p_instance): - '''Always returns minus one. - This function is only provided for backward compatibility. - @param p_instance: ignored. - @return: always -1. - ''' - f = _Cfunctions.get('libvlc_get_log_verbosity', None) or \ - _Cfunction('libvlc_get_log_verbosity', ((1,),), None, - ctypes.c_uint, Instance) - return f(p_instance) - - -def libvlc_set_log_verbosity(p_instance, level): - '''This function does nothing. - It is only provided for backward compatibility. - @param p_instance: ignored. - @param level: ignored. - ''' - f = _Cfunctions.get('libvlc_set_log_verbosity', None) or \ - _Cfunction('libvlc_set_log_verbosity', ((1,), (1,),), None, - None, Instance, ctypes.c_uint) - return f(p_instance, level) - - -def libvlc_log_open(p_instance): - '''This function does nothing useful. - It is only provided for backward compatibility. - @param p_instance: libvlc instance. - @return: an unique pointer or None on error. - ''' - f = _Cfunctions.get('libvlc_log_open', None) or \ - _Cfunction('libvlc_log_open', ((1,),), None, - Log_ptr, Instance) - return f(p_instance) - - -def libvlc_log_close(p_log): - '''Frees memory allocated by L{libvlc_log_open}(). - @param p_log: libvlc log instance or None. - ''' - f = _Cfunctions.get('libvlc_log_close', None) or \ - _Cfunction('libvlc_log_close', ((1,),), None, - None, Log_ptr) - return f(p_log) - - -def libvlc_log_count(p_log): - '''Always returns zero. - This function is only provided for backward compatibility. - @param p_log: ignored. - @return: always zero. - ''' - f = _Cfunctions.get('libvlc_log_count', None) or \ - _Cfunction('libvlc_log_count', ((1,),), None, - ctypes.c_uint, Log_ptr) - return f(p_log) - - -def libvlc_log_clear(p_log): - '''This function does nothing. - It is only provided for backward compatibility. - @param p_log: ignored. - ''' - f = _Cfunctions.get('libvlc_log_clear', None) or \ - _Cfunction('libvlc_log_clear', ((1,),), None, - None, Log_ptr) - return f(p_log) - - -def libvlc_log_get_iterator(p_log): - '''This function does nothing useful. - It is only provided for backward compatibility. - @param p_log: ignored. - @return: an unique pointer or None on error or if the parameter was None. - ''' - f = _Cfunctions.get('libvlc_log_get_iterator', None) or \ - _Cfunction('libvlc_log_get_iterator', ((1,),), class_result(LogIterator), - ctypes.c_void_p, Log_ptr) - return f(p_log) - - -def libvlc_log_iterator_free(p_iter): - '''Frees memory allocated by L{libvlc_log_get_iterator}(). - @param p_iter: libvlc log iterator or None. - ''' - f = _Cfunctions.get('libvlc_log_iterator_free', None) or \ - _Cfunction('libvlc_log_iterator_free', ((1,),), None, - None, LogIterator) - return f(p_iter) - - -def libvlc_log_iterator_has_next(p_iter): - '''Always returns zero. - This function is only provided for backward compatibility. - @param p_iter: ignored. - @return: always zero. - ''' - f = _Cfunctions.get('libvlc_log_iterator_has_next', None) or \ - _Cfunction('libvlc_log_iterator_has_next', ((1,),), None, - ctypes.c_int, LogIterator) - return f(p_iter) - - -def libvlc_log_iterator_next(p_iter, p_buf): - '''Always returns None. - This function is only provided for backward compatibility. - @param p_iter: libvlc log iterator or None. - @param p_buf: ignored. - @return: always None. - ''' - f = _Cfunctions.get('libvlc_log_iterator_next', None) or \ - _Cfunction('libvlc_log_iterator_next', ((1,), (1,),), None, - ctypes.POINTER(LogMessage), LogIterator, ctypes.POINTER(LogMessage)) - return f(p_iter, p_buf) - - -def libvlc_playlist_play(p_instance, i_id, i_options, ppsz_options): - '''Start playing (if there is any item in the playlist). - Additionnal playlist item options can be specified for addition to the - item before it is played. - @param p_instance: the playlist instance. - @param i_id: the item to play. If this is a negative number, the next item will be selected. Otherwise, the item with the given ID will be played. - @param i_options: the number of options to add to the item. - @param ppsz_options: the options to add to the item. - ''' - f = _Cfunctions.get('libvlc_playlist_play', None) or \ - _Cfunction('libvlc_playlist_play', ((1,), (1,), (1,), (1,),), None, - None, Instance, ctypes.c_int, ctypes.c_int, ListPOINTER(ctypes.c_char_p)) - return f(p_instance, i_id, i_options, ppsz_options) - - -def libvlc_media_player_new(p_libvlc_instance): - '''Create an empty Media Player object. - @param p_libvlc_instance: the libvlc instance in which the Media Player should be created. - @return: a new media player object, or None on error. - ''' - f = _Cfunctions.get('libvlc_media_player_new', None) or \ - _Cfunction('libvlc_media_player_new', ((1,),), class_result(MediaPlayer), - ctypes.c_void_p, Instance) - return f(p_libvlc_instance) - - -def libvlc_media_player_new_from_media(p_md): - '''Create a Media Player object from a Media. - @param p_md: the media. Afterwards the p_md can be safely destroyed. - @return: a new media player object, or None on error. - ''' - f = _Cfunctions.get('libvlc_media_player_new_from_media', None) or \ - _Cfunction('libvlc_media_player_new_from_media', ((1,),), class_result(MediaPlayer), - ctypes.c_void_p, Media) - return f(p_md) - - -def libvlc_media_player_release(p_mi): - '''Release a media_player after use - Decrement the reference count of a media player object. If the - reference count is 0, then L{libvlc_media_player_release}() will - release the media player object. If the media player object - has been released, then it should not be used again. - @param p_mi: the Media Player to free. - ''' - f = _Cfunctions.get('libvlc_media_player_release', None) or \ - _Cfunction('libvlc_media_player_release', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_retain(p_mi): - '''Retain a reference to a media player object. Use - L{libvlc_media_player_release}() to decrement reference count. - @param p_mi: media player object. - ''' - f = _Cfunctions.get('libvlc_media_player_retain', None) or \ - _Cfunction('libvlc_media_player_retain', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_media(p_mi, p_md): - '''Set the media that will be used by the media_player. If any, - previous md will be released. - @param p_mi: the Media Player. - @param p_md: the Media. Afterwards the p_md can be safely destroyed. - ''' - f = _Cfunctions.get('libvlc_media_player_set_media', None) or \ - _Cfunction('libvlc_media_player_set_media', ((1,), (1,),), None, - None, MediaPlayer, Media) - return f(p_mi, p_md) - - -def libvlc_media_player_get_media(p_mi): - '''Get the media used by the media_player. - @param p_mi: the Media Player. - @return: the media associated with p_mi, or None if no media is associated. - ''' - f = _Cfunctions.get('libvlc_media_player_get_media', None) or \ - _Cfunction('libvlc_media_player_get_media', ((1,),), class_result(Media), - ctypes.c_void_p, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_event_manager(p_mi): - '''Get the Event Manager from which the media player send event. - @param p_mi: the Media Player. - @return: the event manager associated with p_mi. - ''' - f = _Cfunctions.get('libvlc_media_player_event_manager', None) or \ - _Cfunction('libvlc_media_player_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_is_playing(p_mi): - '''is_playing. - @param p_mi: the Media Player. - @return: 1 if the media player is playing, 0 otherwise \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_player_is_playing', None) or \ - _Cfunction('libvlc_media_player_is_playing', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_play(p_mi): - '''Play. - @param p_mi: the Media Player. - @return: 0 if playback started (and was already started), or -1 on error. - ''' - f = _Cfunctions.get('libvlc_media_player_play', None) or \ - _Cfunction('libvlc_media_player_play', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_pause(mp, do_pause): - '''Pause or resume (no effect if there is no media). - @param mp: the Media Player. - @param do_pause: play/resume if zero, pause if non-zero. - @version: LibVLC 1.1.1 or later. - ''' - f = _Cfunctions.get('libvlc_media_player_set_pause', None) or \ - _Cfunction('libvlc_media_player_set_pause', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_int) - return f(mp, do_pause) - - -def libvlc_media_player_pause(p_mi): - '''Toggle pause (no effect if there is no media). - @param p_mi: the Media Player. - ''' - f = _Cfunctions.get('libvlc_media_player_pause', None) or \ - _Cfunction('libvlc_media_player_pause', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_stop(p_mi): - '''Stop (no effect if there is no media). - @param p_mi: the Media Player. - ''' - f = _Cfunctions.get('libvlc_media_player_stop', None) or \ - _Cfunction('libvlc_media_player_stop', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_renderer(p_mi, p_item): - '''Set a renderer to the media player - @note: must be called before the first call of L{libvlc_media_player_play}() to - take effect. - See L{libvlc_renderer_discoverer_new}. - @param p_mi: the Media Player. - @param p_item: an item discovered by L{libvlc_renderer_discoverer_start}(). - @return: 0 on success, -1 on error. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_player_set_renderer', None) or \ - _Cfunction('libvlc_media_player_set_renderer', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_void_p) - return f(p_mi, p_item) - - -def libvlc_video_set_callbacks(mp, lock, unlock, display, opaque): - '''Set callbacks and private data to render decoded video to a custom area - in memory. - Use L{libvlc_video_set_format}() or L{libvlc_video_set_format_callbacks}() - to configure the decoded format. - @warning: Rendering video into custom memory buffers is considerably less - efficient than rendering in a custom window as normal. - For optimal perfomances, VLC media player renders into a custom window, and - does not use this function and associated callbacks. It is B{highly - recommended} that other LibVLC-based application do likewise. - To embed video in a window, use libvlc_media_player_set_xid() or equivalent - depending on the operating system. - If window embedding does not fit the application use case, then a custom - LibVLC video output display plugin is required to maintain optimal video - rendering performances. - The following limitations affect performance: - - Hardware video decoding acceleration will either be disabled completely, - or require (relatively slow) copy from video/DSP memory to main memory. - - Sub-pictures (subtitles, on-screen display, etc.) must be blent into the - main picture by the CPU instead of the GPU. - - Depending on the video format, pixel format conversion, picture scaling, - cropping and/or picture re-orientation, must be performed by the CPU - instead of the GPU. - - Memory copying is required between LibVLC reference picture buffers and - application buffers (between lock and unlock callbacks). - @param mp: the media player. - @param lock: callback to lock video memory (must not be None). - @param unlock: callback to unlock video memory (or None if not needed). - @param display: callback to display video (or None if not needed). - @param opaque: private pointer for the three callbacks (as first parameter). - @version: LibVLC 1.1.1 or later. - ''' - f = _Cfunctions.get('libvlc_video_set_callbacks', None) or \ - _Cfunction('libvlc_video_set_callbacks', ((1,), (1,), (1,), (1,), (1,),), None, - None, MediaPlayer, VideoLockCb, VideoUnlockCb, VideoDisplayCb, ctypes.c_void_p) - return f(mp, lock, unlock, display, opaque) - - -def libvlc_video_set_format(mp, chroma, width, height, pitch): - '''Set decoded video chroma and dimensions. - This only works in combination with L{libvlc_video_set_callbacks}(), - and is mutually exclusive with L{libvlc_video_set_format_callbacks}(). - @param mp: the media player. - @param chroma: a four-characters string identifying the chroma (e.g. "RV32" or "YUYV"). - @param width: pixel width. - @param height: pixel height. - @param pitch: line pitch (in bytes). - @version: LibVLC 1.1.1 or later. - @bug: All pixel planes are expected to have the same pitch. To use the YCbCr color space with chrominance subsampling, consider using L{libvlc_video_set_format_callbacks}() instead. - ''' - f = _Cfunctions.get('libvlc_video_set_format', None) or \ - _Cfunction('libvlc_video_set_format', ((1,), (1,), (1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_char_p, ctypes.c_uint, ctypes.c_uint, ctypes.c_uint) - return f(mp, chroma, width, height, pitch) - - -def libvlc_video_set_format_callbacks(mp, setup, cleanup): - '''Set decoded video chroma and dimensions. This only works in combination with - L{libvlc_video_set_callbacks}(). - @param mp: the media player. - @param setup: callback to select the video format (cannot be None). - @param cleanup: callback to release any allocated resources (or None). - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_video_set_format_callbacks', None) or \ - _Cfunction('libvlc_video_set_format_callbacks', ((1,), (1,), (1,),), None, - None, MediaPlayer, VideoFormatCb, VideoCleanupCb) - return f(mp, setup, cleanup) - - -def libvlc_media_player_set_nsobject(p_mi, drawable): - '''Set the NSView handler where the media player should render its video output. - Use the vout called "macosx". - The drawable is an NSObject that follow the VLCOpenGLVideoViewEmbedding - protocol: - @code.m - \@protocol VLCOpenGLVideoViewEmbedding - - (void)addVoutSubview:(NSView *)view; - - (void)removeVoutSubview:(NSView *)view; - \@end - @endcode - Or it can be an NSView object. - If you want to use it along with Qt see the QMacCocoaViewContainer. Then - the following code should work: - @code.mm - - NSView *video = [[NSView alloc] init]; - QMacCocoaViewContainer *container = new QMacCocoaViewContainer(video, parent); - L{libvlc_media_player_set_nsobject}(mp, video); - [video release]; - - @endcode - You can find a live example in VLCVideoView in VLCKit.framework. - @param p_mi: the Media Player. - @param drawable: the drawable that is either an NSView or an object following the VLCOpenGLVideoViewEmbedding protocol. - ''' - f = _Cfunctions.get('libvlc_media_player_set_nsobject', None) or \ - _Cfunction('libvlc_media_player_set_nsobject', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_void_p) - return f(p_mi, drawable) - - -def libvlc_media_player_get_nsobject(p_mi): - '''Get the NSView handler previously set with L{libvlc_media_player_set_nsobject}(). - @param p_mi: the Media Player. - @return: the NSView handler or 0 if none where set. - ''' - f = _Cfunctions.get('libvlc_media_player_get_nsobject', None) or \ - _Cfunction('libvlc_media_player_get_nsobject', ((1,),), None, - ctypes.c_void_p, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_xwindow(p_mi, drawable): - '''Set an X Window System drawable where the media player should render its - video output. The call takes effect when the playback starts. If it is - already started, it might need to be stopped before changes apply. - If LibVLC was built without X11 output support, then this function has no - effects. - By default, LibVLC will capture input events on the video rendering area. - Use L{libvlc_video_set_mouse_input}() and L{libvlc_video_set_key_input}() to - disable that and deliver events to the parent window / to the application - instead. By design, the X11 protocol delivers input events to only one - recipient. - @warning - The application must call the XInitThreads() function from Xlib before - L{libvlc_new}(), and before any call to XOpenDisplay() directly or via any - other library. Failure to call XInitThreads() will seriously impede LibVLC - performance. Calling XOpenDisplay() before XInitThreads() will eventually - crash the process. That is a limitation of Xlib. - @param p_mi: media player. - @param drawable: X11 window ID @note The specified identifier must correspond to an existing Input/Output class X11 window. Pixmaps are B{not} currently supported. The default X11 server is assumed, i.e. that specified in the DISPLAY environment variable. @warning LibVLC can deal with invalid X11 handle errors, however some display drivers (EGL, GLX, VA and/or VDPAU) can unfortunately not. Thus the window handle must remain valid until playback is stopped, otherwise the process may abort or crash. - @bug No more than one window handle per media player instance can be specified. If the media has multiple simultaneously active video tracks, extra tracks will be rendered into external windows beyond the control of the application. - ''' - f = _Cfunctions.get('libvlc_media_player_set_xwindow', None) or \ - _Cfunction('libvlc_media_player_set_xwindow', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint32) - return f(p_mi, drawable) - - -def libvlc_media_player_get_xwindow(p_mi): - '''Get the X Window System window identifier previously set with - L{libvlc_media_player_set_xwindow}(). Note that this will return the identifier - even if VLC is not currently using it (for instance if it is playing an - audio-only input). - @param p_mi: the Media Player. - @return: an X window ID, or 0 if none where set. - ''' - f = _Cfunctions.get('libvlc_media_player_get_xwindow', None) or \ - _Cfunction('libvlc_media_player_get_xwindow', ((1,),), None, - ctypes.c_uint32, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_hwnd(p_mi, drawable): - '''Set a Win32/Win64 API window handle (HWND) where the media player should - render its video output. If LibVLC was built without Win32/Win64 API output - support, then this has no effects. - @param p_mi: the Media Player. - @param drawable: windows handle of the drawable. - ''' - f = _Cfunctions.get('libvlc_media_player_set_hwnd', None) or \ - _Cfunction('libvlc_media_player_set_hwnd', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_void_p) - return f(p_mi, drawable) - - -def libvlc_media_player_get_hwnd(p_mi): - '''Get the Windows API window handle (HWND) previously set with - L{libvlc_media_player_set_hwnd}(). The handle will be returned even if LibVLC - is not currently outputting any video to it. - @param p_mi: the Media Player. - @return: a window handle or None if there are none. - ''' - f = _Cfunctions.get('libvlc_media_player_get_hwnd', None) or \ - _Cfunction('libvlc_media_player_get_hwnd', ((1,),), None, - ctypes.c_void_p, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_android_context(p_mi, p_awindow_handler): - '''Set the android context. - @param p_mi: the media player. - @param p_awindow_handler: org.videolan.libvlc.AWindow jobject owned by the org.videolan.libvlc.MediaPlayer class from the libvlc-android project. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_player_set_android_context', None) or \ - _Cfunction('libvlc_media_player_set_android_context', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_void_p) - return f(p_mi, p_awindow_handler) - - -def libvlc_media_player_set_evas_object(p_mi, p_evas_object): - '''Set the EFL Evas Object. - @param p_mi: the media player. - @param p_evas_object: a valid EFL Evas Object (Evas_Object). - @return: -1 if an error was detected, 0 otherwise. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_player_set_evas_object', None) or \ - _Cfunction('libvlc_media_player_set_evas_object', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_void_p) - return f(p_mi, p_evas_object) - - -def libvlc_audio_set_callbacks(mp, play, pause, resume, flush, drain, opaque): - '''Sets callbacks and private data for decoded audio. - Use L{libvlc_audio_set_format}() or L{libvlc_audio_set_format_callbacks}() - to configure the decoded audio format. - @note: The audio callbacks override any other audio output mechanism. - If the callbacks are set, LibVLC will B{not} output audio in any way. - @param mp: the media player. - @param play: callback to play audio samples (must not be None). - @param pause: callback to pause playback (or None to ignore). - @param resume: callback to resume playback (or None to ignore). - @param flush: callback to flush audio buffers (or None to ignore). - @param drain: callback to drain audio buffers (or None to ignore). - @param opaque: private pointer for the audio callbacks (as first parameter). - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_set_callbacks', None) or \ - _Cfunction('libvlc_audio_set_callbacks', ((1,), (1,), (1,), (1,), (1,), (1,), (1,),), None, - None, MediaPlayer, AudioPlayCb, AudioPauseCb, AudioResumeCb, AudioFlushCb, AudioDrainCb, - ctypes.c_void_p) - return f(mp, play, pause, resume, flush, drain, opaque) - - -def libvlc_audio_set_volume_callback(mp, set_volume): - '''Set callbacks and private data for decoded audio. This only works in - combination with L{libvlc_audio_set_callbacks}(). - Use L{libvlc_audio_set_format}() or L{libvlc_audio_set_format_callbacks}() - to configure the decoded audio format. - @param mp: the media player. - @param set_volume: callback to apply audio volume, or None to apply volume in software. - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_set_volume_callback', None) or \ - _Cfunction('libvlc_audio_set_volume_callback', ((1,), (1,),), None, - None, MediaPlayer, AudioSetVolumeCb) - return f(mp, set_volume) - - -def libvlc_audio_set_format_callbacks(mp, setup, cleanup): - '''Sets decoded audio format via callbacks. - This only works in combination with L{libvlc_audio_set_callbacks}(). - @param mp: the media player. - @param setup: callback to select the audio format (cannot be None). - @param cleanup: callback to release any allocated resources (or None). - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_set_format_callbacks', None) or \ - _Cfunction('libvlc_audio_set_format_callbacks', ((1,), (1,), (1,),), None, - None, MediaPlayer, AudioSetupCb, AudioCleanupCb) - return f(mp, setup, cleanup) - - -def libvlc_audio_set_format(mp, format, rate, channels): - '''Sets a fixed decoded audio format. - This only works in combination with L{libvlc_audio_set_callbacks}(), - and is mutually exclusive with L{libvlc_audio_set_format_callbacks}(). - @param mp: the media player. - @param format: a four-characters string identifying the sample format (e.g. "S16N" or "FL32"). - @param rate: sample rate (expressed in Hz). - @param channels: channels count. - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_set_format', None) or \ - _Cfunction('libvlc_audio_set_format', ((1,), (1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_char_p, ctypes.c_uint, ctypes.c_uint) - return f(mp, format, rate, channels) - - -def libvlc_media_player_get_length(p_mi): - '''Get the current movie length (in ms). - @param p_mi: the Media Player. - @return: the movie length (in ms), or -1 if there is no media. - ''' - f = _Cfunctions.get('libvlc_media_player_get_length', None) or \ - _Cfunction('libvlc_media_player_get_length', ((1,),), None, - ctypes.c_longlong, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_get_time(p_mi): - '''Get the current movie time (in ms). - @param p_mi: the Media Player. - @return: the movie time (in ms), or -1 if there is no media. - ''' - f = _Cfunctions.get('libvlc_media_player_get_time', None) or \ - _Cfunction('libvlc_media_player_get_time', ((1,),), None, - ctypes.c_longlong, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_time(p_mi, i_time): - '''Set the movie time (in ms). This has no effect if no media is being played. - Not all formats and protocols support this. - @param p_mi: the Media Player. - @param i_time: the movie time (in ms). - ''' - f = _Cfunctions.get('libvlc_media_player_set_time', None) or \ - _Cfunction('libvlc_media_player_set_time', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_longlong) - return f(p_mi, i_time) - - -def libvlc_media_player_get_position(p_mi): - '''Get movie position as percentage between 0.0 and 1.0. - @param p_mi: the Media Player. - @return: movie position, or -1. in case of error. - ''' - f = _Cfunctions.get('libvlc_media_player_get_position', None) or \ - _Cfunction('libvlc_media_player_get_position', ((1,),), None, - ctypes.c_float, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_position(p_mi, f_pos): - '''Set movie position as percentage between 0.0 and 1.0. - This has no effect if playback is not enabled. - This might not work depending on the underlying input format and protocol. - @param p_mi: the Media Player. - @param f_pos: the position. - ''' - f = _Cfunctions.get('libvlc_media_player_set_position', None) or \ - _Cfunction('libvlc_media_player_set_position', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_float) - return f(p_mi, f_pos) - - -def libvlc_media_player_set_chapter(p_mi, i_chapter): - '''Set movie chapter (if applicable). - @param p_mi: the Media Player. - @param i_chapter: chapter number to play. - ''' - f = _Cfunctions.get('libvlc_media_player_set_chapter', None) or \ - _Cfunction('libvlc_media_player_set_chapter', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_int) - return f(p_mi, i_chapter) - - -def libvlc_media_player_get_chapter(p_mi): - '''Get movie chapter. - @param p_mi: the Media Player. - @return: chapter number currently playing, or -1 if there is no media. - ''' - f = _Cfunctions.get('libvlc_media_player_get_chapter', None) or \ - _Cfunction('libvlc_media_player_get_chapter', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_get_chapter_count(p_mi): - '''Get movie chapter count. - @param p_mi: the Media Player. - @return: number of chapters in movie, or -1. - ''' - f = _Cfunctions.get('libvlc_media_player_get_chapter_count', None) or \ - _Cfunction('libvlc_media_player_get_chapter_count', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_will_play(p_mi): - '''Is the player able to play. - @param p_mi: the Media Player. - @return: boolean \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_player_will_play', None) or \ - _Cfunction('libvlc_media_player_will_play', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_get_chapter_count_for_title(p_mi, i_title): - '''Get title chapter count. - @param p_mi: the Media Player. - @param i_title: title. - @return: number of chapters in title, or -1. - ''' - f = _Cfunctions.get('libvlc_media_player_get_chapter_count_for_title', None) or \ - _Cfunction('libvlc_media_player_get_chapter_count_for_title', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int) - return f(p_mi, i_title) - - -def libvlc_media_player_set_title(p_mi, i_title): - '''Set movie title. - @param p_mi: the Media Player. - @param i_title: title number to play. - ''' - f = _Cfunctions.get('libvlc_media_player_set_title', None) or \ - _Cfunction('libvlc_media_player_set_title', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_int) - return f(p_mi, i_title) - - -def libvlc_media_player_get_title(p_mi): - '''Get movie title. - @param p_mi: the Media Player. - @return: title number currently playing, or -1. - ''' - f = _Cfunctions.get('libvlc_media_player_get_title', None) or \ - _Cfunction('libvlc_media_player_get_title', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_get_title_count(p_mi): - '''Get movie title count. - @param p_mi: the Media Player. - @return: title number count, or -1. - ''' - f = _Cfunctions.get('libvlc_media_player_get_title_count', None) or \ - _Cfunction('libvlc_media_player_get_title_count', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_previous_chapter(p_mi): - '''Set previous chapter (if applicable). - @param p_mi: the Media Player. - ''' - f = _Cfunctions.get('libvlc_media_player_previous_chapter', None) or \ - _Cfunction('libvlc_media_player_previous_chapter', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_next_chapter(p_mi): - '''Set next chapter (if applicable). - @param p_mi: the Media Player. - ''' - f = _Cfunctions.get('libvlc_media_player_next_chapter', None) or \ - _Cfunction('libvlc_media_player_next_chapter', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_get_rate(p_mi): - '''Get the requested movie play rate. - @warning: Depending on the underlying media, the requested rate may be - different from the real playback rate. - @param p_mi: the Media Player. - @return: movie play rate. - ''' - f = _Cfunctions.get('libvlc_media_player_get_rate', None) or \ - _Cfunction('libvlc_media_player_get_rate', ((1,),), None, - ctypes.c_float, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_rate(p_mi, rate): - '''Set movie play rate. - @param p_mi: the Media Player. - @param rate: movie play rate to set. - @return: -1 if an error was detected, 0 otherwise (but even then, it might not actually work depending on the underlying media protocol). - ''' - f = _Cfunctions.get('libvlc_media_player_set_rate', None) or \ - _Cfunction('libvlc_media_player_set_rate', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_float) - return f(p_mi, rate) - - -def libvlc_media_player_get_state(p_mi): - '''Get current movie state. - @param p_mi: the Media Player. - @return: the current state of the media player (playing, paused, ...) See L{State}. - ''' - f = _Cfunctions.get('libvlc_media_player_get_state', None) or \ - _Cfunction('libvlc_media_player_get_state', ((1,),), None, - State, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_has_vout(p_mi): - '''How many video outputs does this media player have? - @param p_mi: the media player. - @return: the number of video outputs. - ''' - f = _Cfunctions.get('libvlc_media_player_has_vout', None) or \ - _Cfunction('libvlc_media_player_has_vout', ((1,),), None, - ctypes.c_uint, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_is_seekable(p_mi): - '''Is this media player seekable? - @param p_mi: the media player. - @return: true if the media player can seek \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_player_is_seekable', None) or \ - _Cfunction('libvlc_media_player_is_seekable', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_can_pause(p_mi): - '''Can this media player be paused? - @param p_mi: the media player. - @return: true if the media player can pause \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_player_can_pause', None) or \ - _Cfunction('libvlc_media_player_can_pause', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_program_scrambled(p_mi): - '''Check if the current program is scrambled. - @param p_mi: the media player. - @return: true if the current program is scrambled \libvlc_return_bool. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_player_program_scrambled', None) or \ - _Cfunction('libvlc_media_player_program_scrambled', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_next_frame(p_mi): - '''Display the next frame (if supported). - @param p_mi: the media player. - ''' - f = _Cfunctions.get('libvlc_media_player_next_frame', None) or \ - _Cfunction('libvlc_media_player_next_frame', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_navigate(p_mi, navigate): - '''Navigate through DVD Menu. - @param p_mi: the Media Player. - @param navigate: the Navigation mode. - @version: libVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_player_navigate', None) or \ - _Cfunction('libvlc_media_player_navigate', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint) - return f(p_mi, navigate) - - -def libvlc_media_player_set_video_title_display(p_mi, position, timeout): - '''Set if, and how, the video title will be shown when media is played. - @param p_mi: the media player. - @param position: position at which to display the title, or libvlc_position_disable to prevent the title from being displayed. - @param timeout: title display timeout in milliseconds (ignored if libvlc_position_disable). - @version: libVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_player_set_video_title_display', None) or \ - _Cfunction('libvlc_media_player_set_video_title_display', ((1,), (1,), (1,),), None, - None, MediaPlayer, Position, ctypes.c_int) - return f(p_mi, position, timeout) - - -def libvlc_media_player_add_slave(p_mi, i_type, psz_uri, b_select): - '''Add a slave to the current media player. - @note: If the player is playing, the slave will be added directly. This call - will also update the slave list of the attached L{Media}. - @param p_mi: the media player. - @param i_type: subtitle or audio. - @param psz_uri: Uri of the slave (should contain a valid scheme). - @param b_select: True if this slave should be selected when it's loaded. - @return: 0 on success, -1 on error. - @version: LibVLC 3.0.0 and later. See L{libvlc_media_slaves_add}. - ''' - f = _Cfunctions.get('libvlc_media_player_add_slave', None) or \ - _Cfunction('libvlc_media_player_add_slave', ((1,), (1,), (1,), (1,),), None, - ctypes.c_int, MediaPlayer, MediaSlaveType, ctypes.c_char_p, ctypes.c_bool) - return f(p_mi, i_type, psz_uri, b_select) - - -def libvlc_track_description_list_release(p_track_description): - '''Release (free) L{TrackDescription}. - @param p_track_description: the structure to release. - ''' - f = _Cfunctions.get('libvlc_track_description_list_release', None) or \ - _Cfunction('libvlc_track_description_list_release', ((1,),), None, - None, ctypes.POINTER(TrackDescription)) - return f(p_track_description) - - -def libvlc_toggle_fullscreen(p_mi): - '''Toggle fullscreen status on non-embedded video outputs. - @warning: The same limitations applies to this function - as to L{libvlc_set_fullscreen}(). - @param p_mi: the media player. - ''' - f = _Cfunctions.get('libvlc_toggle_fullscreen', None) or \ - _Cfunction('libvlc_toggle_fullscreen', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_set_fullscreen(p_mi, b_fullscreen): - '''Enable or disable fullscreen. - @warning: With most window managers, only a top-level windows can be in - full-screen mode. Hence, this function will not operate properly if - L{libvlc_media_player_set_xwindow}() was used to embed the video in a - non-top-level window. In that case, the embedding window must be reparented - to the root window B{before} fullscreen mode is enabled. You will want - to reparent it back to its normal parent when disabling fullscreen. - @param p_mi: the media player. - @param b_fullscreen: boolean for fullscreen status. - ''' - f = _Cfunctions.get('libvlc_set_fullscreen', None) or \ - _Cfunction('libvlc_set_fullscreen', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_int) - return f(p_mi, b_fullscreen) - - -def libvlc_get_fullscreen(p_mi): - '''Get current fullscreen status. - @param p_mi: the media player. - @return: the fullscreen status (boolean) \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_get_fullscreen', None) or \ - _Cfunction('libvlc_get_fullscreen', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_key_input(p_mi, on): - '''Enable or disable key press events handling, according to the LibVLC hotkeys - configuration. By default and for historical reasons, keyboard events are - handled by the LibVLC video widget. - @note: On X11, there can be only one subscriber for key press and mouse - click events per window. If your application has subscribed to those events - for the X window ID of the video widget, then LibVLC will not be able to - handle key presses and mouse clicks in any case. - @warning: This function is only implemented for X11 and Win32 at the moment. - @param p_mi: the media player. - @param on: true to handle key press events, false to ignore them. - ''' - f = _Cfunctions.get('libvlc_video_set_key_input', None) or \ - _Cfunction('libvlc_video_set_key_input', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint) - return f(p_mi, on) - - -def libvlc_video_set_mouse_input(p_mi, on): - '''Enable or disable mouse click events handling. By default, those events are - handled. This is needed for DVD menus to work, as well as a few video - filters such as "puzzle". - See L{libvlc_video_set_key_input}(). - @warning: This function is only implemented for X11 and Win32 at the moment. - @param p_mi: the media player. - @param on: true to handle mouse click events, false to ignore them. - ''' - f = _Cfunctions.get('libvlc_video_set_mouse_input', None) or \ - _Cfunction('libvlc_video_set_mouse_input', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint) - return f(p_mi, on) - - -def libvlc_video_get_size(p_mi, num): - '''Get the pixel dimensions of a video. - @param p_mi: media player. - @param num: number of the video (starting from, and most commonly 0). - @return: px pixel width, py pixel height. - ''' - f = _Cfunctions.get('libvlc_video_get_size', None) or \ - _Cfunction('libvlc_video_get_size', ((1,), (1,), (2,), (2,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint, ctypes.POINTER(ctypes.c_uint), - ctypes.POINTER(ctypes.c_uint)) - return f(p_mi, num) - - -def libvlc_video_get_cursor(p_mi, num): - '''Get the mouse pointer coordinates over a video. - Coordinates are expressed in terms of the decoded video resolution, - B{not} in terms of pixels on the screen/viewport (to get the latter, - you can query your windowing system directly). - Either of the coordinates may be negative or larger than the corresponding - dimension of the video, if the cursor is outside the rendering area. - @warning: The coordinates may be out-of-date if the pointer is not located - on the video rendering area. LibVLC does not track the pointer if it is - outside of the video widget. - @note: LibVLC does not support multiple pointers (it does of course support - multiple input devices sharing the same pointer) at the moment. - @param p_mi: media player. - @param num: number of the video (starting from, and most commonly 0). - @return: px abscissa, py ordinate. - ''' - f = _Cfunctions.get('libvlc_video_get_cursor', None) or \ - _Cfunction('libvlc_video_get_cursor', ((1,), (1,), (2,), (2,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint, ctypes.POINTER(ctypes.c_int), ctypes.POINTER(ctypes.c_int)) - return f(p_mi, num) - - -def libvlc_video_get_scale(p_mi): - '''Get the current video scaling factor. - See also L{libvlc_video_set_scale}(). - @param p_mi: the media player. - @return: the currently configured zoom factor, or 0. if the video is set to fit to the output window/drawable automatically. - ''' - f = _Cfunctions.get('libvlc_video_get_scale', None) or \ - _Cfunction('libvlc_video_get_scale', ((1,),), None, - ctypes.c_float, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_scale(p_mi, f_factor): - '''Set the video scaling factor. That is the ratio of the number of pixels on - screen to the number of pixels in the original decoded video in each - dimension. Zero is a special value; it will adjust the video to the output - window/drawable (in windowed mode) or the entire screen. - Note that not all video outputs support scaling. - @param p_mi: the media player. - @param f_factor: the scaling factor, or zero. - ''' - f = _Cfunctions.get('libvlc_video_set_scale', None) or \ - _Cfunction('libvlc_video_set_scale', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_float) - return f(p_mi, f_factor) - - -def libvlc_video_get_aspect_ratio(p_mi): - '''Get current video aspect ratio. - @param p_mi: the media player. - @return: the video aspect ratio or None if unspecified (the result must be released with free() or L{libvlc_free}()). - ''' - f = _Cfunctions.get('libvlc_video_get_aspect_ratio', None) or \ - _Cfunction('libvlc_video_get_aspect_ratio', ((1,),), string_result, - ctypes.c_void_p, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_aspect_ratio(p_mi, psz_aspect): - '''Set new video aspect ratio. - @param p_mi: the media player. - @param psz_aspect: new video aspect-ratio or None to reset to default @note Invalid aspect ratios are ignored. - ''' - f = _Cfunctions.get('libvlc_video_set_aspect_ratio', None) or \ - _Cfunction('libvlc_video_set_aspect_ratio', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_char_p) - return f(p_mi, psz_aspect) - - -def libvlc_video_new_viewpoint(): - '''Create a video viewpoint structure. - @return: video viewpoint or None (the result must be released with free() or L{libvlc_free}()). - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_video_new_viewpoint', None) or \ - _Cfunction('libvlc_video_new_viewpoint', (), None, - ctypes.POINTER(VideoViewpoint)) - return f() - - -def libvlc_video_update_viewpoint(p_mi, p_viewpoint, b_absolute): - '''Update the video viewpoint information. - @note: It is safe to call this function before the media player is started. - @param p_mi: the media player. - @param p_viewpoint: video viewpoint allocated via L{libvlc_video_new_viewpoint}(). - @param b_absolute: if true replace the old viewpoint with the new one. If false, increase/decrease it. - @return: -1 in case of error, 0 otherwise @note the values are set asynchronously, it will be used by the next frame displayed. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_video_update_viewpoint', None) or \ - _Cfunction('libvlc_video_update_viewpoint', ((1,), (1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.POINTER(VideoViewpoint), ctypes.c_bool) - return f(p_mi, p_viewpoint, b_absolute) - - -def libvlc_video_get_spu(p_mi): - '''Get current video subtitle. - @param p_mi: the media player. - @return: the video subtitle selected, or -1 if none. - ''' - f = _Cfunctions.get('libvlc_video_get_spu', None) or \ - _Cfunction('libvlc_video_get_spu', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_spu_count(p_mi): - '''Get the number of available video subtitles. - @param p_mi: the media player. - @return: the number of available video subtitles. - ''' - f = _Cfunctions.get('libvlc_video_get_spu_count', None) or \ - _Cfunction('libvlc_video_get_spu_count', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_spu_description(p_mi): - '''Get the description of available video subtitles. - @param p_mi: the media player. - @return: list containing description of available video subtitles. It must be freed with L{libvlc_track_description_list_release}(). - ''' - f = _Cfunctions.get('libvlc_video_get_spu_description', None) or \ - _Cfunction('libvlc_video_get_spu_description', ((1,),), None, - ctypes.POINTER(TrackDescription), MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_spu(p_mi, i_spu): - '''Set new video subtitle. - @param p_mi: the media player. - @param i_spu: video subtitle track to select (i_id from track description). - @return: 0 on success, -1 if out of range. - ''' - f = _Cfunctions.get('libvlc_video_set_spu', None) or \ - _Cfunction('libvlc_video_set_spu', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int) - return f(p_mi, i_spu) - - -def libvlc_video_get_spu_delay(p_mi): - '''Get the current subtitle delay. Positive values means subtitles are being - displayed later, negative values earlier. - @param p_mi: media player. - @return: time (in microseconds) the display of subtitles is being delayed. - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_video_get_spu_delay', None) or \ - _Cfunction('libvlc_video_get_spu_delay', ((1,),), None, - ctypes.c_int64, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_spu_delay(p_mi, i_delay): - '''Set the subtitle delay. This affects the timing of when the subtitle will - be displayed. Positive values result in subtitles being displayed later, - while negative values will result in subtitles being displayed earlier. - The subtitle delay will be reset to zero each time the media changes. - @param p_mi: media player. - @param i_delay: time (in microseconds) the display of subtitles should be delayed. - @return: 0 on success, -1 on error. - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_video_set_spu_delay', None) or \ - _Cfunction('libvlc_video_set_spu_delay', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int64) - return f(p_mi, i_delay) - - -def libvlc_media_player_get_full_title_descriptions(p_mi, titles): - '''Get the full description of available titles. - @param p_mi: the media player. - @param titles: address to store an allocated array of title descriptions descriptions (must be freed with L{libvlc_title_descriptions_release}() by the caller) [OUT]. - @return: the number of titles (-1 on error). - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_player_get_full_title_descriptions', None) or \ - _Cfunction('libvlc_media_player_get_full_title_descriptions', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.POINTER(ctypes.POINTER(TitleDescription))) - return f(p_mi, titles) - - -def libvlc_title_descriptions_release(p_titles, i_count): - '''Release a title description. - @param p_titles: title description array to release. - @param i_count: number of title descriptions to release. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_title_descriptions_release', None) or \ - _Cfunction('libvlc_title_descriptions_release', ((1,), (1,),), None, - None, ctypes.POINTER(TitleDescription), ctypes.c_uint) - return f(p_titles, i_count) - - -def libvlc_media_player_get_full_chapter_descriptions(p_mi, i_chapters_of_title, pp_chapters): - '''Get the full description of available chapters. - @param p_mi: the media player. - @param i_chapters_of_title: index of the title to query for chapters (uses current title if set to -1). - @param pp_chapters: address to store an allocated array of chapter descriptions descriptions (must be freed with L{libvlc_chapter_descriptions_release}() by the caller) [OUT]. - @return: the number of chapters (-1 on error). - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_player_get_full_chapter_descriptions', None) or \ - _Cfunction('libvlc_media_player_get_full_chapter_descriptions', ((1,), (1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int, ctypes.POINTER(ctypes.POINTER(ChapterDescription))) - return f(p_mi, i_chapters_of_title, pp_chapters) - - -def libvlc_chapter_descriptions_release(p_chapters, i_count): - '''Release a chapter description. - @param p_chapters: chapter description array to release. - @param i_count: number of chapter descriptions to release. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_chapter_descriptions_release', None) or \ - _Cfunction('libvlc_chapter_descriptions_release', ((1,), (1,),), None, - None, ctypes.POINTER(ChapterDescription), ctypes.c_uint) - return f(p_chapters, i_count) - - -def libvlc_video_get_crop_geometry(p_mi): - '''Get current crop filter geometry. - @param p_mi: the media player. - @return: the crop filter geometry or None if unset. - ''' - f = _Cfunctions.get('libvlc_video_get_crop_geometry', None) or \ - _Cfunction('libvlc_video_get_crop_geometry', ((1,),), string_result, - ctypes.c_void_p, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_crop_geometry(p_mi, psz_geometry): - '''Set new crop filter geometry. - @param p_mi: the media player. - @param psz_geometry: new crop filter geometry (None to unset). - ''' - f = _Cfunctions.get('libvlc_video_set_crop_geometry', None) or \ - _Cfunction('libvlc_video_set_crop_geometry', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_char_p) - return f(p_mi, psz_geometry) - - -def libvlc_video_get_teletext(p_mi): - '''Get current teletext page requested or 0 if it's disabled. - Teletext is disabled by default, call L{libvlc_video_set_teletext}() to enable - it. - @param p_mi: the media player. - @return: the current teletext page requested. - ''' - f = _Cfunctions.get('libvlc_video_get_teletext', None) or \ - _Cfunction('libvlc_video_get_teletext', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_teletext(p_mi, i_page): - '''Set new teletext page to retrieve. - This function can also be used to send a teletext key. - @param p_mi: the media player. - @param i_page: teletex page number requested. This value can be 0 to disable teletext, a number in the range ]0;1000[ to show the requested page, or a \ref L{TeletextKey}. 100 is the default teletext page. - ''' - f = _Cfunctions.get('libvlc_video_set_teletext', None) or \ - _Cfunction('libvlc_video_set_teletext', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_int) - return f(p_mi, i_page) - - -def libvlc_video_get_track_count(p_mi): - '''Get number of available video tracks. - @param p_mi: media player. - @return: the number of available video tracks (int). - ''' - f = _Cfunctions.get('libvlc_video_get_track_count', None) or \ - _Cfunction('libvlc_video_get_track_count', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_track_description(p_mi): - '''Get the description of available video tracks. - @param p_mi: media player. - @return: list with description of available video tracks, or None on error. It must be freed with L{libvlc_track_description_list_release}(). - ''' - f = _Cfunctions.get('libvlc_video_get_track_description', None) or \ - _Cfunction('libvlc_video_get_track_description', ((1,),), None, - ctypes.POINTER(TrackDescription), MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_track(p_mi): - '''Get current video track. - @param p_mi: media player. - @return: the video track ID (int) or -1 if no active input. - ''' - f = _Cfunctions.get('libvlc_video_get_track', None) or \ - _Cfunction('libvlc_video_get_track', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_track(p_mi, i_track): - '''Set video track. - @param p_mi: media player. - @param i_track: the track ID (i_id field from track description). - @return: 0 on success, -1 if out of range. - ''' - f = _Cfunctions.get('libvlc_video_set_track', None) or \ - _Cfunction('libvlc_video_set_track', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int) - return f(p_mi, i_track) - - -def libvlc_video_take_snapshot(p_mi, num, psz_filepath, i_width, i_height): - '''Take a snapshot of the current video window. - If i_width AND i_height is 0, original size is used. - If i_width XOR i_height is 0, original aspect-ratio is preserved. - @param p_mi: media player instance. - @param num: number of video output (typically 0 for the first/only one). - @param psz_filepath: the path of a file or a folder to save the screenshot into. - @param i_width: the snapshot's width. - @param i_height: the snapshot's height. - @return: 0 on success, -1 if the video was not found. - ''' - f = _Cfunctions.get('libvlc_video_take_snapshot', None) or \ - _Cfunction('libvlc_video_take_snapshot', ((1,), (1,), (1,), (1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint, ctypes.c_char_p, ctypes.c_int, ctypes.c_int) - return f(p_mi, num, psz_filepath, i_width, i_height) - - -def libvlc_video_set_deinterlace(p_mi, psz_mode): - '''Enable or disable deinterlace filter. - @param p_mi: libvlc media player. - @param psz_mode: type of deinterlace filter, None to disable. - ''' - f = _Cfunctions.get('libvlc_video_set_deinterlace', None) or \ - _Cfunction('libvlc_video_set_deinterlace', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_char_p) - return f(p_mi, psz_mode) - - -def libvlc_video_get_marquee_int(p_mi, option): - '''Get an integer marquee option value. - @param p_mi: libvlc media player. - @param option: marq option to get See libvlc_video_marquee_int_option_t. - ''' - f = _Cfunctions.get('libvlc_video_get_marquee_int', None) or \ - _Cfunction('libvlc_video_get_marquee_int', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint) - return f(p_mi, option) - - -def libvlc_video_get_marquee_string(p_mi, option): - '''Get a string marquee option value. - @param p_mi: libvlc media player. - @param option: marq option to get See libvlc_video_marquee_string_option_t. - ''' - f = _Cfunctions.get('libvlc_video_get_marquee_string', None) or \ - _Cfunction('libvlc_video_get_marquee_string', ((1,), (1,),), string_result, - ctypes.c_void_p, MediaPlayer, ctypes.c_uint) - return f(p_mi, option) - - -def libvlc_video_set_marquee_int(p_mi, option, i_val): - '''Enable, disable or set an integer marquee option - Setting libvlc_marquee_Enable has the side effect of enabling (arg !0) - or disabling (arg 0) the marq filter. - @param p_mi: libvlc media player. - @param option: marq option to set See libvlc_video_marquee_int_option_t. - @param i_val: marq option value. - ''' - f = _Cfunctions.get('libvlc_video_set_marquee_int', None) or \ - _Cfunction('libvlc_video_set_marquee_int', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint, ctypes.c_int) - return f(p_mi, option, i_val) - - -def libvlc_video_set_marquee_string(p_mi, option, psz_text): - '''Set a marquee string option. - @param p_mi: libvlc media player. - @param option: marq option to set See libvlc_video_marquee_string_option_t. - @param psz_text: marq option value. - ''' - f = _Cfunctions.get('libvlc_video_set_marquee_string', None) or \ - _Cfunction('libvlc_video_set_marquee_string', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint, ctypes.c_char_p) - return f(p_mi, option, psz_text) - - -def libvlc_video_get_logo_int(p_mi, option): - '''Get integer logo option. - @param p_mi: libvlc media player instance. - @param option: logo option to get, values of L{VideoLogoOption}. - ''' - f = _Cfunctions.get('libvlc_video_get_logo_int', None) or \ - _Cfunction('libvlc_video_get_logo_int', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint) - return f(p_mi, option) - - -def libvlc_video_set_logo_int(p_mi, option, value): - '''Set logo option as integer. Options that take a different type value - are ignored. - Passing libvlc_logo_enable as option value has the side effect of - starting (arg !0) or stopping (arg 0) the logo filter. - @param p_mi: libvlc media player instance. - @param option: logo option to set, values of L{VideoLogoOption}. - @param value: logo option value. - ''' - f = _Cfunctions.get('libvlc_video_set_logo_int', None) or \ - _Cfunction('libvlc_video_set_logo_int', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint, ctypes.c_int) - return f(p_mi, option, value) - - -def libvlc_video_set_logo_string(p_mi, option, psz_value): - '''Set logo option as string. Options that take a different type value - are ignored. - @param p_mi: libvlc media player instance. - @param option: logo option to set, values of L{VideoLogoOption}. - @param psz_value: logo option value. - ''' - f = _Cfunctions.get('libvlc_video_set_logo_string', None) or \ - _Cfunction('libvlc_video_set_logo_string', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint, ctypes.c_char_p) - return f(p_mi, option, psz_value) - - -def libvlc_video_get_adjust_int(p_mi, option): - '''Get integer adjust option. - @param p_mi: libvlc media player instance. - @param option: adjust option to get, values of L{VideoAdjustOption}. - @version: LibVLC 1.1.1 and later. - ''' - f = _Cfunctions.get('libvlc_video_get_adjust_int', None) or \ - _Cfunction('libvlc_video_get_adjust_int', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint) - return f(p_mi, option) - - -def libvlc_video_set_adjust_int(p_mi, option, value): - '''Set adjust option as integer. Options that take a different type value - are ignored. - Passing libvlc_adjust_enable as option value has the side effect of - starting (arg !0) or stopping (arg 0) the adjust filter. - @param p_mi: libvlc media player instance. - @param option: adust option to set, values of L{VideoAdjustOption}. - @param value: adjust option value. - @version: LibVLC 1.1.1 and later. - ''' - f = _Cfunctions.get('libvlc_video_set_adjust_int', None) or \ - _Cfunction('libvlc_video_set_adjust_int', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint, ctypes.c_int) - return f(p_mi, option, value) - - -def libvlc_video_get_adjust_float(p_mi, option): - '''Get float adjust option. - @param p_mi: libvlc media player instance. - @param option: adjust option to get, values of L{VideoAdjustOption}. - @version: LibVLC 1.1.1 and later. - ''' - f = _Cfunctions.get('libvlc_video_get_adjust_float', None) or \ - _Cfunction('libvlc_video_get_adjust_float', ((1,), (1,),), None, - ctypes.c_float, MediaPlayer, ctypes.c_uint) - return f(p_mi, option) - - -def libvlc_video_set_adjust_float(p_mi, option, value): - '''Set adjust option as float. Options that take a different type value - are ignored. - @param p_mi: libvlc media player instance. - @param option: adust option to set, values of L{VideoAdjustOption}. - @param value: adjust option value. - @version: LibVLC 1.1.1 and later. - ''' - f = _Cfunctions.get('libvlc_video_set_adjust_float', None) or \ - _Cfunction('libvlc_video_set_adjust_float', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint, ctypes.c_float) - return f(p_mi, option, value) - - -def libvlc_audio_output_list_get(p_instance): - '''Gets the list of available audio output modules. - @param p_instance: libvlc instance. - @return: list of available audio outputs. It must be freed with In case of error, None is returned. - ''' - f = _Cfunctions.get('libvlc_audio_output_list_get', None) or \ - _Cfunction('libvlc_audio_output_list_get', ((1,),), None, - ctypes.POINTER(AudioOutput), Instance) - return f(p_instance) - - -def libvlc_audio_output_list_release(p_list): - '''Frees the list of available audio output modules. - @param p_list: list with audio outputs for release. - ''' - f = _Cfunctions.get('libvlc_audio_output_list_release', None) or \ - _Cfunction('libvlc_audio_output_list_release', ((1,),), None, - None, ctypes.POINTER(AudioOutput)) - return f(p_list) - - -def libvlc_audio_output_set(p_mi, psz_name): - '''Selects an audio output module. - @note: Any change will take be effect only after playback is stopped and - restarted. Audio output cannot be changed while playing. - @param p_mi: media player. - @param psz_name: name of audio output, use psz_name of See L{AudioOutput}. - @return: 0 if function succeeded, -1 on error. - ''' - f = _Cfunctions.get('libvlc_audio_output_set', None) or \ - _Cfunction('libvlc_audio_output_set', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_char_p) - return f(p_mi, psz_name) - - -def libvlc_audio_output_device_enum(mp): - '''Gets a list of potential audio output devices, - See L{libvlc_audio_output_device_set}(). - @note: Not all audio outputs support enumerating devices. - The audio output may be functional even if the list is empty (None). - @note: The list may not be exhaustive. - @warning: Some audio output devices in the list might not actually work in - some circumstances. By default, it is recommended to not specify any - explicit audio device. - @param mp: media player. - @return: A None-terminated linked list of potential audio output devices. It must be freed with L{libvlc_audio_output_device_list_release}(). - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_enum', None) or \ - _Cfunction('libvlc_audio_output_device_enum', ((1,),), None, - ctypes.POINTER(AudioOutputDevice), MediaPlayer) - return f(mp) - - -def libvlc_audio_output_device_list_get(p_instance, aout): - '''Gets a list of audio output devices for a given audio output module, - See L{libvlc_audio_output_device_set}(). - @note: Not all audio outputs support this. In particular, an empty (None) - list of devices does B{not} imply that the specified audio output does - not work. - @note: The list might not be exhaustive. - @warning: Some audio output devices in the list might not actually work in - some circumstances. By default, it is recommended to not specify any - explicit audio device. - @param p_instance: libvlc instance. - @param aout: audio output name (as returned by L{libvlc_audio_output_list_get}()). - @return: A None-terminated linked list of potential audio output devices. It must be freed with L{libvlc_audio_output_device_list_release}(). - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_list_get', None) or \ - _Cfunction('libvlc_audio_output_device_list_get', ((1,), (1,),), None, - ctypes.POINTER(AudioOutputDevice), Instance, ctypes.c_char_p) - return f(p_instance, aout) - - -def libvlc_audio_output_device_list_release(p_list): - '''Frees a list of available audio output devices. - @param p_list: list with audio outputs for release. - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_list_release', None) or \ - _Cfunction('libvlc_audio_output_device_list_release', ((1,),), None, - None, ctypes.POINTER(AudioOutputDevice)) - return f(p_list) - - -def libvlc_audio_output_device_set(mp, module, device_id): - '''Configures an explicit audio output device. - If the module paramater is None, audio output will be moved to the device - specified by the device identifier string immediately. This is the - recommended usage. - A list of adequate potential device strings can be obtained with - L{libvlc_audio_output_device_enum}(). - However passing None is supported in LibVLC version 2.2.0 and later only; - in earlier versions, this function would have no effects when the module - parameter was None. - If the module parameter is not None, the device parameter of the - corresponding audio output, if it exists, will be set to the specified - string. Note that some audio output modules do not have such a parameter - (notably MMDevice and PulseAudio). - A list of adequate potential device strings can be obtained with - L{libvlc_audio_output_device_list_get}(). - @note: This function does not select the specified audio output plugin. - L{libvlc_audio_output_set}() is used for that purpose. - @warning: The syntax for the device parameter depends on the audio output. - Some audio output modules require further parameters (e.g. a channels map - in the case of ALSA). - @param mp: media player. - @param module: If None, current audio output module. if non-None, name of audio output module. - @param device_id: device identifier string. - @return: Nothing. Errors are ignored (this is a design bug). - ''' - f = _Cfunctions.get('libvlc_audio_output_device_set', None) or \ - _Cfunction('libvlc_audio_output_device_set', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_char_p, ctypes.c_char_p) - return f(mp, module, device_id) - - -def libvlc_audio_output_device_get(mp): - '''Get the current audio output device identifier. - This complements L{libvlc_audio_output_device_set}(). - @warning: The initial value for the current audio output device identifier - may not be set or may be some unknown value. A LibVLC application should - compare this value against the known device identifiers (e.g. those that - were previously retrieved by a call to L{libvlc_audio_output_device_enum} or - L{libvlc_audio_output_device_list_get}) to find the current audio output device. - It is possible that the selected audio output device changes (an external - change) without a call to L{libvlc_audio_output_device_set}. That may make this - method unsuitable to use if a LibVLC application is attempting to track - dynamic audio device changes as they happen. - @param mp: media player. - @return: the current audio output device identifier None if no device is selected or in case of error (the result must be released with free() or L{libvlc_free}()). - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_get', None) or \ - _Cfunction('libvlc_audio_output_device_get', ((1,),), string_result, - ctypes.c_void_p, MediaPlayer) - return f(mp) - - -def libvlc_audio_toggle_mute(p_mi): - '''Toggle mute status. - @param p_mi: media player @warning Toggling mute atomically is not always possible: On some platforms, other processes can mute the VLC audio playback stream asynchronously. Thus, there is a small race condition where toggling will not work. See also the limitations of L{libvlc_audio_set_mute}(). - ''' - f = _Cfunctions.get('libvlc_audio_toggle_mute', None) or \ - _Cfunction('libvlc_audio_toggle_mute', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_get_mute(p_mi): - '''Get current mute status. - @param p_mi: media player. - @return: the mute status (boolean) if defined, -1 if undefined/unapplicable. - ''' - f = _Cfunctions.get('libvlc_audio_get_mute', None) or \ - _Cfunction('libvlc_audio_get_mute', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_set_mute(p_mi, status): - '''Set mute status. - @param p_mi: media player. - @param status: If status is true then mute, otherwise unmute @warning This function does not always work. If there are no active audio playback stream, the mute status might not be available. If digital pass-through (S/PDIF, HDMI...) is in use, muting may be unapplicable. Also some audio output plugins do not support muting at all. @note To force silent playback, disable all audio tracks. This is more efficient and reliable than mute. - ''' - f = _Cfunctions.get('libvlc_audio_set_mute', None) or \ - _Cfunction('libvlc_audio_set_mute', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_int) - return f(p_mi, status) - - -def libvlc_audio_get_volume(p_mi): - '''Get current software audio volume. - @param p_mi: media player. - @return: the software volume in percents (0 = mute, 100 = nominal / 0dB). - ''' - f = _Cfunctions.get('libvlc_audio_get_volume', None) or \ - _Cfunction('libvlc_audio_get_volume', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_set_volume(p_mi, i_volume): - '''Set current software audio volume. - @param p_mi: media player. - @param i_volume: the volume in percents (0 = mute, 100 = 0dB). - @return: 0 if the volume was set, -1 if it was out of range. - ''' - f = _Cfunctions.get('libvlc_audio_set_volume', None) or \ - _Cfunction('libvlc_audio_set_volume', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int) - return f(p_mi, i_volume) - - -def libvlc_audio_get_track_count(p_mi): - '''Get number of available audio tracks. - @param p_mi: media player. - @return: the number of available audio tracks (int), or -1 if unavailable. - ''' - f = _Cfunctions.get('libvlc_audio_get_track_count', None) or \ - _Cfunction('libvlc_audio_get_track_count', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_get_track_description(p_mi): - '''Get the description of available audio tracks. - @param p_mi: media player. - @return: list with description of available audio tracks, or None. It must be freed with L{libvlc_track_description_list_release}(). - ''' - f = _Cfunctions.get('libvlc_audio_get_track_description', None) or \ - _Cfunction('libvlc_audio_get_track_description', ((1,),), None, - ctypes.POINTER(TrackDescription), MediaPlayer) - return f(p_mi) - - -def libvlc_audio_get_track(p_mi): - '''Get current audio track. - @param p_mi: media player. - @return: the audio track ID or -1 if no active input. - ''' - f = _Cfunctions.get('libvlc_audio_get_track', None) or \ - _Cfunction('libvlc_audio_get_track', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_set_track(p_mi, i_track): - '''Set current audio track. - @param p_mi: media player. - @param i_track: the track ID (i_id field from track description). - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_audio_set_track', None) or \ - _Cfunction('libvlc_audio_set_track', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int) - return f(p_mi, i_track) - - -def libvlc_audio_get_channel(p_mi): - '''Get current audio channel. - @param p_mi: media player. - @return: the audio channel See L{AudioOutputChannel}. - ''' - f = _Cfunctions.get('libvlc_audio_get_channel', None) or \ - _Cfunction('libvlc_audio_get_channel', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_set_channel(p_mi, channel): - '''Set current audio channel. - @param p_mi: media player. - @param channel: the audio channel, See L{AudioOutputChannel}. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_audio_set_channel', None) or \ - _Cfunction('libvlc_audio_set_channel', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int) - return f(p_mi, channel) - - -def libvlc_audio_get_delay(p_mi): - '''Get current audio delay. - @param p_mi: media player. - @return: the audio delay (microseconds). - @version: LibVLC 1.1.1 or later. - ''' - f = _Cfunctions.get('libvlc_audio_get_delay', None) or \ - _Cfunction('libvlc_audio_get_delay', ((1,),), None, - ctypes.c_int64, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_set_delay(p_mi, i_delay): - '''Set current audio delay. The audio delay will be reset to zero each time the media changes. - @param p_mi: media player. - @param i_delay: the audio delay (microseconds). - @return: 0 on success, -1 on error. - @version: LibVLC 1.1.1 or later. - ''' - f = _Cfunctions.get('libvlc_audio_set_delay', None) or \ - _Cfunction('libvlc_audio_set_delay', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int64) - return f(p_mi, i_delay) - - -def libvlc_audio_equalizer_get_preset_count(): - '''Get the number of equalizer presets. - @return: number of presets. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_get_preset_count', None) or \ - _Cfunction('libvlc_audio_equalizer_get_preset_count', (), None, - ctypes.c_uint) - return f() - - -def libvlc_audio_equalizer_get_preset_name(u_index): - '''Get the name of a particular equalizer preset. - This name can be used, for example, to prepare a preset label or menu in a user - interface. - @param u_index: index of the preset, counting from zero. - @return: preset name, or None if there is no such preset. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_get_preset_name', None) or \ - _Cfunction('libvlc_audio_equalizer_get_preset_name', ((1,),), None, - ctypes.c_char_p, ctypes.c_uint) - return f(u_index) - - -def libvlc_audio_equalizer_get_band_count(): - '''Get the number of distinct frequency bands for an equalizer. - @return: number of frequency bands. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_get_band_count', None) or \ - _Cfunction('libvlc_audio_equalizer_get_band_count', (), None, - ctypes.c_uint) - return f() - - -def libvlc_audio_equalizer_get_band_frequency(u_index): - '''Get a particular equalizer band frequency. - This value can be used, for example, to create a label for an equalizer band control - in a user interface. - @param u_index: index of the band, counting from zero. - @return: equalizer band frequency (Hz), or -1 if there is no such band. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_get_band_frequency', None) or \ - _Cfunction('libvlc_audio_equalizer_get_band_frequency', ((1,),), None, - ctypes.c_float, ctypes.c_uint) - return f(u_index) - - -def libvlc_audio_equalizer_new(): - '''Create a new default equalizer, with all frequency values zeroed. - The new equalizer can subsequently be applied to a media player by invoking - L{libvlc_media_player_set_equalizer}(). - The returned handle should be freed via L{libvlc_audio_equalizer_release}() when - it is no longer needed. - @return: opaque equalizer handle, or None on error. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_new', None) or \ - _Cfunction('libvlc_audio_equalizer_new', (), None, - ctypes.c_void_p) - return f() - - -def libvlc_audio_equalizer_new_from_preset(u_index): - '''Create a new equalizer, with initial frequency values copied from an existing - preset. - The new equalizer can subsequently be applied to a media player by invoking - L{libvlc_media_player_set_equalizer}(). - The returned handle should be freed via L{libvlc_audio_equalizer_release}() when - it is no longer needed. - @param u_index: index of the preset, counting from zero. - @return: opaque equalizer handle, or None on error. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_new_from_preset', None) or \ - _Cfunction('libvlc_audio_equalizer_new_from_preset', ((1,),), None, - ctypes.c_void_p, ctypes.c_uint) - return f(u_index) - - -def libvlc_audio_equalizer_release(p_equalizer): - '''Release a previously created equalizer instance. - The equalizer was previously created by using L{libvlc_audio_equalizer_new}() or - L{libvlc_audio_equalizer_new_from_preset}(). - It is safe to invoke this method with a None p_equalizer parameter for no effect. - @param p_equalizer: opaque equalizer handle, or None. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_release', None) or \ - _Cfunction('libvlc_audio_equalizer_release', ((1,),), None, - None, ctypes.c_void_p) - return f(p_equalizer) - - -def libvlc_audio_equalizer_set_preamp(p_equalizer, f_preamp): - '''Set a new pre-amplification value for an equalizer. - The new equalizer settings are subsequently applied to a media player by invoking - L{libvlc_media_player_set_equalizer}(). - The supplied amplification value will be clamped to the -20.0 to +20.0 range. - @param p_equalizer: valid equalizer handle, must not be None. - @param f_preamp: preamp value (-20.0 to 20.0 Hz). - @return: zero on success, -1 on error. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_set_preamp', None) or \ - _Cfunction('libvlc_audio_equalizer_set_preamp', ((1,), (1,),), None, - ctypes.c_int, ctypes.c_void_p, ctypes.c_float) - return f(p_equalizer, f_preamp) - - -def libvlc_audio_equalizer_get_preamp(p_equalizer): - '''Get the current pre-amplification value from an equalizer. - @param p_equalizer: valid equalizer handle, must not be None. - @return: preamp value (Hz). - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_get_preamp', None) or \ - _Cfunction('libvlc_audio_equalizer_get_preamp', ((1,),), None, - ctypes.c_float, ctypes.c_void_p) - return f(p_equalizer) - - -def libvlc_audio_equalizer_set_amp_at_index(p_equalizer, f_amp, u_band): - '''Set a new amplification value for a particular equalizer frequency band. - The new equalizer settings are subsequently applied to a media player by invoking - L{libvlc_media_player_set_equalizer}(). - The supplied amplification value will be clamped to the -20.0 to +20.0 range. - @param p_equalizer: valid equalizer handle, must not be None. - @param f_amp: amplification value (-20.0 to 20.0 Hz). - @param u_band: index, counting from zero, of the frequency band to set. - @return: zero on success, -1 on error. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_set_amp_at_index', None) or \ - _Cfunction('libvlc_audio_equalizer_set_amp_at_index', ((1,), (1,), (1,),), None, - ctypes.c_int, ctypes.c_void_p, ctypes.c_float, ctypes.c_uint) - return f(p_equalizer, f_amp, u_band) - - -def libvlc_audio_equalizer_get_amp_at_index(p_equalizer, u_band): - '''Get the amplification value for a particular equalizer frequency band. - @param p_equalizer: valid equalizer handle, must not be None. - @param u_band: index, counting from zero, of the frequency band to get. - @return: amplification value (Hz); NaN if there is no such frequency band. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_get_amp_at_index', None) or \ - _Cfunction('libvlc_audio_equalizer_get_amp_at_index', ((1,), (1,),), None, - ctypes.c_float, ctypes.c_void_p, ctypes.c_uint) - return f(p_equalizer, u_band) - - -def libvlc_media_player_set_equalizer(p_mi, p_equalizer): - '''Apply new equalizer settings to a media player. - The equalizer is first created by invoking L{libvlc_audio_equalizer_new}() or - L{libvlc_audio_equalizer_new_from_preset}(). - It is possible to apply new equalizer settings to a media player whether the media - player is currently playing media or not. - Invoking this method will immediately apply the new equalizer settings to the audio - output of the currently playing media if there is any. - If there is no currently playing media, the new equalizer settings will be applied - later if and when new media is played. - Equalizer settings will automatically be applied to subsequently played media. - To disable the equalizer for a media player invoke this method passing None for the - p_equalizer parameter. - The media player does not keep a reference to the supplied equalizer so it is safe - for an application to release the equalizer reference any time after this method - returns. - @param p_mi: opaque media player handle. - @param p_equalizer: opaque equalizer handle, or None to disable the equalizer for this media player. - @return: zero on success, -1 on error. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_player_set_equalizer', None) or \ - _Cfunction('libvlc_media_player_set_equalizer', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_void_p) - return f(p_mi, p_equalizer) - - -def libvlc_media_player_get_role(p_mi): - '''Gets the media role. - @param p_mi: media player. - @return: the media player role (\ref libvlc_media_player_role_t). - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_player_get_role', None) or \ - _Cfunction('libvlc_media_player_get_role', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_role(p_mi, role): - '''Sets the media role. - @param p_mi: media player. - @param role: the media player role (\ref libvlc_media_player_role_t). - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_media_player_set_role', None) or \ - _Cfunction('libvlc_media_player_set_role', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint) - return f(p_mi, role) - - -def libvlc_media_list_player_new(p_instance): - '''Create new media_list_player. - @param p_instance: libvlc instance. - @return: media list player instance or None on error. - ''' - f = _Cfunctions.get('libvlc_media_list_player_new', None) or \ - _Cfunction('libvlc_media_list_player_new', ((1,),), class_result(MediaListPlayer), - ctypes.c_void_p, Instance) - return f(p_instance) - - -def libvlc_media_list_player_release(p_mlp): - '''Release a media_list_player after use - Decrement the reference count of a media player object. If the - reference count is 0, then L{libvlc_media_list_player_release}() will - release the media player object. If the media player object - has been released, then it should not be used again. - @param p_mlp: media list player instance. - ''' - f = _Cfunctions.get('libvlc_media_list_player_release', None) or \ - _Cfunction('libvlc_media_list_player_release', ((1,),), None, - None, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_retain(p_mlp): - '''Retain a reference to a media player list object. Use - L{libvlc_media_list_player_release}() to decrement reference count. - @param p_mlp: media player list object. - ''' - f = _Cfunctions.get('libvlc_media_list_player_retain', None) or \ - _Cfunction('libvlc_media_list_player_retain', ((1,),), None, - None, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_event_manager(p_mlp): - '''Return the event manager of this media_list_player. - @param p_mlp: media list player instance. - @return: the event manager. - ''' - f = _Cfunctions.get('libvlc_media_list_player_event_manager', None) or \ - _Cfunction('libvlc_media_list_player_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_set_media_player(p_mlp, p_mi): - '''Replace media player in media_list_player with this instance. - @param p_mlp: media list player instance. - @param p_mi: media player instance. - ''' - f = _Cfunctions.get('libvlc_media_list_player_set_media_player', None) or \ - _Cfunction('libvlc_media_list_player_set_media_player', ((1,), (1,),), None, - None, MediaListPlayer, MediaPlayer) - return f(p_mlp, p_mi) - - -def libvlc_media_list_player_get_media_player(p_mlp): - '''Get media player of the media_list_player instance. - @param p_mlp: media list player instance. - @return: media player instance @note the caller is responsible for releasing the returned instance. - ''' - f = _Cfunctions.get('libvlc_media_list_player_get_media_player', None) or \ - _Cfunction('libvlc_media_list_player_get_media_player', ((1,),), class_result(MediaPlayer), - ctypes.c_void_p, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_set_media_list(p_mlp, p_mlist): - '''Set the media list associated with the player. - @param p_mlp: media list player instance. - @param p_mlist: list of media. - ''' - f = _Cfunctions.get('libvlc_media_list_player_set_media_list', None) or \ - _Cfunction('libvlc_media_list_player_set_media_list', ((1,), (1,),), None, - None, MediaListPlayer, MediaList) - return f(p_mlp, p_mlist) - - -def libvlc_media_list_player_play(p_mlp): - '''Play media list. - @param p_mlp: media list player instance. - ''' - f = _Cfunctions.get('libvlc_media_list_player_play', None) or \ - _Cfunction('libvlc_media_list_player_play', ((1,),), None, - None, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_pause(p_mlp): - '''Toggle pause (or resume) media list. - @param p_mlp: media list player instance. - ''' - f = _Cfunctions.get('libvlc_media_list_player_pause', None) or \ - _Cfunction('libvlc_media_list_player_pause', ((1,),), None, - None, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_set_pause(p_mlp, do_pause): - '''Pause or resume media list. - @param p_mlp: media list player instance. - @param do_pause: play/resume if zero, pause if non-zero. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_list_player_set_pause', None) or \ - _Cfunction('libvlc_media_list_player_set_pause', ((1,), (1,),), None, - None, MediaListPlayer, ctypes.c_int) - return f(p_mlp, do_pause) - - -def libvlc_media_list_player_is_playing(p_mlp): - '''Is media list playing? - @param p_mlp: media list player instance. - @return: true for playing and false for not playing \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_list_player_is_playing', None) or \ - _Cfunction('libvlc_media_list_player_is_playing', ((1,),), None, - ctypes.c_int, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_get_state(p_mlp): - '''Get current libvlc_state of media list player. - @param p_mlp: media list player instance. - @return: L{State} for media list player. - ''' - f = _Cfunctions.get('libvlc_media_list_player_get_state', None) or \ - _Cfunction('libvlc_media_list_player_get_state', ((1,),), None, - State, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_play_item_at_index(p_mlp, i_index): - '''Play media list item at position index. - @param p_mlp: media list player instance. - @param i_index: index in media list to play. - @return: 0 upon success -1 if the item wasn't found. - ''' - f = _Cfunctions.get('libvlc_media_list_player_play_item_at_index', None) or \ - _Cfunction('libvlc_media_list_player_play_item_at_index', ((1,), (1,),), None, - ctypes.c_int, MediaListPlayer, ctypes.c_int) - return f(p_mlp, i_index) - - -def libvlc_media_list_player_play_item(p_mlp, p_md): - '''Play the given media item. - @param p_mlp: media list player instance. - @param p_md: the media instance. - @return: 0 upon success, -1 if the media is not part of the media list. - ''' - f = _Cfunctions.get('libvlc_media_list_player_play_item', None) or \ - _Cfunction('libvlc_media_list_player_play_item', ((1,), (1,),), None, - ctypes.c_int, MediaListPlayer, Media) - return f(p_mlp, p_md) - - -def libvlc_media_list_player_stop(p_mlp): - '''Stop playing media list. - @param p_mlp: media list player instance. - ''' - f = _Cfunctions.get('libvlc_media_list_player_stop', None) or \ - _Cfunction('libvlc_media_list_player_stop', ((1,),), None, - None, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_next(p_mlp): - '''Play next item from media list. - @param p_mlp: media list player instance. - @return: 0 upon success -1 if there is no next item. - ''' - f = _Cfunctions.get('libvlc_media_list_player_next', None) or \ - _Cfunction('libvlc_media_list_player_next', ((1,),), None, - ctypes.c_int, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_previous(p_mlp): - '''Play previous item from media list. - @param p_mlp: media list player instance. - @return: 0 upon success -1 if there is no previous item. - ''' - f = _Cfunctions.get('libvlc_media_list_player_previous', None) or \ - _Cfunction('libvlc_media_list_player_previous', ((1,),), None, - ctypes.c_int, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_set_playback_mode(p_mlp, e_mode): - '''Sets the playback mode for the playlist. - @param p_mlp: media list player instance. - @param e_mode: playback mode specification. - ''' - f = _Cfunctions.get('libvlc_media_list_player_set_playback_mode', None) or \ - _Cfunction('libvlc_media_list_player_set_playback_mode', ((1,), (1,),), None, - None, MediaListPlayer, PlaybackMode) - return f(p_mlp, e_mode) - - -# 5 function(s) blacklisted: -# libvlc_audio_output_get_device_type -# libvlc_audio_output_set_device_type -# libvlc_dialog_set_callbacks -# libvlc_printerr -# libvlc_set_exit_handler - -# 54 function(s) not wrapped as methods: -# libvlc_audio_equalizer_get_amp_at_index -# libvlc_audio_equalizer_get_band_count -# libvlc_audio_equalizer_get_band_frequency -# libvlc_audio_equalizer_get_preamp -# libvlc_audio_equalizer_get_preset_count -# libvlc_audio_equalizer_get_preset_name -# libvlc_audio_equalizer_new -# libvlc_audio_equalizer_new_from_preset -# libvlc_audio_equalizer_release -# libvlc_audio_equalizer_set_amp_at_index -# libvlc_audio_equalizer_set_preamp -# libvlc_audio_output_device_list_release -# libvlc_audio_output_list_release -# libvlc_chapter_descriptions_release -# libvlc_clearerr -# libvlc_clock -# libvlc_dialog_dismiss -# libvlc_dialog_get_context -# libvlc_dialog_post_action -# libvlc_dialog_post_login -# libvlc_dialog_set_context -# libvlc_event_type_name -# libvlc_free -# libvlc_get_changeset -# libvlc_get_compiler -# libvlc_get_version -# libvlc_log_clear -# libvlc_log_close -# libvlc_log_count -# libvlc_log_get_context -# libvlc_log_get_iterator -# libvlc_log_get_object -# libvlc_media_discoverer_list_release -# libvlc_media_get_codec_description -# libvlc_media_slaves_release -# libvlc_media_tracks_release -# libvlc_module_description_list_release -# libvlc_new -# libvlc_renderer_discoverer_event_manager -# libvlc_renderer_discoverer_list_release -# libvlc_renderer_discoverer_release -# libvlc_renderer_discoverer_start -# libvlc_renderer_discoverer_stop -# libvlc_renderer_item_flags -# libvlc_renderer_item_hold -# libvlc_renderer_item_icon_uri -# libvlc_renderer_item_name -# libvlc_renderer_item_release -# libvlc_renderer_item_type -# libvlc_title_descriptions_release -# libvlc_track_description_list_release -# libvlc_track_description_release -# libvlc_video_new_viewpoint -# libvlc_vprinterr - -# Start of footer.py # - -# Backward compatibility -def callbackmethod(callback): - """Now obsolete @callbackmethod decorator.""" - return callback - - -# libvlc_free is not present in some versions of libvlc. If it is not -# in the library, then emulate it by calling libc.free -if not hasattr(dll, 'libvlc_free'): - # need to find the free function in the C runtime. This is - # platform specific. - # For Linux and MacOSX - libc_path = find_library('c') - if libc_path: - libc = ctypes.CDLL(libc_path) - libvlc_free = libc.free - else: - # On win32, it is impossible to guess the proper lib to call - # (msvcrt, mingw...). Just ignore the call: it will memleak, - # but not prevent to run the application. - def libvlc_free(p): - pass - - # ensure argtypes is right, because default type of int won't - # work on 64-bit systems - libvlc_free.argtypes = [ctypes.c_void_p] - - -# Version functions -def _dot2int(v): - '''(INTERNAL) Convert 'i.i.i[.i]' str to int. - ''' - t = [int(i) for i in v.split('.')] - if len(t) == 3: - if t[2] < 100: - t.append(0) - else: # 100 is arbitrary - t[2:4] = divmod(t[2], 100) - elif len(t) != 4: - raise ValueError('"i.i.i[.i]": %r' % (v,)) - if min(t) < 0 or max(t) > 255: - raise ValueError('[0..255]: %r' % (v,)) - i = t.pop(0) - while t: - i = (i << 8) + t.pop(0) - return i - - -def hex_version(): - """Return the version of these bindings in hex or 0 if unavailable. - """ - try: - return _dot2int(__version__) - except (NameError, ValueError): - return 0 - - -def libvlc_hex_version(): - """Return the libvlc version in hex or 0 if unavailable. - """ - try: - return _dot2int(bytes_to_str(libvlc_get_version()).split()[0]) - except ValueError: - return 0 - - -def debug_callback(event, *args, **kwds): - '''Example callback, useful for debugging. - ''' - l = ['event %s' % (event.type,)] - if args: - l.extend(map(str, args)) - if kwds: - l.extend(sorted('%s=%s' % t for t in kwds.items())) - print('Debug callback (%s)' % ', '.join(l)) - - -if __name__ == '__main__': - logging.basicConfig(level=logging.DEBUG) - try: - from msvcrt import getch - except ImportError: - import termios - import tty - - - def getch(): # getchar(), getc(stdin) #PYCHOK flake - fd = sys.stdin.fileno() - old = termios.tcgetattr(fd) - try: - tty.setraw(fd) - ch = sys.stdin.read(1) - finally: - termios.tcsetattr(fd, termios.TCSADRAIN, old) - return ch - - - def end_callback(event): - print('End of media stream (event %s)' % event.type) - sys.exit(0) - - - echo_position = False - - - def pos_callback(event, player): - if echo_position: - sys.stdout.write('\r%s to %.2f%% (%.2f%%)' % (event.type, - event.u.new_position * 100, - player.get_position() * 100)) - sys.stdout.flush() - - - def print_version(): - """Print version of this vlc.py and of the libvlc""" - try: - print('Build date: %s (%#x)' % (build_date, hex_version())) - print('LibVLC version: %s (%#x)' % (bytes_to_str(libvlc_get_version()), libvlc_hex_version())) - print('LibVLC compiler: %s' % bytes_to_str(libvlc_get_compiler())) - if plugin_path: - print('Plugin path: %s' % plugin_path) - except: - print('Error: %s' % sys.exc_info()[1]) - - - if sys.argv[1:] and '-h' not in sys.argv[1:] and '--help' not in sys.argv[1:]: - - movie = os.path.expanduser(sys.argv.pop()) - if not os.access(movie, os.R_OK): - print('Error: %s file not readable' % movie) - sys.exit(1) - - # Need --sub-source=marq in order to use marquee below - instance = Instance(["--sub-source=marq"] + sys.argv[1:]) - try: - media = instance.media_new(movie) - except (AttributeError, NameError) as e: - print('%s: %s (%s %s vs LibVLC %s)' % (e.__class__.__name__, e, - sys.argv[0], __version__, - libvlc_get_version())) - sys.exit(1) - player = instance.media_player_new() - player.set_media(media) - player.play() - - # Some marquee examples. Marquee requires '--sub-source marq' in the - # Instance() call above, see - player.video_set_marquee_int(VideoMarqueeOption.Enable, 1) - player.video_set_marquee_int(VideoMarqueeOption.Size, 24) # pixels - player.video_set_marquee_int(VideoMarqueeOption.Position, Position.Bottom) - if False: # only one marquee can be specified - player.video_set_marquee_int(VideoMarqueeOption.Timeout, 5000) # millisec, 0==forever - t = media.get_mrl() # movie - else: # update marquee text periodically - player.video_set_marquee_int(VideoMarqueeOption.Timeout, 0) # millisec, 0==forever - player.video_set_marquee_int(VideoMarqueeOption.Refresh, 1000) # millisec (or sec?) - ##t = '$L / $D or $P at $T' - t = '%Y-%m-%d %H:%M:%S' - player.video_set_marquee_string(VideoMarqueeOption.Text, str_to_bytes(t)) - - # Some event manager examples. Note, the callback can be any Python - # callable and does not need to be decorated. Optionally, specify - # any number of positional and/or keyword arguments to be passed - # to the callback (in addition to the first one, an Event instance). - event_manager = player.event_manager() - event_manager.event_attach(EventType.MediaPlayerEndReached, end_callback) - event_manager.event_attach(EventType.MediaPlayerPositionChanged, pos_callback, player) - - - def mspf(): - """Milliseconds per frame""" - return int(1000 // (player.get_fps() or 25)) - - - def print_info(): - """Print information about the media""" - try: - print_version() - media = player.get_media() - print('State: %s' % player.get_state()) - print('Media: %s' % bytes_to_str(media.get_mrl())) - print('Track: %s/%s' % (player.video_get_track(), player.video_get_track_count())) - print('Current time: %s/%s' % (player.get_time(), media.get_duration())) - print('Position: %s' % player.get_position()) - print('FPS: %s (%d ms)' % (player.get_fps(), mspf())) - print('Rate: %s' % player.get_rate()) - print('Video size: %s' % str(player.video_get_size(0))) # num=0 - print('Scale: %s' % player.video_get_scale()) - print('Aspect ratio: %s' % player.video_get_aspect_ratio()) - # print('Window:' % player.get_hwnd() - except Exception: - print('Error: %s' % sys.exc_info()[1]) - - - def sec_forward(): - """Go forward one sec""" - player.set_time(player.get_time() + 1000) - - - def sec_backward(): - """Go backward one sec""" - player.set_time(player.get_time() - 1000) - - - def frame_forward(): - """Go forward one frame""" - player.set_time(player.get_time() + mspf()) - - - def frame_backward(): - """Go backward one frame""" - player.set_time(player.get_time() - mspf()) - - - def print_help(): - """Print help""" - print('Single-character commands:') - for k, m in sorted(keybindings.items()): - m = (m.__doc__ or m.__name__).splitlines()[0] - print(' %s: %s.' % (k, m.rstrip('.'))) - print('0-9: go to that fraction of the movie') - - - def quit_app(): - """Stop and exit""" - sys.exit(0) - - - def toggle_echo_position(): - """Toggle echoing of media position""" - global echo_position - echo_position = not echo_position - - - keybindings = { - ' ': player.pause, - '+': sec_forward, - '-': sec_backward, - '.': frame_forward, - ',': frame_backward, - 'f': player.toggle_fullscreen, - 'i': print_info, - 'p': toggle_echo_position, - 'q': quit_app, - '?': print_help, - } - - print('Press q to quit, ? to get help.%s' % os.linesep) - while True: - k = getch() - print('> %s' % k) - if k in keybindings: - keybindings[k]() - elif k.isdigit(): - # jump to fraction of the movie. - player.set_position(float('0.' + k)) - - else: - print('Usage: %s [options] ' % sys.argv[0]) - print('Once launched, type ? for help.') - print('') - print_version() diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index bd82ef14f..d4c5230f4 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -28,6 +28,7 @@ import os import sys import threading from datetime import datetime +import vlc from distutils.version import LooseVersion from PyQt5 import QtWidgets @@ -65,59 +66,61 @@ def get_vlc(): :return: The "vlc" module, or None """ - if 'openlp.core.ui.media.vendor.vlc' in sys.modules: + if 'vlc' in sys.modules: # If VLC has already been imported, no need to do all the stuff below again is_vlc_available = False try: - is_vlc_available = bool(sys.modules['openlp.core.ui.media.vendor.vlc'].get_default_instance()) + is_vlc_available = bool(sys.modules['vlc'].get_default_instance()) except Exception: pass if is_vlc_available: - return sys.modules['openlp.core.ui.media.vendor.vlc'] + return sys.modules['vlc'] else: return None - is_vlc_available = False - try: - if is_macosx(): - # Newer versions of VLC on OS X need this. See https://forum.videolan.org/viewtopic.php?t=124521 - os.environ['VLC_PLUGIN_PATH'] = '/Applications/VLC.app/Contents/MacOS/plugins' - # On Windows when frozen in PyInstaller, we need to blank SetDllDirectoryW to allow loading of the VLC dll. - # This is due to limitations (by design) in PyInstaller. SetDllDirectoryW original value is restored once - # VLC has been imported. - if is_win(): - buffer_size = 1024 - dll_directory = ctypes.create_unicode_buffer(buffer_size) - new_buffer_size = ctypes.windll.kernel32.GetDllDirectoryW(buffer_size, dll_directory) - dll_directory = ''.join(dll_directory[:new_buffer_size]).replace('\0', '') - log.debug('Original DllDirectory: %s' % dll_directory) - ctypes.windll.kernel32.SetDllDirectoryW(None) - from openlp.core.ui.media.vendor import vlc - if is_win(): - ctypes.windll.kernel32.SetDllDirectoryW(dll_directory) - is_vlc_available = bool(vlc.get_default_instance()) - except (ImportError, NameError, NotImplementedError): - pass - except OSError as e: - # this will get raised the first time - if is_win(): - if not isinstance(e, WindowsError) and e.winerror != 126: - raise - else: - pass - if is_vlc_available: - try: - VERSION = vlc.libvlc_get_version().decode('UTF-8') - except Exception: - VERSION = '0.0.0' - # LooseVersion does not work when a string contains letter and digits (e. g. 2.0.5 Twoflower). - # http://bugs.python.org/issue14894 - if LooseVersion(VERSION.split()[0]) < LooseVersion('1.1.0'): - is_vlc_available = False - log.debug('VLC could not be loaded, because the vlc version is too old: %s' % VERSION) - if is_vlc_available: - return vlc else: - return None + return vlc + #is_vlc_available = False + # try: + # if is_macosx(): + # # Newer versions of VLC on OS X need this. See https://forum.videolan.org/viewtopic.php?t=124521 + # os.environ['VLC_PLUGIN_PATH'] = '/Applications/VLC.app/Contents/MacOS/plugins' + # # On Windows when frozen in PyInstaller, we need to blank SetDllDirectoryW to allow loading of the VLC dll. + # # This is due to limitations (by design) in PyInstaller. SetDllDirectoryW original value is restored once + # # VLC has been imported. + # if is_win(): + # buffer_size = 1024 + # dll_directory = ctypes.create_unicode_buffer(buffer_size) + # new_buffer_size = ctypes.windll.kernel32.GetDllDirectoryW(buffer_size, dll_directory) + # dll_directory = ''.join(dll_directory[:new_buffer_size]).replace('\0', '') + # log.debug('Original DllDirectory: %s' % dll_directory) + # ctypes.windll.kernel32.SetDllDirectoryW(None) + # from openlp.core.ui.media.vendor import vlc + # if is_win(): + # ctypes.windll.kernel32.SetDllDirectoryW(dll_directory) + # is_vlc_available = bool(vlc.get_default_instance()) + # except (ImportError, NameError, NotImplementedError): + # pass + # except OSError as e: + # # this will get raised the first time + # if is_win(): + # if not isinstance(e, WindowsError) and e.winerror != 126: + # raise + # else: + # pass + # if is_vlc_available: + # try: + # VERSION = vlc.libvlc_get_version().decode('UTF-8') + # except Exception: + # VERSION = '0.0.0' + # # LooseVersion does not work when a string contains letter and digits (e. g. 2.0.5 Twoflower). + # # http://bugs.python.org/issue14894 + # if LooseVersion(VERSION.split()[0]) < LooseVersion('1.1.0'): + # is_vlc_available = False + # log.debug('VLC could not be loaded, because the vlc version is too old: %s' % VERSION) + #if is_vlc_available: + # return vlc + #else: + # return None # On linux we need to initialise X threads, but not when running tests. diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py index ab176022f..2fbddd69f 100755 --- a/scripts/check_dependencies.py +++ b/scripts/check_dependencies.py @@ -89,7 +89,8 @@ MODULES = [ 'webob', 'requests', 'qtawesome', - 'pymediainfo' + 'pymediainfo', + 'vlc' ] From 236bc73e59d3d53b78a6c2601d6861ba3e9febbf Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Mon, 6 May 2019 22:06:29 -0700 Subject: [PATCH 17/50] Fix an issue with changing the data folder; Include QDarkStyle when building Windows installer --- openlp/core/ui/mainwindow.py | 2 +- scripts/appveyor.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 874ab754b..a945f06b7 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -1332,7 +1332,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert self.show_status_message( translate('OpenLP.MainWindow', 'Copying OpenLP data to new data directory location - {path} ' '- Please wait for copy to finish').format(path=self.new_data_path)) - dir_util.copy_tree(old_data_path, self.new_data_path) + dir_util.copy_tree(str(old_data_path), str(self.new_data_path)) self.log_info('Copy successful') except (OSError, DistutilsFileError) as why: self.application.set_normal_cursor() diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml index 4e5914b8a..2634958e6 100644 --- a/scripts/appveyor.yml +++ b/scripts/appveyor.yml @@ -16,7 +16,7 @@ environment: install: # Install dependencies from pypi - - "%PYTHON%\\python.exe -m pip install sqlalchemy alembic appdirs chardet beautifulsoup4 lxml Mako mysql-connector-python pytest mock pyodbc psycopg2 pypiwin32 websockets asyncio waitress six webob requests QtAwesome PyQt5 PyQtWebEngine pymediainfo PyMuPDF" + - "%PYTHON%\\python.exe -m pip install sqlalchemy alembic appdirs chardet beautifulsoup4 lxml Mako mysql-connector-python pytest mock pyodbc psycopg2 pypiwin32 websockets asyncio waitress six webob requests QtAwesome PyQt5 PyQtWebEngine pymediainfo PyMuPDF QDarkStyle" build: off @@ -72,5 +72,3 @@ artifacts: name: Portable-installer - path: openlp-branch\dist\*.msi name: Installer - - path: packaging\windows\OpenLP.wxs - name: Generated-XML From 9e22ed86e3036a2e1e62b07cb114d6feb3f3960f Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 8 May 2019 14:58:06 +0100 Subject: [PATCH 18/50] remove unneeded test --- openlp/core/ui/media/vlcplayer.py | 1 - .../openlp_core/ui/media/test_vlcplayer.py | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index d4c5230f4..2a34b8b57 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -29,7 +29,6 @@ import sys import threading from datetime import datetime import vlc -from distutils.version import LooseVersion from PyQt5 import QtWidgets diff --git a/tests/functional/openlp_core/ui/media/test_vlcplayer.py b/tests/functional/openlp_core/ui/media/test_vlcplayer.py index 08e17377b..d3de03758 100644 --- a/tests/functional/openlp_core/ui/media/test_vlcplayer.py +++ b/tests/functional/openlp_core/ui/media/test_vlcplayer.py @@ -65,21 +65,6 @@ class TestVLCPlayer(TestCase, TestMixin): # THEN: The extra environment variable should be there assert 'openlp.core.ui.media.vendor.vlc' not in sys.modules - @patch('openlp.core.ui.media.vlcplayer.is_macosx') - def test_fix_vlc_22_plugin_path(self, mocked_is_macosx): - """ - Test that on OS X we set the VLC plugin path to fix a bug in the VLC module - """ - # GIVEN: We're on OS X and we don't have the VLC plugin path set - mocked_is_macosx.return_value = True - - # WHEN: An checking if the player is available - get_vlc() - - # THEN: The extra environment variable should be there - assert 'VLC_PLUGIN_PATH' in os.environ, 'The plugin path should be in the environment variables' - assert '/Applications/VLC.app/Contents/MacOS/plugins' == os.environ['VLC_PLUGIN_PATH'] - @patch.dict(os.environ) @patch('openlp.core.ui.media.vlcplayer.is_macosx') def test_not_osx_fix_vlc_22_plugin_path(self, mocked_is_macosx): From e2acc386b756a11629a144b9fa96d14c4957c3e3 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 8 May 2019 15:09:54 +0100 Subject: [PATCH 19/50] remove commented out code --- openlp/core/ui/media/vlcplayer.py | 42 ------------------------------- 1 file changed, 42 deletions(-) diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index 2a34b8b57..6ba27998b 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -78,48 +78,6 @@ def get_vlc(): return None else: return vlc - #is_vlc_available = False - # try: - # if is_macosx(): - # # Newer versions of VLC on OS X need this. See https://forum.videolan.org/viewtopic.php?t=124521 - # os.environ['VLC_PLUGIN_PATH'] = '/Applications/VLC.app/Contents/MacOS/plugins' - # # On Windows when frozen in PyInstaller, we need to blank SetDllDirectoryW to allow loading of the VLC dll. - # # This is due to limitations (by design) in PyInstaller. SetDllDirectoryW original value is restored once - # # VLC has been imported. - # if is_win(): - # buffer_size = 1024 - # dll_directory = ctypes.create_unicode_buffer(buffer_size) - # new_buffer_size = ctypes.windll.kernel32.GetDllDirectoryW(buffer_size, dll_directory) - # dll_directory = ''.join(dll_directory[:new_buffer_size]).replace('\0', '') - # log.debug('Original DllDirectory: %s' % dll_directory) - # ctypes.windll.kernel32.SetDllDirectoryW(None) - # from openlp.core.ui.media.vendor import vlc - # if is_win(): - # ctypes.windll.kernel32.SetDllDirectoryW(dll_directory) - # is_vlc_available = bool(vlc.get_default_instance()) - # except (ImportError, NameError, NotImplementedError): - # pass - # except OSError as e: - # # this will get raised the first time - # if is_win(): - # if not isinstance(e, WindowsError) and e.winerror != 126: - # raise - # else: - # pass - # if is_vlc_available: - # try: - # VERSION = vlc.libvlc_get_version().decode('UTF-8') - # except Exception: - # VERSION = '0.0.0' - # # LooseVersion does not work when a string contains letter and digits (e. g. 2.0.5 Twoflower). - # # http://bugs.python.org/issue14894 - # if LooseVersion(VERSION.split()[0]) < LooseVersion('1.1.0'): - # is_vlc_available = False - # log.debug('VLC could not be loaded, because the vlc version is too old: %s' % VERSION) - #if is_vlc_available: - # return vlc - #else: - # return None # On linux we need to initialise X threads, but not when running tests. From 0c14ddf31fb56a2a634316db4d1b16985ef647c2 Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Sat, 11 May 2019 02:07:40 -0700 Subject: [PATCH 20/50] PJLink2 Update v07 --- openlp/core/projectors/constants.py | 1 + openlp/core/projectors/pjlink.py | 1 + openlp/core/projectors/pjlinkcommands.py | 44 +- .../projectors/test_projector_commands_01.py | 2 +- .../projectors/test_projector_commands_02.py | 2 +- .../projectors/test_projector_commands_03.py | 475 +++++++----------- .../test_projector_pjlink_base_01.py | 2 +- .../test_projector_pjlink_base_02.py | 2 +- .../test_projector_pjlink_base_03.py | 130 +++++ 9 files changed, 345 insertions(+), 314 deletions(-) create mode 100644 tests/openlp_core/projectors/test_projector_pjlink_base_03.py diff --git a/openlp/core/projectors/constants.py b/openlp/core/projectors/constants.py index c60fc6473..5765c43f9 100644 --- a/openlp/core/projectors/constants.py +++ b/openlp/core/projectors/constants.py @@ -39,6 +39,7 @@ PJLINK_PREFIX = '%' PJLINK_PORT = 4352 PJLINK_SUFFIX = CR PJLINK_TIMEOUT = 30.0 +PJLINK_TOKEN_SIZE = 8 # PJLINK 1 : where is 8 characters # Error and status codes S_OK = E_OK = 0 # E_OK included since I sometimes forget diff --git a/openlp/core/projectors/pjlink.py b/openlp/core/projectors/pjlink.py index 9859b2825..5ca3d9ba3 100644 --- a/openlp/core/projectors/pjlink.py +++ b/openlp/core/projectors/pjlink.py @@ -281,6 +281,7 @@ class PJLink(QtNetwork.QTcpSocket): self.pjlink_class = copy(PJLINK_CLASS) self.pjlink_name = None # NAME self.power = S_OFF # POWR + self.projector_errors = {} # Full ERST errors self.serial_no = None # SNUM self.serial_no_received = None self.sw_version = None # SVER diff --git a/openlp/core/projectors/pjlinkcommands.py b/openlp/core/projectors/pjlinkcommands.py index 1a3b416d7..2f10c07ad 100644 --- a/openlp/core/projectors/pjlinkcommands.py +++ b/openlp/core/projectors/pjlinkcommands.py @@ -29,13 +29,13 @@ NOTE: PJLink Class (version) checks are handled in the respective PJLink/PJLinkU import logging import re +import string -from openlp.core.common.i18n import translate from openlp.core.common.settings import Settings from openlp.core.projectors.constants import E_AUTHENTICATION, PJLINK_DEFAULT_CODES, PJLINK_ERRORS, \ - PJLINK_ERST_DATA, PJLINK_ERST_STATUS, PJLINK_POWR_STATUS, S_AUTHENTICATE, S_CONNECT, S_DATA_OK, S_OFF, S_OK, S_ON, \ - S_STANDBY, STATUS_MSG + PJLINK_ERST_DATA, PJLINK_ERST_LIST, PJLINK_ERST_STATUS, PJLINK_POWR_STATUS, PJLINK_TOKEN_SIZE, \ + E_NO_AUTHENTICATION, S_AUTHENTICATE, S_CONNECT, S_DATA_OK, S_OFF, S_OK, S_ON, S_STANDBY, STATUS_MSG log = logging.getLogger(__name__) log.debug('Loading pjlinkcommands') @@ -195,8 +195,7 @@ def process_erst(projector, data): # Bad data - ignore log.warning('({ip}) Invalid error status response "{data}"'.format(ip=projector.entry.name, data=data)) return - datacheck = int(data) - if datacheck == 0: + if int(data) == 0: projector.projector_errors = None # No errors return @@ -209,23 +208,17 @@ def process_erst(projector, data): data[PJLINK_ERST_DATA['FILTER']], data[PJLINK_ERST_DATA['OTHER']]) if fan != PJLINK_ERST_STATUS[S_OK]: - projector.projector_errors[translate('OpenLP.ProjectorPJLink', 'Fan')] = \ - PJLINK_ERST_STATUS[fan] + projector.projector_errors[PJLINK_ERST_LIST['FAN']] = PJLINK_ERST_STATUS[fan] if lamp != PJLINK_ERST_STATUS[S_OK]: - projector.projector_errors[translate('OpenLP.ProjectorPJLink', 'Lamp')] = \ - PJLINK_ERST_STATUS[lamp] + projector.projector_errors[PJLINK_ERST_LIST['LAMP']] = PJLINK_ERST_STATUS[lamp] if temp != PJLINK_ERST_STATUS[S_OK]: - projector.projector_errors[translate('OpenLP.ProjectorPJLink', 'Temperature')] = \ - PJLINK_ERST_STATUS[temp] + projector.projector_errors[PJLINK_ERST_LIST['TEMP']] = PJLINK_ERST_STATUS[temp] if cover != PJLINK_ERST_STATUS[S_OK]: - projector.projector_errors[translate('OpenLP.ProjectorPJLink', 'Cover')] = \ - PJLINK_ERST_STATUS[cover] + projector.projector_errors[PJLINK_ERST_LIST['COVER']] = PJLINK_ERST_STATUS[cover] if filt != PJLINK_ERST_STATUS[S_OK]: - projector.projector_errors[translate('OpenLP.ProjectorPJLink', 'Filter')] = \ - PJLINK_ERST_STATUS[filt] + projector.projector_errors[PJLINK_ERST_LIST['FILTER']] = PJLINK_ERST_STATUS[filt] if other != PJLINK_ERST_STATUS[S_OK]: - projector.projector_errors[translate('OpenLP.ProjectorPJLink', 'Other')] = \ - PJLINK_ERST_STATUS[other] + projector.projector_errors[PJLINK_ERST_LIST['OTHER']] = PJLINK_ERST_STATUS[other] return @@ -389,20 +382,29 @@ def process_pjlink(projector, data): if len(chk) > 1: # Invalid data - there should be nothing after a normal authentication scheme log.error('({ip}) Normal connection with extra information - aborting'.format(ip=projector.entry.name)) - return E_AUTHENTICATION + return E_NO_AUTHENTICATION elif projector.pin: log.error('({ip}) Normal connection but PIN set - aborting'.format(ip=projector.entry.name)) - return E_AUTHENTICATION + return E_NO_AUTHENTICATION log.debug('({ip}) PJLINK: Returning S_CONNECT'.format(ip=projector.entry.name)) return S_CONNECT elif chk[0] == '1': if len(chk) < 2: # Not enough information for authenticated connection log.error('({ip}) Authenticated connection but not enough info - aborting'.format(ip=projector.entry.name)) - return E_AUTHENTICATION + return E_NO_AUTHENTICATION + elif len(chk[-1]) != PJLINK_TOKEN_SIZE: + # Bad token - incorrect size + log.error('({ip}) Authentication token invalid (size) - aborting'.format(ip=projector.entry.name)) + return E_NO_AUTHENTICATION + elif not all(c in string.hexdigits for c in chk[-1]): + # Bad token - not hexadecimal + log.error('({ip}) Authentication token invalid (not a hexadecimal number) ' + '- aborting'.format(ip=projector.entry.name)) + return E_NO_AUTHENTICATION elif not projector.pin: log.error('({ip}) Authenticate connection but no PIN - aborting'.format(ip=projector.entry.name)) - return E_AUTHENTICATION + return E_NO_AUTHENTICATION log.debug('({ip}) PJLINK: Returning S_AUTHENTICATE'.format(ip=projector.entry.name)) return S_AUTHENTICATE diff --git a/tests/openlp_core/projectors/test_projector_commands_01.py b/tests/openlp_core/projectors/test_projector_commands_01.py index 07e283031..207ab92f9 100644 --- a/tests/openlp_core/projectors/test_projector_commands_01.py +++ b/tests/openlp_core/projectors/test_projector_commands_01.py @@ -35,7 +35,7 @@ from tests.resources.projector.data import TEST1_DATA class TestPJLinkCommands(TestCase): """ - Tests PJLink get status commands part 1 + Tests PJLink commands part 1 """ def setUp(self): """ diff --git a/tests/openlp_core/projectors/test_projector_commands_02.py b/tests/openlp_core/projectors/test_projector_commands_02.py index e112c27c9..54306c0fe 100644 --- a/tests/openlp_core/projectors/test_projector_commands_02.py +++ b/tests/openlp_core/projectors/test_projector_commands_02.py @@ -35,7 +35,7 @@ from tests.resources.projector.data import TEST1_DATA class TestPJLinkCommands(TestCase): """ - Tests PJLink get status commands part 2 + Tests PJLink commands part 2 """ def setUp(self): """ diff --git a/tests/openlp_core/projectors/test_projector_commands_03.py b/tests/openlp_core/projectors/test_projector_commands_03.py index 0c63ffb2c..b782d205e 100644 --- a/tests/openlp_core/projectors/test_projector_commands_03.py +++ b/tests/openlp_core/projectors/test_projector_commands_03.py @@ -22,335 +22,232 @@ """ Package to test the openlp.core.projectors.pjlink commands package. """ -from unittest import TestCase, skip +from unittest import TestCase from unittest.mock import call, patch import openlp.core.projectors.pjlink -from openlp.core.projectors.constants import PJLINK_PORT, S_CONNECTED, S_OFF, S_ON +from openlp.core.projectors.constants import E_NO_AUTHENTICATION, STATUS_CODE, S_AUTHENTICATE, S_CONNECT from openlp.core.projectors.db import Projector -from openlp.core.projectors.pjlink import PJLink, PJLinkUDP -from tests.resources.projector.data import TEST1_DATA, TEST2_DATA, TEST_HASH, TEST_PIN, TEST_SALT +from openlp.core.projectors.pjlink import PJLink +from openlp.core.projectors.pjlinkcommands import process_command +from tests.resources.projector.data import TEST1_DATA, TEST_PIN, TEST_SALT class TestPJLinkCommands(TestCase): """ - Tests for the PJLinkCommands class part 2 + Tests PJLink commands part 3 """ - @skip('Needs update to new setup') - def test_projector_reset_information(self): + def setUp(self): """ - Test reset_information() resets all information and stops timers + Initialize test state(s) """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - log_debug_calls = [call('({ip}): Calling poll_timer.stop()'.format(ip=pjlink.name)), - call('({ip}): Calling socket_timer.stop()'.format(ip=pjlink.name))] - # timer and socket_timer not available until instantiation, so mock here - with patch.object(pjlink, 'socket_timer') as mock_socket_timer, \ - patch.object(pjlink, 'poll_timer') as mock_timer: + # Default PJLink instance for tests + self.pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.power = S_ON - pjlink.pjlink_name = 'OPENLPTEST' - pjlink.manufacturer = 'PJLINK' - pjlink.model = '1' - pjlink.shutter = True - pjlink.mute = True - pjlink.lamp = True - pjlink.fan = True - pjlink.source_available = True - pjlink.other_info = 'ANOTHER TEST' - pjlink.send_queue = True - pjlink.send_busy = True - - # WHEN: reset_information() is called - pjlink.reset_information() - - # THEN: All information should be reset and timers stopped - assert pjlink.power == S_OFF, 'Projector power should be OFF' - assert pjlink.pjlink_name is None, 'Projector pjlink_name should be None' - assert pjlink.manufacturer is None, 'Projector manufacturer should be None' - assert pjlink.model is None, 'Projector model should be None' - assert pjlink.shutter is None, 'Projector shutter should be None' - assert pjlink.mute is None, 'Projector shuttter should be None' - assert pjlink.lamp is None, 'Projector lamp should be None' - assert pjlink.fan is None, 'Projector fan should be None' - assert pjlink.source_available is None, 'Projector source_available should be None' - assert pjlink.source is None, 'Projector source should be None' - assert pjlink.other_info is None, 'Projector other_info should be None' - assert pjlink.send_queue == [], 'Projector send_queue should be an empty list' - assert pjlink.send_busy is False, 'Projector send_busy should be False' - assert mock_timer.stop.called is True, 'Projector timer.stop() should have been called' - assert mock_socket_timer.stop.called is True, 'Projector socket_timer.stop() should have been called' - mock_log.debug.assert_has_calls(log_debug_calls) - - @skip('Needs update to new setup') - def test_process_pjlink_normal(self): + def tearDown(self): """ - Test initial connection prompt with no authentication + Cleanup test state(s) """ - # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, "log").start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - mock_readyRead = patch('openlp.core.projectors.pjlink.PJLink.readyRead').start() - mock_change_status = patch('openlp.core.projectors.pjlink.PJLink.change_status').start() + del(self.pjlink) - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.pin = None - log_check = [call('({ip}) process_pjlink(): Sending "CLSS" initial command'.format(ip=pjlink.name)), ] - - # WHEN: process_pjlink called with no authentication required - pjlink.process_pjlink(data="0") - - # THEN: proper processing should have occured - mock_log.debug.has_calls(log_check) - mock_disconnect_from_host.assert_not_called() - assert 1 == mock_readyRead.connect.call_count, 'Should have only been called once' - mock_change_status.assert_called_once_with(S_CONNECTED) - mock_send_command.assert_called_with(cmd='CLSS', priority=True, salt=None) - - @skip('Needs update to new setup') - def test_process_pjlink_authenticate(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_authenticate(self, mock_log): """ Test initial connection prompt with authentication """ # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, "log").start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - mock_readyRead = patch('openlp.core.projectors.pjlink.PJLink.readyRead').start() - mock_change_status = patch('openlp.core.projectors.pjlink.PJLink.change_status').start() + log_error_calls = [] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data "1 {data}"'.format(ip=self.pjlink.name, + data=TEST_SALT)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name)), + call('({ip}) PJLINK: Returning {data}'.format(ip=self.pjlink.name, + data=STATUS_CODE[S_AUTHENTICATE]))] - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.pin = TEST_PIN - log_check = [call('({ip}) process_pjlink(): Sending "CLSS" initial command'.format(ip=pjlink.name)), ] + self.pjlink.pin = TEST_PIN # WHEN: process_pjlink called with no authentication required - pjlink.process_pjlink(data='1 {salt}'.format(salt=TEST_SALT)) + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='1 {salt}'.format(salt=TEST_SALT)) # THEN: proper processing should have occured - mock_log.debug.has_calls(log_check) - mock_disconnect_from_host.assert_not_called() - assert 1 == mock_readyRead.connect.call_count, 'Should have only been called once' - mock_change_status.assert_called_once_with(S_CONNECTED) - mock_send_command.assert_called_with(cmd='CLSS', priority=True, salt=TEST_HASH) + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == S_AUTHENTICATE), 'Should have returned {data}'.format(data=STATUS_CODE[S_AUTHENTICATE]) - @skip('Needs update to new setup') - def test_process_pjlink_normal_pin_set_error(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_authenticate_pin_not_set_error(self, mock_log): + """ + Test initial connection prompt with authentication and no pin set + """ + # GIVEN: Initial mocks and data + log_error_calls = [call('({ip}) Authenticate connection but no PIN - aborting'.format(ip=self.pjlink.name))] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data "1 {data}"'.format(ip=self.pjlink.name, + data=TEST_SALT)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name))] + + self.pjlink.pin = None + + # WHEN: process_pjlink called with no authentication required + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='1 {salt}'.format(salt=TEST_SALT)) + + # THEN: proper processing should have occured + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == E_NO_AUTHENTICATION), \ + 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_authenticate_token_invalid(self, mock_log): + """ + Test initial connection prompt with authentication and bad token + """ + # GIVEN: Initial mocks and data + bad_token = 'abcdefgh' + log_error_calls = [call('({ip}) Authentication token invalid (not a hexadecimal number) - ' + 'aborting'.format(ip=self.pjlink.name))] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data ' + '"1 {data}"'.format(ip=self.pjlink.name, data=bad_token)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name))] + self.pjlink.pin = TEST_SALT + + # WHEN: process_pjlink called with bad token + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='1 {data}'.format(data=bad_token)) + + # THEN: proper processing should have occured + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == E_NO_AUTHENTICATION), \ + 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_authenticate_token_length(self, mock_log): + """ + Test initial connection prompt with authentication and bad token + """ + # GIVEN: Initial mocks and data + bad_token = '1234abcde' # Length should be 8, this is 9 + log_error_calls = [call('({ip}) Authentication token invalid (size) - ' + 'aborting'.format(ip=self.pjlink.name))] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data ' + '"1 {data}"'.format(ip=self.pjlink.name, data=bad_token)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name))] + self.pjlink.pin = TEST_SALT + + # WHEN: process_pjlink called with bad token + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='1 {data}'.format(data=bad_token)) + + # THEN: proper processing should have occured + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == E_NO_AUTHENTICATION), \ + 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_authenticate_token_missing(self, mock_log): + """ + Test initial connection prompt with authentication and missing token + """ + # GIVEN: Initial mocks and data + log_error_calls = [call('({ip}) Authenticated connection but not enough info - ' + 'aborting'.format(ip=self.pjlink.name))] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data "1"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name))] + + self.pjlink.pin = TEST_SALT + + # WHEN: process_pjlink called with bad token + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='1') + + # THEN: proper processing should have occured + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == E_NO_AUTHENTICATION), \ + 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_normal(self, mock_log): + """ + Test processing PJLINK initial prompt + """ + # GIVEN: Mocks and data + log_error_calls = [] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data "0"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name)), + call('({ip}) PJLINK: Returning {data}'.format(ip=self.pjlink.name, + data=STATUS_CODE[S_CONNECT]))] + + self.pjlink.pin = None + + # WHEN: process_pjlink called with no authentication required + chk = process_command(projector=self.pjlink, cmd='PJLINK', data="0") + + # THEN: proper processing should have occured + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == S_CONNECT), 'Should have returned {data}'.format(data=STATUS_CODE[S_CONNECT]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_normal_pin_set_error(self, mock_log): """ Test process_pjlinnk called with no authentication but pin is set """ # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, 'log').start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.pin = TEST_PIN - log_check = [call('({ip}) Normal connection but PIN set - aborting'.format(ip=pjlink.name)), ] + log_error_calls = [call('({ip}) Normal connection but PIN set - ' + 'aborting'.format(ip=self.pjlink.name))] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data "0"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name))] + self.pjlink.pin = TEST_PIN # WHEN: process_pjlink called with invalid authentication scheme - pjlink.process_pjlink(data='0') + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='0') # THEN: Proper calls should be made - mock_log.error.assert_has_calls(log_check) - assert 1 == mock_disconnect_from_host.call_count, 'Should have only been called once' - mock_send_command.assert_not_called() + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == E_NO_AUTHENTICATION), \ + 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) - @skip('Needs update to new setup') - def test_process_pjlink_normal_with_salt_error(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_normal_with_token(self, mock_log): """ Test process_pjlinnk called with no authentication but pin is set """ # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, 'log').start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.pin = TEST_PIN - log_check = [call('({ip}) Normal connection with extra information - aborting'.format(ip=pjlink.name)), ] + log_error_calls = [call('({ip}) Normal connection with extra information - ' + 'aborting'.format(ip=self.pjlink.name))] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data ' + '"0 {data}"'.format(ip=self.pjlink.name, data=TEST_SALT)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name))] + self.pjlink.pin = TEST_PIN # WHEN: process_pjlink called with invalid authentication scheme - pjlink.process_pjlink(data='0 {salt}'.format(salt=TEST_SALT)) + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='0 {data}'.format(data=TEST_SALT)) # THEN: Proper calls should be made - mock_log.error.assert_has_calls(log_check) - assert 1 == mock_disconnect_from_host.call_count, 'Should have only been called once' - mock_send_command.assert_not_called() - - @skip('Needs update to new setup') - def test_process_pjlink_invalid_authentication_scheme_length_error(self): - """ - Test initial connection prompt with authentication scheme longer than 1 character - """ - # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, 'log').start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - log_check = [call('({ip}) Invalid initial authentication scheme - aborting'.format(ip=pjlink.name)), ] - - # WHEN: process_pjlink called with invalid authentication scheme - pjlink.process_pjlink(data='01') - - # THEN: socket should be closed and invalid data logged - mock_log.error.assert_has_calls(log_check) - assert 1 == mock_disconnect_from_host.call_count, 'Should have only been called once' - mock_send_command.assert_not_called() - - @skip('Needs update to new setup') - def test_process_pjlink_invalid_authentication_data_length_error(self): - """ - Test initial connection prompt with authentication no salt - """ - # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, 'log').start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - log_check = [call('({ip}) Authenticated connection but not enough info - aborting'.format(ip=pjlink.name)), ] - - # WHEN: process_pjlink called with no salt - pjlink.process_pjlink(data='1') - - # THEN: socket should be closed and invalid data logged - mock_log.error.assert_has_calls(log_check) - assert 1 == mock_disconnect_from_host.call_count, 'Should have only been called once' - mock_send_command.assert_not_called() - - @skip('Needs update to new setup') - def test_process_pjlink_authenticate_pin_not_set_error(self): - """ - Test process_pjlink authentication but pin not set - """ - # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, 'log').start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.pin = None - log_check = [call('({ip}) Authenticate connection but no PIN - aborting'.format(ip=pjlink.name)), ] - - # WHEN: process_pjlink called with no salt - pjlink.process_pjlink(data='1 {salt}'.format(salt=TEST_SALT)) - - # THEN: socket should be closed and invalid data logged - mock_log.error.assert_has_calls(log_check) - assert 1 == mock_disconnect_from_host.call_count, 'Should have only been called once' - mock_send_command.assert_not_called() - - @skip('Change to pjlink_udp.get_datagram() call') - @patch.object(openlp.core.projectors.pjlink, 'log') - def test_process_ackn_duplicate(self, mock_log): - """ - Test process_ackn method with multiple calls with same data - """ - # TODO: Change this to call pjlink_udp.get_datagram() so ACKN can be processed properly - - # GIVEN: Test setup - pjlink = PJLink(projector=self.test_list[0]) - check_list = {TEST1_DATA['ip']: {'data': TEST1_DATA['mac_adx'], 'port': PJLINK_PORT}} - log_warn_calls = [call('(___TEST_ONE___) Host {host} already replied - ' - 'ignoring'.format(host=TEST1_DATA['ip']))] - log_debug_calls = [call('PJlinkCommands(args=() kwargs={})'), - call('(___TEST_ONE___) reset_information() connect status is S_NOT_CONNECTED'), - call('(___TEST_ONE___) Processing ACKN packet'), - call('(___TEST_ONE___) Adding {host} to ACKN list'.format(host=TEST1_DATA['ip'])), - call('(___TEST_ONE___) Processing ACKN packet')] - - # WHEN: process_ackn called twice with same data - pjlink.process_ackn(data=TEST1_DATA['mac_adx'], host=TEST1_DATA['ip'], port=PJLINK_PORT) - pjlink.process_ackn(data=TEST1_DATA['mac_adx'], host=TEST1_DATA['ip'], port=PJLINK_PORT) - - # THEN: pjlink_udp.ack_list should equal test_list - # NOTE: This assert only returns AssertionError - does not list differences. Maybe add a compare function? - if pjlink.ackn_list != check_list: - # Check this way so we can print differences to stdout - print('\nackn_list: ', pjlink.ackn_list) - print('test_list: ', check_list, '\n') - assert pjlink.ackn_list == check_list - mock_log.debug.assert_has_calls(log_debug_calls) - mock_log.warning.assert_has_calls(log_warn_calls) - - @skip('Change to pjlink_udp.get_datagram() call') - @patch.object(openlp.core.projectors.pjlink, 'log') - def test_process_ackn_multiple(self, mock_log): - """ - Test process_ackn method with multiple calls - """ - # TODO: Change this to call pjlink_udp.get_datagram() so ACKN can be processed properly - - # GIVEN: Test setup - pjlink_udp = PJLinkUDP(projector_list=self.test_list) - check_list = {TEST1_DATA['ip']: {'data': TEST1_DATA['mac_adx'], 'port': PJLINK_PORT}, - TEST2_DATA['ip']: {'data': TEST2_DATA['mac_adx'], 'port': PJLINK_PORT}} - log_debug_calls = [call('(UDP) PJLinkUDP() Initialized'), - call('(UDP) Processing ACKN packet'), - call('(UDP) Adding {host} to ACKN list'.format(host=TEST1_DATA['ip'])), - call('(UDP) Processing ACKN packet'), - call('(UDP) Adding {host} to ACKN list'.format(host=TEST2_DATA['ip']))] - - # WHEN: process_ackn called twice with different data - pjlink_udp.process_ackn(data=TEST1_DATA['mac_adx'], host=TEST1_DATA['ip'], port=PJLINK_PORT) - pjlink_udp.process_ackn(data=TEST2_DATA['mac_adx'], host=TEST2_DATA['ip'], port=PJLINK_PORT) - - # THEN: pjlink_udp.ack_list should equal test_list - # NOTE: This assert only returns AssertionError - does not list differences. Maybe add a compare function? - if pjlink_udp.ackn_list != check_list: - # Check this way so we can print differences to stdout - print('\nackn_list: ', pjlink_udp.ackn_list) - print('test_list: ', check_list) - assert pjlink_udp.ackn_list == check_list - mock_log.debug.assert_has_calls(log_debug_calls) - - @skip('Change to pjlink_udp.get_datagram() call') - @patch.object(openlp.core.projectors.pjlink, 'log') - def test_process_ackn_single(self, mock_log): - """ - Test process_ackn method with single call - """ - # TODO: Change this to call pjlink_udp.get_datagram() so ACKN can be processed properly - - # GIVEN: Test setup - pjlink_udp = PJLinkUDP(projector_list=self.test_list) - check_list = {TEST1_DATA['ip']: {'data': TEST1_DATA['mac_adx'], 'port': PJLINK_PORT}} - log_debug_calls = [call('(UDP) PJLinkUDP() Initialized'), - call('(UDP) Processing ACKN packet'), - call('(UDP) Adding {host} to ACKN list'.format(host=TEST1_DATA['ip']))] - - # WHEN: process_ackn called twice with different data - pjlink_udp.process_ackn(data=TEST1_DATA['mac_adx'], host=TEST1_DATA['ip'], port=PJLINK_PORT) - - # THEN: pjlink_udp.ack_list should equal test_list - # NOTE: This assert only returns AssertionError - does not list differences. Maybe add a compare function? - if pjlink_udp.ackn_list != check_list: - # Check this way so we can print differences to stdout - print('\nackn_list: ', pjlink_udp.ackn_list) - print('test_list: ', check_list) - assert pjlink_udp.ackn_list == check_list - mock_log.debug.assert_has_calls(log_debug_calls) - - @skip('Change to pjlink_udp.get_datagram() call') - @patch.object(openlp.core.projectors.pjlink, 'log') - def test_process_srch(self, mock_log): - """ - Test process_srch method - """ - # TODO: Change this to call pjlink_udp.get_datagram() so ACKN can be processed properly - - # GIVEN: Test setup - log_warn_calls = [call('(UDP) SRCH packet received from {ip} - ignoring'.format(ip=TEST1_DATA['ip'])), ] - log_debug_calls = [call('(UDP) PJLinkUDP() Initialized'), ] - pjlink_udp = PJLinkUDP(projector_list=self.test_list) - - # WHEN: process_srch called - pjlink_udp.process_srch(data=None, host=TEST1_DATA['ip'], port=PJLINK_PORT) - - # THEN: log entries should be entered - mock_log.warning.assert_has_calls(log_warn_calls) + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == E_NO_AUTHENTICATION), \ + 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) diff --git a/tests/openlp_core/projectors/test_projector_pjlink_base_01.py b/tests/openlp_core/projectors/test_projector_pjlink_base_01.py index b44d2eca3..b32437e46 100644 --- a/tests/openlp_core/projectors/test_projector_pjlink_base_01.py +++ b/tests/openlp_core/projectors/test_projector_pjlink_base_01.py @@ -20,7 +20,7 @@ # along with this program. If not, see . # ########################################################################## """ -Package to test the openlp.core.projectors.pjlink base package. +Package to test the openlp.core.projectors.pjlink base package part 1. """ from unittest import TestCase from unittest.mock import MagicMock, call, patch diff --git a/tests/openlp_core/projectors/test_projector_pjlink_base_02.py b/tests/openlp_core/projectors/test_projector_pjlink_base_02.py index c45f230a2..86a4fd400 100644 --- a/tests/openlp_core/projectors/test_projector_pjlink_base_02.py +++ b/tests/openlp_core/projectors/test_projector_pjlink_base_02.py @@ -20,7 +20,7 @@ # along with this program. If not, see . # ########################################################################## """ -Package to test the openlp.core.projectors.pjlink base package. +Package to test the openlp.core.projectors.pjlink base package part 2. """ from unittest import TestCase from unittest.mock import call, patch diff --git a/tests/openlp_core/projectors/test_projector_pjlink_base_03.py b/tests/openlp_core/projectors/test_projector_pjlink_base_03.py new file mode 100644 index 000000000..bba030262 --- /dev/null +++ b/tests/openlp_core/projectors/test_projector_pjlink_base_03.py @@ -0,0 +1,130 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 + +########################################################################## +# OpenLP - Open Source Lyrics Projection # +# ---------------------------------------------------------------------- # +# Copyright (c) 2008-2019 OpenLP Developers # +# ---------------------------------------------------------------------- # +# 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, either version 3 of the License, or # +# (at your option) any later version. # +# # +# 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, see . # +########################################################################## +""" +Package to test the openlp.core.projectors.pjlink base package part 3. +""" +from unittest import TestCase +from unittest.mock import call, patch + +import openlp.core.projectors.pjlink +from openlp.core.projectors.constants import PJLINK_CLASS, STATUS_CODE, \ + S_NOT_CONNECTED, S_OFF, S_ON, QSOCKET_STATE +from openlp.core.projectors.db import Projector +from openlp.core.projectors.pjlink import PJLink +from tests.resources.projector.data import TEST1_DATA + + +class TestPJLinkBase(TestCase): + """ + Tests for the PJLink module + """ + def setUp(self): + """ + Initialize test state(s) + """ + # Default PJLink instance for tests + self.pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) + + def tearDown(self): + """ + Cleanup test state(s) + """ + del(self.pjlink) + + @patch.object(openlp.core.projectors.pjlink, 'log') + def test_projector_reset_information(self, mock_log): + """ + Test reset_information() resets all information and stops timers + """ + # GIVEN: Test object + log_debug_calls = [call('({ip}) reset_information() connect status is ' + 'S_NOT_CONNECTED'.format(ip=self.pjlink.name)), + call('({ip}): Calling poll_timer.stop()'.format(ip=self.pjlink.name)), + call('({ip}): Calling socket_timer.stop()'.format(ip=self.pjlink.name)), + call('({ip}): Calling status_timer.stop()'.format(ip=self.pjlink.name))] + + # Attributes not available until instantiation, so mock here + with patch.object(self.pjlink, 'socket_timer') as mock_socket_timer, \ + patch.object(self.pjlink, 'status_timer') as mock_status_timer, \ + patch.object(self.pjlink, 'poll_timer') as mock_poll_timer, \ + patch.object(self.pjlink, 'state') as mock_state: + mock_state.return_value = QSOCKET_STATE[S_NOT_CONNECTED] + # Set attributes to something other than None or {} or [] + self.pjlink.fan = True + self.pjlink.filter_time = True + self.pjlink.lamp = True + self.pjlink.mac_adx_received = 'Some random MAC' + self.pjlink.manufacturer = 'PJLINK' + self.pjlink.model = '1' + self.pjlink.model_filter = 'Filter' + self.pjlink.model_lamp = 'Lamp' + self.pjlink.mute = True + self.pjlink.other_info = 'Another Test' + self.pjlink.pjlink_class = 2 + self.pjlink.pjlink_name = 'OPENLPTEST' + self.pjlink.power = S_ON + self.pjlink.projector_errors = {'test1': True, 'test2': False} + self.pjlink.serial_no = 'Some Number' + self.pjlink.serial_no_received = 'Some Other Number' + self.pjlink.sw_version = 'Some Version' + self.pjlink.sw_version_received = 'Some Other Version' + self.pjlink.shutter = True + self.pjlink.source_available = True + self.pjlink.source = True + self.pjlink.status_timer_checks = {'test1': object(), 'test2': object()} + self.pjlink.send_busy = False + self.pjlink.send_queue = ['test1', 'test2'] + self.pjlink.priority_queue = ['test1', 'test2'] + + # WHEN: reset_information() is called + self.pjlink.reset_information() + + # THEN: All information should be reset and timers stopped + mock_log.debug.assert_has_calls(log_debug_calls) + assert self.pjlink.fan is None, 'fan should be None' + assert self.pjlink.filter_time is None, 'filter_time should be None' + assert self.pjlink.lamp is None, 'lamp should be None' + assert self.pjlink.mac_adx_received is None, 'mac_adx_received should be None' + assert self.pjlink.manufacturer is None, 'manufacturer should be None' + assert self.pjlink.model is None, 'model should be None' + assert self.pjlink.model_filter is None, 'model_filter should be None' + assert self.pjlink.model_lamp is None, 'model_lamp should be None' + assert not self.pjlink.mute, 'mute should be False' + assert self.pjlink.other_info is None, 'other should be None' + assert self.pjlink.pjlink_class == PJLINK_CLASS, 'pjlink_class should be {cls}'.format(cls=PJLINK_CLASS) + assert self.pjlink.pjlink_name is None, 'pjlink_name should be None' + assert self.pjlink.power == S_OFF, 'power should be {data}'.format(data=STATUS_CODE[S_OFF]) + assert self.pjlink.projector_errors == {}, 'projector_errors should be an empty dict' + assert self.pjlink.serial_no is None, 'serial_no should be None' + assert self.pjlink.serial_no_received is None, 'serial_no_received should be None' + assert self.pjlink.sw_version is None, 'sw_version should be None' + assert self.pjlink.sw_version_received is None, 'sw_version_received should be None' + assert not self.pjlink.shutter, 'shutter should be False' + assert self.pjlink.source_available is None, 'source_available should be None' + assert self.pjlink.source is None, 'source should be None' + assert self.pjlink.status_timer_checks == {}, 'status_timer_checks should be an empty dict' + assert not self.pjlink.send_busy, 'send_busy should be False' + assert self.pjlink.send_queue == [], 'send_queue should be an empty list' + assert self.pjlink.priority_queue == [], 'priority_queue should be an empty list' + assert mock_socket_timer.stop.called, 'socket_timer.stop() should have been called' + assert mock_status_timer.stop.called, 'status_timer.stop() should have been called' + assert mock_poll_timer.stop.called, 'poll_timer.stop() should have been called' From 2069c94a109583e1b0ec1f94a70f2661e11d5ba6 Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Wed, 15 May 2019 06:23:58 -0700 Subject: [PATCH 21/50] Remove extraneous parens --- .../projectors/test_projector_commands_01.py | 44 ++++----- .../projectors/test_projector_commands_02.py | 64 ++++++------ .../projectors/test_projector_commands_03.py | 16 +-- .../test_projector_pjlink_base_02.py | 98 +++++++++---------- 4 files changed, 111 insertions(+), 111 deletions(-) diff --git a/tests/openlp_core/projectors/test_projector_commands_01.py b/tests/openlp_core/projectors/test_projector_commands_01.py index 207ab92f9..deaba7619 100644 --- a/tests/openlp_core/projectors/test_projector_commands_01.py +++ b/tests/openlp_core/projectors/test_projector_commands_01.py @@ -92,7 +92,7 @@ class TestPJLinkCommands(TestCase): # THEN: Shutter should be closed and mute should be True assert self.pjlink.shutter, 'Shutter should changed' assert self.pjlink.mute, 'Audio should not have changed' - assert (not mock_UpdateIcons.emit.called), 'Update icons should NOT have been called' + assert not mock_UpdateIcons.emit.called, 'Update icons should NOT have been called' mock_log.warning.assert_has_calls(log_warning_text) mock_log.debug.assert_has_calls(log_debug_text) @@ -140,8 +140,8 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='AVMT', data='30') # THEN: Shutter should be closed and mute should be True - assert (not self.pjlink.shutter), 'Shutter should have been set to off' - assert (not self.pjlink.mute), 'Audio should be on' + assert not self.pjlink.shutter, 'Shutter should have been set to off' + assert not self.pjlink.mute, 'Audio should be on' assert mock_UpdateIcons.emit.called, 'Update icons should have been called' mock_log.warning.assert_has_calls(log_warning_text) mock_log.debug.assert_has_calls(log_debug_text) @@ -193,7 +193,7 @@ class TestPJLinkCommands(TestCase): assert self.pjlink.shutter, 'Shutter should have been set to closed' assert self.pjlink.mute, 'Audio should not have changed' assert mock_UpdateIcons.emit.called, 'Update icons should have been called' - assert ('AVMT' not in self.pjlink.status_timer_checks), 'Status timer list should not have AVMT callback' + assert 'AVMT' not in self.pjlink.status_timer_checks, 'Status timer list should not have AVMT callback' assert mock_status_timer.stop.called, 'Projector status_timer.stop() should have been called' mock_log.warning.assert_has_calls(log_warning_text) mock_log.debug.assert_has_calls(log_debug_text) @@ -214,7 +214,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='CLSS', data='1') # THEN: Projector class should be set with proper value - assert ('1' == self.pjlink.pjlink_class), 'Should have set class=1' + assert '1' == self.pjlink.pjlink_class, 'Should have set class=1' mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -235,7 +235,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='CLSS', data='2') # THEN: Projector class should be set with proper value - assert ('2' == self.pjlink.pjlink_class), 'Should have set class=2' + assert '2' == self.pjlink.pjlink_class, 'Should have set class=2' mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -256,7 +256,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='CLSS', data='Z') # THEN: Projector class should be set with default value - assert (self.pjlink.pjlink_class == '1'), 'Invalid NaN class reply should have set class=1' + assert self.pjlink.pjlink_class == '1', 'Invalid NaN class reply should have set class=1' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -276,7 +276,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='CLSS', data='Invalid') # THEN: Projector class should be set with default value - assert (self.pjlink.pjlink_class == '1'), 'Invalid class reply should have set class=1' + assert self.pjlink.pjlink_class == '1', 'Invalid class reply should have set class=1' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -296,7 +296,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='CLSS', data='Class 1') # THEN: Projector class should be set with proper value - assert ('1' == self.pjlink.pjlink_class), 'Non-standard class reply should have set class=1' + assert '1' == self.pjlink.pjlink_class, 'Non-standard class reply should have set class=1' mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -316,7 +316,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='CLSS', data='Version2') # THEN: Projector class should be set with proper value - assert ('2' == self.pjlink.pjlink_class), 'Non-standard class reply should have set class=1' + assert '2' == self.pjlink.pjlink_class, 'Non-standard class reply should have set class=1' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -348,7 +348,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='ERST', data=chk_data) # THEN: PJLink instance errors should match chk_value - assert (self.pjlink.projector_errors == chk_test), 'Projector errors should be all E_ERROR' + assert self.pjlink.projector_errors == chk_test, 'Projector errors should be all E_ERROR' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -368,7 +368,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='ERST', data=chk_data) # THEN: PJLink instance errors should be None - assert (self.pjlink.projector_errors is None), 'projector_errors should have been set to None' + assert self.pjlink.projector_errors is None, 'projector_errors should have been set to None' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -400,7 +400,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='ERST', data=chk_data) # THEN: PJLink instance errors should match chk_value - assert (self.pjlink.projector_errors == chk_test), 'Projector errors should be all E_WARN' + assert self.pjlink.projector_errors == chk_test, 'Projector errors should be all E_WARN' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -423,7 +423,7 @@ class TestPJLinkCommands(TestCase): process_command(self.pjlink, cmd='ERST', data=chk_data) # THEN: pjlink.projector_errors should be empty and warning logged - assert (not self.pjlink.projector_errors), 'There should be no errors' + assert not self.pjlink.projector_errors, 'There should be no errors' mock_log.warning.assert_has_calls(log_warn_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -445,7 +445,7 @@ class TestPJLinkCommands(TestCase): process_command(self.pjlink, cmd='ERST', data=chk_data) # THEN: pjlink.projector_errors should be empty and warning logged - assert (not self.pjlink.projector_errors), 'There should be no errors' + assert not self.pjlink.projector_errors, 'There should be no errors' mock_log.warning.assert_has_calls(log_warn_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -472,10 +472,10 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='ERST', data=chk_data) # THEN: PJLink instance errors should match only cover warning - assert (1 == len(self.pjlink.projector_errors)), 'There should only be 1 error listed in projector_errors' - assert ('Cover' in self.pjlink.projector_errors), '"Cover" should be the only error listed' - assert (self.pjlink.projector_errors['Cover'] == E_WARN), '"Cover" should have E_WARN listed as error' - assert (chk_test == self.pjlink.projector_errors), 'projector_errors should match test errors' + assert 1 == len(self.pjlink.projector_errors), 'There should only be 1 error listed in projector_errors' + assert 'Cover' in self.pjlink.projector_errors, '"Cover" should be the only error listed' + assert self.pjlink.projector_errors['Cover'] == E_WARN, '"Cover" should have E_WARN listed as error' + assert chk_test == self.pjlink.projector_errors, 'projector_errors should match test errors' mock_log.warning.assert_has_calls(log_warn_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -498,7 +498,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='INF1', data=chk_data) # THEN: Data should be saved - assert (self.pjlink.manufacturer == chk_data), 'Test data should have been saved' + assert self.pjlink.manufacturer == chk_data, 'Test data should have been saved' mock_log.warning.assert_has_calls(log_warn_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -521,7 +521,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='INF2', data=chk_data) # THEN: Data should be saved - assert (self.pjlink.model == chk_data), 'Test data should have been saved' + assert self.pjlink.model == chk_data, 'Test data should have been saved' mock_log.warning.assert_has_calls(log_warn_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -544,6 +544,6 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='INFO', data=chk_data) # THEN: Data should be saved - assert (self.pjlink.other_info == chk_data), 'Test data should have been saved' + assert self.pjlink.other_info == chk_data, 'Test data should have been saved' mock_log.warning.assert_has_calls(log_warn_calls) mock_log.debug.assert_has_calls(log_debug_calls) diff --git a/tests/openlp_core/projectors/test_projector_commands_02.py b/tests/openlp_core/projectors/test_projector_commands_02.py index 54306c0fe..2462010cc 100644 --- a/tests/openlp_core/projectors/test_projector_commands_02.py +++ b/tests/openlp_core/projectors/test_projector_commands_02.py @@ -67,7 +67,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='INPT', data='21') # THEN: Input selected should reflect current input - assert ('21' == self.pjlink.source), 'Input source should be set to "21"' + assert '21' == self.pjlink.source, 'Input source should be set to "21"' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -88,7 +88,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='INPT', data='91') # THEN: Input selected should reflect current input - assert (not self.pjlink.source), 'Input source should not have changed' + assert not self.pjlink.source, 'Input source should not have changed' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -110,7 +110,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='INPT', data='25') # THEN: Input selected should reflect current input - assert ('11' == self.pjlink.source), 'Input source should not have changed' + assert '11' == self.pjlink.source, 'Input source should not have changed' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -138,7 +138,7 @@ class TestPJLinkCommands(TestCase): # THEN: Data should have been sorted and saved properly mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (self.pjlink.source_available == chk_test), "Sources should have been sorted and saved" + assert self.pjlink.source_available == chk_test, "Sources should have been sorted and saved" @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_lamp_invalid_missing_data(self, mock_log): @@ -158,7 +158,7 @@ class TestPJLinkCommands(TestCase): # THEN: Lamp should have been set with proper lamp status mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (not self.pjlink.lamp), 'Projector lamp info should not have changed' + assert not self.pjlink.lamp, 'Projector lamp info should not have changed' @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_lamp_invalid_nan(self, mock_log): @@ -180,11 +180,11 @@ class TestPJLinkCommands(TestCase): # THEN: lamps should not have changed mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (2 == len(self.pjlink.lamp)), 'Projector lamp list should not have changed' + assert 2 == len(self.pjlink.lamp), 'Projector lamp list should not have changed' assert self.pjlink.lamp[0]['On'], 'Lamp 1 power status should not have changed' - assert (0 == self.pjlink.lamp[0]['Hours']), 'Lamp 1 hours should not have changed' - assert (not self.pjlink.lamp[1]['On']), 'Lamp 2 power status should not have changed' - assert (11111 == self.pjlink.lamp[1]['Hours']), 'Lamp 2 hours should not have changed' + assert 0 == self.pjlink.lamp[0]['Hours'], 'Lamp 1 hours should not have changed' + assert not self.pjlink.lamp[1]['On'], 'Lamp 2 power status should not have changed' + assert 11111 == self.pjlink.lamp[1]['Hours'], 'Lamp 2 hours should not have changed' @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_lamp_multiple(self, mock_log): @@ -204,13 +204,13 @@ class TestPJLinkCommands(TestCase): # THEN: Lamp should have been set with proper lamp status mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (3 == len(self.pjlink.lamp)), 'Projector should have 3 lamps specified' + assert 3 == len(self.pjlink.lamp), 'Projector should have 3 lamps specified' assert self.pjlink.lamp[0]['On'], 'Lamp 1 power status should have been set to TRUE' - assert (11111 == self.pjlink.lamp[0]['Hours']), 'Lamp 1 hours should have been set to 11111' - assert (not self.pjlink.lamp[1]['On']), 'Lamp 2 power status should have been set to FALSE' - assert (22222 == self.pjlink.lamp[1]['Hours']), 'Lamp 2 hours should have been set to 22222' + assert 11111 == self.pjlink.lamp[0]['Hours'], 'Lamp 1 hours should have been set to 11111' + assert not self.pjlink.lamp[1]['On'], 'Lamp 2 power status should have been set to FALSE' + assert 22222 == self.pjlink.lamp[1]['Hours'], 'Lamp 2 hours should have been set to 22222' assert self.pjlink.lamp[2]['On'], 'Lamp 3 power status should have been set to TRUE' - assert (33333 == self.pjlink.lamp[2]['Hours']), 'Lamp 3 hours should have been set to 33333' + assert 33333 == self.pjlink.lamp[2]['Hours'], 'Lamp 3 hours should have been set to 33333' @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_lamp_single(self, mock_log): @@ -229,9 +229,9 @@ class TestPJLinkCommands(TestCase): # THEN: Lamp should have been set with proper lamp status mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (1 == len(self.pjlink.lamp)), 'Projector should have 1 lamp specified' + assert 1 == len(self.pjlink.lamp), 'Projector should have 1 lamp specified' assert self.pjlink.lamp[0]['On'], 'Lamp 1 power status should have been set to TRUE' - assert (11111 == self.pjlink.lamp[0]['Hours']), 'Lamp 1 hours should have been set to 11111' + assert 11111 == self.pjlink.lamp[0]['Hours'], 'Lamp 1 hours should have been set to 11111' @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_name(self, mock_log): @@ -253,7 +253,7 @@ class TestPJLinkCommands(TestCase): # THEN: name should be set and logged mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (self.pjlink.pjlink_name == chk_data), 'Name test data should have been saved' + assert self.pjlink.pjlink_name == chk_data, 'Name test data should have been saved' @patch.object(openlp.core.projectors.pjlink.PJLink, 'send_command') @patch.object(openlp.core.projectors.pjlink.PJLink, 'change_status') @@ -276,7 +276,7 @@ class TestPJLinkCommands(TestCase): # THEN: Projector power should not have changed mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (S_STANDBY == self.pjlink.power), 'Power should not have changed' + assert S_STANDBY == self.pjlink.power, 'Power should not have changed' mock_UpdateIcons.emit.assert_not_called() mock_change_status.assert_not_called() mock_send_command.assert_not_called() @@ -302,9 +302,9 @@ class TestPJLinkCommands(TestCase): # THEN: Power should be set to ON mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (S_STANDBY == self.pjlink.power), 'Power should have been set to OFF' + assert S_STANDBY == self.pjlink.power, 'Power should have been set to OFF' assert mock_UpdateIcons.emit.called, 'projectorUpdateIcons should have been called' - assert (not mock_send_command.called), 'send_command should not have been called' + assert not mock_send_command.called, 'send_command should not have been called' mock_change_status.assert_called_once_with(S_STANDBY) @patch.object(openlp.core.projectors.pjlink.PJLink, 'send_command') @@ -328,7 +328,7 @@ class TestPJLinkCommands(TestCase): # THEN: Power should be set to ON mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (S_ON == self.pjlink.power), 'Power should have been set to ON' + assert S_ON == self.pjlink.power, 'Power should have been set to ON' assert mock_UpdateIcons.emit.called, 'projectorUpdateIcons should have been called' mock_send_command.assert_called_once_with('INST') mock_change_status.assert_called_once_with(S_ON) @@ -352,7 +352,7 @@ class TestPJLinkCommands(TestCase): # THEN: Filter model number should be saved mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (self.pjlink.model_filter == new_data), 'Filter model should have been saved' + assert self.pjlink.model_filter == new_data, 'Filter model should have been saved' @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_rfil_nosave(self, mock_log): @@ -374,7 +374,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='RFIL', data=new_data) # THEN: Filter model number should be saved - assert (self.pjlink.model_filter != new_data), 'Filter model should NOT have been saved' + assert self.pjlink.model_filter != new_data, 'Filter model should NOT have been saved' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -397,7 +397,7 @@ class TestPJLinkCommands(TestCase): # THEN: Filter model number should be saved mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (self.pjlink.model_lamp == new_data), 'Lamp model should have been saved' + assert self.pjlink.model_lamp == new_data, 'Lamp model should have been saved' @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_rlmp_nosave(self, mock_log): @@ -419,7 +419,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='RLMP', data=new_data) # THEN: Filter model number should be saved - assert (self.pjlink.model_lamp != new_data), 'Lamp model should NOT have been saved' + assert self.pjlink.model_lamp != new_data, 'Lamp model should NOT have been saved' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -446,7 +446,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='SNUM', data=new_data) # THEN: Serial number should be set - assert (self.pjlink.serial_no != new_data), 'Projector serial number should NOT have been set' + assert self.pjlink.serial_no != new_data, 'Projector serial number should NOT have been set' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -469,7 +469,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='SNUM', data=new_data) # THEN: Serial number should be set - assert (self.pjlink.serial_no == new_data), 'Projector serial number should have been set' + assert self.pjlink.serial_no == new_data, 'Projector serial number should have been set' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -497,7 +497,7 @@ class TestPJLinkCommands(TestCase): process_command(self.pjlink, cmd='SVER', data=new_data) # THEN: Version information should change - assert (self.pjlink.sw_version == new_data), 'Software version should have changed' + assert self.pjlink.sw_version == new_data, 'Software version should have changed' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -519,8 +519,8 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='SVER', data=new_data) # THEN: Version information should not change - assert (not self.pjlink.sw_version), 'Software version should not have changed' - assert (not self.pjlink.sw_version_received), 'Received software version should not have changed' + assert not self.pjlink.sw_version, 'Software version should not have changed' + assert not self.pjlink.sw_version_received, 'Received software version should not have changed' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -544,7 +544,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='SVER', data=new_data) # THEN: Version information should not change - assert (self.pjlink.sw_version == new_data), 'Software version should have been updated' - assert (not self.pjlink.sw_version_received), 'Received version field should not have changed' + assert self.pjlink.sw_version == new_data, 'Software version should have been updated' + assert not self.pjlink.sw_version_received, 'Received version field should not have changed' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) diff --git a/tests/openlp_core/projectors/test_projector_commands_03.py b/tests/openlp_core/projectors/test_projector_commands_03.py index b782d205e..788ac1430 100644 --- a/tests/openlp_core/projectors/test_projector_commands_03.py +++ b/tests/openlp_core/projectors/test_projector_commands_03.py @@ -74,7 +74,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == S_AUTHENTICATE), 'Should have returned {data}'.format(data=STATUS_CODE[S_AUTHENTICATE]) + assert chk == S_AUTHENTICATE, 'Should have returned {data}'.format(data=STATUS_CODE[S_AUTHENTICATE]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_process_pjlink_authenticate_pin_not_set_error(self, mock_log): @@ -98,7 +98,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == E_NO_AUTHENTICATION), \ + assert chk == E_NO_AUTHENTICATION, \ 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') @@ -124,7 +124,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == E_NO_AUTHENTICATION), \ + assert chk == E_NO_AUTHENTICATION, \ 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') @@ -150,7 +150,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == E_NO_AUTHENTICATION), \ + assert chk == E_NO_AUTHENTICATION, \ 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') @@ -175,7 +175,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == E_NO_AUTHENTICATION), \ + assert chk == E_NO_AUTHENTICATION, \ 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') @@ -201,7 +201,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == S_CONNECT), 'Should have returned {data}'.format(data=STATUS_CODE[S_CONNECT]) + assert chk == S_CONNECT, 'Should have returned {data}'.format(data=STATUS_CODE[S_CONNECT]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_process_pjlink_normal_pin_set_error(self, mock_log): @@ -224,7 +224,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == E_NO_AUTHENTICATION), \ + assert chk == E_NO_AUTHENTICATION, \ 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') @@ -249,5 +249,5 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == E_NO_AUTHENTICATION), \ + assert chk == E_NO_AUTHENTICATION, \ 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) diff --git a/tests/openlp_core/projectors/test_projector_pjlink_base_02.py b/tests/openlp_core/projectors/test_projector_pjlink_base_02.py index 86a4fd400..2f36814f7 100644 --- a/tests/openlp_core/projectors/test_projector_pjlink_base_02.py +++ b/tests/openlp_core/projectors/test_projector_pjlink_base_02.py @@ -96,10 +96,10 @@ class TestPJLinkBase(TestCase): mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) mock_change_status.called_with(E_NETWORK, 'Error while sending data to projector') - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' assert mock_timer.start.called, 'Timer should have been called' - assert (not mock_reset.called), 'reset_information() should not should have been called' + assert not mock_reset.called, 'reset_information() should not should have been called' assert mock_disconnect.called, 'disconnect_from_host() should have been called' assert self.pjlink.send_busy, 'send_busy should be True' @@ -127,10 +127,10 @@ class TestPJLinkBase(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' - assert (not mock_timer.called), 'Timer should not have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' + assert not mock_timer.called, 'Timer should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'write') @patch.object(openlp.core.projectors.pjlink.PJLink, 'disconnect_from_host') @@ -173,11 +173,11 @@ class TestPJLinkBase(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' assert mock_timer.start.called, 'Timer should have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' - assert (not mock_disconnect.called), 'disconnect_from_host() should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' + assert not mock_disconnect.called, 'disconnect_from_host() should not have been called' assert self.pjlink.send_busy, 'send_busy flag should be True' @patch.object(openlp.core.projectors.pjlink.PJLink, 'disconnect_from_host') @@ -211,12 +211,12 @@ class TestPJLinkBase(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (self.pjlink.send_queue == [test_command]), 'Send queue should have one entry' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' - assert (not mock_timer.called), 'Timer should not have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert self.pjlink.send_queue == [test_command], 'Send queue should have one entry' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' + assert not mock_timer.called, 'Timer should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_disconnect.called, 'disconnect_from_host() should have been called' - assert (not self.pjlink.send_busy), 'send_busy flag should be False' + assert not self.pjlink.send_busy, 'send_busy flag should be False' @patch.object(openlp.core.projectors.pjlink.PJLink, 'write') @patch.object(openlp.core.projectors.pjlink.PJLink, 'disconnect_from_host') @@ -261,11 +261,11 @@ class TestPJLinkBase(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' assert mock_timer.start.called, 'Timer should have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' - assert (not mock_disconnect.called), 'disconnect_from_host() should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' + assert not mock_disconnect.called, 'disconnect_from_host() should not have been called' assert self.pjlink.send_busy, 'send_busy flag should be True' @patch.object(openlp.core.projectors.pjlink.PJLink, 'write') @@ -314,10 +314,10 @@ class TestPJLinkBase(TestCase): mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) assert self.pjlink.send_queue, 'Send queue should have one entry' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' assert mock_timer.start.called, 'Timer should have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' - assert (not mock_disconnect.called), 'disconnect_from_host() should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' + assert not mock_disconnect.called, 'disconnect_from_host() should not have been called' assert self.pjlink.send_busy, 'send_busy flag should be True' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -358,9 +358,9 @@ class TestPJLinkBase(TestCase): mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) assert self.pjlink.send_queue, 'Send queue should have one entry' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' - assert (not mock_timer.start.called), 'Timer should not have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' + assert not mock_timer.start.called, 'Timer should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' assert self.pjlink.send_busy, 'send_busy flag should be True' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -402,10 +402,10 @@ class TestPJLinkBase(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' + assert not self.pjlink.send_queue, 'Send queue should be empty' assert self.pjlink.priority_queue, 'Priority queue should have one entry' - assert (not mock_timer.start.called), 'Timer should not have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not mock_timer.start.called, 'Timer should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' assert self.pjlink.send_busy, 'send_busy flag should be True' # ------------ Test PJLink.send_command ---------- @@ -440,7 +440,7 @@ class TestPJLinkBase(TestCase): mock_log.debug.assert_has_calls(log_debug_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_send_command.called, '_underscore_send_command() should have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -473,8 +473,8 @@ class TestPJLinkBase(TestCase): mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) mock_priority.append.assert_called_with(test_command) - assert (not mock_send.append.called), 'send_queue should not have changed' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not mock_send.append.called, 'send_queue should not have changed' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_send_command.called, '_underscore_send_command() should have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -506,9 +506,9 @@ class TestPJLinkBase(TestCase): mock_log.debug.assert_has_calls(log_debug_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) - assert (self.pjlink.send_queue == [test_command]), 'Send queue should have one entry' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert self.pjlink.send_queue == [test_command], 'Send queue should have one entry' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_send_command.called, '_underscore_send_command() should have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -540,9 +540,9 @@ class TestPJLinkBase(TestCase): mock_log.debug.assert_has_calls(log_debug_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (self.pjlink.priority_queue == [test_command]), 'Priority queue should have one entry' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert self.pjlink.priority_queue == [test_command], 'Priority queue should have one entry' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_send_command.called, '_underscore_send_command() should have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -569,10 +569,10 @@ class TestPJLinkBase(TestCase): mock_log.debug.assert_has_calls(log_debug_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' - assert (not mock_reset.called), 'reset_information() should not have been called' - assert (not mock_send_command.called), '_underscore_send_command() should not have been called' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' + assert not mock_reset.called, 'reset_information() should not have been called' + assert not mock_send_command.called, '_underscore_send_command() should not have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @patch.object(openlp.core.projectors.pjlink.PJLink, 'reset_information') @@ -602,8 +602,8 @@ class TestPJLinkBase(TestCase): mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) assert self.pjlink.send_queue, 'Send queue should have one entry' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_send_command.called, '_underscore_send_command() should have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -633,9 +633,9 @@ class TestPJLinkBase(TestCase): mock_log.debug.assert_has_calls(log_debug_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' + assert not self.pjlink.send_queue, 'Send queue should be empty' assert self.pjlink.priority_queue, 'Priority queue should have one entry' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_send_command.called, '_underscore_send_command() should have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -661,7 +661,7 @@ class TestPJLinkBase(TestCase): mock_log.debug.assert_has_calls(log_debug_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' assert mock_reset.called, 'reset_information() should have been called' - assert (not mock_send_command.called), '_underscore_send_command() should not have been called' + assert not mock_send_command.called, '_underscore_send_command() should not have been called' From 685e46f6239e4f87df1bd4ac353dd98c741a0352 Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Wed, 15 May 2019 22:46:10 +0200 Subject: [PATCH 22/50] Synchronize setup.py with check_dependencies --- scripts/check_dependencies.py | 1 + setup.py | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py index 2fbddd69f..5b66c5ab9 100755 --- a/scripts/check_dependencies.py +++ b/scripts/check_dependencies.py @@ -100,6 +100,7 @@ OPTIONAL_MODULES = [ ('pyodbc', '(ODBC support)'), ('psycopg2', '(PostgreSQL support)'), ('enchant', '(spell checker)'), + ('fitz', '(executable-independent PDF support)'), ('pysword', '(import SWORD bibles)'), ('uno', '(LibreOffice/OpenOffice support)'), # development/testing modules diff --git a/setup.py b/setup.py index 90cef4885..3c408bb64 100644 --- a/setup.py +++ b/setup.py @@ -178,6 +178,7 @@ using a computer and a data projector.""", 'pyobjc-framework-Cocoa; platform_system=="Darwin"', 'PyQt5 >= 5.12', 'PyQtWebEngine', + 'python-vlc', 'pywin32; platform_system=="Windows"', 'QtAwesome', 'requests', From df538b1d70356b3943a7f0459b70cead0f58d346 Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Thu, 16 May 2019 00:36:16 +0200 Subject: [PATCH 23/50] Remove nose2 references --- nose2.cfg | 27 --------------------------- scripts/check_dependencies.py | 1 - setup.py | 3 +-- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 nose2.cfg diff --git a/nose2.cfg b/nose2.cfg deleted file mode 100644 index 451737d6c..000000000 --- a/nose2.cfg +++ /dev/null @@ -1,27 +0,0 @@ -[unittest] -verbose = true -plugins = nose2.plugins.mp - -[log-capture] -always-on = true -clear-handlers = true -filter = -nose -log-level = ERROR - -[test-result] -always-on = true -descriptions = true - -[coverage] -always-on = true -coverage = openlp -coverage-report = html - -[multiprocess] -always-on = false -processes = 4 - -[output-buffer] -always-on = true -stderr = true -stdout = true diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py index 5b66c5ab9..a49149f40 100755 --- a/scripts/check_dependencies.py +++ b/scripts/check_dependencies.py @@ -106,7 +106,6 @@ OPTIONAL_MODULES = [ # development/testing modules ('jenkins', '(access jenkins api)'), ('launchpadlib', '(launchpad script support)'), - ('nose2', '(testing framework)'), ('pylint', '(linter)') ] diff --git a/setup.py b/setup.py index 3c408bb64..dcf430d4c 100644 --- a/setup.py +++ b/setup.py @@ -200,13 +200,12 @@ using a computer and a data projector.""", 'launchpad': ['launchpadlib'] }, tests_require=[ - 'nose2', 'pylint', 'PyMuPDF', 'pyodbc', 'pysword', 'python-xlib; platform_system=="Linux"' ], - test_suite='nose2.collector.collector', + test_suite='tests', entry_points={'gui_scripts': ['openlp = run_openlp:start']} ) From 89ecdf2a965ec29a3cce5729465cfae9b9c27cc8 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 20 May 2019 22:35:48 +0200 Subject: [PATCH 24/50] try to make impress support going before start --- openlp/plugins/presentations/lib/impresscontroller.py | 4 ++++ openlp/plugins/presentations/lib/messagelistener.py | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index 03a69493d..081a06478 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -493,9 +493,13 @@ class ImpressDocument(PresentationDocument): """ Triggers the previous slide on the running presentation. """ + # if we are at the presentations start don't go further back, just return True + if self.slide_ended_reverse and self.get_slide_number() == 1: + return True self.slide_ended = False self.slide_ended_reverse = False self.control.gotoPreviousEffect() + return False def get_slide_text(self, slide_no): """ diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index 82f7559e5..0cea6949b 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -191,18 +191,18 @@ class Controller(object): """ log.debug('Live = {live}, previous'.format(live=self.is_live)) if not self.doc: - return + return False if not self.is_live: - return + return False if self.hide_mode: if not self.doc.is_active(): - return + return False if self.doc.slidenumber > 1: self.doc.slidenumber -= 1 self.poll() - return + return False if not self.activate(): - return + return False ret = self.doc.previous_step() self.poll() print('previous returning: %d' % ret) From 3d8d573389af510d17f67202edb008ef71836edf Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Tue, 21 May 2019 22:07:25 +0200 Subject: [PATCH 25/50] Always make sure the powerpoint slide index map is created --- openlp/core/ui/servicemanager.py | 6 ++++++ openlp/plugins/presentations/lib/powerpointcontroller.py | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index b18f2f9d8..18b5b6f04 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -975,8 +975,10 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi prev_item_last_slide = None service_iterator = QtWidgets.QTreeWidgetItemIterator(self.service_manager_list) while service_iterator.value(): + # Found the selected/current service item if service_iterator.value() == selected: if last_slide and prev_item_last_slide: + # Go to the last slide of the previous service item pos = prev_item.data(0, QtCore.Qt.UserRole) check_expanded = self.service_items[pos - 1]['expanded'] self.service_manager_list.setCurrentItem(prev_item_last_slide) @@ -985,13 +987,17 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi self.make_live() self.service_manager_list.setCurrentItem(prev_item) elif prev_item: + # Go to the first slide of the previous service item self.service_manager_list.setCurrentItem(prev_item) self.make_live() return + # Found the previous service item root if service_iterator.value().parent() is None: prev_item = service_iterator.value() + # Found the last slide of the previous item if service_iterator.value().parent() is prev_item: prev_item_last_slide = service_iterator.value() + # Go to next item in the tree service_iterator += 1 def on_set_item(self, message): diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index 7645a277a..fd5772e88 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -170,14 +170,17 @@ class PowerpointDocument(PresentationDocument): However, for the moment, we want a physical file since it makes life easier elsewhere. """ log.debug('create_thumbnails') + generate_thumbs = True if self.check_thumbnails(): - return + # No need for thumbnails but we still need the index + generate_thumbs = False key = 1 for num in range(self.presentation.Slides.Count): if not self.presentation.Slides(num + 1).SlideShowTransition.Hidden: self.index_map[key] = num + 1 - self.presentation.Slides(num + 1).Export( - str(self.get_thumbnail_folder() / 'slide{key:d}.png'.format(key=key)), 'png', 320, 240) + if generate_thumbs: + self.presentation.Slides(num + 1).Export( + str(self.get_thumbnail_folder() / 'slide{key:d}.png'.format(key=key)), 'png', 320, 240) key += 1 self.slide_count = key - 1 From 5482e70e6dc9ac88c90650344d238d86e4e57149 Mon Sep 17 00:00:00 2001 From: Phill Date: Wed, 22 May 2019 07:47:00 +0100 Subject: [PATCH 26/50] Break out json and path refactors from fixes branch --- openlp/core/api/deploy.py | 2 +- openlp/core/api/endpoint/controller.py | 2 +- openlp/core/app.py | 6 +- openlp/core/common/__init__.py | 10 +- openlp/core/common/applocation.py | 13 +- openlp/core/common/httputils.py | 2 +- openlp/core/common/json.py | 144 ++++++++++-- openlp/core/common/path.py | 121 +--------- openlp/core/common/settings.py | 17 +- openlp/core/lib/__init__.py | 12 +- openlp/core/lib/db.py | 23 +- openlp/core/lib/mediamanageritem.py | 6 +- openlp/core/lib/serviceitem.py | 6 +- openlp/core/lib/theme.py | 14 +- openlp/core/server.py | 3 +- openlp/core/ui/advancedtab.py | 4 +- openlp/core/ui/firsttimeform.py | 3 +- openlp/core/ui/generaltab.py | 2 +- openlp/core/ui/mainwindow.py | 8 +- openlp/core/ui/servicemanager.py | 21 +- openlp/core/ui/slidecontroller.py | 2 +- openlp/core/ui/themeform.py | 4 +- openlp/core/ui/thememanager.py | 28 +-- openlp/core/widgets/dialogs.py | 16 +- openlp/core/widgets/edits.py | 11 +- openlp/core/widgets/views.py | 5 +- openlp/plugins/bibles/lib/bibleimport.py | 2 +- openlp/plugins/bibles/lib/db.py | 6 +- .../plugins/bibles/lib/importers/csvbible.py | 2 +- .../bibles/lib/importers/wordproject.py | 2 +- openlp/plugins/bibles/lib/manager.py | 2 +- openlp/plugins/images/lib/mediaitem.py | 9 +- openlp/plugins/images/lib/upgrade.py | 6 +- .../media/forms/mediaclipselectorform.py | 2 +- .../presentations/lib/impresscontroller.py | 2 +- openlp/plugins/presentations/lib/mediaitem.py | 6 +- .../presentations/lib/messagelistener.py | 2 +- .../presentations/lib/pdfcontroller.py | 6 +- .../presentations/lib/powerpointcontroller.py | 2 +- .../lib/presentationcontroller.py | 20 +- .../presentations/lib/presentationtab.py | 2 +- openlp/plugins/songs/forms/editsongform.py | 3 +- openlp/plugins/songs/forms/mediafilesform.py | 4 +- .../songs/lib/importers/easyworship.py | 2 +- .../plugins/songs/lib/importers/powersong.py | 4 +- .../lib/importers/presentationmanager.py | 2 +- .../songs/lib/importers/propresenter.py | 2 +- .../plugins/songs/lib/importers/songbeamer.py | 2 +- .../plugins/songs/lib/importers/songimport.py | 7 +- openlp/plugins/songs/lib/importers/songpro.py | 2 +- .../plugins/songs/lib/importers/sundayplus.py | 4 +- .../plugins/songs/lib/importers/videopsalm.py | 2 +- openlp/plugins/songs/lib/mediaitem.py | 5 +- openlp/plugins/songs/lib/openlyricsexport.py | 2 +- openlp/plugins/songs/lib/upgrade.py | 6 +- openlp/plugins/songs/reporting.py | 2 +- openlp/plugins/songs/songsplugin.py | 2 +- .../songusage/forms/songusagedetailform.py | 2 +- .../functional/openlp_core/api/test_deploy.py | 5 +- .../openlp_core/common/test_applocation.py | 2 +- .../openlp_core/common/test_common.py | 2 +- .../openlp_core/common/test_httputils.py | 2 +- .../openlp_core/common/test_init.py | 2 +- .../openlp_core/common/test_json.py | 214 ++++++++++++++++-- .../openlp_core/common/test_path.py | 191 +--------------- .../openlp_core/common/test_settings.py | 3 +- tests/functional/openlp_core/lib/test_db.py | 2 +- tests/functional/openlp_core/lib/test_lib.py | 2 +- .../openlp_core/lib/test_serviceitem.py | 2 +- tests/functional/openlp_core/test_server.py | 2 +- .../openlp_core/ui/test_exceptionform.py | 2 +- .../openlp_core/ui/test_firsttimeform.py | 2 +- .../openlp_core/ui/test_themeform.py | 2 +- .../openlp_core/ui/test_thememanager.py | 16 +- .../openlp_core/widgets/test_dialogs.py | 2 +- .../openlp_core/widgets/test_edits.py | 2 +- .../openlp_plugins/bibles/test_bibleimport.py | 2 +- .../openlp_plugins/bibles/test_csvimport.py | 2 +- .../openlp_plugins/bibles/test_manager.py | 2 +- .../bibles/test_wordprojectimport.py | 2 +- .../openlp_plugins/images/test_lib.py | 2 +- .../openlp_plugins/images/test_upgrade.py | 2 +- .../openlp_plugins/media/test_mediaitem.py | 2 +- .../presentations/test_mediaitem.py | 2 +- .../presentations/test_pdfcontroller.py | 8 +- .../test_presentationcontroller.py | 2 +- .../songs/test_openlyricsexport.py | 5 +- tests/helpers/songfileimport.py | 2 +- .../openlp_core/lib/test_pluginmanager.py | 5 +- .../openlp_core/ui/test_firsttimeform.py | 2 +- .../openlp_core/ui/test_thememanager.py | 2 +- tests/utils/__init__.py | 2 +- tests/utils/constants.py | 3 +- 93 files changed, 564 insertions(+), 547 deletions(-) diff --git a/openlp/core/api/deploy.py b/openlp/core/api/deploy.py index fcfe74916..d592ea982 100644 --- a/openlp/core/api/deploy.py +++ b/openlp/core/api/deploy.py @@ -34,7 +34,7 @@ def deploy_zipfile(app_root_path, zip_name): Process the downloaded zip file and add to the correct directory :param str zip_name: the zip file name to be processed - :param openlp.core.common.path.Path app_root_path: The directory to expand the zip to + :param pathlib.Path app_root_path: The directory to expand the zip to :return: None """ diff --git a/openlp/core/api/endpoint/controller.py b/openlp/core/api/endpoint/controller.py index 4933ea7c8..96acbb885 100644 --- a/openlp/core/api/endpoint/controller.py +++ b/openlp/core/api/endpoint/controller.py @@ -24,11 +24,11 @@ import logging import os import urllib.error import urllib.request +from pathlib import Path from openlp.core.api.http import requires_auth from openlp.core.api.http.endpoint import Endpoint from openlp.core.common.applocation import AppLocation -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.lib import create_thumb diff --git a/openlp/core/app.py b/openlp/core/app.py index ab738e1a2..018be0860 100644 --- a/openlp/core/app.py +++ b/openlp/core/app.py @@ -32,6 +32,8 @@ import sys import time import os from datetime import datetime +from pathlib import Path +from shutil import copytree from traceback import format_exception from PyQt5 import QtCore, QtWebEngineWidgets, QtWidgets # noqa @@ -41,7 +43,7 @@ from openlp.core.common import is_macosx, is_win from openlp.core.common.applocation import AppLocation from openlp.core.loader import loader from openlp.core.common.i18n import LanguageManager, UiStrings, translate -from openlp.core.common.path import copytree, create_paths, Path +from openlp.core.common.path import create_paths from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.display.screens import ScreenList @@ -316,7 +318,7 @@ def set_up_logging(log_path): """ Setup our logging using log_path - :param openlp.core.common.path.Path log_path: The file to save the log to. + :param Path log_path: The file to save the log to. :rtype: None """ create_paths(log_path, do_not_log=True) diff --git a/openlp/core/common/__init__.py b/openlp/core/common/__init__.py index c7bc25b29..bcdb99109 100644 --- a/openlp/core/common/__init__.py +++ b/openlp/core/common/__init__.py @@ -142,7 +142,7 @@ def path_to_module(path): """ Convert a path to a module name (i.e openlp.core.common) - :param openlp.core.common.path.Path path: The path to convert to a module name. + :param pathlib.Path path: The path to convert to a module name. :return: The module name. :rtype: str """ @@ -371,7 +371,7 @@ def delete_file(file_path): """ Deletes a file from the system. - :param openlp.core.common.path.Path file_path: The file, including path, to delete. + :param pathlib.Path file_path: The file, including path, to delete. :return: True if the deletion was successful, or the file never existed. False otherwise. :rtype: bool """ @@ -407,7 +407,7 @@ def is_not_image_file(file_path): """ Validate that the file is not an image file. - :param openlp.core.common.path.Path file_path: The file to be checked. + :param pathlib.Path file_path: The file to be checked. :return: If the file is not an image :rtype: bool """ @@ -435,7 +435,7 @@ def check_binary_exists(program_path): """ Function that checks whether a binary exists. - :param openlp.core.common.path.Path program_path: The full path to the binary to check. + :param pathlib.Path program_path: The full path to the binary to check. :return: program output to be parsed :rtype: bytes """ @@ -462,7 +462,7 @@ def get_file_encoding(file_path): """ Utility function to incrementally detect the file encoding. - :param openlp.core.common.path.Path file_path: Filename for the file to determine the encoding for. + :param pathlib.Path file_path: Filename for the file to determine the encoding for. :return: The name of the encoding detected :rtype: str """ diff --git a/openlp/core/common/applocation.py b/openlp/core/common/applocation.py index b3407b528..fdf0eecdc 100644 --- a/openlp/core/common/applocation.py +++ b/openlp/core/common/applocation.py @@ -25,12 +25,13 @@ The :mod:`openlp.core.common.applocation` module provides an utility for OpenLP import logging import os import sys +from pathlib import Path import appdirs import openlp from openlp.core.common import get_frozen_path, is_macosx, is_win -from openlp.core.common.path import Path, create_paths +from openlp.core.common.path import create_paths from openlp.core.common.settings import Settings @@ -58,7 +59,7 @@ class AppLocation(object): :param dir_type: The directory type you want, for instance the data directory. Default *AppLocation.AppDir* :return: The requested path - :rtype: openlp.core.common.path.Path + :rtype: Path """ if dir_type == AppLocation.AppDir or dir_type == AppLocation.VersionDir: return get_frozen_path(FROZEN_APP_PATH, APP_PATH) @@ -75,7 +76,7 @@ class AppLocation(object): Return the path OpenLP stores all its data under. :return: The data path to use. - :rtype: openlp.core.common.path.Path + :rtype: Path """ # Check if we have a different data location. if Settings().contains('advanced/data path'): @@ -95,7 +96,7 @@ class AppLocation(object): :param str extension: Defaults to ''. The extension to search for. For example:: '.png' :return: List of files found. - :rtype: list[openlp.core.common.path.Path] + :rtype: list[Path] """ path = AppLocation.get_data_path() if section: @@ -112,7 +113,7 @@ class AppLocation(object): Return the path a particular module stores its data under. :param str section: - :rtype: openlp.core.common.path.Path + :rtype: Path """ path = AppLocation.get_data_path() / section create_paths(path) @@ -125,7 +126,7 @@ def _get_os_dir_path(dir_type): :param dir_type: AppLocation Enum of the requested path type :return: The requested path - :rtype: openlp.core.common.path.Path + :rtype: Path """ # If running from source, return the language directory from the source directory if dir_type == AppLocation.LanguageDir: diff --git a/openlp/core/common/httputils.py b/openlp/core/common/httputils.py index 6ed42697d..32d74f8a6 100644 --- a/openlp/core/common/httputils.py +++ b/openlp/core/common/httputils.py @@ -26,6 +26,7 @@ import hashlib import logging import sys import time +from pathlib import Path from random import randint from tempfile import gettempdir @@ -33,7 +34,6 @@ import requests from PyQt5 import QtCore from openlp.core.common import trace_error_handler -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.common.settings import ProxyMode, Settings from openlp.core.threading import ThreadWorker diff --git a/openlp/core/common/json.py b/openlp/core/common/json.py index fb79aeabd..91ff4a3b3 100644 --- a/openlp/core/common/json.py +++ b/openlp/core/common/json.py @@ -19,14 +19,76 @@ # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # ########################################################################## +from contextlib import suppress from json import JSONDecoder, JSONEncoder - -from openlp.core.common.path import Path +from pathlib import Path -class OpenLPJsonDecoder(JSONDecoder): +_registered_classes = {} + + +class JSONMixin(object): """ - Implement a custom JSONDecoder to handle Path objects + :class:`JSONMixin` is a mixin class to simplify the serialization of a subclass to JSON. + + :cvar:`_json_keys` is used to specify the attributes of the subclass that you wish to serialize. + :vartype _json_keys: list[str] + :cvar:`_name` set to override the the subclass name, useful if using a `proxy` class + :vartype _name: str + """ + _json_keys = [] + _name = None + _version = 1 + + def __init_subclass__(cls, register_names=None, **kwargs): + """ + Register the subclass. + + :param collections.Iterable[str] register_names: Alternative names to register instead of the class name + :param kwargs: Other args to pass to the super method + :return None: + """ + super().__init_subclass__(**kwargs) + for key in register_names or [cls.__name__]: + _registered_classes[key] = cls + + @classmethod + def encode_json(cls, obj, **kwargs): + """ + Create a instance of the subclass from the dictionary that has been constructed by the JSON representation. + Only use the keys specified in :cvar:`_json_keys`. + + :param dict[str] obj: The dictionary representation of the subclass (deserailized from the JSON) + :param kwargs: Contains any extra parameters. Not used! + :return: The desrialized object + """ + return cls(**{key: obj[key] for key in cls._json_keys if obj.get(key) is not None}) + + @classmethod + def attach_meta(cls, j_dict): + """ + Attach meta data to the serialized dictionary. + + :param dict[str] j_dict: The dictionary to update with the meta data + :return None: + """ + j_dict.update({'json_meta': {'class': cls.__name__ or cls._name, 'version': cls._version}}) + + def json_object(self, **kwargs): + """ + Create a dictionary that can be JSON decoded. + + :param kwargs: Contains any extra parameters. Not used! + :return dict[str]: The dictionary representation of this Path object. + """ + j_dict = {key: self.__dict__[key] for key in self._json_keys if self.__dict__.get(key) is not None} + self.attach_meta(j_dict) + return j_dict + + +class OpenLPJSONDecoder(JSONDecoder): + """ + Implement a custom JSONDecoder to extend compatibility to custom objects Example Usage: object = json.loads(json_string, cls=OpenLPJsonDecoder) @@ -45,23 +107,26 @@ class OpenLPJsonDecoder(JSONDecoder): def custom_object_hook(self, obj): """ - Implement a custom Path object decoder. + Implement a custom object decoder. :param dict obj: A decoded JSON object - :return: The original object literal, or a Path object if the object literal contains a key '__Path__' - :rtype: dict | openlp.core.common.path.Path + :return: The custom object from the serialized data if the custom object is registered, else obj """ - if '__Path__' in obj: - obj = Path.encode_json(obj, **self.kwargs) + try: + key = obj['json_meta']['class'] + except KeyError: + return obj + if key in _registered_classes: + return _registered_classes[key].encode_json(obj, **self.kwargs) return obj -class OpenLPJsonEncoder(JSONEncoder): +class OpenLPJSONEncoder(JSONEncoder): """ - Implement a custom JSONEncoder to handle Path objects + Implement a custom JSONEncoder to handle to extend compatibility to custom objects Example Usage: - json_string = json.dumps(object, cls=OpenLPJsonEncoder) + json_string = json.dumps(object, cls=OpenLPJSONEncoder) """ def __init__(self, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, sort_keys=False, indent=None, separators=None, default=None, **kwargs): @@ -78,12 +143,57 @@ class OpenLPJsonEncoder(JSONEncoder): def custom_default(self, obj): """ - Convert any Path objects into a dictionary object which can be serialized. + Convert any registered objects into a dictionary object which can be serialized. :param object obj: The object to convert - :return: The serializable object - :rtype: dict + :return dict: The serializable object """ - if isinstance(obj, Path): - return obj.json_object(**self.kwargs) + if isinstance(obj, JSONMixin): + return obj.json_object() + elif obj.__class__.__name__ in _registered_classes: + return _registered_classes[obj.__class__.__name__].json_object(obj) return super().default(obj) + + +def is_serializable(obj): + return obj.__class__.__name__ in _registered_classes + + +class PathSerializer(JSONMixin, register_names=('Path', 'PosixPath', 'WindowsPath')): + """ + Implement a de/serializer for pathlib.Path objects + """ + _name = 'Path' + + @staticmethod + def encode_json(obj, base_path=None, **kwargs): + """ + Reimplement encode_json to create a Path object from a dictionary representation. + + :param dict[str] obj: The dictionary representation + :param Path base_path: If specified, an absolute path to base the relative path off of. + :param kwargs: Contains any extra parameters. Not used! + :return Path: The deserialized Path object + """ + path = Path(*obj['parts']) + if base_path and not path.is_absolute(): + return base_path / path + return path + + @classmethod + def json_object(cls, obj, base_path=None, **kwargs): + """ + Create a dictionary that can be JSON decoded. + + :param Path base_path: If specified, an absolute path to make a relative path from. + :param kwargs: Contains any extra parameters. Not used! + :return: The dictionary representation of this Path object. + :rtype: dict[tuple] + """ + path = obj + if base_path: + with suppress(ValueError): + path = path.relative_to(base_path) + json_dict = {'parts': path.parts} + cls.attach_meta(path, json_dict) + return json_dict diff --git a/openlp/core/common/path.py b/openlp/core/common/path.py index e5c97927a..126555fd6 100644 --- a/openlp/core/common/path.py +++ b/openlp/core/common/path.py @@ -21,66 +21,11 @@ ########################################################################## import logging import shutil -from contextlib import suppress - -from openlp.core.common import is_win - - -if is_win(): - from pathlib import WindowsPath as PathVariant # pragma: nocover -else: - from pathlib import PosixPath as PathVariant # pragma: nocover +from pathlib import Path log = logging.getLogger(__name__) -class Path(PathVariant): - """ - Subclass pathlib.Path, so we can add json conversion methods - """ - @staticmethod - def encode_json(obj, base_path=None, **kwargs): - """ - Create a Path object from a dictionary representation. The dictionary has been constructed by JSON encoding of - a JSON reprensation of a Path object. - - :param dict[str] obj: The dictionary representation - :param openlp.core.common.path.Path base_path: If specified, an absolute path to base the relative path off of. - :param kwargs: Contains any extra parameters. Not used! - :return: The reconstructed Path object - :rtype: openlp.core.common.path.Path - """ - path = Path(*obj['__Path__']) - if base_path and not path.is_absolute(): - return base_path / path - return path - - def json_object(self, base_path=None, **kwargs): - """ - Create a dictionary that can be JSON decoded. - - :param openlp.core.common.path.Path base_path: If specified, an absolute path to make a relative path from. - :param kwargs: Contains any extra parameters. Not used! - :return: The dictionary representation of this Path object. - :rtype: dict[tuple] - """ - path = self - if base_path: - with suppress(ValueError): - path = path.relative_to(base_path) - return {'__Path__': path.parts} - - def rmtree(self, ignore_errors=False, onerror=None): - """ - Provide an interface to :func:`shutil.rmtree` - - :param bool ignore_errors: Ignore errors - :param onerror: Handler function to handle any errors - :rtype: None - """ - shutil.rmtree(self, ignore_errors, onerror) - - def replace_params(args, kwargs, params): """ Apply a transformation function to the specified args or kwargs @@ -110,65 +55,11 @@ def replace_params(args, kwargs, params): return tuple(args), kwargs -def copy(*args, **kwargs): - """ - Wraps :func:`shutil.copy` so that we can accept Path objects. - - :param src openlp.core.common.path.Path: Takes a Path object which is then converted to a str object - :param dst openlp.core.common.path.Path: Takes a Path object which is then converted to a str object - :return: Converts the str object received from :func:`shutil.copy` to a Path or NoneType object - :rtype: openlp.core.common.path.Path | None - - See the following link for more information on the other parameters: - https://docs.python.org/3/library/shutil.html#shutil.copy - """ - - args, kwargs = replace_params(args, kwargs, ((0, 'src', path_to_str), (1, 'dst', path_to_str))) - - return str_to_path(shutil.copy(*args, **kwargs)) - - -def copyfile(*args, **kwargs): - """ - Wraps :func:`shutil.copyfile` so that we can accept Path objects. - - :param openlp.core.common.path.Path src: Takes a Path object which is then converted to a str object - :param openlp.core.common.path.Path dst: Takes a Path object which is then converted to a str object - :return: Converts the str object received from :func:`shutil.copyfile` to a Path or NoneType object - :rtype: openlp.core.common.path.Path | None - - See the following link for more information on the other parameters: - https://docs.python.org/3/library/shutil.html#shutil.copyfile - """ - - args, kwargs = replace_params(args, kwargs, ((0, 'src', path_to_str), (1, 'dst', path_to_str))) - - return str_to_path(shutil.copyfile(*args, **kwargs)) - - -def copytree(*args, **kwargs): - """ - Wraps :func:shutil.copytree` so that we can accept Path objects. - - :param openlp.core.common.path.Path src : Takes a Path object which is then converted to a str object - :param openlp.core.common.path.Path dst: Takes a Path object which is then converted to a str object - :return: Converts the str object received from :func:`shutil.copytree` to a Path or NoneType object - :rtype: openlp.core.common.path.Path | None - - See the following link for more information on the other parameters: - https://docs.python.org/3/library/shutil.html#shutil.copytree - """ - - args, kwargs = replace_params(args, kwargs, ((0, 'src', path_to_str), (1, 'dst', path_to_str))) - - return str_to_path(shutil.copytree(*args, **kwargs)) - - def which(*args, **kwargs): """ Wraps :func:shutil.which` so that it return a Path objects. - :rtype: openlp.core.common.Path + :rtype: Path See the following link for more information on the other parameters: https://docs.python.org/3/library/shutil.html#shutil.which @@ -183,7 +74,7 @@ def path_to_str(path=None): """ A utility function to convert a Path object or NoneType to a string equivalent. - :param openlp.core.common.path.Path | None path: The value to convert to a string + :param Path | None path: The value to convert to a string :return: An empty string if :param:`path` is None, else a string representation of the :param:`path` :rtype: str """ @@ -204,7 +95,7 @@ def str_to_path(string): :param str string: The string to convert :return: None if :param:`string` is empty, or a Path object representation of :param:`string` - :rtype: openlp.core.common.path.Path | None + :rtype: Path | None """ if not isinstance(string, str): log.error('parameter \'string\' must be of type str, got {} which is a {} instead'.format(string, type(string))) @@ -218,7 +109,7 @@ def create_paths(*paths, **kwargs): """ Create one or more paths - :param openlp.core.common.path.Path paths: The paths to create + :param Path paths: The paths to create :param bool do_not_log: To not log anything. This is need for the start up, when the log isn't ready. :rtype: None """ @@ -239,7 +130,7 @@ def files_to_paths(file_names): :param list[str] file_names: The list of file names to convert. :return: The list converted to file paths - :rtype: openlp.core.common.path.Path + :rtype: Path """ if file_names: return [str_to_path(file_name) for file_name in file_names] diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py index 8decb9c3f..d5c83f44d 100644 --- a/openlp/core/common/settings.py +++ b/openlp/core/common/settings.py @@ -27,13 +27,14 @@ import json import logging import os from enum import IntEnum +from pathlib import Path from tempfile import gettempdir from PyQt5 import QtCore, QtGui from openlp.core.common import SlideLimits, ThemeLevel, is_linux, is_win -from openlp.core.common.json import OpenLPJsonDecoder, OpenLPJsonEncoder -from openlp.core.common.path import Path, files_to_paths, str_to_path +from openlp.core.common.json import OpenLPJSONDecoder, OpenLPJSONEncoder, is_serializable +from openlp.core.common.path import files_to_paths, str_to_path log = logging.getLogger(__name__) @@ -337,7 +338,7 @@ class Settings(QtCore.QSettings): Does not affect existing Settings objects. - :param openlp.core.common.path.Path ini_path: ini file path + :param Path ini_path: ini file path :rtype: None """ Settings.__file_path__ = str(ini_path) @@ -584,8 +585,8 @@ class Settings(QtCore.QSettings): :param value: The value to save :rtype: None """ - if isinstance(value, (Path, dict)) or (isinstance(value, list) and value and isinstance(value[0], Path)): - value = json.dumps(value, cls=OpenLPJsonEncoder) + if is_serializable(value): # TODO: doesnt handle list off path objects + value = json.dumps(value, cls=OpenLPJSONEncoder) super().setValue(key, value) def _convert_value(self, setting, default_value): @@ -611,8 +612,8 @@ class Settings(QtCore.QSettings): elif isinstance(default_value, dict): return {} elif isinstance(setting, str): - if '__Path__' in setting or setting.startswith('{'): - return json.loads(setting, cls=OpenLPJsonDecoder) + if 'json_meta' in setting or setting.startswith('{'): # TODO: Appears screeen settings is using this, subcass from jsonmixin + return json.loads(setting, cls=OpenLPJSONDecoder) # Convert the setting to the correct type. if isinstance(default_value, bool): if isinstance(setting, bool): @@ -629,7 +630,7 @@ class Settings(QtCore.QSettings): """ Export the settings to file. - :param openlp.core.common.path.Path dest_path: The file path to create the export file. + :param Path dest_path: The file path to create the export file. :return: Success :rtype: bool """ diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index 2213a5ff8..75973f389 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -24,11 +24,11 @@ The :mod:`lib` module contains most of the components and libraries that make OpenLP work. """ import logging +from pathlib import Path from PyQt5 import QtCore, QtGui, QtWidgets from openlp.core.common.i18n import translate -from openlp.core.common.path import Path log = logging.getLogger(__name__ + '.__init__') @@ -181,7 +181,7 @@ def get_text_file_string(text_file_path): returns False. If there is an error loading the file or the content can't be decoded then the function will return None. - :param openlp.core.common.path.Path text_file_path: The path to the file. + :param Path text_file_path: The path to the file. :return: The contents of the file, False if the file does not exist, or None if there is an Error reading or decoding the file. :rtype: str | False | None @@ -263,8 +263,8 @@ def create_thumb(image_path, thumb_path, return_icon=True, size=None): """ Create a thumbnail from the given image path and depending on ``return_icon`` it returns an icon from this thumb. - :param openlp.core.common.path.Path image_path: The image file to create the icon from. - :param openlp.core.common.path.Path thumb_path: The filename to save the thumbnail to. + :param Path image_path: The image file to create the icon from. + :param Path thumb_path: The filename to save the thumbnail to. :param return_icon: States if an icon should be build and returned from the thumb. Defaults to ``True``. :param size: Allows to state a own size (QtCore.QSize) to use. Defaults to ``None``, which means that a default height of 88 is used. @@ -311,8 +311,8 @@ def validate_thumb(file_path, thumb_path): Validates whether an file's thumb still exists and if is up to date. **Note**, you must **not** call this function, before checking the existence of the file. - :param openlp.core.common.path.Path file_path: The path to the file. The file **must** exist! - :param openlp.core.common.path.Path thumb_path: The path to the thumb. + :param Path file_path: The path to the file. The file **must** exist! + :param Path thumb_path: The path to the thumb. :return: Has the image changed since the thumb was created? :rtype: bool """ diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py index 386c39e77..c8d6b03e8 100644 --- a/openlp/core/lib/db.py +++ b/openlp/core/lib/db.py @@ -40,7 +40,7 @@ from sqlalchemy.pool import NullPool from openlp.core.common import delete_file from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import translate -from openlp.core.common.json import OpenLPJsonDecoder, OpenLPJsonEncoder +from openlp.core.common.json import OpenLPJSONDecoder, OpenLPJSONEncoder from openlp.core.common.settings import Settings from openlp.core.lib.ui import critical_error_message_box @@ -132,7 +132,7 @@ def get_db_path(plugin_name, db_file_name=None): Create a path to a database from the plugin name and database name :param plugin_name: Name of plugin - :param openlp.core.common.path.Path | str | None db_file_name: File name of database + :param pathlib.Path | str | None db_file_name: File name of database :return: The path to the database :rtype: str """ @@ -150,7 +150,7 @@ def handle_db_error(plugin_name, db_file_path): Log and report to the user that a database cannot be loaded :param plugin_name: Name of plugin - :param openlp.core.common.path.Path db_file_path: File name of database + :param pathlib.Path db_file_path: File name of database :return: None """ db_path = get_db_path(plugin_name, db_file_path) @@ -165,7 +165,7 @@ def init_url(plugin_name, db_file_name=None): Construct the connection string for a database. :param plugin_name: The name of the plugin for the database creation. - :param openlp.core.common.path.Path | str | None db_file_name: The database file name. Defaults to None resulting + :param pathlib.Path | str | None db_file_name: The database file name. Defaults to None resulting in the plugin_name being used. :return: The database URL :rtype: str @@ -215,8 +215,7 @@ class PathType(types.TypeDecorator): Create a PathType for storing Path objects with SQLAlchemy. Behind the scenes we convert the Path object to a JSON representation and store it as a Unicode type """ - impl = types.UnicodeText - + impl = types.Unicode def coerce_compared_value(self, op, value): """ Some times it make sense to compare a PathType with a string. In the case a string is used coerce the the @@ -224,7 +223,7 @@ class PathType(types.TypeDecorator): :param op: The operation being carried out. Not used, as we only care about the type that is being used with the operation. - :param openlp.core.common.path.Path | str value: The value being used for the comparison. Most likely a Path + :param psthlib.Path | str value: The value being used for the comparison. Most likely a Path Object or str. :return: The coerced value stored in the db :rtype: PathType or UnicodeText @@ -238,13 +237,13 @@ class PathType(types.TypeDecorator): """ Convert the Path object to a JSON representation - :param openlp.core.common.path.Path value: The value to convert + :param psthlib.Path value: The value to convert :param dialect: Not used :return: The Path object as a JSON string :rtype: str """ data_path = AppLocation.get_data_path() - return json.dumps(value, cls=OpenLPJsonEncoder, base_path=data_path) + return json.dumps(value, cls=OpenLPJSONEncoder, base_path=data_path) def process_result_value(self, value, dialect): """ @@ -253,10 +252,10 @@ class PathType(types.TypeDecorator): :param types.UnicodeText value: The value to convert :param dialect: Not used :return: The JSON object converted Python object (in this case it should be a Path object) - :rtype: openlp.core.common.path.Path + :rtype: psthlib.Path """ data_path = AppLocation.get_data_path() - return json.loads(value, cls=OpenLPJsonDecoder, base_path=data_path) + return json.loads(value, cls=OpenLPJSONDecoder, base_path=data_path) def upgrade_db(url, upgrade): @@ -351,7 +350,7 @@ class Manager(object): :param plugin_name: The name to setup paths and settings section names :param init_schema: The init_schema function for this database - :param openlp.core.common.path.Path db_file_path: The file name to use for this database. Defaults to None + :param pathlib.Path db_file_path: The file name to use for this database. Defaults to None resulting in the plugin_name being used. :param upgrade_mod: The upgrade_schema function for this database """ diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 876b70da2..59cb1cdcf 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -369,7 +369,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties): Process a list for files either from the File Dialog or from Drag and Drop - :param list[openlp.core.common.path.Path] file_paths: The files to be loaded. + :param list[pathlib.Path] file_paths: The files to be loaded. :param target_group: The QTreeWidgetItem of the group that will be the parent of the added files """ full_list = [] @@ -410,7 +410,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties): """ Return the current list of files - :rtype: list[openlp.core.common.path.Path] + :rtype: list[pathlib.Path] """ file_paths = [] for index in range(self.list_view.count()): @@ -462,7 +462,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties): :param item: The database item to be used to build the service item :param remote: Was this remote triggered (False) :param context: The service context - :param openlp.core.common.path.Path file_path: + :param pathlib.Path file_path: """ raise NotImplementedError('MediaManagerItem.generate_slide_data needs to be defined by the plugin') diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index b590d2cd7..f284f59bb 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -29,6 +29,7 @@ import ntpath import os import uuid from copy import deepcopy +from pathlib import Path from PyQt5 import QtGui @@ -37,7 +38,6 @@ from openlp.core.common import md5_hash from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import translate from openlp.core.common.mixins import RegistryProperties -from openlp.core.common.path import Path from openlp.core.common.settings import Settings from openlp.core.display.render import remove_tags, render_tags from openlp.core.lib import ItemCapabilities @@ -264,8 +264,8 @@ class ServiceItem(RegistryProperties): if image and not self.has_original_files and self.name == 'presentations': file_location = os.path.join(path, file_name) file_location_hash = md5_hash(file_location.encode('utf-8')) - image = os.path.join(str(AppLocation.get_section_data_path(self.name)), 'thumbnails', - file_location_hash, ntpath.basename(image)) # TODO: Pathlib + image = os.path.join(AppLocation.get_section_data_path(self.name), 'thumbnails', file_location_hash, + ntpath.basename(image)) # TODO: Pathlib self.slides.append({'title': file_name, 'image': image, 'path': path, 'display_title': display_title, 'notes': notes, 'thumbnail': image}) # if self.is_capable(ItemCapabilities.HasThumbnails): diff --git a/openlp/core/lib/theme.py b/openlp/core/lib/theme.py index f770b7487..d5219a5d1 100644 --- a/openlp/core/lib/theme.py +++ b/openlp/core/lib/theme.py @@ -29,7 +29,7 @@ from lxml import etree, objectify from openlp.core.common import de_hump from openlp.core.common.applocation import AppLocation -from openlp.core.common.json import OpenLPJsonDecoder, OpenLPJsonEncoder +from openlp.core.common.json import OpenLPJSONDecoder, OpenLPJSONEncoder from openlp.core.display.screens import ScreenList from openlp.core.lib import get_text_file_string, str_to_bool @@ -190,7 +190,7 @@ class Theme(object): """ Add the path name to the image name so the background can be rendered. - :param openlp.core.common.path.Path path: The path name to be added. + :param pathlib.Path path: The path name to be added. :rtype: None """ if self.background_type == 'image' or self.background_type == 'video': @@ -216,13 +216,13 @@ class Theme(object): Convert the JSON file and expand it. :param theme: the theme string - :param openlp.core.common.path.Path theme_path: The path to the theme + :param pathlib.Path theme_path: The path to the theme :rtype: None """ if theme_path: - jsn = json.loads(theme, cls=OpenLPJsonDecoder, base_path=theme_path) + jsn = json.loads(theme, cls=OpenLPJSONDecoder, base_path=theme_path) else: - jsn = json.loads(theme, cls=OpenLPJsonDecoder) + jsn = json.loads(theme, cls=OpenLPJSONDecoder) self.expand_json(jsn) def export_theme(self, theme_path=None): @@ -234,8 +234,8 @@ class Theme(object): for attr, value in self.__dict__.items(): theme_data["{attr}".format(attr=attr)] = value if theme_path: - return json.dumps(theme_data, cls=OpenLPJsonEncoder, base_path=theme_path) - return json.dumps(theme_data, cls=OpenLPJsonEncoder) + return json.dumps(theme_data, cls=OpenLPJSONEncoder, base_path=theme_path) + return json.dumps(theme_data, cls=OpenLPJSONEncoder) def parse(self, xml): """ diff --git a/openlp/core/server.py b/openlp/core/server.py index 33c024254..25f8a4329 100644 --- a/openlp/core/server.py +++ b/openlp/core/server.py @@ -19,10 +19,11 @@ # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # ########################################################################## +from pathlib import Path + from PyQt5 import QtCore, QtNetwork from openlp.core.common.mixins import LogMixin -from openlp.core.common.path import Path from openlp.core.common.registry import Registry diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index 7a84f092c..72b9133a0 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -518,7 +518,7 @@ class AdvancedTab(SettingsTab): """ Handle the `editPathChanged` signal of the data_directory_path_edit - :param openlp.core.common.path.Path new_path: The new path + :param pathlib.Path new_path: The new path :rtype: None """ # Make sure they want to change the data. @@ -552,7 +552,7 @@ class AdvancedTab(SettingsTab): """ Check if there's already data in the target directory. - :param openlp.core.common.path.Path data_path: The target directory to check + :param pathlib.Path data_path: The target directory to check """ if (data_path / 'songs').exists(): self.data_exists = True diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py index db5040b04..96ac20af7 100644 --- a/openlp/core/ui/firsttimeform.py +++ b/openlp/core/ui/firsttimeform.py @@ -28,6 +28,7 @@ import time import urllib.error import urllib.parse import urllib.request +from pathlib import Path from tempfile import gettempdir from PyQt5 import QtCore, QtWidgets @@ -37,7 +38,7 @@ from openlp.core.common.applocation import AppLocation from openlp.core.common.httputils import DownloadWorker, download_file, get_url_file_size, get_web_page from openlp.core.common.i18n import translate from openlp.core.common.mixins import RegistryProperties -from openlp.core.common.path import Path, create_paths +from openlp.core.common.path import create_paths from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.lib import build_icon diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 5fd9f36e4..06d27e9df 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -23,12 +23,12 @@ The general tab of the configuration dialog. """ import logging +from pathlib import Path from PyQt5 import QtGui, QtWidgets from openlp.core.common import get_images_filter from openlp.core.common.i18n import UiStrings, translate -from openlp.core.common.path import Path from openlp.core.common.settings import Settings from openlp.core.display.screens import ScreenList from openlp.core.lib.settingstab import SettingsTab diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 7c26ea9a4..5e6753aec 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -23,9 +23,11 @@ This is the main window, where all the action happens. """ import os +import shutil from datetime import datetime from distutils import dir_util from distutils.errors import DistutilsFileError +from pathlib import Path from tempfile import gettempdir from PyQt5 import QtCore, QtGui, QtWidgets @@ -38,7 +40,7 @@ from openlp.core.common.actions import ActionList, CategoryOrder from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import LanguageManager, UiStrings, translate from openlp.core.common.mixins import LogMixin, RegistryProperties -from openlp.core.common.path import Path, copyfile, create_paths +from openlp.core.common.path import create_paths from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.display.screens import ScreenList @@ -658,7 +660,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert plugin.first_time() self.application.process_events() temp_path = Path(gettempdir(), 'openlp') - temp_path.rmtree(True) + shutil.rmtree(temp_path, True) def on_first_time_wizard_clicked(self): """ @@ -861,7 +863,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert temp_dir_path = Path(gettempdir(), 'openlp') create_paths(temp_dir_path) temp_config_path = temp_dir_path / import_file_path.name - copyfile(import_file_path, temp_config_path) + shutil.copyfile(import_file_path, temp_config_path) settings = Settings() import_settings = Settings(str(temp_config_path), Settings.IniFormat) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index b18f2f9d8..5e8b3e0cd 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -24,10 +24,12 @@ The service manager sets up, loads, saves and manages services. """ import html import json +import shutil import os import zipfile from contextlib import suppress from datetime import datetime, timedelta +from pathlib import Path from tempfile import NamedTemporaryFile from PyQt5 import QtCore, QtGui, QtWidgets @@ -36,9 +38,8 @@ from openlp.core.common import ThemeLevel, delete_file from openlp.core.common.actions import ActionList, CategoryOrder from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import UiStrings, format_time, translate -from openlp.core.common.json import OpenLPJsonDecoder, OpenLPJsonEncoder +from openlp.core.common.json import OpenLPJSONDecoder, OpenLPJSONEncoder from openlp.core.common.mixins import LogMixin, RegistryProperties -from openlp.core.common.path import Path from openlp.core.common.registry import Registry, RegistryBase from openlp.core.common.settings import Settings from openlp.core.lib import build_icon @@ -371,7 +372,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi """ Setter for service file. - :param openlp.core.common.path.Path file_path: The service file name + :param Path file_path: The service file name :rtype: None """ self._service_path = file_path @@ -386,7 +387,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi """ Return the current file name including path. - :rtype: openlp.core.common.path.Path + :rtype: Path """ return self._service_path @@ -443,7 +444,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi """ Loads the service file and saves the existing one it there is one unchanged. - :param openlp.core.common.path.Path | None file_path: The service file to the loaded. + :param Path | None file_path: The service file to the loaded. """ if self.is_modified(): result = self.save_modified_service() @@ -518,7 +519,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi Get a list of files used in the service and files that are missing. :return: A list of files used in the service that exist, and a list of files that don't. - :rtype: (list[openlp.core.common.path.Path], list[openlp.core.common.path.Path]) + :rtype: (list[Path], list[Path]) """ write_list = [] missing_list = [] @@ -581,7 +582,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi # Add the service item to the service. service.append({'serviceitem': service_item}) self.repaint_service_list(-1, -1) - service_content = json.dumps(service, cls=OpenLPJsonEncoder) + service_content = json.dumps(service, cls=OpenLPJSONEncoder) service_content_size = len(bytes(service_content, encoding='utf-8')) total_size = service_content_size for file_item in write_list: @@ -679,7 +680,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi """ Load an existing service file. - :param openlp.core.common.path.Path file_path: The service file to load. + :param Path file_path: The service file to load. """ if not file_path.exists(): return False @@ -702,7 +703,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi zip_file.extract(zip_info, self.service_path) self.main_window.increment_progress_bar(zip_info.compress_size) if service_data: - items = json.loads(service_data, cls=OpenLPJsonDecoder) + items = json.loads(service_data, cls=OpenLPJSONDecoder) self.new_file() self.process_service_items(items) self.set_file_name(file_path) @@ -1250,7 +1251,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi delete_file(file_path) audio_path = self.service_path / 'audio' if audio_path.exists(): - audio_path.rmtree(True) + shutil.rmtree(audio_path, True) def on_theme_combo_box_selected(self, current_index): """ diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index e9a0d5117..4f45f8ca6 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -25,6 +25,7 @@ The :mod:`slidecontroller` module contains the most important part of OpenLP - t import copy import datetime from collections import deque +from pathlib import Path from threading import Lock from PyQt5 import QtCore, QtGui, QtWidgets @@ -33,7 +34,6 @@ from openlp.core.common import SlideLimits from openlp.core.common.actions import ActionList, CategoryOrder from openlp.core.common.i18n import UiStrings, translate from openlp.core.common.mixins import LogMixin, RegistryProperties -from openlp.core.common.path import Path from openlp.core.common.registry import Registry, RegistryBase from openlp.core.common.settings import Settings from openlp.core.display.screens import ScreenList diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index 4eea05adb..0dfb53aab 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -462,7 +462,7 @@ class ThemeForm(QtWidgets.QWizard, Ui_ThemeWizard, RegistryProperties): """ Handle the `pathEditChanged` signal from image_path_edit - :param openlp.core.common.path.Path new_path: Path to the new image + :param pathlib.Path new_path: Path to the new image :rtype: None """ self.theme.background_filename = new_path @@ -472,7 +472,7 @@ class ThemeForm(QtWidgets.QWizard, Ui_ThemeWizard, RegistryProperties): """ Handle the `pathEditChanged` signal from video_path_edit - :param openlp.core.common.path.Path new_path: Path to the new video + :param pathlib.Path new_path: Path to the new video :rtype: None """ self.theme.background_filename = new_path diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 88e947d5b..fd003ed2e 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -23,7 +23,9 @@ The Theme Manager manages adding, deleteing and modifying of themes. """ import os +import shutil import zipfile +from pathlib import Path from xml.etree.ElementTree import XML, ElementTree from PyQt5 import QtCore, QtWidgets @@ -32,7 +34,7 @@ from openlp.core.common import delete_file from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import UiStrings, get_locale_key, translate from openlp.core.common.mixins import LogMixin, RegistryProperties -from openlp.core.common.path import Path, copyfile, create_paths +from openlp.core.common.path import create_paths from openlp.core.common.registry import Registry, RegistryBase from openlp.core.common.settings import Settings from openlp.core.lib import build_icon, check_item_selected, create_thumb, get_text_file_string, validate_thumb @@ -378,7 +380,7 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R delete_file(self.theme_path / thumb) delete_file(self.thumb_path / thumb) try: - (self.theme_path / theme).rmtree() + shutil.rmtree(self.theme_path / theme) except OSError: self.log_exception('Error deleting theme {name}'.format(name=theme)) @@ -415,7 +417,7 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R """ Create the zipfile with the theme contents. - :param openlp.core.common.path.Path theme_path: Location where the zip file will be placed + :param Path theme_path: Location where the zip file will be placed :param str theme_name: The name of the theme to be exported :return: The success of creating the zip file :rtype: bool @@ -433,7 +435,7 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R 'The {theme_name} export failed because this error occurred: {err}') .format(theme_name=theme_name, err=ose.strerror)) if theme_path.exists(): - theme_path.rmtree(ignore_errors=True) + shutil.rmtree(theme_path, ignore_errors=True) return False def on_import_theme(self, checked=None): @@ -557,8 +559,8 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R """ Unzip the theme, remove the preview file if stored. Generate a new preview file. Check the XML theme version and upgrade if necessary. - :param openlp.core.common.path.Path file_path: - :param openlp.core.common.path.Path directory_path: + :param Path file_path: + :param Path directory_path: """ self.log_debug('Unzipping theme {name}'.format(name=file_path)) file_xml = None @@ -642,8 +644,8 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R Called by theme maintenance Dialog to save the theme and to trigger the reload of the theme list :param Theme theme: The theme data object. - :param openlp.core.common.path.Path image_source_path: Where the theme image is currently located. - :param openlp.core.common.path.Path image_destination_path: Where the Theme Image is to be saved to + :param Path image_source_path: Where the theme image is currently located. + :param Path image_destination_path: Where the Theme Image is to be saved to :rtype: None """ self._write_theme(theme, image_source_path, image_destination_path) @@ -653,8 +655,8 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R Writes the theme to the disk and handles the background image if necessary :param Theme theme: The theme data object. - :param openlp.core.common.path.Path image_source_path: Where the theme image is currently located. - :param openlp.core.common.path.Path image_destination_path: Where the Theme Image is to be saved to + :param Path image_source_path: Where the theme image is currently located. + :param Path image_destination_path: Where the Theme Image is to be saved to :rtype: None """ name = theme.theme_name @@ -671,7 +673,7 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R delete_file(self.old_background_image_path) if image_source_path != image_destination_path: try: - copyfile(image_source_path, image_destination_path) + shutil.copyfile(image_source_path, image_destination_path) except OSError: self.log_exception('Failed to save theme image') self.generate_and_save_image(name, theme) @@ -718,7 +720,7 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R Return a theme object using information parsed from XML :param theme_xml: The Theme data object. - :param openlp.core.common.path.Path image_path: Where the theme image is stored + :param Path image_path: Where the theme image is stored :return: Theme data. :rtype: Theme """ @@ -732,7 +734,7 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R Return a theme object using information parsed from JSON :param theme_json: The Theme data object. - :param openlp.core.common.path.Path image_path: Where the theme image is stored + :param Path image_path: Where the theme image is stored :return: Theme data. :rtype: Theme """ diff --git a/openlp/core/widgets/dialogs.py b/openlp/core/widgets/dialogs.py index 11083f393..97e3dfba1 100755 --- a/openlp/core/widgets/dialogs.py +++ b/openlp/core/widgets/dialogs.py @@ -33,9 +33,9 @@ class FileDialog(QtWidgets.QFileDialog): :type parent: QtWidgets.QWidget | None :type caption: str - :type directory: openlp.core.common.path.Path + :type directory: pathlib.Path :type options: QtWidgets.QFileDialog.Options - :rtype: openlp.core.common.path.Path + :rtype: pathlib.Path """ args, kwargs = replace_params(args, kwargs, ((2, 'directory', path_to_str),)) @@ -52,11 +52,11 @@ class FileDialog(QtWidgets.QFileDialog): :type parent: QtWidgets.QWidget | None :type caption: str - :type directory: openlp.core.common.path.Path + :type directory: pathlib.Path :type filter: str :type initialFilter: str :type options: QtWidgets.QFileDialog.Options - :rtype: tuple[openlp.core.common.path.Path, str] + :rtype: tuple[pathlib.Path, str] """ args, kwargs = replace_params(args, kwargs, ((2, 'directory', path_to_str),)) @@ -73,11 +73,11 @@ class FileDialog(QtWidgets.QFileDialog): :type parent: QtWidgets.QWidget | None :type caption: str - :type directory: openlp.core.common.path.Path + :type directory: pathlib.Path :type filter: str :type initialFilter: str :type options: QtWidgets.QFileDialog.Options - :rtype: tuple[list[openlp.core.common.path.Path], str] + :rtype: tuple[list[pathlib.Path], str] """ args, kwargs = replace_params(args, kwargs, ((2, 'directory', path_to_str),)) @@ -95,11 +95,11 @@ class FileDialog(QtWidgets.QFileDialog): :type parent: QtWidgets.QWidget | None :type caption: str - :type directory: openlp.core.common.path.Path + :type directory: pathlib.Path :type filter: str :type initialFilter: str :type options: QtWidgets.QFileDialog.Options - :rtype: tuple[openlp.core.common.path.Path | None, str] + :rtype: tuple[pathlib.Path | None, str] """ args, kwargs = replace_params(args, kwargs, ((2, 'directory', path_to_str),)) diff --git a/openlp/core/widgets/edits.py b/openlp/core/widgets/edits.py index 6dbf09fdf..de2a7b021 100644 --- a/openlp/core/widgets/edits.py +++ b/openlp/core/widgets/edits.py @@ -24,12 +24,13 @@ The :mod:`~openlp.core.widgets.edits` module contains all the customised edit wi """ import logging import re +from pathlib import Path from PyQt5 import QtCore, QtGui, QtWidgets from openlp.core.common import CONTROL_CHARS from openlp.core.common.i18n import UiStrings, translate -from openlp.core.common.path import Path, path_to_str, str_to_path +from openlp.core.common.path import path_to_str, str_to_path from openlp.core.common.settings import Settings from openlp.core.lib.formattingtags import FormattingTags from openlp.core.lib.ui import create_action, create_widget_action @@ -207,7 +208,7 @@ class PathEdit(QtWidgets.QWidget): :param QtWidget.QWidget | None: The parent of the widget. This is just passed to the super method. :param str dialog_caption: Used to customise the caption in the QFileDialog. - :param openlp.core.common.path.Path default_path: The default path. This is set as the path when the revert + :param Path default_path: The default path. This is set as the path when the revert button is clicked :param bool show_revert: Used to determine if the 'revert button' should be visible. :rtype: None @@ -250,7 +251,7 @@ class PathEdit(QtWidgets.QWidget): A property getter method to return the selected path. :return: The selected path - :rtype: openlp.core.common.path.Path + :rtype: Path """ return self._path @@ -259,7 +260,7 @@ class PathEdit(QtWidgets.QWidget): """ A Property setter method to set the selected path - :param openlp.core.common.path.Path path: The path to set the widget to + :param Path path: The path to set the widget to :rtype: None """ self._path = path @@ -348,7 +349,7 @@ class PathEdit(QtWidgets.QWidget): Emits the pathChanged Signal - :param openlp.core.common.path.Path path: The new path + :param Path path: The new path :rtype: None """ if self._path != path: diff --git a/openlp/core/widgets/views.py b/openlp/core/widgets/views.py index dbe7c2be6..ac4e26772 100644 --- a/openlp/core/widgets/views.py +++ b/openlp/core/widgets/views.py @@ -23,12 +23,13 @@ The :mod:`listpreviewwidget` is a widget that lists the slides in the slide controller. It is based on a QTableWidget but represents its contents in list form. """ +from pathlib import Path + from PyQt5 import QtCore, QtGui, QtWidgets from openlp.core.common import is_win from openlp.core.common.i18n import UiStrings from openlp.core.common.mixins import RegistryProperties -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.lib.serviceitem import ItemCapabilities, ServiceItem @@ -41,7 +42,7 @@ def handle_mime_data_urls(mime_data): :param QtCore.QMimeData mime_data: The mime data from the drag and drop opperation. :return: A list of file paths that were dropped - :rtype: list[openlp.core.common.path.Path] + :rtype: list[Path] """ file_paths = [] for url in mime_data.urls(): diff --git a/openlp/plugins/bibles/lib/bibleimport.py b/openlp/plugins/bibles/lib/bibleimport.py index 3f0493a4a..1e920cc18 100644 --- a/openlp/plugins/bibles/lib/bibleimport.py +++ b/openlp/plugins/bibles/lib/bibleimport.py @@ -48,7 +48,7 @@ class BibleImport(BibleDB, LogMixin, RegistryProperties): """ Check if the supplied file is compressed - :param openlp.core.common.path.Path file_path: A path to the file to check + :param pathlib.Path file_path: A path to the file to check """ if is_zipfile(file_path): critical_error_message_box( diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py index 89dec73ce..3f48ca7b2 100644 --- a/openlp/plugins/bibles/lib/db.py +++ b/openlp/plugins/bibles/lib/db.py @@ -24,6 +24,7 @@ import logging import re import sqlite3 import time +from pathlib import Path import chardet from PyQt5 import QtCore @@ -35,7 +36,6 @@ from sqlalchemy.orm.exc import UnmappedClassError from openlp.core.common import clean_filename from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import translate -from openlp.core.common.path import Path from openlp.core.lib.db import BaseModel, Manager, init_db from openlp.core.lib.ui import critical_error_message_box from openlp.plugins.bibles.lib import BibleStrings, LanguageSelection, upgrade @@ -130,13 +130,13 @@ class BibleDB(Manager): :param parent: :param kwargs: ``path`` - The path to the bible database file. Type: openlp.core.common.path.Path + The path to the bible database file. Type: Path ``name`` The name of the database. This is also used as the file name for SQLite databases. ``file`` - Type: openlp.core.common.path.Path + Type: Path :rtype: None """ diff --git a/openlp/plugins/bibles/lib/importers/csvbible.py b/openlp/plugins/bibles/lib/importers/csvbible.py index 0f273de8b..a4826904d 100644 --- a/openlp/plugins/bibles/lib/importers/csvbible.py +++ b/openlp/plugins/bibles/lib/importers/csvbible.py @@ -96,7 +96,7 @@ class CSVBible(BibleImport): """ Parse the supplied CSV file. - :param openlp.core.common.path.Path file_path: The name of the file to parse. + :param pathlib.Path file_path: The name of the file to parse. :param namedtuple results_tuple: The namedtuple to use to store the results. :return: An list of namedtuples of type results_tuple :rtype: list[namedtuple] diff --git a/openlp/plugins/bibles/lib/importers/wordproject.py b/openlp/plugins/bibles/lib/importers/wordproject.py index 4aa6da7ef..75f559ee0 100644 --- a/openlp/plugins/bibles/lib/importers/wordproject.py +++ b/openlp/plugins/bibles/lib/importers/wordproject.py @@ -21,12 +21,12 @@ ########################################################################## import logging import re +from pathlib import Path from tempfile import TemporaryDirectory from zipfile import ZipFile from bs4 import BeautifulSoup, NavigableString, Tag -from openlp.core.common.path import Path from openlp.plugins.bibles.lib.bibleimport import BibleImport diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index 07d6d6175..79f66cef4 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -20,12 +20,12 @@ # along with this program. If not, see . # ########################################################################## import logging +from pathlib import Path from openlp.core.common import delete_file from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import UiStrings, translate from openlp.core.common.mixins import LogMixin, RegistryProperties -from openlp.core.common.path import Path from openlp.core.common.settings import Settings from openlp.plugins.bibles.lib import LanguageSelection, parse_reference from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 9909198cf..f6e66f4da 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -21,13 +21,14 @@ ########################################################################## import logging +from pathlib import Path from PyQt5 import QtCore, QtGui, QtWidgets from openlp.core.common import delete_file, get_images_filter from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import UiStrings, get_natural_key, translate -from openlp.core.common.path import Path, create_paths +from openlp.core.common.path import create_paths from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.lib import ServiceItemContext, build_icon, check_item_selected, create_thumb, validate_thumb @@ -343,7 +344,7 @@ class ImageMediaItem(MediaManagerItem): :param openlp.plugins.images.lib.db.ImageFilenames image: The image to generate the thumbnail path for. :return: A path to the thumbnail - :rtype: openlp.core.common.path.Path + :rtype: Path """ ext = image.file_path.suffix.lower() return self.service_path / '{name:d}{ext}'.format(name=image.id, ext=ext) @@ -401,7 +402,7 @@ class ImageMediaItem(MediaManagerItem): Process a list for files either from the File Dialog or from Drag and Drop. This method is overloaded from MediaManagerItem. - :param list[openlp.core.common.path.Path] file_paths: A List of paths to be loaded + :param list[Path] file_paths: A List of paths to be loaded :param target_group: The QTreeWidgetItem of the group that will be the parent of the added files """ self.application.set_normal_cursor() @@ -413,7 +414,7 @@ class ImageMediaItem(MediaManagerItem): """ Add new images to the database. This method is called when adding images using the Add button or DnD. - :param list[openlp.core.common.Path] image_paths: A list of file paths to the images to be loaded + :param list[Path] image_paths: A list of file paths to the images to be loaded :param target_group: The QTreeWidgetItem of the group that will be the parent of the added files :param initial_load: When set to False, the busy cursor and progressbar will be shown while loading images """ diff --git a/openlp/plugins/images/lib/upgrade.py b/openlp/plugins/images/lib/upgrade.py index 5d78f74f0..05cc2a60a 100644 --- a/openlp/plugins/images/lib/upgrade.py +++ b/openlp/plugins/images/lib/upgrade.py @@ -24,13 +24,13 @@ The :mod:`upgrade` module provides the migration path for the OLP Paths database """ import json import logging +from pathlib import Path from sqlalchemy import Column, Table from openlp.core.common.applocation import AppLocation from openlp.core.common.db import drop_columns -from openlp.core.common.json import OpenLPJsonEncoder -from openlp.core.common.path import Path +from openlp.core.common.json import OpenLPJSONEncoder from openlp.core.lib.db import PathType, get_upgrade_op @@ -58,7 +58,7 @@ def upgrade_2(session, metadata): results = conn.execute('SELECT * FROM image_filenames') data_path = AppLocation.get_data_path() for row in results.fetchall(): - file_path_json = json.dumps(Path(row.filename), cls=OpenLPJsonEncoder, base_path=data_path) + file_path_json = json.dumps(Path(row.filename), cls=OpenLPJSONEncoder, base_path=data_path) sql = 'UPDATE image_filenames SET file_path = \'{file_path_json}\' WHERE id = {id}'.format( file_path_json=file_path_json, id=row.id) conn.execute(sql) diff --git a/openlp/plugins/media/forms/mediaclipselectorform.py b/openlp/plugins/media/forms/mediaclipselectorform.py index 26ca3b095..8f3c00226 100644 --- a/openlp/plugins/media/forms/mediaclipselectorform.py +++ b/openlp/plugins/media/forms/mediaclipselectorform.py @@ -23,6 +23,7 @@ import logging import os import re from datetime import datetime +from pathlib import Path from time import sleep from PyQt5 import QtCore, QtWidgets @@ -30,7 +31,6 @@ from PyQt5 import QtCore, QtWidgets from openlp.core.common import is_linux, is_macosx, is_win from openlp.core.common.i18n import translate from openlp.core.common.mixins import RegistryProperties -from openlp.core.common.path import Path from openlp.core.lib.ui import critical_error_message_box from openlp.core.ui.icons import UiIcons from openlp.core.ui.media.vlcplayer import get_vlc diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index 15d95cd0a..ebe491005 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -205,7 +205,7 @@ class ImpressDocument(PresentationDocument): """ Constructor, store information about the file and initialise. - :param openlp.core.common.path.Path document_path: File path for the document to load + :param pathlib.Path document_path: File path for the document to load :rtype: None """ log.debug('Init Presentation OpenOffice') diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index dda2a485c..6bc2496a2 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -156,7 +156,7 @@ class PresentationMediaItem(MediaManagerItem): Add presentations into the media manager. This is called both on initial load of the plugin to populate with existing files, and when the user adds new files via the media manager. - :param list[openlp.core.common.path.Path] file_paths: List of file paths to add to the media manager. + :param list[pathlib.Path] file_paths: List of file paths to add to the media manager. """ current_paths = self.get_file_list() titles = [file_path.name for file_path in current_paths] @@ -241,7 +241,7 @@ class PresentationMediaItem(MediaManagerItem): """ Clean up the files created such as thumbnails - :param openlp.core.common.path.Path file_path: File path of the presentation to clean up after + :param pathlib.Path file_path: File path of the presentation to clean up after :param bool clean_for_update: Only clean thumbnails if update is needed :rtype: None """ @@ -385,7 +385,7 @@ class PresentationMediaItem(MediaManagerItem): set as the preferred controller. Find the first (alphabetic) enabled controller which "supports" the extension. If none found, then look for a controller which "also supports" it instead. - :param openlp.core.common.path.Path file_path: The file path + :param pathlib.Path file_path: The file path :return: The default application controller for this file type, or None if not supported :rtype: PresentationController """ diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index faff8ecbf..55f472399 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -21,10 +21,10 @@ ########################################################################## import copy import logging +from pathlib import Path from PyQt5 import QtCore -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.lib import ServiceItemContext diff --git a/openlp/plugins/presentations/lib/pdfcontroller.py b/openlp/plugins/presentations/lib/pdfcontroller.py index 57a1494ca..4b7456471 100644 --- a/openlp/plugins/presentations/lib/pdfcontroller.py +++ b/openlp/plugins/presentations/lib/pdfcontroller.py @@ -21,11 +21,11 @@ ########################################################################## import logging import re +from shutil import which from subprocess import CalledProcessError, check_output from openlp.core.common import check_binary_exists, is_win from openlp.core.common.applocation import AppLocation -from openlp.core.common.path import which from openlp.core.common.settings import Settings from openlp.core.display.screens import ScreenList from openlp.plugins.presentations.lib.presentationcontroller import PresentationController, PresentationDocument @@ -71,7 +71,7 @@ class PdfController(PresentationController): Function that checks whether a binary is either ghostscript or mudraw or neither. Is also used from presentationtab.py - :param openlp.core.common.path.Path program_path: The full path to the binary to check. + :param pathlib.Path program_path: The full path to the binary to check. :return: Type of the binary, 'gs' if ghostscript, 'mudraw' if mudraw, None if invalid. :rtype: str | None """ @@ -182,7 +182,7 @@ class PdfDocument(PresentationDocument): """ Constructor, store information about the file and initialise. - :param openlp.core.common.path.Path document_path: Path to the document to load + :param pathlib.Path document_path: Path to the document to load :rtype: None """ log.debug('Init Presentation Pdf') diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index 34331dc5d..acac15f79 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -124,7 +124,7 @@ class PowerpointDocument(PresentationDocument): Constructor, store information about the file and initialise. :param controller: - :param openlp.core.common.path.Path document_path: Path to the document to load + :param pathlib.Path document_path: Path to the document to load :rtype: None """ log.debug('Init Presentation Powerpoint') diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py index 30e656b4b..7d8d99518 100644 --- a/openlp/plugins/presentations/lib/presentationcontroller.py +++ b/openlp/plugins/presentations/lib/presentationcontroller.py @@ -20,12 +20,14 @@ # along with this program. If not, see . # ########################################################################## import logging +import shutil +from pathlib import Path from PyQt5 import QtCore from openlp.core.common import md5_hash from openlp.core.common.applocation import AppLocation -from openlp.core.common.path import Path, create_paths +from openlp.core.common.path import create_paths from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.lib import create_thumb, validate_thumb @@ -92,7 +94,7 @@ class PresentationDocument(object): Constructor for the PresentationController class :param controller: - :param openlp.core.common.path.Path document_path: Path to the document to load. + :param Path document_path: Path to the document to load. :rtype: None """ self.controller = controller @@ -102,7 +104,7 @@ class PresentationDocument(object): """ Run some initial setup. This method is separate from __init__ in order to mock it out in tests. - :param openlp.core.common.path.Path document_path: Path to the document to load. + :param Path document_path: Path to the document to load. :rtype: None """ self.slide_number = 0 @@ -129,7 +131,7 @@ class PresentationDocument(object): if thumbnail_folder_path.exists(): thumbnail_folder_path.rmtree() if temp_folder_path.exists(): - temp_folder_path.rmtree() + shutil.rmtree(temp_folder_path) except OSError: log.exception('Failed to delete presentation controller files') @@ -138,7 +140,7 @@ class PresentationDocument(object): The location where thumbnail images will be stored :return: The path to the thumbnail - :rtype: openlp.core.common.path.Path + :rtype: Path """ # TODO: Can be removed when the upgrade path to OpenLP 3.0 is no longer needed, also ensure code in # get_temp_folder and PresentationPluginapp_startup is removed @@ -153,7 +155,7 @@ class PresentationDocument(object): The location where thumbnail images will be stored :return: The path to the temporary file folder - :rtype: openlp.core.common.path.Path + :rtype: Path """ # TODO: Can be removed when the upgrade path to OpenLP 3.0 is no longer needed, also ensure code in # get_thumbnail_folder and PresentationPluginapp_startup is removed @@ -260,7 +262,7 @@ class PresentationDocument(object): """ Convert the slide image the application made to a scaled 360px height .png image. - :param openlp.core.common.path.Path image_path: Path to the image to create a thumb nail of + :param Path image_path: Path to the image to create a thumbnail of :param int index: The index of the slide to create the thumbnail for. :rtype: None """ @@ -277,7 +279,7 @@ class PresentationDocument(object): :param int slide_no: The slide an image is required for, starting at 1 :param bool check_exists: Check if the generated path exists :return: The path, or None if the :param:`check_exists` is True and the file does not exist - :rtype: openlp.core.common.path.Path | None + :rtype: Path | None """ path = self.get_thumbnail_folder() / (self.controller.thumbnail_prefix + str(slide_no) + '.png') if path.is_file() or not check_exists: @@ -473,7 +475,7 @@ class PresentationController(object): """ Called when a new presentation document is opened. - :param openlp.core.common.path.Path document_path: Path to the document to load + :param Path document_path: Path to the document to load :return: The document :rtype: PresentationDocument """ diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index 46ca8a675..6a18fb330 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -221,7 +221,7 @@ class PresentationTab(SettingsTab): """ Handle the `pathEditChanged` signal from program_path_edit - :param openlp.core.common.path.Path new_path: File path to the new program + :param pathlib.Path new_path: File path to the new program :rtype: None """ if new_path: diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index c36778346..62d0eb7d7 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -25,13 +25,14 @@ used to edit songs. """ import logging import re +from shutil import copyfile from PyQt5 import QtCore, QtWidgets from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import UiStrings, get_natural_key, translate from openlp.core.common.mixins import RegistryProperties -from openlp.core.common.path import copyfile, create_paths +from openlp.core.common.path import create_paths from openlp.core.common.registry import Registry from openlp.core.lib import MediaType, create_separated_list from openlp.core.lib.plugin import PluginStatus diff --git a/openlp/plugins/songs/forms/mediafilesform.py b/openlp/plugins/songs/forms/mediafilesform.py index 8c6dddb27..162199524 100644 --- a/openlp/plugins/songs/forms/mediafilesform.py +++ b/openlp/plugins/songs/forms/mediafilesform.py @@ -43,7 +43,7 @@ class MediaFilesForm(QtWidgets.QDialog, Ui_MediaFilesDialog): def populate_files(self, file_paths): """ - :param list[openlp.core.common.path.Path] file_paths: + :param list[pathlib.Path] file_paths: :return: """ self.file_list_widget.clear() @@ -54,6 +54,6 @@ class MediaFilesForm(QtWidgets.QDialog, Ui_MediaFilesDialog): def get_selected_files(self): """ - :rtype: list[openlp.core.common.path.Path] + :rtype: list[pathlib.Path] """ return [item.data(QtCore.Qt.UserRole) for item in self.file_list_widget.selectedItems()] diff --git a/openlp/plugins/songs/lib/importers/easyworship.py b/openlp/plugins/songs/lib/importers/easyworship.py index c3257898a..9468031fa 100644 --- a/openlp/plugins/songs/lib/importers/easyworship.py +++ b/openlp/plugins/songs/lib/importers/easyworship.py @@ -28,9 +28,9 @@ import re import sqlite3 import struct import zlib +from pathlib import Path from openlp.core.common.i18n import translate -from openlp.core.common.path import Path from openlp.plugins.songs.lib import VerseType, retrieve_windows_encoding, strip_rtf from .songimport import SongImport diff --git a/openlp/plugins/songs/lib/importers/powersong.py b/openlp/plugins/songs/lib/importers/powersong.py index 235590c93..f2347a52b 100644 --- a/openlp/plugins/songs/lib/importers/powersong.py +++ b/openlp/plugins/songs/lib/importers/powersong.py @@ -24,9 +24,9 @@ The :mod:`powersong` module provides the functionality for importing PowerSong songs into the OpenLP database. """ import logging +from pathlib import Path from openlp.core.common.i18n import translate -from openlp.core.common.path import Path from openlp.plugins.songs.lib.importers.songimport import SongImport @@ -73,7 +73,7 @@ class PowerSongImport(SongImport): * is a directory * contains at least one * .song file - :param openlp.core.common.path.Path import_source: Should be a Path object that fulfills the above criteria + :param Path import_source: Should be a Path object that fulfills the above criteria :return: If the source is valid :rtype: bool """ diff --git a/openlp/plugins/songs/lib/importers/presentationmanager.py b/openlp/plugins/songs/lib/importers/presentationmanager.py index 6647222cb..830552aed 100644 --- a/openlp/plugins/songs/lib/importers/presentationmanager.py +++ b/openlp/plugins/songs/lib/importers/presentationmanager.py @@ -78,7 +78,7 @@ class PresentationManagerImport(SongImport): def process_song(self, root, file_path): """ :param root: - :param openlp.core.common.path.Path file_path: Path to the file to process + :param pathlib.Path file_path: Path to the file to process :rtype: None """ self.set_defaults() diff --git a/openlp/plugins/songs/lib/importers/propresenter.py b/openlp/plugins/songs/lib/importers/propresenter.py index 874de9247..0d666e449 100644 --- a/openlp/plugins/songs/lib/importers/propresenter.py +++ b/openlp/plugins/songs/lib/importers/propresenter.py @@ -55,7 +55,7 @@ class ProPresenterImport(SongImport): def process_song(self, root, file_path): """ :param root: - :param openlp.core.common.path.Path file_path: Path to the file thats being imported + :param pathlib.Path file_path: Path to the file thats being imported :rtype: None """ self.set_defaults() diff --git a/openlp/plugins/songs/lib/importers/songbeamer.py b/openlp/plugins/songs/lib/importers/songbeamer.py index 0fe42c541..3b5bf4aac 100644 --- a/openlp/plugins/songs/lib/importers/songbeamer.py +++ b/openlp/plugins/songs/lib/importers/songbeamer.py @@ -27,9 +27,9 @@ import logging import math import os import re +from pathlib import Path from openlp.core.common import get_file_encoding, is_macosx, is_win -from openlp.core.common.path import Path from openlp.core.common.settings import Settings from openlp.plugins.songs.lib import VerseType from openlp.plugins.songs.lib.importers.songimport import SongImport diff --git a/openlp/plugins/songs/lib/importers/songimport.py b/openlp/plugins/songs/lib/importers/songimport.py index f566e1604..2b312cc14 100644 --- a/openlp/plugins/songs/lib/importers/songimport.py +++ b/openlp/plugins/songs/lib/importers/songimport.py @@ -22,13 +22,14 @@ import logging import re +from shutil import copyfile from PyQt5 import QtCore from openlp.core.common import normalize_str from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import translate -from openlp.core.common.path import copyfile, create_paths +from openlp.core.common.path import create_paths from openlp.core.common.registry import Registry from openlp.core.widgets.wizard import WizardStrings from openlp.plugins.songs.lib import VerseType, clean_song @@ -401,9 +402,9 @@ class SongImport(QtCore.QObject): the new file location. :param song_id: - :param openlp.core.common.path.Path file_path: The file to copy. + :param pathlib.Path file_path: The file to copy. :return: The new location of the file - :rtype: openlp.core.common.path.Path + :rtype: pathlib.Path """ if not hasattr(self, 'save_path'): self.save_path = AppLocation.get_section_data_path(self.import_wizard.plugin.name) / 'audio' / str(song_id) diff --git a/openlp/plugins/songs/lib/importers/songpro.py b/openlp/plugins/songs/lib/importers/songpro.py index 7256ebf20..125fa4f49 100644 --- a/openlp/plugins/songs/lib/importers/songpro.py +++ b/openlp/plugins/songs/lib/importers/songpro.py @@ -24,8 +24,8 @@ The :mod:`songpro` module provides the functionality for importing SongPro songs into the OpenLP database. """ import re +from pathlib import Path -from openlp.core.common.path import Path from openlp.plugins.songs.lib import strip_rtf from openlp.plugins.songs.lib.importers.songimport import SongImport diff --git a/openlp/plugins/songs/lib/importers/sundayplus.py b/openlp/plugins/songs/lib/importers/sundayplus.py index f64ff5f9d..4961ba388 100644 --- a/openlp/plugins/songs/lib/importers/sundayplus.py +++ b/openlp/plugins/songs/lib/importers/sundayplus.py @@ -65,7 +65,7 @@ class SundayPlusImport(SongImport): """ Process the Sunday Plus song file - :param openlp.core.common.path.Path file_path: The song file to import + :param pathlib.Path file_path: The song file to import :rtype: None """ with file_path.open('rb') as song_file: @@ -180,7 +180,7 @@ class SundayPlusImport(SongImport): """ Extract the title from the filename - :param openlp.core.common.path.Path file_path: File being imported + :param pathlib.Path file_path: File being imported :return: The song title :rtype: str """ diff --git a/openlp/plugins/songs/lib/importers/videopsalm.py b/openlp/plugins/songs/lib/importers/videopsalm.py index 91fec46f1..bc0e06093 100644 --- a/openlp/plugins/songs/lib/importers/videopsalm.py +++ b/openlp/plugins/songs/lib/importers/videopsalm.py @@ -25,9 +25,9 @@ exported from Lyrix.""" import json import logging import re +from pathlib import Path from openlp.core.common.i18n import translate -from openlp.core.common.path import Path from openlp.core.common.settings import Settings from openlp.plugins.songs.lib.db import AuthorType from openlp.plugins.songs.lib.importers.songimport import SongImport diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index a58bf6d8b..90e4e9098 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -20,8 +20,9 @@ # along with this program. If not, see . # ########################################################################## import logging -import os import mako +import os +from shutil import copyfile from PyQt5 import QtCore, QtWidgets from sqlalchemy.sql import and_, or_ @@ -29,7 +30,7 @@ from sqlalchemy.sql import and_, or_ from openlp.core.state import State from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import UiStrings, get_natural_key, translate -from openlp.core.common.path import copyfile, create_paths +from openlp.core.common.path import create_paths from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.lib import ServiceItemContext, check_item_selected, create_separated_list diff --git a/openlp/plugins/songs/lib/openlyricsexport.py b/openlp/plugins/songs/lib/openlyricsexport.py index 4047c087a..311bfa711 100644 --- a/openlp/plugins/songs/lib/openlyricsexport.py +++ b/openlp/plugins/songs/lib/openlyricsexport.py @@ -45,7 +45,7 @@ class OpenLyricsExport(RegistryProperties): """ Initialise the export. - :param openlp.core.common.path.Path save_path: The directory to save the exported songs in + :param pathlib.Path save_path: The directory to save the exported songs in :rtype: None """ log.debug('initialise OpenLyricsExport') diff --git a/openlp/plugins/songs/lib/upgrade.py b/openlp/plugins/songs/lib/upgrade.py index 4338d2d46..b637714d5 100644 --- a/openlp/plugins/songs/lib/upgrade.py +++ b/openlp/plugins/songs/lib/upgrade.py @@ -25,14 +25,14 @@ backend for the Songs plugin """ import json import logging +from pathlib import Path from sqlalchemy import Column, ForeignKey, Table, types from sqlalchemy.sql.expression import false, func, null, text from openlp.core.common.applocation import AppLocation from openlp.core.common.db import drop_columns -from openlp.core.common.json import OpenLPJsonEncoder -from openlp.core.common.path import Path +from openlp.core.common.json import OpenLPJSONEncoder from openlp.core.lib.db import PathType, get_upgrade_op @@ -182,7 +182,7 @@ def upgrade_7(session, metadata): results = conn.execute('SELECT * FROM media_files') data_path = AppLocation.get_data_path() for row in results.fetchall(): - file_path_json = json.dumps(Path(row.file_name), cls=OpenLPJsonEncoder, base_path=data_path) + file_path_json = json.dumps(Path(row.file_name), cls=OpenLPJSONEncoder, base_path=data_path) sql = 'UPDATE media_files SET file_path = \'{file_path_json}\' WHERE id = {id}'.format( file_path_json=file_path_json, id=row.id) conn.execute(sql) diff --git a/openlp/plugins/songs/reporting.py b/openlp/plugins/songs/reporting.py index 85faa8000..cbe964736 100644 --- a/openlp/plugins/songs/reporting.py +++ b/openlp/plugins/songs/reporting.py @@ -24,9 +24,9 @@ The :mod:`db` module provides the ability to provide a csv file of all songs """ import csv import logging +from pathlib import Path from openlp.core.common.i18n import translate -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.lib.ui import critical_error_message_box from openlp.core.widgets.dialogs import FileDialog diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 10fa64387..a6fdcd99f 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -432,7 +432,7 @@ class SongsPlugin(Plugin): """ Provide a count of the songs in the database - :param openlp.core.common.path.Path db_path: The database to use + :param Path db_path: The database to use :return: The number of songs in the db. :rtype: int """ diff --git a/openlp/plugins/songusage/forms/songusagedetailform.py b/openlp/plugins/songusage/forms/songusagedetailform.py index 953dd544b..c0422f291 100644 --- a/openlp/plugins/songusage/forms/songusagedetailform.py +++ b/openlp/plugins/songusage/forms/songusagedetailform.py @@ -70,7 +70,7 @@ class SongUsageDetailForm(QtWidgets.QDialog, Ui_SongUsageDetailDialog, RegistryP """ Handle the `pathEditChanged` signal from report_path_edit - :param openlp.core.common.path.Path file_path: The new path. + :param pathlib.Path file_path: The new path. :rtype: None """ Settings().setValue(self.plugin.settings_section + '/last directory export', file_path) diff --git a/tests/functional/openlp_core/api/test_deploy.py b/tests/functional/openlp_core/api/test_deploy.py index 89462aaa1..3424f63bf 100644 --- a/tests/functional/openlp_core/api/test_deploy.py +++ b/tests/functional/openlp_core/api/test_deploy.py @@ -20,12 +20,13 @@ # along with this program. If not, see . # ########################################################################## import os +import shutil +from pathlib import Path from tempfile import mkdtemp from unittest import TestCase from unittest.mock import MagicMock, patch from openlp.core.api.deploy import deploy_zipfile, download_and_check, download_sha256 -from openlp.core.common.path import Path CONFIG_FILE = '2c266badff1e3d140664c50fd1460a2b332b24d5ad8c267fa62e506b5eb6d894 deploy/site.zip\n2017_06_27' @@ -46,7 +47,7 @@ class TestRemoteDeploy(TestCase): """ Clean up after tests """ - self.app_root_path.rmtree() + shutil.rmtree(self.app_root_path) @patch('openlp.core.api.deploy.ZipFile') def test_deploy_zipfile(self, MockZipFile): diff --git a/tests/functional/openlp_core/common/test_applocation.py b/tests/functional/openlp_core/common/test_applocation.py index fe0bfb86d..c1fdeb8a7 100644 --- a/tests/functional/openlp_core/common/test_applocation.py +++ b/tests/functional/openlp_core/common/test_applocation.py @@ -23,11 +23,11 @@ Functional tests to test the AppLocation class and related methods. """ import os +from pathlib import Path from unittest.mock import patch from openlp.core.common import get_frozen_path from openlp.core.common.applocation import AppLocation -from openlp.core.common.path import Path FILE_LIST = ['file1', 'file2', 'file3.txt', 'file4.txt', 'file5.mp3', 'file6.mp3'] diff --git a/tests/functional/openlp_core/common/test_common.py b/tests/functional/openlp_core/common/test_common.py index 715e66ff6..21f246a75 100644 --- a/tests/functional/openlp_core/common/test_common.py +++ b/tests/functional/openlp_core/common/test_common.py @@ -22,12 +22,12 @@ """ Functional tests to test the AppLocation class and related methods. """ +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, call, patch from openlp.core.common import clean_button_text, de_hump, extension_loader, is_linux, is_macosx, is_win, \ normalize_str, path_to_module, trace_error_handler -from openlp.core.common.path import Path class TestCommonFunctions(TestCase): diff --git a/tests/functional/openlp_core/common/test_httputils.py b/tests/functional/openlp_core/common/test_httputils.py index 4e8fb671b..120980b54 100644 --- a/tests/functional/openlp_core/common/test_httputils.py +++ b/tests/functional/openlp_core/common/test_httputils.py @@ -24,12 +24,12 @@ Functional tests to test the AppLocation class and related methods. """ import os import tempfile +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, patch from openlp.core.common.httputils import ProxyMode, download_file, get_proxy_settings, get_url_file_size, \ get_user_agent, get_web_page -from openlp.core.common.path import Path from openlp.core.common.settings import Settings from tests.helpers.testmixin import TestMixin diff --git a/tests/functional/openlp_core/common/test_init.py b/tests/functional/openlp_core/common/test_init.py index d7320114e..6665b2a13 100644 --- a/tests/functional/openlp_core/common/test_init.py +++ b/tests/functional/openlp_core/common/test_init.py @@ -23,12 +23,12 @@ Functional tests to test the AppLocation class and related methods. """ from io import BytesIO +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, PropertyMock, call, patch from openlp.core.common import add_actions, clean_filename, delete_file, get_file_encoding, get_filesystem_encoding, \ get_uno_command, get_uno_instance -from openlp.core.common.path import Path from tests.helpers.testmixin import TestMixin diff --git a/tests/functional/openlp_core/common/test_json.py b/tests/functional/openlp_core/common/test_json.py index fd1eb1b95..d0b8c9506 100644 --- a/tests/functional/openlp_core/common/test_json.py +++ b/tests/functional/openlp_core/common/test_json.py @@ -23,14 +23,134 @@ Package to test the openlp.core.common.json package. """ import json +import os +from pathlib import Path from unittest import TestCase from unittest.mock import patch -from openlp.core.common.json import OpenLPJsonDecoder, OpenLPJsonEncoder -from openlp.core.common.path import Path +from openlp.core.common.json import JSONMixin, OpenLPJSONDecoder, OpenLPJSONEncoder, PathSerializer, _registered_classes -class TestOpenLPJsonDecoder(TestCase): +class TestClassBase(object): + """ + Simple class to avoid repetition + """ + def __init__(self, a=None, b=None, c=None): + self.a = a + self.b = b + self.c = c + + +class TestJSONMixin(TestCase): + """ + Test the JSONMixin class + """ + def setUp(self): + self._registered_classes_patcher = patch.dict(_registered_classes, clear=True) + self.addCleanup(self._registered_classes_patcher.stop) + self._registered_classes_patcher.start() + + def test_subclass_json_mixin(self): + """ + Test that a class is `registered` when subclassing JSONMixin + """ + # GIVEN: The JSONMixin class + # WHEN: Subclassing it + class TestClass(JSONMixin): + pass + + # THEN: The TestClass should have been `registered` + assert _registered_classes['TestClass'] == TestClass + + def test_subclass_json_mixin_alt_names(self): + """ + Test that a class is `registered` using the specified names when subclassing JSONMixin + """ + # GIVEN: The JSONMixin class + # WHEN: Subclassing it with custom names + class TestClass(JSONMixin, register_names=('AltName1', 'AltName2')): + pass + + # THEN: The TestClass should have been registered with only those names + assert 'TestClass' not in _registered_classes + assert _registered_classes['AltName1'] == TestClass + assert _registered_classes['AltName2'] == TestClass + + def test_encoding_json_mixin_subclass(self): + """ + Test that an instance of a JSONMixin subclass is properly serialized to a JSON string + """ + # GIVEN: A instance of a subclass of the JSONMixin class + class TestClass(TestClassBase, JSONMixin): + _json_keys = ['a', 'b'] + + instance = TestClass(a=1, c=2) + + # WHEN: Serializing the instance + json_string = json.dumps(instance, cls=OpenLPJSONEncoder) + + # THEN: Only the attributes specified by `_json_keys` should be serialized, and only if they have been set + assert json_string == '{"a": 1, "json_meta": {"class": "TestClass", "version": 1}}' + + def test_decoding_json_mixin_subclass(self): + """ + Test that an instance of a JSONMixin subclass is properly deserialized from a JSON string + """ + # GIVEN: A subclass of the JSONMixin class + class TestClass(TestClassBase, JSONMixin): + _json_keys = ['a', 'b'] + + # WHEN: Deserializing a JSON representation of the TestClass + instance = json.loads( + '{"a": 1, "c": 2, "json_meta": {"class": "TestClass", "version": 1}}', cls=OpenLPJSONDecoder) + + # THEN: Only the attributes specified by `_json_keys` should have been set + assert instance.__class__ == TestClass + assert instance.a == 1 + assert instance.b is None + assert instance.c is None + + def test_encoding_json_mixin_subclass_custom_name(self): + """ + Test that an instance of a JSONMixin subclass is properly serialized to a JSON string when using a custom name + """ + # GIVEN: A instance of a subclass of the JSONMixin class with a custom name + class TestClass(TestClassBase, JSONMixin, register_names=('AltName', )): + _json_keys = ['a', 'b'] + _name = 'AltName' + _version = 2 + + instance = TestClass(a=1, c=2) + + # WHEN: Serializing the instance + json_string = json.dumps(instance, cls=OpenLPJSONEncoder) + + # THEN: Only the attributes specified by `_json_keys` should be serialized, and only if they have been set + assert json_string == '{"a": 1, "json_meta": {"class": "AltName", "version": 2}}' + + def test_decoding_json_mixin_subclass_custom_name(self): + """ + Test that an instance of a JSONMixin subclass is properly deserialized from a JSON string when using a custom + name + """ + # GIVEN: A instance of a subclass of the JSONMixin class with a custom name + class TestClass(TestClassBase, JSONMixin, register_names=('AltName', )): + _json_keys = ['a', 'b'] + _name = 'AltName' + _version = 2 + + # WHEN: Deserializing a JSON representation of the TestClass + instance = json.loads( + '{"a": 1, "c": 2, "json_meta": {"class": "AltName", "version": 2}}', cls=OpenLPJSONDecoder) + + # THEN: Only the attributes specified by `_json_keys` should have been set + assert instance.__class__ == TestClass + assert instance.a == 1 + assert instance.b is None + assert instance.c is None + + +class TestOpenLPJSONDecoder(TestCase): """ Test the OpenLPJsonDecoder class """ @@ -39,10 +159,10 @@ class TestOpenLPJsonDecoder(TestCase): Test the object_hook method when called with a decoded Path JSON object """ # GIVEN: An instance of OpenLPJsonDecoder - instance = OpenLPJsonDecoder() + instance = OpenLPJSONDecoder() # WHEN: Calling the object_hook method with a decoded JSON object which contains a Path - result = instance.object_hook({'__Path__': ['test', 'path']}) + result = instance.object_hook({'parts': ['test', 'path'], "json_meta": {"class": "Path", "version": 1}}) # THEN: A Path object should be returned assert result == Path('test', 'path') @@ -52,7 +172,7 @@ class TestOpenLPJsonDecoder(TestCase): Test the object_hook method when called with a decoded JSON object """ # GIVEN: An instance of OpenLPJsonDecoder - instance = OpenLPJsonDecoder() + instance = OpenLPJSONDecoder() # WHEN: Calling the object_hook method with a decoded JSON object which contains a Path with patch('openlp.core.common.json.Path') as mocked_path: @@ -67,31 +187,32 @@ class TestOpenLPJsonDecoder(TestCase): Test the OpenLPJsonDecoder when decoding a JSON string """ # GIVEN: A JSON encoded string - json_string = '[{"__Path__": ["test", "path1"]}, {"__Path__": ["test", "path2"]}]' + json_string = '[{"parts": ["test", "path1"], "json_meta": {"class": "Path", "version": 1}}, ' \ + '{"parts": ["test", "path2"], "json_meta": {"class": "Path", "version": 1}}]' # WHEN: Decoding the string using the OpenLPJsonDecoder class - obj = json.loads(json_string, cls=OpenLPJsonDecoder) + obj = json.loads(json_string, cls=OpenLPJSONDecoder) # THEN: The object returned should be a python version of the JSON string assert obj == [Path('test', 'path1'), Path('test', 'path2')] -class TestOpenLPJsonEncoder(TestCase): +class TestOpenLPJSONEncoder(TestCase): """ - Test the OpenLPJsonEncoder class + Test the OpenLPJSONEncoder class """ def test_default_path_object(self): """ Test the default method when called with a Path object """ - # GIVEN: An instance of OpenLPJsonEncoder - instance = OpenLPJsonEncoder() + # GIVEN: An instance of OpenLPJSONEncoder + instance = OpenLPJSONEncoder() # WHEN: Calling the default method with a Path object result = instance.default(Path('test', 'path')) # THEN: A dictionary object that can be JSON encoded should be returned - assert result == {'__Path__': ('test', 'path')} + assert result == {'parts': ('test', 'path'), "json_meta": {"class": "Path", "version": 1}} def test_default_non_path_object(self): """ @@ -99,8 +220,8 @@ class TestOpenLPJsonEncoder(TestCase): """ with patch('openlp.core.common.json.JSONEncoder.default') as mocked_super_default: - # GIVEN: An instance of OpenLPJsonEncoder - instance = OpenLPJsonEncoder() + # GIVEN: An instance of OpenLPJSONEncoder + instance = OpenLPJSONEncoder() # WHEN: Calling the default method with a object other than a Path object instance.default('invalid object') @@ -115,8 +236,65 @@ class TestOpenLPJsonEncoder(TestCase): # GIVEN: A list of Path objects obj = [Path('test', 'path1'), Path('test', 'path2')] - # WHEN: Encoding the object using the OpenLPJsonEncoder class - json_string = json.dumps(obj, cls=OpenLPJsonEncoder) + # WHEN: Encoding the object using the OpenLPJSONEncoder class + json_string = json.dumps(obj, cls=OpenLPJSONEncoder) # THEN: The JSON string return should be a representation of the object encoded - assert json_string == '[{"__Path__": ["test", "path1"]}, {"__Path__": ["test", "path2"]}]' + assert json_string == '[{"parts": ["test", "path1"], "json_meta": {"class": "Path", "version": 1}}, ' \ + '{"parts": ["test", "path2"], "json_meta": {"class": "Path", "version": 1}}]' + + +class TestPathSerializer(TestCase): + + def test_path_encode_json(self): + """ + Test that `Path.encode_json` returns a Path object from a dictionary representation of a Path object decoded + from JSON + """ + # GIVEN: A Path object from openlp.core.common.path + # WHEN: Calling encode_json, with a dictionary representation + path = PathSerializer.encode_json( + {'parts': ['path', 'to', 'fi.le'], "json_meta": {"class": "Path", "version": 1}}, extra=1, args=2) + + # THEN: A Path object should have been returned + assert path == Path('path', 'to', 'fi.le') + + def test_path_encode_json_base_path(self): + """ + Test that `Path.encode_json` returns a Path object from a dictionary representation of a Path object decoded + from JSON when the base_path arg is supplied. + """ + # GIVEN: A Path object from openlp.core.common.path + # WHEN: Calling encode_json, with a dictionary representation + path = PathSerializer.encode_json( + {'parts': ['path', 'to', 'fi.le'], "json_meta": {"class": "Path", "version": 1}}, base_path=Path('/base')) + + # THEN: A Path object should have been returned with an absolute path + assert path == Path('/', 'base', 'path', 'to', 'fi.le') + + def test_path_json_object(self): + """ + Test that `Path.json_object` creates a JSON decode-able object from a Path object + """ + # GIVEN: A Path object from openlp.core.common.path + path = Path('/base', 'path', 'to', 'fi.le') + + # WHEN: Calling json_object + obj = PathSerializer().json_object(path, extra=1, args=2) + + # THEN: A JSON decodeable object should have been returned. + assert obj == {'parts': (os.sep, 'base', 'path', 'to', 'fi.le'), "json_meta": {"class": "Path", "version": 1}} + + def test_path_json_object_base_path(self): + """ + Test that `Path.json_object` creates a JSON decode-able object from a Path object, that is relative to the + base_path + """ + # GIVEN: A Path object from openlp.core.common.path + path = Path('/base', 'path', 'to', 'fi.le') + + # WHEN: Calling json_object with a base_path + obj = PathSerializer().json_object(path, base_path=Path('/', 'base')) + + # THEN: A JSON decodable object should have been returned. + assert obj == {'parts': ('path', 'to', 'fi.le'), "json_meta": {"class": "Path", "version": 1}} diff --git a/tests/functional/openlp_core/common/test_path.py b/tests/functional/openlp_core/common/test_path.py index 5ccc6523b..263dc391e 100644 --- a/tests/functional/openlp_core/common/test_path.py +++ b/tests/functional/openlp_core/common/test_path.py @@ -22,12 +22,13 @@ """ Package to test the openlp.core.common.path package. """ +# TODO: fix patches import os +from pathlib import Path from unittest import TestCase -from unittest.mock import ANY, MagicMock, patch +from unittest.mock import MagicMock, patch -from openlp.core.common.path import Path, copy, copyfile, copytree, create_paths, files_to_paths, path_to_str, \ - replace_params, str_to_path, which +from openlp.core.common.path import create_paths, files_to_paths, path_to_str, replace_params, str_to_path, which class TestShutil(TestCase): @@ -66,139 +67,6 @@ class TestShutil(TestCase): assert result_args == (1, '2') assert result_kwargs == {'arg3': '3', 'arg4': 4} - def test_copy(self): - """ - Test :func:`openlp.core.common.path.copy` - """ - # GIVEN: A mocked `shutil.copy` which returns a test path as a string - with patch('openlp.core.common.path.shutil.copy', return_value=os.path.join('destination', 'test', 'path')) \ - as mocked_shutil_copy: - - # WHEN: Calling :func:`openlp.core.common.path.copy` with the src and dst parameters as Path object types - result = copy(Path('source', 'test', 'path'), Path('destination', 'test', 'path')) - - # THEN: :func:`shutil.copy` should have been called with the str equivalents of the Path objects. - # :func:`openlp.core.common.path.copy` should return the str type result of calling - # :func:`shutil.copy` as a Path object. - mocked_shutil_copy.assert_called_once_with(os.path.join('source', 'test', 'path'), - os.path.join('destination', 'test', 'path')) - assert result == Path('destination', 'test', 'path') - - def test_copy_follow_optional_params(self): - """ - Test :func:`openlp.core.common.path.copy` when follow_symlinks is set to false - """ - # GIVEN: A mocked `shutil.copy` - with patch('openlp.core.common.path.shutil.copy', return_value='') as mocked_shutil_copy: - - # WHEN: Calling :func:`openlp.core.common.path.copy` with :param:`follow_symlinks` set to False - copy(Path('source', 'test', 'path'), Path('destination', 'test', 'path'), follow_symlinks=False) - - # THEN: :func:`shutil.copy` should have been called with :param:`follow_symlinks` set to false - mocked_shutil_copy.assert_called_once_with(ANY, ANY, follow_symlinks=False) - - def test_copyfile(self): - """ - Test :func:`openlp.core.common.path.copyfile` - """ - # GIVEN: A mocked :func:`shutil.copyfile` which returns a test path as a string - with patch('openlp.core.common.path.shutil.copyfile', - return_value=os.path.join('destination', 'test', 'path')) as mocked_shutil_copyfile: - - # WHEN: Calling :func:`openlp.core.common.path.copyfile` with the src and dst parameters as Path object - # types - result = copyfile(Path('source', 'test', 'path'), Path('destination', 'test', 'path')) - - # THEN: :func:`shutil.copyfile` should have been called with the str equivalents of the Path objects. - # :func:`openlp.core.common.path.copyfile` should return the str type result of calling - # :func:`shutil.copyfile` as a Path object. - mocked_shutil_copyfile.assert_called_once_with(os.path.join('source', 'test', 'path'), - os.path.join('destination', 'test', 'path')) - assert result == Path('destination', 'test', 'path') - - def test_copyfile_optional_params(self): - """ - Test :func:`openlp.core.common.path.copyfile` when follow_symlinks is set to false - """ - # GIVEN: A mocked :func:`shutil.copyfile` - with patch('openlp.core.common.path.shutil.copyfile', return_value='') as mocked_shutil_copyfile: - - # WHEN: Calling :func:`openlp.core.common.path.copyfile` with :param:`follow_symlinks` set to False - copyfile(Path('source', 'test', 'path'), Path('destination', 'test', 'path'), follow_symlinks=False) - - # THEN: :func:`shutil.copyfile` should have been called with the optional parameters, with out any of the - # values being modified - mocked_shutil_copyfile.assert_called_once_with(ANY, ANY, follow_symlinks=False) - - def test_copytree(self): - """ - Test :func:`openlp.core.common.path.copytree` - """ - # GIVEN: A mocked :func:`shutil.copytree` which returns a test path as a string - with patch('openlp.core.common.path.shutil.copytree', - return_value=os.path.join('destination', 'test', 'path')) as mocked_shutil_copytree: - - # WHEN: Calling :func:`openlp.core.common.path.copytree` with the src and dst parameters as Path object - # types - result = copytree(Path('source', 'test', 'path'), Path('destination', 'test', 'path')) - - # THEN: :func:`shutil.copytree` should have been called with the str equivalents of the Path objects. - # :func:`openlp.core.common.path.copytree` should return the str type result of calling - # :func:`shutil.copytree` as a Path object. - mocked_shutil_copytree.assert_called_once_with(os.path.join('source', 'test', 'path'), - os.path.join('destination', 'test', 'path')) - assert result == Path('destination', 'test', 'path') - - def test_copytree_optional_params(self): - """ - Test :func:`openlp.core.common.path.copytree` when optional parameters are passed - """ - # GIVEN: A mocked :func:`shutil.copytree` - with patch('openlp.core.common.path.shutil.copytree', return_value='') as mocked_shutil_copytree: - mocked_ignore = MagicMock() - mocked_copy_function = MagicMock() - - # WHEN: Calling :func:`openlp.core.common.path.copytree` with the optional parameters set - copytree(Path('source', 'test', 'path'), Path('destination', 'test', 'path'), symlinks=True, - ignore=mocked_ignore, copy_function=mocked_copy_function, ignore_dangling_symlinks=True) - - # THEN: :func:`shutil.copytree` should have been called with the optional parameters, with out any of the - # values being modified - mocked_shutil_copytree.assert_called_once_with(ANY, ANY, symlinks=True, ignore=mocked_ignore, - copy_function=mocked_copy_function, - ignore_dangling_symlinks=True) - - def test_rmtree(self): - """ - Test :func:`rmtree` - """ - # GIVEN: A mocked :func:`shutil.rmtree` and a test Path object - with patch('openlp.core.common.path.shutil.rmtree', return_value=None) as mocked_shutil_rmtree: - path = Path('test', 'path') - - # WHEN: Calling :func:`openlp.core.common.path.rmtree` with the path parameter as Path object type - path.rmtree() - - # THEN: :func:`shutil.rmtree` should have been called with the the Path object. - mocked_shutil_rmtree.assert_called_once_with(Path('test', 'path'), False, None) - - def test_rmtree_optional_params(self): - """ - Test :func:`openlp.core.common.path.rmtree` when optional parameters are passed - """ - # GIVEN: A mocked :func:`shutil.rmtree` and a test Path object. - with patch('openlp.core.common.path.shutil.rmtree', return_value=None) as mocked_shutil_rmtree: - path = Path('test', 'path') - mocked_on_error = MagicMock() - - # WHEN: Calling :func:`openlp.core.common.path.rmtree` with :param:`ignore_errors` set to True and - # :param:`onerror` set to a mocked object - path.rmtree(ignore_errors=True, onerror=mocked_on_error) - - # THEN: :func:`shutil.rmtree` should have been called with the optional parameters, with out any of the - # values being modified - mocked_shutil_rmtree.assert_called_once_with(path, True, mocked_on_error) - def test_which_no_command(self): """ Test :func:`openlp.core.common.path.which` when the command is not found. @@ -287,57 +155,6 @@ class TestPath(TestCase): # THEN: `path_to_str` should return None assert result is None - def test_path_encode_json(self): - """ - Test that `Path.encode_json` returns a Path object from a dictionary representation of a Path object decoded - from JSON - """ - # GIVEN: A Path object from openlp.core.common.path - # WHEN: Calling encode_json, with a dictionary representation - path = Path.encode_json({'__Path__': ['path', 'to', 'fi.le']}, extra=1, args=2) - - # THEN: A Path object should have been returned - assert path == Path('path', 'to', 'fi.le') - - def test_path_encode_json_base_path(self): - """ - Test that `Path.encode_json` returns a Path object from a dictionary representation of a Path object decoded - from JSON when the base_path arg is supplied. - """ - # GIVEN: A Path object from openlp.core.common.path - # WHEN: Calling encode_json, with a dictionary representation - path = Path.encode_json({'__Path__': ['path', 'to', 'fi.le']}, base_path=Path('/base')) - - # THEN: A Path object should have been returned with an absolute path - assert path == Path('/', 'base', 'path', 'to', 'fi.le') - - def test_path_json_object(self): - """ - Test that `Path.json_object` creates a JSON decode-able object from a Path object - """ - # GIVEN: A Path object from openlp.core.common.path - path = Path('/base', 'path', 'to', 'fi.le') - - # WHEN: Calling json_object - obj = path.json_object(extra=1, args=2) - - # THEN: A JSON decodable object should have been returned. - assert obj == {'__Path__': (os.sep, 'base', 'path', 'to', 'fi.le')} - - def test_path_json_object_base_path(self): - """ - Test that `Path.json_object` creates a JSON decode-able object from a Path object, that is relative to the - base_path - """ - # GIVEN: A Path object from openlp.core.common.path - path = Path('/base', 'path', 'to', 'fi.le') - - # WHEN: Calling json_object with a base_path - obj = path.json_object(base_path=Path('/', 'base')) - - # THEN: A JSON decodable object should have been returned. - assert obj == {'__Path__': ('path', 'to', 'fi.le')} - def test_create_paths_dir_exists(self): """ Test the create_paths() function when the path already exists diff --git a/tests/functional/openlp_core/common/test_settings.py b/tests/functional/openlp_core/common/test_settings.py index c3d991d5f..8053d4ffe 100644 --- a/tests/functional/openlp_core/common/test_settings.py +++ b/tests/functional/openlp_core/common/test_settings.py @@ -277,7 +277,8 @@ class TestSettings(TestCase, TestMixin): """Test the Settings._convert_value() method when a setting is JSON and represents a Path object""" # GIVEN: A settings object # WHEN: _convert_value() is run - result = Settings()._convert_value('{"__Path__": ["openlp", "core"]}', None) + result = Settings()._convert_value( + '{"parts": ["openlp", "core"], "json_meta": {"class": "Path", "version": 1}}', None) # THEN: The result should be a Path object assert isinstance(result, Path), 'The result should be a Path object' diff --git a/tests/functional/openlp_core/lib/test_db.py b/tests/functional/openlp_core/lib/test_db.py index fa1b6a08a..64e1dbcb9 100644 --- a/tests/functional/openlp_core/lib/test_db.py +++ b/tests/functional/openlp_core/lib/test_db.py @@ -23,6 +23,7 @@ Package to test the openlp.core.lib package. """ import shutil +from pathlib import Path from tempfile import mkdtemp from unittest import TestCase from unittest.mock import MagicMock, patch @@ -31,7 +32,6 @@ from sqlalchemy import MetaData from sqlalchemy.orm.scoping import ScopedSession from sqlalchemy.pool import NullPool -from openlp.core.common.path import Path from openlp.core.lib.db import delete_database, get_upgrade_op, init_db, upgrade_db diff --git a/tests/functional/openlp_core/lib/test_lib.py b/tests/functional/openlp_core/lib/test_lib.py index 5692e3f4d..9e031398f 100644 --- a/tests/functional/openlp_core/lib/test_lib.py +++ b/tests/functional/openlp_core/lib/test_lib.py @@ -22,12 +22,12 @@ """ Package to test the openlp.core.lib package. """ +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, patch from PyQt5 import QtCore, QtGui -from openlp.core.common.path import Path from openlp.core.lib import build_icon, check_item_selected, create_separated_list, create_thumb, \ get_text_file_string, image_to_byte, resize_image, str_to_bool, validate_thumb from tests.utils.constants import RESOURCE_PATH diff --git a/tests/functional/openlp_core/lib/test_serviceitem.py b/tests/functional/openlp_core/lib/test_serviceitem.py index 1f3d28b61..6660ce869 100644 --- a/tests/functional/openlp_core/lib/test_serviceitem.py +++ b/tests/functional/openlp_core/lib/test_serviceitem.py @@ -23,12 +23,12 @@ Package to test the openlp.core.lib package. """ import os +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, patch from openlp.core.state import State from openlp.core.common import md5_hash -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.lib.formattingtags import FormattingTags diff --git a/tests/functional/openlp_core/test_server.py b/tests/functional/openlp_core/test_server.py index 96cf55005..88509a1a3 100644 --- a/tests/functional/openlp_core/test_server.py +++ b/tests/functional/openlp_core/test_server.py @@ -19,10 +19,10 @@ # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # ########################################################################## +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, patch -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.server import Server from tests.helpers.testmixin import TestMixin diff --git a/tests/functional/openlp_core/ui/test_exceptionform.py b/tests/functional/openlp_core/ui/test_exceptionform.py index d469f4d9a..88f7b1603 100644 --- a/tests/functional/openlp_core/ui/test_exceptionform.py +++ b/tests/functional/openlp_core/ui/test_exceptionform.py @@ -25,10 +25,10 @@ Package to test the openlp.core.ui.exeptionform package. import os import tempfile from collections import OrderedDict +from pathlib import Path from unittest import TestCase from unittest.mock import call, patch -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.ui import exceptionform from tests.helpers.testmixin import TestMixin diff --git a/tests/functional/openlp_core/ui/test_firsttimeform.py b/tests/functional/openlp_core/ui/test_firsttimeform.py index c96338ed2..556b5e2aa 100644 --- a/tests/functional/openlp_core/ui/test_firsttimeform.py +++ b/tests/functional/openlp_core/ui/test_firsttimeform.py @@ -24,12 +24,12 @@ Package to test the openlp.core.ui.firsttimeform package. """ import os import tempfile +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, call, patch, DEFAULT from PyQt5 import QtWidgets -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.ui.firsttimeform import FirstTimeForm, ThemeListWidgetItem from tests.helpers.testmixin import TestMixin diff --git a/tests/functional/openlp_core/ui/test_themeform.py b/tests/functional/openlp_core/ui/test_themeform.py index 95a639661..38b4de7b6 100644 --- a/tests/functional/openlp_core/ui/test_themeform.py +++ b/tests/functional/openlp_core/ui/test_themeform.py @@ -22,10 +22,10 @@ """ Package to test the openlp.core.ui.themeform package. """ +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, patch -from openlp.core.common.path import Path from openlp.core.ui.themeform import ThemeForm diff --git a/tests/functional/openlp_core/ui/test_thememanager.py b/tests/functional/openlp_core/ui/test_thememanager.py index e4a2e7988..b4d50331b 100644 --- a/tests/functional/openlp_core/ui/test_thememanager.py +++ b/tests/functional/openlp_core/ui/test_thememanager.py @@ -24,13 +24,13 @@ Package to test the openlp.core.ui.thememanager package. """ import os import shutil +from pathlib import Path from tempfile import mkdtemp from unittest import TestCase from unittest.mock import ANY, MagicMock, patch from PyQt5 import QtWidgets -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.ui.thememanager import ThemeManager from tests.utils.constants import RESOURCE_PATH @@ -81,9 +81,9 @@ class TestThemeManager(TestCase): # THEN: The the controller should be registered in the registry. assert Registry().get('theme_manager') is not None, 'The base theme manager should be registered' - @patch('openlp.core.ui.thememanager.copyfile') + @patch('openlp.core.ui.thememanager.shutil') @patch('openlp.core.ui.thememanager.create_paths') - def test_write_theme_same_image(self, mocked_create_paths, mocked_copyfile): + def test_write_theme_same_image(self, mocked_create_paths, mocked_shutil): """ Test that we don't try to overwrite a theme background image with itself """ @@ -103,11 +103,11 @@ class TestThemeManager(TestCase): theme_manager._write_theme(mocked_theme, file_path_1, file_path_1) # THEN: The mocked_copyfile should not have been called - assert mocked_copyfile.called is False, 'copyfile should not be called' + assert mocked_shutil.copyfile.called is False, 'copyfile should not be called' - @patch('openlp.core.ui.thememanager.copyfile') + @patch('openlp.core.ui.thememanager.shutil') @patch('openlp.core.ui.thememanager.create_paths') - def test_write_theme_diff_images(self, mocked_create_paths, mocked_copyfile): + def test_write_theme_diff_images(self, mocked_create_paths, mocked_shutil): """ Test that we do overwrite a theme background image when a new is submitted """ @@ -127,7 +127,7 @@ class TestThemeManager(TestCase): theme_manager._write_theme(mocked_theme, file_path_1, file_path_2) # THEN: The mocked_copyfile should not have been called - assert mocked_copyfile.called is True, 'copyfile should be called' + assert mocked_shutil.copyfile.called is True, 'copyfile should be called' def test_write_theme_special_char_name(self): """ @@ -207,7 +207,7 @@ class TestThemeManager(TestCase): # THEN: Files should be unpacked assert (folder_path / 'Moss on tree' / 'Moss on tree.xml').exists() is True assert mocked_critical_error_message_box.call_count == 0, 'No errors should have happened' - folder_path.rmtree() + shutil.rmtree(folder_path) def test_unzip_theme_invalid_version(self): """ diff --git a/tests/functional/openlp_core/widgets/test_dialogs.py b/tests/functional/openlp_core/widgets/test_dialogs.py index 304cce127..1d5ecea63 100755 --- a/tests/functional/openlp_core/widgets/test_dialogs.py +++ b/tests/functional/openlp_core/widgets/test_dialogs.py @@ -20,12 +20,12 @@ # along with this program. If not, see . # ########################################################################## import os +from pathlib import Path from unittest import TestCase from unittest.mock import patch from PyQt5 import QtWidgets -from openlp.core.common.path import Path from openlp.core.widgets.dialogs import FileDialog diff --git a/tests/functional/openlp_core/widgets/test_edits.py b/tests/functional/openlp_core/widgets/test_edits.py index dbfaf4a16..ccddd9efe 100755 --- a/tests/functional/openlp_core/widgets/test_edits.py +++ b/tests/functional/openlp_core/widgets/test_edits.py @@ -23,10 +23,10 @@ This module contains tests for the openlp.core.widgets.edits module """ import os +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, PropertyMock, patch -from openlp.core.common.path import Path from openlp.core.widgets.dialogs import FileDialog from openlp.core.widgets.edits import PathEdit from openlp.core.widgets.enums import PathEditType diff --git a/tests/functional/openlp_plugins/bibles/test_bibleimport.py b/tests/functional/openlp_plugins/bibles/test_bibleimport.py index 8684d5905..bfad69e21 100644 --- a/tests/functional/openlp_plugins/bibles/test_bibleimport.py +++ b/tests/functional/openlp_plugins/bibles/test_bibleimport.py @@ -23,6 +23,7 @@ This module contains tests for the bibleimport module. """ from io import BytesIO +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, patch @@ -30,7 +31,6 @@ from lxml import etree, objectify from PyQt5.QtWidgets import QDialog from openlp.core.common.i18n import Language -from openlp.core.common.path import Path from openlp.core.lib.exceptions import ValidationError from openlp.plugins.bibles.lib.bibleimport import BibleImport from openlp.plugins.bibles.lib.db import BibleDB diff --git a/tests/functional/openlp_plugins/bibles/test_csvimport.py b/tests/functional/openlp_plugins/bibles/test_csvimport.py index 0110db597..95c54861b 100644 --- a/tests/functional/openlp_plugins/bibles/test_csvimport.py +++ b/tests/functional/openlp_plugins/bibles/test_csvimport.py @@ -24,10 +24,10 @@ This module contains tests for the CSV Bible importer. """ import csv from collections import namedtuple +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, PropertyMock, call, patch -from openlp.core.common.path import Path from openlp.core.lib.exceptions import ValidationError from openlp.plugins.bibles.lib.bibleimport import BibleImport from openlp.plugins.bibles.lib.importers.csvbible import Book, CSVBible, Verse diff --git a/tests/functional/openlp_plugins/bibles/test_manager.py b/tests/functional/openlp_plugins/bibles/test_manager.py index 9bffdeb89..cb9e48528 100644 --- a/tests/functional/openlp_plugins/bibles/test_manager.py +++ b/tests/functional/openlp_plugins/bibles/test_manager.py @@ -22,10 +22,10 @@ """ This module contains tests for the manager submodule of the Bibles plugin. """ +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, patch -from openlp.core.common.path import Path from openlp.plugins.bibles.lib.manager import BibleManager diff --git a/tests/functional/openlp_plugins/bibles/test_wordprojectimport.py b/tests/functional/openlp_plugins/bibles/test_wordprojectimport.py index 55d188c13..027162b0f 100644 --- a/tests/functional/openlp_plugins/bibles/test_wordprojectimport.py +++ b/tests/functional/openlp_plugins/bibles/test_wordprojectimport.py @@ -22,10 +22,10 @@ """ This module contains tests for the WordProject Bible importer. """ +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, call, patch -from openlp.core.common.path import Path from openlp.plugins.bibles.lib.importers.wordproject import WordProjectBible from tests.utils.constants import RESOURCE_PATH diff --git a/tests/functional/openlp_plugins/images/test_lib.py b/tests/functional/openlp_plugins/images/test_lib.py index aeba10985..44981303b 100644 --- a/tests/functional/openlp_plugins/images/test_lib.py +++ b/tests/functional/openlp_plugins/images/test_lib.py @@ -22,12 +22,12 @@ """ This module contains tests for the lib submodule of the Images plugin. """ +from pathlib import Path from unittest import TestCase from unittest.mock import ANY, MagicMock, patch from PyQt5 import QtCore, QtWidgets -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.plugins.images.lib.db import ImageFilenames, ImageGroups from openlp.plugins.images.lib.mediaitem import ImageMediaItem diff --git a/tests/functional/openlp_plugins/images/test_upgrade.py b/tests/functional/openlp_plugins/images/test_upgrade.py index 77857cc9d..4a2cd7a0d 100644 --- a/tests/functional/openlp_plugins/images/test_upgrade.py +++ b/tests/functional/openlp_plugins/images/test_upgrade.py @@ -24,12 +24,12 @@ This module contains tests for the lib submodule of the Images plugin. """ import os import shutil +from pathlib import Path from tempfile import mkdtemp from unittest import TestCase, skip from unittest.mock import patch from openlp.core.common.applocation import AppLocation -from openlp.core.common.path import Path from openlp.core.common.settings import Settings from openlp.core.lib.db import Manager from openlp.plugins.images.lib import upgrade diff --git a/tests/functional/openlp_plugins/media/test_mediaitem.py b/tests/functional/openlp_plugins/media/test_mediaitem.py index c199a34d6..248443c3b 100644 --- a/tests/functional/openlp_plugins/media/test_mediaitem.py +++ b/tests/functional/openlp_plugins/media/test_mediaitem.py @@ -22,12 +22,12 @@ """ Test the media plugin """ +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, patch from PyQt5 import QtCore -from openlp.core.common.path import Path from openlp.core.common.settings import Settings from openlp.plugins.media.lib.mediaitem import MediaMediaItem from tests.helpers.testmixin import TestMixin diff --git a/tests/functional/openlp_plugins/presentations/test_mediaitem.py b/tests/functional/openlp_plugins/presentations/test_mediaitem.py index 4ea625f08..476bce029 100644 --- a/tests/functional/openlp_plugins/presentations/test_mediaitem.py +++ b/tests/functional/openlp_plugins/presentations/test_mediaitem.py @@ -22,10 +22,10 @@ """ This module contains tests for the lib submodule of the Presentations plugin. """ +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, call, patch -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.plugins.presentations.lib.mediaitem import PresentationMediaItem from tests.helpers.testmixin import TestMixin diff --git a/tests/functional/openlp_plugins/presentations/test_pdfcontroller.py b/tests/functional/openlp_plugins/presentations/test_pdfcontroller.py index e0c4f3047..0891451c8 100644 --- a/tests/functional/openlp_plugins/presentations/test_pdfcontroller.py +++ b/tests/functional/openlp_plugins/presentations/test_pdfcontroller.py @@ -23,7 +23,8 @@ This module contains tests for the PdfController """ import os -from shutil import which +from pathlib import Path +from shutil import rmtree, which from tempfile import mkdtemp from unittest import TestCase from unittest.mock import MagicMock, patch @@ -31,7 +32,6 @@ from unittest.mock import MagicMock, patch from PyQt5 import QtCore, QtGui from openlp.core.common import is_macosx, is_linux, is_win -from openlp.core.common.path import Path from openlp.core.common.settings import Settings from openlp.core.display.screens import ScreenList from openlp.plugins.presentations.lib.pdfcontroller import PdfController, PdfDocument @@ -99,8 +99,8 @@ class TestPdfController(TestCase, TestMixin): """ del self.screens self.destroy_settings() - self.thumbnail_folder_path.rmtree() - self.temp_folder_path.rmtree() + rmtree(self.thumbnail_folder_path) + rmtree(self.temp_folder_path) def test_constructor(self): """ diff --git a/tests/functional/openlp_plugins/presentations/test_presentationcontroller.py b/tests/functional/openlp_plugins/presentations/test_presentationcontroller.py index 82c622a84..2dd121349 100644 --- a/tests/functional/openlp_plugins/presentations/test_presentationcontroller.py +++ b/tests/functional/openlp_plugins/presentations/test_presentationcontroller.py @@ -23,10 +23,10 @@ Functional tests to test the PresentationController and PresentationDocument classes and related methods. """ +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, call, patch -from openlp.core.common.path import Path from openlp.plugins.presentations.lib.presentationcontroller import PresentationController, PresentationDocument diff --git a/tests/functional/openlp_plugins/songs/test_openlyricsexport.py b/tests/functional/openlp_plugins/songs/test_openlyricsexport.py index 8f56ca985..9050580dd 100644 --- a/tests/functional/openlp_plugins/songs/test_openlyricsexport.py +++ b/tests/functional/openlp_plugins/songs/test_openlyricsexport.py @@ -22,11 +22,12 @@ """ This module contains tests for the OpenLyrics song importer. """ +import shutil +from pathlib import Path from tempfile import mkdtemp from unittest import TestCase from unittest.mock import MagicMock, patch -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.plugins.songs.lib.openlyricsexport import OpenLyricsExport from tests.helpers.testmixin import TestMixin @@ -47,7 +48,7 @@ class TestOpenLyricsExport(TestCase, TestMixin): """ Cleanup """ - self.temp_folder.rmtree() + shutil.rmtree(self.temp_folder) def test_export_same_filename(self): """ diff --git a/tests/helpers/songfileimport.py b/tests/helpers/songfileimport.py index 60f624723..8f0f338b2 100644 --- a/tests/helpers/songfileimport.py +++ b/tests/helpers/songfileimport.py @@ -82,7 +82,7 @@ class SongImportTestHelper(TestCase): """ A method to load and return an object containing the song data from an external file. - :param openlp.core.common.path.Path file_path: The path of the file to load + :param pathlib.Path file_path: The path of the file to load """ return json.loads(file_path.read_bytes().decode()) diff --git a/tests/interfaces/openlp_core/lib/test_pluginmanager.py b/tests/interfaces/openlp_core/lib/test_pluginmanager.py index 8a8f83172..8c993535f 100644 --- a/tests/interfaces/openlp_core/lib/test_pluginmanager.py +++ b/tests/interfaces/openlp_core/lib/test_pluginmanager.py @@ -22,7 +22,9 @@ """ Package to test the openlp.core.lib.pluginmanager package. """ +import shutil import sys +from pathlib import Path from tempfile import mkdtemp from unittest import TestCase, skip from unittest.mock import MagicMock, patch @@ -30,7 +32,6 @@ from unittest.mock import MagicMock, patch from PyQt5 import QtWidgets from openlp.core.common import is_win -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.state import State @@ -65,7 +66,7 @@ class TestPluginManager(TestCase, TestMixin): if is_win(): import gc gc.collect() - self.temp_dir_path.rmtree() + shutil.rmtree(self.temp_dir_path) @skip # This test is broken but totally unable to debug it. diff --git a/tests/interfaces/openlp_core/ui/test_firsttimeform.py b/tests/interfaces/openlp_core/ui/test_firsttimeform.py index 56f32bd83..9a1dc6736 100644 --- a/tests/interfaces/openlp_core/ui/test_firsttimeform.py +++ b/tests/interfaces/openlp_core/ui/test_firsttimeform.py @@ -22,10 +22,10 @@ """ Package to test the openlp.core.ui.firsttimeform package. """ +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, call, patch -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.ui.firsttimeform import ThemeListWidgetItem from openlp.core.ui.icons import UiIcons diff --git a/tests/interfaces/openlp_core/ui/test_thememanager.py b/tests/interfaces/openlp_core/ui/test_thememanager.py index 116e2f82e..b85f7c744 100644 --- a/tests/interfaces/openlp_core/ui/test_thememanager.py +++ b/tests/interfaces/openlp_core/ui/test_thememanager.py @@ -22,10 +22,10 @@ """ Interface tests to test the themeManager class and related methods. """ +from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, patch -from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.ui.thememanager import ThemeManager diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py index 8b48b0284..48acffd7f 100644 --- a/tests/utils/__init__.py +++ b/tests/utils/__init__.py @@ -44,6 +44,6 @@ def load_external_result_data(file_path): """ A method to load and return an object containing the song data from an external file. - :param openlp.core.common.path.Path file_path: The path of the file to load + :param pathlib.Path file_path: The path of the file to load """ return json.loads(file_path.read_bytes().decode()) diff --git a/tests/utils/constants.py b/tests/utils/constants.py index ba9f1e62a..58c442654 100644 --- a/tests/utils/constants.py +++ b/tests/utils/constants.py @@ -20,8 +20,7 @@ # along with this program. If not, see . # ########################################################################## import os - -from openlp.core.common.path import Path +from pathlib import Path OPENLP_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')) From fbc776dbfc8b6c5f596751d80fc8dff132d276f4 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 22 May 2019 09:42:51 -0700 Subject: [PATCH 27/50] Clean up AppVeyor script a bit, and install 32-bit VLC for 32-bit Python --- scripts/appveyor.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml index 2634958e6..439e931d7 100644 --- a/scripts/appveyor.yml +++ b/scripts/appveyor.yml @@ -12,7 +12,9 @@ clone_script: environment: matrix: - PYTHON: C:\\Python37-x64 + CHOCO_VLC: vlc - PYTHON: C:\\Python37 + CHOCO_VLC: vlc --forcex86 install: # Install dependencies from pypi @@ -31,13 +33,6 @@ after_test: # This is where we create a package using PyInstaller # Install PyInstaller - "%PYTHON%\\python.exe -m pip install pyinstaller" - # Download and install Inno Setup - used for packaging - # - appveyor DownloadFile http://www.jrsoftware.org/download.php/is-unicode.exe - # - is-unicode.exe /VERYSILENT /SUPPRESSMSGBOXES /SP- - # Download and unpack portable-bundle - - appveyor DownloadFile https://get.openlp.org/win-sdk/portable-setup.7z - - 7z x portable-setup.7z - - choco install vlc # Disabled portable installers - can't figure out how to make them silent # - curl -L -O http://downloads.sourceforge.net/project/portableapps/PortableApps.com%20Installer/PortableApps.comInstaller_3.4.4.paf.exe # - PortableApps.comInstaller_3.4.4.paf.exe /S @@ -45,6 +40,11 @@ after_test: # - PortableApps.comLauncher_2.2.1.paf.exe /S # - curl -L -O http://downloads.sourceforge.net/project/portableapps/NSIS%20Portable/NSISPortable_3.0_English.paf.exe # - NSISPortable_3.0_English.paf.exe /S + # Download and unpack portable-bundle + - appveyor DownloadFile https://get.openlp.org/win-sdk/portable-setup.7z + - 7z x portable-setup.7z + # Install VLC + - choco install %CHOCO_VLC% # Get the packaging code #- appveyor DownloadFile http://bazaar.launchpad.net/~openlp-core/openlp/packaging/tarball -FileName packaging.tar.gz - appveyor DownloadFile http://bazaar.launchpad.net/~raoul-snyman/openlp/wix-packaging/tarball -FileName packaging.tar.gz From ebc6e696687c1ea9bf62db5a3db9a41e633f80ec Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 22 May 2019 09:59:58 -0700 Subject: [PATCH 28/50] Fix linting and remove duplicated VLC path env var --- openlp/core/app.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/openlp/core/app.py b/openlp/core/app.py index 601ca9c69..49e606869 100644 --- a/openlp/core/app.py +++ b/openlp/core/app.py @@ -31,7 +31,6 @@ import logging import os import sys import time -import os from datetime import datetime from traceback import format_exception @@ -347,9 +346,6 @@ def main(): # Bug #1018855: Set the WM_CLASS property in X11 if not is_win() and not is_macosx(): qt_args.append('OpenLP') - # Set the libvlc environment variable if we're frozen - if getattr(sys, 'frozen', False): - os.environ['PYTHON_VLC_LIB_PATH'] = str(AppLocation.get_directory(AppLocation.AppDir)) # Initialise the resources qInitResources() # Now create and actually run the application. From e0cf05ae136dba01da0e3d52dbc5531464d976cb Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 22 May 2019 13:30:12 -0700 Subject: [PATCH 29/50] Fix paths to point back to normal packaging, now that my changes have been merged --- scripts/appveyor.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml index 439e931d7..13e50fc73 100644 --- a/scripts/appveyor.yml +++ b/scripts/appveyor.yml @@ -46,12 +46,10 @@ after_test: # Install VLC - choco install %CHOCO_VLC% # Get the packaging code - #- appveyor DownloadFile http://bazaar.launchpad.net/~openlp-core/openlp/packaging/tarball -FileName packaging.tar.gz - - appveyor DownloadFile http://bazaar.launchpad.net/~raoul-snyman/openlp/wix-packaging/tarball -FileName packaging.tar.gz + - appveyor DownloadFile http://bazaar.launchpad.net/~openlp-core/openlp/packaging/tarball -FileName packaging.tar.gz - 7z e packaging.tar.gz - 7z x packaging.tar - #- mv ~openlp-core/openlp/packaging packaging - - mv ~raoul-snyman/openlp/wix-packaging packaging + - mv ~openlp-core/openlp/packaging packaging # If this is trunk we should also build the manual - ps: >- If (BUILD_DOCS) { From d178b7adbad154992b4feafe66579246ec009385 Mon Sep 17 00:00:00 2001 From: Phill Date: Wed, 22 May 2019 21:46:51 +0100 Subject: [PATCH 30/50] Tidy ups + doc --- openlp/core/common/settings.py | 5 +++-- openlp/core/lib/db.py | 22 ++++++++++------------ openlp/core/widgets/edits.py | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py index d5c83f44d..297e1d37f 100644 --- a/openlp/core/common/settings.py +++ b/openlp/core/common/settings.py @@ -585,7 +585,8 @@ class Settings(QtCore.QSettings): :param value: The value to save :rtype: None """ - if is_serializable(value): # TODO: doesnt handle list off path objects + if is_serializable(value) or isinstance(value, dict) or \ + (isinstance(value, list) and value and is_serializable(value[0])): value = json.dumps(value, cls=OpenLPJSONEncoder) super().setValue(key, value) @@ -612,7 +613,7 @@ class Settings(QtCore.QSettings): elif isinstance(default_value, dict): return {} elif isinstance(setting, str): - if 'json_meta' in setting or setting.startswith('{'): # TODO: Appears screeen settings is using this, subcass from jsonmixin + if 'json_meta' in setting or setting.startswith('{'): return json.loads(setting, cls=OpenLPJSONDecoder) # Convert the setting to the correct type. if isinstance(default_value, bool): diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py index c8d6b03e8..a0445730f 100644 --- a/openlp/core/lib/db.py +++ b/openlp/core/lib/db.py @@ -165,8 +165,8 @@ def init_url(plugin_name, db_file_name=None): Construct the connection string for a database. :param plugin_name: The name of the plugin for the database creation. - :param pathlib.Path | str | None db_file_name: The database file name. Defaults to None resulting - in the plugin_name being used. + :param pathlib.Path | str | None db_file_name: The database file name. Defaults to None resulting in the plugin_name + being used. :return: The database URL :rtype: str """ @@ -216,6 +216,7 @@ class PathType(types.TypeDecorator): representation and store it as a Unicode type """ impl = types.Unicode + def coerce_compared_value(self, op, value): """ Some times it make sense to compare a PathType with a string. In the case a string is used coerce the the @@ -223,10 +224,8 @@ class PathType(types.TypeDecorator): :param op: The operation being carried out. Not used, as we only care about the type that is being used with the operation. - :param psthlib.Path | str value: The value being used for the comparison. Most likely a Path - Object or str. - :return: The coerced value stored in the db - :rtype: PathType or UnicodeText + :param pathlib.Path | str value: The value being used for the comparison. Most likely a Path Object or str. + :return PathType | UnicodeText: The coerced value stored in the db """ if isinstance(value, str): return UnicodeText() @@ -237,10 +236,9 @@ class PathType(types.TypeDecorator): """ Convert the Path object to a JSON representation - :param psthlib.Path value: The value to convert + :param pathlib.Path value: The value to convert :param dialect: Not used - :return: The Path object as a JSON string - :rtype: str + :return str: The Path object as a JSON string """ data_path = AppLocation.get_data_path() return json.dumps(value, cls=OpenLPJSONEncoder, base_path=data_path) @@ -252,7 +250,7 @@ class PathType(types.TypeDecorator): :param types.UnicodeText value: The value to convert :param dialect: Not used :return: The JSON object converted Python object (in this case it should be a Path object) - :rtype: psthlib.Path + :rtype: pathlib.Path """ data_path = AppLocation.get_data_path() return json.loads(value, cls=OpenLPJSONDecoder, base_path=data_path) @@ -350,8 +348,8 @@ class Manager(object): :param plugin_name: The name to setup paths and settings section names :param init_schema: The init_schema function for this database - :param pathlib.Path db_file_path: The file name to use for this database. Defaults to None - resulting in the plugin_name being used. + :param pathlib.Path | None db_file_path: The file name to use for this database. Defaults to None resulting in + the plugin_name being used. :param upgrade_mod: The upgrade_schema function for this database """ super().__init__() diff --git a/openlp/core/widgets/edits.py b/openlp/core/widgets/edits.py index de2a7b021..64cda27ca 100644 --- a/openlp/core/widgets/edits.py +++ b/openlp/core/widgets/edits.py @@ -30,7 +30,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets from openlp.core.common import CONTROL_CHARS from openlp.core.common.i18n import UiStrings, translate -from openlp.core.common.path import path_to_str, str_to_path +from openlp.core.common.path import path_to_str, str_to_path from openlp.core.common.settings import Settings from openlp.core.lib.formattingtags import FormattingTags from openlp.core.lib.ui import create_action, create_widget_action From dd0d531be38f3c48fef6d95360bcd5b4fbc35135 Mon Sep 17 00:00:00 2001 From: Phill Date: Thu, 23 May 2019 20:33:46 +0100 Subject: [PATCH 31/50] Fix images --- openlp/core/common/json.py | 4 ++-- openlp/core/display/window.py | 12 ++++++------ openlp/core/widgets/views.py | 6 +++--- openlp/plugins/images/lib/mediaitem.py | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/openlp/core/common/json.py b/openlp/core/common/json.py index 91ff4a3b3..6f815aefa 100644 --- a/openlp/core/common/json.py +++ b/openlp/core/common/json.py @@ -72,7 +72,7 @@ class JSONMixin(object): :param dict[str] j_dict: The dictionary to update with the meta data :return None: """ - j_dict.update({'json_meta': {'class': cls.__name__ or cls._name, 'version': cls._version}}) + j_dict.update({'json_meta': {'class': cls._name or cls.__name__, 'version': cls._version}}) def json_object(self, **kwargs): """ @@ -195,5 +195,5 @@ class PathSerializer(JSONMixin, register_names=('Path', 'PosixPath', 'WindowsPat with suppress(ValueError): path = path.relative_to(base_path) json_dict = {'parts': path.parts} - cls.attach_meta(path, json_dict) + cls.attach_meta(json_dict) return json_dict diff --git a/openlp/core/display/window.py b/openlp/core/display/window.py index 161b49981..c8d99fd22 100644 --- a/openlp/core/display/window.py +++ b/openlp/core/display/window.py @@ -249,18 +249,18 @@ class DisplayWindow(QtWidgets.QWidget): """ Set images in the display """ - for image in images: - if not image['path'].startswith('file://'): - image['path'] = 'file://' + image['path'] - json_images = json.dumps(images) + imagesr = copy.deepcopy(images) + for image in imagesr: + image['path'] = image['path'].as_uri() + json_images = json.dumps(imagesr) self.run_javascript('Display.setImageSlides({images});'.format(images=json_images)) def load_video(self, video): """ Load video in the display """ - if not video['path'].startswith('file://'): - video['path'] = 'file://' + video['path'] + video = copy.deepcopy(video) + video['path'] = video['path'].as_uri() json_video = json.dumps(video) self.run_javascript('Display.setVideo({video});'.format(video=json_video)) diff --git a/openlp/core/widgets/views.py b/openlp/core/widgets/views.py index ac4e26772..b5c07993c 100644 --- a/openlp/core/widgets/views.py +++ b/openlp/core/widgets/views.py @@ -202,14 +202,14 @@ class ListPreviewWidget(QtWidgets.QTableWidget, RegistryProperties): label.setScaledContents(True) if self.service_item.is_command(): if self.service_item.is_capable(ItemCapabilities.HasThumbnails): - pixmap = QtGui.QPixmap(remove_url_prefix(slide['thumbnail'])) + pixmap = QtGui.QPixmap(str(slide['thumbnail'])) else: if isinstance(slide['image'], QtGui.QIcon): pixmap = slide['image'].pixmap(QtCore.QSize(32, 32)) else: - pixmap = QtGui.QPixmap(remove_url_prefix(slide['image'])) + pixmap = QtGui.QPixmap(str(slide['image'])) else: - pixmap = QtGui.QPixmap(remove_url_prefix(slide['path'])) + pixmap = QtGui.QPixmap(str(slide['path'])) label.setPixmap(pixmap) container = QtWidgets.QWidget() layout = AspectRatioLayout(container, self.screen_ratio) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index f6e66f4da..f11f4e794 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -611,7 +611,7 @@ class ImageMediaItem(MediaManagerItem): for image in images: name = image.file_path.name thumbnail_path = self.generate_thumbnail_path(image) - service_item.add_from_image(str(image.file_path), name, background, str(thumbnail_path)) + service_item.add_from_image(image.file_path, name, background, str(thumbnail_path)) return True def check_group_exists(self, new_group): From a3fdaff2c4c622197f27d622971784d812f8af27 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Thu, 23 May 2019 21:41:00 +0200 Subject: [PATCH 32/50] Fix test and remove debug prints --- openlp/core/ui/slidecontroller.py | 1 - openlp/plugins/presentations/lib/impresscontroller.py | 2 +- openlp/plugins/presentations/lib/messagelistener.py | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 5caf33b7a..2d419d6f2 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -1303,7 +1303,6 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties): [self.service_item, self.is_live]) # Check id we have tried to go before that start slide if self.is_live and before_start and before_start[0]: - print('detected before start!') if self.slide_limits == SlideLimits.Wrap: self.on_slide_selected_index([self.preview_widget.slide_count() - 1]) elif self.is_live and self.slide_limits == SlideLimits.Next: diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index 081a06478..0f773b98a 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -553,7 +553,7 @@ class ImpressDocument(PresentationDocument): titles.append(self.__get_text_from_page(slide_no, TextType.Title).replace('\r\n', ' ') .replace('\n', ' ').strip()) note = self.__get_text_from_page(slide_no, TextType.Notes) - if not note: + if len(note) == 0: note = ' ' notes.append(note) self.save_titles_and_notes(titles, notes) diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index 0cea6949b..9237f6a40 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -205,7 +205,6 @@ class Controller(object): return False ret = self.doc.previous_step() self.poll() - print('previous returning: %d' % ret) return ret def shutdown(self): From 347617431378737633c633c811d42b63cbf6eaf1 Mon Sep 17 00:00:00 2001 From: Phill Date: Thu, 23 May 2019 20:49:13 +0100 Subject: [PATCH 33/50] Pep fix --- tests/functional/openlp_core/common/test_path.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/openlp_core/common/test_path.py b/tests/functional/openlp_core/common/test_path.py index 263dc391e..55b5b70de 100644 --- a/tests/functional/openlp_core/common/test_path.py +++ b/tests/functional/openlp_core/common/test_path.py @@ -28,7 +28,7 @@ from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, patch -from openlp.core.common.path import create_paths, files_to_paths, path_to_str, replace_params, str_to_path, which +from openlp.core.common.path import create_paths, files_to_paths, path_to_str, replace_params, str_to_path, which class TestShutil(TestCase): From 1caf38b075e85169cb5e7f92a5da46f1ae6da851 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 23 May 2019 13:18:40 -0700 Subject: [PATCH 34/50] Forgot python-vlc --- scripts/appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml index 13e50fc73..1525f9d66 100644 --- a/scripts/appveyor.yml +++ b/scripts/appveyor.yml @@ -18,7 +18,7 @@ environment: install: # Install dependencies from pypi - - "%PYTHON%\\python.exe -m pip install sqlalchemy alembic appdirs chardet beautifulsoup4 lxml Mako mysql-connector-python pytest mock pyodbc psycopg2 pypiwin32 websockets asyncio waitress six webob requests QtAwesome PyQt5 PyQtWebEngine pymediainfo PyMuPDF QDarkStyle" + - "%PYTHON%\\python.exe -m pip install sqlalchemy alembic appdirs chardet beautifulsoup4 lxml Mako mysql-connector-python pytest mock pyodbc psycopg2 pypiwin32 websockets asyncio waitress six webob requests QtAwesome PyQt5 PyQtWebEngine pymediainfo PyMuPDF QDarkStyle python-vlc" build: off From 0b0593de4c411e620392d31342f99e0b89a5c751 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 23 May 2019 13:29:04 -0700 Subject: [PATCH 35/50] Re-enable the tests --- scripts/appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml index 1525f9d66..76e305b4e 100644 --- a/scripts/appveyor.yml +++ b/scripts/appveyor.yml @@ -25,7 +25,7 @@ build: off test_script: - cd openlp-branch # Run the tests - #- "%PYTHON%\\python.exe -m pytest -v tests" + - "%PYTHON%\\python.exe -m pytest -v tests" # Go back to the user root folder - cd.. From e6baed110561468c2e135dcf7760ff66fa8cf32b Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Thu, 23 May 2019 22:30:46 +0200 Subject: [PATCH 36/50] pep8 fixes --- openlp/core/ui/servicemanager.py | 2 +- .../presentations/lib/impresscontroller.py | 19 ++++++++++++------- .../presentations/lib/powerpointcontroller.py | 3 ++- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 18b5b6f04..33dd5c845 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -987,7 +987,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi self.make_live() self.service_manager_list.setCurrentItem(prev_item) elif prev_item: - # Go to the first slide of the previous service item + # Go to the first slide of the previous service item self.service_manager_list.setCurrentItem(prev_item) self.make_live() return diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index 0f773b98a..fb5254a05 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -222,25 +222,28 @@ class ImpressController(PresentationController): # Create Instance of ConfigurationProvider if not self.conf_provider: if is_win(): - self.conf_provider = self.manager.createInstance("com.sun.star.configuration.ConfigurationProvider") + self.conf_provider = self.manager.createInstance('com.sun.star.configuration.ConfigurationProvider') else: - self.conf_provider = self.manager.createInstanceWithContext("com.sun.star.configuration.ConfigurationProvider", uno.getComponentContext()) + self.conf_provider = self.manager.createInstanceWithContext( + 'com.sun.star.configuration.ConfigurationProvider', uno.getComponentContext()) # Setup lookup properties to get Impress settings properties = [] properties.append(self.create_property('nodepath', 'org.openoffice.Office.Impress')) properties = tuple(properties) try: # Get an updateable configuration view - impress_conf_props = self.conf_provider.createInstanceWithArguments('com.sun.star.configuration.ConfigurationUpdateAccess', properties) + impress_conf_props = self.conf_provider.createInstanceWithArguments( + 'com.sun.star.configuration.ConfigurationUpdateAccess', properties) # Get the specific setting for presentation screen - presenter_screen_enabled = impress_conf_props.getHierarchicalPropertyValue('Misc/Start/EnablePresenterScreen') + presenter_screen_enabled = impress_conf_props.getHierarchicalPropertyValue( + 'Misc/Start/EnablePresenterScreen') # If the presentation screen is enabled we disable it if presenter_screen_enabled != target_value: impress_conf_props.setHierarchicalPropertyValue('Misc/Start/EnablePresenterScreen', target_value) impress_conf_props.commitChanges() # if target_value is False this is an attempt to disable the Presenter Screen # so we make a note that it has been disabled, so it can be enabled again on close. - if target_value == False: + if target_value is False: self.presenter_screen_disabled_by_openlp = True except Exception as e: log.exception(e) @@ -561,6 +564,7 @@ class ImpressDocument(PresentationDocument): if is_win(): property_object = self.controller.manager.Bridge_GetStruct('com.sun.star.beans.PropertyValue') + class SlideShowListener(SlideShowListenerImport): """ Listener interface to receive global slide show events. @@ -568,8 +572,9 @@ class SlideShowListener(SlideShowListenerImport): def __init__(self, document): """ + Constructor - :param control: SlideShowController + :param document: The ImpressDocument being presented """ self.document = document @@ -602,7 +607,7 @@ class SlideShowListener(SlideShowListenerImport): Notify that the last animation from the main sequence of the current slide has ended. """ log.debug('LibreOffice SlideShowListener event: slideAnimationsEnded') - #if not Registry().get('main_window').isActiveWindow(): + # if not Registry().get('main_window').isActiveWindow(): # log.debug('main window is not in focus - should update slidecontroller') # Registry().execute('slidecontroller_live_change', self.document.control.getCurrentSlideIndex() + 1) diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index fd5772e88..a01470855 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -444,7 +444,8 @@ class PowerpointDocument(PresentationDocument): """ log.debug('next_step') # if we are at the presentations end don't go further, just return True - if self.presentation.SlideShowWindow.View.GetClickCount() == self.presentation.SlideShowWindow.View.GetClickIndex()\ + if self.presentation.SlideShowWindow.View.GetClickCount() == \ + self.presentation.SlideShowWindow.View.GetClickIndex() \ and self.get_slide_number() == self.get_slide_count(): return True past_end = False From 6e03382f1ff02ac8da3d3ed3b131e0008da75b8d Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Fri, 24 May 2019 21:21:19 +0200 Subject: [PATCH 37/50] Reenable setting slidecontroller index when openlp is not in focus. --- openlp/plugins/presentations/lib/impresscontroller.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index fb5254a05..426e8f2fc 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -607,9 +607,9 @@ class SlideShowListener(SlideShowListenerImport): Notify that the last animation from the main sequence of the current slide has ended. """ log.debug('LibreOffice SlideShowListener event: slideAnimationsEnded') - # if not Registry().get('main_window').isActiveWindow(): - # log.debug('main window is not in focus - should update slidecontroller') - # Registry().execute('slidecontroller_live_change', self.document.control.getCurrentSlideIndex() + 1) + if not Registry().get('main_window').isActiveWindow(): + log.debug('main window is not in focus - should update slidecontroller') + Registry().execute('slidecontroller_live_change', self.document.control.getCurrentSlideIndex() + 1) def slideEnded(self, reverse): """ From c901ec3d75ed82c12870ff300860c058fcabf5e0 Mon Sep 17 00:00:00 2001 From: Phill Date: Fri, 24 May 2019 23:11:11 +0100 Subject: [PATCH 38/50] Move suffixes from list to set, remove VlcPlayer.is_active as it was never ser --- openlp/core/lib/serviceitem.py | 8 +++++--- openlp/core/ui/media/mediacontroller.py | 18 ++++++++---------- openlp/core/ui/media/mediaplayer.py | 1 - openlp/core/ui/servicemanager.py | 16 ++++++++-------- .../ui/media/test_mediacontroller.py | 1 - 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index f284f59bb..3366cd858 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -593,9 +593,11 @@ class ServiceItem(RegistryProperties): """ return not bool(self.slides) - def validate_item(self, suffix_list=None): + def validate_item(self, suffixes=None): """ Validates a service item to make sure it is valid + + :param set[str] suffixes: A set of vaild suffixes """ self.is_valid = True for slide in self.slides: @@ -612,8 +614,8 @@ class ServiceItem(RegistryProperties): if not os.path.exists(file_name): self.is_valid = False break - if suffix_list and not self.is_text(): + if suffixes and not self.is_text(): file_suffix = slide['title'].split('.')[-1] - if file_suffix.lower() not in suffix_list: + if file_suffix.lower() not in suffixes: self.is_valid = False break diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 69fee7189..4cb2a8e79 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -104,17 +104,15 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): """ suffix_list = [] self.audio_extensions_list = [] - if self.vlc_player.is_active: - for item in self.vlc_player.audio_extensions_list: - if item not in self.audio_extensions_list: - self.audio_extensions_list.append(item) - suffix_list.append(item[2:]) + for item in self.vlc_player.audio_extensions_list: + if item not in self.audio_extensions_list: + self.audio_extensions_list.append(item) + suffix_list.append(item[2:]) self.video_extensions_list = [] - if self.vlc_player.is_active: - for item in self.vlc_player.video_extensions_list: - if item not in self.video_extensions_list: - self.video_extensions_list.append(item) - suffix_list.append(item[2:]) + for item in self.vlc_player.video_extensions_list: + if item not in self.video_extensions_list: + self.video_extensions_list.append(item) + suffix_list.append(item[2:]) self.service_manager.supported_suffixes(suffix_list) def bootstrap_initialise(self): diff --git a/openlp/core/ui/media/mediaplayer.py b/openlp/core/ui/media/mediaplayer.py index f4bc4a1df..9eb186665 100644 --- a/openlp/core/ui/media/mediaplayer.py +++ b/openlp/core/ui/media/mediaplayer.py @@ -38,7 +38,6 @@ class MediaPlayer(RegistryProperties): self.parent = parent self.name = name self.available = self.check_available() - self.is_active = False self.can_background = False self.can_folder = False self.state = {0: MediaState.Off, 1: MediaState.Off} diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 5e8b3e0cd..9e8b915fb 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -320,7 +320,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi """ super().__init__(parent) self.service_items = [] - self.suffixes = [] + self.suffixes = set() self.drop_position = -1 self.service_id = 0 # is a new service and has not been saved @@ -403,20 +403,18 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi Resets the Suffixes list. """ - self.suffixes = [] + self.suffixes.clear() def supported_suffixes(self, suffix_list): """ Adds Suffixes supported to the master list. Called from Plugins. - :param suffix_list: New Suffix's to be supported + :param list[str] | str suffix_list: New suffix(s) to be supported """ if isinstance(suffix_list, str): - self.suffixes.append(suffix_list) + self.suffixes.add(suffix_list) else: - for suffix in suffix_list: - if suffix not in self.suffixes: - self.suffixes.append(suffix) + self.suffixes.update(suffix_list) def on_new_service_clicked(self): """ @@ -475,9 +473,11 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi QtWidgets.QMessageBox.Save | QtWidgets.QMessageBox.Discard | QtWidgets.QMessageBox.Cancel, QtWidgets.QMessageBox.Save) - def on_recent_service_clicked(self): + def on_recent_service_clicked(self, checked): """ Load a recent file as the service triggered by mainwindow recent service list. + + :param bool checked: Not used """ if self.is_modified(): result = self.save_modified_service() diff --git a/tests/functional/openlp_core/ui/media/test_mediacontroller.py b/tests/functional/openlp_core/ui/media/test_mediacontroller.py index e6209cd37..a1a1122a1 100644 --- a/tests/functional/openlp_core/ui/media/test_mediacontroller.py +++ b/tests/functional/openlp_core/ui/media/test_mediacontroller.py @@ -50,7 +50,6 @@ class TestMediaController(TestCase, TestMixin): # GIVEN: A MediaController and an active player with audio and video extensions media_controller = MediaController() media_controller.vlc_player = VlcPlayer(None) - media_controller.vlc_player.is_active = True media_controller.vlc_player.audio_extensions_list = ['*.mp3', '*.wav', '*.wma', '*.ogg'] media_controller.vlc_player.video_extensions_list = ['*.mp4', '*.mov', '*.avi', '*.ogm'] From 7288336ad4d757f932c1c67d705280de39d4fb6b Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Sat, 25 May 2019 16:43:43 +0200 Subject: [PATCH 39/50] Replace native test runner with pytest --- setup.cfg | 3 +++ setup.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 5b443dcf7..27af3897d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,6 +2,9 @@ # E722 do not use bare except, specify exception instead # F841 local variable '' is assigned to but never used +[aliases] +test=pytest + [pep8] exclude=resources.py,vlc.py max-line-length = 120 diff --git a/setup.py b/setup.py index dcf430d4c..260f0f8be 100644 --- a/setup.py +++ b/setup.py @@ -204,8 +204,9 @@ using a computer and a data projector.""", 'PyMuPDF', 'pyodbc', 'pysword', + 'pytest', 'python-xlib; platform_system=="Linux"' ], - test_suite='tests', + setup_requires=['pytest-runner'], entry_points={'gui_scripts': ['openlp = run_openlp:start']} ) From 9caffa028b21850fb612b49521d31b93e0bb516f Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Sat, 25 May 2019 16:47:10 +0200 Subject: [PATCH 40/50] Add pytest to check_dependencies --- scripts/check_dependencies.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py index a49149f40..19325fbb8 100755 --- a/scripts/check_dependencies.py +++ b/scripts/check_dependencies.py @@ -106,6 +106,7 @@ OPTIONAL_MODULES = [ # development/testing modules ('jenkins', '(access jenkins api)'), ('launchpadlib', '(launchpad script support)'), + ('pytest', '(testing framework)'), ('pylint', '(linter)') ] From 38a310a1aa0e27468a4c42157238e1b2d03e09ce Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Sat, 25 May 2019 21:21:19 +0200 Subject: [PATCH 41/50] Remove unused code --- openlp/plugins/presentations/lib/impresscontroller.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index 426e8f2fc..9dd1a776a 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -561,9 +561,6 @@ class ImpressDocument(PresentationDocument): notes.append(note) self.save_titles_and_notes(titles, notes) - if is_win(): - property_object = self.controller.manager.Bridge_GetStruct('com.sun.star.beans.PropertyValue') - class SlideShowListener(SlideShowListenerImport): """ From c2550777c3f8f9940e75977c7d268445939898e3 Mon Sep 17 00:00:00 2001 From: Phill Date: Sun, 26 May 2019 11:30:37 +0100 Subject: [PATCH 42/50] VLC extension tidyups --- openlp/core/common/json.py | 1 - openlp/core/lib/mediamanageritem.py | 4 +-- openlp/core/ui/media/mediacontroller.py | 32 +++---------------- openlp/core/ui/media/mediaplayer.py | 2 -- openlp/core/ui/media/vlcplayer.py | 2 -- openlp/core/ui/themeform.py | 1 - openlp/plugins/media/lib/mediaitem.py | 10 +++--- openlp/plugins/songs/lib/openlyricsexport.py | 2 +- .../openlp_core/common/test_path.py | 1 - .../ui/media/test_mediacontroller.py | 19 ----------- .../openlp_core/ui/media/test_vlcplayer.py | 2 -- 11 files changed, 13 insertions(+), 63 deletions(-) diff --git a/openlp/core/common/json.py b/openlp/core/common/json.py index 6f815aefa..4a54e41b3 100644 --- a/openlp/core/common/json.py +++ b/openlp/core/common/json.py @@ -23,7 +23,6 @@ from contextlib import suppress from json import JSONDecoder, JSONEncoder from pathlib import Path - _registered_classes = {} diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 59cb1cdcf..eee11b970 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -589,7 +589,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties): """ Add this item to the current service. - :param item: Item to be processed + :param QtWidgets.QListWidgetItem | QtWidgets.QTreeWidgetItem | None item: Item to be processed :param replace: Replace the existing item :param remote: Triggered from remote :param position: Position to place item @@ -627,7 +627,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties): def build_service_item(self, item=None, remote=False, context=ServiceItemContext.Live): """ Common method for generating a service item - :param item: Service Item to be built. + :param QtWidgets.QListWidgetItem | QtWidgets.QTreeWidgetItem | None item: Service Item to be built. :param remote: Remote triggered (False) :param context: The context on which this is called """ diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 4cb2a8e79..4f4400f81 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -44,7 +44,7 @@ from openlp.core.lib.ui import critical_error_message_box from openlp.core.ui import DisplayControllerType from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path from openlp.core.ui.media.endpoint import media_endpoint -from openlp.core.ui.media.vlcplayer import VlcPlayer, get_vlc +from openlp.core.ui.media.vlcplayer import AUDIO_EXT, VIDEO_EXT, VlcPlayer, get_vlc log = logging.getLogger(__name__) @@ -65,11 +65,6 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): current_media_players is an array of player instances keyed on ControllerType. """ - def __init__(self, parent=None): - """ - Constructor - """ - super(MediaController, self).__init__(parent) def setup(self): self.vlc_player = None @@ -95,26 +90,8 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): Registry().register_function('songs_hide', self.media_hide) Registry().register_function('songs_blank', self.media_blank) Registry().register_function('songs_unblank', self.media_unblank) - Registry().register_function('mediaitem_suffixes', self._generate_extensions_lists) register_endpoint(media_endpoint) - def _generate_extensions_lists(self): - """ - Set the active players and available media files - """ - suffix_list = [] - self.audio_extensions_list = [] - for item in self.vlc_player.audio_extensions_list: - if item not in self.audio_extensions_list: - self.audio_extensions_list.append(item) - suffix_list.append(item[2:]) - self.video_extensions_list = [] - for item in self.vlc_player.video_extensions_list: - if item not in self.video_extensions_list: - self.video_extensions_list.append(item) - suffix_list.append(item[2:]) - self.service_manager.supported_suffixes(suffix_list) - def bootstrap_initialise(self): """ Check to see if we have any media Player's available. @@ -129,7 +106,8 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): else: State().missing_text('media_live', translate('OpenLP.SlideController', 'VLC or pymediainfo are missing, so you are unable to play any media')) - self._generate_extensions_lists() + self.service_manager.supported_suffixes(ext[2:] for ext in AUDIO_EXT) + self.service_manager.supported_suffixes(ext[2:] for ext in VIDEO_EXT) return True def bootstrap_post_set_up(self): @@ -379,7 +357,7 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): if file.is_file: suffix = '*%s' % file.suffix.lower() file = str(file) - if suffix in self.vlc_player.video_extensions_list: + if suffix in VIDEO_EXT: if not controller.media_info.is_background or controller.media_info.is_background and \ self.vlc_player.can_background: self.resize(display, self.vlc_player) @@ -387,7 +365,7 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): self.current_media_players[controller.controller_type] = self.vlc_player controller.media_info.media_type = MediaType.Video return True - if suffix in self.vlc_player.audio_extensions_list: + if suffix in AUDIO_EXT: if self.vlc_player.load(display, file): self.current_media_players[controller.controller_type] = self.vlc_player controller.media_info.media_type = MediaType.Audio diff --git a/openlp/core/ui/media/mediaplayer.py b/openlp/core/ui/media/mediaplayer.py index 9eb186665..3c0b7e873 100644 --- a/openlp/core/ui/media/mediaplayer.py +++ b/openlp/core/ui/media/mediaplayer.py @@ -42,8 +42,6 @@ class MediaPlayer(RegistryProperties): self.can_folder = False self.state = {0: MediaState.Off, 1: MediaState.Off} self.has_own_widget = False - self.audio_extensions_list = [] - self.video_extensions_list = [] def check_available(self): """ diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index 6ba27998b..3f7deac75 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -109,8 +109,6 @@ class VlcPlayer(MediaPlayer): self.display_name = '&VLC' self.parent = parent self.can_folder = True - self.audio_extensions_list = AUDIO_EXT - self.video_extensions_list = VIDEO_EXT def setup(self, output_display, live_display): """ diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index 0dfb53aab..7394409fa 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -32,7 +32,6 @@ from openlp.core.common.mixins import RegistryProperties from openlp.core.common.registry import Registry from openlp.core.lib.theme import BackgroundGradientType, BackgroundType from openlp.core.lib.ui import critical_error_message_box -# TODO: Fix this. Use a "get_video_extensions" method which uses the current media player from openlp.core.ui.media.vlcplayer import VIDEO_EXT from openlp.core.ui.themelayoutform import ThemeLayoutForm from openlp.core.ui.themewizard import Ui_ThemeWizard diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 658773b99..2d66eabe9 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -38,7 +38,7 @@ from openlp.core.lib.serviceitem import ItemCapabilities from openlp.core.lib.ui import critical_error_message_box from openlp.core.ui.icons import UiIcons from openlp.core.ui.media import parse_optical_path, format_milliseconds -from openlp.core.ui.media.vlcplayer import get_vlc +from openlp.core.ui.media.vlcplayer import AUDIO_EXT, VIDEO_EXT, get_vlc if get_vlc() is not None: @@ -233,8 +233,8 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): # self.populate_display_types() self.on_new_file_masks = translate('MediaPlugin.MediaItem', 'Videos ({video});;Audio ({audio});;{files} ' - '(*)').format(video=' '.join(self.media_controller.video_extensions_list), - audio=' '.join(self.media_controller.audio_extensions_list), + '(*)').format(video=' '.join(VIDEO_EXT), + audio=' '.join(AUDIO_EXT), files=UiStrings().AllFiles) def on_delete_click(self): @@ -301,9 +301,9 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): media_file_paths = Settings().value(self.settings_section + '/media files') media_file_paths.sort(key=lambda file_path: get_natural_key(file_path.name)) if media_type == MediaType.Audio: - extension = self.media_controller.audio_extensions_list + extension = AUDIO_EXT else: - extension = self.media_controller.video_extensions_list + extension = VIDEO_EXT # TODO: Rename extension to extensions extension = [x[1:] for x in extension] media = [x for x in media_file_paths if x.suffix in extension] return media diff --git a/openlp/plugins/songs/lib/openlyricsexport.py b/openlp/plugins/songs/lib/openlyricsexport.py index 311bfa711..37a64162f 100644 --- a/openlp/plugins/songs/lib/openlyricsexport.py +++ b/openlp/plugins/songs/lib/openlyricsexport.py @@ -43,7 +43,7 @@ class OpenLyricsExport(RegistryProperties): """ def __init__(self, parent, songs, save_path): """ - Initialise the export. + Initialise the export :param pathlib.Path save_path: The directory to save the exported songs in :rtype: None diff --git a/tests/functional/openlp_core/common/test_path.py b/tests/functional/openlp_core/common/test_path.py index 55b5b70de..5b983bc20 100644 --- a/tests/functional/openlp_core/common/test_path.py +++ b/tests/functional/openlp_core/common/test_path.py @@ -22,7 +22,6 @@ """ Package to test the openlp.core.common.path package. """ -# TODO: fix patches import os from pathlib import Path from unittest import TestCase diff --git a/tests/functional/openlp_core/ui/media/test_mediacontroller.py b/tests/functional/openlp_core/ui/media/test_mediacontroller.py index a1a1122a1..2389d8a34 100644 --- a/tests/functional/openlp_core/ui/media/test_mediacontroller.py +++ b/tests/functional/openlp_core/ui/media/test_mediacontroller.py @@ -43,25 +43,6 @@ class TestMediaController(TestCase, TestMixin): Registry.create() Registry().register('service_manager', MagicMock()) - def test_generate_extensions_lists(self): - """ - Test that the extensions are create correctly - """ - # GIVEN: A MediaController and an active player with audio and video extensions - media_controller = MediaController() - media_controller.vlc_player = VlcPlayer(None) - media_controller.vlc_player.audio_extensions_list = ['*.mp3', '*.wav', '*.wma', '*.ogg'] - media_controller.vlc_player.video_extensions_list = ['*.mp4', '*.mov', '*.avi', '*.ogm'] - - # WHEN: calling _generate_extensions_lists - media_controller._generate_extensions_lists() - - # THEN: extensions list should have been copied from the player to the mediacontroller - assert media_controller.video_extensions_list == media_controller.video_extensions_list, \ - 'Video extensions should be the same' - assert media_controller.audio_extensions_list == media_controller.audio_extensions_list, \ - 'Audio extensions should be the same' - def test_resize(self): """ Test that the resize method is called correctly diff --git a/tests/functional/openlp_core/ui/media/test_vlcplayer.py b/tests/functional/openlp_core/ui/media/test_vlcplayer.py index d3de03758..75828de8d 100644 --- a/tests/functional/openlp_core/ui/media/test_vlcplayer.py +++ b/tests/functional/openlp_core/ui/media/test_vlcplayer.py @@ -95,8 +95,6 @@ class TestVLCPlayer(TestCase, TestMixin): assert '&VLC' == vlc_player.display_name assert vlc_player.parent is None assert vlc_player.can_folder is True - assert AUDIO_EXT == vlc_player.audio_extensions_list - assert VIDEO_EXT == vlc_player.video_extensions_list @patch('openlp.core.ui.media.vlcplayer.is_win') @patch('openlp.core.ui.media.vlcplayer.is_macosx') From cdf29876e25792150b5b11b359128033544ff656 Mon Sep 17 00:00:00 2001 From: Phill Date: Sun, 26 May 2019 21:53:54 +0100 Subject: [PATCH 43/50] More media clean-up --- openlp/core/ui/media/mediacontroller.py | 4 +-- openlp/core/ui/media/mediaplayer.py | 6 ---- openlp/core/ui/media/vlcplayer.py | 33 ++++++------------- openlp/core/ui/themeform.py | 5 ++- .../openlp_core/ui/media/test_vlcplayer.py | 17 ---------- 5 files changed, 14 insertions(+), 51 deletions(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 4f4400f81..a17e48ea9 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -106,8 +106,8 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): else: State().missing_text('media_live', translate('OpenLP.SlideController', 'VLC or pymediainfo are missing, so you are unable to play any media')) - self.service_manager.supported_suffixes(ext[2:] for ext in AUDIO_EXT) - self.service_manager.supported_suffixes(ext[2:] for ext in VIDEO_EXT) + self.service_manager.supported_suffixes(AUDIO_EXT) + self.service_manager.supported_suffixes(VIDEO_EXT) return True def bootstrap_post_set_up(self): diff --git a/openlp/core/ui/media/mediaplayer.py b/openlp/core/ui/media/mediaplayer.py index 3c0b7e873..be88ab549 100644 --- a/openlp/core/ui/media/mediaplayer.py +++ b/openlp/core/ui/media/mediaplayer.py @@ -163,12 +163,6 @@ class MediaPlayer(RegistryProperties): """ return '' - def get_info(self): - """ - Returns Information about the player - """ - return '' - def get_live_state(self): """ Get the state of the live player diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index 3f7deac75..da4036bda 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -42,20 +42,18 @@ from openlp.core.ui.media.mediaplayer import MediaPlayer log = logging.getLogger(__name__) # Audio and video extensions copied from 'include/vlc_interface.h' from vlc 2.2.0 source -AUDIO_EXT = ['*.3ga', '*.669', '*.a52', '*.aac', '*.ac3', '*.adt', '*.adts', '*.aif', '*.aifc', '*.aiff', '*.amr', - '*.aob', '*.ape', '*.awb', '*.caf', '*.dts', '*.flac', '*.it', '*.kar', '*.m4a', '*.m4b', '*.m4p', '*.m5p', - '*.mid', '*.mka', '*.mlp', '*.mod', '*.mpa', '*.mp1', '*.mp2', '*.mp3', '*.mpc', '*.mpga', '*.mus', - '*.oga', '*.ogg', '*.oma', '*.opus', '*.qcp', '*.ra', '*.rmi', '*.s3m', '*.sid', '*.spx', '*.thd', '*.tta', - '*.voc', '*.vqf', '*.w64', '*.wav', '*.wma', '*.wv', '*.xa', '*.xm'] +AUDIO_EXT = ('3ga', '669', 'a52', 'aac', 'ac3', 'adt', 'adts', 'aif', 'aifc', 'aiff', 'amr', 'aob', 'ape', 'awb', 'caf', + 'dts', 'flac', 'it', 'kar', 'm4a', 'm4b', 'm4p', 'm5p', 'mid', 'mka', 'mlp', 'mod', 'mpa', 'mp1', 'mp2', + 'mp3', 'mpc', 'mpga', 'mus', 'oga', 'ogg', 'oma', 'opus', 'qcp', 'ra', 'rmi', 's3m', 'sid', 'spx', 'thd', + 'tta', 'voc', 'vqf', 'w64', 'wav', 'wma', 'wv', 'xa', 'xm') -VIDEO_EXT = ['*.3g2', '*.3gp', '*.3gp2', '*.3gpp', '*.amv', '*.asf', '*.avi', '*.bik', '*.divx', '*.drc', '*.dv', - '*.f4v', '*.flv', '*.gvi', '*.gxf', '*.iso', '*.m1v', '*.m2v', '*.m2t', '*.m2ts', '*.m4v', '*.mkv', - '*.mov', '*.mp2', '*.mp2v', '*.mp4', '*.mp4v', '*.mpe', '*.mpeg', '*.mpeg1', '*.mpeg2', '*.mpeg4', '*.mpg', - '*.mpv2', '*.mts', '*.mtv', '*.mxf', '*.mxg', '*.nsv', '*.nuv', '*.ogg', '*.ogm', '*.ogv', '*.ogx', '*.ps', - '*.rec', '*.rm', '*.rmvb', '*.rpl', '*.thp', '*.tod', '*.ts', '*.tts', '*.txd', '*.vob', '*.vro', '*.webm', - '*.wm', '*.wmv', '*.wtv', '*.xesc', +VIDEO_EXT = ('3g2', '3gp', '3gp2', '3gpp', 'amv', 'asf', 'avi', 'bik', 'divx', 'drc', 'dv', 'f4v', 'flv', 'gvi', 'gxf', + 'iso', 'm1v', 'm2v', 'm2t', 'm2ts', 'm4v', 'mkv', 'mov', 'mp2', 'mp2v', 'mp4', 'mp4v', 'mpe', 'mpeg', + 'mpeg1', 'mpeg2', 'mpeg4', 'mpg', 'mpv2', 'mts', 'mtv', 'mxf', 'mxg', 'nsv', 'nuv', 'ogg', 'ogm', 'ogv', + 'ogx', 'ps', 'rec', 'rm', 'rmvb', 'rpl', 'thp', 'tod', 'ts', 'tts', 'txd', 'vob', 'vro', 'webm', 'wm', + 'wmv', 'wtv', 'xesc', # These extensions was not in the official list, added manually. - '*.nut', '*.rv', '*.xvid'] + 'nut', 'rv', 'xvid') def get_vlc(): @@ -372,14 +370,3 @@ class VlcPlayer(MediaPlayer): else: controller.seek_slider.setSliderPosition(output_display.vlc_media_player.get_time()) controller.seek_slider.blockSignals(False) - - def get_info(self): - """ - Return some information about this player - """ - return(translate('Media.player', 'VLC is an external player which ' - 'supports a number of different formats.') + - '
' + translate('Media.player', 'Audio') + - '
' + str(AUDIO_EXT) + '
' + - translate('Media.player', 'Video') + '
' + - str(VIDEO_EXT) + '
') diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index 7394409fa..f165d32dc 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -75,9 +75,8 @@ class ThemeForm(QtWidgets.QWizard, Ui_ThemeWizard, RegistryProperties): self.image_path_edit.filters = \ '{name};;{text} (*)'.format(name=get_images_filter(), text=UiStrings().AllFiles) self.image_path_edit.pathChanged.connect(self.on_image_path_edit_path_changed) - # TODO: Should work - visible_formats = '({name})'.format(name='; '.join(VIDEO_EXT)) - actual_formats = '({name})'.format(name=' '.join(VIDEO_EXT)) + visible_formats = '(*.{name})'.format(name='; *.'.join(VIDEO_EXT)) + actual_formats = '(*.{name})'.format(name=' *.'.join(VIDEO_EXT)) video_filter = '{trans} {visible} {actual}'.format(trans=translate('OpenLP', 'Video Files'), visible=visible_formats, actual=actual_formats) self.video_path_edit.filters = '{video};;{ui} (*)'.format(video=video_filter, ui=UiStrings().AllFiles) diff --git a/tests/functional/openlp_core/ui/media/test_vlcplayer.py b/tests/functional/openlp_core/ui/media/test_vlcplayer.py index 75828de8d..ace896066 100644 --- a/tests/functional/openlp_core/ui/media/test_vlcplayer.py +++ b/tests/functional/openlp_core/ui/media/test_vlcplayer.py @@ -956,20 +956,3 @@ class TestVLCPlayer(TestCase, TestMixin): mocked_controller.seek_slider.setSliderPosition.assert_called_with(300) expected_calls = [call(True), call(False)] assert expected_calls == mocked_controller.seek_slider.blockSignals.call_args_list - - @patch('openlp.core.ui.media.vlcplayer.translate') - def test_get_info(self, mocked_translate): - """ - Test that get_info() returns some information about the VLC player - """ - # GIVEN: A VlcPlayer - mocked_translate.side_effect = lambda *x: x[1] - vlc_player = VlcPlayer(None) - - # WHEN: get_info() is run - info = vlc_player.get_info() - - # THEN: The information should be correct - assert 'VLC is an external player which supports a number of different formats.
' \ - 'Audio
' + str(AUDIO_EXT) + '
Video
' + \ - str(VIDEO_EXT) + '
' == info From 949231a35f7352adbc09991d04168cca5c0dc63e Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Wed, 29 May 2019 21:18:25 +0200 Subject: [PATCH 44/50] Fix traceback on Mac tests --- openlp/plugins/presentations/lib/impresscontroller.py | 4 +++- openlp/plugins/presentations/lib/powerpointcontroller.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index 9dd1a776a..b64973c33 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -42,7 +42,7 @@ from openlp.core.display.screens import ScreenList from openlp.plugins.presentations.lib.presentationcontroller import PresentationController, PresentationDocument, \ TextType - +# Load the XSlideShowListener class so we can inherit from it if is_win(): from win32com.client import Dispatch import pywintypes @@ -75,6 +75,8 @@ else: uno_available = True except ImportError: uno_available = False + class SlideShowListenerImport(): + pass log = logging.getLogger(__name__) diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index a01470855..763be4560 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -145,8 +145,8 @@ class PowerpointDocument(PresentationDocument): try: if not self.controller.process: self.controller.start_process() - self.controller.process.Presentations.Open(str(self.file_path), False, False, False) - self.presentation = self.controller.process.Presentations(self.controller.process.Presentations.Count) + self.presentation = self.controller.process.Presentations.Open(str(self.file_path), False, False, False) + log.debug('Loaded presentation %s' % self.presentation.FullName) self.create_thumbnails() self.create_titles_and_notes() # Make sure powerpoint doesn't steal focus, unless we're on a single screen setup From 2efaffec7ad5921ff32d6164c177078c57e37d89 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Wed, 29 May 2019 21:22:12 +0200 Subject: [PATCH 45/50] pep8 --- openlp/plugins/presentations/lib/impresscontroller.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index b64973c33..5a5e81cd3 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -75,6 +75,7 @@ else: uno_available = True except ImportError: uno_available = False + class SlideShowListenerImport(): pass From f4111e4431edad7122ae33c56a4049edd0cf44c4 Mon Sep 17 00:00:00 2001 From: Phill Date: Fri, 31 May 2019 20:59:38 +0100 Subject: [PATCH 46/50] Fix up filters --- openlp/plugins/media/lib/mediaitem.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 2d66eabe9..f1801b7a2 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -232,9 +232,9 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): """ # self.populate_display_types() self.on_new_file_masks = translate('MediaPlugin.MediaItem', - 'Videos ({video});;Audio ({audio});;{files} ' - '(*)').format(video=' '.join(VIDEO_EXT), - audio=' '.join(AUDIO_EXT), + 'Videos (*.{video});;Audio (*.{audio});;{files} ' + '(*)').format(video=' *.'.join(VIDEO_EXT), + audio=' *.'.join(AUDIO_EXT), files=UiStrings().AllFiles) def on_delete_click(self): From 8fe469aca3c4c2ccebcf6d94f01f2b3c5159f004 Mon Sep 17 00:00:00 2001 From: Phill Date: Fri, 31 May 2019 21:04:51 +0100 Subject: [PATCH 47/50] Re-add period --- openlp/plugins/songs/lib/openlyricsexport.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/songs/lib/openlyricsexport.py b/openlp/plugins/songs/lib/openlyricsexport.py index 37a64162f..311bfa711 100644 --- a/openlp/plugins/songs/lib/openlyricsexport.py +++ b/openlp/plugins/songs/lib/openlyricsexport.py @@ -43,7 +43,7 @@ class OpenLyricsExport(RegistryProperties): """ def __init__(self, parent, songs, save_path): """ - Initialise the export + Initialise the export. :param pathlib.Path save_path: The directory to save the exported songs in :rtype: None From 52eb196e5b08d02bda775ccc7b84cf7ed4a6e565 Mon Sep 17 00:00:00 2001 From: Phill Date: Fri, 31 May 2019 21:19:15 +0100 Subject: [PATCH 48/50] PEP8 --- openlp/core/ui/media/vlcplayer.py | 5 ++--- .../functional/openlp_core/ui/media/test_mediacontroller.py | 1 - tests/functional/openlp_core/ui/media/test_vlcplayer.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index da4036bda..3904b63ae 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -33,7 +33,6 @@ import vlc from PyQt5 import QtWidgets from openlp.core.common import is_linux, is_macosx, is_win -from openlp.core.common.i18n import translate from openlp.core.common.settings import Settings from openlp.core.ui.media import MediaState, MediaType from openlp.core.ui.media.mediaplayer import MediaPlayer @@ -49,8 +48,8 @@ AUDIO_EXT = ('3ga', '669', 'a52', 'aac', 'ac3', 'adt', 'adts', 'aif', 'aifc', 'a VIDEO_EXT = ('3g2', '3gp', '3gp2', '3gpp', 'amv', 'asf', 'avi', 'bik', 'divx', 'drc', 'dv', 'f4v', 'flv', 'gvi', 'gxf', 'iso', 'm1v', 'm2v', 'm2t', 'm2ts', 'm4v', 'mkv', 'mov', 'mp2', 'mp2v', 'mp4', 'mp4v', 'mpe', 'mpeg', - 'mpeg1', 'mpeg2', 'mpeg4', 'mpg', 'mpv2', 'mts', 'mtv', 'mxf', 'mxg', 'nsv', 'nuv', 'ogg', 'ogm', 'ogv', - 'ogx', 'ps', 'rec', 'rm', 'rmvb', 'rpl', 'thp', 'tod', 'ts', 'tts', 'txd', 'vob', 'vro', 'webm', 'wm', + 'mpeg1', 'mpeg2', 'mpeg4', 'mpg', 'mpv2', 'mts', 'mtv', 'mxf', 'mxg', 'nsv', 'nuv', 'ogg', 'ogm', 'ogv', + 'ogx', 'ps', 'rec', 'rm', 'rmvb', 'rpl', 'thp', 'tod', 'ts', 'tts', 'txd', 'vob', 'vro', 'webm', 'wm', 'wmv', 'wtv', 'xesc', # These extensions was not in the official list, added manually. 'nut', 'rv', 'xvid') diff --git a/tests/functional/openlp_core/ui/media/test_mediacontroller.py b/tests/functional/openlp_core/ui/media/test_mediacontroller.py index 2389d8a34..b0e41c19c 100644 --- a/tests/functional/openlp_core/ui/media/test_mediacontroller.py +++ b/tests/functional/openlp_core/ui/media/test_mediacontroller.py @@ -27,7 +27,6 @@ from unittest.mock import MagicMock, patch from openlp.core.common.registry import Registry from openlp.core.ui.media.mediacontroller import MediaController -from openlp.core.ui.media.vlcplayer import VlcPlayer from tests.helpers.testmixin import TestMixin from tests.utils.constants import RESOURCE_PATH diff --git a/tests/functional/openlp_core/ui/media/test_vlcplayer.py b/tests/functional/openlp_core/ui/media/test_vlcplayer.py index ace896066..9eaeb21a6 100644 --- a/tests/functional/openlp_core/ui/media/test_vlcplayer.py +++ b/tests/functional/openlp_core/ui/media/test_vlcplayer.py @@ -30,7 +30,7 @@ from unittest.mock import MagicMock, call, patch from openlp.core.common.registry import Registry from openlp.core.ui.media import MediaState, MediaType -from openlp.core.ui.media.vlcplayer import AUDIO_EXT, VIDEO_EXT, VlcPlayer, get_vlc +from openlp.core.ui.media.vlcplayer import VlcPlayer, get_vlc from tests.helpers import MockDateTime from tests.helpers.testmixin import TestMixin From aaaab9bf43a4e4d59bac4d941bab8286ad29871e Mon Sep 17 00:00:00 2001 From: Phill Date: Sat, 1 Jun 2019 07:59:45 +0100 Subject: [PATCH 49/50] Add media extensions in the service manager --- openlp/core/ui/media/mediacontroller.py | 2 -- openlp/core/ui/servicemanager.py | 10 +++++++++- openlp/plugins/media/lib/mediaitem.py | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index a17e48ea9..27164a06a 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -106,8 +106,6 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): else: State().missing_text('media_live', translate('OpenLP.SlideController', 'VLC or pymediainfo are missing, so you are unable to play any media')) - self.service_manager.supported_suffixes(AUDIO_EXT) - self.service_manager.supported_suffixes(VIDEO_EXT) return True def bootstrap_post_set_up(self): diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 9e8b915fb..220998c59 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -48,6 +48,7 @@ from openlp.core.lib.plugin import PluginStatus from openlp.core.lib.serviceitem import ItemCapabilities, ServiceItem from openlp.core.lib.ui import create_widget_action, critical_error_message_box, find_and_set_in_combo_box from openlp.core.ui.icons import UiIcons +from openlp.core.ui.media.vlcplayer import AUDIO_EXT, VIDEO_EXT from openlp.core.ui.serviceitemeditform import ServiceItemEditForm from openlp.core.ui.servicenoteform import ServiceNoteForm from openlp.core.ui.starttimeform import StartTimeForm @@ -321,6 +322,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi super().__init__(parent) self.service_items = [] self.suffixes = set() + self.add_media_suffixes() self.drop_position = -1 self.service_id = 0 # is a new service and has not been saved @@ -347,6 +349,13 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi self.service_item_edit_form = ServiceItemEditForm() self.start_time_form = StartTimeForm() + def add_media_suffixes(self): + """ + Add the suffixes supported by :mod:`openlp.core.ui.media.vlcplayer` + """ + self.suffixes.update(AUDIO_EXT) + self.suffixes.update(VIDEO_EXT) + def set_modified(self, modified=True): """ Setter for property "modified". Sets whether or not the current service has been modified. @@ -401,7 +410,6 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi def reset_supported_suffixes(self): """ Resets the Suffixes list. - """ self.suffixes.clear() diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index f1801b7a2..58994a909 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -303,7 +303,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): if media_type == MediaType.Audio: extension = AUDIO_EXT else: - extension = VIDEO_EXT # TODO: Rename extension to extensions + extension = VIDEO_EXT extension = [x[1:] for x in extension] media = [x for x in media_file_paths if x.suffix in extension] return media From 3963923e2d9ede2ff0057038401e160feeff6d30 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Tue, 4 Jun 2019 22:03:19 +0200 Subject: [PATCH 50/50] Fix as suggested --- .../presentations/lib/impresscontroller.py | 23 +++++++++++++------ .../lib/presentationcontroller.py | 4 ++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index ffbb79d04..873e91b86 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -188,7 +188,7 @@ class ImpressController(PresentationController): """ log.debug('Kill OpenOffice') if self.presenter_screen_disabled_by_openlp: - self._toggle_presentation_screen(True) + self.toggle_presentation_screen(True) while self.docs: self.docs[0].close_presentation() desktop = None @@ -218,9 +218,12 @@ class ImpressController(PresentationController): except Exception: log.warning('Failed to terminate OpenOffice') - def toggle_presentation_screen(self, target_value): + def toggle_presentation_screen(self, set_visible): """ Enable or disable the Presentation Screen/Console + + :param bool set_visible: Should the presentation screen/console be set to be visible. + :rtype: None """ # Create Instance of ConfigurationProvider if not self.conf_provider: @@ -241,21 +244,24 @@ class ImpressController(PresentationController): presenter_screen_enabled = impress_conf_props.getHierarchicalPropertyValue( 'Misc/Start/EnablePresenterScreen') # If the presentation screen is enabled we disable it - if presenter_screen_enabled != target_value: - impress_conf_props.setHierarchicalPropertyValue('Misc/Start/EnablePresenterScreen', target_value) + if presenter_screen_enabled != set_visible: + impress_conf_props.setHierarchicalPropertyValue('Misc/Start/EnablePresenterScreen', set_visible) impress_conf_props.commitChanges() - # if target_value is False this is an attempt to disable the Presenter Screen + # if set_visible is False this is an attempt to disable the Presenter Screen # so we make a note that it has been disabled, so it can be enabled again on close. - if target_value is False: + if set_visible is False: self.presenter_screen_disabled_by_openlp = True except Exception as e: log.exception(e) trace_error_handler(log) - return def create_property(self, name, value): """ Create an OOo style property object which are passed into some Uno methods. + + :param str name: The name of the property + :param str value: The value of the property + :rtype: com.sun.star.beans.PropertyValue """ log.debug('create property OpenOffice') if is_win(): @@ -615,6 +621,9 @@ class SlideShowListener(SlideShowListenerImport): """ Notify that the current slide has ended, e.g. the user has clicked on the slide. Calling displaySlide() twice will not issue this event. + + :param bool reverse: Whether or not the direction of the "slide movement" is reversed/backwards. + :rtype: None """ log.debug('LibreOffice SlideShowListener event: slideEnded %d' % reverse) if reverse: diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py index cb827cc5c..ac25fa9a4 100644 --- a/openlp/plugins/presentations/lib/presentationcontroller.py +++ b/openlp/plugins/presentations/lib/presentationcontroller.py @@ -249,14 +249,14 @@ class PresentationDocument(object): """ Triggers the next effect of slide on the running presentation. This might be the next animation on the current slide, or the next slide. - Returns True if we stepped beyond the slides of the presentation + :rtype bool: True if we stepped beyond the slides of the presentation """ return False def previous_step(self): """ Triggers the previous slide on the running presentation - Returns True if we stepped beyond the slides of the presentation + :rtype bool: True if we stepped beyond the slides of the presentation """ return False