changeset 3014:b6abf8af87db

plugin ad-hoc D-Bus: fixed warning when no media player is found
author Goffi <goffi@goffi.org>
date Fri, 19 Jul 2019 17:07:56 +0200
parents 860c550028d6
children 7b8d40b17451
files sat/memory/disco.py sat/plugins/plugin_adhoc_dbus.py
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/sat/memory/disco.py	Thu Jul 18 21:58:34 2019 +0200
+++ b/sat/memory/disco.py	Fri Jul 19 17:07:56 2019 +0200
@@ -313,7 +313,8 @@
         """Return entities (including jid_ and its items) offering features
 
         @param features: iterable of features which must be present
-        @param identity(None, tuple(unicode, unicode)): if not None, accept only this (category/type) identity
+        @param identity(None, tuple(unicode, unicode)): if not None, accept only this
+            (category/type) identity
         @param jid_: the jid of the target server (None for profile's server)
         @param profile: %(doc_profile)s
         @return: a set of found entities
--- a/sat/plugins/plugin_adhoc_dbus.py	Thu Jul 18 21:58:34 2019 +0200
+++ b/sat/plugins/plugin_adhoc_dbus.py	Fri Jul 19 17:07:56 2019 +0200
@@ -346,6 +346,8 @@
                                                           NS_MEDIA_PLAYER, timeout=5)
                             command_elt = self._c.getCommandElt(result_elt)
                             form = data_form.findForm(command_elt, NS_MEDIA_PLAYER)
+                            if form is None:
+                                continue
                             mp_options = form.fields['media_player'].options
                             session_id = command_elt.getAttribute('sessionid')
                             if mp_options and session_id: