andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1368 from bbenne10/develop

Browse Source 
Address mopidy/mopidy#1335
This commit is contained in:
Stein Magnus Jodal 2015-12-28 23:16:00 +01:00
commit da43b8679f
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mopidy/zeroconf.py
View File

@ -55,17 +55,20 @@ class Zeroconf(object):
self.bus = None
self.server = None
self.group = None
try:
self.bus = dbus.SystemBus()
self.server = dbus.Interface(
self.bus.get_object('org.freedesktop.Avahi', '/'),
'org.freedesktop.Avahi.Server')
except dbus.exceptions.DBusException as e:
logger.debug('%s: Server failed: %s', self, e)
self.display_hostname = None
self.name = None
self.display_hostname = '%s' % self.server.GetHostName()
self.name = string.Template(name).safe_substitute(
hostname=self.display_hostname, port=port)
if dbus:
try:
self.bus = dbus.SystemBus()
self.server = dbus.Interface(
self.bus.get_object('org.freedesktop.Avahi', '/'),
'org.freedesktop.Avahi.Server')
self.display_hostname = '%s' % self.server.GetHostName()
self.name = string.Template(name).safe_substitute(
hostname=self.display_hostname, port=port)
except dbus.exceptions.DBusException as e:
logger.debug('%s: Server failed: %s', self, e)
def __str__(self):
return 'Zeroconf service "%s" (%s at [%s]:%d)' % (